Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SERVICES] Revert f6d81f22 because it breaks the advapi32 LockServiceDatabase test.

Browse source
This commit is contained in:
Eric Kohl 2018-10-05 09:41:50 +02:00
parent f6d81f2257
commit 1820aa8fe6
1 changed files with 9 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

59
base/system/services/rpcserver.c
View 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
@ -1720,8 +1683,6 @@ RSetServiceStatus(
DWORD dwPreviousType;
LPCWSTR lpLogStrings[2];
WCHAR szLogBuffer[80];
HANDLE hStopThread = NULL;
DWORD dwStopThreadId;
UINT uID;
DPRINT("RSetServiceStatus() called\n");
@ -1801,17 +1762,15 @@ RSetServiceStatus(
/* 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;
}
}