ntdll: Tolerate null handle in DeregisterWait.

Signed-off-by: Keno Fischer <keno@juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Tolerate null handle in DeregisterWait.
90173ce4 · Keno Fischer · Alexandre Julliard · 710a58da · 90173ce4 · 90173ce4
Commit 90173ce4 authored Aug 19, 2016 by Keno Fischer Committed by Alexandre Julliard Aug 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

thread.c dlls/kernel32/tests/thread.c +4 -0

threadpool.c dlls/ntdll/threadpool.c +3 -0

No files found.
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -1245,6 +1245,10 @@ static void test_RegisterWaitForSingleObject(void)

    ret = pUnregisterWait(wait_handle);
    ok(ret, "UnregisterWait failed with error %d\n", GetLastError());
+
+    ret = pUnregisterWait(0);
+    ok(!ret && GetLastError() == ERROR_INVALID_HANDLE,
+        "UnregisterWait failed with unexpected error %d\n", GetLastError());
 }

 static DWORD LS_main;

--- a/dlls/ntdll/threadpool.c
+++ b/dlls/ntdll/threadpool.c
@@ -637,6 +637,9 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent)

    TRACE( "(%p)\n", WaitHandle );

+    if (WaitHandle == NULL)
+        return STATUS_INVALID_HANDLE;
+
    NtSetEvent( wait_work_item->CancelEvent, NULL );
    if (wait_work_item->CallbackInProgress)
    {