Skip to content

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

dinput: Update internal thread events list on every wake up.

Instead of message notifications only. We have to remove the events from devices that are automatically unacquired whenever a read failed. Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a7f0647d
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
dlls/dinput/dinput_main.c
View file @ ac442a78
......@@ -1311,16 +1311,9 @@ static DWORD WINAPI dinput_thread_proc( void *params )
goto done;
}
events_count = 0;
EnterCriticalSection( &dinput_hook_crit );
kbd_cnt = list_count( &acquired_keyboard_list );
mice_cnt = list_count( &acquired_mouse_list );
LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry )
{
if (!impl->read_event || !impl->vtbl->read) continue;
if (events_count >= ARRAY_SIZE(events)) break;
events[events_count++] = impl->read_event;
}
LeaveCriticalSection( &dinput_hook_crit );
if (kbd_cnt && !kbd_hook)
......@@ -1341,8 +1334,20 @@ static DWORD WINAPI dinput_thread_proc( void *params )
SetEvent(finished_event);
}
events_count = 0;
EnterCriticalSection( &dinput_hook_crit );
LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry )
{
if (!impl->read_event || !impl->vtbl->read) continue;
if (events_count >= ARRAY_SIZE(events)) break;
events[events_count++] = impl->read_event;
}
LeaveCriticalSection( &dinput_hook_crit );
}
if (ret != events_count) ERR("Unexpected termination, ret %#x\n", ret);
done:
DestroyWindow( di_em_win );
di_em_win = NULL;
......
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