wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5662d85e0e95a2715ab3b81c25c89121fc8db34d.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-05-13 12:38:27 +10:00
parent 8791ceb20d
commit cc0df4cd1b
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch
View File

@ -1,4 +1,4 @@
From aabf00b3648c3ac7573d2ddffdb95bb98aed2616 Mon Sep 17 00:00:00 2001
From c5886826531d48127be7e9f957708c737bb9f9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Wed, 24 Mar 2021 23:29:28 +0100
Subject: [PATCH] user32: Set SEND_HWMSG_RAWINPUT flags only when RAWINPUT is
@ -12,18 +12,18 @@ __wine_send_input with INPUT_HARDWARE input type and a rawinput.
dlls/win32u/message.c | 4 ++--
dlls/wineandroid.drv/keyboard.c | 3 ++-
dlls/wineandroid.drv/window.c | 5 +++--
dlls/winemac.drv/ime.c | 6 ++++--
dlls/winemac.drv/ime.c | 1 +
dlls/winemac.drv/keyboard.c | 3 ++-
dlls/winemac.drv/mouse.c | 3 ++-
dlls/winex11.drv/keyboard.c | 3 ++-
dlls/winex11.drv/mouse.c | 11 +++++++----
9 files changed, 26 insertions(+), 15 deletions(-)
9 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index a8b938066ff..b89869b141c 100644
index 83d2a4e3efb..511d4040d38 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -613,6 +613,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
@@ -653,6 +653,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
{
UINT i;
NTSTATUS status = STATUS_SUCCESS;
@ -31,7 +31,7 @@ index a8b938066ff..b89869b141c 100644
if (size != sizeof(INPUT))
{
@@ -642,7 +643,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
@@ -682,7 +683,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
update_mouse_coords( &input );
/* fallthrough */
case INPUT_KEYBOARD:
@ -41,7 +41,7 @@ index a8b938066ff..b89869b141c 100644
case INPUT_HARDWARE:
RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED );
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index bad69c18142..3c4c12d1c7f 100644
index a8ced6eac52..c860612f2b4 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -2627,7 +2627,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
@ -114,7 +114,7 @@ index f01df37a400..eb96300da89 100644
default:
diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 5780c942283..41835ea3e2d 100644
index 9249b722909..b8aec78e12c 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -38,6 +38,7 @@
@ -125,29 +125,8 @@ index 5780c942283..41835ea3e2d 100644
WINE_DEFAULT_DEBUG_CHANNEL(imm);
@@ -1403,6 +1404,7 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
params->cursor_pos, !params->complete);
else
{
+ RAWINPUT rawinput;
INPUT input;
unsigned int i;
@@ -1415,10 +1417,10 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
{
input.ki.wScan = params->text[i];
input.ki.dwFlags = KEYEVENTF_UNICODE;
- __wine_send_input(hwnd, &input, NULL);
+ __wine_send_input(hwnd, &input, &rawinput);
input.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP;
- __wine_send_input(hwnd, &input, NULL);
+ __wine_send_input(hwnd, &input, &rawinput);
}
}
}
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 76c038caf02..9e415bd70e3 100644
index c1963daa56e..14f0010e37e 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)
@ -189,7 +168,7 @@ index cb194095d55..74c329488c4 100644
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 5d02da68313..0a74a7c603d 100644
index c6a167dc4c6..03fe0ce8d32 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1123,6 +1123,7 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e)
@ -274,5 +253,5 @@ index e25b3e7728a..bb9807bf850 100644
}
--
2.39.2
2.40.1

2
staging/upstream-commit
View File

@ -1 +1 @@
19eab9c0e59201277f359d55ee5747383e014e87
5662d85e0e95a2715ab3b81c25c89121fc8db34d