diff --git a/reactos/apps/tests/capclock/capclock.c b/reactos/apps/tests/capclock/capclock.c
index 077ce096fc4..9d0d1bf1e62 100644
--- a/reactos/apps/tests/capclock/capclock.c
+++ b/reactos/apps/tests/capclock/capclock.c
@@ -1,4 +1,4 @@
-/* $Id: capclock.c,v 1.3 2003/11/14 17:13:16 weiden Exp $
+/* $Id: capclock.c,v 1.4 2004/10/11 21:08:03 weiden Exp $
  *
  * DESCRIPTION: Simple Win32 Caption Clock
  * PROJECT    : ReactOS (test applications)
@@ -27,7 +27,7 @@ INT STDCALL WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT
 	wc.hbrBackground  = (HBRUSH) (COLOR_WINDOW + 1);
 	wc.lpszClassName  = "CapClock";
 	RegisterClass (& wc);
-	return DialogBox(hinst, MAKEINTRESOURCE(2), NULL, (DLGPROC) DialogFunc);
+	return DialogBox(hinst, MAKEINTRESOURCE(2), NULL, DialogFunc);
 
 }
 static int InitializeApp (HWND hDlg,WPARAM wParam, LPARAM lParam)
@@ -36,7 +36,7 @@ static int InitializeApp (HWND hDlg,WPARAM wParam, LPARAM lParam)
 	TimerProc (hDlg,0,0,0);
 	return 1;
 }
-static BOOL CALLBACK DialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	switch (msg)
 	{
diff --git a/reactos/apps/tests/dirdlg/dirdlg.c b/reactos/apps/tests/dirdlg/dirdlg.c
index 7ced633e670..fdcb074dd78 100644
--- a/reactos/apps/tests/dirdlg/dirdlg.c
+++ b/reactos/apps/tests/dirdlg/dirdlg.c
@@ -6,7 +6,7 @@
 
 static char selected[MAX_PATH + 1];
 
-BOOL 
+INT_PTR
 CALLBACK 
 DlgMainProc(
   HWND hwndDlg,
diff --git a/reactos/apps/utils/infinst/.cvsignore b/reactos/apps/utils/infinst/.cvsignore
new file mode 100644
index 00000000000..285568f3f33
--- /dev/null
+++ b/reactos/apps/utils/infinst/.cvsignore
@@ -0,0 +1,6 @@
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/lib/cpl/access/access.c b/reactos/lib/cpl/access/access.c
index 2dc5d0c91c3..83acd5f8209 100644
--- a/reactos/lib/cpl/access/access.c
+++ b/reactos/lib/cpl/access/access.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: access.c,v 1.2 2004/07/10 22:06:39 kuehng Exp $
+/* $Id: access.c,v 1.3 2004/10/11 21:08:03 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/sysdm.c
@@ -37,11 +37,11 @@
 #define NUM_APPLETS	(1)
 
 LONG CALLBACK SystemApplet(VOID);
-BOOL CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
diff --git a/reactos/lib/cpl/access/display.c b/reactos/lib/cpl/access/display.c
index 12178ab3fb2..11715ab4674 100644
--- a/reactos/lib/cpl/access/display.c
+++ b/reactos/lib/cpl/access/display.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: display.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+/* $Id: display.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -31,7 +31,7 @@
 #include "access.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 DisplayPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/access/general.c b/reactos/lib/cpl/access/general.c
index 03f032cac43..0a213095caa 100644
--- a/reactos/lib/cpl/access/general.c
+++ b/reactos/lib/cpl/access/general.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: general.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+/* $Id: general.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -31,7 +31,7 @@
 #include "access.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 GeneralPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/access/keyboard.c b/reactos/lib/cpl/access/keyboard.c
index aeb64bfbdd2..ef11a320df5 100644
--- a/reactos/lib/cpl/access/keyboard.c
+++ b/reactos/lib/cpl/access/keyboard.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: keyboard.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+/* $Id: keyboard.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -31,7 +31,7 @@
 #include "access.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 KeyboardPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/access/mouse.c b/reactos/lib/cpl/access/mouse.c
index ec8ce4a5d2f..ec685c21d22 100644
--- a/reactos/lib/cpl/access/mouse.c
+++ b/reactos/lib/cpl/access/mouse.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mouse.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+/* $Id: mouse.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -31,7 +31,7 @@
 #include "access.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 MousePageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/access/sound.c b/reactos/lib/cpl/access/sound.c
index c1780b41059..06b5019bf3e 100644
--- a/reactos/lib/cpl/access/sound.c
+++ b/reactos/lib/cpl/access/sound.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: sound.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+/* $Id: sound.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -31,7 +31,7 @@
 #include "access.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 SoundPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/appwiz/appwiz.c b/reactos/lib/cpl/appwiz/appwiz.c
index 6cf3f8aa04c..f8f9ad6e2a9 100644
--- a/reactos/lib/cpl/appwiz/appwiz.c
+++ b/reactos/lib/cpl/appwiz/appwiz.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: appwiz.c,v 1.3 2004/07/10 22:06:39 kuehng Exp $
+/* $Id: appwiz.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS Software Control Panel
  * FILE:            lib/cpl/system/appwiz.c
@@ -42,8 +42,8 @@
 #define NUM_APPLETS	(1)
 
 LONG CALLBACK SystemApplet(VOID);
-BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
@@ -106,7 +106,7 @@ CallUninstall(HWND hwndDlg)
 
 
 /* Property page dialog callback */
