James Hawkins : user32: Fix a test that fails in XP and win2k3.

Alexandre Julliard julliard at winehq.org
Thu Apr 17 07:38:21 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Wed Apr 16 15:33:31 2008 -0500

user32: Fix a test that fails in XP and win2k3.

---

 dlls/user32/tests/sysparams.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 320bd04..7623a67 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -2554,11 +2554,13 @@ static void test_EnumDisplaySettings(void)
 
     num = 1;
     while (1) {
-	SetLastError (0xdeadbeef);
-	if (!EnumDisplaySettings(NULL, num++, &devmode)) {
-		DWORD le = GetLastError();
-		ok (le == ERROR_NO_MORE_FILES, "Last error on EnumDisplaySettings was %d, expected ERROR_NO_MORE_FILES\n", le);
-		break;
+        SetLastError (0xdeadbeef);
+        if (!EnumDisplaySettings(NULL, num++, &devmode)) {
+            DWORD le = GetLastError();
+            ok(le == ERROR_NO_MORE_FILES ||
+               le == 0xdeadbeef, /* XP, 2003 */
+               "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d\n", le);
+            break;
 	}
     }
 }




More information about the wine-cvs mailing list