Paul Vriens : winspool.drv/tests: Fix a test on Vista/W2K8.

Alexandre Julliard julliard at winehq.org
Fri Sep 5 10:34:07 CDT 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Fri Sep  5 16:19:34 2008 +0200

winspool.drv/tests: Fix a test on Vista/W2K8.

---

 dlls/winspool.drv/tests/info.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index f0f4754..e2fd941 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -693,7 +693,9 @@ static void test_DeleteMonitor(void)
     AddMonitorA(NULL, 2, (LPBYTE) &mi2a);
     SetLastError(MAGIC_DEAD);
     res = DeleteMonitorA(NULL, invalid_env, winetest);
-    ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError());
+    ok( res ||
+        (!res && GetLastError() == ERROR_INVALID_ENVIRONMENT) /* Vista/W2K8 */,
+        "returned %d with %d\n", res, GetLastError());
 
     /* the monitor-name */
     AddMonitorA(NULL, 2, (LPBYTE) &mi2a);




More information about the wine-cvs mailing list