From 3b5160fc4079eb13aedceeff2d40ba81f998c5de Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 28 Jul 2007 20:02:37 +0000
Subject: [PATCH] More function prototype fixes

svn path=/trunk/; revision=27972
---
 reactos/dll/cpl/hdwwiz/hdwwiz.c     | 6 +++---
 reactos/dll/cpl/intl/intl.c         | 8 ++++----
 reactos/dll/cpl/intl_new/intl.c     | 6 +++---
 reactos/dll/cpl/main/keyboard.c     | 2 +-
 reactos/dll/cpl/main/main.h         | 4 ++--
 reactos/dll/cpl/main/mouse.c        | 2 +-
 reactos/dll/cpl/mmsys/mmsys.c       | 4 ++--
 reactos/dll/cpl/mmsys/mmsys.h       | 4 ++--
 reactos/dll/cpl/ncpa/ncpa.c         | 4 ++--
 reactos/dll/cpl/ncpa/ncpa.h         | 2 +-
 reactos/dll/cpl/powercfg/powercfg.c | 6 +++---
 reactos/dll/cpl/timedate/timedate.c | 6 +++---
 reactos/dll/cpl/usrmgr/usrmgr.c     | 6 +++---
 13 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.c b/reactos/dll/cpl/hdwwiz/hdwwiz.c
index d83317c7bd8..d25bb77cfcc 100644
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.c
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.c
@@ -33,7 +33,7 @@
 #include "resource.h"
 #include "hdwwiz.h"
 
-LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
@@ -44,8 +44,8 @@ APPLET Applets[] =
 
 typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD);
 
-LONG APIENTRY
-Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
+static LONG APIENTRY
+Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
 	HMODULE hNewDev = NULL;
 	PINSTALL_NEW_DEVICE InstallNewDevice;
diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index 92244492930..4d37e9344c2 100644
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -35,8 +35,8 @@
 
 #define NUM_APPLETS	(1)
 
-LONG APIENTRY
-Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+static LONG APIENTRY
+Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 
 HINSTANCE hApplet = 0;
@@ -126,8 +126,8 @@ LONG ParseSetupInf()
   return 0;
 }
 
-LONG APIENTRY
-Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
+static LONG APIENTRY
+Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
   PROPSHEETPAGE psp[6];
   PROPSHEETHEADER psh;
diff --git a/reactos/dll/cpl/intl_new/intl.c b/reactos/dll/cpl/intl_new/intl.c
index fe0a5d4a083..17e5b74278c 100644
--- a/reactos/dll/cpl/intl_new/intl.c
+++ b/reactos/dll/cpl/intl_new/intl.c
@@ -21,7 +21,7 @@
 #define NUM_APPLETS     (1)
 #define NUM_SHEETS       3
 
-LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 HINSTANCE hApplet;
 
@@ -45,9 +45,9 @@ InitPropSheetPage(PROPSHEETPAGE *PsPage, WORD IdDlg, DLGPROC DlgProc)
 }
 
 /* Create applets */
-LONG
+static LONG
 APIENTRY
-Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
+Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
     PROPSHEETPAGE PsPage[NUM_SHEETS];
     PROPSHEETHEADER psh;
diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c
index 9618e03af9f..a3db0bb90b3 100644
--- a/reactos/dll/cpl/main/keyboard.c
+++ b/reactos/dll/cpl/main/keyboard.c
@@ -294,7 +294,7 @@ KeybHardwareProc(IN HWND hwndDlg,
 
 
 LONG APIENTRY
-KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
+KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
     PROPSHEETPAGE psp[2];
     PROPSHEETHEADER psh;
diff --git a/reactos/dll/cpl/main/main.h b/reactos/dll/cpl/main/main.h
index c674bd1a40d..53e938c5cae 100644
--- a/reactos/dll/cpl/main/main.h
+++ b/reactos/dll/cpl/main/main.h
@@ -30,7 +30,7 @@ extern HINSTANCE hApplet;
 /* keyboard.c */
 
 LONG APIENTRY
-KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 /* main.c */
 
@@ -43,7 +43,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp,
 /* mouse.c */
 
 LONG APIENTRY
-MouseApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+MouseApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 #endif /* __CPL_MAIN_H */
 
diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index a88e8142d15..ebceac21b51 100644
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -1796,7 +1796,7 @@ WheelProc(IN HWND hwndDlg,
 
 
 LONG APIENTRY
-MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2)
+MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
     PROPSHEETPAGE psp[5];
     PROPSHEETHEADER psh;
diff --git a/reactos/dll/cpl/mmsys/mmsys.c b/reactos/dll/cpl/mmsys/mmsys.c
index 53d962b23d7..0112d65cc97 100644
--- a/reactos/dll/cpl/mmsys/mmsys.c
+++ b/reactos/dll/cpl/mmsys/mmsys.c
@@ -92,8 +92,8 @@ HardwareDlgProc(HWND hwndDlg,
 LONG APIENTRY
 MmSysApplet(HWND hwnd,
             UINT uMsg,
-            LONG wParam,
-            LONG lParam)
+            LPARAM wParam,
+            LPARAM lParam)
 {
     PROPSHEETPAGE psp[1];
     PROPSHEETHEADER psh = {0};
diff --git a/reactos/dll/cpl/mmsys/mmsys.h b/reactos/dll/cpl/mmsys/mmsys.h
index 0cc249db0d1..3ae2ae4d715 100644
--- a/reactos/dll/cpl/mmsys/mmsys.h
+++ b/reactos/dll/cpl/mmsys/mmsys.h
@@ -24,8 +24,8 @@ InitPropSheetPage(PROPSHEETPAGE *psp,
 LONG APIENTRY
 MmSysApplet(HWND hwnd,
             UINT uMsg,
-            LONG wParam,
-            LONG lParam);
+            LPARAM wParam,
+            LPARAM lParam);
 
 #endif /* __CPL_MMSYS_H */
 
diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c
index 3fed3ced18a..1626305a8de 100644
--- a/reactos/dll/cpl/ncpa/ncpa.c
+++ b/reactos/dll/cpl/ncpa/ncpa.c
@@ -336,9 +336,9 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 					IP_ADAPTER_INFO Adapters[64];
 					IP_ADAPTER_INFO *pAdapter;
 					TCHAR *tpszCfgInstanceID;
-					DWORD dwSize = sizeof(Adapters);
+					ULONG ulSize = sizeof(Adapters);
 					memset(&Adapters,0x00,sizeof(Adapters));
-					if(GetAdaptersInfo(Adapters,&dwSize)!=ERROR_SUCCESS)
+					if(GetAdaptersInfo(Adapters,&ulSize)!=ERROR_SUCCESS)
 						break;;
 					pAdapter = Adapters;
 					tpszCfgInstanceID = (TCHAR*)pPage->lParam;
diff --git a/reactos/dll/cpl/ncpa/ncpa.h b/reactos/dll/cpl/ncpa/ncpa.h
index 17d1d92d7ab..4d947706051 100644
--- a/reactos/dll/cpl/ncpa/ncpa.h
+++ b/reactos/dll/cpl/ncpa/ncpa.h
@@ -13,7 +13,7 @@ typedef struct
 
 extern HINSTANCE hApplet;
 
-extern DWORD DbgPrint(PCCH Fmt, ...);
+extern ULONG DbgPrint(PCCH Fmt, ...);
 
 #endif // __NCPA_H
 
diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c
index dbdcadc8053..669ea0a5385 100644
--- a/reactos/dll/cpl/powercfg/powercfg.c
+++ b/reactos/dll/cpl/powercfg/powercfg.c
@@ -18,7 +18,7 @@
 
 #define NUM_APPLETS	(1)
 
-LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK powershemesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK alarmsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK advancedProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -80,8 +80,8 @@ PropSheetProc(
 }
 
 /* First Applet */
-LONG APIENTRY
-Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)	
+static LONG APIENTRY
+Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)	
 {
   PROPSHEETPAGE psp[5];
   PROPSHEETHEADER psh;
diff --git a/reactos/dll/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c
index 90b787ec7ed..b7422fb9f79 100644
--- a/reactos/dll/cpl/timedate/timedate.c
+++ b/reactos/dll/cpl/timedate/timedate.c
@@ -12,7 +12,7 @@
 
 #define NUM_APPLETS 1
 
-LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 HINSTANCE hApplet;
 
@@ -68,8 +68,8 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 }
 
 
-LONG APIENTRY
-Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
+static LONG APIENTRY
+Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
     PROPSHEETHEADER psh;
     PROPSHEETPAGE psp[3];
diff --git a/reactos/dll/cpl/usrmgr/usrmgr.c b/reactos/dll/cpl/usrmgr/usrmgr.c
index e04aebae5ea..e43fd8d1764 100644
--- a/reactos/dll/cpl/usrmgr/usrmgr.c
+++ b/reactos/dll/cpl/usrmgr/usrmgr.c
@@ -12,7 +12,7 @@
 
 #define NUM_APPLETS 1
 
-LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
+static LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 HINSTANCE hApplet = 0;
 
@@ -41,8 +41,8 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 
 
 /* Display Applet */
-LONG APIENTRY
-UsrmgrApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
+static LONG APIENTRY
+UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
     PROPSHEETPAGE psp[3];
     PROPSHEETHEADER psh;