[PATCH] Add definitions to winuser.h

2002-06-17  Casper S. Hornstrup  <[email protected]>

	* include/winuser.h (VK_*, FLASHW_*, INPUT_MOUSE, INPUT_KEYBOARD,
	INPUT_HARDWARE, HDEVNOTIFY): Add defines.
	(FLASHWINFO, PFLASHWINFO, tagMOUSEMOVEPOINT, tagMOUSEINPUT,
	tagKEYBDINPUT, tagHARDWAREINPUT, tagINPUT, tagGUITHREADINFO): Add typedefs.
	(CreateDesktopA, CreateDesktopW, CreateMDIWindowA, CreateMDIWindowW,
	GetClassInfoA, GetClassInfoExA, GetClassInfoW, GetClassInfoExW,
	GetKeyboardLayoutList, GetMenuInfo, MessageBoxIndirectA,
	MessageBoxIndirectW, MsgWaitForMultipleObjects,
	MsgWaitForMultipleObjectsEx, RegisterClassA, RegisterClassW,
	RegisterClassExA, RegisterClassExW, SetMenuItemInfoA,
	SetMenuItemInfoW): Correct prototypes.


Index: include/winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.16
diff -b -u -r1.16 winuser.h
--- include/winuser.h	14 Jun 2002 11:44:47 -0000	1.16
+++ include/winuser.h	15 Jun 2002 12:33:01 -0000
@@ -1587,6 +1587,42 @@
 #define VK_INSERT	45
 #define VK_DELETE	46
 #define VK_HELP	47
+#define VK_0 48
+#define VK_1 49
+#define VK_2 50
+#define VK_3 51
+#define VK_4 52
+#define VK_5 53
+#define VK_6 54
+#define VK_7 55
+#define VK_8 56
+#define VK_9 57
+#define VK_A 65
+#define VK_B 66
+#define VK_C 67
+#define VK_D 68
+#define VK_E 69
+#define VK_F 70
+#define VK_G 71
+#define VK_H 72
+#define VK_I 73
+#define VK_J 74
+#define VK_K 75
+#define VK_L 76
+#define VK_M 77
+#define VK_N 78
+#define VK_O 79
+#define VK_P 80
+#define VK_Q 81
+#define VK_R 82
+#define VK_S 83
+#define VK_T 84
+#define VK_U 85
+#define VK_V 86
+#define VK_W 87
+#define VK_X 88
+#define VK_Y 89
+#define VK_Z 90
 #define VK_LWIN	0x5B
 #define VK_RWIN	0x5C
 #define VK_APPS	0x5D
@@ -1896,6 +1932,15 @@
 #define MOD_RIGHT 16384
 #define MOD_LEFT 32768
 #define LLKHF_ALTDOWN  0x00000020
+#define FLASHW_STOP 0
+#define FLASHW_CAPTION 1
+#define FLASHW_TRAY 2
+#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY)
+#define FLASHW_TIMER 4
+#define FLASHW_TIMERNOFG 12
+#define INPUT_MOUSE 0
+#define INPUT_KEYBOARD 1
+#define INPUT_HARDWARE 2
 
 #ifndef RC_INVOKED
 typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
@@ -1922,6 +1967,7 @@
 typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT);
 DECLARE_HANDLE(HHOOK);
 DECLARE_HANDLE(HDWP);
+DECLARE_HANDLE(HDEVNOTIFY);
 typedef struct tagACCEL {
 	BYTE fVirt;
 	WORD key;
@@ -2590,7 +2636,58 @@
 	DWORD time;
 	DWORD dwExtraInfo;
 } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
