dinput: Create single thread for mouse and keyboard hook procs.
Vitaliy Margolen
wine-patch at kievinfo.com
Sat Feb 4 11:33:28 CST 2006
For hooks to work properly hook callback have to be in a thread with
message loop. Some games create separate threads just to handle mouse
and/or keyboard events that do not have message loop. This patch fixes
such games (Bug 4264) and (Bug 2981).
ChangeLog:
dinput: Create single thread for mouse and keyboard hook procs.
Put keyboard & mouse hook callbacks into separate thread.
Move few global variables into object.
Delete no longer used crit section.
dlls/dinput/device.c | 80 +++++++++++++++++++++++++
dlls/dinput/device_private.h | 2 +
dlls/dinput/keyboard.c | 136 +++++++++++++++++-------------------------
dlls/dinput/mouse.c | 25 +++-----
4 files changed, 147 insertions(+), 96 deletions(-)
-------------- next part --------------
a311024b30ea0ea8a44f8035b4fdc2dda5202448
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 8cca6f5..ebc0dbe 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -32,9 +32,11 @@
#include "wine/unicode.h"
#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
#include "winerror.h"
#include "dinput.h"
#include "device_private.h"
+#include "dinput_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
@@ -898,3 +900,81 @@ HRESULT WINAPI IDirectInputDevice8WImpl_
return DI_OK;
}
+
+/******************************************************************************
+ * hook_thread_proc
+ */
+static HANDLE signal_event;
+
+static DWORD WINAPI dinput_hook_thread_proc(void *param)
+{
+ MSG msg;
+
+ while (GetMessageW(&msg, 0, 0, 0))
+ {
+ TRACE("got message %x %p %p\n", msg.message, (LPVOID)msg.wParam, (LPVOID)msg.lParam);
+ switch (msg.message)
+ {
+ case WM_USER+0x10: /* install keyboard hook */
+ *(HHOOK*)msg.wParam = SetWindowsHookExW(WH_KEYBOARD_LL, (LPVOID)msg.lParam,
+ DINPUT_instance, 0);
+ break;
+ case WM_USER+0x11: /* install mouse hook */
+ *(HHOOK*)msg.wParam = SetWindowsHookExW(WH_MOUSE_LL, (LPVOID)msg.lParam,
+ DINPUT_instance, 0);
+ break;
+ }
+ SetEvent(signal_event);
+ }
+ return 0;
+}
+
+static DWORD get_dinput_thread_tid(void)
+{
+ static HANDLE dinput_hook_thread;
+ static DWORD dinput_hook_thread_id;
+
+ if (!dinput_hook_thread)
+ {
+ HANDLE thread;
+ DWORD tid;
+
+ thread = CreateThread(NULL, 0, dinput_hook_thread_proc, NULL, 0, &tid);
+
+ if (InterlockedCompareExchangePointer((PVOID)&dinput_hook_thread, thread, 0) != 0)
+ {
+ /* someone beat us here... */
+ while (!PostThreadMessageW(tid, WM_QUIT, 0, 0)) Sleep(100);
+ WaitForSingleObject(thread, INFINITE);
+ CloseHandle(thread);
+ }
+ else
+ {
+ dinput_hook_thread_id = tid;
+ signal_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+ }
+ }
+ return dinput_hook_thread_id;
+}
+
+HHOOK set_dinput_hook(int hook_id, LPVOID proc)
+{
+ HHOOK hook;
+
+ TRACE("hook_id=%i proc=%p\n", hook_id, proc);
+ switch (hook_id)
+ {
+ case WH_KEYBOARD_LL:
+ while (!PostThreadMessageW(get_dinput_thread_tid(), WM_USER+0x10, (WPARAM)&hook, (LPARAM)proc))
+ Sleep(100);
+ break;
+ case WH_MOUSE_LL:
+ while (!PostThreadMessageW(get_dinput_thread_tid(), WM_USER+0x11, (WPARAM)&hook, (LPARAM)proc))
+ Sleep(100);
+ break;
+ default:
+ return 0;
+ }
+ WaitForSingleObject(signal_event, INFINITE);
+ return hook;
+}
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index 4f2347b..6c967e7 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -52,6 +52,8 @@ extern void fill_DataFormat(void *out, c
extern DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) ;
extern void release_DataFormat(DataFormat *df) ;
+extern HHOOK set_dinput_hook(int hook_id, LPVOID proc);
+
/* Used to fill events in the queue */
#define GEN_EVENT(offset,data,xtime,seq) \
{ \
diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index aa6cbcb..305a5d7 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -52,7 +52,8 @@ struct SysKeyboardImpl
IDirectInputImpl* dinput;
- HANDLE hEvent;
+ HANDLE hEvent;
+ HHOOK hook; /* installed WH_KEYBOARD_LL hook */
/* SysKeyboardAImpl */
int acquired;
int buffersize; /* set in 'SetProperty' */
@@ -78,73 +79,57 @@ static SysKeyboardImpl* current_lock = N
static BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; /* array for 'GetDeviceState' */
-static CRITICAL_SECTION keyboard_crit;
-static CRITICAL_SECTION_DEBUG critsect_debug =
-{
- 0, 0, &keyboard_crit,
- { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
- 0, 0, { (DWORD_PTR)(__FILE__ ": keyboard_crit") }
-};
-static CRITICAL_SECTION keyboard_crit = { &critsect_debug, -1, 0, 0, 0, 0 };
-
-static LONG keyboard_users = 0;
-static HHOOK keyboard_hook = NULL;
-
LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam )
{
- BYTE dik_code;
- BOOL down;
- DWORD timestamp;
- KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam;
- BYTE new_diks;
+ SysKeyboardImpl *This = (SysKeyboardImpl *)current_lock;
+ BYTE dik_code;
+ BOOL down;
+ KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam;
+ BYTE new_diks;
- TRACE("(%d,%d,%ld)\n", code, wparam, lparam);
+ TRACE("(%d,%d,%ld)\n", code, wparam, lparam);
- /** returns now if not HC_ACTION */
- if (code != HC_ACTION) return CallNextHookEx(keyboard_hook, code, wparam, lparam);
+ /* returns now if not HC_ACTION */
+ if (code != HC_ACTION) return CallNextHookEx(This->hook, code, wparam, lparam);
- {
dik_code = hook->scanCode;
if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80;
down = !(hook->flags & LLKHF_UP);
- timestamp = hook->time;
- }
- /** returns now if key event already known */
- new_diks = (down ? 0x80 : 0);
- /*if (new_diks != DInputKeyState[dik_code]) return CallNextHookEx(keyboard_hook, code, wparam, lparam); TO BE FIXED */
+ /** returns now if key event already known */
+ new_diks = (down ? 0x80 : 0);
+ /*if (new_diks != DInputKeyState[dik_code]) return CallNextHookEx(keyboard_hook, code, wparam, lparam); TO BE FIXED */
- DInputKeyState[dik_code] = new_diks;
- TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]);
+ DInputKeyState[dik_code] = new_diks;
+ TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]);
- if (current_lock != NULL) {
- if (current_lock->hEvent) SetEvent(current_lock->hEvent);
+ if (This->hEvent) SetEvent(This->hEvent);
- if (current_lock->buffer != NULL) {
- int n;
-
- EnterCriticalSection(&(current_lock->crit));
-
- n = (current_lock->start + current_lock->count) % current_lock->buffersize;
-
- current_lock->buffer[n].dwOfs = dik_code;
- current_lock->buffer[n].dwData = down ? 0x80 : 0;
- current_lock->buffer[n].dwTimeStamp = timestamp;
- current_lock->buffer[n].dwSequence = current_lock->dinput->evsequence++;
+ if (This->buffer != NULL)
+ {
+ int n;
+
+ EnterCriticalSection(&(This->crit));
+
+ n = (This->start + This->count) % This->buffersize;
+
+ This->buffer[n].dwOfs = dik_code;
+ This->buffer[n].dwData = down ? 0x80 : 0;
+ This->buffer[n].dwTimeStamp = hook->time;
+ This->buffer[n].dwSequence = This->dinput->evsequence++;
- TRACE("Adding event at offset %d : %ld - %ld - %ld - %ld\n", n,
- current_lock->buffer[n].dwOfs, current_lock->buffer[n].dwData, current_lock->buffer[n].dwTimeStamp, current_lock->buffer[n].dwSequence);
+ TRACE("Adding event at offset %d : %ld - %ld - %ld - %ld\n", n,
+ This->buffer[n].dwOfs, This->buffer[n].dwData, This->buffer[n].dwTimeStamp, This->buffer[n].dwSequence);
- if (current_lock->count == current_lock->buffersize) {
- current_lock->start = ++current_lock->start % current_lock->buffersize;
- current_lock->overflow = TRUE;
- } else
- current_lock->count++;
+ if (This->count == This->buffersize) {
+ This->start = ++This->start % This->buffersize;
+ This->overflow = TRUE;
+ }
+ else This->count++;
- LeaveCriticalSection(&(current_lock->crit));
+ LeaveCriticalSection(&(This->crit));
}
- }
- return CallNextHookEx(keyboard_hook, code, wparam, lparam);
+ return CallNextHookEx(This->hook, code, wparam, lparam);
}
static GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */
@@ -241,7 +226,6 @@ static BOOL keyboarddev_enum_deviceW(DWO
static SysKeyboardImpl *alloc_device(REFGUID rguid, const void *kvt, IDirectInputImpl *dinput)
{
SysKeyboardImpl* newDevice;
- DWORD kbd_users;
newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysKeyboardImpl));
newDevice->lpVtbl = kvt;
@@ -250,13 +234,6 @@ static SysKeyboardImpl *alloc_device(REF
newDevice->dinput = dinput;
InitializeCriticalSection(&(newDevice->crit));
- EnterCriticalSection(&keyboard_crit);
- kbd_users = InterlockedIncrement(&keyboard_users);
- if (1 == kbd_users) {
- keyboard_hook = SetWindowsHookExW( WH_KEYBOARD_LL, KeyboardCallback, DINPUT_instance, 0 );
- }
- LeaveCriticalSection(&keyboard_crit);
-
return newDevice;
}
@@ -307,29 +284,22 @@ const struct dinput_device keyboard_devi
static ULONG WINAPI SysKeyboardAImpl_Release(LPDIRECTINPUTDEVICE8A iface)
{
- SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
- ULONG ref;
- DWORD kbd_users;
+ SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+ ULONG ref;
- ref = InterlockedDecrement(&(This->ref));
- if (ref)
- return ref;
-
- EnterCriticalSection(&keyboard_crit);
- kbd_users = InterlockedDecrement(&keyboard_users);
- if (0 == kbd_users) {
- UnhookWindowsHookEx( keyboard_hook );
- keyboard_hook = 0;
- }
- LeaveCriticalSection(&keyboard_crit);
+ ref = InterlockedDecrement(&(This->ref));
+ if (ref) return ref;
- /* Free the data queue */
- HeapFree(GetProcessHeap(),0,This->buffer);
+ if (This->hook)
+ UnhookWindowsHookEx(This->hook);
- DeleteCriticalSection(&(This->crit));
+ /* Free the data queue */
+ HeapFree(GetProcessHeap(),0,This->buffer);
- HeapFree(GetProcessHeap(),0,This);
- return DI_OK;
+ DeleteCriticalSection(&(This->crit));
+
+ HeapFree(GetProcessHeap(),0,This);
+ return DI_OK;
}
static HRESULT WINAPI SysKeyboardAImpl_SetProperty(
@@ -563,7 +533,7 @@ static HRESULT WINAPI SysKeyboardAImpl_A
This->buffer = NULL;
}
- /*keyboard_hook = SetWindowsHookExW( WH_KEYBOARD_LL, KeyboardCallback, DINPUT_instance, 0 );*/
+ This->hook = set_dinput_hook(WH_KEYBOARD_LL, KeyboardCallback);
return DI_OK;
}
@@ -576,6 +546,12 @@ static HRESULT WINAPI SysKeyboardAImpl_U
if (This->acquired == 0)
return DI_NOEFFECT;
+ if (This->hook)
+ {
+ UnhookWindowsHookEx(This->hook);
+ This->hook = NULL;
+ }
+
/* No more locks */
if (current_lock == This)
current_lock = NULL;
diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index 6570d1f..d7e763a 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -330,14 +330,10 @@ static ULONG WINAPI SysMouseAImpl_Releas
if (ref)
return ref;
+ if (This->hook) UnhookWindowsHookEx(This->hook);
+
/* Free the data queue */
HeapFree(GetProcessHeap(),0,This->data_queue);
-
- if (This->hook) {
- UnhookWindowsHookEx( This->hook );
- if (This->dwCoopLevel & DISCL_EXCLUSIVE)
- ShowCursor(TRUE); /* show cursor */
- }
DeleteCriticalSection(&(This->crit));
/* Free the DataFormat */
@@ -553,7 +549,6 @@ static LRESULT CALLBACK dinput_mouse_hoo
return ret;
}
-
static void dinput_window_check(SysMouseImpl* This) {
RECT rect;
DWORD centerX, centerY;
@@ -611,7 +606,7 @@ static HRESULT WINAPI SysMouseAImpl_Acqu
/* Install our mouse hook */
if (This->dwCoopLevel & DISCL_EXCLUSIVE)
ShowCursor(FALSE); /* hide cursor */
- This->hook = SetWindowsHookExA( WH_MOUSE_LL, dinput_mouse_hook, DINPUT_instance, 0 );
+ This->hook = set_dinput_hook(WH_MOUSE_LL, dinput_mouse_hook);
/* Get the window dimension and find the center */
GetWindowRect(This->win, &rect);
@@ -647,16 +642,14 @@ static HRESULT WINAPI SysMouseAImpl_Unac
if (0 == This->acquired) {
return DI_NOEFFECT;
}
-
- /* Reinstall previous mouse event handler */
if (This->hook) {
- UnhookWindowsHookEx( This->hook );
- This->hook = 0;
-
- if (This->dwCoopLevel & DISCL_EXCLUSIVE)
- ShowCursor(TRUE); /* show cursor */
+ UnhookWindowsHookEx(This->hook);
+ This->hook = NULL;
+
+ if (This->dwCoopLevel & DISCL_EXCLUSIVE)
+ ShowCursor(TRUE); /* show cursor */
}
-
+
/* No more locks */
if (current_lock == (IDirectInputDevice8A*) This)
current_lock = NULL;
More information about the wine-patches
mailing list