Detlef Riekenberg : winspool/tests: Fix a failure on NT4 for EnumPrintProcessors.

Alexandre Julliard julliard at winehq.org
Fri Oct 16 11:26:11 CDT 2009


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

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Fri Oct 16 15:13:17 2009 +0200

winspool/tests: Fix a failure on NT4 for EnumPrintProcessors.

---

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

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index 37ddd63..b249a00 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -1315,9 +1315,10 @@ static void test_EnumPrintProcessors(void)
     SetLastError(0xdeadbeef);
     pcbNeeded = 0xdeadbeef;
     res = EnumPrintProcessorsA(NULL, invalid_env, 1, buffer, cbBuf, &pcbNeeded, &pcReturned);
-    /* NT5: ERROR_INVALID_ENVIRONMENT, 9x: ERROR_INVALID_PARAMETER */
-    ok( !res && ((GetLastError() == ERROR_INVALID_ENVIRONMENT) ||
-                 (GetLastError() == ERROR_INVALID_PARAMETER)),
+    /* NT5: ERROR_INVALID_ENVIRONMENT, NT4: res != 0, 9x: ERROR_INVALID_PARAMETER */
+    ok( broken(res) || /* NT4 */
+        (GetLastError() == ERROR_INVALID_ENVIRONMENT) ||
+        (GetLastError() == ERROR_INVALID_PARAMETER),
         "got %u with %u (expected '0' with ERROR_INVALID_ENVIRONMENT or "
         "ERROR_INVALID_PARAMETER)\n", res, GetLastError());
 




More information about the wine-cvs mailing list