Rémi Bernon : dinput: Unacquire all devices on internal thread error.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5119753a33e3b0bed98186b574eb1a82cb18664e
URL:    https://gitlab.winehq.org/wine/wine/-/commit/5119753a33e3b0bed98186b574eb1a8...

Author: Rémi Bernon 
Date:   Sun Jan 22 12:28:14 2023 +0100

dinput: Unacquire all devices on internal thread error.

---

dlls/dinput/dinput_main.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 21b77b32cac..aceed841df5 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -201,7 +201,7 @@ static void dinput_unacquire_window_devices( HWND window )

LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry )
     {
-        if (window == impl->win)
+        if (!window || window == impl->win)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
             dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
@@ -209,7 +209,7 @@ static void dinput_unacquire_window_devices( HWND window )
     }
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry )
     {
-        if (window == impl->win)
+        if (!window || window == impl->win)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
             dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
@@ -217,7 +217,7 @@ static void dinput_unacquire_window_devices( HWND window )
     }
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_rawmouse_list, struct dinput_device, entry )
     {
-        if (window == impl->win)
+        if (!window || window == impl->win)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
             dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
@@ -225,7 +225,7 @@ static void dinput_unacquire_window_devices( HWND window )
     }
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry )
     {
-        if (window == impl->win)
+        if (!window || window == impl->win)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
             dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
@@ -335,7 +335,8 @@ static DWORD WINAPI dinput_thread_proc( void *params )
         }
     }

-    if (ret != state.events_count) ERR("Unexpected termination, ret %#lx\n", ret);
+    ERR( "Unexpected termination, ret %#lx\n", ret );
+    dinput_unacquire_window_devices( 0 );

done:
     while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] );