user32/tests: Update some todos for changed test failure behavior.

This commit is contained in:
Alexandre Julliard 2015-05-07 22:28:41 +09:00
parent 193667ecd7
commit 7f956031bb

View File

@ -880,7 +880,10 @@ static void test_foregroundwindow(void)
if (input_desk_id == thread_desk_id) if (input_desk_id == thread_desk_id)
{ {
ok(ret, "SetForegroundWindow failed!\n"); ok(ret, "SetForegroundWindow failed!\n");
ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); if (hwnd)
ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd);
else
todo_wine ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd);
} }
else else
{ {
@ -893,12 +896,18 @@ static void test_foregroundwindow(void)
if (input_desk_id == thread_desk_id) if (input_desk_id == thread_desk_id)
{ {
ok(!ret, "SetForegroundWindow should fail!\n"); ok(!ret, "SetForegroundWindow should fail!\n");
ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); if (hwnd)
ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd);
else
todo_wine ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd);
} }
else else
{ {
todo_wine ok(!ret, "SetForegroundWindow should fail!\n"); todo_wine ok(!ret, "SetForegroundWindow should fail!\n");
todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); if (!hwnd)
ok(hwnd == 0, "unexpected foreground window %p\n", hwnd);
else
todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd);
} }
} }
} }