2002-06-19 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* include/winuser.h (FLASHW_*,INPUT_MOUSE,INPUT_KEYBOARD,
	INPUT_HARDWARE): Add defines.
	(HDEVNOTIFY): Add typedef.
	(FLASHWINFO,tagMOUSEMOVEPOINT,tagMOUSEINPUT,tagKEYBDINPUT,
	tagHARDWAREINPUT,tagINPUT,tagGUITHREADINFO): Define structs and
	typedefs.
	(CreateDesktop[AW],CreateMDIWindow[AW],GetClassInfo[AW],
	GetClassInfoEx[AW],GetKeyboardLayoutList,
	MessageBoxIndirect[AW],MsgWaitForMultipleObjects,
	MsgWaitForMultipleObjectsEx, RegisterClass[AW],
	RegisterClassEx[AW]): Correct prototypes.

Remove duplicate ChangeLog entry of 2001-12-07

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index eebc19353c74a9e5d4951241279c2b67dfbd6ba6..a47fe42257a1d888403ff6daecae358c1b976bd0 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-19  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+       * include/winuser.h (FLASHW_*,INPUT_MOUSE,INPUT_KEYBOARD,
+       INPUT_HARDWARE): Add defines.
+       (HDEVNOTIFY): Add typedef.
+       (FLASHWINFO,tagMOUSEMOVEPOINT,tagMOUSEINPUT,tagKEYBDINPUT,
+       tagHARDWAREINPUT,tagINPUT,tagGUITHREADINFO): Define structs and
+       typedefs.
+       (CreateDesktop[AW],CreateMDIWindow[AW],GetClassInfo[AW],
+       GetClassInfoEx[AW],GetKeyboardLayoutList,
+       MessageBoxIndirect[AW],MsgWaitForMultipleObjects,
+       MsgWaitForMultipleObjectsEx, RegisterClass[AW],
+       RegisterClassEx[AW]): Correct prototypes.
+
 2002-06-19  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * include/ddeml.h (DdeCreateStringHandle{AW]:Correct
@@ -708,14 +722,6 @@
        * Makefile.in: Increment VERSION.
        * include/w32api.h: Ditto.
 
-2001-12-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-       * include/setupi.h (SetupDiCreateDeviceInterfaceRegKey[AW],
-       SetupDiCreateDevRegKey[AW],SetupDiDeleteDeviceInterfaceRegKey,
-       SetupDiDeleteDevRegKey,SetupDiOpenClassRegKey,
-       SetupDiOpenClassRegKeyEx[AW],SetupDiOpenDeviceInterfaceRegKey,
-       SetupDiOpenDevRegKey): Correct function names.
-
 2001-12-07  Earnie Boyd  <earnie@users.sf.net>
 
        * Makefile.in: Increment VERSION.

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 943d6bcf3eaf86cc1c48d65eb47ce5edea8b10a7..62f565b09cc09a0b273992364ad49463326987d9 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1896,6 +1896,17 @@ extern "C" {
 #define MOD_RIGHT 16384
 #define MOD_LEFT 32768
 #define LLKHF_ALTDOWN  0x00000020
+#if(WINVER >= 0x0500)
+#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
+#endif /* (WINVER >= 0x0500) */
+#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 +1933,7 @@ typedef NAMEENUMPROCW WINSTAENUMPROCW;
 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 +2602,60 @@ typedef struct tagKBDLLHOOKSTRUCT {
        DWORD time;
        DWORD dwExtraInfo;
 } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
-
+#if(WINVER >= 0x0500)
+typedef struct {
+  UINT  cbSize;
+  HWND  hwnd;
+  DWORD dwFlags;
+  UINT  uCount;
+  DWORD dwTimeout;
+} FLASHWINFO, *PFLASHWINFO;
+#endif /* (WINVER >= 0x0500) */
+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;
+  _ANONYMOUS_UNION 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 +2741,8 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int);
 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 +2755,8 @@ HICON WINAPI CreateIcon(HINSTANCE,int,int,BYTE,BYTE,const BYTE*,const BYTE*);
 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 +2856,10 @@ SHORT WINAPI GetAsyncKeyState(int);
 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 +2889,7 @@ BOOL WINAPI GetIconInfo(HICON,PICONINFO);
 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);
@@ -2987,14 +3052,14 @@ int WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
 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 MSGBOXPARAMSA*);
+int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
 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 +3085,10 @@ BOOL WINAPI PostThreadMessageA(DWORD,UINT,WPARAM,LPARAM);
 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);