From: André Hentschel <nerv@dawncrow.de>
Subject: advapi32/tests: Don't crash on Wine in WoW setups
Message-Id: <543C4DF3.9030500@dawncrow.de>
Date: Tue, 14 Oct 2014 00:10:59 +0200

e.g. https://test.winehq.org/data/a71f25d239ed7dd65f9fa7a3b7baa371e74f2ec9/linux_cw-gtx560-wow32/advapi32:service.html
---
 dlls/advapi32/tests/service.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index beb589d..f98f117 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -1398,8 +1398,12 @@ static void test_enum_svc(void)
         SERVICE_STATUS status = services[i].ServiceStatus;
 
         /* lpServiceName and lpDisplayName should always be filled */
-        ok(lstrlenA(services[i].lpServiceName) > 0, "Expected a service name\n");
-        ok(lstrlenA(services[i].lpDisplayName) > 0, "Expected a display name\n");
+        ok(services[i].lpServiceName != NULL, "Expected lpServiceName to point to a string\n");
+        if (services[i].lpServiceName)
+            ok(lstrlenA(services[i].lpServiceName) > 0, "Expected a service name\n");
+        ok(services[i].lpDisplayName != NULL, "Expected lpDisplayName to point to a string\n");
+        if (services[i].lpDisplayName)
+            ok(lstrlenA(services[i].lpDisplayName) > 0, "Expected a display name\n");
 
         /* Decrement the counters to see if the functions calls return the same
          * numbers as the contents of these structures.
@@ -1701,8 +1705,12 @@ static void test_enum_svc(void)
         SERVICE_STATUS_PROCESS status = exservices[i].ServiceStatusProcess;
 
         /* lpServiceName and lpDisplayName should always be filled */
-        ok(lstrlenA(exservices[i].lpServiceName) > 0, "Expected a service name\n");
-        ok(lstrlenA(exservices[i].lpDisplayName) > 0, "Expected a display name\n");
+        ok(exservices[i].lpServiceName != NULL, "Expected lpServiceName to point to a string\n");
+        if (exservices[i].lpServiceName)
+            ok(lstrlenA(exservices[i].lpServiceName) > 0, "Expected a service name\n");
+        ok(exservices[i].lpDisplayName != NULL, "Expected lpDisplayName to point to a string\n");
+        if (exservices[i].lpDisplayName)
+            ok(lstrlenA(exservices[i].lpDisplayName) > 0, "Expected a display name\n");
 
         /* Decrement the counters to see if the functions calls return the
          * same numbers as the contents of these structures.