Detlef Riekenberg : netapi32/tests: Fix workstation test failures on XP.

[Alexandre Julliard]

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

Author: Detlef Riekenberg <wine.dev(a)web.de>
Date:   Tue Nov 13 23:50:15 2012 +0100

netapi32/tests: Fix workstation test failures on XP.

---

 dlls/netapi32/tests/wksta.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c
index 54c25e5..5d1d8ac 100644
--- a/dlls/netapi32/tests/wksta.c
+++ b/dlls/netapi32/tests/wksta.c
@@ -79,12 +79,17 @@ static void run_wkstausergetinfo_tests(void)
     LPWKSTA_USER_INFO_1 ui1 = NULL;
     LPWKSTA_USER_INFO_1101 ui1101 = NULL;
     DWORD dwSize;
+    NET_API_STATUS rc;
 
     /* Level 0 */
-    ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success,
-       "NetWkstaUserGetInfo is unsuccessful\n");
+    rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0);
+    if (rc == NERR_WkstaNotStarted)
+    {
+        skip("Workstation service not running\n");
+        return;
+    }
+    ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0);
 
-    ok(ui0 != NULL, "ui0 is NULL\n");
     /* This failure occurred when I ran sshd as service and didn't authenticate
      * Since the test dereferences ui0, the rest of this test is worthless
      */
@@ -168,7 +173,7 @@ static void run_wkstatransportenum_tests(void)
     /* final check: valid return, actually get data back */
     apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH,
         &entriesRead, &totalEntries, NULL);
-    ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE,
+    ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted,
        "NetWkstaTransportEnum returned %d\n", apiReturn);
     if (apiReturn == NERR_Success) {
         /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */