Rémi Bernon : dinput: Split dinput_unacquire_window_devices helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7f9fb63aec7f00e73b3c0756d48947059c2b1797
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7f9fb63aec7f00e73b3c0756d489470...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Sun Feb 12 00:25:29 2023 +0100

dinput: Split dinput_unacquire_window_devices helper.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54431

---

 dlls/dinput/dinput_main.c | 52 ++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 149dd402aa8..6ea6338fd99 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -163,40 +163,50 @@ static void dinput_unacquire_window_devices( HWND window )
 
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry )
     {
-        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 );
-        }
+        if (window != impl->win) continue;
+        TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
     }
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry )
     {
-        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 );
-        }
+        if (window != impl->win) continue;
+        TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
     }
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_rawmouse_list, struct dinput_device, entry )
     {
-        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 );
-        }
+        if (window != impl->win) continue;
+        TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
     }
     LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry )
     {
-        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 );
-        }
+        if (window != impl->win) continue;
+        TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl );
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
     }
 
     LeaveCriticalSection( &dinput_hook_crit );
 }
 
+static void dinput_unacquire_devices(void)
+{
+    struct dinput_device *impl, *next;
+
+    EnterCriticalSection( &dinput_hook_crit );
+
+    LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry )
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
+    LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry )
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
+    LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_rawmouse_list, struct dinput_device, entry )
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
+    LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry )
+        dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED );
+
+    LeaveCriticalSection( &dinput_hook_crit );
+}
+
 static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam )
 {
     CWPSTRUCT *msg = (CWPSTRUCT *)lparam;
@@ -390,7 +400,7 @@ static DWORD WINAPI dinput_thread_proc( void *params )
     if (state.running)
     {
         ERR( "Unexpected termination, ret %#lx\n", ret );
-        dinput_unacquire_window_devices( 0 );
+        dinput_unacquire_devices();
     }
 
     while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] );