-static BOOL CALLBACK
+static INT_PTR CALLBACK
 InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
   TCHAR pszName[MAX_PATH];
@@ -183,7 +183,7 @@ InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 
 
 /* Property page dialog callback */
-static BOOL CALLBACK
+static INT_PTR CALLBACK
 RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
   switch(uMsg)
diff --git a/reactos/lib/cpl/cplsample/cplsample.c b/reactos/lib/cpl/cplsample/cplsample.c
index 1bcf34d6c23..f70ff242d29 100644
--- a/reactos/lib/cpl/cplsample/cplsample.c
+++ b/reactos/lib/cpl/cplsample/cplsample.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cplsample.c,v 1.3 2004/07/10 22:06:40 kuehng Exp $
+/* $Id: cplsample.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS Sample Control Panel
  * FILE:            lib/cpl/cplsample/cplsample.c
@@ -53,7 +53,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 Page1Proc(
   HWND hwndDlg,
   UINT uMsg,
@@ -70,7 +70,7 @@ Page1Proc(
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 Page2Proc(
   HWND hwndDlg,
   UINT uMsg,
@@ -87,7 +87,7 @@ Page2Proc(
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 Page3Proc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/desk/desk.c b/reactos/lib/cpl/desk/desk.c
index 7af90994d6b..8e388ca61b4 100644
--- a/reactos/lib/cpl/desk/desk.c
+++ b/reactos/lib/cpl/desk/desk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: desk.c,v 1.1 2004/08/07 00:05:23 kuehng Exp $
+/* $Id: desk.c,v 1.2 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS Display Control Panel
  * FILE:            lib/cpl/desk/desk.c
@@ -49,10 +49,10 @@
 #define NUM_APPLETS	(1)
 
 LONG CALLBACK DisplayApplet(VOID);
-BOOL CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
@@ -64,7 +64,8 @@ APPLET Applets[NUM_APPLETS] =
 
 
 /* Property page dialog callback */
-BOOL CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch(uMsg)
 	{
@@ -76,7 +77,8 @@ BOOL CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 	return FALSE;
 }
 /* Property page dialog callback */
-BOOL CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch(uMsg)
 	{
@@ -88,7 +90,8 @@ BOOL CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 	return FALSE;
 }
 /* Property page dialog callback */
-BOOL CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch(uMsg)
 	{
@@ -100,7 +103,8 @@ BOOL CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 	return FALSE;
 }
 /* Property page dialog callback */
