wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

user32-rawinput-nolegacy: Also update the key state if RIDEV_NOLEGACY is used.

Browse Source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48612
This commit is contained in:
Zebediah Figura
2020-04-05 11:38:00 -05:00
parent f23b6cb7dc
commit 44d1a45e98
5 changed files with 212 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
patches/user32-rawinput-nolegacy/0006-server-Also-update-the-key-state-if-RIDEV_NOLEGACY-i.patch Normal file
View File

@@ -0,0 +1,106 @@
From 5406b7b15cae43cbe023492f518436c6990871f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 27 Mar 2020 16:25:14 +0100
Subject: [PATCH] server: Also update the key state if RIDEV_NOLEGACY is used.
---
server/queue.c | 40 ++++++++++++++++++++++++++++++++--------
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/server/queue.c b/server/queue.c
index 7262d6201f4..5621e393dd8 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1310,12 +1310,12 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int
/* update the key state for a keyboard message */
static void update_key_state( struct desktop *desktop, unsigned char *keystate,
- const struct message *msg )
+ unsigned int msg, lparam_t wparam )
{
unsigned char key;
int down = 0;
- switch (msg->msg)
+ switch (msg)
{
case WM_LBUTTONDOWN:
down = (keystate == desktop->keystate) ? 0xc0 : 0x80;
@@ -1339,8 +1339,8 @@ static void update_key_state( struct desktop *desktop, unsigned char *keystate,
down = (keystate == desktop->keystate) ? 0xc0 : 0x80;
/* fall through */
case WM_XBUTTONUP:
- if (msg->wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down );
- else if (msg->wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down );
+ if (wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down );
+ else if (wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down );
break;
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
@@ -1348,7 +1348,7 @@ static void update_key_state( struct desktop *desktop, unsigned char *keystate,
/* fall through */
case WM_KEYUP:
case WM_SYSKEYUP:
- key = (unsigned char)msg->wparam;
+ key = (unsigned char)wparam;
set_input_key_state( keystate, key, down );
switch(key)
{
@@ -1392,11 +1392,35 @@ static void synchronize_input_key_state( struct thread_input *input )
}
}
+/* update the desktop key state according to a mouse message flags */
+static void update_desktop_mouse_state( struct desktop *desktop, unsigned int flags,
+ int x, int y, lparam_t wparam )
+{
+ if (flags & MOUSEEVENTF_MOVE)
+ update_desktop_cursor_pos( desktop, x, y );
+ if (flags & MOUSEEVENTF_LEFTDOWN)
+ update_key_state( desktop, desktop->keystate, WM_LBUTTONDOWN, wparam );
+ if (flags & MOUSEEVENTF_LEFTUP)
+ update_key_state( desktop, desktop->keystate, WM_LBUTTONUP, wparam );
+ if (flags & MOUSEEVENTF_RIGHTDOWN)
+ update_key_state( desktop, desktop->keystate, WM_RBUTTONDOWN, wparam );
+ if (flags & MOUSEEVENTF_RIGHTUP)
+ update_key_state( desktop, desktop->keystate, WM_RBUTTONUP, wparam );
+ if (flags & MOUSEEVENTF_MIDDLEDOWN)
+ update_key_state( desktop, desktop->keystate, WM_MBUTTONDOWN, wparam );
+ if (flags & MOUSEEVENTF_MIDDLEUP)
+ update_key_state( desktop, desktop->keystate, WM_MBUTTONUP, wparam );
+ if (flags & MOUSEEVENTF_XDOWN)
+ update_key_state( desktop, desktop->keystate, WM_XBUTTONDOWN, wparam );
+ if (flags & MOUSEEVENTF_XUP)
+ update_key_state( desktop, desktop->keystate, WM_XBUTTONUP, wparam );
+}
+
/* update the thread input key state for a keyboard message */
static void update_input_key_state( struct thread_input *input, const struct message *msg )
{
synchronize_input_key_state( input );
- update_key_state( input->desktop, input->keystate, msg );
+ update_key_state( input->desktop, input->keystate, msg->msg, msg->wparam );
}
/* release the hardware message currently being processed by the given thread */
@@ -1548,7 +1572,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
struct thread_input *input;
unsigned int msg_code;
- update_key_state( desktop, desktop->keystate, msg );
+ update_key_state( desktop, desktop->keystate, msg->msg, msg->wparam );
last_input_time = get_tick_count();
if (msg->msg != WM_MOUSEMOVE) always_queue = 1;
@@ -1796,7 +1820,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
return 0;
if ((device = current->process->rawinput_mouse) && (device->flags & RIDEV_NOLEGACY))
{
- if (flags & MOUSEEVENTF_MOVE) update_desktop_cursor_pos( desktop, x, y );
+ update_desktop_mouse_state( desktop, flags, x, y, input->mouse.data << 16 );
return 0;
}
--
2.26.0

1
patches/user32-rawinput-nolegacy/definition
View File

@@ -1 +1,2 @@
Depends: user32-rawinput-mouse
Depends: server-Key_State