libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* 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.
This commit is contained in:
Dimitri Papadopoulos 2003-09-26 14:46:33 +00:00
parent b6c1b88ad4
commit 349a6402fe
4 changed files with 159 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
winsup/w32api/ChangeLog
View File

@ -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> 2003-09-26 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winuser.h [_WIN32_WINNT >= 0x0501] (PrintWindow, * include/winuser.h [_WIN32_WINNT >= 0x0501] (PrintWindow,
@ -38,8 +89,8 @@
2003-09-26 Dimitri Papadopoulos <papadopo@users.sourceforge.net> 2003-09-26 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winnt.h (ACE_INHERITED_OBJECT_TYPE_PRESENT, * 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> 2003-09-26 Dimitri Papadopoulos <papadopo@users.sourceforge.net>

53
winsup/w32api/include/winable.h
View File

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

86
winsup/w32api/include/winuser.h
View File

@ -469,7 +469,7 @@ extern "C" {
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
#define DFCS_TRANSPARENT 0x800 #define DFCS_TRANSPARENT 0x800
#define DFCS_HOT 0x1000 #define DFCS_HOT 0x1000
#endif /* (WINVER >= 0x0500) */ #endif
#define DFCS_ADJUSTRECT 0x2000 #define DFCS_ADJUSTRECT 0x2000
#define DFCS_FLAT 0x4000 #define DFCS_FLAT 0x4000
#define DFCS_MONO 0x8000 #define DFCS_MONO 0x8000
@ -911,9 +911,9 @@ extern "C" {
#define SM_CMONITORS 80 #define SM_CMONITORS 80
#define SM_SAMEDISPLAYFORMAT 81 #define SM_SAMEDISPLAYFORMAT 81
#if (_WIN32_WINNT < 0x0400) #if (_WIN32_WINNT < 0x0400)
# define SM_CMETRICS 76 #define SM_CMETRICS 76
#else #else
# define SM_CMETRICS 83 #define SM_CMETRICS 83
#endif #endif
#define ARW_BOTTOMLEFT 0 #define ARW_BOTTOMLEFT 0
#define ARW_BOTTOMRIGHT 1 #define ARW_BOTTOMRIGHT 1
@ -2038,17 +2038,20 @@ extern "C" {
#define FLASHW_STOP 0 #define FLASHW_STOP 0
#define FLASHW_CAPTION 1 #define FLASHW_CAPTION 1
#define FLASHW_TRAY 2 #define FLASHW_TRAY 2
#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY) #define FLASHW_ALL (FLASHW_CAPTION|FLASHW_TRAY)
#define FLASHW_TIMER 4 #define FLASHW_TIMER 4
#define FLASHW_TIMERNOFG 12 #define FLASHW_TIMERNOFG 12
#endif /* (WINVER >= 0x0500) */ #endif /* (WINVER >= 0x0500) */
#define INPUT_MOUSE 0
#define INPUT_KEYBOARD 1
#define INPUT_HARDWARE 2
#define CURSOR_SHOWING 0x00000001 #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) #if (WINVER >= 0x0400)
#define ENDSESSION_LOGOFF 0x80000000 #define ENDSESSION_LOGOFF 0x80000000
#endif /* (WINVER >= 0x0400) */ #endif
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
#define CHILDID_SELF 0 #define CHILDID_SELF 0
#define OBJID_WINDOW 0x00000000 #define OBJID_WINDOW 0x00000000
@ -2086,7 +2089,7 @@ extern "C" {
#define AW_BLEND 0x00080000 #define AW_BLEND 0x00080000
#define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000 #define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000
#define DEVICE_NOTIFY_SERVICE_HANDLE 0x00000001 #define DEVICE_NOTIFY_SERVICE_HANDLE 0x00000001
#if(_WIN32_WINNT >= 0x0501) #if (_WIN32_WINNT >= 0x0501)
#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004 #define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004
#endif #endif
#endif /* (WINVER >= 0x0500) */ #endif /* (WINVER >= 0x0500) */
@ -2529,7 +2532,7 @@ typedef struct tagMOUSEKEYS{
DWORD iCtrlSpeed; DWORD iCtrlSpeed;
DWORD dwReserved1; DWORD dwReserved1;
DWORD dwReserved2; DWORD dwReserved2;
} MOUSEKEYS, *LPMOUSEKEYS; } MOUSEKEYS,*LPMOUSEKEYS;
#ifndef NOGDI #ifndef NOGDI
typedef struct tagNONCLIENTMETRICSA { typedef struct tagNONCLIENTMETRICSA {
UINT cbSize; UINT cbSize;
@ -2625,7 +2628,7 @@ typedef struct tagMOUSEHOOKSTRUCT {
HWND hwnd; HWND hwnd;
UINT wHitTestCode; UINT wHitTestCode;
DWORD dwExtraInfo; DWORD dwExtraInfo;
} MOUSEHOOKSTRUCT, FAR *LPMOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT; } MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT;
typedef struct tagTRACKMOUSEEVENT { typedef struct tagTRACKMOUSEEVENT {
DWORD cbSize; DWORD cbSize;
DWORD dwFlags; DWORD dwFlags;
@ -2642,7 +2645,7 @@ typedef struct tagEVENTMSG {
UINT paramH; UINT paramH;
DWORD time; DWORD time;
HWND hwnd; HWND hwnd;
} EVENTMSG,*PEVENTMSGMSG,*LPEVENTMSGMSG, *PEVENTMSG, *LPEVENTMSG; } EVENTMSG,*PEVENTMSGMSG,*LPEVENTMSGMSG,*PEVENTMSG,*LPEVENTMSG;
typedef struct _WINDOWPOS { typedef struct _WINDOWPOS {
HWND hwnd; HWND hwnd;
HWND hwndInsertAfter; HWND hwndInsertAfter;
@ -2745,7 +2748,7 @@ typedef struct tagALTTABINFO {
int cxItem; int cxItem;
int cyItem; int cyItem;
POINT ptStart; POINT ptStart;
} ALTTABINFO, *PALTTABINFO, *LPALTTABINFO; } ALTTABINFO,*PALTTABINFO,*LPALTTABINFO;
typedef struct tagCOMBOBOXINFO { typedef struct tagCOMBOBOXINFO {
DWORD cbSize; DWORD cbSize;
RECT rcItem; RECT rcItem;
@ -2754,7 +2757,7 @@ typedef struct tagCOMBOBOXINFO {
HWND hwndCombo; HWND hwndCombo;
HWND hwndItem; HWND hwndItem;
HWND hwndList; HWND hwndList;
} COMBOBOXINFO, *PCOMBOBOXINFO, *LPCOMBOBOXINFO; } COMBOBOXINFO,*PCOMBOBOXINFO,*LPCOMBOBOXINFO;
typedef struct tagCURSORINFO { typedef struct tagCURSORINFO {
DWORD cbSize; DWORD cbSize;
DWORD flags; DWORD flags;
@ -2768,7 +2771,7 @@ typedef struct tagMENUBARINFO {
HWND hwndMenu; HWND hwndMenu;
BOOL fBarFocused:1; BOOL fBarFocused:1;
BOOL fFocused:1; BOOL fFocused:1;
} MENUBARINFO, *PMENUBARINFO; } MENUBARINFO,*PMENUBARINFO;
typedef struct tagMENUINFO { typedef struct tagMENUINFO {
DWORD cbSize; DWORD cbSize;
DWORD fMask; DWORD fMask;
@ -2777,7 +2780,7 @@ typedef struct tagMENUINFO {
HBRUSH hbrBack; HBRUSH hbrBack;
DWORD dwContextHelpID; DWORD dwContextHelpID;
ULONG_PTR dwMenuData; ULONG_PTR dwMenuData;
} MENUINFO, *LPMENUINFO; } MENUINFO,*LPMENUINFO;
typedef MENUINFO CONST *LPCMENUINFO; typedef MENUINFO CONST *LPCMENUINFO;
#define CCHILDREN_SCROLLBAR 5 #define CCHILDREN_SCROLLBAR 5
typedef struct tagSCROLLBARINFO { typedef struct tagSCROLLBARINFO {
@ -2787,14 +2790,14 @@ typedef struct tagSCROLLBARINFO {
int xyThumbTop; int xyThumbTop;
int xyThumbBottom; int xyThumbBottom;
int reserved; int reserved;
DWORD rgstate[CCHILDREN_SCROLLBAR + 1]; DWORD rgstate[CCHILDREN_SCROLLBAR+1];
} SCROLLBARINFO, *PSCROLLBARINFO, *LPSCROLLBARINFO; } SCROLLBARINFO,*PSCROLLBARINFO,*LPSCROLLBARINFO;
#define CCHILDREN_TITLEBAR 5 #define CCHILDREN_TITLEBAR 5
typedef struct tagTITLEBARINFO { typedef struct tagTITLEBARINFO {
DWORD cbSize; DWORD cbSize;
RECT rcTitleBar; RECT rcTitleBar;
DWORD rgstate[CCHILDREN_TITLEBAR + 1]; DWORD rgstate[CCHILDREN_TITLEBAR+1];
} TITLEBARINFO, *PTITLEBARINFO, *LPTITLEBARINFO; } TITLEBARINFO,*PTITLEBARINFO,*LPTITLEBARINFO;
typedef struct tagWINDOWINFO { typedef struct tagWINDOWINFO {
DWORD cbSize; DWORD cbSize;
RECT rcWindow; RECT rcWindow;
@ -2806,11 +2809,11 @@ typedef struct tagWINDOWINFO {
UINT cyWindowBorders; UINT cyWindowBorders;
ATOM atomWindowType; ATOM atomWindowType;
WORD wCreatorVersion; WORD wCreatorVersion;
} WINDOWINFO, *PWINDOWINFO, *LPWINDOWINFO; } WINDOWINFO,*PWINDOWINFO,*LPWINDOWINFO;
typedef struct tagLASTINPUTINFO { typedef struct tagLASTINPUTINFO {
UINT cbSize; UINT cbSize;
DWORD dwTime; DWORD dwTime;
} LASTINPUTINFO, * PLASTINPUTINFO; } LASTINPUTINFO,*PLASTINPUTINFO;
typedef struct tagMONITORINFO { typedef struct tagMONITORINFO {
DWORD cbSize; DWORD cbSize;
RECT rcMonitor; RECT rcMonitor;
@ -2824,21 +2827,21 @@ typedef struct tagMONITORINFOEXA {
RECT rcWork; RECT rcWork;
DWORD dwFlags; DWORD dwFlags;
CHAR szDevice[CCHDEVICENAME]; CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXA, *LPMONITORINFOEXA; } MONITORINFOEXA,*LPMONITORINFOEXA;
typedef struct tagMONITORINFOEXW { typedef struct tagMONITORINFOEXW {
DWORD cbSize; DWORD cbSize;
RECT rcMonitor; RECT rcMonitor;
RECT rcWork; RECT rcWork;
DWORD dwFlags; DWORD dwFlags;
WCHAR szDevice[CCHDEVICENAME]; WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXW, *LPMONITORINFOEXW; } MONITORINFOEXW,*LPMONITORINFOEXW;
typedef struct tagKBDLLHOOKSTRUCT { typedef struct tagKBDLLHOOKSTRUCT {
DWORD vkCode; DWORD vkCode;
DWORD scanCode; DWORD scanCode;
DWORD flags; DWORD flags;
DWORD time; DWORD time;
DWORD dwExtraInfo; DWORD dwExtraInfo;
} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT; } KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT;
#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
typedef struct { typedef struct {
UINT cbSize; UINT cbSize;
@ -2846,7 +2849,7 @@ typedef struct {
DWORD dwFlags; DWORD dwFlags;
UINT uCount; UINT uCount;
DWORD dwTimeout; DWORD dwTimeout;
} FLASHWINFO, *PFLASHWINFO; } FLASHWINFO,*PFLASHWINFO;
#endif /* (WINVER >= 0x0500 || _WIN32_WINDOWS >= 0x0410) */ #endif /* (WINVER >= 0x0500 || _WIN32_WINDOWS >= 0x0410) */
#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
typedef struct tagMOUSEMOVEPOINT { typedef struct tagMOUSEMOVEPOINT {
@ -2854,8 +2857,9 @@ typedef struct tagMOUSEMOVEPOINT {
int y; int y;
DWORD time; DWORD time;
ULONG_PTR dwExtraInfo; ULONG_PTR dwExtraInfo;
} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT, *LPMOUSEMOVEPOINT; } MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT;
#endif #endif
#if (_WIN32_WINNT >= 0x0403)
typedef struct tagMOUSEINPUT { typedef struct tagMOUSEINPUT {
LONG dx; LONG dx;
LONG dy; LONG dy;
@ -2863,19 +2867,19 @@ typedef struct tagMOUSEINPUT {
DWORD dwFlags; DWORD dwFlags;
DWORD time; DWORD time;
ULONG_PTR dwExtraInfo; ULONG_PTR dwExtraInfo;
} MOUSEINPUT, *PMOUSEINPUT; } MOUSEINPUT,*PMOUSEINPUT;
typedef struct tagKEYBDINPUT { typedef struct tagKEYBDINPUT {
WORD wVk; WORD wVk;
WORD wScan; WORD wScan;
DWORD dwFlags; DWORD dwFlags;
DWORD time; DWORD time;
ULONG_PTR dwExtraInfo; ULONG_PTR dwExtraInfo;
} KEYBDINPUT, *PKEYBDINPUT; } KEYBDINPUT,*PKEYBDINPUT;
typedef struct tagHARDWAREINPUT { typedef struct tagHARDWAREINPUT {
DWORD uMsg; DWORD uMsg;
WORD wParamL; WORD wParamL;
WORD wParamH; WORD wParamH;
} HARDWAREINPUT, *PHARDWAREINPUT; } HARDWAREINPUT,*PHARDWAREINPUT;
typedef struct tagINPUT { typedef struct tagINPUT {
DWORD type; DWORD type;
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
@ -2883,7 +2887,8 @@ typedef struct tagINPUT {
KEYBDINPUT ki; KEYBDINPUT ki;
HARDWAREINPUT hi; HARDWAREINPUT hi;
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
} INPUT, *PINPUT, FAR *LPINPUT; } INPUT,*PINPUT,*LPINPUT;
#endif /* (_WIN32_WINNT >= 0x0403) */
#if (WINVER >= 0x0500) #if (WINVER >= 0x0500)
typedef struct tagGUITHREADINFO { typedef struct tagGUITHREADINFO {
DWORD cbSize; DWORD cbSize;
@ -3134,7 +3139,7 @@ BOOL WINAPI FlashWindowEx(PFLASHWINFO);
int WINAPI FrameRect(HDC,LPCRECT,HBRUSH); int WINAPI FrameRect(HDC,LPCRECT,HBRUSH);
BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,int,int); BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,int,int);
HWND WINAPI GetActiveWindow(void); HWND WINAPI GetActiveWindow(void);
HWND WINAPI GetAncestor(HWND hwnd, UINT gaFlags); HWND WINAPI GetAncestor(HWND,UINT);
SHORT WINAPI GetAsyncKeyState(int); SHORT WINAPI GetAsyncKeyState(int);
HWND WINAPI GetCapture(void); HWND WINAPI GetCapture(void);
UINT WINAPI GetCaretBlinkTime(void); UINT WINAPI GetCaretBlinkTime(void);
@ -3273,7 +3278,7 @@ BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);
BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO); BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO);
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI GetProcessDefaultLayout(DWORD*); BOOL WINAPI GetProcessDefaultLayout(DWORD*);
#endif /* (_WIN32_WINNT >= 0x0500) */ #endif
BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO); BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO);
BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO); BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO); BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO);
@ -3324,6 +3329,9 @@ BOOL WINAPI IsWindow(HWND);
BOOL WINAPI IsWindowEnabled(HWND); BOOL WINAPI IsWindowEnabled(HWND);
BOOL WINAPI IsWindowUnicode(HWND); BOOL WINAPI IsWindowUnicode(HWND);
BOOL WINAPI IsWindowVisible(HWND); BOOL WINAPI IsWindowVisible(HWND);
#if (_WIN32_WINNT >= 0x0501)
BOOL WINAPI IsWinEventHookInstalled(DWORD);
#endif
BOOL WINAPI IsZoomed(HWND); BOOL WINAPI IsZoomed(HWND);
VOID WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD); VOID WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD);
BOOL WINAPI KillTimer(HWND,UINT); BOOL WINAPI KillTimer(HWND,UINT);
@ -3348,6 +3356,9 @@ HMENU WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
int WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,int); int WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,int);
int WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,int); int WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,int);
BOOL WINAPI LockWindowUpdate(HWND); BOOL WINAPI LockWindowUpdate(HWND);
#if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI LockWorkStation(VOID);
#endif
int WINAPI LookupIconIdFromDirectory(PBYTE,BOOL); int WINAPI LookupIconIdFromDirectory(PBYTE,BOOL);
int WINAPI LookupIconIdFromDirectoryEx(PBYTE,BOOL,int,int,UINT); int WINAPI LookupIconIdFromDirectoryEx(PBYTE,BOOL,int,int,UINT);
BOOL WINAPI MapDialogRect(HWND,LPRECT); 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); BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD); DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD); DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
#if (WINVER >= 0x0500)
void WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG); void WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
#endif
DWORD WINAPI OemKeyScan(WORD); DWORD WINAPI OemKeyScan(WORD);
BOOL WINAPI OemToCharA(LPCSTR,LPSTR); BOOL WINAPI OemToCharA(LPCSTR,LPSTR);
BOOL WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD); 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); int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
LONG WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM); LONG WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM);
LONG WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM); LONG WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM);
#if (_WIN32_WINNT >= 0x0403)
UINT WINAPI SendInput(UINT,LPINPUT,int); UINT WINAPI SendInput(UINT,LPINPUT,int);
#endif /* (_WIN32_WINNT >= 0x0403) */
LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM); LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD); BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
BOOL WINAPI SendMessageCallbackW(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 TranslateMessage(const MSG*);
BOOL WINAPI UnhookWindowsHook(int,HOOKPROC); BOOL WINAPI UnhookWindowsHook(int,HOOKPROC);
BOOL WINAPI UnhookWindowsHookEx(HHOOK); BOOL WINAPI UnhookWindowsHookEx(HHOOK);
#if (WINVER >= 0x0500)
BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK);
#endif
BOOL WINAPI UnionRect(LPRECT,LPCRECT,LPCRECT); BOOL WINAPI UnionRect(LPRECT,LPCRECT,LPCRECT);
BOOL WINAPI UnloadKeyboardLayout(HKL); BOOL WINAPI UnloadKeyboardLayout(HKL);
BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE); BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
@ -3907,4 +3925,4 @@ typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _WINUSER_H */ #endif

4
winsup/w32api/lib/user32.def
View File

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