-BOOL CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch(uMsg)
 	{
diff --git a/reactos/lib/cpl/ncpa/ncpa.c b/reactos/lib/cpl/ncpa/ncpa.c
index a4bca682787..5c6fce371da 100644
--- a/reactos/lib/cpl/ncpa/ncpa.c
+++ b/reactos/lib/cpl/ncpa/ncpa.c
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/* $Id: ncpa.c,v 1.3 2004/09/26 15:55:52 weiden Exp $
+/* $Id: ncpa.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS Network Control Panel
  * FILE:            lib/cpl/system/ncpa.c
@@ -129,7 +129,7 @@ void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc,LPARAM lP
 
 
 LONG CALLBACK DisplayApplet(VOID);
-BOOL CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo);
 
 HINSTANCE hApplet = 0;
@@ -240,7 +240,8 @@ void NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
 
 
 
-BOOL CALLBACK NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);
 	switch(uMsg)
@@ -426,7 +427,8 @@ void DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID)
 
 
 
-BOOL CALLBACK NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch(uMsg)
 	{
@@ -608,7 +610,8 @@ void EnumAdapters(HWND hwndDlg)
 }
 
 
-BOOL CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	NMHDR* pnmh;
 	int nIndex;
diff --git a/reactos/lib/cpl/ncpa/tcpip_properties.c b/reactos/lib/cpl/ncpa/tcpip_properties.c
index 842be2d9931..b0a68e0787b 100644
--- a/reactos/lib/cpl/ncpa/tcpip_properties.c
+++ b/reactos/lib/cpl/ncpa/tcpip_properties.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: tcpip_properties.c,v 1.2 2004/09/26 15:55:52 weiden Exp $
+/* $Id: tcpip_properties.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS Network Control Panel
  * FILE:            lib/cpl/system/tcpip_properties.c
@@ -52,7 +52,8 @@
 
 extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc);
 
-BOOL CALLBACK TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);
 	IP_ADAPTER_INFO *pInfo = NULL;
diff --git a/reactos/lib/cpl/sysdm/advanced.c b/reactos/lib/cpl/sysdm/advanced.c
index d61039ad8d6..08876a201fa 100644
--- a/reactos/lib/cpl/sysdm/advanced.c
+++ b/reactos/lib/cpl/sysdm/advanced.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: advanced.c,v 1.3 2004/07/02 20:28:00 ekohl Exp $
+/* $Id: advanced.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -33,7 +33,7 @@
 #include "sysdm.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 AdvancedPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/sysdm/computer.c b/reactos/lib/cpl/sysdm/computer.c
index f2ea1c6c248..0c8fd6e3c81 100644
--- a/reactos/lib/cpl/sysdm/computer.c
+++ b/reactos/lib/cpl/sysdm/computer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: computer.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: computer.c,v 1.2 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/computer.c
@@ -31,7 +31,7 @@
 #include "sysdm.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 ComputerPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/sysdm/environment.c b/reactos/lib/cpl/sysdm/environment.c
index 0f3aec227e5..ee2ec30d779 100644
--- a/reactos/lib/cpl/sysdm/environment.c
+++ b/reactos/lib/cpl/sysdm/environment.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: environment.c,v 1.4 2004/09/26 15:55:53 weiden Exp $
+/* $Id: environment.c,v 1.5 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/sysdm/environment.c
@@ -42,7 +42,7 @@ typedef struct _VARIABLE_DATA
 
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 EditVariableDlgProc(HWND hwndDlg,
 		    UINT uMsg,
 		    WPARAM wParam,
@@ -475,7 +475,7 @@ ReleaseListViewItems(HWND hwndDlg,
 
 
 /* Environment dialog procedure */
-BOOL CALLBACK
+INT_PTR CALLBACK
 EnvironmentDlgProc(HWND hwndDlg,
 		   UINT uMsg,
 		   WPARAM wParam,
diff --git a/reactos/lib/cpl/sysdm/general.c b/reactos/lib/cpl/sysdm/general.c
index 9d8b1375730..d7a10fb967d 100644
--- a/reactos/lib/cpl/sysdm/general.c
+++ b/reactos/lib/cpl/sysdm/general.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: general.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
+/* $Id: general.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/general.c
@@ -90,7 +90,7 @@ ObtainSystemInformationThread(POSITINFO posit)
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 GeneralPageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/sysdm/hardware.c b/reactos/lib/cpl/sysdm/hardware.c
index eb56423357e..5ab95914bc2 100644
--- a/reactos/lib/cpl/sysdm/hardware.c
+++ b/reactos/lib/cpl/sysdm/hardware.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hardware.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
+/* $Id: hardware.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/hardware.c
@@ -55,7 +55,7 @@ BOOL LaunchDeviceManager(HWND hWndParent)
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 HardwarePageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/cpl/sysdm/sysdm.h b/reactos/lib/cpl/sysdm/sysdm.h
index 915203dfed8..a4003d76c42 100644
--- a/reactos/lib/cpl/sysdm/sysdm.h
+++ b/reactos/lib/cpl/sysdm/sysdm.h
@@ -15,14 +15,14 @@ extern HINSTANCE hApplet;
 
 void ShowLastWin32Error(HWND hWndOwner);
 
-BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* environment.c */
-BOOL CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
 #endif /* __CPL_SYSDM_H */
diff --git a/reactos/lib/cpl/sysdm/userprofile.c b/reactos/lib/cpl/sysdm/userprofile.c
index fd2425f7702..1cbe01987de 100644
--- a/reactos/lib/cpl/sysdm/userprofile.c
+++ b/reactos/lib/cpl/sysdm/userprofile.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: userprofile.c,v 1.1 2004/06/30 10:53:05 ekohl Exp $
+/* $Id: userprofile.c,v 1.2 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/computer.c
@@ -31,7 +31,7 @@
 #include "sysdm.h"
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 UserProfilePageProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/devmgr/devmgr.c b/reactos/lib/devmgr/devmgr.c
index 93f7c1dd6ba..f5e68b65945 100644
--- a/reactos/lib/devmgr/devmgr.c
+++ b/reactos/lib/devmgr/devmgr.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/* $Id: devmgr.c,v 1.2 2004/09/28 16:04:15 weiden Exp $
+/* $Id: devmgr.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS devmgr.dll
  * FILE:            lib/devmgr/devmgr.c
@@ -29,7 +29,7 @@
 #include "devmgr.h"
 #include "resource.h"
 
-extern HINSTANCE hDllInstance;
+HINSTANCE hDllInstance;
 
 
 BOOL STDCALL
diff --git a/reactos/lib/devmgr/devmgr.h b/reactos/lib/devmgr/devmgr.h
index 8a27758e003..bcd3facb5fe 100644
--- a/reactos/lib/devmgr/devmgr.h
+++ b/reactos/lib/devmgr/devmgr.h
@@ -1,7 +1,7 @@
 #ifndef __DEVMGR_H
 #define __DEVMGR_H
 
-HINSTANCE hDllInstance;
+extern HINSTANCE hDllInstance;
 
 WINBOOL
 WINAPI
diff --git a/reactos/lib/msgina/msgina.c b/reactos/lib/msgina/msgina.c
index d6d81915402..9dd4d9e0498 100644
--- a/reactos/lib/msgina/msgina.c
+++ b/reactos/lib/msgina/msgina.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: msgina.c,v 1.9 2004/03/28 12:19:07 weiden Exp $
+/* $Id: msgina.c,v 1.10 2004/10/11 21:08:04 weiden Exp $
  *
  * PROJECT:         ReactOS msgina.dll
  * FILE:            lib/msgina/msgina.c
@@ -42,7 +42,7 @@ typedef struct _DISPLAYSTATUSMSG
   HANDLE StartupEvent;
 } DISPLAYSTATUSMSG, *PDISPLAYSTATUSMSG;
 
-BOOL CALLBACK 
+INT_PTR CALLBACK
 LoggedOnDlgProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/lib/syssetup/wizard.c b/reactos/lib/syssetup/wizard.c
index 9f44d73e4b7..ddcb24a39c3 100644
--- a/reactos/lib/syssetup/wizard.c
+++ b/reactos/lib/syssetup/wizard.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: wizard.c,v 1.8 2004/09/26 15:55:53 weiden Exp $
+/* $Id: wizard.c,v 1.9 2004/10/11 21:08:04 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
@@ -98,7 +98,7 @@ CreateTitleFont(VOID)
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 WelcomeDlgProc(HWND hwndDlg,
                UINT uMsg,
                WPARAM wParam,
@@ -164,7 +164,7 @@ WelcomeDlgProc(HWND hwndDlg,
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 OwnerPageDlgProc(HWND hwndDlg,
                  UINT uMsg,
                  WPARAM wParam,
@@ -254,7 +254,7 @@ OwnerPageDlgProc(HWND hwndDlg,
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 ComputerPageDlgProc(HWND hwndDlg,
                     UINT uMsg,
                     WPARAM wParam,
@@ -355,7 +355,7 @@ ComputerPageDlgProc(HWND hwndDlg,
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 LocalePageDlgProc(HWND hwndDlg,
                   UINT uMsg,
                   WPARAM wParam,
@@ -406,7 +406,7 @@ LocalePageDlgProc(HWND hwndDlg,
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 ProcessPageDlgProc(HWND hwndDlg,
                    UINT uMsg,
                    WPARAM wParam,
@@ -481,7 +481,7 @@ ProcessPageDlgProc(HWND hwndDlg,
 
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 FinishDlgProc(HWND hwndDlg,
               UINT uMsg,
               WPARAM wParam,
diff --git a/reactos/subsys/system/explorer/shell/filechild.cpp b/reactos/subsys/system/explorer/shell/filechild.cpp
index 324d1d59cf0..3cedc016301 100644
--- a/reactos/subsys/system/explorer/shell/filechild.cpp
+++ b/reactos/subsys/system/explorer/shell/filechild.cpp
@@ -93,7 +93,7 @@ WebChildWndInfo::WebChildWndInfo(HWND hmdiclient, LPCTSTR url)
 }
 
 
-BOOL CALLBACK ExecuteDialog::WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
+INT_PTR CALLBACK ExecuteDialog::WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
 {
 	static struct ExecuteDialog* dlg;
 
diff --git a/reactos/subsys/system/explorer/shell/filechild.h b/reactos/subsys/system/explorer/shell/filechild.h
index 2fea578a020..d5d0721424c 100644
--- a/reactos/subsys/system/explorer/shell/filechild.h
+++ b/reactos/subsys/system/explorer/shell/filechild.h
@@ -132,5 +132,5 @@ struct ExecuteDialog {	///@todo use class Dialog
 	TCHAR	cmd[MAX_PATH];
 	int		cmdshow;
 
-	static BOOL CALLBACK WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam);
+	static INT_PTR CALLBACK WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam);
 };
diff --git a/reactos/subsys/system/regedit/childwnd.c b/reactos/subsys/system/regedit/childwnd.c
index 2a71a889988..04040f3a5dd 100644
--- a/reactos/subsys/system/regedit/childwnd.c
+++ b/reactos/subsys/system/regedit/childwnd.c
@@ -131,7 +131,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
  *  WM_DESTROY  - post a quit message and return
  *
  */
-LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     static short last_split;
     BOOL Result;
diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c
index 93c7c02c8dd..71a7b5d1b81 100644
--- a/reactos/subsys/system/regedit/framewnd.c
+++ b/reactos/subsys/system/regedit/framewnd.c
@@ -642,7 +642,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
  *
  */
 
-LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message) {
     case WM_CREATE:
diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index 32e2ea8e05e..a363752992a 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -60,7 +60,7 @@ typedef struct
 #define HEHT_ASCIIDUMP	(0x6)
 #define HEHT_RIGHTMARGIN	(0x7)
 
-LRESULT WINAPI HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 ATOM
 STDCALL
@@ -858,8 +858,7 @@ HEXEDIT_WM_SIZE(PHEXEDIT_DATA hed, DWORD sType, WORD NewWidth, WORD NewHeight)
   return 0;
 }
 
-LRESULT
-WINAPI
+INT_PTR CALLBACK
 HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   PHEXEDIT_DATA hed;
diff --git a/reactos/subsys/system/regedit/main.h b/reactos/subsys/system/regedit/main.h
index 96c6d424686..5bce146dcea 100644
--- a/reactos/subsys/system/regedit/main.h
+++ b/reactos/subsys/system/regedit/main.h
@@ -80,10 +80,10 @@ extern TCHAR szChildClass[];
 extern void ShowAboutBox(HWND hWnd);
 
 /* childwnd.c */
-extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
+extern INT_PTR CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
 
 /* framewnd.c */
-extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
+extern INT_PTR CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
 extern void SetupStatusBar(HWND hWnd, BOOL bResize);
 extern void UpdateStatusBar(void);
 
diff --git a/reactos/subsys/system/taskmgr/about.c b/reactos/subsys/system/taskmgr/about.c
index df57aa18091..676e2cc1021 100644
--- a/reactos/subsys/system/taskmgr/about.c
+++ b/reactos/subsys/system/taskmgr/about.c
@@ -30,14 +30,15 @@
     
 #include "about.h"
 
-LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 void OnAbout(void)
 {
     DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogWndProc);
 }
 
-LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HWND    hLicenseEditWnd;
     TCHAR    strLicense[0x1000];
diff --git a/reactos/subsys/system/taskmgr/affinity.c b/reactos/subsys/system/taskmgr/affinity.c
index ae99fa3ad77..8f6209fab05 100644
--- a/reactos/subsys/system/taskmgr/affinity.c
+++ b/reactos/subsys/system/taskmgr/affinity.c
@@ -35,7 +35,7 @@
 
 HANDLE        hProcessAffinityHandle;
 
-LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 void ProcessPage_OnSetAffinity(void)
 {
@@ -69,7 +69,8 @@ void ProcessPage_OnSetAffinity(void)
     }
 }
 
-LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     DWORD    dwProcessAffinityMask = 0;
     DWORD    dwSystemAffinityMask = 0;
diff --git a/reactos/subsys/system/taskmgr/applpage.c b/reactos/subsys/system/taskmgr/applpage.c
index ebee748d585..eca2e3fb6bc 100644
--- a/reactos/subsys/system/taskmgr/applpage.c
+++ b/reactos/subsys/system/taskmgr/applpage.c
@@ -64,7 +64,8 @@ BOOL bRestore /* Restore the window if it is minimized */
 );
 #endif
 
-LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     RECT        rc;
     int         nXDifference;
