Author: sserapion Date: Fri Jul 25 06:33:42 2008 New Revision: 34771
URL: http://svn.reactos.org/svn/reactos?rev=34771&view=rev Log: Fix multiple 64bit warnings
Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c branches/ros-amd64-bringup/reactos/base/applications/control/control.c branches/ros-amd64-bringup/reactos/base/applications/control/control.h branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solgame.cpp branches/ros-amd64-bringup/reactos/base/applications/games/winemine/dialog.h branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -1303,7 +1303,7 @@ 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
Modified: branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -79,5 +79,5 @@ DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_ABOUTBOX), hWndParent, - AboutDialogProc); + (DLGPROC)AboutDialogProc); }
Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/control/control.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/control/control.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -23,7 +23,7 @@ _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
Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- 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] Fri Jul 25 06:33:42 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)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)
Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -338,7 +338,7 @@ 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;
Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -119,11 +119,11 @@ 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 */
Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -209,7 +209,7 @@ 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;
Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -326,7 +326,7 @@ 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); } } }
Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -298,7 +298,7 @@ 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
Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -366,7 +366,7 @@ // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams); + SetWindowLong(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
return 1;
Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -117,8 +117,8 @@ }
//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;
Modified: branches/ros-amd64-bringup/reactos/base/applications/games/winemine/dialog.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -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 );
Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Fri Jul 25 06:33:42 2008 @@ -173,7 +173,7 @@ break;
case WM_NOTIFY: - idctrl = (int)wParam; + idctrl = wParam; pnmh = (LPNMHDR)lParam; if ((pnmh->hwndFrom == hTabWnd) && (pnmh->idFrom == IDC_TAB) &&
Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- 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] Fri Jul 25 06:33:42 2008 @@ -183,12 +183,12 @@ 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: