marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support. 

Signed-off-by: Kira Backes <kira.backes@nrwsoft.de>
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Kira Backes 2016-02-03 23:58:17 -07:00 committed by Alexandre Julliard
parent 032e088c7d
commit 94aee7a738
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/user32/message.c
View File

@ -2489,7 +2489,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 */
@ -2585,17 +2585,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;

11
include/winuser.h
View File

@ -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 */