Zebediah Figura : advapi32/tests: Accept another value for the default service pre-shutdown timeout.
Alexandre Julliard
julliard at winehq.org
Sun Oct 27 15:06:17 CDT 2019
Module: wine
Branch: master
Commit: a39d0c7a399ebf55c1c85657efb33640ef5fdf53
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a39d0c7a399ebf55c1c85657efb33640ef5fdf53
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Oct 25 11:40:13 2019 -0500
advapi32/tests: Accept another value for the default service pre-shutdown timeout.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 c607e292aa..75da3cd483 100644
--- 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",
- 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;
More information about the wine-cvs
mailing list