[ros-diffs] [cgutman] 45731: - Send the SCM reply packet with the final status after completing the requested actions - Fixes the hang during 2nd stage setup

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sun Feb 28 19:20:17 2010
New Revision: 45731

URL: http://svn.reactos.org/svn/reactos?rev=45731&view=rev
Log:
 - Send the SCM reply packet with the final status after completing the requested actions
 - Fixes the hang during 2nd stage setup

Modified:
    trunk/reactos/dll/win32/advapi32/service/sctrl.c

Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/sctrl.c?rev=45731&r1=45730&r2=45731&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Feb 28 19:20:17 2010
@@ -347,6 +347,8 @@
     DWORD dwRunningServices = 0;
     LPWSTR lpServiceName;
     PACTIVE_SERVICE lpService;
+    SCM_REPLY_PACKET ReplyPacket;
+    DWORD dwError;
 
     TRACE("ScDispatcherLoop() called\n");
 
@@ -381,21 +383,41 @@
             {
                 case SERVICE_CONTROL_START:
                     TRACE("Start command - recieved SERVICE_CONTROL_START\n");
-                    if (ScStartService(lpService, ControlPacket) == ERROR_SUCCESS)
+                    dwError = ScStartService(lpService, ControlPacket);
+                    if (dwError == ERROR_SUCCESS)
                         dwRunningServices++;
                     break;
 
                 case SERVICE_CONTROL_STOP:
                     TRACE("Stop command - recieved SERVICE_CONTROL_STOP\n");
-                    if (ScControlService(lpService, ControlPacket) == ERROR_SUCCESS)
+                    dwError = ScControlService(lpService, ControlPacket);
+                    if (dwError == ERROR_SUCCESS)
                         dwRunningServices--;
                     break;
 
                 default:
                     TRACE("Command %lu received", ControlPacket->dwControl);
-                    ScControlService(lpService, ControlPacket);
-                    continue;
+                    dwError = ScControlService(lpService, ControlPacket);
+                    break;
             }
+        }
+        else
+        {
+            dwError = ERROR_NOT_FOUND;
+        }
+
+        ReplyPacket.dwError = dwError;
+
+        /* Send the reply packet */
+        bResult = WriteFile(hPipe,
+                            &ReplyPacket,
+                            sizeof(ReplyPacket),
+                            &Count,
+                            NULL);
+        if (bResult == FALSE)
+        {
+            ERR("Pipe write failed (Error: %lu)\n", GetLastError());
+            return FALSE;
         }
 
         if (dwRunningServices == 0)