-
+typedef struct {
+  UINT  cbSize;
+  HWND  hwnd;
+  DWORD dwFlags;
+  UINT  uCount;
+  DWORD dwTimeout;
+} FLASHWINFO, *PFLASHWINFO;
+typedef struct tagMOUSEMOVEPOINT {
+  int x;
+  int y;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT;
+typedef struct tagMOUSEINPUT {
+  LONG dx;
+  LONG dy;
+  DWORD mouseData;
+  DWORD dwFlags;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} MOUSEINPUT, *PMOUSEINPUT;
+typedef struct tagKEYBDINPUT {
+  WORD wVk;
+  WORD wScan;
+  DWORD dwFlags;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} KEYBDINPUT, *PKEYBDINPUT;
+typedef struct tagHARDWAREINPUT {
+  DWORD uMsg;
+  WORD wParamL;
+  WORD wParamH;
+} HARDWAREINPUT, *PHARDWAREINPUT;
+typedef struct tagINPUT {
+  DWORD type;
+  union {
+		MOUSEINPUT mi;
+		KEYBDINPUT ki;
+		HARDWAREINPUT hi;
+  } DUMMYUNIONNAME;
+} INPUT, *PINPUT, FAR *LPINPUT;
+typedef struct tagGUITHREADINFO {
+	DWORD cbSize;
+	DWORD flags;
+	HWND hwndActive;
+	HWND hwndFocus;
+	HWND hwndCapture;
+	HWND hwndMenuOwner;
+	HWND hwndMoveSize;
+	HWND hwndCaret;
+	RECT rcCaret;
+} GUITHREADINFO, *PGUITHREADINFO;
 
 #define AnsiToOem CharToOemA
 #define OemToAnsi OemToCharA
@@ -2676,8 +2773,8 @@
 HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
 BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
 HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
-HDESK WINAPI CreateDesktopA(LPSTR,LPSTR,LPDEVMODEA,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-HDESK WINAPI CreateDesktopW(LPWSTR,LPWSTR,LPDEVMODEW,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
+HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
 #define CreateDialogA(h,n,w,f) CreateDialogParamA(h,n,w,f,0)
 #define CreateDialogW(h,n,w,f) CreateDialogParamW(h,n,w,f,0)
 #define CreateDialogIndirectA(h,t,w,f) CreateDialogIndirectParamA(h,t,w,f,0)
@@ -2690,8 +2787,8 @@
 HICON WINAPI CreateIconFromResource(PBYTE,DWORD,BOOL,DWORD);
 HICON WINAPI CreateIconFromResourceEx(PBYTE,DWORD,BOOL,DWORD,int,int,UINT);
 HICON WINAPI CreateIconIndirect(PICONINFO);
-HWND WINAPI CreateMDIWindowA(LPSTR,LPSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
-HWND WINAPI CreateMDIWindowW(LPWSTR,LPWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
+HWND WINAPI CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
+HWND WINAPI CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
 HMENU WINAPI CreateMenu(void);
 HMENU WINAPI CreatePopupMenu(void);
 #define CreateWindowA(a,b,c,d,e,f,g,h,i,j,k) CreateWindowExA(0,a,b,c,d,e,f,g,h,i,j,k)
@@ -2791,10 +2888,10 @@
 HWND WINAPI GetCapture(void);
 UINT WINAPI GetCaretBlinkTime(void);
 BOOL WINAPI GetCaretPos(LPPOINT);
-BOOL WINAPI GetClassInfoA(HINSTANCE,LPCSTR,PWNDCLASSA);
-BOOL WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,PWNDCLASSEXA);
-BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,PWNDCLASSW);
-BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,PWNDCLASSEXW);
+BOOL WINAPI GetClassInfoA(HINSTANCE,LPCSTR,LPWNDCLASSA);
+BOOL WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,LPWNDCLASSEXA);
+BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,LPWNDCLASSW);
+BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
 DWORD WINAPI GetClassLongA(HWND,int);
 DWORD WINAPI GetClassLongW(HWND,int);
 int WINAPI GetClassNameA(HWND,LPSTR,int);
@@ -2824,7 +2921,7 @@
 BOOL WINAPI GetInputState(void);
 UINT WINAPI GetKBCodePage(void);
 HKL WINAPI GetKeyboardLayout(DWORD);
-int WINAPI GetKeyboardLayoutList(int,HKL*);
+UINT WINAPI GetKeyboardLayoutList(int,HKL*);
 BOOL WINAPI GetKeyboardLayoutNameA(LPSTR);
 BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR);
 BOOL WINAPI GetKeyboardState(PBYTE);
@@ -2907,7 +3004,7 @@
 BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO);
 DWORD WINAPI GetListBoxInfo(HWND);
 BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);
-BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO);
+BOOL WINAPI GetMenuInfo(HMENU,LPCMENUINFO);
 BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO);
 BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
 BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO);
@@ -2987,14 +3084,14 @@
 int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
 int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
 int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
-int WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
-int WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
+int WINAPI MessageBoxIndirectA(const LPMSGBOXPARAMSA);
+int WINAPI MessageBoxIndirectW(const LPMSGBOXPARAMSW);
 BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
 BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
 void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,DWORD);
 BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
