Rémi Bernon : dinput: Introduce new dinput_device_internal_unacquire helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 29fae9a7761f73bc2417901194c738bf7985e315
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=29fae9a7761f73bc241790119...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Oct 13 09:21:18 2021 +0200

dinput: Introduce new dinput_device_internal_unacquire helper.

And use it from within the internal hook critical section, to unacquire
the device and remove it from the acquired device list directly.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dinput/dinput_main.c  | 26 +++++++++++++++++++++-----
 dlls/dinput/joystick_hid.c |  1 -
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 329cb738469..46c18ed55dd 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -119,6 +119,22 @@ void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface)
     LeaveCriticalSection( &dinput_hook_crit );
 }
 
+static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface )
+{
+    IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface );
+
+    TRACE( "iface %p.\n", iface );
+
+    EnterCriticalSection( &impl->crit );
+    if (impl->acquired)
+    {
+        impl->vtbl->unacquire( iface );
+        impl->acquired = FALSE;
+        list_remove( &impl->entry );
+    }
+    LeaveCriticalSection( &impl->crit );
+}
+
 static HRESULT create_directinput_instance(REFIID riid, LPVOID *ppDI, IDirectInputImpl **out)
 {
     IDirectInputImpl *This = calloc( 1, sizeof(IDirectInputImpl) );
@@ -1248,7 +1264,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
         if (msg->hwnd == dev->win && msg->hwnd != foreground)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev );
-            IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8W_iface );
+            dinput_device_internal_unacquire( &dev->IDirectInputDevice8W_iface );
         }
     }
     LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_mouse_list, IDirectInputDeviceImpl, entry )
@@ -1256,7 +1272,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
         if (msg->hwnd == dev->win && msg->hwnd != foreground)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev );
-            IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8W_iface );
+            dinput_device_internal_unacquire( &dev->IDirectInputDevice8W_iface );
         }
     }
     LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_rawmouse_list, IDirectInputDeviceImpl, entry )
@@ -1264,7 +1280,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
         if (msg->hwnd == dev->win && msg->hwnd != foreground)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev );
-            IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8W_iface );
+            dinput_device_internal_unacquire( &dev->IDirectInputDevice8W_iface );
         }
     }
     LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_keyboard_list, IDirectInputDeviceImpl, entry )
@@ -1272,7 +1288,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
         if (msg->hwnd == dev->win && msg->hwnd != foreground)
         {
             TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev );
-            IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8W_iface );
+            dinput_device_internal_unacquire( &dev->IDirectInputDevice8W_iface );
         }
     }
     LeaveCriticalSection( &dinput_hook_crit );
@@ -1309,7 +1325,7 @@ static DWORD WINAPI hook_thread_proc(void *param)
                 if (impl->read_event == events[ret])
                 {
                     hr = impl->vtbl->read( &impl->IDirectInputDevice8W_iface );
-                    if (FAILED(hr)) list_remove( &impl->entry );
+                    if (FAILED( hr )) dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface );
                     break;
                 }
             }
diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 6454a4b7fd1..710e63185fb 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -1573,7 +1573,6 @@ static HRESULT hid_joystick_internal_read( IDirectInputDevice8W *iface )
         WARN( "GetOverlappedResult/ReadFile failed, error %u\n", GetLastError() );
         CloseHandle(impl->device);
         impl->device = INVALID_HANDLE_VALUE;
-        impl->base.acquired = FALSE;
         hr = DIERR_INPUTLOST;
     }
     LeaveCriticalSection( &impl->base.crit );