From 4bec383d9f0b462ca930834e0ec4ee7efe3b95c8 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 25 Jan 2009 17:28:39 +0100 Subject: [PATCH] user32/tests: Fix various failures in the monitor test. --- dlls/user32/tests/monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 3d0359679e..25c886774c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -240,7 +240,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmFields = vid_modes_test[i].fields; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(vid_modes_test[i].must_succeed ? - (res == DISP_CHANGE_SUCCESSFUL) : + (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res); @@ -257,7 +257,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); - ok(ClipCursor(NULL), "ClipCursor() failed\n"); + if (!ClipCursor(NULL)) continue; ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); @@ -368,7 +368,8 @@ static void test_work_area(void) wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); OffsetRect(&wp.rcNormalPosition, rc_work.left, rc_work.top); - if (!EqualRect(&mi.rcMonitor, &mi.rcWork)) /* FIXME: remove once Wine is fixed */ + if (mi.rcMonitor.left != mi.rcWork.left || + mi.rcMonitor.top != mi.rcWork.top) /* FIXME: remove once Wine is fixed */ todo_wine ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); else ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n");