[PATCH 2/3] advapi32/tests: Accept another value for the default service pre-shutdown timeout.

Zebediah Figura z.figura12 at gmail.com
Fri Oct 25 11:04:50 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/advapi32/tests/service.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index 123673022d..744aaabb48 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -2270,8 +2270,9 @@ static void test_queryconfig2(void)
     }
     ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError());
     ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed);
-    ok(preshutdown_info.dwPreshutdownTimeout == 180000, "Default PreshutdownTimeout = %d\n",
-            preshutdown_info.dwPreshutdownTimeout);
+    ok(preshutdown_info.dwPreshutdownTimeout == 180000
+            || preshutdown_info.dwPreshutdownTimeout == 10000 /* Win10 1709+ */,
+            "Default PreshutdownTimeout = %d\n", preshutdown_info.dwPreshutdownTimeout);
 
     SetLastError(0xdeadbeef);
     preshutdown_info.dwPreshutdownTimeout = -1;
-- 
2.20.1




More information about the wine-devel mailing list