commit 0722a25dcd085a6f981bbc5651a169a4045baf38
author Piotr Caban <piotr@codeweavers.com> Fri Dec 04 11:41:43 2015 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 04 21:56:20 2015 +0900
tree 3504ac8884180fa975f7bc08420a56d046613a9f
parent eddc4609eca7589c021e181b1701ec25b1ee0e8e

msiexec: Avoid broken pipe error caused by setting SERVICE_STOPPED state twice.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

programs/msiexec/service.c

diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c
index 59dfd0e..735cd5c 100644
--- a/programs/msiexec/service.c
+++ b/programs/msiexec/service.c
@@ -47,7 +47,9 @@
     status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
     status.dwCurrentState = dwCurrentState;
 
-    if (dwCurrentState == SERVICE_START_PENDING)
+    if (dwCurrentState == SERVICE_START_PENDING
+            || dwCurrentState == SERVICE_STOP_PENDING
+            || dwCurrentState == SERVICE_STOPPED)
         status.dwControlsAccepted = 0;
     else
     {
@@ -81,8 +83,6 @@
 
 static void WINAPI ServiceCtrlHandler(DWORD code)
 {
-    DWORD state = SERVICE_RUNNING;
-
     WINE_TRACE("%d\n", code);
 
     switch (code)
@@ -91,14 +91,12 @@
         case SERVICE_CONTROL_STOP:
             UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0);
             KillService();
-            state = SERVICE_STOPPED;
             break;
         default:
             fprintf(stderr, "Unhandled service control code: %d\n", code);
+            UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0);
             break;
     }
-
-    UpdateSCMStatus(state, NO_ERROR, 0);
 }
 
 static DWORD WINAPI ServiceExecutionThread(LPVOID param)
@@ -150,10 +148,7 @@
     }
 
     UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0);
-
-    WaitForSingleObject(kill_event, INFINITE);
-    KillService();
-
+    WaitForSingleObject(thread, INFINITE);
     UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0);
 }