[ros-diffs] [ekohl] 73416: [SERVICES] - Get rid of the obsolete USE_SERVICE_START_PENDING option. - Services do not accept any command when they are in SERVICE_START_PENDING state. Patch by Hermès BÉLUSCA - MA...

Author: ekohl
Date: Sat Dec  3 09:33:03 2016
New Revision: 73416

URL: http://svn.reactos.org/svn/reactos?rev=73416&view=rev
Log:
[SERVICES]
- Get rid of the obsolete USE_SERVICE_START_PENDING option.
- Services do not accept any command when they are in SERVICE_START_PENDING state.
Patch by Hermès BÉLUSCA - MAÏTO.

Modified:
    trunk/reactos/base/system/services/database.c

Modified: trunk/reactos/base/system/services/database.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab…
==============================================================================
--- trunk/reactos/base/system/services/database.c	[iso-8859-1] (original)
+++ trunk/reactos/base/system/services/database.c	[iso-8859-1] Sat Dec  3 09:33:03 2016
@@ -18,12 +18,6 @@
 
 #define NDEBUG
 #include <debug.h>
-
-/*
- * Uncomment the line below to start services
- * using the SERVICE_START_PENDING state.
- */
-#define USE_SERVICE_START_PENDING
 
 /*
  * Uncomment the line below to use asynchronous IO operations
@@ -1766,8 +1760,8 @@
         dwError = ScmLoadDriver(Service);
         if (dwError == ERROR_SUCCESS)
         {
+            Service->Status.dwCurrentState = SERVICE_RUNNING;
             Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP;
-            Service->Status.dwCurrentState = SERVICE_RUNNING;
         }
     }
     else // if (Service->Status.dwServiceType & (SERVICE_WIN32 |
SERVICE_INTERACTIVE_PROCESS))
@@ -1779,11 +1773,8 @@
             dwError = ScmStartUserModeService(Service, argc, argv);
             if (dwError == ERROR_SUCCESS)
             {
-#ifdef USE_SERVICE_START_PENDING
                 Service->Status.dwCurrentState = SERVICE_START_PENDING;
-#else
-                Service->Status.dwCurrentState = SERVICE_RUNNING;
-#endif
+                Service->Status.dwControlsAccepted = 0;
             }
             else
             {