ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: Move service cleanup code to separate function.

This commit is contained in:
Piotr Caban 2011-12-12 11:04:46 +01:00 committed by Alexandre Julliard
parent bc866c899f
commit 01ef66cb1e
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/services/rpc.c
View File

@ -1062,6 +1062,11 @@ DWORD __cdecl svcctl_ControlService(
break; break;
} }
if (result==ERROR_SUCCESS && !service->service_entry->control_mutex) {
result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
service_terminate(service->service_entry);
}
if (result != ERROR_SUCCESS) if (result != ERROR_SUCCESS)
{ {
if (lpServiceStatus) if (lpServiceStatus)

37
programs/services/services.c
View File

@ -847,22 +847,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
ReleaseMutex(service->control_mutex); ReleaseMutex(service->control_mutex);
else else
{ service_terminate(service);
CloseHandle(service->overlapped_event);
service->overlapped_event = NULL;
CloseHandle(service->status_changed_event);
service->status_changed_event = NULL;
CloseHandle(service->control_mutex);
service->control_mutex = NULL;
if (service->control_pipe != INVALID_HANDLE_VALUE)
CloseHandle(service->control_pipe);
service->control_pipe = INVALID_HANDLE_VALUE;
service->status.dwProcessId = 0;
service_lock_exclusive(service);
service->status.dwCurrentState = SERVICE_STOPPED;
service_unlock(service);
}
scmdatabase_unlock_startup(service->db); scmdatabase_unlock_startup(service->db);
WINE_TRACE("returning %d\n", err); WINE_TRACE("returning %d\n", err);
@ -870,6 +855,26 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
return err; return err;
} }
void service_terminate(struct service_entry *service)
{
service_lock_exclusive(service);
TerminateProcess(service->process, 0);
CloseHandle(service->process);
service->process = NULL;
CloseHandle(service->overlapped_event);
service->overlapped_event = NULL;
CloseHandle(service->status_changed_event);
service->status_changed_event = NULL;
CloseHandle(service->control_mutex);
service->control_mutex = NULL;
CloseHandle(service->control_pipe);
service->control_pipe = INVALID_HANDLE_VALUE;
service->status.dwProcessId = 0;
service->status.dwCurrentState = SERVICE_STOPPED;
service_unlock(service);
}
static void load_registry_parameters(void) static void load_registry_parameters(void)
{ {
static const WCHAR controlW[] = static const WCHAR controlW[] =

1
programs/services/services.h
View File

@ -78,6 +78,7 @@ void service_lock_shared(struct service_entry *service);
void service_lock_exclusive(struct service_entry *service); void service_lock_exclusive(struct service_entry *service);
void service_unlock(struct service_entry *service); void service_unlock(struct service_entry *service);
DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv);
void service_terminate(struct service_entry *service);
BOOL service_send_command( struct service_entry *service, HANDLE pipe, BOOL service_send_command( struct service_entry *service, HANDLE pipe,
const void *data, DWORD size, DWORD *result ); const void *data, DWORD size, DWORD *result );