* include/winable.h (BlockInput): Add function.

* include/winable.h (WS_ACTIVECAPTION): Add constant.
	For use with WINDOWINFO structure.

	* include/winuser.h [_WIN32_WINNT >= 0x0500] (LockWorkStation):
	Add function.

	* include/winuser.h [_WIN32_WINNT >= 0x0501] (IsWinEventHookInstalled):
	Add function.

	* include/winuser.h [WINVER >= 0x0500] (UnhookWinEvent):
	Add function...

	* include/winable.h [WINVER < 0x0500] (UnhookWinEvent):
	...and duplicate.

	* include/winuser.h [_WIN32_WINNT >= 0x0403] (SendInput):
	Guard function...

	* include/winable.h [_WIN32_WINNT < 0x0403] (SendInput):
	...and duplicate.

	* include/winuser.h [WINVER >= 0x0500] (NotifyWinEvent):
	Guard function...

	* include/winable.h [WINVER < 0x0500] (NotifyWinEvent):
	...and duplicate.

	* include/winuser.h [WINVER >= 0x0500] (MOUSEINPUT, KEYBDINPUT,
	HARDWAREINPUT, INPUT): Guard structures...

	* include/winable.h [WINVER < 0x0500] (MOUSEINPUT, KEYBDINPUT,
	HARDWAREINPUT, INPUT): ...and duplicate.

	* include/winuser.h [_WIN32_WINNT >= 0x0403] (INPUT_MOUSE,
	INPUT_KEYBOARD, INPUT_HARDWARE): Guard constants...

	* include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE,
	INPUT_KEYBOARD, INPUT_HARDWARE): ...and duplicate.

	* include/winuser.h: Move around some lines. Reformat according
	to recommended or dominant style. Remove FAR keyword.

	* include/winable.h: Move around some lines.

	* lib/user32.def (BlockInput, IsWinEventHookInstalled,
	LockWorkStation, UnhookWinEvent): Add functions.

winsup/w32api/ChangeLog

@@ -1,3 +1,54 @@
+2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/winable.h (BlockInput): Add function.
+
+	* include/winable.h (WS_ACTIVECAPTION): Add constant.
+	For use with WINDOWINFO structure.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0500] (LockWorkStation):
+	Add function.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0501] (IsWinEventHookInstalled):
+	Add function.
+
+	* include/winuser.h [WINVER >= 0x0500] (UnhookWinEvent):
+	Add function...
+
+	* include/winable.h [WINVER < 0x0500] (UnhookWinEvent):
+	...and duplicate.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0403] (SendInput):
+	Guard function...
+
+	* include/winable.h [_WIN32_WINNT < 0x0403] (SendInput):
+	...and duplicate.
+
+	* include/winuser.h [WINVER >= 0x0500] (NotifyWinEvent):
+	Guard function...
+
+	* include/winable.h [WINVER < 0x0500] (NotifyWinEvent):
+	...and duplicate.
+
+	* include/winuser.h [WINVER >= 0x0500] (MOUSEINPUT, KEYBDINPUT,
+	HARDWAREINPUT, INPUT): Guard structures...
+
+	* include/winable.h [WINVER < 0x0500] (MOUSEINPUT, KEYBDINPUT,
+	HARDWAREINPUT, INPUT): ...and duplicate.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0403] (INPUT_MOUSE,
+	INPUT_KEYBOARD, INPUT_HARDWARE): Guard constants...
+
+	* include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE,
+	INPUT_KEYBOARD, INPUT_HARDWARE): ...and duplicate.
+
+	* include/winuser.h: Move around some lines. Reformat according
+	to recommended or dominant style. Remove FAR keyword.
+
+	* include/winable.h: Move around some lines.
+
+	* lib/user32.def (BlockInput, IsWinEventHookInstalled,
+	LockWorkStation, UnhookWinEvent): Add functions.
+
 2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winuser.h [_WIN32_WINNT >= 0x0501] (PrintWindow,
@@ -38,8 +89,8 @@
 2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winnt.h (ACE_INHERITED_OBJECT_TYPE_PRESENT,
-	ACE_OBJECT_TYPE_PRESENT): Add constants. For use with
+	ACE_OBJECT_TYPE_PRESENT): Add constants.
-	OBJECTS_AND_NAME structure.
+	For use with OBJECTS_AND_NAME structure.
 
 2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 

winsup/w32api/include/winable.h

@@ -8,12 +8,12 @@
 extern "C" {
 #endif
 
-#if (WINVER < 0x0500)
 #if (_WIN32_WINNT < 0x0403)
-#define INPUT_MOUSE 0
+#define INPUT_MOUSE 0x00000000
-#define INPUT_KEYBOARD 1
+#define INPUT_KEYBOARD 0x00000001
-#define INPUT_HARDWARE 2
+#define INPUT_HARDWARE 0x00000002
 #endif /* (_WIN32_WINNT < 0x04030) */
+#if (WINVER < 0x0500)
 #define CHILDID_SELF 0
 #define OBJID_WINDOW 0x00000000
 #define OBJID_SYSMENU 0xFFFFFFFF
@@ -36,6 +36,39 @@ extern "C" {
 #define WINEVENT_SKIPOWNTHREAD 0x0001
 #define WINEVENT_SKIPOWNPROCESS 0x0002
 #define WINEVENT_INCONTEXT 0x0004
+#endif /* (WINVER < 0x0500) */
+#if (_WIN32_WINNT < 0x0403)
+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,*LPINPUT;
+#endif /* (_WIN32_WINNT < 0x0403) */
+#if (WINVER < 0x0500)
+typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD);
 typedef struct tagGUITHREADINFO {
 	DWORD cbSize;
 	DWORD flags;
@@ -47,12 +80,20 @@ typedef struct tagGUITHREADINFO {
 	HWND hwndCaret;
 	RECT rcCaret;
 } GUITHREADINFO,*PGUITHREADINFO,*LPGUITHREADINFO;
-typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD);
+#endif /* (WINVER < 0x0500) */
+
+BOOL WINAPI BlockInput(BOOL);
+#if (_WIN32_WINNT < 0x0403)
+UINT WINAPI SendInput(UINT,LPINPUT,int);
+#endif
+#if (WINVER < 0x0500)
 BOOL WINAPI GetGUIThreadInfo(DWORD,LPGUITHREADINFO);
+void WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
 HWINEVENTHOOK WINAPI SetWinEventHook(UINT,UINT,HMODULE,WINEVENTPROC,DWORD,DWORD,UINT);
+BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK);
 #endif /* (WINVER < 0x0500) */
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* _WINABLE_H */
+#endif

winsup/w32api/include/winuser.h

@@ -469,7 +469,7 @@ extern "C" {
 #if (WINVER >= 0x0500)
 #define DFCS_TRANSPARENT	0x800
 #define DFCS_HOT	0x1000
-#endif /* (WINVER >= 0x0500) */
+#endif
 #define DFCS_ADJUSTRECT	0x2000
 #define DFCS_FLAT	0x4000
 #define DFCS_MONO	0x8000
@@ -2042,13 +2042,16 @@ extern "C" {
 #define FLASHW_TIMER 4
 #define FLASHW_TIMERNOFG 12
 #endif /* (WINVER >= 0x0500) */
-#define INPUT_MOUSE 0
-#define INPUT_KEYBOARD 1
-#define INPUT_HARDWARE 2
 #define CURSOR_SHOWING 0x00000001
+#define WS_ACTIVECAPTION 0x00000001
+#if (_WIN32_WINNT >= 0x0403)
+#define INPUT_MOUSE 0x00000000
+#define INPUT_KEYBOARD 0x00000001
+#define INPUT_HARDWARE 0x00000002
+#endif /* (_WIN32_WINNT >= 0x0403) */
 #if (WINVER >= 0x0400)
 #define ENDSESSION_LOGOFF 0x80000000
-#endif /* (WINVER >= 0x0400) */
+#endif
 #if (WINVER >= 0x0500)
 #define CHILDID_SELF 0
 #define OBJID_WINDOW 0x00000000
@@ -2625,7 +2628,7 @@ typedef struct tagMOUSEHOOKSTRUCT {
 	HWND hwnd;
 	UINT wHitTestCode;
 	DWORD dwExtraInfo;
-} MOUSEHOOKSTRUCT, FAR *LPMOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT;
+} MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT;
 typedef struct tagTRACKMOUSEEVENT {
 	DWORD cbSize;
 	DWORD dwFlags;
@@ -2838,7 +2841,7 @@ typedef struct tagKBDLLHOOKSTRUCT {
 	DWORD flags;
 	DWORD time;
 	DWORD dwExtraInfo;
-} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
+} KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT;
 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
 typedef struct {
   UINT  cbSize;
@@ -2856,6 +2859,7 @@ typedef struct tagMOUSEMOVEPOINT {
   ULONG_PTR dwExtraInfo;
 } MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT;
 #endif
+#if (_WIN32_WINNT >= 0x0403)
 typedef struct tagMOUSEINPUT {
   LONG dx;
   LONG dy;
@@ -2883,7 +2887,8 @@ typedef struct tagINPUT {
 		KEYBDINPUT ki;
 		HARDWAREINPUT hi;
   } DUMMYUNIONNAME;
-} INPUT, *PINPUT, FAR *LPINPUT;
+} INPUT,*PINPUT,*LPINPUT;
+#endif /* (_WIN32_WINNT >= 0x0403) */
 #if (WINVER >= 0x0500)
 typedef struct tagGUITHREADINFO {
 	DWORD cbSize;
@@ -3134,7 +3139,7 @@ BOOL WINAPI FlashWindowEx(PFLASHWINFO);
 int WINAPI FrameRect(HDC,LPCRECT,HBRUSH);
 BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,int,int);
 HWND WINAPI GetActiveWindow(void);
-HWND WINAPI GetAncestor(HWND hwnd, UINT gaFlags);
+HWND WINAPI GetAncestor(HWND,UINT);
 SHORT WINAPI GetAsyncKeyState(int);
 HWND WINAPI GetCapture(void);
 UINT WINAPI GetCaretBlinkTime(void);
@@ -3273,7 +3278,7 @@ BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);
 BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO);
 #if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI GetProcessDefaultLayout(DWORD*);
-#endif /* (_WIN32_WINNT >= 0x0500) */
+#endif
 BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO);
 BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
 BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO);
@@ -3324,6 +3329,9 @@ BOOL WINAPI IsWindow(HWND);
 BOOL WINAPI IsWindowEnabled(HWND);
 BOOL WINAPI IsWindowUnicode(HWND);
 BOOL WINAPI IsWindowVisible(HWND);
+#if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI IsWinEventHookInstalled(DWORD);
+#endif
 BOOL WINAPI IsZoomed(HWND);
 VOID WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD);
 BOOL WINAPI KillTimer(HWND,UINT);
@@ -3348,6 +3356,9 @@ HMENU WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
 int WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,int);
 int WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,int);
 BOOL WINAPI LockWindowUpdate(HWND);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI LockWorkStation(VOID);
+#endif
 int WINAPI LookupIconIdFromDirectory(PBYTE,BOOL);
 int WINAPI LookupIconIdFromDirectoryEx(PBYTE,BOOL,int,int,UINT);
 BOOL WINAPI MapDialogRect(HWND,LPRECT);
@@ -3370,7 +3381,9 @@ void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
 BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
 DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
 DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
+#if (WINVER >= 0x0500)
 void WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
+#endif
 DWORD WINAPI OemKeyScan(WORD);
 BOOL WINAPI OemToCharA(LPCSTR,LPSTR);
 BOOL WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
@@ -3427,7 +3440,9 @@ BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT);
 int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
 LONG WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM);
 LONG WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM);
+#if (_WIN32_WINNT >= 0x0403)
 UINT WINAPI SendInput(UINT,LPINPUT,int);
+#endif /* (_WIN32_WINNT >= 0x0403) */
 LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
 BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
 BOOL WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
@@ -3536,6 +3551,9 @@ BOOL WINAPI TranslateMDISysAccel(HWND,LPMSG);
 BOOL WINAPI TranslateMessage(const MSG*);
 BOOL WINAPI UnhookWindowsHook(int,HOOKPROC);
 BOOL WINAPI UnhookWindowsHookEx(HHOOK);
+#if (WINVER >= 0x0500)
+BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK);
+#endif
 BOOL WINAPI UnionRect(LPRECT,LPCRECT,LPCRECT);
 BOOL WINAPI UnloadKeyboardLayout(HKL);
 BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
@@ -3907,4 +3925,4 @@ typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #ifdef __cplusplus
 }
 #endif
-#endif /* _WINUSER_H */
+#endif

winsup/w32api/lib/user32.def

@@ -12,6 +12,7 @@ ArrangeIconicWindows@4
 AttachThreadInput@12
 BeginDeferWindowPos@4
 BeginPaint@8
+BlockInput@4
 BringWindowToTop@4
 BroadcastSystemMessage@20
 BroadcastSystemMessageA@20
@@ -382,6 +383,7 @@ IsHungAppWindow@4
 IsIconic@4
 IsMenu@4
 IsRectEmpty@4
+IsWinEventHookInstalled@4
 IsWindow@4
 IsWindowEnabled@4
 IsWindowUnicode@4
@@ -411,6 +413,7 @@ LoadStringA@16
 LoadStringW@16
 LockSetForegroundWindow@4
 LockWindowUpdate@4
+LockWorkStation@0
 LookupIconIdFromDirectory@8
 LookupIconIdFromDirectoryEx@20
 MapDialogRect@8
@@ -590,6 +593,7 @@ TranslateAcceleratorA@12
 TranslateAcceleratorW@12
 TranslateMDISysAccel@8
 TranslateMessage@4
+UnhookWinEvent@4
 UnhookWindowsHook@8
 UnhookWindowsHookEx@4
 UnionRect@12