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

Added patch to fallback to global key state for threads without a queue.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-02-26 04:26:59 +01:00
parent d25e78cefb
commit dd12b420e8
5 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
patches/server-Key_State/0001-server-Fall-back-to-global-key-state-when-thread-doe.patch Normal file
View File

@@ -0,0 +1,58 @@
From c908afaed01d4ca53ef66a7fb649402f9ae1a3d8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 26 Feb 2015 04:23:28 +0100
Subject: server: Fall back to global key state when thread doesn't have a
queue.
---
server/queue.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/server/queue.c b/server/queue.c
index 3a321cd..6cbf8e1 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -2783,27 +2783,28 @@ DECL_HANDLER(get_key_state)
struct desktop *desktop;
data_size_t size = min( 256, get_reply_max_size() );
- if (!req->tid) /* get global async key state */
- {
- if (!(desktop = get_thread_desktop( current, 0 ))) return;
- if (req->key >= 0)
- {
- reply->state = desktop->keystate[req->key & 0xff];
- desktop->keystate[req->key & 0xff] &= ~0x40;
- }
- set_reply_data( desktop->keystate, size );
- release_object( desktop );
- }
- else
+ if (req->tid)
{
if (!(thread = get_thread_from_id( req->tid ))) return;
if (thread->queue)
{
if (req->key >= 0) reply->state = thread->queue->input->keystate[req->key & 0xff];
set_reply_data( thread->queue->input->keystate, size );
+ release_object( thread );
+ return;
}
release_object( thread );
}
+
+ /* get global async key state */
+ if (!(desktop = get_thread_desktop( current, 0 ))) return;
+ if (req->key >= 0)
+ {
+ reply->state = desktop->keystate[req->key & 0xff];
+ desktop->keystate[req->key & 0xff] &= ~0x40;
+ }
+ set_reply_data( desktop->keystate, size );
+ release_object( desktop );
}
--
2.3.0

1
patches/server-Key_State/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [27238] Fallback to global key state for threads without a queue