Module: wine Branch: master Commit: 49f2d424aca936a7ae69ea62b2e941ca715ec714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f2d424aca936a7ae69ea62b2...
Author: André Hentschel nerv@dawncrow.de Date: Mon Oct 3 14:12:39 2016 +0200
advapi32/tests: Don't crash the service test on wow64 Wine.
Signed-off-by: André Hentschel nerv@dawncrow.de Signed-off-by: Sebastian Lackner sebastian@fds-team.de Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/tests/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 81d2f74..c7e3154 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1401,7 +1401,7 @@ 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\n");
/* Decrement the counters to see if the functions calls return the same * numbers as the contents of these structures. @@ -1704,7 +1704,7 @@ static void test_enum_svc(void)
/* lpServiceName and lpDisplayName should always be filled */ ok(exservices[i].lpServiceName[0], "Expected a service name\n"); - ok(exservices[i].lpDisplayName[0], "Expected a display name\n"); + ok(exservices[i].lpDisplayName && 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.