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

dinput: Wait for the hook thread to exit when stopping it.

Browse Source 
FlatOut2 demo calls FreeLibrary on the dinput8 module more times than
it has loaded it, and the module reference that the internal thread has
is getting decremented before its exit.

Having an internal window to destroy also makes it more likely to crash
as it takes more time to exit calls the window procedure function.

Waiting for the thread to complete when all the dinput instances are
destroyed ensures that the thread isn't alive when the game frees the
DLL, and prevents the thread from crashing.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50673
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-03-26 18:36:01 +01:00 committed by Alexandre Julliard
parent 4634fd4ccb
commit b71cea76ed
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/dinput/dinput_main.c
View File

@ -1861,6 +1861,7 @@ static BOOL check_hook_thread(void)
{
static HANDLE hook_thread;
HMODULE module;
HANDLE wait_handle = NULL;
EnterCriticalSection(&dinput_hook_crit);
@ -1884,11 +1885,17 @@ static BOOL check_hook_thread(void)
hook_thread_id = 0;
PostThreadMessageW(tid, WM_USER+0x10, 0, 0);
CloseHandle(hook_thread);
wait_handle = hook_thread;
hook_thread = NULL;
}
LeaveCriticalSection(&dinput_hook_crit);
if (wait_handle)
{
WaitForSingleObject(wait_handle, INFINITE);
CloseHandle(wait_handle);
}
return hook_thread_id != 0;
}