[PATCH] winspool/tests: Fix two failing tests for non-admin users

Marcel Partap mpartap at gmx.net
Sun Apr 27 15:33:05 CDT 2008


---
 dlls/winspool.drv/tests/info.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index d5b4274..07bd384 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -545,11 +545,13 @@ static void test_AddPort(void)
     SetLastError(0xdeadbeef);
     res = AddPortA(NULL, 0, NULL);
     RETURN_ON_DEACTIVATED_SPOOLER(res)
-    /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */
+    /* NT: RPC_X_NULL_REF_POINTER, non-admin user: ERROR_NOT_SUPPORTED
+       9x: ERROR_INVALID_PARAMETER */
     ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || 
+                 (GetLastError() == ERROR_NOT_SUPPORTED) ||
                  (GetLastError() == ERROR_INVALID_PARAMETER)),
-        "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or "
-        "ERROR_INVALID_PARAMETER)\n", res, GetLastError());
+        "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER or "
+        "ERROR_NOT_SUPPORTED or ERROR_INVALID_PARAMETER)\n", res, GetLastError());
 
 
     SetLastError(0xdeadbeef);
@@ -697,11 +699,13 @@ static void test_ConfigurePort(void)
     SetLastError(0xdeadbeef);
     res = ConfigurePortA(NULL, 0, NULL);
     RETURN_ON_DEACTIVATED_SPOOLER(res)
-    /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */
+    /* NT: RPC_X_NULL_REF_POINTER, non-admin user: ERROR_NOT_SUPPORTED
+       9x: ERROR_INVALID_PARAMETER */
     ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || 
+                 (GetLastError() == ERROR_NOT_SUPPORTED) ||
                  (GetLastError() == ERROR_INVALID_PARAMETER)),
-        "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or "
-        "ERROR_INVALID_PARAMETER)\n", res, GetLastError());
+        "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER or "
+        "ERROR_NOT_SUPPORTED or ERROR_INVALID_PARAMETER)\n", res, GetLastError());
 
     SetLastError(0xdeadbeef);
     res = ConfigurePortA(NULL, 0, empty);
-- 
1.5.5.1


--------------000304050903070402060605--



More information about the wine-patches mailing list