schedsvc: Avoid deadlock when scheduler service starts rpcss.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

schedsvc: Avoid deadlock when scheduler service starts rpcss.
bd31e320 · Sebastian Lackner · Alexandre Julliard · e3cda2c4 · bd31e320
Commit bd31e320 authored Sep 01, 2016 by Sebastian Lackner Committed by Alexandre Julliard Sep 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

svc_main.c dlls/schedsvc/svc_main.c +7 -5

No files found.
--- a/dlls/schedsvc/svc_main.c
+++ b/dlls/schedsvc/svc_main.c
@@ -175,8 +175,6 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv)
 {
    TRACE("starting Task Scheduler Service\n");

-    if (RPC_init() != RPC_S_OK) return;
-
    schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler);
    if (!schedsvc_handle)
    {
@@ -186,11 +184,15 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv)

    done_event = CreateEventW(NULL, TRUE, FALSE, NULL);

-    schedsvc_update_status(SERVICE_RUNNING);
+    schedsvc_update_status(SERVICE_START_PENDING);

-    WaitForSingleObject(done_event, INFINITE);
+    if (RPC_init() == RPC_S_OK)
+    {
+        schedsvc_update_status(SERVICE_RUNNING);
+        WaitForSingleObject(done_event, INFINITE);
+        RPC_finish();
+    }

-    RPC_finish();
    schedsvc_update_status(SERVICE_STOPPED);

    TRACE("exiting Task Scheduler Service\n");