system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 13:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

services: Don't close control_pipe when SERVICE_CONTROL_STOP is sent.

Browse source 
This prevents service_control_dispatcher from being stopped. Thanks to
it the service may continue to work and do the clean up.
This commit is contained in:
Piotr Caban 2011-12-12 11:04:28 +01:00 committed by Alexandre Julliard
parent b9797b5caa
commit bc866c899f
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
programs/services/rpc.c
View file

@ -1015,7 +1015,6 @@ DWORD __cdecl svcctl_ControlService(
DWORD result;
BOOL ret;
HANDLE control_mutex;
HANDLE control_pipe;
WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus);
@ -1085,22 +1084,19 @@ DWORD __cdecl svcctl_ControlService(
return ERROR_INVALID_SERVICE_CONTROL;
}
/* prevent races by caching these variables and clearing them on
* stop here instead of outside the services lock */
/* prevent races by caching control_mutex and clearing it on
* stop instead of outside the services lock */
control_mutex = service->service_entry->control_mutex;
control_pipe = service->service_entry->control_pipe;
if (dwControl == SERVICE_CONTROL_STOP)
{
service->service_entry->control_mutex = NULL;
service->service_entry->control_pipe = INVALID_HANDLE_VALUE;
}
service_unlock(service->service_entry);
ret = WaitForSingleObject(control_mutex, 30000);
if (ret == WAIT_OBJECT_0)
{
service_send_control(service->service_entry, control_pipe, dwControl, &result);
service_send_control(service->service_entry, service->service_entry->control_pipe,
dwControl, &result);
if (lpServiceStatus)
{
@ -1116,10 +1112,7 @@ DWORD __cdecl svcctl_ControlService(
}
if (dwControl == SERVICE_CONTROL_STOP)
{
CloseHandle(control_mutex);
CloseHandle(control_pipe);
}
else
ReleaseMutex(control_mutex);
@ -1128,10 +1121,7 @@ DWORD __cdecl svcctl_ControlService(
else
{
if (dwControl == SERVICE_CONTROL_STOP)
{
CloseHandle(control_mutex);
CloseHandle(control_pipe);
}
return ERROR_SERVICE_REQUEST_TIMEOUT;
}
}

1
programs/services/services.c
View file

@ -813,6 +813,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
return ERROR_SERVICE_ALREADY_RUNNING;
}
CloseHandle(service->control_pipe);
service->control_mutex = CreateMutexW(NULL, TRUE, NULL);
if (!service->status_changed_event)