-DWORD WINAPI MsgWaitForMultipleObjects(DWORD,LPHANDLE,BOOL,DWORD,DWORD);
-DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,LPHANDLE,DWORD,DWORD,DWORD);
+DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
+DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
 DWORD WINAPI OemKeyScan(WORD);
 BOOL WINAPI OemToCharA(LPCSTR,LPSTR);
 BOOL WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
@@ -3020,10 +3117,10 @@
 BOOL WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM);
 BOOL WINAPI PtInRect(LPCRECT,POINT);
 BOOL WINAPI RedrawWindow(HWND,LPCRECT,HRGN,UINT);
-ATOM WINAPI RegisterClassA(const WNDCLASSA*);
-ATOM WINAPI RegisterClassW(const WNDCLASSW*);
-ATOM WINAPI RegisterClassExA(const WNDCLASSEXA*);
-ATOM WINAPI RegisterClassExW(const WNDCLASSEXW*);
+ATOM WINAPI RegisterClassA(CONST WNDCLASSA*);
+ATOM WINAPI RegisterClassW(CONST WNDCLASSW*);
+ATOM WINAPI RegisterClassExA(CONST WNDCLASSEXA*);
+ATOM WINAPI RegisterClassExW(CONST WNDCLASSEXW*);
 UINT WINAPI RegisterClipboardFormatA(LPCSTR);
 UINT WINAPI RegisterClipboardFormatW(LPCWSTR);
 BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT);
@@ -3073,8 +3170,8 @@
 BOOL WINAPI SetMenuDefaultItem(HMENU,UINT,UINT);
 BOOL WINAPI SetMenuInfo(HMENU,LPCMENUINFO);
 BOOL WINAPI SetMenuItemBitmaps(HMENU,UINT,UINT,HBITMAP,HBITMAP);
-BOOL WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
-BOOL WINAPI SetMenuItemInfoW( HMENU,UINT,BOOL,LPCMENUITEMINFOW);
+BOOL WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,LPMENUITEMINFOA);
+BOOL WINAPI SetMenuItemInfoW( HMENU,UINT,BOOL,LPMENUITEMINFOW);
 LPARAM WINAPI SetMessageExtraInfo(LPARAM);
 BOOL WINAPI SetMessageQueue(int);
 HWND WINAPI SetParent(HWND,HWND);

2002-06-17  Casper S. Hornstrup  <[email protected]>

	* include/winuser.h (VK_*, FLASHW_*, INPUT_MOUSE, INPUT_KEYBOARD,
	INPUT_HARDWARE, HDEVNOTIFY): Add defines.
	(FLASHWINFO, PFLASHWINFO, tagMOUSEMOVEPOINT, tagMOUSEINPUT,
	tagKEYBDINPUT, tagHARDWAREINPUT, tagINPUT, tagGUITHREADINFO): Add typedefs.
	(CreateDesktopA, CreateDesktopW, CreateMDIWindowA, CreateMDIWindowW,
	GetClassInfoA, GetClassInfoExA, GetClassInfoW, GetClassInfoExW,
	GetKeyboardLayoutList, GetMenuInfo, MessageBoxIndirectA,
	MessageBoxIndirectW, MsgWaitForMultipleObjects,
	MsgWaitForMultipleObjectsEx, RegisterClassA, RegisterClassW,
	RegisterClassExA, RegisterClassExW, SetMenuItemInfoA,
	SetMenuItemInfoW): Correct prototypes.


Index: include/winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.16
diff -b -u -r1.16 winuser.h
--- include/winuser.h	14 Jun 2002 11:44:47 -0000	1.16
+++ include/winuser.h	15 Jun 2002 12:33:01 -0000
@@ -1587,6 +1587,42 @@
 #define VK_INSERT	45
 #define VK_DELETE	46
 #define VK_HELP	47
+#define VK_0 48
+#define VK_1 49
+#define VK_2 50
+#define VK_3 51
+#define VK_4 52
+#define VK_5 53
+#define VK_6 54
+#define VK_7 55
+#define VK_8 56
+#define VK_9 57
+#define VK_A 65
+#define VK_B 66
+#define VK_C 67
+#define VK_D 68
+#define VK_E 69
+#define VK_F 70
+#define VK_G 71
+#define VK_H 72
+#define VK_I 73
+#define VK_J 74
+#define VK_K 75
+#define VK_L 76
+#define VK_M 77
+#define VK_N 78
+#define VK_O 79
+#define VK_P 80
+#define VK_Q 81
+#define VK_R 82
+#define VK_S 83
+#define VK_T 84
+#define VK_U 85
+#define VK_V 86
+#define VK_W 87
+#define VK_X 88
+#define VK_Y 89
+#define VK_Z 90
 #define VK_LWIN	0x5B
 #define VK_RWIN	0x5C
 #define VK_APPS	0x5D
@@ -1896,6 +1932,15 @@
 #define MOD_RIGHT 16384
 #define MOD_LEFT 32768
 #define LLKHF_ALTDOWN  0x00000020
+#define FLASHW_STOP 0
+#define FLASHW_CAPTION 1
+#define FLASHW_TRAY 2
+#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY)
+#define FLASHW_TIMER 4
+#define FLASHW_TIMERNOFG 12
+#define INPUT_MOUSE 0
+#define INPUT_KEYBOARD 1
+#define INPUT_HARDWARE 2
 
 #ifndef RC_INVOKED
 typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
@@ -1922,6 +1967,7 @@
 typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT);
 DECLARE_HANDLE(HHOOK);
 DECLARE_HANDLE(HDWP);
+DECLARE_HANDLE(HDEVNOTIFY);
 typedef struct tagACCEL {
 	BYTE fVirt;
 	WORD key;
@@ -2590,7 +2636,58 @@
 	DWORD time;
 	DWORD dwExtraInfo;
 } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
-
+typedef struct {
+  UINT  cbSize;
+  HWND  hwnd;
+  DWORD dwFlags;
+  UINT  uCount;
+  DWORD dwTimeout;
+} FLASHWINFO, *PFLASHWINFO;
+typedef struct tagMOUSEMOVEPOINT {
+  int x;
+  int y;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT;
+typedef struct tagMOUSEINPUT {
+  LONG dx;
+  LONG dy;
+  DWORD mouseData;
+  DWORD dwFlags;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} MOUSEINPUT, *PMOUSEINPUT;
+typedef struct tagKEYBDINPUT {
+  WORD wVk;
+  WORD wScan;
+  DWORD dwFlags;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} KEYBDINPUT, *PKEYBDINPUT;
+typedef struct tagHARDWAREINPUT {
+  DWORD uMsg;
+  WORD wParamL;
+  WORD wParamH;
+} HARDWAREINPUT, *PHARDWAREINPUT;
+typedef struct tagINPUT {
+  DWORD type;
+  union {
+		MOUSEINPUT mi;
+		KEYBDINPUT ki;
+		HARDWAREINPUT hi;
+  } DUMMYUNIONNAME;
+} INPUT, *PINPUT, FAR *LPINPUT;
+typedef struct tagGUITHREADINFO {
+	DWORD cbSize;
+	DWORD flags;
+	HWND hwndActive;
+	HWND hwndFocus;
+	HWND hwndCapture;
+	HWND hwndMenuOwner;
+	HWND hwndMoveSize;
+	HWND hwndCaret;
+	RECT rcCaret;
+} GUITHREADINFO, *PGUITHREADINFO;
 
 #define AnsiToOem CharToOemA
 #define OemToAnsi OemToCharA
@@ -2676,8 +2773,8 @@
 HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
 BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
 HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
-HDESK WINAPI CreateDesktopA(LPSTR,LPSTR,LPDEVMODEA,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-HDESK WINAPI CreateDesktopW(LPWSTR,LPWSTR,LPDEVMODEW,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
+HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
 #define CreateDialogA(h,n,w,f) CreateDialogParamA(h,n,w,f,0)
 #define CreateDialogW(h,n,w,f) CreateDialogParamW(h,n,w,f,0)
 #define CreateDialogIndirectA(h,t,w,f) CreateDialogIndirectParamA(h,t,w,f,0)
@@ -2690,8 +2787,8 @@
 HICON WINAPI CreateIconFromResource(PBYTE,DWORD,BOOL,DWORD);
 HICON WINAPI CreateIconFromResourceEx(PBYTE,DWORD,BOOL,DWORD,int,int,UINT);
 HICON WINAPI CreateIconIndirect(PICONINFO);
-HWND WINAPI CreateMDIWindowA(LPSTR,LPSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
-HWND WINAPI CreateMDIWindowW(LPWSTR,LPWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
+HWND WINAPI CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
+HWND WINAPI CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
 HMENU WINAPI CreateMenu(void);
 HMENU WINAPI CreatePopupMenu(void);
 #define CreateWindowA(a,b,c,d,e,f,g,h,i,j,k) CreateWindowExA(0,a,b,c,d,e,f,g,h,i,j,k)
@@ -2791,10 +2888,10 @@
 HWND WINAPI GetCapture(void);
 UINT WINAPI GetCaretBlinkTime(void);
 BOOL WINAPI GetCaretPos(LPPOINT);
-BOOL WINAPI GetClassInfoA(HINSTANCE,LPCSTR,PWNDCLASSA);
-BOOL WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,PWNDCLASSEXA);
-BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,PWNDCLASSW);
-BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,PWNDCLASSEXW);
+BOOL WINAPI GetClassInfoA(HINSTANCE,LPCSTR,LPWNDCLASSA);
+BOOL WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,LPWNDCLASSEXA);
+BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,LPWNDCLASSW);
+BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
 DWORD WINAPI GetClassLongA(HWND,int);
 DWORD WINAPI GetClassLongW(HWND,int);
 int WINAPI GetClassNameA(HWND,LPSTR,int);
