Francois Gouget : advapi32/tests: Skip some tests if the EventLog service crashed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2078afb9283d2a69b4e4c8b22f8101a15f70d092
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2078afb9283d2a69b4e4c8b22f8101a...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Mar 17 14:14:42 2023 +0100

advapi32/tests: Skip some tests if the EventLog service crashed.

advapi32:eventlog crashes the EventLog service in some Windows
versions so defend against that condition.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53461

---

 dlls/advapi32/tests/service.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index c999255fbcc..da8495da45f 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -2919,19 +2919,25 @@ static void test_EventLog(void)
     ok(status.dwServiceType == SERVICE_WIN32_SHARE_PROCESS ||
        status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */,
        "got %#lx\n", status.dwServiceType);
-    ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState);
-    todo_wine
-    ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ ||
-       status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ ||
-       status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN),
-       "got %#lx\n", status.dwControlsAccepted);
-    ok(status.dwWin32ExitCode == 0, "got %#lx\n", status.dwWin32ExitCode);
     ok(status.dwServiceSpecificExitCode == 0, "got %#lx\n", status.dwServiceSpecificExitCode);
     ok(status.dwCheckPoint == 0, "got %#lx\n", status.dwCheckPoint);
     ok(status.dwWaitHint == 0, "got %#lx\n", status.dwWaitHint);
-    ok(status.dwProcessId != 0, "got %#lx\n", status.dwProcessId);
     ok(status.dwServiceFlags == 0 || status.dwServiceFlags == SERVICE_RUNS_IN_SYSTEM_PROCESS /* XP */,
        "got %#lx\n", status.dwServiceFlags);
+    if (status.dwCurrentState == SERVICE_STOPPED &&
+        status.dwWin32ExitCode == ERROR_PROCESS_ABORTED)
+        win_skip("EventLog crashed!\n");
+    else
+    {
+        ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState);
+        todo_wine
+        ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ ||
+           status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ ||
+           status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN),
+           "got %#lx\n", status.dwControlsAccepted);
+        ok(status.dwWin32ExitCode == 0, "got %#lx\n", status.dwWin32ExitCode);
+        ok(status.dwProcessId != 0, "got %#lx\n", status.dwProcessId);
+    }
 
     CloseServiceHandle(svc_handle);
     CloseServiceHandle(scm_handle);