Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-06-08 04:52:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

dll: FspServiceStop: early exit if service is already being stopped

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-05-11 11:29:36 -07:00
parent 457e151fa5
commit e82b06ae49
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/winfsp/winfsp.h
View File

@ -857,8 +857,9 @@ typedef struct _FSP_SERVICE
ULONG AcceptControl; ULONG AcceptControl;
ULONG ExitCode; ULONG ExitCode;
SERVICE_STATUS_HANDLE StatusHandle; SERVICE_STATUS_HANDLE StatusHandle;
CRITICAL_SECTION ServiceStatusGuard;
SERVICE_STATUS ServiceStatus; SERVICE_STATUS ServiceStatus;
CRITICAL_SECTION ServiceStatusGuard;
CRITICAL_SECTION ServiceStopGuard;
BOOLEAN AllowConsoleMode; BOOLEAN AllowConsoleMode;
WCHAR ServiceName[]; WCHAR ServiceName[];
} FSP_SERVICE; } FSP_SERVICE;

13
src/dll/service.c
View File

@ -126,6 +126,7 @@ FSP_API NTSTATUS FspServiceCreate(PWSTR ServiceName,
Service->AcceptControl = OnStop ? SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN : 0; Service->AcceptControl = OnStop ? SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN : 0;
InitializeCriticalSection(&Service->ServiceStatusGuard); InitializeCriticalSection(&Service->ServiceStatusGuard);
InitializeCriticalSection(&Service->ServiceStopGuard);
*PService = Service; *PService = Service;
@ -134,6 +135,7 @@ FSP_API NTSTATUS FspServiceCreate(PWSTR ServiceName,
FSP_API VOID FspServiceDelete(FSP_SERVICE *Service) FSP_API VOID FspServiceDelete(FSP_SERVICE *Service)
{ {
DeleteCriticalSection(&Service->ServiceStopGuard);
DeleteCriticalSection(&Service->ServiceStatusGuard); DeleteCriticalSection(&Service->ServiceStatusGuard);
MemFree(Service); MemFree(Service);
} }
@ -335,11 +337,16 @@ exit:
FSP_API VOID FspServiceStop(FSP_SERVICE *Service) FSP_API VOID FspServiceStop(FSP_SERVICE *Service)
{ {
SERVICE_STATUS ServiceStatus; SERVICE_STATUS ServiceStatus;
BOOLEAN Stopped;
NTSTATUS Result; NTSTATUS Result;
EnterCriticalSection(&Service->ServiceStatusGuard); if (!TryEnterCriticalSection(&Service->ServiceStopGuard))
return; /* the service is already being stopped! */
if (SERVICE_STOPPED == Service->ServiceStatus.dwCurrentState) EnterCriticalSection(&Service->ServiceStatusGuard);
Stopped = SERVICE_STOPPED == Service->ServiceStatus.dwCurrentState;
LeaveCriticalSection(&Service->ServiceStatusGuard);
if (Stopped)
goto exit; goto exit;
ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING; ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
@ -376,7 +383,7 @@ FSP_API VOID FspServiceStop(FSP_SERVICE *Service)
} }
exit: exit:
LeaveCriticalSection(&Service->ServiceStatusGuard); LeaveCriticalSection(&Service->ServiceStopGuard);
} }
static VOID WINAPI FspServiceEntry(DWORD Argc, PWSTR *Argv) static VOID WINAPI FspServiceEntry(DWORD Argc, PWSTR *Argv)