diff --git a/reactos/subsys/system/taskmgr/applpage.h b/reactos/subsys/system/taskmgr/applpage.h
index 0c48d106344..ab215355ff2 100644
--- a/reactos/subsys/system/taskmgr/applpage.h
+++ b/reactos/subsys/system/taskmgr/applpage.h
@@ -30,7 +30,7 @@ extern    HWND        hApplicationPageEndTaskButton;    /* Application End Task
 extern    HWND        hApplicationPageSwitchToButton;    /* Application Switch To button */
 extern    HWND        hApplicationPageNewTaskButton;    /* Application New Task button */
 
-LRESULT CALLBACK    ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK    ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 void                RefreshApplicationPage(void);
 void                UpdateApplicationListControlViewSetting(void);
 
diff --git a/reactos/subsys/system/taskmgr/column.c b/reactos/subsys/system/taskmgr/column.c
index 976ac8f1cdd..ccf1f2b3d09 100644
--- a/reactos/subsys/system/taskmgr/column.c
+++ b/reactos/subsys/system/taskmgr/column.c
@@ -33,8 +33,8 @@
 
 UINT    ColumnDataHints[25];
 
-int                    InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem);
-LRESULT CALLBACK    ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+int                 InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem);
+INT_PTR CALLBACK    ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 void AddColumns(void)
 {
@@ -368,7 +368,8 @@ void ProcessPage_OnViewSelectColumns(void)
     }
 }
 
-LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 
     switch (message)
diff --git a/reactos/subsys/system/taskmgr/dbgchnl.c b/reactos/subsys/system/taskmgr/dbgchnl.c
index b50d61332f6..4ec1f616e84 100644
--- a/reactos/subsys/system/taskmgr/dbgchnl.c
+++ b/reactos/subsys/system/taskmgr/dbgchnl.c
@@ -397,7 +397,7 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam)
     }
 }
 
-static LRESULT CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message)
     {
@@ -419,5 +419,5 @@ static LRESULT CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wPa
 
 void ProcessPage_OnDebugChannels(void)
 {
-    DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, (DLGPROC)DebugChannelsDlgProc);
+    DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc);
 }
diff --git a/reactos/subsys/system/taskmgr/graph.c b/reactos/subsys/system/taskmgr/graph.c
index 3403b228248..861e36d9930 100644
--- a/reactos/subsys/system/taskmgr/graph.c
+++ b/reactos/subsys/system/taskmgr/graph.c
@@ -40,7 +40,8 @@ void                Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd);
 void                Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd);
 void                Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd);
 
-LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HDC                hdc;
     PAINTSTRUCT        ps;
diff --git a/reactos/subsys/system/taskmgr/graph.h b/reactos/subsys/system/taskmgr/graph.h
index 633fd494e7d..5153cad003a 100644
--- a/reactos/subsys/system/taskmgr/graph.h
+++ b/reactos/subsys/system/taskmgr/graph.h
@@ -34,7 +34,7 @@ extern "C" {
 
 extern	LONG				OldGraphWndProc;
 
-LRESULT CALLBACK	Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK	Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 
 #ifdef __cplusplus
diff --git a/reactos/subsys/system/taskmgr/graphctl.c b/reactos/subsys/system/taskmgr/graphctl.c
index 18cd2d80030..65ad43efd62 100644
--- a/reactos/subsys/system/taskmgr/graphctl.c
+++ b/reactos/subsys/system/taskmgr/graphctl.c
@@ -530,7 +530,8 @@ extern TGraphCtrl PerformancePageMemUsageHistoryGraph;
 extern HWND hPerformancePageCpuUsageHistoryGraph;
 extern HWND hPerformancePageMemUsageHistoryGraph;
 
-LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     RECT        rcClient;
     HDC            hdc;
diff --git a/reactos/subsys/system/taskmgr/graphctl.h b/reactos/subsys/system/taskmgr/graphctl.h
index 589500b341c..5a2e22b84f1 100644
--- a/reactos/subsys/system/taskmgr/graphctl.h
+++ b/reactos/subsys/system/taskmgr/graphctl.h
@@ -104,7 +104,7 @@ color);
 void    GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double 
 dUpper, int nDecimalPlaces);
 
-LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 #ifdef __cplusplus
 }
diff --git a/reactos/subsys/system/taskmgr/perfpage.c b/reactos/subsys/system/taskmgr/perfpage.c
index f9836752155..119fbe384ba 100644
--- a/reactos/subsys/system/taskmgr/perfpage.c
+++ b/reactos/subsys/system/taskmgr/perfpage.c
@@ -117,7 +117,8 @@ void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference)
     AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0);
 }
 		 
-LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	RECT	rc;
 	int		nXDifference;
diff --git a/reactos/subsys/system/taskmgr/perfpage.h b/reactos/subsys/system/taskmgr/perfpage.h
index 0a9b0b7e97e..c92e0486310 100644
--- a/reactos/subsys/system/taskmgr/perfpage.h
+++ b/reactos/subsys/system/taskmgr/perfpage.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 extern	HWND		hPerformancePage;		/* Performance Property Page */
-LRESULT CALLBACK	PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK	PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 void	RefreshPerformancePage(void);
 void	PerformancePage_OnViewShowKernelTimes(void);
 void	PerformancePage_OnViewCPUHistoryOneGraphAll(void);
