ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Wait for the internal thread to complete unacquiring. 

Otherwise we may close HID read event before it has finished removing it
from the wait handles, causing MsgWaitForMultipleObjectsEx to return an
error and terminate.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-10-13 09:21:19 +02:00 committed by Alexandre Julliard
parent 29fae9a776
commit 947e6ee5b4
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/dinput/dinput_main.c
View File

@ -1381,8 +1381,7 @@ static DWORD WINAPI hook_thread_proc(void *param)
mouse_hook = NULL; mouse_hook = NULL;
} }
if (finished_event) SetEvent(finished_event);
SetEvent(finished_event);
} }
} }
@ -1504,17 +1503,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired)
WARN( "Unable to (un)register raw device %x:%x\n", dev->raw_device.usUsagePage, dev->raw_device.usUsage ); WARN( "Unable to (un)register raw device %x:%x\n", dev->raw_device.usUsagePage, dev->raw_device.usUsage );
} }
if (acquired) hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL );
hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL );
PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event );
LeaveCriticalSection(&dinput_hook_crit); LeaveCriticalSection(&dinput_hook_crit);
if (acquired) WaitForSingleObject(hook_change_finished_event, INFINITE);
{ CloseHandle(hook_change_finished_event);
WaitForSingleObject(hook_change_finished_event, INFINITE);
CloseHandle(hook_change_finished_event);
}
} }
void check_dinput_events(void) void check_dinput_events(void)

6
dlls/dinput8/tests/hid.c
View File

@ -4758,9 +4758,6 @@ static void test_simple_joystick(void)
todo_wine todo_wine
ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr );
/* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */
Sleep( 100 );
ref = IDirectInputDevice8_Release( device ); ref = IDirectInputDevice8_Release( device );
ok( ref == 0, "Release returned %d\n", ref ); ok( ref == 0, "Release returned %d\n", ref );
@ -7227,9 +7224,6 @@ static void test_force_feedback_joystick( void )
ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr );
set_hid_expect( file, NULL, 0 ); set_hid_expect( file, NULL, 0 );
/* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */
Sleep( 100 );
ref = IDirectInputDevice8_Release( device ); ref = IDirectInputDevice8_Release( device );
ok( ref == 0, "Release returned %d\n", ref ); ok( ref == 0, "Release returned %d\n", ref );