Fix multiple 64bit warnings

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

diff --git a/reactos/base/applications/calc/winmain.c b/reactos/base/applications/calc/winmain.c
index 86ffe56..9c83b34 100644 (file)
--- a/reactos/base/applications/calc/winmain.c
+++ b/reactos/base/applications/calc/winmain.c
@@ -1303,7 +1303,7 @@ static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS));
         switch (LOWORD(wp)) {
         case IDM_HELP_ABOUT:
-            DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd, AboutDlgProc);
+            DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd,(DLGPROC) AboutDlgProc);
             return TRUE;
         case IDM_HELP_HELP:
 #ifndef DISABLE_HTMLHELP_SUPPORT

diff --git a/reactos/base/applications/charmap/about.c b/reactos/base/applications/charmap/about.c
index 464591e..91b2ebb 100644 (file)
--- a/reactos/base/applications/charmap/about.c
+++ b/reactos/base/applications/charmap/about.c
@@ -79,5 +79,5 @@ ShowAboutDlg(HWND hWndParent)
     DialogBoxW(hInstance,\r
                MAKEINTRESOURCEW(IDD_ABOUTBOX),\r
                hWndParent,\r
-               AboutDialogProc);\r
+               (DLGPROC)AboutDialogProc);\r
 }\r

diff --git a/reactos/base/applications/control/control.c b/reactos/base/applications/control/control.c
index 660c40a..866146e 100644 (file)
--- a/reactos/base/applications/control/control.c
+++ b/reactos/base/applications/control/control.c
@@ -23,7 +23,7 @@ OpenShellFolder(LPTSTR lpFolderCLSID)
     _tcscpy(szParameters, _T("/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"));
     _tcscat(szParameters, lpFolderCLSID);
 
-    return (int)ShellExecute(NULL, _T("open"), _T("explorer.exe"), szParameters, NULL, SW_SHOWDEFAULT) > 32;
+    return (INT)(INT_PTR)ShellExecute(NULL, _T("open"), _T("explorer.exe"), szParameters, NULL, SW_SHOWDEFAULT) > 32;
 }
 
 static INT

diff --git a/reactos/base/applications/control/control.h b/reactos/base/applications/control/control.h
index 4fbc9bc..c9fd9bd 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)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)
+#define RUNDLL(param)   ((int)(INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)

diff --git a/reactos/base/applications/dxdiag/display.c b/reactos/base/applications/dxdiag/display.c
index 6542034..8b4c02b 100644 (file)
--- a/reactos/base/applications/dxdiag/display.c
+++ b/reactos/base/applications/dxdiag/display.c
@@ -338,7 +338,7 @@ void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext)
             break;
 
         pContext->hDisplayWnd = hDlgs;
-        hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext);
+        hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, (DLGPROC)DisplayPageWndProc, (LPARAM)pContext);
         if (!hwndDlg)
            break;
 

diff --git a/reactos/base/applications/dxdiag/dxdiag.c b/reactos/base/applications/dxdiag/dxdiag.c
index 0e6330d..7876509 100644 (file)
--- a/reactos/base/applications/dxdiag/dxdiag.c
+++ b/reactos/base/applications/dxdiag/dxdiag.c
@@ -119,11 +119,11 @@ InitializeTabCtrl(HWND hwndDlg, PDXDIAG_CONTEXT pContext)
     pContext->hTabCtrl = hTabCtrlWnd;
 
     /* create the dialogs */
-    pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, SystemPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, MusicPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, InputPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, NetworkPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, HelpPageWndProc, (LPARAM)pContext);
+    pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, (DLGPROC)SystemPageWndProc, (LPARAM)pContext);
+    pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, (DLGPROC)MusicPageWndProc, (LPARAM)pContext);
+    pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, (DLGPROC)InputPageWndProc, (LPARAM)pContext);
+    pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, (DLGPROC)NetworkPageWndProc, (LPARAM)pContext);
+    pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, (DLGPROC)HelpPageWndProc, (LPARAM)pContext);
 
     /* insert tab ctrl items */
 

diff --git a/reactos/base/applications/dxdiag/sound.c b/reactos/base/applications/dxdiag/sound.c
index 47c66f4..0b8c2a6 100644 (file)
--- a/reactos/base/applications/dxdiag/sound.c
+++ b/reactos/base/applications/dxdiag/sound.c
@@ -209,7 +209,7 @@ BOOL CALLBACK DSEnumCallback(LPGUID lpGuid, LPCWSTR lpcstrDescription, LPCWSTR l
         return FALSE;
 
     pContext->hSoundWnd = hDlgs;
-    hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext);
+    hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, (DLGPROC)SoundPageWndProc, (LPARAM)pContext);
     if (!hwndDlg)
         return FALSE;
 

diff --git a/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp b/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp
index 66e7e77..1722624 100644 (file)
--- a/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp
+++ b/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp
@@ -326,7 +326,7 @@ int CardButton::OnLButtonUp(HWND hwnd, int x, int y)
             else
             {
                 HWND hwnd = (HWND)parentWnd;
-                SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd);
+                SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG_PTR)hwnd);
             }
         }
     }

diff --git a/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp b/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp
index 4c95613..84b7483 100644 (file)
--- a/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp
+++ b/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp
@@ -298,7 +298,7 @@ void CardRegion::Render(HDC hdc)
             else
                 fDrawTips = TRUE;
 
-            if(yoffset != 0 && abs(xoffset) == 1 ||    xoffset != 0 && abs(yoffset) == 1)
+            if((yoffset != 0 && abs(xoffset) == 1) || (xoffset != 0 && abs(yoffset) == 1))
                 fDrawTips = TRUE;
 
             //draw horizontal strips

diff --git a/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp b/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
index 400985e..3b01a0b 100644 (file)
--- a/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
+++ b/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
@@ -366,7 +366,7 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
         //
         // associate this class with the window
         //
-        SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams);
+        SetWindowLong(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
 
         return 1;
 

diff --git a/reactos/base/applications/games/solitaire/solgame.cpp b/reactos/base/applications/games/solitaire/solgame.cpp
index 6b61783..5eed2aa 100644 (file)
--- a/reactos/base/applications/games/solitaire/solgame.cpp
+++ b/reactos/base/applications/games/solitaire/solgame.cpp
@@ -117,8 +117,8 @@ bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj,  const CardStack &dragca
         }
 
         //can only drop if card is different colour
-        if( mystack[0].IsBlack() && !dragcard.IsRed() ||
-           !mystack[0].IsBlack() &&  dragcard.IsRed() )
+        if( (mystack[0].IsBlack() && !dragcard.IsRed()) ||
+           (!mystack[0].IsBlack() &&  dragcard.IsRed()) )
         {
             TRACE("EXIT RowStackDropProc(false)\n");
             return false;

diff --git a/reactos/base/applications/games/winemine/dialog.h b/reactos/base/applications/games/winemine/dialog.h
index 9f5471f..0de5ae2 100644 (file)
--- a/reactos/base/applications/games/winemine/dialog.h
+++ b/reactos/base/applications/games/winemine/dialog.h
@@ -19,7 +19,7 @@
  */
 
 
-BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
+INT_PTR CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
+INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
+INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
+INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );

diff --git a/reactos/base/applications/msconfig/msconfig.c b/reactos/base/applications/msconfig/msconfig.c
index 3e4ce7c..117bf74 100644 (file)
--- a/reactos/base/applications/msconfig/msconfig.c
+++ b/reactos/base/applications/msconfig/msconfig.c
@@ -173,7 +173,7 @@ MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
             break;
 
         case WM_NOTIFY:
-            idctrl = (int)wParam;
+            idctrl = wParam;
             pnmh = (LPNMHDR)lParam;
             if ((pnmh->hwndFrom == hTabWnd) &&
                 (pnmh->idFrom == IDC_TAB) &&

diff --git a/reactos/base/applications/msconfig/startuppage.c b/reactos/base/applications/msconfig/startuppage.c
index b30219f..30ac5ca 100644 (file)
--- a/reactos/base/applications/msconfig/startuppage.c
+++ b/reactos/base/applications/msconfig/startuppage.c
@@ -183,12 +183,12 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
                         SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
                     }
 
-                    switch (PtrToLong(hRootKey))
+                    switch (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff)
                     {
-                    case PtrToLong(HKEY_LOCAL_MACHINE):
+                    case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff):
                         _tcscpy(Path, _T("HKLM\\\0"));
                         break;
-                    case PtrToLong(HKEY_CURRENT_USER):
+                    case (((LONG_PTR)HKEY_CURRENT_USER) & 0xff):
                         _tcscpy(Path, _T("HKCU\\\0"));
                         break;
                     default: