dinput: Avoid deadlock when CS are acquired in different order.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43356Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Avoid deadlock when CS are acquired in different order.
02f03428 · Sebastian Lackner · Alexandre Julliard · 181e0225 · 02f03428 · 02f03428
Commit 02f03428 authored Apr 08, 2019 by Sebastian Lackner Committed by Alexandre Julliard Apr 08, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

device.c dlls/dinput/device.c +4 -4

dinput_main.c dlls/dinput/dinput_main.c +2 -2

dinput_private.h dlls/dinput/dinput_private.h +1 -1

No files found.
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -994,9 +994,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
    EnterCriticalSection(&This->crit);
    res = This->acquired ? S_FALSE : DI_OK;
    This->acquired = 1;
-    if (res == DI_OK)
-        check_dinput_hooks(iface);
    LeaveCriticalSection(&This->crit);
+    if (res == DI_OK)
+        check_dinput_hooks(iface, TRUE);

    return res;
 }
@@ -1022,9 +1022,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface)
    EnterCriticalSection(&This->crit);
    res = !This->acquired ? DI_NOEFFECT : DI_OK;
    This->acquired = 0;
-    if (res == DI_OK)
-        check_dinput_hooks(iface);
    LeaveCriticalSection(&This->crit);
+    if (res == DI_OK)
+        check_dinput_hooks(iface, FALSE);

    return res;
 }

--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -1834,7 +1834,7 @@ static BOOL check_hook_thread(void)
    return hook_thread_id != 0;
 }

-void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface)
+void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired)
 {
    static HHOOK callwndproc_hook;
    static ULONG foreground_cnt;
@@ -1844,7 +1844,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface)

    if (dev->dwCoopLevel & DISCL_FOREGROUND)
    {
-        if (dev->acquired)
+        if (acquired)
            foreground_cnt++;
        else
            foreground_cnt--;

--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -71,7 +71,7 @@ extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN;
 extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN;
 extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN;

-extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN;
+extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W, BOOL) DECLSPEC_HIDDEN;
 extern void check_dinput_events(void) DECLSPEC_HIDDEN;
 typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);