diff --git a/reactos/subsys/system/taskmgr/proclist.c b/reactos/subsys/system/taskmgr/proclist.c
index de9f63c54eb..3b544a64dc4 100644
--- a/reactos/subsys/system/taskmgr/proclist.c
+++ b/reactos/subsys/system/taskmgr/proclist.c
@@ -34,12 +34,13 @@
 #include "perfdata.h"
 
 
-LRESULT CALLBACK    ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK    ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 WNDPROC             OldProcessListWndProc;
 
 
-LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HBRUSH    hbrBackground;
     RECT    rcItem;
@@ -116,5 +117,5 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
     /*
      * We pass on all messages except WM_ERASEBKGND
      */
-    return CallWindowProc((WNDPROC)OldProcessListWndProc, hWnd, message, wParam, lParam);
+    return CallWindowProc(OldProcessListWndProc, hWnd, message, wParam, lParam);
 }
diff --git a/reactos/subsys/system/taskmgr/proclist.h b/reactos/subsys/system/taskmgr/proclist.h
index f5e9d516182..d9fbb189968 100644
--- a/reactos/subsys/system/taskmgr/proclist.h
+++ b/reactos/subsys/system/taskmgr/proclist.h
@@ -23,7 +23,7 @@
 #ifndef __PROCLIST_H
 #define __PROCLIST_H
 
-LRESULT CALLBACK	ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK	ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 extern	WNDPROC		OldProcessListWndProc;
 
diff --git a/reactos/subsys/system/taskmgr/procpage.c b/reactos/subsys/system/taskmgr/procpage.c
index 3333dc7a079..ff2d0cd6336 100644
--- a/reactos/subsys/system/taskmgr/procpage.c
+++ b/reactos/subsys/system/taskmgr/procpage.c
@@ -53,7 +53,8 @@ void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount);
 void ProcessPageShowContextMenu(DWORD dwProcessId);
 DWORD WINAPI ProcessPageRefreshThread(void *lpParameter);
 
-LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     RECT    rc;
     int        nXDifference;
diff --git a/reactos/subsys/system/taskmgr/procpage.h b/reactos/subsys/system/taskmgr/procpage.h
index 379c02c13ca..1d4268dc4a8 100644
--- a/reactos/subsys/system/taskmgr/procpage.h
+++ b/reactos/subsys/system/taskmgr/procpage.h
@@ -29,7 +29,7 @@ extern	HWND		hProcessPageHeaderCtrl;			/* Process Header Control */
 extern	HWND		hProcessPageEndProcessButton;		/* Process End Process button */
 extern	HWND		hProcessPageShowAllProcessesButton;	/* Process Show All Processes checkbox */
 
-LRESULT CALLBACK	ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK	ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 void				RefreshProcessPage(void);
 
 #endif /* __PROCESSPAGE_H */
diff --git a/reactos/subsys/system/taskmgr/taskmgr.c b/reactos/subsys/system/taskmgr/taskmgr.c
index 36945a6a349..fdb58a41100 100644
--- a/reactos/subsys/system/taskmgr/taskmgr.c
+++ b/reactos/subsys/system/taskmgr/taskmgr.c
@@ -106,7 +106,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
         return -1;
     }
 
-    DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, (DLGPROC)TaskManagerWndProc);
+    DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, TaskManagerWndProc);
  
     /* Save our settings to the registry */
     SaveSettings();
@@ -115,7 +115,8 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 }
 
 /* Message handler for dialog box. */
-LRESULT CALLBACK TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK
+TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HDC             hdc;
     PAINTSTRUCT     ps;
diff --git a/reactos/subsys/system/taskmgr/taskmgr.h b/reactos/subsys/system/taskmgr/taskmgr.h
index d3b1f96f048..32682bf88c7 100644
--- a/reactos/subsys/system/taskmgr/taskmgr.h
+++ b/reactos/subsys/system/taskmgr/taskmgr.h
@@ -125,7 +125,7 @@ extern	int			nOldHeight;					/* Holds the previous client area height */
 extern	TASKMANAGER_SETTINGS	TaskManagerSettings;
 
 /* Foward declarations of functions included in this code module: */
-LRESULT CALLBACK TaskManagerWndProc(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK TaskManagerWndProc(HWND, UINT, WPARAM, LPARAM);
 BOOL OnCreate(HWND hWnd);
 void OnSize(UINT nType, int cx, int cy);
 void OnMove(UINT nType, int cx, int cy);
diff --git a/reactos/subsys/system/vmwinst/vmwinst.c b/reactos/subsys/system/vmwinst/vmwinst.c
index cc45532ecc9..cd72dd06d3a 100644
--- a/reactos/subsys/system/vmwinst/vmwinst.c
+++ b/reactos/subsys/system/vmwinst/vmwinst.c
@@ -18,7 +18,7 @@
  *
  * VMware is a registered trademark of VMware, Inc.
  */
-/* $Id: vmwinst.c,v 1.11 2004/09/24 20:20:46 weiden Exp $
+/* $Id: vmwinst.c,v 1.12 2004/10/11 21:08:05 weiden Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS VMware(r) driver installation utility
@@ -369,7 +369,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc)
 }
 
 /* Property page dialog callback */
-int CALLBACK
+INT_PTR CALLBACK
 PageWelcomeProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -414,7 +414,7 @@ PageWelcomeProc(
 }
 
 /* Property page dialog callback */
-int CALLBACK
+INT_PTR CALLBACK
 PageInsertDiscProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -569,7 +569,7 @@ InstStartInstallationThread(HWND hwndNotify)
 }
 
 /* Property page dialog callback */
