[tkreuzer] 37910: Merge 34758, 34771, 34786, 34787, 34906, 35826, 36174, 36274, 36444, 36445, 36446, 36447, 36448, 36477, 36511, 36898, 36903 from amd64 branch
7 Dec
2008
7 Dec
'08
12:11 p.m.
Author: tkreuzer
Date: Sun Dec 7 06:11:46 2008
New Revision: 37910
URL: http://svn.reactos.org/svn/reactos?rev=37910&view=rev
Log:
Merge 34758, 34771, 34786, 34787, 34906, 35826, 36174, 36274, 36444, 36445, 36446, 36447,
36448, 36477, 36511, 36898, 36903 from amd64 branch
Modified:
trunk/reactos/base/applications/calc/winmain.c
trunk/reactos/base/applications/charmap/charmap.c
trunk/reactos/base/applications/control/control.c
trunk/reactos/base/applications/control/control.h
trunk/reactos/base/applications/dxdiag/dxdiag.c
trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp
trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp
trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
trunk/reactos/base/applications/games/solitaire/solgame.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.cpp
trunk/reactos/base/applications/games/winemine/dialog.h
trunk/reactos/base/applications/msconfig/msconfig.c
trunk/reactos/base/applications/mscutils/devmgmt/about.c
trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c
trunk/reactos/base/applications/mscutils/devmgmt/precomp.h
trunk/reactos/base/applications/mscutils/servman/about.c
trunk/reactos/base/applications/mscutils/servman/create.c
trunk/reactos/base/applications/mscutils/servman/delete.c
trunk/reactos/base/applications/mscutils/servman/mainwnd.c
trunk/reactos/base/applications/mscutils/servman/precomp.h
trunk/reactos/base/applications/mscutils/servman/progress.c
trunk/reactos/base/applications/mstsc/connectdialog.c
trunk/reactos/base/applications/network/ftp/cmds.c
trunk/reactos/base/applications/network/ftp/ftp.c
trunk/reactos/base/applications/network/ftp/ftp_var.h
trunk/reactos/base/applications/network/ftp/main.c
trunk/reactos/base/applications/notepad/dialog.c
trunk/reactos/base/applications/notepad/dialog.h
trunk/reactos/base/applications/notepad/main.c
trunk/reactos/base/applications/regedit/regedit.rbuild
trunk/reactos/base/applications/taskmgr/perfdata.c
trunk/reactos/base/applications/winhlp32/lex.yy.c
trunk/reactos/base/applications/winhlp32/macro.c
trunk/reactos/base/setup/usetup/cabinet.c
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/base/setup/usetup/partlist.c
trunk/reactos/base/setup/vmwinst/vmwinst.c
trunk/reactos/base/setup/welcome/welcome.c
trunk/reactos/base/shell/cmd/cmd.c
trunk/reactos/base/system/services/database.c
trunk/reactos/base/system/services/rpcserver.c
trunk/reactos/base/system/services/services.h
trunk/reactos/base/system/smss/client.c
trunk/reactos/base/system/smss/initss.c
trunk/reactos/base/system/smss/smapicomp.c
trunk/reactos/base/system/winlogon/sas.c
trunk/reactos/base/system/winlogon/winlogon.c
trunk/reactos/base/system/winlogon/wlx.c
trunk/reactos/dll/win32/advapi32/reg/reg.c
trunk/reactos/include/psdk/wincrypt.h
trunk/reactos/include/psdk/winuser.h
trunk/reactos/include/reactos/services/services.h
Modified: trunk/reactos/base/applications/calc/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win…
==============================================================================
--- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -804,7 +804,7 @@
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 @@
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;
Modified: trunk/reactos/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -188,7 +188,7 @@
static
-BOOL
+INT_PTR
CALLBACK
DlgProc(HWND hDlg,
UINT Message,
@@ -359,7 +359,7 @@
Ret = DialogBoxW(hInstance,
MAKEINTRESOURCEW(IDD_CHARMAP),
NULL,
- (DLGPROC)DlgProc) >= 0;
+ DlgProc) >= 0;
UnregisterMapClasses(hInstance);
}
Modified: trunk/reactos/base/applications/control/control.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/…
==============================================================================
--- trunk/reactos/base/applications/control/control.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/control/control.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -24,12 +24,12 @@
_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
Modified: trunk/reactos/base/applications/control/control.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/…
==============================================================================
--- trunk/reactos/base/applications/control/control.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/control/control.h [iso-8859-1] Sun Dec 7 06:11:46
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_PTR)ShellExecute(NULL, _T("open"),
_T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)
Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -238,7 +238,7 @@
hInst = hInstance;
- DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, (DLGPROC) DxDiagWndProc);
+ DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc);
return 0;
}
Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp [iso-8859-1]
Sun Dec 7 06:11:46 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: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp [iso-8859-1]
Sun Dec 7 06:11:46 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: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1]
Sun Dec 7 06:11:46 2008
@@ -626,7 +626,7 @@
MoveDragCardTo(hdc, ix, iy);
- if(attarget || ix == idestx && iy == idesty)
+ if(attarget || (ix == idestx && iy == idesty))
break;
oldx = (int)x;
Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1]
Sun Dec 7 06:11:46 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: trunk/reactos/base/applications/games/solitaire/solgame.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -118,8 +118,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: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -200,7 +200,7 @@
}
-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 @@
}
-BOOL CALLBACK CardBackDlgProc(HWND hDlg,
+INT_PTR CALLBACK CardBackDlgProc(HWND hDlg,
UINT uMsg,
WPARAM wParam,
LPARAM lParam)
Modified: trunk/reactos/base/applications/games/winemine/dialog.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/winemine/dialog.h [iso-8859-1] Sun Dec 7
06:11:46 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: trunk/reactos/base/applications/msconfig/msconfig.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -23,12 +23,12 @@
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 @@
break;
case WM_NOTIFY:
- idctrl = (int)wParam;
+ idctrl = wParam;
pnmh = (LPNMHDR)lParam;
if ((pnmh->hwndFrom == hTabWnd) &&
(pnmh->idFrom == IDC_TAB) &&
@@ -251,7 +251,7 @@
hInst = hInstance;
- DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc);
+ DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc);
return 0;
}
Modified: trunk/reactos/base/applications/mscutils/devmgmt/about.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -9,7 +9,7 @@
#include "precomp.h"
-BOOL CALLBACK
+INT_PTR CALLBACK
AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
HWND hLicenseEditWnd;
Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -464,7 +464,7 @@
DialogBox(hInstance,
MAKEINTRESOURCE(IDD_ABOUTBOX),
Info->hMainWnd,
- (DLGPROC)AboutDialogProc);
+ AboutDialogProc);
SetFocus(Info->hTreeView);
}
Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -34,7 +34,7 @@
} 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 */
Modified: trunk/reactos/base/applications/mscutils/servman/about.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -9,7 +9,7 @@
#include "precomp.h"
-BOOL CALLBACK
+INT_PTR CALLBACK
AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message)
Modified: trunk/reactos/base/applications/mscutils/servman/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -164,7 +164,7 @@
}
-BOOL CALLBACK
+INT_PTR CALLBACK
CreateHelpDialogProc(HWND hDlg,
UINT message,
WPARAM wParam,
@@ -221,7 +221,7 @@
}
-BOOL CALLBACK
+INT_PTR CALLBACK
CreateDialogProc(HWND hDlg,
UINT message,
WPARAM wParam,
@@ -302,7 +302,7 @@
hHelp = CreateDialog(hInstance,
MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS),
hDlg,
- (DLGPROC)CreateHelpDialogProc);
+ CreateHelpDialogProc);
if(hHelp != NULL)
{
bHelpOpen = TRUE;
Modified: trunk/reactos/base/applications/mscutils/servman/delete.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -56,7 +56,7 @@
}
-BOOL CALLBACK
+INT_PTR CALLBACK
DeleteDialogProc(HWND hDlg,
UINT message,
WPARAM wParam,
Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -432,7 +432,7 @@
ret = DialogBoxParam(hInstance,
MAKEINTRESOURCE(IDD_DLG_CREATE),
Info->hMainWnd,
- (DLGPROC)CreateDialogProc,
+ CreateDialogProc,
(LPARAM)Info);
if (ret == IDOK)
RefreshServiceList(Info);
@@ -448,7 +448,7 @@
DialogBoxParam(hInstance,
MAKEINTRESOURCE(IDD_DLG_DELETE),
Info->hMainWnd,
- (DLGPROC)DeleteDialogProc,
+ DeleteDialogProc,
(LPARAM)Info);
}
else
@@ -569,7 +569,7 @@
DialogBox(hInstance,
MAKEINTRESOURCE(IDD_ABOUTBOX),
Info->hMainWnd,
- (DLGPROC)AboutDialogProc);
+ AboutDialogProc);
SetFocus(Info->hListView);
break;
Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -43,10 +43,10 @@
} 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 */
Modified: trunk/reactos/base/applications/mscutils/servman/progress.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -56,7 +56,7 @@
}
}
-BOOL CALLBACK
+INT_PTR CALLBACK
ProgressDialogProc(HWND hDlg,
UINT Message,
WPARAM wParam,
@@ -113,7 +113,7 @@
hProgDlg = CreateDialog(hInstance,
MAKEINTRESOURCE(IDD_DLG_PROGRESS),
hParent,
- (DLGPROC)ProgressDialogProc);
+ ProgressDialogProc);
if (hProgDlg != NULL)
{
/* write the info to the progress dialog */
Modified: trunk/reactos/base/applications/mstsc/connectdialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co…
==============================================================================
--- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -989,7 +989,7 @@
if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_GENERAL),
pInfo->hTab,
- (DLGPROC)GeneralDlgProc,
+ GeneralDlgProc,
(LPARAM)pInfo))
{
WCHAR str[256];
@@ -1004,7 +1004,7 @@
if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_DISPLAY),
pInfo->hTab,
- (DLGPROC)DisplayDlgProc,
+ DisplayDlgProc,
(LPARAM)pInfo))
{
WCHAR str[256];
@@ -1049,7 +1049,7 @@
}
}
-static BOOL CALLBACK
+static INT_PTR CALLBACK
DlgProc(HWND hDlg,
UINT Message,
WPARAM wParam,
@@ -1246,6 +1246,6 @@
return (DialogBoxParamW(hInst,
MAKEINTRESOURCEW(IDD_CONNECTDIALOG),
NULL,
- (DLGPROC)DlgProc,
+ DlgProc,
(LPARAM)pRdpSettings) == IDOK);
}
Modified: trunk/reactos/base/applications/network/ftp/cmds.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -416,7 +416,7 @@
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 @@
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 @@
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 @@
if (!connected)
return;
(void) command("QUIT");
- cout = (int) NULL;
+ cout = 0;
connected = 0;
data = -1;
if (!proxy) {
Modified: trunk/reactos/base/applications/network/ftp/ftp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -295,7 +295,7 @@
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 @@
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 @@
}
}
din = dataconn("r");
- if (din == (int)NULL)
+ if (!din)
goto abort;
if (strcmp(local, "-") == 0)
fout = stdout;
@@ -1271,7 +1271,7 @@
if (s < 0) {
perror("ftp: accept");
(void) closesocket(data), data = -1;
- return (int) (NULL);
+ return 0;
}
if(closesocket(data)) {
int iret=WSAGetLastError ();
Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -48,11 +48,6 @@
#define STRU_F 1
#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
Modified: trunk/reactos/base/applications/network/ftp/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -264,9 +264,9 @@
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 @@
}
pswitch(1);
if (connected) {
- if (cout != (int)NULL) {
+ if (cout) {
closesocket(cout);
- cout = (int) NULL;
+ cout = 0;
}
connected = 0;
}
@@ -538,7 +538,7 @@
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 @@
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);
Modified: trunk/reactos/base/applications/notepad/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
==============================================================================
--- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -926,7 +926,7 @@
#ifdef _MSC_VER
#pragma warning(disable : 4100)
#endif
-BOOL CALLBACK
+INT_PTR CALLBACK
AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
HWND hLicenseEditWnd;
Modified: trunk/reactos/base/applications/notepad/dialog.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
==============================================================================
--- trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -55,7 +55,7 @@
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);
Modified: trunk/reactos/base/applications/notepad/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
==============================================================================
--- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -91,7 +91,7 @@
case CMD_ABOUT: DialogBox(GetModuleHandle(NULL),
MAKEINTRESOURCE(IDD_ABOUTBOX),
Globals.hMainWnd,
- (DLGPROC) AboutDialogProc);
+ AboutDialogProc);
break;
case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break;
Modified: trunk/reactos/base/applications/regedit/regedit.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Sun Dec 7
06:11:46 2008
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="regedit" type="win32gui"
installname="regedit.exe">
+<module name="regedit" type="win32gui"
installname="regedit.exe" allowwarnings="true">
<include base="regedit">.</include>
<define name="UNICODE" />
<define name="_UNICODE" />
@@ -10,7 +10,6 @@
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
- <library>comdlg32</library>
<library>ole32</library>
<library>shell32</library>
<library>comctl32</library>
Modified: trunk/reactos/base/applications/taskmgr/perfdata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -88,7 +88,7 @@
void PerfDataRefresh(void)
{
- SIZE_T ulSize;
+ ULONG ulSize;
NTSTATUS status;
LPBYTE pBuffer;
ULONG BufferSize;
@@ -393,7 +393,7 @@
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 @@
EnterCriticalSection(&PerfDataCriticalSection);
if (Index < ProcessCount)
- ProcessId = (ULONG)pPerfData[Index].ProcessId;
+ ProcessId = PtrToUlong(pPerfData[Index].ProcessId);
else
ProcessId = 0;
Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -1670,7 +1670,7 @@
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;
}
Modified: trunk/reactos/base/applications/winhlp32/macro.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -848,7 +848,7 @@
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");
}
Modified: trunk/reactos/base/setup/usetup/cabinet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.…
==============================================================================
--- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -148,7 +148,7 @@
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);
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -699,7 +699,7 @@
INFCONTEXT Context;
PWCHAR Value;
UINT ErrorLine;
- SIZE_T ReturnSize;
+ ULONG ReturnSize;
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -903,7 +903,7 @@
OBJECT_ATTRIBUTES ObjectAttributes;
SYSTEM_DEVICE_INFORMATION Sdi;
IO_STATUS_BLOCK Iosb;
- SIZE_T ReturnSize;
+ ULONG ReturnSize;
NTSTATUS Status;
ULONG DiskNumber;
WCHAR Buffer[MAX_PATH];
Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst…
==============================================================================
--- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -504,7 +504,7 @@
}
cleanup:
- hThread = (HANDLE)InterlockedExchange((LONG*)&hInstallationThread, 0);
+ hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0);
if(hThread != NULL)
{
CloseHandle(hThread);
Modified: trunk/reactos/base/setup/welcome/welcome.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome…
==============================================================================
--- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -179,7 +179,7 @@
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 @@
rcLeftPanel.right - rcLeftPanel.left,
dwHeight,
hWnd,
- (HMENU)i,
+ (HMENU)IntToPtr(i),
hInstance,
NULL);
hwndDefaultTopic = hwndTopicButton[i];
Modified: trunk/reactos/base/shell/cmd/cmd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -307,10 +307,10 @@
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);
}
Modified: trunk/reactos/base/system/services/database.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab…
==============================================================================
--- trunk/reactos/base/system/services/database.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -117,13 +117,13 @@
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)
Modified: trunk/reactos/base/system/services/rpcserver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse…
==============================================================================
--- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -1018,7 +1018,7 @@
return ERROR_INVALID_HANDLE;
}
- lpService = ScmGetServiceEntryByClientHandle(hServiceStatus);
+ lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus);
if (lpService == NULL)
{
DPRINT1("lpService == NULL!\n");
Modified: trunk/reactos/base/system/services/services.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi…
==============================================================================
--- trunk/reactos/base/system/services/services.h [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -107,7 +107,7 @@
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);
Modified: trunk/reactos/base/system/smss/client.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?…
==============================================================================
--- trunk/reactos/base/system/smss/client.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/client.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -435,7 +435,7 @@
SmpClientDirectory.CandidateClient->ServerProcess =
(HANDLE) ProcessInfo->ProcessHandle;
SmpClientDirectory.CandidateClient->ServerProcessId =
- (ULONG) ProcessInfo->ClientId.UniqueProcess;
+ (DWORD_PTR) ProcessInfo->ClientId.UniqueProcess;
/*
* Copy the program name
*/
Modified: trunk/reactos/base/system/smss/initss.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initss.c?…
==============================================================================
--- trunk/reactos/base/system/smss/initss.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/initss.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -41,8 +41,8 @@
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);
Modified: trunk/reactos/base/system/smss/smapicomp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapicomp…
==============================================================================
--- trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -24,7 +24,7 @@
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",
Modified: trunk/reactos/base/system/winlogon/sas.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c…
==============================================================================
--- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -505,7 +505,7 @@
return STATUS_SUCCESS;
}
-static BOOL CALLBACK
+static INT_PTR CALLBACK
ShutdownComputerWindowProc(
IN HWND hwndDlg,
IN UINT uMsg,
Modified: trunk/reactos/base/system/winlogon/winlogon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo…
==============================================================================
--- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -185,7 +185,7 @@
return
Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context);
}
-static BOOL CALLBACK
+static INT_PTR CALLBACK
GinaLoadFailedWindowProc(
IN HWND hwndDlg,
IN UINT uMsg,
Modified: trunk/reactos/base/system/winlogon/wlx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c…
==============================================================================
--- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -23,7 +23,7 @@
/* FUNCTIONS ****************************************************************/
-static BOOL CALLBACK
+static INT_PTR CALLBACK
DefaultWlxWindowProc(
IN HWND hwndDlg,
IN UINT uMsg,
Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -403,7 +403,7 @@
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 @@
return RtlNtStatusToDosError(Status);
}
- TRACE("ParentKey %x\n", (ULONG)ParentKey);
+ TRACE("ParentKey %p\n", ParentKey);
if (lpClass != NULL)
{
@@ -1105,7 +1105,7 @@
return RtlNtStatusToDosError(Status);
}
- TRACE("ParentKey %x\n", (ULONG)ParentKey);
+ TRACE("ParentKey %p\n", ParentKey);
RtlInitUnicodeString(&ClassString,
lpClass);
Modified: trunk/reactos/include/psdk/wincrypt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re…
==============================================================================
--- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -3788,7 +3788,7 @@
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);
Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Dec 7 06:11:46 2008
@@ -2703,7 +2703,7 @@
#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);
Modified: trunk/reactos/include/reactos/services/services.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s…
==============================================================================
--- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sun Dec 7 06:11:46
2008
@@ -11,7 +11,7 @@
#define SERVICE_CONTROL_START 0
-typedef DWORD CLIENT_HANDLE;
+DECLARE_HANDLE(CLIENT_HANDLE);
typedef struct _SCM_CONTROL_PACKET
{
6047
days inactive
6047
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org