advapi32/tests: Accept another value for the default service pre-shutdown timeout.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

advapi32/tests: Accept another value for the default service pre-shutdown timeout.
a39d0c7a · Zebediah Figura · Alexandre Julliard · 4eee305b · a39d0c7a
Commit a39d0c7a authored Oct 25, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 27, 2019
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

service.c dlls/advapi32/tests/service.c +3 -2

No files found.
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -2275,8 +2275,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",
+    ok(preshutdown_info.dwPreshutdownTimeout == 180000
-            preshutdown_info.dwPreshutdownTimeout);
+            || preshutdown_info.dwPreshutdownTimeout == 10000 /* Win10 1709+ */,
+            "Default PreshutdownTimeout = %d\n", preshutdown_info.dwPreshutdownTimeout);
    SetLastError(0xdeadbeef);
    preshutdown_info.dwPreshutdownTimeout = -1;