ntoskrnl.exe: Cancel active timer before setting it.

Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntoskrnl.exe: Cancel active timer before setting it.
6cb35889 · Paul Gofman · Alexandre Julliard · 4584ffad · 6cb35889
Commit 6cb35889 authored May 28, 2020 by Paul Gofman Committed by Alexandre Julliard May 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sync.c dlls/ntoskrnl.exe/sync.c +3 -1

No files found.
--- a/dlls/ntoskrnl.exe/sync.c
+++ b/dlls/ntoskrnl.exe/sync.c
@@ -443,7 +443,9 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, 

    EnterCriticalSection( &sync_cs );

-    ret = timer->Header.Inserted;
+    if ((ret = timer->Header.Inserted))
+        KeCancelTimer(timer);
+
    timer->Header.Inserted = TRUE;

    if (!timer->TimerListEntry.Blink)