[ros-diffs] [reactos] 01/01: [PSDK] Sort out the QS_*** definitions. Add the Win7+ QS_TOUCH and QS_POINTER.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d78a5b6dbf9de09d905de…

commit d78a5b6dbf9de09d905def711cb0c3f763fcaed8
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Fri Nov 19 18:23:35 2021 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Nov 19 18:23:57 2021 +0100

    [PSDK] Sort out the QS_*** definitions. Add the Win7+ QS_TOUCH and QS_POINTER.
    
    In particular, define the compound QS_MOUSE, QS_INPUT, QS_ALLEVENTS
    and QS_ALLINPUT flags based on the other elementary QS_*** flags,
    instead of having magic values for these.
---
 sdk/include/psdk/winuser.h | 47 ++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h
index 4ee8eaf49a5..0b5f2cd04cd 100644
--- a/sdk/include/psdk/winuser.h
+++ b/sdk/include/psdk/winuser.h
@@ -865,29 +865,36 @@ extern "C" {
 #define DWLP_DLGPROC (DWLP_MSGRESULT + sizeof(LRESULT))
 #define DWLP_USER (DWLP_DLGPROC + sizeof(DLGPROC))
 
+#define QS_KEY              1
+#define QS_MOUSEMOVE        2
+#define QS_MOUSEBUTTON      4
+#define QS_POSTMESSAGE      8
+#define QS_TIMER            16
+#define QS_PAINT            32
+#define QS_SENDMESSAGE      64
+#define QS_HOTKEY           128
+#define QS_ALLPOSTMESSAGE   256
+
 #if (_WIN32_WINNT >= 0x0501)
-#define QS_ALLEVENTS 1215
-#define QS_ALLINPUT 1279
-#define QS_RAWINPUT 1024
-#else
-#define QS_ALLEVENTS 191
-#define QS_ALLINPUT 255
+#define QS_RAWINPUT         1024
 #endif
-#define QS_ALLPOSTMESSAGE 256
-#define QS_HOTKEY 128
-#if (_WIN32_WINNT >= 0x0501)
-#define QS_INPUT 1031
+#if (_WIN32_WINNT >= 0x0602)
+#define QS_TOUCH            2048
+#define QS_POINTER          4096
+#endif
+
+#define QS_MOUSE            (QS_MOUSEMOVE | QS_MOUSEBUTTON)
+
+#if (_WIN32_WINNT >= 0x0602)
+#define QS_INPUT            (QS_KEY | QS_MOUSE | QS_RAWINPUT | QS_TOUCH | QS_POINTER)
+#elif (_WIN32_WINNT >= 0x0501)
+#define QS_INPUT            (QS_KEY | QS_MOUSE | QS_RAWINPUT)
 #else
-#define QS_INPUT 7
-#endif
-#define QS_KEY 1
-#define QS_MOUSE 6
-#define QS_MOUSEBUTTON 4
-#define QS_MOUSEMOVE 2
-#define QS_PAINT 32
-#define QS_POSTMESSAGE 8
-#define QS_SENDMESSAGE 64
-#define QS_TIMER 16
+#define QS_INPUT            (QS_KEY | QS_MOUSE)
+#endif
+
+#define QS_ALLEVENTS        (QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT |
QS_HOTKEY)
+#define QS_ALLINPUT         (QS_ALLEVENTS | QS_SENDMESSAGE)
 
 #define USER_TIMER_MAXIMUM  2147483647
 #define USER_TIMER_MINIMUM  10