@@ -2824,7 +2921,7 @@
 BOOL WINAPI GetInputState(void);
 UINT WINAPI GetKBCodePage(void);
 HKL WINAPI GetKeyboardLayout(DWORD);
-int WINAPI GetKeyboardLayoutList(int,HKL*);
+UINT WINAPI GetKeyboardLayoutList(int,HKL*);
 BOOL WINAPI GetKeyboardLayoutNameA(LPSTR);
 BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR);
 BOOL WINAPI GetKeyboardState(PBYTE);
@@ -2907,7 +3004,7 @@
 BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO);
 DWORD WINAPI GetListBoxInfo(HWND);
 BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);
-BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO);
+BOOL WINAPI GetMenuInfo(HMENU,LPCMENUINFO);
 BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO);
 BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
 BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO);
@@ -2987,14 +3084,14 @@
 int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
 int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
 int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
-int WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
-int WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
+int WINAPI MessageBoxIndirectA(const LPMSGBOXPARAMSA);
+int WINAPI MessageBoxIndirectW(const LPMSGBOXPARAMSW);
 BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
 BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
 void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,DWORD);
 BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
-DWORD WINAPI MsgWaitForMultipleObjects(DWORD,LPHANDLE,BOOL,DWORD,DWORD);
-DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,LPHANDLE,DWORD,DWORD,DWORD);
+DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
+DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
 DWORD WINAPI OemKeyScan(WORD);
 BOOL WINAPI OemToCharA(LPCSTR,LPSTR);
 BOOL WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
@@ -3020,10 +3117,10 @@
 BOOL WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM);
 BOOL WINAPI PtInRect(LPCRECT,POINT);
 BOOL WINAPI RedrawWindow(HWND,LPCRECT,HRGN,UINT);
-ATOM WINAPI RegisterClassA(const WNDCLASSA*);
-ATOM WINAPI RegisterClassW(const WNDCLASSW*);
-ATOM WINAPI RegisterClassExA(const WNDCLASSEXA*);
-ATOM WINAPI RegisterClassExW(const WNDCLASSEXW*);
+ATOM WINAPI RegisterClassA(CONST WNDCLASSA*);
+ATOM WINAPI RegisterClassW(CONST WNDCLASSW*);
+ATOM WINAPI RegisterClassExA(CONST WNDCLASSEXA*);
+ATOM WINAPI RegisterClassExW(CONST WNDCLASSEXW*);
 UINT WINAPI RegisterClipboardFormatA(LPCSTR);
 UINT WINAPI RegisterClipboardFormatW(LPCWSTR);
 BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT);
@@ -3073,8 +3170,8 @@
 BOOL WINAPI SetMenuDefaultItem(HMENU,UINT,UINT);
 BOOL WINAPI SetMenuInfo(HMENU,LPCMENUINFO);
 BOOL WINAPI SetMenuItemBitmaps(HMENU,UINT,UINT,HBITMAP,HBITMAP);
-BOOL WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
-BOOL WINAPI SetMenuItemInfoW( HMENU,UINT,BOOL,LPCMENUITEMINFOW);
+BOOL WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,LPMENUITEMINFOA);
+BOOL WINAPI SetMenuItemInfoW( HMENU,UINT,BOOL,LPMENUITEMINFOW);
 LPARAM WINAPI SetMessageExtraInfo(LPARAM);
 BOOL WINAPI SetMessageQueue(int);
 HWND WINAPI SetParent(HWND,HWND);