Module: wine Branch: master Commit: 7f956031bb4f493e7fde9ff30517a30eb13eb756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f956031bb4f493e7fde9ff305...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 7 22:28:41 2015 +0900
user32/tests: Update some todos for changed test failure behavior.
---
dlls/user32/tests/winstation.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index c09ebb1..30c56c3 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -880,7 +880,10 @@ static void test_foregroundwindow(void) if (input_desk_id == thread_desk_id) { 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 { @@ -893,12 +896,18 @@ static void test_foregroundwindow(void) if (input_desk_id == thread_desk_id) { 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 { 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); } } }