Alexandre Julliard : user32/tests: Accept DISP_CHANGE_RESTART also for tests expected to fail.

Alexandre Julliard julliard at winehq.org
Tue Jan 27 09:08:12 CST 2009


Module: wine
Branch: master
Commit: e55a691dedf3cdd32f0faa46ce097e50de08f68a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e55a691dedf3cdd32f0faa46ce097e50de08f68a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jan 27 14:38:23 2009 +0100

user32/tests: Accept DISP_CHANGE_RESTART also for tests expected to fail.

---

 dlls/user32/tests/monitor.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
index 25c8867..944e49b 100644
--- a/dlls/user32/tests/monitor.c
+++ b/dlls/user32/tests/monitor.c
@@ -241,7 +241,8 @@ static void test_ChangeDisplaySettingsEx(void)
         res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL);
         ok(vid_modes_test[i].must_succeed ?
            (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) :
-           (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM),
+           (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART ||
+            res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM),
            "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res);
 
         if (res == DISP_CHANGE_SUCCESSFUL)




More information about the wine-cvs mailing list