[ros-diffs] [tkreuzer] 37925: - reduce differences to trunk

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Mon Dec  8 01:36:10 2008
New Revision: 37925

URL: http://svn.reactos.org/svn/reactos?rev=37925&view=rev
Log:
- reduce differences to trunk

Modified:
    branches/ros-amd64-bringup/reactos/base/applications/control/control.h
    branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
    branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c
    branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c
    branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec

Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/control/control.h?rev=37925&r1=37924&r2=37925&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/control/control.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/control/control.h [iso-8859-1] Mon Dec  8 01:36:10 2008
@@ -15,4 +15,4 @@
 
 /* Macro for calling "rundll32.exe"
    According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */
-#define RUNDLL(param)   ((int)(INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)
+#define RUNDLL(param)   ((INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)

Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c?rev=37925&r1=37924&r2=37925&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Mon Dec  8 01:36:10 2008
@@ -185,10 +185,10 @@
 
                     switch (PtrToLong(hRootKey))
                     {
-                    case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff):
+                    case PtrToLong(HKEY_LOCAL_MACHINE):
                         _tcscpy(Path, _T("HKLM\\\0"));
                         break;
-                    case (((LONG_PTR)HKEY_CURRENT_USER) & 0xff):
+                    case PtrToLong(HKEY_CURRENT_USER):
                         _tcscpy(Path, _T("HKCU\\\0"));
                         break;
                     default:

Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c?rev=37925&r1=37924&r2=37925&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Mon Dec  8 01:36:10 2008
@@ -478,7 +478,7 @@
         OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK;
     saveas.lpstrDefExt       = szDefaultExt;
     saveas.lpTemplateName    = MAKEINTRESOURCE(DIALOG_ENCODING);
-    saveas.lpfnHook          = (LPOFNHOOKPROC)DIALOG_FileSaveAs_Hook;
+    saveas.lpfnHook          = DIALOG_FileSaveAs_Hook;
 
     if (GetSaveFileName(&saveas)) {
         SetFileName(szPath);

Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c?rev=37925&r1=37924&r2=37925&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Dec  8 01:36:10 2008
@@ -307,7 +307,7 @@
 
 	ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL);
 
-	TRACE ("RunFile: ShellExecuteA/W returned %p\n", (DWORD_PTR)ret);
+	TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret);
 
 	FreeLibrary(hShell32);
 	return (((DWORD_PTR)ret) > 32);

Modified: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec?rev=37925&r1=37924&r2=37925&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec [iso-8859-1] Mon Dec  8 01:36:10 2008
@@ -5,4 +5,4 @@
 @ stdcall DbgPrompt(ptr ptr long)
 @ stdcall RtlAssert(ptr ptr long ptr)
 @ stdcall RtlUnwind(ptr ptr ptr ptr)
-@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)
+@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)