[PATCH v2 4/6] ntdll: Reject pseudo-handles in NtWaitForMultipleObjects.

[Marc-Aurel Zent]

From: Marc-Aurel Zent

---
 dlls/kernel32/tests/sync.c | 12 ++++++------
 dlls/ntdll/unix/sync.c     | 14 +++++++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
index 466bbc8908b..f2fc0196626 100644
--- a/dlls/kernel32/tests/sync.c
+++ b/dlls/kernel32/tests/sync.c
@@ -1432,26 +1432,26 @@ static void test_WaitForMultipleObjects(void)
     maxevents[0] = GetCurrentProcess();
     SetLastError(0xdeadbeef);
     r = WaitForMultipleObjects(1, maxevents, FALSE, 100);
-    todo_wine ok(r == WAIT_FAILED, "expected WAIT_FAILED, got %lu\n", r);
-    todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE,
+    ok(r == WAIT_FAILED, "expected WAIT_FAILED, got %lu\n", r);
+    ok(GetLastError() == ERROR_INVALID_HANDLE,
                  "expected ERROR_INVALID_HANDLE, got %lu\n", GetLastError());

maxevents[0] = GetCurrentThread();
     SetLastError(0xdeadbeef);
     r = WaitForMultipleObjects(1, maxevents, FALSE, 100);
-    todo_wine ok(r == WAIT_FAILED, "expected WAIT_FAILED, got %lu\n", r);
-    todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE,
+    ok(r == WAIT_FAILED, "expected WAIT_FAILED, got %lu\n", r);
+    ok(GetLastError() == ERROR_INVALID_HANDLE,
                  "expected ERROR_INVALID_HANDLE, got %lu\n", GetLastError());

timeout.QuadPart = -1000000;
     maxevents[0] = GetCurrentProcess();
     status = pNtWaitForMultipleObjects(1, maxevents, WaitAny, FALSE, &timeout);
-    todo_wine ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08lx\n", status);
+    ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08lx\n", status);

timeout.QuadPart = -1000000;
     maxevents[0] = GetCurrentThread();
     status = pNtWaitForMultipleObjects(1, maxevents, WaitAny, FALSE, &timeout);
-    todo_wine ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08lx\n", status);
+    ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08lx\n", status);
 }

static BOOL g_initcallback_ret, g_initcallback_called;
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 6557bc3bf28..6cf0fa4369a 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -2313,16 +2313,24 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, WA
         TRACE( "}, timeout %s\n", debugstr_timeout(timeout) );
     }

-    if ((ret = inproc_wait( count, handles, type, alertable, timeout )) != STATUS_NOT_IMPLEMENTED)
+    /* Reject pseudo-handles up front. These are not valid for multi-object waits. */
+    for (i = 0; i < count; i++)
     {
-        TRACE( "-> %#x\n", ret );
-        return ret;
+        if ((ULONG)(ULONG_PTR)handles[i] >= 0xfffffffa)
+        {
+            ret = STATUS_INVALID_HANDLE;
+            goto out;
+        }
     }

+    if ((ret = inproc_wait( count, handles, type, alertable, timeout )) != STATUS_NOT_IMPLEMENTED)
+        goto out;
+
     if (alertable) flags |= SELECT_ALERTABLE;
     select_op.wait.op = type == WaitAll ? SELECT_WAIT_ALL : SELECT_WAIT;
     for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] );
     ret = server_wait( &select_op, offsetof( union select_op, wait.handles[count] ), flags, timeout );
+out:
     TRACE( "-> %#x\n", ret );
     return ret;
 }