advapi32/tests: Avoid a crash on some linux hosts.

Michael Stefaniuc mstefani at redhat.de
Wed Nov 5 07:13:23 CST 2014


---
While researching the w7u timeout for this tests stumbled upon some
Linux hosts that crash. This should fix it and provide further
troubleshooting info.



 dlls/advapi32/tests/service.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index ad81a25..1d2c4a7 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -1399,7 +1399,8 @@ static void test_enum_svc(void)
 
         /* lpServiceName and lpDisplayName should always be filled */
         ok(services[i].lpServiceName[0], "Expected a service name\n");
-        ok(services[i].lpDisplayName[0], "Expected a display name\n");
+        ok(services[i].lpDisplayName && services[i].lpDisplayName[0],
+           "Expected a display name for service '%s'\n", services[i].lpServiceName);
 
         /* Decrement the counters to see if the functions calls return the same
          * numbers as the contents of these structures.
-- 
1.8.3.1



More information about the wine-patches mailing list