-int CALLBACK
+INT_PTR CALLBACK
 PageInstallingProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -638,7 +638,7 @@ PageInstallingProc(
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 PageInstallFailedProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -686,7 +686,7 @@ typedef struct
 } MAPCTLRES;
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 PageConfigProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -799,7 +799,7 @@ PageConfigProc(
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 PageChooseActionProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -851,7 +851,7 @@ PageChooseActionProc(
 }
 
 /* Property page dialog callback */
-BOOL CALLBACK
+INT_PTR CALLBACK
 PageSelectDriverProc(
   HWND hwndDlg,
   UINT uMsg,
@@ -921,7 +921,7 @@ ShowUninstNotice(HWND Owner)
   MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION);
 }
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 PageDoUninstallProc(
   HWND hwndDlg,
   UINT uMsg,
diff --git a/reactos/subsys/system/welcome/welcome.c b/reactos/subsys/system/welcome/welcome.c
index fc5b90642c2..6ca856b7761 100755
--- a/reactos/subsys/system/welcome/welcome.c
+++ b/reactos/subsys/system/welcome/welcome.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: welcome.c,v 1.6 2004/09/26 15:55:53 weiden Exp $
+/* $Id: welcome.c,v 1.7 2004/10/11 21:08:05 weiden Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS welcome/autorun application
@@ -89,7 +89,7 @@ RECT rcRightPanel;
 WNDPROC fnOldBtn;
 
 
-LRESULT CALLBACK
+INT_PTR CALLBACK
 MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
@@ -211,7 +211,7 @@ WinMain(HINSTANCE hInst,
 }
 
 
-LRESULT CALLBACK
+INT_PTR CALLBACK
 ButtonSubclassWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   LONG i;
@@ -783,7 +783,7 @@ OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam)
 }
 
 
-LRESULT CALLBACK
+INT_PTR CALLBACK
 MainWndProc(HWND hWnd,
 	    UINT uMsg,
 	    WPARAM wParam,
diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c
index 22e44a33747..ef2cb182148 100644
--- a/reactos/subsys/system/winefile/winefile.c
+++ b/reactos/subsys/system/winefile/winefile.c
@@ -1601,7 +1601,7 @@ struct ExecuteDialog {
 };
 
 
-static BOOL CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
+static INT_PTR CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
 {
 	static struct ExecuteDialog* dlg;
 
@@ -1627,7 +1627,7 @@ static BOOL CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, L
 	return 0;
 }
 
-static BOOL CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
+static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
 {
 	TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN];
 
diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c
index 61aae7db220..867e6e538dd 100644
--- a/reactos/subsys/system/winlogon/winlogon.c
+++ b/reactos/subsys/system/winlogon/winlogon.c
@@ -1,4 +1,4 @@
-/* $Id: winlogon.c,v 1.34 2004/07/12 20:09:35 gvg Exp $
+/* $Id: winlogon.c,v 1.35 2004/10/11 21:08:05 weiden Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -65,7 +65,7 @@ PrintString (WCHAR* fmt,...)
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 ShutdownComputerProc (HWND hwndDlg,
 		      UINT uMsg,
 		      WPARAM wParam,
diff --git a/reactos/subsys/system/winlogon/wlx.c b/reactos/subsys/system/winlogon/wlx.c
index 1be312b0ca8..7a8f72a6c7b 100644
--- a/reactos/subsys/system/winlogon/wlx.c
+++ b/reactos/subsys/system/winlogon/wlx.c
@@ -1,4 +1,4 @@
-/* $Id: wlx.c,v 1.5 2004/07/12 20:09:35 gvg Exp $
+/* $Id: wlx.c,v 1.6 2004/10/11 21:08:05 weiden Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -521,8 +521,7 @@ GetMsGinaPath(WCHAR *path)
   RegCloseKey(hKey);
 }
 
-BOOL 
-CALLBACK 
+INT_PTR CALLBACK
 GinaLoadFailedProc(
   HWND hwndDlg,
   UINT uMsg,