user32/tests: Fix a test failure on Win9x, WinMe and NT4.

919bd612 · Paul Vriens · Alexandre Julliard · a42b7568 · 919bd612
Commit 919bd612 authored Nov 17, 2008 by Paul Vriens Committed by Alexandre Julliard Nov 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

monitor.c dlls/user32/tests/monitor.c +4 -2

No files found.
--- 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,
+    ok(res == DISP_CHANGE_SUCCESSFUL ||
-       "ChangeDisplaySettingsExA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res);
+       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;