[PATCH] Fix a test failure on Win9x, WinMe and NT4

Paul Vriens Paul.Vriens.Wine at gmail.com
Mon Nov 17 07:17:05 CST 2008


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

diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
index d858f72..441b94f 100644
--- a/dlls/user32/tests/monitor.c
+++ b/dlls/user32/tests/monitor.c
@@ -213,8 +213,10 @@ static void test_ChangeDisplaySettingsEx(void)
     dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
     dm.dmPelsWidth = width;
     res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL);
-    ok(res == DISP_CHANGE_SUCCESSFUL,
-       "ChangeDisplaySettingsExA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res);
+    ok(res == DISP_CHANGE_SUCCESSFUL ||
+       res == DISP_CHANGE_BADMODE || /* Win98, WinMe */
+       res == DISP_CHANGE_FAILED, /* NT4 */
+       "ChangeDisplaySettingsExA returned unexpected %d\n", res);
 
     memset(&dmW, 0, sizeof(dmW));
     dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
-- 
1.5.4.3


--------------060502010602060107020908--



More information about the wine-patches mailing list