- reduce differences to trunk

svn path=/branches/ros-amd64-bringup/; revision=37925

diff --git a/reactos/base/applications/control/control.h b/reactos/base/applications/control/control.h
index c9fd9bd..c6ed9c5 100644 (file)
--- a/reactos/base/applications/control/control.h
+++ b/reactos/base/applications/control/control.h
@@ -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)

diff --git a/reactos/base/applications/msconfig/startuppage.c b/reactos/base/applications/msconfig/startuppage.c
index 49de3c1..47d5673 100644 (file)
--- a/reactos/base/applications/msconfig/startuppage.c
+++ b/reactos/base/applications/msconfig/startuppage.c
@@ -185,10 +185,10 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
 
                     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:

diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c
index 5295159..7dc02ce 100644 (file)
--- a/reactos/base/applications/notepad/dialog.c
+++ b/reactos/base/applications/notepad/dialog.c
@@ -478,7 +478,7 @@ VOID DIALOG_FileSaveAs(VOID)
         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);

diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c
index eef62f1..116066c 100644 (file)
--- a/reactos/base/shell/cmd/cmd.c
+++ b/reactos/base/shell/cmd/cmd.c
@@ -307,7 +307,7 @@ static BOOL RunFile(LPTSTR filename)
 
        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);

diff --git a/reactos/lib/debugsup/debugsup-ntos.spec b/reactos/lib/debugsup/debugsup-ntos.spec
index 8814568..f7ec548 100644 (file)
--- a/reactos/lib/debugsup/debugsup-ntos.spec
+++ b/reactos/lib/debugsup/debugsup-ntos.spec
@@ -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)
\ No newline at end of file
+@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)