| winuser.h (6.3.9600.17415-Windows 8.1) | | winuser.h (10.0.10586.306-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 42 | | skipping to change at line 42 |
| #endif | | #endif |
| #endif | | #endif |
| | |
| #ifdef _MAC | | #ifdef _MAC |
| #include <macwin32.h> | | #include <macwin32.h> |
| #endif | | #endif |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(push) |
| | #ifndef _MSC_EXTENSIONS |
| | #pragma warning(disable:4309) // truncation of constant value |
| | #endif |
| | #pragma warning(disable:4820) // padding added after data member |
| | #endif |
| | |
| #ifndef WINVER | | #ifndef WINVER |
| #define WINVER 0x0500 /* version 5.0 */ | | #define WINVER 0x0500 /* version 5.0 */ |
| #endif /* !WINVER */ | | #endif /* !WINVER */ |
| | |
| #include <stdarg.h> | | #include <stdarg.h> |
| | |
| #ifndef NOAPISET | | #ifndef NOAPISET |
| #include <libloaderapi.h> // LoadString% | | #include <libloaderapi.h> // LoadString% |
| #endif | | #endif |
| | |
| skipping to change at line 81 | | skipping to change at line 88 |
| typedef LPMENUTEMPLATEA LPMENUTEMPLATE; | | typedef LPMENUTEMPLATEA LPMENUTEMPLATE; |
| #endif // UNICODE | | #endif // UNICODE |
| | |
| typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM); | | typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM); |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #ifdef STRICT | | #ifdef STRICT |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| typedef INT_PTR (CALLBACK* DLGPROC)(HWND, UINT, WPARAM, LPARAM); | | typedef INT_PTR (CALLBACK* DLGPROC)(HWND, UINT, WPARAM, LPARAM); |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| typedef VOID (CALLBACK* TIMERPROC)(HWND, UINT, UINT_PTR, DWORD); | | typedef VOID (CALLBACK* TIMERPROC)(HWND, UINT, UINT_PTR, DWORD); |
| typedef BOOL (CALLBACK* GRAYSTRINGPROC)(HDC, LPARAM, int); | | typedef BOOL (CALLBACK* GRAYSTRINGPROC)(HDC, LPARAM, int); |
| typedef BOOL (CALLBACK* WNDENUMPROC)(HWND, LPARAM); | | typedef BOOL (CALLBACK* WNDENUMPROC)(HWND, LPARAM); |
| typedef LRESULT (CALLBACK* HOOKPROC)(int code, WPARAM wParam, LPARAM lParam); | | typedef LRESULT (CALLBACK* HOOKPROC)(int code, WPARAM wParam, LPARAM lParam); |
| typedef VOID (CALLBACK* SENDASYNCPROC)(HWND, UINT, ULONG_PTR, LRESULT); | | typedef VOID (CALLBACK* SENDASYNCPROC)(HWND, UINT, ULONG_PTR, LRESULT); |
| | |
| skipping to change at line 116 | | skipping to change at line 123 |
| | |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
| typedef BOOL (CALLBACK* DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int
cx, int cy); | | typedef BOOL (CALLBACK* DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int
cx, int cy); |
| #endif /* WINVER >= 0x0400 */ | | #endif /* WINVER >= 0x0400 */ |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #else /* !STRICT */ | | #else /* !STRICT */ |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| typedef FARPROC DLGPROC; | | typedef FARPROC DLGPROC; |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| typedef FARPROC TIMERPROC; | | typedef FARPROC TIMERPROC; |
| typedef FARPROC GRAYSTRINGPROC; | | typedef FARPROC GRAYSTRINGPROC; |
| typedef FARPROC WNDENUMPROC; | | typedef FARPROC WNDENUMPROC; |
| typedef FARPROC HOOKPROC; | | typedef FARPROC HOOKPROC; |
| typedef FARPROC SENDASYNCPROC; | | typedef FARPROC SENDASYNCPROC; |
| | |
| skipping to change at line 427 | | skipping to change at line 434 |
| #define VK_RBUTTON 0x02 | | #define VK_RBUTTON 0x02 |
| #define VK_CANCEL 0x03 | | #define VK_CANCEL 0x03 |
| #define VK_MBUTTON 0x04 /* NOT contiguous with L & RBUTTON */ | | #define VK_MBUTTON 0x04 /* NOT contiguous with L & RBUTTON */ |
| | |
| #if(_WIN32_WINNT >= 0x0500) | | #if(_WIN32_WINNT >= 0x0500) |
| #define VK_XBUTTON1 0x05 /* NOT contiguous with L & RBUTTON */ | | #define VK_XBUTTON1 0x05 /* NOT contiguous with L & RBUTTON */ |
| #define VK_XBUTTON2 0x06 /* NOT contiguous with L & RBUTTON */ | | #define VK_XBUTTON2 0x06 /* NOT contiguous with L & RBUTTON */ |
| #endif /* _WIN32_WINNT >= 0x0500 */ | | #endif /* _WIN32_WINNT >= 0x0500 */ |
| | |
| /* | | /* |
|
| * 0x07 : unassigned | | * 0x07 : reserved |
| */ | | */ |
| | |
| #define VK_BACK 0x08 | | #define VK_BACK 0x08 |
| #define VK_TAB 0x09 | | #define VK_TAB 0x09 |
| | |
| /* | | /* |
| * 0x0A - 0x0B : reserved | | * 0x0A - 0x0B : reserved |
| */ | | */ |
| | |
| #define VK_CLEAR 0x0C | | #define VK_CLEAR 0x0C |
| #define VK_RETURN 0x0D | | #define VK_RETURN 0x0D |
| | |
|
| | /* |
| | * 0x0E - 0x0F : unassigned |
| | */ |
| | |
| #define VK_SHIFT 0x10 | | #define VK_SHIFT 0x10 |
| #define VK_CONTROL 0x11 | | #define VK_CONTROL 0x11 |
| #define VK_MENU 0x12 | | #define VK_MENU 0x12 |
| #define VK_PAUSE 0x13 | | #define VK_PAUSE 0x13 |
| #define VK_CAPITAL 0x14 | | #define VK_CAPITAL 0x14 |
| | |
| #define VK_KANA 0x15 | | #define VK_KANA 0x15 |
| #define VK_HANGEUL 0x15 /* old name - should be here for compatibility *
/ | | #define VK_HANGEUL 0x15 /* old name - should be here for compatibility *
/ |
| #define VK_HANGUL 0x15 | | #define VK_HANGUL 0x15 |
|
| | |
| | /* |
| | * 0x16 : unassigned |
| | */ |
| | |
| #define VK_JUNJA 0x17 | | #define VK_JUNJA 0x17 |
| #define VK_FINAL 0x18 | | #define VK_FINAL 0x18 |
| #define VK_HANJA 0x19 | | #define VK_HANJA 0x19 |
| #define VK_KANJI 0x19 | | #define VK_KANJI 0x19 |
| | |
|
| | /* |
| | * 0x1A : unassigned |
| | */ |
| | |
| #define VK_ESCAPE 0x1B | | #define VK_ESCAPE 0x1B |
| | |
| #define VK_CONVERT 0x1C | | #define VK_CONVERT 0x1C |
| #define VK_NONCONVERT 0x1D | | #define VK_NONCONVERT 0x1D |
| #define VK_ACCEPT 0x1E | | #define VK_ACCEPT 0x1E |
| #define VK_MODECHANGE 0x1F | | #define VK_MODECHANGE 0x1F |
| | |
| #define VK_SPACE 0x20 | | #define VK_SPACE 0x20 |
| #define VK_PRIOR 0x21 | | #define VK_PRIOR 0x21 |
| #define VK_NEXT 0x22 | | #define VK_NEXT 0x22 |
| | |
| skipping to change at line 480 | | skipping to change at line 500 |
| #define VK_SELECT 0x29 | | #define VK_SELECT 0x29 |
| #define VK_PRINT 0x2A | | #define VK_PRINT 0x2A |
| #define VK_EXECUTE 0x2B | | #define VK_EXECUTE 0x2B |
| #define VK_SNAPSHOT 0x2C | | #define VK_SNAPSHOT 0x2C |
| #define VK_INSERT 0x2D | | #define VK_INSERT 0x2D |
| #define VK_DELETE 0x2E | | #define VK_DELETE 0x2E |
| #define VK_HELP 0x2F | | #define VK_HELP 0x2F |
| | |
| /* | | /* |
| * VK_0 - VK_9 are the same as ASCII '0' - '9' (0x30 - 0x39) | | * VK_0 - VK_9 are the same as ASCII '0' - '9' (0x30 - 0x39) |
|
| * 0x40 : unassigned | | * 0x3A - 0x40 : unassigned |
| * VK_A - VK_Z are the same as ASCII 'A' - 'Z' (0x41 - 0x5A) | | * VK_A - VK_Z are the same as ASCII 'A' - 'Z' (0x41 - 0x5A) |
| */ | | */ |
| | |
| #define VK_LWIN 0x5B | | #define VK_LWIN 0x5B |
| #define VK_RWIN 0x5C | | #define VK_RWIN 0x5C |
| #define VK_APPS 0x5D | | #define VK_APPS 0x5D |
| | |
| /* | | /* |
| * 0x5E : reserved | | * 0x5E : reserved |
| */ | | */ |
| | |
| skipping to change at line 535 | | skipping to change at line 555 |
| #define VK_F16 0x7F | | #define VK_F16 0x7F |
| #define VK_F17 0x80 | | #define VK_F17 0x80 |
| #define VK_F18 0x81 | | #define VK_F18 0x81 |
| #define VK_F19 0x82 | | #define VK_F19 0x82 |
| #define VK_F20 0x83 | | #define VK_F20 0x83 |
| #define VK_F21 0x84 | | #define VK_F21 0x84 |
| #define VK_F22 0x85 | | #define VK_F22 0x85 |
| #define VK_F23 0x86 | | #define VK_F23 0x86 |
| #define VK_F24 0x87 | | #define VK_F24 0x87 |
| | |
|
| | #if(_WIN32_WINNT >= 0x0604) |
| | |
| /* | | /* |
|
| * 0x88 - 0x8F : unassigned | | * 0x88 - 0x8F : UI navigation |
| */ | | */ |
| | |
|
| | #define VK_NAVIGATION_VIEW 0x88 // reserved |
| | #define VK_NAVIGATION_MENU 0x89 // reserved |
| | #define VK_NAVIGATION_UP 0x8A // reserved |
| | #define VK_NAVIGATION_DOWN 0x8B // reserved |
| | #define VK_NAVIGATION_LEFT 0x8C // reserved |
| | #define VK_NAVIGATION_RIGHT 0x8D // reserved |
| | #define VK_NAVIGATION_ACCEPT 0x8E // reserved |
| | #define VK_NAVIGATION_CANCEL 0x8F // reserved |
| | |
| | #endif /* _WIN32_WINNT >= 0x0604 */ |
| | |
| #define VK_NUMLOCK 0x90 | | #define VK_NUMLOCK 0x90 |
| #define VK_SCROLL 0x91 | | #define VK_SCROLL 0x91 |
| | |
| /* | | /* |
| * NEC PC-9800 kbd definitions | | * NEC PC-9800 kbd definitions |
| */ | | */ |
| #define VK_OEM_NEC_EQUAL 0x92 // '=' key on numpad | | #define VK_OEM_NEC_EQUAL 0x92 // '=' key on numpad |
| | |
| /* | | /* |
| * Fujitsu/OASYS kbd definitions | | * Fujitsu/OASYS kbd definitions |
| | |
| skipping to change at line 608 | | skipping to change at line 641 |
| | |
| #define VK_OEM_1 0xBA // ';:' for US | | #define VK_OEM_1 0xBA // ';:' for US |
| #define VK_OEM_PLUS 0xBB // '+' any country | | #define VK_OEM_PLUS 0xBB // '+' any country |
| #define VK_OEM_COMMA 0xBC // ',' any country | | #define VK_OEM_COMMA 0xBC // ',' any country |
| #define VK_OEM_MINUS 0xBD // '-' any country | | #define VK_OEM_MINUS 0xBD // '-' any country |
| #define VK_OEM_PERIOD 0xBE // '.' any country | | #define VK_OEM_PERIOD 0xBE // '.' any country |
| #define VK_OEM_2 0xBF // '/?' for US | | #define VK_OEM_2 0xBF // '/?' for US |
| #define VK_OEM_3 0xC0 // '`~' for US | | #define VK_OEM_3 0xC0 // '`~' for US |
| | |
| /* | | /* |
|
| * 0xC1 - 0xD7 : reserved | | * 0xC1 - 0xC2 : reserved |
| */ | | */ |
| | |
|
| | #if(_WIN32_WINNT >= 0x0604) |
| | |
| /* | | /* |
|
| * 0xD8 - 0xDA : unassigned | | * 0xC3 - 0xDA : Gamepad input |
| */ | | */ |
| | |
|
| | #define VK_GAMEPAD_A 0xC3 // reserved |
| | #define VK_GAMEPAD_B 0xC4 // reserved |
| | #define VK_GAMEPAD_X 0xC5 // reserved |
| | #define VK_GAMEPAD_Y 0xC6 // reserved |
| | #define VK_GAMEPAD_RIGHT_SHOULDER 0xC7 // reserved |
| | #define VK_GAMEPAD_LEFT_SHOULDER 0xC8 // reserved |
| | #define VK_GAMEPAD_LEFT_TRIGGER 0xC9 // reserved |
| | #define VK_GAMEPAD_RIGHT_TRIGGER 0xCA // reserved |
| | #define VK_GAMEPAD_DPAD_UP 0xCB // reserved |
| | #define VK_GAMEPAD_DPAD_DOWN 0xCC // reserved |
| | #define VK_GAMEPAD_DPAD_LEFT 0xCD // reserved |
| | #define VK_GAMEPAD_DPAD_RIGHT 0xCE // reserved |
| | #define VK_GAMEPAD_MENU 0xCF // reserved |
| | #define VK_GAMEPAD_VIEW 0xD0 // reserved |
| | #define VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON 0xD1 // reserved |
| | #define VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON 0xD2 // reserved |
| | #define VK_GAMEPAD_LEFT_THUMBSTICK_UP 0xD3 // reserved |
| | #define VK_GAMEPAD_LEFT_THUMBSTICK_DOWN 0xD4 // reserved |
| | #define VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT 0xD5 // reserved |
| | #define VK_GAMEPAD_LEFT_THUMBSTICK_LEFT 0xD6 // reserved |
| | #define VK_GAMEPAD_RIGHT_THUMBSTICK_UP 0xD7 // reserved |
| | #define VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN 0xD8 // reserved |
| | #define VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT 0xD9 // reserved |
| | #define VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT 0xDA // reserved |
| | |
| | #endif /* _WIN32_WINNT >= 0x0604 */ |
| | |
| #define VK_OEM_4 0xDB // '[{' for US | | #define VK_OEM_4 0xDB // '[{' for US |
| #define VK_OEM_5 0xDC // '\|' for US | | #define VK_OEM_5 0xDC // '\|' for US |
| #define VK_OEM_6 0xDD // ']}' for US | | #define VK_OEM_6 0xDD // ']}' for US |
| #define VK_OEM_7 0xDE // ''"' for US | | #define VK_OEM_7 0xDE // ''"' for US |
| #define VK_OEM_8 0xDF | | #define VK_OEM_8 0xDF |
| | |
| /* | | /* |
| * 0xE0 : reserved | | * 0xE0 : reserved |
| */ | | */ |
| | |
| | |
| skipping to change at line 1069 | | skipping to change at line 1131 |
| | |
| #if(_WIN32_WINNT >= 0x0500) | | #if(_WIN32_WINNT >= 0x0500) |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| typedef struct tagMOUSEHOOKSTRUCTEX : public tagMOUSEHOOKSTRUCT | | typedef struct tagMOUSEHOOKSTRUCTEX : public tagMOUSEHOOKSTRUCT |
| { | | { |
| DWORD mouseData; | | DWORD mouseData; |
| } MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX; | | } MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX; |
| #else // ndef __cplusplus | | #else // ndef __cplusplus |
| typedef struct tagMOUSEHOOKSTRUCTEX | | typedef struct tagMOUSEHOOKSTRUCTEX |
| { | | { |
|
| MOUSEHOOKSTRUCT; | | MOUSEHOOKSTRUCT DUMMYSTRUCTNAME; |
| DWORD mouseData; | | DWORD mouseData; |
| } MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX; | | } MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX; |
| #endif | | #endif |
| #endif /* _WIN32_WINNT >= 0x0500 */ | | #endif /* _WIN32_WINNT >= 0x0500 */ |
| | |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
| /* | | /* |
| * Structure used by WH_HARDWARE | | * Structure used by WH_HARDWARE |
| */ | | */ |
| typedef struct tagHARDWAREHOOKSTRUCT { | | typedef struct tagHARDWAREHOOKSTRUCT { |
| | |
| skipping to change at line 1581 | | skipping to change at line 1643 |
| #pragma endregion | | #pragma endregion |
| | |
| #define UOI_FLAGS 1 | | #define UOI_FLAGS 1 |
| #define UOI_NAME 2 | | #define UOI_NAME 2 |
| #define UOI_TYPE 3 | | #define UOI_TYPE 3 |
| #define UOI_USER_SID 4 | | #define UOI_USER_SID 4 |
| #if(WINVER >= 0x0600) | | #if(WINVER >= 0x0600) |
| #define UOI_HEAPSIZE 5 | | #define UOI_HEAPSIZE 5 |
| #define UOI_IO 6 | | #define UOI_IO 6 |
| #endif /* WINVER >= 0x0600 */ | | #endif /* WINVER >= 0x0600 */ |
|
| | #define UOI_TIMERPROC_EXCEPTION_SUPPRESSION 7 |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| typedef struct tagUSEROBJECTFLAGS { | | typedef struct tagUSEROBJECTFLAGS { |
| BOOL fInherit; | | BOOL fInherit; |
| BOOL fReserved; | | BOOL fReserved; |
| DWORD dwFlags; | | DWORD dwFlags; |
| } USEROBJECTFLAGS, *PUSEROBJECTFLAGS; | | } USEROBJECTFLAGS, *PUSEROBJECTFLAGS; |
| | |
| | |
| skipping to change at line 1746 | | skipping to change at line 1809 |
| WINAPI | | WINAPI |
| DisableProcessWindowsGhosting( | | DisableProcessWindowsGhosting( |
| VOID); | | VOID); |
| #endif /* WINVER >= 0x0501 */ | | #endif /* WINVER >= 0x0501 */ |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #ifndef NOMSG | | #ifndef NOMSG |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| /* | | /* |
| * Message structure | | * Message structure |
| */ | | */ |
| typedef struct tagMSG { | | typedef struct tagMSG { |
| HWND hwnd; | | HWND hwnd; |
| UINT message; | | UINT message; |
| WPARAM wParam; | | WPARAM wParam; |
| LPARAM lParam; | | LPARAM lParam; |
| DWORD time; | | DWORD time; |
| POINT pt; | | POINT pt; |
| #ifdef _MAC | | #ifdef _MAC |
| DWORD lPrivate; | | DWORD lPrivate; |
| #endif | | #endif |
| } MSG, *PMSG, NEAR *NPMSG, FAR *LPMSG; | | } MSG, *PMSG, NEAR *NPMSG, FAR *LPMSG; |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #define POINTSTOPOINT(pt, pts) \ | | #define POINTSTOPOINT(pt, pts) \ |
| { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts); \ | | { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts); \ |
| (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); } | | (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); } |
| | |
| #define POINTTOPOINTS(pt) (MAKELONG((short)((pt).x), (short)((pt).y))) | | #define POINTTOPOINTS(pt) (MAKELONG((short)((pt).x), (short)((pt).y))) |
| #define MAKEWPARAM(l, h) ((WPARAM)(DWORD)MAKELONG(l, h)) | | #define MAKEWPARAM(l, h) ((WPARAM)(DWORD)MAKELONG(l, h)) |
| #define MAKELPARAM(l, h) ((LPARAM)(DWORD)MAKELONG(l, h)) | | #define MAKELPARAM(l, h) ((LPARAM)(DWORD)MAKELONG(l, h)) |
| #define MAKELRESULT(l, h) ((LRESULT)(DWORD)MAKELONG(l, h)) | | #define MAKELRESULT(l, h) ((LRESULT)(DWORD)MAKELONG(l, h)) |
| | |
| skipping to change at line 2279 | | skipping to change at line 2342 |
| #define WM_POINTERDOWN 0x0246 | | #define WM_POINTERDOWN 0x0246 |
| #define WM_POINTERUP 0x0247 | | #define WM_POINTERUP 0x0247 |
| #define WM_POINTERENTER 0x0249 | | #define WM_POINTERENTER 0x0249 |
| #define WM_POINTERLEAVE 0x024A | | #define WM_POINTERLEAVE 0x024A |
| #define WM_POINTERACTIVATE 0x024B | | #define WM_POINTERACTIVATE 0x024B |
| #define WM_POINTERCAPTURECHANGED 0x024C | | #define WM_POINTERCAPTURECHANGED 0x024C |
| #define WM_TOUCHHITTESTING 0x024D | | #define WM_TOUCHHITTESTING 0x024D |
| #define WM_POINTERWHEEL 0x024E | | #define WM_POINTERWHEEL 0x024E |
| #define WM_POINTERHWHEEL 0x024F | | #define WM_POINTERHWHEEL 0x024F |
| #define DM_POINTERHITTEST 0x0250 | | #define DM_POINTERHITTEST 0x0250 |
|
| | #define WM_POINTERROUTEDTO 0x0251 |
| | #define WM_POINTERROUTEDAWAY 0x0252 |
| | #define WM_POINTERROUTEDRELEASED 0x0253 |
| #endif /* WINVER >= 0x0602 */ | | #endif /* WINVER >= 0x0602 */ |
| | |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
| #define WM_IME_SETCONTEXT 0x0281 | | #define WM_IME_SETCONTEXT 0x0281 |
| #define WM_IME_NOTIFY 0x0282 | | #define WM_IME_NOTIFY 0x0282 |
| #define WM_IME_CONTROL 0x0283 | | #define WM_IME_CONTROL 0x0283 |
| #define WM_IME_COMPOSITIONFULL 0x0284 | | #define WM_IME_COMPOSITIONFULL 0x0284 |
| #define WM_IME_SELECT 0x0285 | | #define WM_IME_SELECT 0x0285 |
| #define WM_IME_CHAR 0x0286 | | #define WM_IME_CHAR 0x0286 |
| #endif /* WINVER >= 0x0400 */ | | #endif /* WINVER >= 0x0400 */ |
| | |
| skipping to change at line 2371 | | skipping to change at line 2437 |
| #if(_WIN32_WINNT >= 0x0601) | | #if(_WIN32_WINNT >= 0x0601) |
| #define WM_DWMSENDICONICTHUMBNAIL 0x0323 | | #define WM_DWMSENDICONICTHUMBNAIL 0x0323 |
| #define WM_DWMSENDICONICLIVEPREVIEWBITMAP 0x0326 | | #define WM_DWMSENDICONICLIVEPREVIEWBITMAP 0x0326 |
| #endif /* _WIN32_WINNT >= 0x0601 */ | | #endif /* _WIN32_WINNT >= 0x0601 */ |
| | |
| #if(WINVER >= 0x0600) | | #if(WINVER >= 0x0600) |
| #define WM_GETTITLEBARINFOEX 0x033F | | #define WM_GETTITLEBARINFOEX 0x033F |
| #endif /* WINVER >= 0x0600 */ | | #endif /* WINVER >= 0x0600 */ |
| | |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
|
| | #endif /* WINVER >= 0x0400 */ |
| | |
|
| | #if(WINVER >= 0x0400) |
| #define WM_HANDHELDFIRST 0x0358 | | #define WM_HANDHELDFIRST 0x0358 |
| #define WM_HANDHELDLAST 0x035F | | #define WM_HANDHELDLAST 0x035F |
| | |
| #define WM_AFXFIRST 0x0360 | | #define WM_AFXFIRST 0x0360 |
| #define WM_AFXLAST 0x037F | | #define WM_AFXLAST 0x037F |
| #endif /* WINVER >= 0x0400 */ | | #endif /* WINVER >= 0x0400 */ |
| | |
| #define WM_PENWINFIRST 0x0380 | | #define WM_PENWINFIRST 0x0380 |
| #define WM_PENWINLAST 0x038F | | #define WM_PENWINLAST 0x038F |
| | |
| | |
| skipping to change at line 3071 | | skipping to change at line 3139 |
| #define WPF_RESTORETOMAXIMIZED 0x0002 | | #define WPF_RESTORETOMAXIMIZED 0x0002 |
| #if(_WIN32_WINNT >= 0x0500) | | #if(_WIN32_WINNT >= 0x0500) |
| #define WPF_ASYNCWINDOWPLACEMENT 0x0004 | | #define WPF_ASYNCWINDOWPLACEMENT 0x0004 |
| #endif /* _WIN32_WINNT >= 0x0500 */ | | #endif /* _WIN32_WINNT >= 0x0500 */ |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| typedef struct tagNMHDR | | typedef struct tagNMHDR |
| { | | { |
| HWND hwndFrom; | | HWND hwndFrom; |
| UINT_PTR idFrom; | | UINT_PTR idFrom; |
| UINT code; // NM_ code | | UINT code; // NM_ code |
| } NMHDR; | | } NMHDR; |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| typedef NMHDR FAR * LPNMHDR; | | typedef NMHDR FAR * LPNMHDR; |
| | |
| typedef struct tagSTYLESTRUCT | | typedef struct tagSTYLESTRUCT |
| { | | { |
| DWORD styleOld; | | DWORD styleOld; |
| | |
| skipping to change at line 3361 | | skipping to change at line 3429 |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| UnregisterHotKey( | | UnregisterHotKey( |
| _In_opt_ HWND hWnd, | | _In_opt_ HWND hWnd, |
| _In_ int id); | | _In_ int id); |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
|
| #define MOD_ALT 0x0001 | | #define MOD_ALT 0x0001 |
| #define MOD_CONTROL 0x0002 | | #define MOD_CONTROL 0x0002 |
| #define MOD_SHIFT 0x0004 | | #define MOD_SHIFT 0x0004 |
| #define MOD_WIN 0x0008 | | #define MOD_WIN 0x0008 |
| #if(WINVER >= 0x0601) | | #if(WINVER >= 0x0601) |
|
| #define MOD_NOREPEAT 0x4000 | | #define MOD_NOREPEAT 0x4000 |
| #endif /* WINVER >= 0x0601 */ | | #endif /* WINVER >= 0x0601 */ |
| | |
| #define IDHOT_SNAPWINDOW (-1) /* SHIFT-PRINTSCRN */ | | #define IDHOT_SNAPWINDOW (-1) /* SHIFT-PRINTSCRN */ |
| #define IDHOT_SNAPDESKTOP (-2) /* PRINTSCRN */ | | #define IDHOT_SNAPDESKTOP (-2) /* PRINTSCRN */ |
| | |
| #ifdef WIN_INTERNAL | | #ifdef WIN_INTERNAL |
| #ifndef LSTRING | | #ifndef LSTRING |
| #define NOLSTRING | | #define NOLSTRING |
| #endif /* LSTRING */ | | #endif /* LSTRING */ |
| #ifndef LFILEIO | | #ifndef LFILEIO |
| | |
| skipping to change at line 4596 | | skipping to change at line 4664 |
| | |
| #ifndef NOCTLMGR | | #ifndef NOCTLMGR |
| | |
| /* | | /* |
| * WARNING: | | * WARNING: |
| * The following structures must NOT be DWORD padded because they are | | * The following structures must NOT be DWORD padded because they are |
| * followed by strings, etc that do not have to be DWORD aligned. | | * followed by strings, etc that do not have to be DWORD aligned. |
| */ | | */ |
| #include <pshpack2.h> | | #include <pshpack2.h> |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| /* | | /* |
| * original NT 32 bit dialog template: | | * original NT 32 bit dialog template: |
| */ | | */ |
| typedef struct { | | typedef struct { |
| DWORD style; | | DWORD style; |
| DWORD dwExtendedStyle; | | DWORD dwExtendedStyle; |
| WORD cdit; | | WORD cdit; |
| short x; | | short x; |
| short y; | | short y; |
| short cx; | | short cx; |
| short cy; | | short cy; |
| } DLGTEMPLATE; | | } DLGTEMPLATE; |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| typedef DLGTEMPLATE *LPDLGTEMPLATEA; | | typedef DLGTEMPLATE *LPDLGTEMPLATEA; |
| typedef DLGTEMPLATE *LPDLGTEMPLATEW; | | typedef DLGTEMPLATE *LPDLGTEMPLATEW; |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef LPDLGTEMPLATEW LPDLGTEMPLATE; | | typedef LPDLGTEMPLATEW LPDLGTEMPLATE; |
| #else | | #else |
| typedef LPDLGTEMPLATEA LPDLGTEMPLATE; | | typedef LPDLGTEMPLATEA LPDLGTEMPLATE; |
| #endif // UNICODE | | #endif // UNICODE |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| typedef CONST DLGTEMPLATE *LPCDLGTEMPLATEA; | | typedef CONST DLGTEMPLATE *LPCDLGTEMPLATEA; |
| typedef CONST DLGTEMPLATE *LPCDLGTEMPLATEW; | | typedef CONST DLGTEMPLATE *LPCDLGTEMPLATEW; |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef LPCDLGTEMPLATEW LPCDLGTEMPLATE; | | typedef LPCDLGTEMPLATEW LPCDLGTEMPLATE; |
| #else | | #else |
| typedef LPCDLGTEMPLATEA LPCDLGTEMPLATE; | | typedef LPCDLGTEMPLATEA LPCDLGTEMPLATE; |
| #endif // UNICODE | | #endif // UNICODE |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* | | /* |
| * 32 bit Dialog item template. | | * 32 bit Dialog item template. |
| */ | | */ |
| typedef struct { | | typedef struct { |
| DWORD style; | | DWORD style; |
| | |
| skipping to change at line 5284 | | skipping to change at line 5352 |
| OemToCharBuffW( | | OemToCharBuffW( |
| _In_ LPCSTR lpszSrc, | | _In_ LPCSTR lpszSrc, |
| _Out_writes_(cchDstLength) LPWSTR lpszDst, | | _Out_writes_(cchDstLength) LPWSTR lpszDst, |
| _In_ DWORD cchDstLength); | | _In_ DWORD cchDstLength); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define OemToCharBuff OemToCharBuffW | | #define OemToCharBuff OemToCharBuffW |
| #else | | #else |
| #define OemToCharBuff OemToCharBuffA | | #define OemToCharBuff OemToCharBuffA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| | #pragma region Desktop Family or OneCore Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| WINUSERAPI | | WINUSERAPI |
| LPSTR | | LPSTR |
| WINAPI | | WINAPI |
| CharUpperA( | | CharUpperA( |
| _Inout_ LPSTR lpsz); | | _Inout_ LPSTR lpsz); |
| WINUSERAPI | | WINUSERAPI |
| LPWSTR | | LPWSTR |
| WINAPI | | WINAPI |
| CharUpperW( | | CharUpperW( |
| _Inout_ LPWSTR lpsz); | | _Inout_ LPWSTR lpsz); |
| | |
| skipping to change at line 5386 | | skipping to change at line 5460 |
| WINAPI | | WINAPI |
| CharPrevW( | | CharPrevW( |
| _In_ LPCWSTR lpszStart, | | _In_ LPCWSTR lpszStart, |
| _In_ LPCWSTR lpszCurrent); | | _In_ LPCWSTR lpszCurrent); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define CharPrev CharPrevW | | #define CharPrev CharPrevW |
| #else | | #else |
| #define CharPrev CharPrevA | | #define CharPrev CharPrevA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY |
| | STEM) */ |
| | #pragma endregion |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
| WINUSERAPI | | WINUSERAPI |
| LPSTR | | LPSTR |
| WINAPI | | WINAPI |
| CharNextExA( | | CharNextExA( |
| _In_ WORD CodePage, | | _In_ WORD CodePage, |
| _In_ LPCSTR lpCurrentChar, | | _In_ LPCSTR lpCurrentChar, |
| _In_ DWORD dwFlags); | | _In_ DWORD dwFlags); |
| | |
| WINUSERAPI | | WINUSERAPI |
| | |
| skipping to change at line 5422 | | skipping to change at line 5502 |
| #define OemToAnsi OemToCharA | | #define OemToAnsi OemToCharA |
| #define AnsiToOemBuff CharToOemBuffA | | #define AnsiToOemBuff CharToOemBuffA |
| #define OemToAnsiBuff OemToCharBuffA | | #define OemToAnsiBuff OemToCharBuffA |
| #define AnsiUpper CharUpperA | | #define AnsiUpper CharUpperA |
| #define AnsiUpperBuff CharUpperBuffA | | #define AnsiUpperBuff CharUpperBuffA |
| #define AnsiLower CharLowerA | | #define AnsiLower CharLowerA |
| #define AnsiLowerBuff CharLowerBuffA | | #define AnsiLowerBuff CharLowerBuffA |
| #define AnsiNext CharNextA | | #define AnsiNext CharNextA |
| #define AnsiPrev CharPrevA | | #define AnsiPrev CharPrevA |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| #ifndef NOLANGUAGE | | #ifndef NOLANGUAGE |
| /* | | /* |
| * Language dependent Routines | | * Language dependent Routines |
| */ | | */ |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| IsCharAlphaA( | | IsCharAlphaA( |
| | |
| skipping to change at line 5496 | | skipping to change at line 5576 |
| IsCharLowerW( | | IsCharLowerW( |
| _In_ WCHAR ch); | | _In_ WCHAR ch); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define IsCharLower IsCharLowerW | | #define IsCharLower IsCharLowerW |
| #else | | #else |
| #define IsCharLower IsCharLowerA | | #define IsCharLower IsCharLowerA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
| #endif /* !NOLANGUAGE */ | | #endif /* !NOLANGUAGE */ |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY |
| | STEM) */ |
| | #pragma endregion |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| WINUSERAPI | | WINUSERAPI |
| HWND | | HWND |
| WINAPI | | WINAPI |
| SetFocus( | | SetFocus( |
| _In_opt_ HWND hWnd); | | _In_opt_ HWND hWnd); |
| | |
| WINUSERAPI | | WINUSERAPI |
| HWND | | HWND |
| WINAPI | | WINAPI |
| GetActiveWindow( | | GetActiveWindow( |
| | |
| skipping to change at line 5702 | | skipping to change at line 5788 |
| _In_ DWORD dx, | | _In_ DWORD dx, |
| _In_ DWORD dy, | | _In_ DWORD dy, |
| _In_ DWORD dwData, | | _In_ DWORD dwData, |
| _In_ ULONG_PTR dwExtraInfo); | | _In_ ULONG_PTR dwExtraInfo); |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #if (_WIN32_WINNT > 0x0400) | | #if (_WIN32_WINNT > 0x0400) |
| | |
|
| #pragma region Desktop Family | | |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | |
| | | |
| typedef struct tagMOUSEINPUT { | | typedef struct tagMOUSEINPUT { |
| LONG dx; | | LONG dx; |
| LONG dy; | | LONG dy; |
| DWORD mouseData; | | DWORD mouseData; |
| DWORD dwFlags; | | DWORD dwFlags; |
| DWORD time; | | DWORD time; |
| ULONG_PTR dwExtraInfo; | | ULONG_PTR dwExtraInfo; |
| } MOUSEINPUT, *PMOUSEINPUT, FAR* LPMOUSEINPUT; | | } MOUSEINPUT, *PMOUSEINPUT, FAR* LPMOUSEINPUT; |
| | |
| 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, FAR* LPKEYBDINPUT; | | } KEYBDINPUT, *PKEYBDINPUT, FAR* LPKEYBDINPUT; |
| | |
|
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| typedef struct tagHARDWAREINPUT { | | typedef struct tagHARDWAREINPUT { |
| DWORD uMsg; | | DWORD uMsg; |
| WORD wParamL; | | WORD wParamL; |
| WORD wParamH; | | WORD wParamH; |
| } HARDWAREINPUT, *PHARDWAREINPUT, FAR* LPHARDWAREINPUT; | | } HARDWAREINPUT, *PHARDWAREINPUT, FAR* LPHARDWAREINPUT; |
| | |
| #define INPUT_MOUSE 0 | | #define INPUT_MOUSE 0 |
| #define INPUT_KEYBOARD 1 | | #define INPUT_KEYBOARD 1 |
| #define INPUT_HARDWARE 2 | | #define INPUT_HARDWARE 2 |
| | |
| typedef struct tagINPUT { | | typedef struct tagINPUT { |
| DWORD type; | | DWORD type; |
| | |
| union | | union |
| { | | { |
| MOUSEINPUT mi; | | MOUSEINPUT mi; |
| KEYBDINPUT ki; | | KEYBDINPUT ki; |
| HARDWAREINPUT hi; | | HARDWAREINPUT hi; |
|
| }; | | } DUMMYUNIONNAME; |
| } INPUT, *PINPUT, FAR* LPINPUT; | | } INPUT, *PINPUT, FAR* LPINPUT; |
| | |
| WINUSERAPI | | WINUSERAPI |
| UINT | | UINT |
| WINAPI | | WINAPI |
| SendInput( | | SendInput( |
| _In_ UINT cInputs, // number of input in the array | | _In_ UINT cInputs, // number of input in the array |
| _In_reads_(cInputs) LPINPUT pInputs, // array of inputs | | _In_reads_(cInputs) LPINPUT pInputs, // array of inputs |
| _In_ int cbSize); // sizeof(INPUT) | | _In_ int cbSize); // sizeof(INPUT) |
| | |
| | |
| skipping to change at line 5877 | | skipping to change at line 5963 |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif /* WINVER >= 0x0601 */ | | #endif /* WINVER >= 0x0601 */ |
| | |
| #if(WINVER >= 0x0602) | | #if(WINVER >= 0x0602) |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
|
| | #define POINTER_STRUCTURES |
| | |
| enum tagPOINTER_INPUT_TYPE { | | enum tagPOINTER_INPUT_TYPE { |
| PT_POINTER = 0x00000001, // Generic pointer | | PT_POINTER = 0x00000001, // Generic pointer |
| PT_TOUCH = 0x00000002, // Touch | | PT_TOUCH = 0x00000002, // Touch |
| PT_PEN = 0x00000003, // Pen | | PT_PEN = 0x00000003, // Pen |
| PT_MOUSE = 0x00000004, // Mouse | | PT_MOUSE = 0x00000004, // Mouse |
| #if(WINVER >= 0x0603) | | #if(WINVER >= 0x0603) |
| PT_TOUCHPAD = 0x00000005, // Touchpad | | PT_TOUCHPAD = 0x00000005, // Touchpad |
| #endif /* WINVER >= 0x0603 */ | | #endif /* WINVER >= 0x0603 */ |
| }; | | }; |
|
| | |
| typedef DWORD POINTER_INPUT_TYPE; | | typedef DWORD POINTER_INPUT_TYPE; |
| | |
| typedef UINT32 POINTER_FLAGS; | | typedef UINT32 POINTER_FLAGS; |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #define POINTER_FLAG_NONE 0x00000000 // Default | | #define POINTER_FLAG_NONE 0x00000000 // Default |
| #define POINTER_FLAG_NEW 0x00000001 // New pointer | | #define POINTER_FLAG_NEW 0x00000001 // New pointer |
| #define POINTER_FLAG_INRANGE 0x00000002 // Pointer has not departed | | #define POINTER_FLAG_INRANGE 0x00000002 // Pointer has not departed |
| | |
| skipping to change at line 6061 | | skipping to change at line 6150 |
| _In_ UINT32 maxCount, | | _In_ UINT32 maxCount, |
| _In_ DWORD dwMode); | | _In_ DWORD dwMode); |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| InjectTouchInput( | | InjectTouchInput( |
| _In_ UINT32 count, | | _In_ UINT32 count, |
| _In_reads_(count) CONST POINTER_TOUCH_INFO *contacts); | | _In_reads_(count) CONST POINTER_TOUCH_INFO *contacts); |
| | |
|
| | typedef struct tagUSAGE_PROPERTIES { |
| | USHORT level; |
| | USHORT page; |
| | USHORT usage; |
| | INT32 logicalMinimum; |
| | INT32 logicalMaximum; |
| | USHORT unit; |
| | USHORT exponent; |
| | BYTE count; |
| | INT32 physicalMinimum; |
| | INT32 physicalMaximum; |
| | }USAGE_PROPERTIES, *PUSAGE_PROPERTIES; |
| | |
| | typedef struct tagPOINTER_TYPE_INFO { |
| | POINTER_INPUT_TYPE type; |
| | union{ |
| | POINTER_TOUCH_INFO touchInfo; |
| | POINTER_PEN_INFO penInfo; |
| | } DUMMYUNIONNAME; |
| | }POINTER_TYPE_INFO, *PPOINTER_TYPE_INFO; |
| | |
| | typedef struct tagINPUT_INJECTION_VALUE { |
| | USHORT page; |
| | USHORT usage; |
| | INT32 value; |
| | USHORT index; |
| | }INPUT_INJECTION_VALUE, *PINPUT_INJECTION_VALUE; |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| GetPointerType( | | GetPointerType( |
| _In_ UINT32 pointerId, | | _In_ UINT32 pointerId, |
| _Out_ POINTER_INPUT_TYPE *pointerType); | | _Out_ POINTER_INPUT_TYPE *pointerType); |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| | |
| skipping to change at line 6194 | | skipping to change at line 6311 |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| UnregisterPointerInputTarget( | | UnregisterPointerInputTarget( |
| _In_ HWND hwnd, | | _In_ HWND hwnd, |
| _In_ POINTER_INPUT_TYPE pointerType); | | _In_ POINTER_INPUT_TYPE pointerType); |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
|
| | RegisterPointerInputTargetEx( |
| | _In_ HWND hwnd, |
| | _In_ POINTER_INPUT_TYPE pointerType, |
| | _In_ BOOL fObserve); |
| | |
| | WINUSERAPI |
| | BOOL |
| | WINAPI |
| | UnregisterPointerInputTargetEx( |
| | _In_ HWND hwnd, |
| | _In_ POINTER_INPUT_TYPE pointerType); |
| | |
| | WINUSERAPI |
| | BOOL |
| | WINAPI |
| EnableMouseInPointer( | | EnableMouseInPointer( |
| _In_ BOOL fEnable); | | _In_ BOOL fEnable); |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| IsMouseInPointerEnabled( | | IsMouseInPointerEnabled( |
| VOID); | | VOID); |
| | |
| #define TOUCH_HIT_TESTING_DEFAULT 0x0 | | #define TOUCH_HIT_TESTING_DEFAULT 0x0 |
| | |
| skipping to change at line 6307 | | skipping to change at line 6439 |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif /* WINVER >= 0x0602 */ | | #endif /* WINVER >= 0x0602 */ |
| | |
| #if(WINVER >= 0x0603) | | #if(WINVER >= 0x0603) |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
|
| | //Disable warning C4201:nameless struct/union |
| | #if _MSC_VER >= 1200 |
| | #pragma warning(push) |
| | #endif |
| | #pragma warning(disable : 4201) |
| | |
| typedef struct tagINPUT_TRANSFORM { | | typedef struct tagINPUT_TRANSFORM { |
| union { | | union { |
| struct { | | struct { |
| float _11, _12, _13, _14; | | float _11, _12, _13, _14; |
| float _21, _22, _23, _24; | | float _21, _22, _23, _24; |
| float _31, _32, _33, _34; | | float _31, _32, _33, _34; |
| float _41, _42, _43, _44; | | float _41, _42, _43, _44; |
|
| }; | | } DUMMYSTRUCTNAME; |
| float m[4][4]; | | float m[4][4]; |
|
| }; | | } DUMMYUNIONNAME; |
| } INPUT_TRANSFORM; | | } INPUT_TRANSFORM; |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| GetPointerInputTransform( | | GetPointerInputTransform( |
| _In_ UINT32 pointerId, | | _In_ UINT32 pointerId, |
| _In_ UINT32 historyCount, | | _In_ UINT32 historyCount, |
| _Out_writes_(historyCount) INPUT_TRANSFORM *inputTransform); | | _Out_writes_(historyCount) INPUT_TRANSFORM *inputTransform); |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| skipping to change at line 6673 | | skipping to change at line 6815 |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
| #endif /* !NOMSG */ | | #endif /* !NOMSG */ |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #ifndef NOSYSMETRICS | | #ifndef NOSYSMETRICS |
| | |
| /* | | /* |
|
| | * GetDpiMetrics() codes |
| | */ |
| | #define DPISM_CYSIZE SM_CYSIZE |
| | #define DPISM_CXSIZE SM_CXSIZE |
| | #define DPISM_CXMENUCHECK SM_CXMENUCHECK |
| | #define DPISM_CYMENUCHECK SM_CYMENUCHECK |
| | #define DPISM_CYSMSIZE SM_CYSMSIZE |
| | #define DPISM_CXSMSIZE SM_CXSMSIZE |
| | #define DPISM_CYMENUSIZE SM_CYMENUSIZE |
| | #define DPISM_CXMENUSIZE SM_CXMENUSIZE |
| | #define DPISM_CYMENU SM_CYMENU |
| | #define DPISM_CYCAPTION SM_CYCAPTION |
| | #define DPISM_CYSMCAPTION SM_CYSMCAPTION |
| | #define DPISM_CXHSCROLL SM_CXHSCROLL |
| | #define DPISM_CXVSCROLL SM_CXVSCROLL |
| | #define DPISM_CYHSCROLL SM_CYHSCROLL |
| | #define DPISM_CYVSCROLL SM_CYVSCROLL |
| | #define DPISM_CYVTHUMB SM_CYVTHUMB |
| | #define DPISM_CXHTHUMB SM_CXHTHUMB |
| | #define DPISM_CXFRAME SM_CXFRAME |
| | #define DPISM_CYFRAME SM_CYFRAME |
| | #define DPISM_CXICON SM_CXICON |
| | #define DPISM_CYICON SM_CYICON |
| | #define DPISM_CXICONSPACING SM_CXICONSPACING |
| | #define DPISM_CYICONSPACING SM_CYICONSPACING |
| | #define DPISM_CXSMICON SM_CXSMICON |
| | #define DPISM_CYSMICON SM_CYSMICON |
| | #define DPISM_CXCURSOR SM_CXCURSOR |
| | #define DPISM_CYCURSOR SM_CYCURSOR |
| | #define DPISM_CXPADDEDBORDER SM_CXPADDEDBORDER |
| | |
| | /* |
| * GetSystemMetrics() codes | | * GetSystemMetrics() codes |
| */ | | */ |
| | |
| #define SM_CXSCREEN 0 | | #define SM_CXSCREEN 0 |
| #define SM_CYSCREEN 1 | | #define SM_CYSCREEN 1 |
| #define SM_CXVSCROLL 2 | | #define SM_CXVSCROLL 2 |
| #define SM_CYHSCROLL 3 | | #define SM_CYHSCROLL 3 |
| #define SM_CYCAPTION 4 | | #define SM_CYCAPTION 4 |
| #define SM_CXBORDER 5 | | #define SM_CXBORDER 5 |
| #define SM_CYBORDER 6 | | #define SM_CYBORDER 6 |
| | |
| skipping to change at line 11784 | | skipping to change at line 11958 |
| | |
| #define SPI_GETTOUCHPREDICTIONPARAMETERS 0x009C | | #define SPI_GETTOUCHPREDICTIONPARAMETERS 0x009C |
| #define SPI_SETTOUCHPREDICTIONPARAMETERS 0x009D | | #define SPI_SETTOUCHPREDICTIONPARAMETERS 0x009D |
| | |
| #define MAX_LOGICALDPIOVERRIDE 2 | | #define MAX_LOGICALDPIOVERRIDE 2 |
| #define MIN_LOGICALDPIOVERRIDE -2 | | #define MIN_LOGICALDPIOVERRIDE -2 |
| | |
| #define SPI_GETLOGICALDPIOVERRIDE 0x009E | | #define SPI_GETLOGICALDPIOVERRIDE 0x009E |
| #define SPI_SETLOGICALDPIOVERRIDE 0x009F | | #define SPI_SETLOGICALDPIOVERRIDE 0x009F |
| | |
|
| #define SPI_GETMOUSECORNERCLIPLENGTH 0x00A0 | | |
| #define SPI_SETMOUSECORNERCLIPLENGTH 0x00A1 | | |
| | | |
| #define SPI_GETMENURECT 0x00A2 | | #define SPI_GETMENURECT 0x00A2 |
| #define SPI_SETMENURECT 0x00A3 | | #define SPI_SETMENURECT 0x00A3 |
| | |
| #endif /* WINVER >= 0x0602 */ | | #endif /* WINVER >= 0x0602 */ |
| | |
| #if(WINVER >= 0x0500) | | #if(WINVER >= 0x0500) |
| #define SPI_GETACTIVEWINDOWTRACKING 0x1000 | | #define SPI_GETACTIVEWINDOWTRACKING 0x1000 |
| #define SPI_SETACTIVEWINDOWTRACKING 0x1001 | | #define SPI_SETACTIVEWINDOWTRACKING 0x1001 |
| #define SPI_GETMENUANIMATION 0x1002 | | #define SPI_GETMENUANIMATION 0x1002 |
| #define SPI_SETMENUANIMATION 0x1003 | | #define SPI_SETMENUANIMATION 0x1003 |
| | |
| skipping to change at line 11927 | | skipping to change at line 12098 |
| #define GESTUREVISUALIZATION_PRESSANDHOLD 0x0008 | | #define GESTUREVISUALIZATION_PRESSANDHOLD 0x0008 |
| #define GESTUREVISUALIZATION_RIGHTTAP 0x0010 | | #define GESTUREVISUALIZATION_RIGHTTAP 0x0010 |
| #endif /* WINVER >= 0x0602 */ | | #endif /* WINVER >= 0x0602 */ |
| | |
| #if(WINVER >= 0x0602) | | #if(WINVER >= 0x0602) |
| #define SPI_GETMOUSEWHEELROUTING 0x201C | | #define SPI_GETMOUSEWHEELROUTING 0x201C |
| #define SPI_SETMOUSEWHEELROUTING 0x201D | | #define SPI_SETMOUSEWHEELROUTING 0x201D |
| | |
| #define MOUSEWHEEL_ROUTING_FOCUS 0 | | #define MOUSEWHEEL_ROUTING_FOCUS 0 |
| #define MOUSEWHEEL_ROUTING_HYBRID 1 | | #define MOUSEWHEEL_ROUTING_HYBRID 1 |
|
| | | #if(WINVER >= 0x0603) |
| | #define MOUSEWHEEL_ROUTING_MOUSE_POS 2 |
| | #endif /* WINVER >= 0x0603 */ |
| #endif /* WINVER >= 0x0602 */ | | #endif /* WINVER >= 0x0602 */ |
| | |
|
| | #if(WINVER >= 0x0604) |
| | #define SPI_GETPENVISUALIZATION 0x201E |
| | #define SPI_SETPENVISUALIZATION 0x201F |
| | /* constants for SPI_{GET|SET}PENVISUALIZATION */ |
| | #define PENVISUALIZATION_ON 0x0023 |
| | #define PENVISUALIZATION_OFF 0x0000 |
| | #define PENVISUALIZATION_TAP 0x0001 |
| | #define PENVISUALIZATION_DOUBLETAP 0x0002 |
| | #define PENVISUALIZATION_CURSOR 0x0020 |
| | #endif /* WINVER >= 0x0604 */ |
| | |
| #endif /* WINVER >= 0x0500 */ | | #endif /* WINVER >= 0x0500 */ |
| | |
| /* | | /* |
| * Flags | | * Flags |
| */ | | */ |
| #define SPIF_UPDATEINIFILE 0x0001 | | #define SPIF_UPDATEINIFILE 0x0001 |
| #define SPIF_SENDWININICHANGE 0x0002 | | #define SPIF_SENDWININICHANGE 0x0002 |
| #define SPIF_SENDCHANGE SPIF_SENDWININICHANGE | | #define SPIF_SENDCHANGE SPIF_SENDWININICHANGE |
| | |
| #define METRICS_USEDEFAULT -1 | | #define METRICS_USEDEFAULT -1 |
| | |
| skipping to change at line 12734 | | skipping to change at line 12918 |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef MONITORINFOEXW MONITORINFOEX; | | typedef MONITORINFOEXW MONITORINFOEX; |
| typedef LPMONITORINFOEXW LPMONITORINFOEX; | | typedef LPMONITORINFOEXW LPMONITORINFOEX; |
| #else | | #else |
| typedef MONITORINFOEXA MONITORINFOEX; | | typedef MONITORINFOEXA MONITORINFOEX; |
| typedef LPMONITORINFOEXA LPMONITORINFOEX; | | typedef LPMONITORINFOEXA LPMONITORINFOEX; |
| #endif // UNICODE | | #endif // UNICODE |
| #else // ndef __cplusplus | | #else // ndef __cplusplus |
| typedef struct tagMONITORINFOEXA | | typedef struct tagMONITORINFOEXA |
| { | | { |
|
| MONITORINFO; | | MONITORINFO DUMMYSTRUCTNAME; |
| CHAR szDevice[CCHDEVICENAME]; | | CHAR szDevice[CCHDEVICENAME]; |
| } MONITORINFOEXA, *LPMONITORINFOEXA; | | } MONITORINFOEXA, *LPMONITORINFOEXA; |
| typedef struct tagMONITORINFOEXW | | typedef struct tagMONITORINFOEXW |
| { | | { |
|
| MONITORINFO; | | MONITORINFO DUMMYSTRUCTNAME; |
| WCHAR szDevice[CCHDEVICENAME]; | | WCHAR szDevice[CCHDEVICENAME]; |
| } MONITORINFOEXW, *LPMONITORINFOEXW; | | } MONITORINFOEXW, *LPMONITORINFOEXW; |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef MONITORINFOEXW MONITORINFOEX; | | typedef MONITORINFOEXW MONITORINFOEX; |
| typedef LPMONITORINFOEXW LPMONITORINFOEX; | | typedef LPMONITORINFOEXW LPMONITORINFOEX; |
| #else | | #else |
| typedef MONITORINFOEXA MONITORINFOEX; | | typedef MONITORINFOEXA MONITORINFOEX; |
| typedef LPMONITORINFOEXA LPMONITORINFOEX; | | typedef LPMONITORINFOEXA LPMONITORINFOEX; |
| #endif // UNICODE | | #endif // UNICODE |
| #endif | | #endif |
| | |
| skipping to change at line 13921 | | skipping to change at line 14105 |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| /* | | /* |
| * Type of the raw input | | * Type of the raw input |
| */ | | */ |
| #define RIM_TYPEMOUSE 0 | | #define RIM_TYPEMOUSE 0 |
| #define RIM_TYPEKEYBOARD 1 | | #define RIM_TYPEKEYBOARD 1 |
| #define RIM_TYPEHID 2 | | #define RIM_TYPEHID 2 |
|
| | #define RIM_TYPEMAX 2 |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
|
| | //Disable warning C4201:nameless struct/union |
| | #if _MSC_VER >= 1200 |
| | #pragma warning(push) |
| | #endif |
| | #pragma warning(disable : 4201) |
| | |
| /* | | /* |
| * Raw format of the mouse input | | * Raw format of the mouse input |
| */ | | */ |
| typedef struct tagRAWMOUSE { | | typedef struct tagRAWMOUSE { |
| /* | | /* |
| * Indicator flags. | | * Indicator flags. |
| */ | | */ |
| USHORT usFlags; | | USHORT usFlags; |
| | |
| /* | | /* |
| * The transition state of the mouse buttons. | | * The transition state of the mouse buttons. |
| */ | | */ |
| union { | | union { |
| ULONG ulButtons; | | ULONG ulButtons; |
| struct { | | struct { |
| USHORT usButtonFlags; | | USHORT usButtonFlags; |
| USHORT usButtonData; | | USHORT usButtonData; |
|
| }; | | } DUMMYSTRUCTNAME; |
| }; | | } DUMMYUNIONNAME; |
| | |
| /* | | /* |
| * The raw state of the mouse buttons. | | * The raw state of the mouse buttons. |
| */ | | */ |
| ULONG ulRawButtons; | | ULONG ulRawButtons; |
| | |
| /* | | /* |
| * The signed relative or absolute motion in the X direction. | | * The signed relative or absolute motion in the X direction. |
| */ | | */ |
| LONG lLastX; | | LONG lLastX; |
| | |
| skipping to change at line 13967 | | skipping to change at line 14158 |
| */ | | */ |
| LONG lLastY; | | LONG lLastY; |
| | |
| /* | | /* |
| * Device-specific additional information for the event. | | * Device-specific additional information for the event. |
| */ | | */ |
| ULONG ulExtraInformation; | | ULONG ulExtraInformation; |
| | |
| } RAWMOUSE, *PRAWMOUSE, *LPRAWMOUSE; | | } RAWMOUSE, *PRAWMOUSE, *LPRAWMOUSE; |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| /* | | /* |
| * Define the mouse button state indicators. | | * Define the mouse button state indicators. |
| */ | | */ |
| | |
| #define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 // Left Button changed to down. | | #define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 // Left Button changed to down. |
| #define RI_MOUSE_LEFT_BUTTON_UP 0x0002 // Left Button changed to up. | | #define RI_MOUSE_LEFT_BUTTON_UP 0x0002 // Left Button changed to up. |
| #define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 // Right Button changed to down. | | #define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 // Right Button changed to down. |
| | |
| skipping to change at line 13998 | | skipping to change at line 14193 |
| #define RI_MOUSE_BUTTON_4_DOWN 0x0040 | | #define RI_MOUSE_BUTTON_4_DOWN 0x0040 |
| #define RI_MOUSE_BUTTON_4_UP 0x0080 | | #define RI_MOUSE_BUTTON_4_UP 0x0080 |
| #define RI_MOUSE_BUTTON_5_DOWN 0x0100 | | #define RI_MOUSE_BUTTON_5_DOWN 0x0100 |
| #define RI_MOUSE_BUTTON_5_UP 0x0200 | | #define RI_MOUSE_BUTTON_5_UP 0x0200 |
| | |
| /* | | /* |
| * If usButtonFlags has RI_MOUSE_WHEEL, the wheel delta is stored in usButtonDat
a. | | * If usButtonFlags has RI_MOUSE_WHEEL, the wheel delta is stored in usButtonDat
a. |
| * Take it as a signed value. | | * Take it as a signed value. |
| */ | | */ |
| #define RI_MOUSE_WHEEL 0x0400 | | #define RI_MOUSE_WHEEL 0x0400 |
|
| | #if(WINVER >= 0x0600) |
| | #define RI_MOUSE_HWHEEL 0x0800 |
| | #endif /* WINVER >= 0x0600 */ |
| | |
| /* | | /* |
| * Define the mouse indicator flags. | | * Define the mouse indicator flags. |
| */ | | */ |
| #define MOUSE_MOVE_RELATIVE 0 | | #define MOUSE_MOVE_RELATIVE 0 |
| #define MOUSE_MOVE_ABSOLUTE 1 | | #define MOUSE_MOVE_ABSOLUTE 1 |
| #define MOUSE_VIRTUAL_DESKTOP 0x02 // the coordinates are mapped to the virt
ual desktop | | #define MOUSE_VIRTUAL_DESKTOP 0x02 // the coordinates are mapped to the virt
ual desktop |
| #define MOUSE_ATTRIBUTES_CHANGED 0x04 // requery for mouse attributes | | #define MOUSE_ATTRIBUTES_CHANGED 0x04 // requery for mouse attributes |
| #if(WINVER >= 0x0600) | | #if(WINVER >= 0x0600) |
| #define MOUSE_MOVE_NOCOALESCE 0x08 // do not coalesce mouse moves | | #define MOUSE_MOVE_NOCOALESCE 0x08 // do not coalesce mouse moves |
| | |
| skipping to change at line 14172 | | skipping to change at line 14370 |
| USHORT usUsage; | | USHORT usUsage; |
| } RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID; | | } RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID; |
| | |
| typedef struct tagRID_DEVICE_INFO { | | typedef struct tagRID_DEVICE_INFO { |
| DWORD cbSize; | | DWORD cbSize; |
| DWORD dwType; | | DWORD dwType; |
| union { | | union { |
| RID_DEVICE_INFO_MOUSE mouse; | | RID_DEVICE_INFO_MOUSE mouse; |
| RID_DEVICE_INFO_KEYBOARD keyboard; | | RID_DEVICE_INFO_KEYBOARD keyboard; |
| RID_DEVICE_INFO_HID hid; | | RID_DEVICE_INFO_HID hid; |
|
| }; | | } DUMMYUNIONNAME; |
| } RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO; | | } RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO; |
| | |
| WINUSERAPI | | WINUSERAPI |
| UINT | | UINT |
| WINAPI | | WINAPI |
| GetRawInputDeviceInfoA( | | GetRawInputDeviceInfoA( |
| _In_opt_ HANDLE hDevice, | | _In_opt_ HANDLE hDevice, |
| _In_ UINT uiCommand, | | _In_ UINT uiCommand, |
| _Inout_updates_bytes_to_opt_(*pcbSize, *pcbSize) LPVOID pData, | | _Inout_updates_bytes_to_opt_(*pcbSize, *pcbSize) LPVOID pData, |
| _Inout_ PUINT pcbSize); | | _Inout_ PUINT pcbSize); |
| | |
| skipping to change at line 14811 | | skipping to change at line 15009 |
| GetCIMSSM( | | GetCIMSSM( |
| _Out_ INPUT_MESSAGE_SOURCE *inputMessageSource); | | _Out_ INPUT_MESSAGE_SOURCE *inputMessageSource); |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif /* WINVER >= 0x0601 */ | | #endif /* WINVER >= 0x0601 */ |
| | |
| #if(WINVER >= 0x0601) | | #if(WINVER >= 0x0601) |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| /* | | /* |
| * AutoRotation state structure | | * AutoRotation state structure |
| */ | | */ |
| typedef enum tagAR_STATE { | | typedef enum tagAR_STATE { |
| AR_ENABLED = 0x0, | | AR_ENABLED = 0x0, |
| AR_DISABLED = 0x1, | | AR_DISABLED = 0x1, |
| AR_SUPPRESSED = 0x2, | | AR_SUPPRESSED = 0x2, |
| AR_REMOTESESSION = 0x4, | | AR_REMOTESESSION = 0x4, |
| AR_MULTIMON = 0x8, | | AR_MULTIMON = 0x8, |
| AR_NOSENSOR = 0x10, | | AR_NOSENSOR = 0x10, |
| AR_NOT_SUPPORTED = 0x20, | | AR_NOT_SUPPORTED = 0x20, |
| AR_DOCKED = 0x40, | | AR_DOCKED = 0x40, |
| AR_LAPTOP = 0x80 | | AR_LAPTOP = 0x80 |
| } AR_STATE, *PAR_STATE; | | } AR_STATE, *PAR_STATE; |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #ifndef MIDL_PASS | | #ifndef MIDL_PASS |
|
| // Dont define this for MIDL compiler passes over winuser.h. Some of them | | // Don't define this for MIDL compiler passes over winuser.h. Some of them |
| // dont include winnt.h (where DEFINE_ENUM_FLAG_OPERATORS is defined and | | // don't include winnt.h (where DEFINE_ENUM_FLAG_OPERATORS is defined and |
| // get compile errors. | | // get compile errors. |
|
| DEFINE_ENUM_FLAG_OPERATORS(AR_STATE); | | DEFINE_ENUM_FLAG_OPERATORS(AR_STATE) |
| #endif | | #endif |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* | | /* |
| * Orientation preference structure. This is used by applications to specify | | * Orientation preference structure. This is used by applications to specify |
| * their orientation preferences to windows. | | * their orientation preferences to windows. |
| */ | | */ |
| typedef enum ORIENTATION_PREFERENCE { | | typedef enum ORIENTATION_PREFERENCE { |
| ORIENTATION_PREFERENCE_NONE = 0x0, | | ORIENTATION_PREFERENCE_NONE = 0x0, |
| ORIENTATION_PREFERENCE_LANDSCAPE = 0x1, | | ORIENTATION_PREFERENCE_LANDSCAPE = 0x1, |
| ORIENTATION_PREFERENCE_PORTRAIT = 0x2, | | ORIENTATION_PREFERENCE_PORTRAIT = 0x2, |
| ORIENTATION_PREFERENCE_LANDSCAPE_FLIPPED = 0x4, | | ORIENTATION_PREFERENCE_LANDSCAPE_FLIPPED = 0x4, |
| ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8 | | ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8 |
| } ORIENTATION_PREFERENCE; | | } ORIENTATION_PREFERENCE; |
| | |
| #ifndef MIDL_PASS | | #ifndef MIDL_PASS |
|
| // Dont define this for MIDL compiler passes over winuser.h. Some of them | | // Don't define this for MIDL compiler passes over winuser.h. Some of them |
| // dont include winnt.h (where DEFINE_ENUM_FLAG_OPERATORS is defined and | | // don't include winnt.h (where DEFINE_ENUM_FLAG_OPERATORS is defined and |
| // get compile errors. | | // get compile errors. |
|
| DEFINE_ENUM_FLAG_OPERATORS(ORIENTATION_PREFERENCE); | | DEFINE_ENUM_FLAG_OPERATORS(ORIENTATION_PREFERENCE) |
| #endif | | #endif |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| GetAutoRotationState( | | GetAutoRotationState( |
| _Out_ PAR_STATE pState); | | _Out_ PAR_STATE pState); |
| | |
| WINUSERAPI | | WINUSERAPI |
| BOOL | | BOOL |
| | |
| skipping to change at line 14913 | | skipping to change at line 15111 |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| SetProcessRestrictionExemption( | | SetProcessRestrictionExemption( |
| _In_ BOOL fEnableExemption); | | _In_ BOOL fEnableExemption); |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif /* WINVER >= 0x0601 */ | | #endif /* WINVER >= 0x0601 */ |
| | |
|
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | |
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ | | #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ |
| #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) | | #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) |
| #include "winuser.inl" | | #include "winuser.inl" |
| #endif /* ISOLATION_AWARE_ENABLED */ | | #endif /* ISOLATION_AWARE_ENABLED */ |
| #endif /* RC */ | | #endif /* RC */ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
| | |
| | |
| End of changes. 66 change blocks. |
| 55 lines changed or deleted | | 264 lines changed or added |
|