Kira Backes : user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: cfa2c8702677435798fc67638235f10359a69479
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cfa2c8702677435798fc676382...

Author: Kira Backes <kira.backes(a)nrwsoft.de>
Date:   Wed Feb  3 23:58:17 2016 -0700

user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support.

Signed-off-by: Kira Backes <kira.backes(a)nrwsoft.de>
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 94aee7a738751194969b5cf7f055c4f3727fbf1e)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/user32/message.c | 20 +++++++++++---------
 include/winuser.h     | 11 +++++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index 96e7f2e..3e419ee 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -2488,7 +2488,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
     INT hittest;
     EVENTMSG event;
     GUITHREADINFO info;
-    MOUSEHOOKSTRUCT hook;
+    MOUSEHOOKSTRUCTEX hook;
     BOOL eatMsg;
 
     /* find the window to dispatch this mouse message to */
@@ -2584,17 +2584,19 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
 
     /* message is accepted now (but may still get dropped) */
 
-    hook.pt           = msg->pt;
-    hook.hwnd         = msg->hwnd;
-    hook.wHitTestCode = hittest;
-    hook.dwExtraInfo  = extra_info;
+    hook.s.pt           = msg->pt;
+    hook.s.hwnd         = msg->hwnd;
+    hook.s.wHitTestCode = hittest;
+    hook.s.dwExtraInfo  = extra_info;
+    hook.mouseData      = msg->wParam;
     if (HOOK_CallHooks( WH_MOUSE, remove ? HC_ACTION : HC_NOREMOVE,
                         message, (LPARAM)&hook, TRUE ))
     {
-        hook.pt           = msg->pt;
-        hook.hwnd         = msg->hwnd;
-        hook.wHitTestCode = hittest;
-        hook.dwExtraInfo  = extra_info;
+        hook.s.pt           = msg->pt;
+        hook.s.hwnd         = msg->hwnd;
+        hook.s.wHitTestCode = hittest;
+        hook.s.dwExtraInfo  = extra_info;
+        hook.mouseData      = msg->wParam;
         HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE );
         accept_hardware_message( hw_id, TRUE );
         return FALSE;
diff --git a/include/winuser.h b/include/winuser.h
index 50821f4..cbd592c 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -385,6 +385,17 @@ typedef struct
     ULONG_PTR dwExtraInfo;
 } MOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT, *LPMOUSEHOOKSTRUCT;
 
+typedef struct
+{
+    struct { /* MOUSEHOOKSTRUCT */
+        POINT pt;
+        HWND  hwnd;
+        UINT  wHitTestCode;
+        ULONG_PTR dwExtraInfo;
+    } DUMMYSTRUCTNAME;
+    DWORD mouseData;
+} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX;
+
 
     /* Hardware hook structure */