From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/message.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 9e8f9d54af8..6f16a1ddb41 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3248,11 +3248,17 @@ static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { struct thunk_lock_params params = {.dispatch.callback = thunk_lock_callback}; - LARGE_INTEGER time; - DWORD ret; + LARGE_INTEGER time, now, *abs; + DWORD ret = count - 1; void *ret_ptr; ULONG ret_len; + if ((abs = get_nt_timeout( &time, timeout ))) + { + NtQuerySystemTime( &now ); + abs->QuadPart = now.QuadPart - abs->QuadPart; + } + if (!KeUserDispatchCallback( ¶ms.dispatch, sizeof(params), &ret_ptr, &ret_len ) && ret_len == sizeof(params.locks)) { @@ -3263,8 +3269,7 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW if (process_driver_events( QS_ALLINPUT )) ret = count - 1; else { - ret = NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), - !!(flags & MWMO_ALERTABLE), get_nt_timeout( &time, timeout )); + ret = NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), !!(flags & MWMO_ALERTABLE), abs ); if (ret == count - 1) process_driver_events( QS_ALLINPUT ); else if (HIWORD(ret)) /* is it an error code? */ { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9128