Commit f30b7089 authored by Peter Oberndorfer's avatar Peter Oberndorfer Committed by Alexandre Julliard

kernel32: Fix WaitForMultipleObjectsEx for handles with lower 2 bits set.

parent 4f2afdd0
......@@ -180,11 +180,8 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
*/
if (is_console_handle(hloc[i]))
{
if (!VerifyConsoleIoHandle(hloc[i]))
{
return FALSE;
}
hloc[i] = GetConsoleInputWaitHandle();
if (VerifyConsoleIoHandle(hloc[i]))
hloc[i] = GetConsoleInputWaitHandle();
}
}
......
......@@ -978,7 +978,7 @@ static void test_WaitForSingleObject(void)
SetLastError(0xdeadbeef);
ret = WaitForSingleObject(modify_handle(invalid, 3), 0);
todo_wine ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret);
ok(ret == WAIT_FAILED, "expected WAIT_FAILED, got %d\n", ret);
ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
/* valid handle with different values for lower 2 bits */
......@@ -999,7 +999,7 @@ static void test_WaitForSingleObject(void)
SetLastError(0xdeadbeef);
ret = WaitForSingleObject(modify_handle(nonsignaled, 3), 0);
todo_wine ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret);
ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %d\n", ret);
todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
/* valid handle with different values for lower 2 bits */
......
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