diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index be514272..b63cfba6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "772badd0d7f3286a7881a71f16fad417e2d7787d" + echo "ec62575e9d99fc35752760cc37ded207febdfd11" } # Show version information diff --git a/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch b/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch index 843d3130..fb7efdd4 100644 --- a/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch +++ b/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch @@ -1,4 +1,4 @@ -From aaf6709946884d010891d213b4a7f3f4b22f4ee5 Mon Sep 17 00:00:00 2001 +From ce8d669795e7c7fc81189c534e16fd58c501e577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Wed, 24 Mar 2021 23:29:28 +0100 Subject: [PATCH] user32: Set SEND_HWMSG_RAWINPUT flags only when RAWINPUT is @@ -20,7 +20,7 @@ __wine_send_input with INPUT_HARDWARE input type and a rawinput. 9 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index bc451cdd5d6..4f62fff1b83 100644 +index 2ac23ba999c..2db536fc48e 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -131,6 +131,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size ) @@ -41,10 +41,10 @@ index bc451cdd5d6..4f62fff1b83 100644 case INPUT_HARDWARE: RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c -index 0c6e2f262ff..921472646af 100644 +index 62bd20c42aa..3e35d278fab 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c -@@ -2605,7 +2605,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r +@@ -2611,7 +2611,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.mouse.flags = input->mi.dwFlags; req->input.mouse.time = input->mi.time; req->input.mouse.info = input->mi.dwExtraInfo; @@ -53,7 +53,7 @@ index 0c6e2f262ff..921472646af 100644 break; case INPUT_KEYBOARD: req->input.kbd.vkey = input->ki.wVk; -@@ -2613,7 +2613,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r +@@ -2619,7 +2619,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.kbd.flags = input->ki.dwFlags; req->input.kbd.time = input->ki.time; req->input.kbd.info = input->ki.dwExtraInfo; @@ -147,18 +147,18 @@ index 19a974b3c24..d5c5689d396 100644 } } diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c -index b43ea0b5dc7..539502d79d9 100644 +index 76c038caf02..9e415bd70e3 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -990,6 +990,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) */ - static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, DWORD flags, DWORD time) + static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, unsigned int flags, unsigned int time) { + RAWINPUT rawinput; INPUT input; TRACE_(key)("hwnd %p vkey=%04x scan=%04x flags=%04x\n", hwnd, vkey, scan, flags); -@@ -1001,7 +1002,7 @@ static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, DWORD fl +@@ -1001,7 +1002,7 @@ static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, unsigned input.ki.time = time; input.ki.dwExtraInfo = 0; @@ -168,7 +168,7 @@ index b43ea0b5dc7..539502d79d9 100644 diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c -index 6dd90978a93..0479bc78c2b 100644 +index cb194095d55..74c329488c4 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -129,6 +129,7 @@ static const CFStringRef cocoa_cursor_names[] = @@ -274,5 +274,5 @@ index 82a82032957..17e88f87982 100644 } -- -2.38.1 +2.39.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index d67dabb8..100a5485 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -772badd0d7f3286a7881a71f16fad417e2d7787d +ec62575e9d99fc35752760cc37ded207febdfd11