From 6308175bc4d456ef2d6e87122576b56a074c3c44 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 18 Mar 2015 16:07:35 +0100 Subject: [PATCH] user32-Key_State: Fix (harmless) issue in the structure layout of user_thread_info. --- ...alling-LL-hooks-the-key-state-cache-ha.patch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/patches/user32-Key_State/0001-user32-After-calling-LL-hooks-the-key-state-cache-ha.patch b/patches/user32-Key_State/0001-user32-After-calling-LL-hooks-the-key-state-cache-ha.patch index 5eac4caf..59100670 100644 --- a/patches/user32-Key_State/0001-user32-After-calling-LL-hooks-the-key-state-cache-ha.patch +++ b/patches/user32-Key_State/0001-user32-After-calling-LL-hooks-the-key-state-cache-ha.patch @@ -1,4 +1,4 @@ -From 96c4389fb6f0799c218394dce61e204c5a03dc8f Mon Sep 17 00:00:00 2001 +From bd1a61f0fe9aee47535902b65bf3fcf669574b93 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 14 Jul 2014 05:06:40 +0200 Subject: user32: After calling LL hooks the key state cache has to be @@ -8,8 +8,8 @@ Subject: user32: After calling LL hooks the key state cache has to be dlls/user32/hook.c | 2 +- dlls/user32/input.c | 8 ++++++-- dlls/user32/message.c | 7 ++++++- - dlls/user32/user_private.h | 3 +++ - 4 files changed, 16 insertions(+), 4 deletions(-) + dlls/user32/user_private.h | 5 ++++- + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 2f6b42c..0c6a059 100644 @@ -90,10 +90,10 @@ index eac4e4d..d59e342 100644 USER_Driver->pSetCursorPos( new_x, new_y ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h -index adf3f7d..7afe48b 100644 +index adf3f7d..aa43578 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h -@@ -184,6 +184,7 @@ struct user_thread_info +@@ -184,15 +184,18 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ UINT active_hooks; /* Bitmap of active hooks */ @@ -101,8 +101,11 @@ index adf3f7d..7afe48b 100644 UINT key_state_time; /* Time of last key state refresh */ BYTE *key_state; /* Cache of global key state */ HWND top_window; /* Desktop window */ -@@ -193,6 +194,8 @@ struct user_thread_info - ULONG pad[6]; /* Available for more data */ + HWND msg_window; /* HWND_MESSAGE parent window */ + RAWINPUT *rawinput; + +- ULONG pad[6]; /* Available for more data */ ++ ULONG pad[5]; /* Available for more data */ }; +extern INT global_key_state_epoch DECLSPEC_HIDDEN;