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

README.md

@@ -38,8 +38,9 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [1]:**
+**Bugfixes and features included in the next upcoming release [2]:**
 
+* Fallback to global key state for threads without a queue ([Wine Bug #27238](https://bugs.winehq.org/show_bug.cgi?id=27238))
 * Fix race-condition when threads are killed during shutdown
 
 

debian/changelog

@@ -7,6 +7,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low
   * Added patch to complete and properly pack DNS_HEADER structure (by Amine Khaldi, wine-patched/pull/6).
   * Added patch to fix race-condition when threads are killed during shutdown.
   * Added patch to avoid deadlock by using _exit() in NtTerminateProcess.
+  * Added patch to fallback to global key state for threads without a queue.
   * Removed patch to properly call DriverUnload when unloading device drivers (accepted upstream).
   * Removed patch to allow Accept-Encoding for HTTP/1.0 in wininet (accepted upstream).
   * Removed patch to declare pDirectInputCreateEx in a MSVC compatible way (accepted upstream).

patches/patchinstall.sh

@@ -156,6 +156,7 @@ patch_enable_all ()
 	enable_server_ClipCursor="$1"
 	enable_server_CreateProcess_ACLs="$1"
 	enable_server_Inherited_ACLs="$1"
+	enable_server_Key_State="$1"
 	enable_server_Misc_ACL="$1"
 	enable_server_OpenProcess="$1"
 	enable_server_Stored_ACLs="$1"
@@ -500,6 +501,9 @@ patch_enable ()
 		server-Inherited_ACLs)
 			enable_server_Inherited_ACLs="$2"
 			;;
+		server-Key_State)
+			enable_server_Key_State="$2"
+			;;
 		server-Misc_ACL)
 			enable_server_Misc_ACL="$2"
 			;;
@@ -3221,6 +3225,21 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset server-Key_State
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#27238] Fallback to global key state for threads without a queue
+# |
+# | Modified files:
+# |   *	server/queue.c
+# |
+if test "$enable_server_Key_State" -eq 1; then
+	patch_apply server-Key_State/0001-server-Fall-back-to-global-key-state-when-thread-doe.patch
+	(
+		echo '+    { "Sebastian Lackner", "server: Fall back to global key state when thread doesn'\''t have a queue.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset server-Misc_ACL
 # |
 # | This patchset fixes the following Wine bugs:

patches/server-Key_State/0001-server-Fall-back-to-global-key-state-when-thread-doe.patch

@@ -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
+

patches/server-Key_State/definition

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