Skip to content

W
wine-cw
Commit 29fae9a7 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

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: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 77f5edda
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 6 deletions
dlls/dinput/dinput_main.c
View file @ 29fae9a7
...@@ -119,6 +119,22 @@ void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface) ...@@ -119,6 +119,22 @@ void dinput_hooks_unacquire_device(LPDIRECTINPUTDEVICE8W iface)
LeaveCriticalSection( &dinput_hook_crit ); 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) static HRESULT create_directinput_instance(REFIID riid, LPVOID *ppDI, IDirectInputImpl **out)
{ {
IDirectInputImpl *This = calloc( 1, sizeof(IDirectInputImpl) ); IDirectInputImpl *This = calloc( 1, sizeof(IDirectInputImpl) );
...@@ -1248,7 +1264,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam ...@@ -1248,7 +1264,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
if (msg->hwnd == dev->win && msg->hwnd != foreground) if (msg->hwnd == dev->win && msg->hwnd != foreground)
{ {
TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); 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 ) 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 ...@@ -1256,7 +1272,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
if (msg->hwnd == dev->win && msg->hwnd != foreground) if (msg->hwnd == dev->win && msg->hwnd != foreground)
{ {
TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); 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 ) 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 ...@@ -1264,7 +1280,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
if (msg->hwnd == dev->win && msg->hwnd != foreground) if (msg->hwnd == dev->win && msg->hwnd != foreground)
{ {
TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); 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 ) 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 ...@@ -1272,7 +1288,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam
if (msg->hwnd == dev->win && msg->hwnd != foreground) if (msg->hwnd == dev->win && msg->hwnd != foreground)
{ {
TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); 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 ); LeaveCriticalSection( &dinput_hook_crit );
...@@ -1309,7 +1325,7 @@ static DWORD WINAPI hook_thread_proc(void *param) ...@@ -1309,7 +1325,7 @@ static DWORD WINAPI hook_thread_proc(void *param)
if (impl->read_event == events[ret]) if (impl->read_event == events[ret])
{ {
hr = impl->vtbl->read( &impl->IDirectInputDevice8W_iface ); 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; break;
} }
} }
......
dlls/dinput/joystick_hid.c
View file @ 29fae9a7
...@@ -1573,7 +1573,6 @@ static HRESULT hid_joystick_internal_read( IDirectInputDevice8W *iface ) ...@@ -1573,7 +1573,6 @@ static HRESULT hid_joystick_internal_read( IDirectInputDevice8W *iface )
WARN( "GetOverlappedResult/ReadFile failed, error %u\n", GetLastError() ); WARN( "GetOverlappedResult/ReadFile failed, error %u\n", GetLastError() );
CloseHandle(impl->device); CloseHandle(impl->device);
impl->device = INVALID_HANDLE_VALUE; impl->device = INVALID_HANDLE_VALUE;
impl->base.acquired = FALSE;
hr = DIERR_INPUTLOST; hr = DIERR_INPUTLOST;
} }
LeaveCriticalSection( &impl->base.crit ); LeaveCriticalSection( &impl->base.crit );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment