diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 12 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 44 | ||||
| -rw-r--r-- | winsup/w32api/lib/user32.def | 5 |
3 files changed, 61 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 4227e43..2b78a90 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,15 @@ +2009-20-10 Jarkko Sakkinen <jarkko.sakkinen@iki.fi> + + * include/winuser.h (WM_TOUCHMOVE, WM_TOUCHDOWN, WM_TOUCHUP, + TOUCHEVENTF_DOWN, TOUCHEVENTF_INRANGE, TOUCHEVENTF_MOVE, + TOUCHEVENTF_NOCOALESCE, TOUCHEVENTF_PALM, TOUCHEVENTF_PEN, + TOUCHEVENTF_PRIMARY, TOUCHEVENTF_UP, TOUCHEVENTMASKF_CONTACTAREA, + TOUCHEVENTMASKF_EXTRAINFO, TOUCHEVENTMASKF_TIMEFROMSYSTEM, TOUCHINPUT, + CloseTouchInputHandle, GetTouchInputInfo, IsTouchWindow, + RegisterTouchWindow, UnregisterTouchWindow): Define. + * lib/user32.def (CloseTouchInputHandle, GetTouchInputInfo, IsTouchWindow, + RegisterTouchWindow, UnregisterTouchWindow): Define. + 2009-20-10 Dmitry Potapov <dpotapov@users.sourceforge.net> * include/winver.h (VerQueryValue[AW]): Correct definition. diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index cb63dea..675e62f 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -1584,6 +1584,11 @@ extern "C" { #define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam)) #define WHEEL_PAGESCROLL UINT_MAX #endif +#if (_WIN32_WINNT >= 0x0601) +#define WM_TOUCHMOVE 576 +#define WM_TOUCHDOWN 577 +#define WM_TOUCHUP 578 +#endif #define BM_CLICK 245 #define BM_GETCHECK 240 #define BM_GETIMAGE 246 @@ -2465,6 +2470,21 @@ extern "C" { #define RIDEV_APPKEYS 0x00000400 #endif +#if (_WIN32_WINNT >= 0x0601) +#define TOUCHEVENTF_DOWN 0x0001 +#define TOUCHEVENTF_INRANGE 0x0008 +#define TOUCHEVENTF_MOVE 0x0002 +#define TOUCHEVENTF_NOCOALESCE 0x0020 +#define TOUCHEVENTF_PALM 0x0080 +#define TOUCHEVENTF_PEN 0x0040 +#define TOUCHEVENTF_PRIMARY 0x0010 +#define TOUCHEVENTF_UP 0x0004 + +#define TOUCHEVENTMASKF_CONTACTAREA 0x0004 +#define TOUCHEVENTMASKF_EXTRAINFO 0x0002 +#define TOUCHEVENTMASKF_TIMEFROMSYSTEM 0x0001 +#endif + #ifndef RC_INVOKED typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); @@ -3249,6 +3269,21 @@ typedef struct tagINPUT { } DUMMYUNIONNAME; } INPUT,*PINPUT,*LPINPUT; #endif /* (_WIN32_WINNT >= 0x0403) */ +#if (_WIN32_WINNT >= 0x0601) +typedef struct _TOUCHINPUT { + LONG x; + LONG y; + HANDLE hSource; + DWORD dwID; + DWORD dwFlags; + DWORD dwMask; + DWORD dwTime; + ULONG_PTR dwExtraInfo; + DWORD cxContact; + DWORD cyContact; +} TOUCHINPUT, + *PTOUCHINPUT; +#endif /* (_WIN32_WINNT >= 0x0601) */ #if (WINVER >= 0x0500) typedef struct tagGUITHREADINFO { DWORD cbSize; @@ -4117,6 +4152,15 @@ WINUSERAPI BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLO #if (_WIN32_WINNT >= 0x0501) WINUSERAPI BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*); #endif + +#if (_WIN32_WINNT >= 0x0601) +BOOL WINAPI CloseTouchInputHandle(HANDLE hTouchInput); +BOOL WINAPI GetTouchInputInfo(HANDLE hTouchInput, UINT cInputs, PTOUCHINPUT pInputs, int cbSize); +BOOL WINAPI IsTouchWindow(HWND hWnd, PULONG pulFlags); +BOOL WINAPI RegisterTouchWindow(HWND hWnd, ULONG ulFlags); +BOOL WINAPI UnregisterTouchWindow(HWND hWnd); +#endif + #ifdef UNICODE #define EDITWORDBREAKPROC EDITWORDBREAKPROCW #define PROPENUMPROC PROPENUMPROCW diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index 451b4be..7503a7a 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -63,6 +63,7 @@ ClientToScreen@8 ClipCursor@4 CloseClipboard@0 CloseDesktop@4 +CloseTouchInputHandle@4 CloseWindow@4 CloseWindowStation@4 CopyAcceleratorTableA@12 @@ -331,6 +332,7 @@ GetTabbedTextExtentW@20 GetThreadDesktop@4 GetTitleBarInfo@8 GetTopWindow@4 +GetTouchInputInfo@16 GetUpdateRect@12 GetUpdateRgn@12 GetUserObjectInformationA@20 @@ -390,6 +392,7 @@ IsHungAppWindow@4 IsIconic@4 IsMenu@4 IsRectEmpty@4 +IsTouchWindow@8 IsWinEventHookInstalled@4 IsWindow@4 IsWindowEnabled@4 @@ -487,6 +490,7 @@ RegisterDeviceNotificationW@12 RegisterPowerSettingNotification@12 RegisterHotKey@16 RegisterRawInputDevices@12 +RegisterTouchWindow@8 RegisterWindowMessageA@4 RegisterWindowMessageW@4 ReleaseCapture@0 @@ -615,6 +619,7 @@ UnregisterClassA@8 UnregisterClassW@8 UnregisterDeviceNotification@4 UnregisterPowerSettingNotification@4 +UnregisterTouchWindow@4 UnregisterHotKey@8 UpdateLayeredWindow@36 UpdateWindow@4 |