diff --git a/reactos/base/applications/calc/winmain.c b/reactos/base/applications/calc/winmain.c index 14b00ac0333..61ba0bac49c 100644 --- a/reactos/base/applications/calc/winmain.c +++ b/reactos/base/applications/calc/winmain.c @@ -804,7 +804,7 @@ static char *ReadConversion(const char *formula) return str; } -static LRESULT CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { TCHAR buffer[SIZEOF(calc.buffer)]; DWORD n; @@ -1179,7 +1179,7 @@ static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) return 1L; } -static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; RECT rc; diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c index f5b6cf458dd..6dd988d8280 100644 --- a/reactos/base/applications/charmap/charmap.c +++ b/reactos/base/applications/charmap/charmap.c @@ -188,7 +188,7 @@ AddCharToSelection(HWND hText, static -BOOL +INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, @@ -359,7 +359,7 @@ wWinMain(HINSTANCE hInst, Ret = DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CHARMAP), NULL, - (DLGPROC)DlgProc) >= 0; + DlgProc) >= 0; UnregisterMapClasses(hInstance); } diff --git a/reactos/base/applications/control/control.c b/reactos/base/applications/control/control.c index 4c5dae55731..f98eb13f209 100644 --- a/reactos/base/applications/control/control.c +++ b/reactos/base/applications/control/control.c @@ -24,12 +24,12 @@ 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_PTR)ShellExecute(NULL, + _T("open"), + _T("explorer.exe"), + szParameters, + NULL, + SW_SHOWDEFAULT) > 32; } static diff --git a/reactos/base/applications/control/control.h b/reactos/base/applications/control/control.h index 4fbc9bc3302..c6ed9c5724b 100644 --- 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_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) diff --git a/reactos/base/applications/dxdiag/dxdiag.c b/reactos/base/applications/dxdiag/dxdiag.c index 0e6330d3b0d..3985fae208d 100644 --- a/reactos/base/applications/dxdiag/dxdiag.c +++ b/reactos/base/applications/dxdiag/dxdiag.c @@ -238,7 +238,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, hInst = hInstance; - DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, (DLGPROC) DxDiagWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); return 0; } diff --git a/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp b/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp index 66e7e77a18d..1722624f59c 100644 --- 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 4c95613b338..84b748332be 100644 --- 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/cardrgnmouse.cpp b/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp index 52c269f2363..c8cdf4a3aff 100644 --- a/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp +++ b/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp @@ -626,7 +626,7 @@ void CardRegion::ZoomCard(HDC hdc, int xpos, int ypos, CardRegion *pDestStack) MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; diff --git a/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp b/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp index 400985e1215..3b01a0b650a 100644 --- 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 d3b9774b5db..fc9d655bb8f 100644 --- a/reactos/base/applications/games/solitaire/solgame.cpp +++ b/reactos/base/applications/games/solitaire/solgame.cpp @@ -118,8 +118,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/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp index d8a0c993430..3c3ecf22feb 100644 --- a/reactos/base/applications/games/solitaire/solitaire.cpp +++ b/reactos/base/applications/games/solitaire/solitaire.cpp @@ -200,7 +200,7 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm } -BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -358,7 +358,7 @@ CardImageWndProc(HWND hwnd, } -BOOL CALLBACK CardBackDlgProc(HWND hDlg, +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) diff --git a/reactos/base/applications/games/winemine/dialog.h b/reactos/base/applications/games/winemine/dialog.h index 9f5471f8a16..0de5ae2b82f 100644 --- 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 ce9856c47f5..49f2e31229e 100644 --- a/reactos/base/applications/msconfig/msconfig.c +++ b/reactos/base/applications/msconfig/msconfig.c @@ -23,12 +23,12 @@ BOOL OnCreate(HWND hWnd) TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); @@ -202,7 +202,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) && @@ -251,7 +251,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc); + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); return 0; } diff --git a/reactos/base/applications/mscutils/devmgmt/about.c b/reactos/base/applications/mscutils/devmgmt/about.c index ed20b2157cb..b68c96f6205 100644 --- a/reactos/base/applications/mscutils/devmgmt/about.c +++ b/reactos/base/applications/mscutils/devmgmt/about.c @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; diff --git a/reactos/base/applications/mscutils/devmgmt/mainwnd.c b/reactos/base/applications/mscutils/devmgmt/mainwnd.c index 1d9b45df031..68ad01afb86 100644 --- a/reactos/base/applications/mscutils/devmgmt/mainwnd.c +++ b/reactos/base/applications/mscutils/devmgmt/mainwnd.c @@ -464,7 +464,7 @@ MainWndCommand(PMAIN_WND_INFO Info, DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hTreeView); } diff --git a/reactos/base/applications/mscutils/devmgmt/precomp.h b/reactos/base/applications/mscutils/devmgmt/precomp.h index 81a59b89762..d9bdd425f85 100644 --- a/reactos/base/applications/mscutils/devmgmt/precomp.h +++ b/reactos/base/applications/mscutils/devmgmt/precomp.h @@ -34,7 +34,7 @@ typedef struct _MAIN_WND_INFO } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* devmgmt.c */ diff --git a/reactos/base/applications/mscutils/servman/about.c b/reactos/base/applications/mscutils/servman/about.c index 18a2abfcc5a..c45e456fd1b 100644 --- a/reactos/base/applications/mscutils/servman/about.c +++ b/reactos/base/applications/mscutils/servman/about.c @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) diff --git a/reactos/base/applications/mscutils/servman/create.c b/reactos/base/applications/mscutils/servman/create.c index 4bc304672e3..16c50141d9e 100644 --- a/reactos/base/applications/mscutils/servman/create.c +++ b/reactos/base/applications/mscutils/servman/create.c @@ -164,7 +164,7 @@ FreeMemory(PCREATE_DATA Data) } -BOOL CALLBACK +INT_PTR CALLBACK CreateHelpDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -221,7 +221,7 @@ CreateHelpDialogProc(HWND hDlg, } -BOOL CALLBACK +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -302,7 +302,7 @@ CreateDialogProc(HWND hDlg, hHelp = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS), hDlg, - (DLGPROC)CreateHelpDialogProc); + CreateHelpDialogProc); if(hHelp != NULL) { bHelpOpen = TRUE; diff --git a/reactos/base/applications/mscutils/servman/delete.c b/reactos/base/applications/mscutils/servman/delete.c index 9faa36714cf..8f6e27c9877 100644 --- a/reactos/base/applications/mscutils/servman/delete.c +++ b/reactos/base/applications/mscutils/servman/delete.c @@ -56,7 +56,7 @@ DoDeleteService(PMAIN_WND_INFO Info, } -BOOL CALLBACK +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, diff --git a/reactos/base/applications/mscutils/servman/mainwnd.c b/reactos/base/applications/mscutils/servman/mainwnd.c index be918d7de0e..77d0bfa0739 100644 --- a/reactos/base/applications/mscutils/servman/mainwnd.c +++ b/reactos/base/applications/mscutils/servman/mainwnd.c @@ -432,7 +432,7 @@ MainWndCommand(PMAIN_WND_INFO Info, ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_CREATE), Info->hMainWnd, - (DLGPROC)CreateDialogProc, + CreateDialogProc, (LPARAM)Info); if (ret == IDOK) RefreshServiceList(Info); @@ -448,7 +448,7 @@ MainWndCommand(PMAIN_WND_INFO Info, DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_DELETE), Info->hMainWnd, - (DLGPROC)DeleteDialogProc, + DeleteDialogProc, (LPARAM)Info); } else @@ -569,7 +569,7 @@ MainWndCommand(PMAIN_WND_INFO Info, DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hListView); break; diff --git a/reactos/base/applications/mscutils/servman/precomp.h b/reactos/base/applications/mscutils/servman/precomp.h index b6fd9835aa4..796bb321167 100644 --- a/reactos/base/applications/mscutils/servman/precomp.h +++ b/reactos/base/applications/mscutils/servman/precomp.h @@ -43,10 +43,10 @@ typedef struct _MAIN_WND_INFO } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* servman.c */ diff --git a/reactos/base/applications/mscutils/servman/progress.c b/reactos/base/applications/mscutils/servman/progress.c index 6ecd86c9898..e6c01feefc2 100644 --- a/reactos/base/applications/mscutils/servman/progress.c +++ b/reactos/base/applications/mscutils/servman/progress.c @@ -56,7 +56,7 @@ IncrementProgressBar(HWND hProgDlg) } } -BOOL CALLBACK +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -113,7 +113,7 @@ CreateProgressDialog(HWND hParent, hProgDlg = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_PROGRESS), hParent, - (DLGPROC)ProgressDialogProc); + ProgressDialogProc); if (hProgDlg != NULL) { /* write the info to the progress dialog */ diff --git a/reactos/base/applications/mstsc/connectdialog.c b/reactos/base/applications/mstsc/connectdialog.c index 77bdf5c99ea..659d5bcd9e2 100644 --- a/reactos/base/applications/mstsc/connectdialog.c +++ b/reactos/base/applications/mstsc/connectdialog.c @@ -989,7 +989,7 @@ OnMainCreate(HWND hwnd, if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_GENERAL), pInfo->hTab, - (DLGPROC)GeneralDlgProc, + GeneralDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1004,7 +1004,7 @@ OnMainCreate(HWND hwnd, if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY), pInfo->hTab, - (DLGPROC)DisplayDlgProc, + DisplayDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1049,7 +1049,7 @@ static void Cleanup(PINFO pInfo) } } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -1246,6 +1246,6 @@ OpenRDPConnectDialog(HINSTANCE hInstance, return (DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_CONNECTDIALOG), NULL, - (DLGPROC)DlgProc, + DlgProc, (LPARAM)pRdpSettings) == IDOK); } diff --git a/reactos/base/applications/network/ftp/cmds.c b/reactos/base/applications/network/ftp/cmds.c index 5ba350ad2bd..977b847621f 100644 --- a/reactos/base/applications/network/ftp/cmds.c +++ b/reactos/base/applications/network/ftp/cmds.c @@ -416,7 +416,7 @@ void mput(argc, argv) if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -573,7 +573,7 @@ usage: if (!*tp) { tp = argv[2]; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -715,7 +715,7 @@ void mget(argc, argv) if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -1686,7 +1686,7 @@ void disconnect() if (!connected) return; (void) command("QUIT"); - cout = (int) NULL; + cout = 0; connected = 0; data = -1; if (!proxy) { diff --git a/reactos/base/applications/network/ftp/ftp.c b/reactos/base/applications/network/ftp/ftp.c index ea9610c883f..a40162373e8 100644 --- a/reactos/base/applications/network/ftp/ftp.c +++ b/reactos/base/applications/network/ftp/ftp.c @@ -295,7 +295,7 @@ int command(const char *fmt, ...) printf("\n"); (void) fflush(stdout); } - if (cout == (int) NULL) { + if (cout == 0) { perror ("No control connection for command"); code = -1; return (0); @@ -583,7 +583,7 @@ null();// (void) signal(SIGPIPE, oldintp); return; } dout = dataconn(mode); - if (dout == (int)NULL) + if (!dout) goto abort; (void) gettimeofday(&start, (struct timezone *)0); null();// oldintp = signal(SIGPIPE, SIG_IGN); @@ -887,7 +887,7 @@ null();// (void) signal(SIGINT, oldintr); } } din = dataconn("r"); - if (din == (int)NULL) + if (!din) goto abort; if (strcmp(local, "-") == 0) fout = stdout; @@ -1271,7 +1271,7 @@ int dataconn(const char *mode) if (s < 0) { perror("ftp: accept"); (void) closesocket(data), data = -1; - return (int) (NULL); + return 0; } if(closesocket(data)) { int iret=WSAGetLastError (); diff --git a/reactos/base/applications/network/ftp/ftp_var.h b/reactos/base/applications/network/ftp/ftp_var.h index c18d1541cab..d8a4d910e6e 100644 --- a/reactos/base/applications/network/ftp/ftp_var.h +++ b/reactos/base/applications/network/ftp/ftp_var.h @@ -49,11 +49,6 @@ #define STRU_R 2 #define STRU_P 3 -#define SIGQUIT 1 -#define SIGPIPE 2 -#define SIGALRM 3 - - #define FORM_N 1 #define FORM_T 2 #define FORM_C 3 diff --git a/reactos/base/applications/network/ftp/main.c b/reactos/base/applications/network/ftp/main.c index d83a04183ca..aaf42d12e6e 100644 --- a/reactos/base/applications/network/ftp/main.c +++ b/reactos/base/applications/network/ftp/main.c @@ -264,9 +264,9 @@ void lostpeer(void) extern int data; if (connected) { - if (cout != (int) NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } if (data >= 0) { (void) shutdown(data, 1+1); @@ -277,9 +277,9 @@ void lostpeer(void) } pswitch(1); if (connected) { - if (cout != (int)NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } connected = 0; } @@ -538,7 +538,7 @@ void help(argc, argv) char *argv[]; { extern struct cmd cmdtab[]; - register struct cmd *c; + struct cmd *c; if (argc == 1) { register int i, j, w, k; @@ -591,7 +591,7 @@ void help(argc, argv) else if (c == (struct cmd *)0) printf("?Invalid help command %s\n", arg); else - printf("%-*s\t%s\n", HELPINDENT, + printf("%-*s\t%s\n", (int)HELPINDENT, c->c_name, c->c_help); } (void) fflush(stdout); diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c index b4359743706..7dc02ce291c 100644 --- a/reactos/base/applications/notepad/dialog.c +++ b/reactos/base/applications/notepad/dialog.c @@ -926,7 +926,7 @@ VOID DIALOG_HelpHelp(VOID) #ifdef _MSC_VER #pragma warning(disable : 4100) #endif -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; diff --git a/reactos/base/applications/notepad/dialog.h b/reactos/base/applications/notepad/dialog.h index 8808d928824..893e4daf7e2 100644 --- a/reactos/base/applications/notepad/dialog.h +++ b/reactos/base/applications/notepad/dialog.h @@ -55,7 +55,7 @@ VOID DIALOG_HelpAboutWine(VOID); VOID DIALOG_TimeDate(VOID); -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* utility functions */ VOID ShowLastError(void); diff --git a/reactos/base/applications/notepad/main.c b/reactos/base/applications/notepad/main.c index 4b94522ccf3..aa74631eb10 100644 --- a/reactos/base/applications/notepad/main.c +++ b/reactos/base/applications/notepad/main.c @@ -91,7 +91,7 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_ABOUTBOX), Globals.hMainWnd, - (DLGPROC) AboutDialogProc); + AboutDialogProc); break; case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild index 71cde4968bb..8396875e63e 100644 --- a/reactos/base/applications/regedit/regedit.rbuild +++ b/reactos/base/applications/regedit/regedit.rbuild @@ -1,7 +1,7 @@ - + . @@ -10,7 +10,6 @@ user32 gdi32 advapi32 - comdlg32 ole32 shell32 comctl32 diff --git a/reactos/base/applications/taskmgr/perfdata.c b/reactos/base/applications/taskmgr/perfdata.c index 3f871e2fa05..5978639371a 100644 --- a/reactos/base/applications/taskmgr/perfdata.c +++ b/reactos/base/applications/taskmgr/perfdata.c @@ -88,7 +88,7 @@ static void SidToUserName(PSID Sid, LPWSTR szBuffer, DWORD BufferSize) void PerfDataRefresh(void) { - SIZE_T ulSize; + ULONG ulSize; NTSTATUS status; LPBYTE pBuffer; ULONG BufferSize; @@ -393,7 +393,7 @@ int PerfGetIndexByProcessId(DWORD dwProcessId) for (Index = 0; Index < ProcessCount; Index++) { - if ((DWORD)pPerfData[Index].ProcessId == dwProcessId) + if (PtrToUlong(pPerfData[Index].ProcessId) == dwProcessId) { FoundIndex = Index; break; @@ -412,7 +412,7 @@ ULONG PerfDataGetProcessId(ULONG Index) EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) - ProcessId = (ULONG)pPerfData[Index].ProcessId; + ProcessId = PtrToUlong(pPerfData[Index].ProcessId); else ProcessId = 0; diff --git a/reactos/base/applications/winhlp32/lex.yy.c b/reactos/base/applications/winhlp32/lex.yy.c index c91bc9e2b9d..c644d1be831 100644 --- a/reactos/base/applications/winhlp32/lex.yy.c +++ b/reactos/base/applications/winhlp32/lex.yy.c @@ -1670,7 +1670,7 @@ static LRESULT CALLBACK MACRO_TestDialogProc(HWND hDlg, UINT msg, WPARAM wParam, void macro_test(void) { WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance); - DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, (DLGPROC)lpfnDlg); + DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, lpfnDlg); FreeProcInstance(lpfnDlg); macro = szTestMacro; } diff --git a/reactos/base/applications/winhlp32/macro.c b/reactos/base/applications/winhlp32/macro.c index 19bf19619ff..1c970c7fead 100644 --- a/reactos/base/applications/winhlp32/macro.c +++ b/reactos/base/applications/winhlp32/macro.c @@ -848,7 +848,7 @@ void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR args) dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD_PTR)Callbacks, 0); } else WINE_WARN("OOM\n"); } diff --git a/reactos/base/setup/usetup/cabinet.c b/reactos/base/setup/usetup/cabinet.c index db6dfa63327..c44521a541a 100644 --- a/reactos/base/setup/usetup/cabinet.c +++ b/reactos/base/setup/usetup/cabinet.c @@ -148,7 +148,7 @@ MSZipCodecUncompress(PVOID OutputBuffer, return CS_BADSTREAM; } - ZStream.next_in = (PUCHAR)((ULONG)InputBuffer + 2); + ZStream.next_in = ((PUCHAR)InputBuffer )+ 2; ZStream.avail_in = *InputLength - 2; ZStream.next_out = (PUCHAR)OutputBuffer; ZStream.avail_out = abs(*OutputLength); diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index 2920793bf18..79fff3e524c 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -699,7 +699,7 @@ SetupStartPage(PINPUT_RECORD Ir) INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - SIZE_T ReturnSize; + ULONG ReturnSize; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c index 18289a518fc..5335f9bbdc8 100644 --- a/reactos/base/setup/usetup/partlist.c +++ b/reactos/base/setup/usetup/partlist.c @@ -903,7 +903,7 @@ CreatePartitionList (SHORT Left, OBJECT_ATTRIBUTES ObjectAttributes; SYSTEM_DEVICE_INFORMATION Sdi; IO_STATUS_BLOCK Iosb; - SIZE_T ReturnSize; + ULONG ReturnSize; NTSTATUS Status; ULONG DiskNumber; WCHAR Buffer[MAX_PATH]; diff --git a/reactos/base/setup/vmwinst/vmwinst.c b/reactos/base/setup/vmwinst/vmwinst.c index e81764d905f..987a28db0d8 100644 --- a/reactos/base/setup/vmwinst/vmwinst.c +++ b/reactos/base/setup/vmwinst/vmwinst.c @@ -504,7 +504,7 @@ done: } cleanup: - hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0); + hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0); if(hThread != NULL) { CloseHandle(hThread); diff --git a/reactos/base/setup/welcome/welcome.c b/reactos/base/setup/welcome/welcome.c index 87d11d7090e..2c93c43c5ba 100755 --- a/reactos/base/setup/welcome/welcome.c +++ b/reactos/base/setup/welcome/welcome.c @@ -179,7 +179,7 @@ _tWinMain(HINSTANCE hInst, rcRightPanel.left = rcLeftPanel.right; rcRightPanel.right = ulInnerWidth - 1; - if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) + if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); /* Create main window */ @@ -386,7 +386,7 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam) rcLeftPanel.right - rcLeftPanel.left, dwHeight, hWnd, - (HMENU)i, + (HMENU)IntToPtr(i), hInstance, NULL); hwndDefaultTopic = hwndTopicButton[i]; diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index 1dbd4c996ef..116066c25ff 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -307,10 +307,10 @@ static BOOL RunFile(LPTSTR filename) ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %d\n", (DWORD)ret); + TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret); FreeLibrary(hShell32); - return (((DWORD)ret) > 32); + return (((DWORD_PTR)ret) > 32); } diff --git a/reactos/base/system/services/database.c b/reactos/base/system/services/database.c index 3fd38d94ae6..50ef276eb5f 100644 --- a/reactos/base/system/services/database.c +++ b/reactos/base/system/services/database.c @@ -117,13 +117,13 @@ ScmGetServiceEntryByResumeCount(DWORD dwResumeCount) PSERVICE -ScmGetServiceEntryByClientHandle(ULONG Handle) +ScmGetServiceEntryByClientHandle(HANDLE Handle) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; DPRINT("ScmGetServiceEntryByClientHandle() called\n"); - DPRINT("looking for %lu\n", Handle); + DPRINT("looking for %p\n", Handle); ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c index f72f866afbf..38d7e23718d 100644 --- a/reactos/base/system/services/rpcserver.c +++ b/reactos/base/system/services/rpcserver.c @@ -1018,7 +1018,7 @@ DWORD RSetServiceStatus( return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle(hServiceStatus); + lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h index 9bfb452195f..bfd0544bfef 100644 --- a/reactos/base/system/services/services.h +++ b/reactos/base/system/services/services.h @@ -107,7 +107,7 @@ DWORD ScmStartService(PSERVICE Service, PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); -PSERVICE ScmGetServiceEntryByClientHandle(ULONG ThreadId); +PSERVICE ScmGetServiceEntryByClientHandle(HANDLE Handle); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); VOID ScmDeleteServiceRecord(PSERVICE lpService); diff --git a/reactos/base/system/smss/client.c b/reactos/base/system/smss/client.c index 97725f3ee6f..4ad46e99d5f 100644 --- a/reactos/base/system/smss/client.c +++ b/reactos/base/system/smss/client.c @@ -435,7 +435,7 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName) SmpClientDirectory.CandidateClient->ServerProcess = (HANDLE) ProcessInfo->ProcessHandle; SmpClientDirectory.CandidateClient->ServerProcessId = - (ULONG) ProcessInfo->ClientId.UniqueProcess; + (DWORD_PTR) ProcessInfo->ClientId.UniqueProcess; /* * Copy the program name */ diff --git a/reactos/base/system/smss/initss.c b/reactos/base/system/smss/initss.c index 75f6f38887f..387ed0d85af 100644 --- a/reactos/base/system/smss/initss.c +++ b/reactos/base/system/smss/initss.c @@ -41,8 +41,8 @@ NTSTATUS NTAPI SmRegisterInternalSubsystem (LPWSTR PgmName, RtlZeroMemory (& ProcessInfo, sizeof ProcessInfo); ProcessInfo.Size = sizeof ProcessInfo; - ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; - ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; + ProcessInfo.ProcessHandle = (HANDLE) UlongToPtr(SmSsProcessId); + ProcessInfo.ClientId.UniqueProcess = (HANDLE) UlongToPtr(SmSsProcessId); DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n", __FUNCTION__,ProcessInfo.ProcessHandle); Status = SmCreateClient (& ProcessInfo, PgmName); diff --git a/reactos/base/system/smss/smapicomp.c b/reactos/base/system/smss/smapicomp.c index ee3fbf7afdf..7f5476e8708 100644 --- a/reactos/base/system/smss/smapicomp.c +++ b/reactos/base/system/smss/smapicomp.c @@ -24,7 +24,7 @@ SMAPI(SmCompSes) DPRINT("SM: %s: ClientId.UniqueProcess=%p\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess); - Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); + Status = SmCompleteClientInitialization (PtrToUlong(Request->Header.ClientId.UniqueProcess)); if (!NT_SUCCESS(Status)) { DPRINT1("SM: %s: SmCompleteClientInitialization failed (Status=0x%08lx)\n", diff --git a/reactos/base/system/winlogon/sas.c b/reactos/base/system/winlogon/sas.c index 750b01fef94..898aa311079 100644 --- a/reactos/base/system/winlogon/sas.c +++ b/reactos/base/system/winlogon/sas.c @@ -505,7 +505,7 @@ HandleLogoff( return STATUS_SUCCESS; } -static BOOL CALLBACK +static INT_PTR CALLBACK ShutdownComputerWindowProc( IN HWND hwndDlg, IN UINT uMsg, diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c index bc70d65eeb6..7c9a79e7c26 100644 --- a/reactos/base/system/winlogon/winlogon.c +++ b/reactos/base/system/winlogon/winlogon.c @@ -185,7 +185,7 @@ RemoveStatusMessage( return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } -static BOOL CALLBACK +static INT_PTR CALLBACK GinaLoadFailedWindowProc( IN HWND hwndDlg, IN UINT uMsg, diff --git a/reactos/base/system/winlogon/wlx.c b/reactos/base/system/winlogon/wlx.c index 86065decc8f..fa32b5a5e20 100644 --- a/reactos/base/system/winlogon/wlx.c +++ b/reactos/base/system/winlogon/wlx.c @@ -23,7 +23,7 @@ static UINT_PTR IdTimer; /* FUNCTIONS ****************************************************************/ -static BOOL CALLBACK +static INT_PTR CALLBACK DefaultWlxWindowProc( IN HWND hwndDlg, IN UINT uMsg, diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c index 4884f6c9b7f..181b7ec7acc 100644 --- a/reactos/dll/win32/advapi32/reg/reg.c +++ b/reactos/dll/win32/advapi32/reg/reg.c @@ -403,7 +403,7 @@ RegCloseKey(HKEY hKey) NTSTATUS Status; /* don't close null handle or a pseudo handle */ - if ((!hKey) || (((ULONG)hKey & 0xF0000000) == 0x80000000)) + if ((!hKey) || (((ULONG_PTR)hKey & 0xF0000000) == 0x80000000)) { return ERROR_INVALID_HANDLE; } @@ -1031,7 +1031,7 @@ RegCreateKeyExA(HKEY hKey, return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); if (lpClass != NULL) { @@ -1105,7 +1105,7 @@ RegCreateKeyExW(HKEY hKey, return RtlNtStatusToDosError(Status); } - TRACE("ParentKey %x\n", (ULONG)ParentKey); + TRACE("ParentKey %p\n", ParentKey); RtlInitUnicodeString(&ClassString, lpClass); diff --git a/reactos/include/psdk/wincrypt.h b/reactos/include/psdk/wincrypt.h index 7ca1b51c373..2816dc2b841 100644 --- a/reactos/include/psdk/wincrypt.h +++ b/reactos/include/psdk/wincrypt.h @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h index 3a9430f38bb..514ed278f92 100644 --- a/reactos/include/psdk/winuser.h +++ b/reactos/include/psdk/winuser.h @@ -2703,7 +2703,7 @@ extern "C" { #define STATE_SYSTEM_VALID 0x1fffffff #ifndef RC_INVOKED -typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); +typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int); typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); diff --git a/reactos/include/reactos/services/services.h b/reactos/include/reactos/services/services.h index e32d8bcae8c..21a6085bf6c 100644 --- a/reactos/include/reactos/services/services.h +++ b/reactos/include/reactos/services/services.h @@ -11,7 +11,7 @@ #define SERVICE_CONTROL_START 0 -typedef DWORD CLIENT_HANDLE; +DECLARE_HANDLE(CLIENT_HANDLE); typedef struct _SCM_CONTROL_PACKET {