From ae11aef9046b04775be40c6a46585c3fd9c6e6f4 Mon Sep 17 00:00:00 2001 From: papadopo Date: Fri, 26 Sep 2003 14:46:33 +0000 Subject: [PATCH] * 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 | 55 +++++++++++++++++++++++++- winsup/w32api/include/winable.h | 59 +++++++++++++++++++++++----- winsup/w32api/include/winuser.h | 86 +++++++++++++++++++++++++---------------- winsup/w32api/lib/user32.def | 4 ++ 4 files changed, 159 insertions(+), 45 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7280f87d84..50edc0e916 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,56 @@ 2003-09-26 Dimitri Papadopoulos + * 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 + * include/winuser.h [_WIN32_WINNT >= 0x0501] (PrintWindow, PW_CLIENTONLY): Add function and constant. @@ -38,8 +89,8 @@ 2003-09-26 Dimitri Papadopoulos * include/winnt.h (ACE_INHERITED_OBJECT_TYPE_PRESENT, - ACE_OBJECT_TYPE_PRESENT): Add constants. For use with - OBJECTS_AND_NAME structure. + ACE_OBJECT_TYPE_PRESENT): Add constants. + For use with OBJECTS_AND_NAME structure. 2003-09-26 Dimitri Papadopoulos diff --git a/winsup/w32api/include/winable.h b/winsup/w32api/include/winable.h index aa33511fdc..0228293531 100644 --- a/winsup/w32api/include/winable.h +++ b/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_KEYBOARD 1 -#define INPUT_HARDWARE 2 +#define INPUT_MOUSE 0x00000000 +#define INPUT_KEYBOARD 0x00000001 +#define INPUT_HARDWARE 0x00000002 #endif /* (_WIN32_WINNT < 0x04030) */ +#if (WINVER < 0x0500) #define CHILDID_SELF 0 #define OBJID_WINDOW 0x00000000 #define OBJID_SYSMENU 0xFFFFFFFF @@ -32,10 +32,43 @@ extern "C" { #define GUI_INMENUMODE 0x00000004 #define GUI_SYSTEMMENUMODE 0x00000008 #define GUI_POPUPMENUMODE 0x00000010 -#define WINEVENT_OUTOFCONTEXT 0x0000 -#define WINEVENT_SKIPOWNTHREAD 0x0001 +#define WINEVENT_OUTOFCONTEXT 0x0000 +#define WINEVENT_SKIPOWNTHREAD 0x0001 #define WINEVENT_SKIPOWNPROCESS 0x0002 -#define WINEVENT_INCONTEXT 0x0004 +#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 diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 15fb0aa557..40fb812b36 100644 --- a/winsup/w32api/include/winuser.h +++ b/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 @@ -911,9 +911,9 @@ extern "C" { #define SM_CMONITORS 80 #define SM_SAMEDISPLAYFORMAT 81 #if (_WIN32_WINNT < 0x0400) -# define SM_CMETRICS 76 +#define SM_CMETRICS 76 #else -# define SM_CMETRICS 83 +#define SM_CMETRICS 83 #endif #define ARW_BOTTOMLEFT 0 #define ARW_BOTTOMRIGHT 1 @@ -2038,17 +2038,20 @@ extern "C" { #define FLASHW_STOP 0 #define FLASHW_CAPTION 1 #define FLASHW_TRAY 2 -#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY) +#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 #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 @@ -2086,7 +2089,7 @@ extern "C" { #define AW_BLEND 0x00080000 #define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000 #define DEVICE_NOTIFY_SERVICE_HANDLE 0x00000001 -#if(_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0501) #define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004 #endif #endif /* (WINVER >= 0x0500) */ @@ -2529,7 +2532,7 @@ typedef struct tagMOUSEKEYS{ DWORD iCtrlSpeed; DWORD dwReserved1; DWORD dwReserved2; -} MOUSEKEYS, *LPMOUSEKEYS; +} MOUSEKEYS,*LPMOUSEKEYS; #ifndef NOGDI typedef struct tagNONCLIENTMETRICSA { UINT cbSize; @@ -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; @@ -2642,7 +2645,7 @@ typedef struct tagEVENTMSG { UINT paramH; DWORD time; HWND hwnd; -} EVENTMSG,*PEVENTMSGMSG,*LPEVENTMSGMSG, *PEVENTMSG, *LPEVENTMSG; +} EVENTMSG,*PEVENTMSGMSG,*LPEVENTMSGMSG,*PEVENTMSG,*LPEVENTMSG; typedef struct _WINDOWPOS { HWND hwnd; HWND hwndInsertAfter; @@ -2745,7 +2748,7 @@ typedef struct tagALTTABINFO { int cxItem; int cyItem; POINT ptStart; -} ALTTABINFO, *PALTTABINFO, *LPALTTABINFO; +} ALTTABINFO,*PALTTABINFO,*LPALTTABINFO; typedef struct tagCOMBOBOXINFO { DWORD cbSize; RECT rcItem; @@ -2754,7 +2757,7 @@ typedef struct tagCOMBOBOXINFO { HWND hwndCombo; HWND hwndItem; HWND hwndList; -} COMBOBOXINFO, *PCOMBOBOXINFO, *LPCOMBOBOXINFO; +} COMBOBOXINFO,*PCOMBOBOXINFO,*LPCOMBOBOXINFO; typedef struct tagCURSORINFO { DWORD cbSize; DWORD flags; @@ -2768,7 +2771,7 @@ typedef struct tagMENUBARINFO { HWND hwndMenu; BOOL fBarFocused:1; BOOL fFocused:1; -} MENUBARINFO, *PMENUBARINFO; +} MENUBARINFO,*PMENUBARINFO; typedef struct tagMENUINFO { DWORD cbSize; DWORD fMask; @@ -2777,7 +2780,7 @@ typedef struct tagMENUINFO { HBRUSH hbrBack; DWORD dwContextHelpID; ULONG_PTR dwMenuData; -} MENUINFO, *LPMENUINFO; +} MENUINFO,*LPMENUINFO; typedef MENUINFO CONST *LPCMENUINFO; #define CCHILDREN_SCROLLBAR 5 typedef struct tagSCROLLBARINFO { @@ -2787,14 +2790,14 @@ typedef struct tagSCROLLBARINFO { int xyThumbTop; int xyThumbBottom; int reserved; - DWORD rgstate[CCHILDREN_SCROLLBAR + 1]; -} SCROLLBARINFO, *PSCROLLBARINFO, *LPSCROLLBARINFO; + DWORD rgstate[CCHILDREN_SCROLLBAR+1]; +} SCROLLBARINFO,*PSCROLLBARINFO,*LPSCROLLBARINFO; #define CCHILDREN_TITLEBAR 5 typedef struct tagTITLEBARINFO { DWORD cbSize; RECT rcTitleBar; - DWORD rgstate[CCHILDREN_TITLEBAR + 1]; -} TITLEBARINFO, *PTITLEBARINFO, *LPTITLEBARINFO; + DWORD rgstate[CCHILDREN_TITLEBAR+1]; +} TITLEBARINFO,*PTITLEBARINFO,*LPTITLEBARINFO; typedef struct tagWINDOWINFO { DWORD cbSize; RECT rcWindow; @@ -2806,11 +2809,11 @@ typedef struct tagWINDOWINFO { UINT cyWindowBorders; ATOM atomWindowType; WORD wCreatorVersion; -} WINDOWINFO, *PWINDOWINFO, *LPWINDOWINFO; +} WINDOWINFO,*PWINDOWINFO,*LPWINDOWINFO; typedef struct tagLASTINPUTINFO { UINT cbSize; DWORD dwTime; -} LASTINPUTINFO, * PLASTINPUTINFO; +} LASTINPUTINFO,*PLASTINPUTINFO; typedef struct tagMONITORINFO { DWORD cbSize; RECT rcMonitor; @@ -2824,21 +2827,21 @@ typedef struct tagMONITORINFOEXA { RECT rcWork; DWORD dwFlags; CHAR szDevice[CCHDEVICENAME]; -} MONITORINFOEXA, *LPMONITORINFOEXA; +} MONITORINFOEXA,*LPMONITORINFOEXA; typedef struct tagMONITORINFOEXW { DWORD cbSize; RECT rcMonitor; RECT rcWork; DWORD dwFlags; WCHAR szDevice[CCHDEVICENAME]; -} MONITORINFOEXW, *LPMONITORINFOEXW; +} MONITORINFOEXW,*LPMONITORINFOEXW; typedef struct tagKBDLLHOOKSTRUCT { DWORD vkCode; DWORD scanCode; DWORD flags; DWORD time; DWORD dwExtraInfo; -} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT; +} KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT; #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) typedef struct { UINT cbSize; @@ -2846,7 +2849,7 @@ typedef struct { DWORD dwFlags; UINT uCount; DWORD dwTimeout; -} FLASHWINFO, *PFLASHWINFO; +} FLASHWINFO,*PFLASHWINFO; #endif /* (WINVER >= 0x0500 || _WIN32_WINDOWS >= 0x0410) */ #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) typedef struct tagMOUSEMOVEPOINT { @@ -2854,8 +2857,9 @@ typedef struct tagMOUSEMOVEPOINT { int y; DWORD time; ULONG_PTR dwExtraInfo; -} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT, *LPMOUSEMOVEPOINT; +} MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT; #endif +#if (_WIN32_WINNT >= 0x0403) typedef struct tagMOUSEINPUT { LONG dx; LONG dy; @@ -2863,19 +2867,19 @@ typedef struct tagMOUSEINPUT { DWORD dwFlags; DWORD time; ULONG_PTR dwExtraInfo; -} MOUSEINPUT, *PMOUSEINPUT; +} MOUSEINPUT,*PMOUSEINPUT; typedef struct tagKEYBDINPUT { WORD wVk; WORD wScan; DWORD dwFlags; DWORD time; ULONG_PTR dwExtraInfo; -} KEYBDINPUT, *PKEYBDINPUT; +} KEYBDINPUT,*PKEYBDINPUT; typedef struct tagHARDWAREINPUT { DWORD uMsg; WORD wParamL; WORD wParamH; -} HARDWAREINPUT, *PHARDWAREINPUT; +} HARDWAREINPUT,*PHARDWAREINPUT; typedef struct tagINPUT { DWORD type; _ANONYMOUS_UNION union { @@ -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 diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index 2beae1c83f..916ba56458 100644 --- a/winsup/w32api/lib/user32.def +++ b/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 -- 2.11.0