From e9c00b0eeba8aa8c74a7549be2a73fc668b6c6a8 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos Date: Thu, 25 Sep 2003 15:04:55 +0000 Subject: [PATCH] * include/winuser.h (GetClipboardSequenceNumber): Add functions and constants. * include/winuser.h (GetGuiResources, GR_GDIOBJECTS, GR_USEROBJECTS): Add functions and constants. * include/winuser.h (GetMouseMovePointsEx, GMMP_USE_DISPLAY_POINTS, GMMP_USE_HIGH_RESOLUTION_POINTS): Add functions and constants. * include/winuser.h (InSendMessageEx, ISMEX_NOSEND, ISMEX_CALLBACK, ISMEX_NOTIFY, ISMEX_REPLIED, ISMEX_SEND): Add functions and constants. * lib/user32.def (GetClipboardSequenceNumber, GetGuiResources, GetMouseMovePointsEx, InSendMessageEx): Add functions. --- winsup/w32api/ChangeLog | 18 ++++++++++++++++++ winsup/w32api/include/winuser.h | 31 ++++++++++++++++++++++++++++--- winsup/w32api/lib/user32.def | 4 ++++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 36ff5273f..276272244 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,21 @@ +2003-09-25 Dimitri Papadopoulos + + * include/winuser.h (GetClipboardSequenceNumber): Add functions + and constants. + + * include/winuser.h (GetGuiResources, GR_GDIOBJECTS, + GR_USEROBJECTS): Add functions and constants. + + * include/winuser.h (GetMouseMovePointsEx, GMMP_USE_DISPLAY_POINTS, + GMMP_USE_HIGH_RESOLUTION_POINTS): Add functions and constants. + + * include/winuser.h (InSendMessageEx, ISMEX_NOSEND, ISMEX_CALLBACK, + ISMEX_NOTIFY, ISMEX_REPLIED, ISMEX_SEND): Add functions and + constants. + + * lib/user32.def (GetClipboardSequenceNumber, GetGuiResources, + GetMouseMovePointsEx, InSendMessageEx): Add functions. + 2003-09-25 Dimitri Papadopoulos * include/winuser.h (BroadcastSystemMessage, BroadcastSystemMessageA, diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 18708adcb..692ac4c95 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -2097,9 +2097,20 @@ extern "C" { #define MONITOR_DEFAULTTOPRIMARY 1 #define MONITOR_DEFAULTTONEAREST 2 #define MONITORINFOF_PRIMARY 1 -#endif -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) #define EDS_RAWMODE 0x00000002 +#define ISMEX_NOSEND 0x00000000 +#define ISMEX_CALLBACK 0x00000004 +#define ISMEX_NOTIFY 0x00000002 +#define ISMEX_REPLIED 0x00000008 +#define ISMEX_SEND 0x00000001 +#endif +#if (_WIN32_WINNT >= 0x0500) +#define GR_GDIOBJECTS 0 +#define GR_USEROBJECTS 1 +#endif +#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) +#define GMMP_USE_DISPLAY_POINTS 1 +#define GMMP_USE_HIGH_RESOLUTION_POINTS 2 #endif #ifndef RC_INVOKED @@ -2824,12 +2835,14 @@ typedef struct { DWORD dwTimeout; } FLASHWINFO, *PFLASHWINFO; #endif /* (WINVER >= 0x0500) */ +#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) typedef struct tagMOUSEMOVEPOINT { int x; int y; DWORD time; ULONG_PTR dwExtraInfo; -} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT; +} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT, *LPMOUSEMOVEPOINT; +#endif typedef struct tagMOUSEINPUT { LONG dx; LONG dy; @@ -3126,6 +3139,9 @@ HANDLE WINAPI GetClipboardData(UINT); int WINAPI GetClipboardFormatNameA(UINT,LPSTR,int); int WINAPI GetClipboardFormatNameW(UINT,LPWSTR,int); HWND WINAPI GetClipboardOwner(void); +#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) +DWORD WINAPI GetClipboardSequenceNumber(void); +#endif HWND WINAPI GetClipboardViewer(void); BOOL WINAPI GetClipCursor(LPRECT); BOOL WINAPI GetCursorPos(LPPOINT); @@ -3141,6 +3157,9 @@ UINT WINAPI GetDlgItemTextW(HWND,int,LPWSTR,int); UINT WINAPI GetDoubleClickTime(void); HWND WINAPI GetFocus(void); HWND WINAPI GetForegroundWindow(void); +#if (_WIN32_WINNT >= 0x0500) +DWORD WINAPI GetGuiResources(HANDLE,DWORD); +#endif BOOL WINAPI GetIconInfo(HICON,PICONINFO); BOOL WINAPI GetInputState(void); UINT WINAPI GetKBCodePage(void); @@ -3172,6 +3191,9 @@ BOOL WINAPI GetMessageW(LPMSG,HWND,UINT,UINT); LONG WINAPI GetMessageExtraInfo(void); DWORD WINAPI GetMessagePos(void); LONG WINAPI GetMessageTime(void); +#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) +int WINAPI GetMouseMovePointsEx(UINT,LPMOUSEMOVEPOINT,LPMOUSEMOVEPOINT,int,DWORD); +#endif HWND WINAPI GetNextDlgGroupItem(HWND,HWND,BOOL); HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL); #define GetNextWindow(h,c) GetWindow(h,c) @@ -3251,6 +3273,9 @@ BOOL WINAPI HideCaret(HWND); BOOL WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT); BOOL WINAPI InflateRect(LPRECT,int,int); BOOL WINAPI InSendMessage(VOID); +#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) +DWORD WINAPI InSendMessageEx(LPVOID); +#endif BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR); BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR); BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,LPCMENUITEMINFOA); diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index 7a350824e..712f4141e 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -239,6 +239,7 @@ GetClipboardData@4 GetClipboardFormatNameA@12 GetClipboardFormatNameW@12 GetClipboardOwner@0 +GetClipboardSequenceNumber@0 GetClipboardViewer@0 GetComboBoxInfo@8 GetCursor@0 @@ -257,6 +258,7 @@ GetDoubleClickTime@0 GetFocus@0 GetForegroundWindow@0 GetGUIThreadInfo@8 +GetGuiResources@8 GetIconInfo@8 GetInputDesktop@0 GetInputState@0 @@ -295,6 +297,7 @@ GetMessageTime@0 GetMessageW@16 GetMonitorInfoA@8 GetMonitorInfoW@8 +GetMouseMovePointsEx@20 GetNextDlgGroupItem@12 GetNextDlgTabItem@12 GetOpenClipboardWindow@0 @@ -350,6 +353,7 @@ HideCaret@4 HiliteMenuItem@16 ImpersonateDdeClientWindow@8 InSendMessage@0 +InSendMessageEx@4 InflateRect@12 InsertMenuA@20 InsertMenuItemA@16