[SERVICES] Revert f6d81f22 because it breaks the advapi32 LockServiceDatabase test.
authorEric Kohl <eric.kohl@reactos.org>
Fri, 5 Oct 2018 07:41:50 +0000 (09:41 +0200)
committerEric Kohl <eric.kohl@reactos.org>
Fri, 5 Oct 2018 07:41:50 +0000 (09:41 +0200)
base/system/services/rpcserver.c

index 8e383a5..7f251c8 100644 (file)
@@ -1671,43 +1671,6 @@ ScmIsValidServiceState(DWORD dwCurrentState)
 }
 
 
 }
 
 
-static
-DWORD
-WINAPI
-ScmStopThread(
-    _In_ PVOID pParam)
-{
-    PSERVICE pService;
-
-    DPRINT("ScmStopThread(%p)\n", pParam);
-
-    pService = (PSERVICE)pParam;
-
-    if (pService->lpImage->dwImageRunCount != 0)
-        return 0;
-
-    Sleep(2000);
-
-    /* Lock the service database exclusively */
-    ScmLockDatabaseExclusive();
-
-    /* Stop the dispatcher thread */
-    ScmControlService(pService->lpImage->hControlPipe,
-                      L"",
-                      (SERVICE_STATUS_HANDLE)pService,
-                      SERVICE_CONTROL_STOP);
-
-    /* Remove the service image */
-    ScmRemoveServiceImage(pService->lpImage);
-
-    /* Unlock the service database */
-    ScmUnlockDatabase();
-
-    DPRINT("ScmStopThread done!\n");
-    return 0;
-}
-
-
 /* Function 7 */
 DWORD
 WINAPI
 /* Function 7 */
 DWORD
 WINAPI
@@ -1720,8 +1683,6 @@ RSetServiceStatus(
     DWORD dwPreviousType;
     LPCWSTR lpLogStrings[2];
     WCHAR szLogBuffer[80];
     DWORD dwPreviousType;
     LPCWSTR lpLogStrings[2];
     WCHAR szLogBuffer[80];
-    HANDLE hStopThread = NULL;
-    DWORD dwStopThreadId;
     UINT uID;
 
     DPRINT("RSetServiceStatus() called\n");
     UINT uID;
 
     DPRINT("RSetServiceStatus() called\n");
@@ -1801,17 +1762,15 @@ RSetServiceStatus(
         /* If we just stopped the last running service... */
         if (lpService->lpImage->dwImageRunCount == 0)
         {
         /* If we just stopped the last running service... */
         if (lpService->lpImage->dwImageRunCount == 0)
         {
-           /* Run the stop thread to stop the service dispatcher */
-           hStopThread = CreateThread(NULL,
-                                      0,
-                                      (LPTHREAD_START_ROUTINE)ScmStopThread,
-                                      (LPVOID)lpService,
-                                      0,
-                                      &dwStopThreadId);
-           if (hStopThread != NULL)
-           {
-               CloseHandle(hStopThread);
-           }
+            /* Stop the dispatcher thread */
+            ScmControlService(lpService->lpImage->hControlPipe,
+                              L"",
+                              (SERVICE_STATUS_HANDLE)lpService,
+                              SERVICE_CONTROL_STOP);
+
+            /* Remove the service image */
+            ScmRemoveServiceImage(lpService->lpImage);
+            lpService->lpImage = NULL;
         }
     }
 
         }
     }