[PATCH] ntprint: Do not fail when the spooler service was stopped [try 2]

Detlef Riekenberg wine.dev at web.de
Tue Jun 12 14:56:06 CDT 2012


try 2: without adding a test for GetLastError()

--
By by ... Detlef
---
 dlls/ntprint/tests/ntprint.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c
index cf9853d..7e1ab58 100644
--- a/dlls/ntprint/tests/ntprint.c
+++ b/dlls/ntprint/tests/ntprint.c
@@ -70,6 +70,10 @@ static void test_PSetupCreateMonitorInfo(VOID)
 
     SetLastError(0xdeadbeef);
     mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
+        win_skip("The Service 'Spooler' is required for many test\n");
+        return;
+    }
     ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError());
     if (mi) pPSetupDestroyMonitorInfo(mi);
 
@@ -96,6 +100,10 @@ static void test_PSetupDestroyMonitorInfo(VOID)
 
     SetLastError(0xdeadbeef);
     mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL);
+    if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) {
+        win_skip("The Service 'Spooler' is required for many test\n");
+        return;
+    }
     ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError());
 
     if (!mi) return;
-- 
1.7.5.4




More information about the wine-patches mailing list