Skip to content

W
wine-winehq
Commit 34fd6398 authored by Sebastian Lackner's avatar Sebastian Lackner Committed by Alexandre Julliard
Browse files
Options

services: Do not distinguish between shared/exclusive lock.

Signed-off-by: 's avatarSebastian Lackner <sebastian@fds-team.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0819c739
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 45 deletions
programs/services/rpc.c
View file @ 34fd6398
...@@ -267,14 +267,14 @@ DWORD __cdecl svcctl_GetServiceDisplayNameW( ...@@ -267,14 +267,14 @@ DWORD __cdecl svcctl_GetServiceDisplayNameW(
if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS)
return err; return err;
scmdatabase_lock_shared(manager->db); scmdatabase_lock(manager->db);
entry = scmdatabase_find_service(manager->db, lpServiceName); entry = scmdatabase_find_service(manager->db, lpServiceName);
if (entry != NULL) if (entry != NULL)
{ {
LPCWSTR name; LPCWSTR name;
int len; int len;
service_lock_shared(entry); service_lock(entry);
name = get_display_name(entry); name = get_display_name(entry);
len = strlenW(name); len = strlenW(name);
if (len <= *cchBufSize) if (len <= *cchBufSize)
...@@ -313,13 +313,13 @@ DWORD __cdecl svcctl_GetServiceKeyNameW( ...@@ -313,13 +313,13 @@ DWORD __cdecl svcctl_GetServiceKeyNameW(
if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS)
return err; return err;
scmdatabase_lock_shared(manager->db); scmdatabase_lock(manager->db);
entry = scmdatabase_find_service_by_displayname(manager->db, lpServiceDisplayName); entry = scmdatabase_find_service_by_displayname(manager->db, lpServiceDisplayName);
if (entry != NULL) if (entry != NULL)
{ {
int len; int len;
service_lock_shared(entry); service_lock(entry);
len = strlenW(entry->name); len = strlenW(entry->name);
if (len <= *cchBufSize) if (len <= *cchBufSize)
{ {
...@@ -381,7 +381,7 @@ DWORD __cdecl svcctl_OpenServiceW( ...@@ -381,7 +381,7 @@ DWORD __cdecl svcctl_OpenServiceW(
if (!validate_service_name(lpServiceName)) if (!validate_service_name(lpServiceName))
return ERROR_INVALID_NAME; return ERROR_INVALID_NAME;
scmdatabase_lock_shared(manager->db); scmdatabase_lock(manager->db);
entry = scmdatabase_find_service(manager->db, lpServiceName); entry = scmdatabase_find_service(manager->db, lpServiceName);
if (entry != NULL) if (entry != NULL)
InterlockedIncrement(&entry->ref_count); InterlockedIncrement(&entry->ref_count);
...@@ -535,11 +535,11 @@ static DWORD create_serviceW( ...@@ -535,11 +535,11 @@ static DWORD create_serviceW(
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
} }
scmdatabase_lock_exclusive(manager->db); scmdatabase_lock(manager->db);
if ((found = scmdatabase_find_service(manager->db, lpServiceName))) if ((found = scmdatabase_find_service(manager->db, lpServiceName)))
{ {
service_lock_exclusive(found); service_lock(found);
err = is_marked_for_delete(found) ? ERROR_SERVICE_MARKED_FOR_DELETE : ERROR_SERVICE_EXISTS; err = is_marked_for_delete(found) ? ERROR_SERVICE_MARKED_FOR_DELETE : ERROR_SERVICE_EXISTS;
service_unlock(found); service_unlock(found);
scmdatabase_unlock(manager->db); scmdatabase_unlock(manager->db);
...@@ -599,7 +599,7 @@ DWORD __cdecl svcctl_DeleteService( ...@@ -599,7 +599,7 @@ DWORD __cdecl svcctl_DeleteService(
if ((err = validate_service_handle(hService, DELETE, &service)) != ERROR_SUCCESS) if ((err = validate_service_handle(hService, DELETE, &service)) != ERROR_SUCCESS)
return err; return err;
service_lock_exclusive(service->service_entry); service_lock(service->service_entry);
if (!is_marked_for_delete(service->service_entry)) if (!is_marked_for_delete(service->service_entry))
err = mark_for_delete(service->service_entry); err = mark_for_delete(service->service_entry);
...@@ -625,7 +625,7 @@ DWORD __cdecl svcctl_QueryServiceConfigW( ...@@ -625,7 +625,7 @@ DWORD __cdecl svcctl_QueryServiceConfigW(
if ((err = validate_service_handle(hService, SERVICE_QUERY_CONFIG, &service)) != 0) if ((err = validate_service_handle(hService, SERVICE_QUERY_CONFIG, &service)) != 0)
return err; return err;
service_lock_shared(service->service_entry); service_lock(service->service_entry);
config->dwServiceType = service->service_entry->config.dwServiceType; config->dwServiceType = service->service_entry->config.dwServiceType;
config->dwStartType = service->service_entry->config.dwStartType; config->dwStartType = service->service_entry->config.dwStartType;
config->dwErrorControl = service->service_entry->config.dwErrorControl; config->dwErrorControl = service->service_entry->config.dwErrorControl;
...@@ -668,7 +668,7 @@ DWORD __cdecl svcctl_ChangeServiceConfigW( ...@@ -668,7 +668,7 @@ DWORD __cdecl svcctl_ChangeServiceConfigW(
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
/* first check if the new configuration is correct */ /* first check if the new configuration is correct */
service_lock_exclusive(service->service_entry); service_lock(service->service_entry);
if (is_marked_for_delete(service->service_entry)) if (is_marked_for_delete(service->service_entry))
{ {
...@@ -765,7 +765,7 @@ DWORD __cdecl svcctl_SetServiceStatus( ...@@ -765,7 +765,7 @@ DWORD __cdecl svcctl_SetServiceStatus(
if ((err = validate_service_handle(hServiceStatus, SERVICE_SET_STATUS, &service)) != 0) if ((err = validate_service_handle(hServiceStatus, SERVICE_SET_STATUS, &service)) != 0)
return err; return err;
service_lock_exclusive(service->service_entry); service_lock(service->service_entry);
/* FIXME: be a bit more discriminant about what parts of the status we set /* FIXME: be a bit more discriminant about what parts of the status we set
* and check that fields are valid */ * and check that fields are valid */
service->service_entry->status.dwServiceType = lpServiceStatus->dwServiceType; service->service_entry->status.dwServiceType = lpServiceStatus->dwServiceType;
...@@ -806,7 +806,7 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI ...@@ -806,7 +806,7 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI
} }
WINE_TRACE( "changing service %p descr to %s\n", service, wine_dbgstr_w(descr) ); WINE_TRACE( "changing service %p descr to %s\n", service, wine_dbgstr_w(descr) );
service_lock_exclusive( service->service_entry ); service_lock( service->service_entry );
HeapFree( GetProcessHeap(), 0, service->service_entry->description ); HeapFree( GetProcessHeap(), 0, service->service_entry->description );
service->service_entry->description = descr; service->service_entry->description = descr;
save_service_config( service->service_entry ); save_service_config( service->service_entry );
...@@ -822,7 +822,7 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI ...@@ -822,7 +822,7 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI
case SERVICE_CONFIG_PRESHUTDOWN_INFO: case SERVICE_CONFIG_PRESHUTDOWN_INFO:
WINE_TRACE( "changing service %p preshutdown timeout to %d\n", WINE_TRACE( "changing service %p preshutdown timeout to %d\n",
service, config.u.preshutdown->dwPreshutdownTimeout ); service, config.u.preshutdown->dwPreshutdownTimeout );
service_lock_exclusive( service->service_entry ); service_lock( service->service_entry );
service->service_entry->preshutdown_timeout = config.u.preshutdown->dwPreshutdownTimeout; service->service_entry->preshutdown_timeout = config.u.preshutdown->dwPreshutdownTimeout;
save_service_config( service->service_entry ); save_service_config( service->service_entry );
service_unlock( service->service_entry ); service_unlock( service->service_entry );
...@@ -852,7 +852,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, ...@@ -852,7 +852,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level,
{ {
SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer;
service_lock_shared(service->service_entry); service_lock(service->service_entry);
*needed = sizeof(*descr); *needed = sizeof(*descr);
if (service->service_entry->description) if (service->service_entry->description)
*needed += (strlenW(service->service_entry->description) + 1) * sizeof(WCHAR); *needed += (strlenW(service->service_entry->description) + 1) * sizeof(WCHAR);
...@@ -872,7 +872,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, ...@@ -872,7 +872,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level,
break; break;
case SERVICE_CONFIG_PRESHUTDOWN_INFO: case SERVICE_CONFIG_PRESHUTDOWN_INFO:
service_lock_shared(service->service_entry); service_lock(service->service_entry);
*needed = sizeof(SERVICE_PRESHUTDOWN_INFO); *needed = sizeof(SERVICE_PRESHUTDOWN_INFO);
if (size >= *needed) if (size >= *needed)
...@@ -922,7 +922,7 @@ DWORD __cdecl svcctl_QueryServiceStatusEx( ...@@ -922,7 +922,7 @@ DWORD __cdecl svcctl_QueryServiceStatusEx(
return ERROR_INSUFFICIENT_BUFFER; return ERROR_INSUFFICIENT_BUFFER;
} }
service_lock_shared(service->service_entry); service_lock(service->service_entry);
pSvcStatusData->dwServiceType = service->service_entry->status.dwServiceType; pSvcStatusData->dwServiceType = service->service_entry->status.dwServiceType;
pSvcStatusData->dwCurrentState = service->service_entry->status.dwCurrentState; pSvcStatusData->dwCurrentState = service->service_entry->status.dwCurrentState;
...@@ -1126,7 +1126,7 @@ DWORD __cdecl svcctl_ControlService( ...@@ -1126,7 +1126,7 @@ DWORD __cdecl svcctl_ControlService(
if ((result = validate_service_handle(hService, access_required, &service)) != 0) if ((result = validate_service_handle(hService, access_required, &service)) != 0)
return result; return result;
service_lock_exclusive(service->service_entry); service_lock(service->service_entry);
result = ERROR_SUCCESS; result = ERROR_SUCCESS;
switch (service->service_entry->status.dwCurrentState) switch (service->service_entry->status.dwCurrentState)
...@@ -1185,7 +1185,7 @@ DWORD __cdecl svcctl_ControlService( ...@@ -1185,7 +1185,7 @@ DWORD __cdecl svcctl_ControlService(
if (lpServiceStatus) if (lpServiceStatus)
{ {
service_lock_shared(service->service_entry); service_lock(service->service_entry);
lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType;
lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState;
lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted;
...@@ -1324,7 +1324,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW( ...@@ -1324,7 +1324,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW(
if (resume) if (resume)
WINE_FIXME("resume index not supported\n"); WINE_FIXME("resume index not supported\n");
scmdatabase_lock_exclusive(manager->db); scmdatabase_lock(manager->db);
total_size = num_services = 0; total_size = num_services = 0;
LIST_FOR_EACH_ENTRY(service, &manager->db->services, struct service_entry, entry) LIST_FOR_EACH_ENTRY(service, &manager->db->services, struct service_entry, entry)
...@@ -1441,7 +1441,7 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( ...@@ -1441,7 +1441,7 @@ DWORD __cdecl svcctl_EnumServicesStatusExW(
if ((err = validate_scm_handle(hmngr, SC_MANAGER_ENUMERATE_SERVICE, &manager)) != ERROR_SUCCESS) if ((err = validate_scm_handle(hmngr, SC_MANAGER_ENUMERATE_SERVICE, &manager)) != ERROR_SUCCESS)
return err; return err;
scmdatabase_lock_exclusive(manager->db); scmdatabase_lock(manager->db);
if (group && !find_service_by_group(manager->db, group)) if (group && !find_service_by_group(manager->db, group))
{ {
......
programs/services/services.c
View file @ 34fd6398
...@@ -281,7 +281,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) ...@@ -281,7 +281,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db)
if (!services_list) if (!services_list)
return; return;
scmdatabase_lock_shared(db); scmdatabase_lock(db);
LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry)
{ {
...@@ -326,7 +326,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db) ...@@ -326,7 +326,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db)
struct service_entry *service; struct service_entry *service;
BOOL run = TRUE; BOOL run = TRUE;
scmdatabase_lock_shared(db); scmdatabase_lock(db);
while(run) while(run)
{ {
run = FALSE; run = FALSE;
...@@ -336,7 +336,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db) ...@@ -336,7 +336,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db)
{ {
scmdatabase_unlock(db); scmdatabase_unlock(db);
WaitForSingleObject(service->process, INFINITE); WaitForSingleObject(service->process, INFINITE);
scmdatabase_lock_shared(db); scmdatabase_lock(db);
CloseHandle(service->process); CloseHandle(service->process);
service->process = NULL; service->process = NULL;
run = TRUE; run = TRUE;
...@@ -434,8 +434,8 @@ void release_service(struct service_entry *service) ...@@ -434,8 +434,8 @@ void release_service(struct service_entry *service)
{ {
if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service))
{ {
scmdatabase_lock_exclusive(service->db); scmdatabase_lock(service->db);
service_lock_exclusive(service); service_lock(service);
scmdatabase_remove_service(service->db, service); scmdatabase_remove_service(service->db, service);
service_unlock(service); service_unlock(service);
scmdatabase_unlock(service->db); scmdatabase_unlock(service->db);
...@@ -549,12 +549,7 @@ void scmdatabase_unlock_startup(struct scmdatabase *db) ...@@ -549,12 +549,7 @@ void scmdatabase_unlock_startup(struct scmdatabase *db)
InterlockedCompareExchange(&db->service_start_lock, FALSE, TRUE); InterlockedCompareExchange(&db->service_start_lock, FALSE, TRUE);
} }
void scmdatabase_lock_shared(struct scmdatabase *db) void scmdatabase_lock(struct scmdatabase *db)
{
EnterCriticalSection(&db->cs);
}
void scmdatabase_lock_exclusive(struct scmdatabase *db)
{ {
EnterCriticalSection(&db->cs); EnterCriticalSection(&db->cs);
} }
...@@ -564,12 +559,7 @@ void scmdatabase_unlock(struct scmdatabase *db) ...@@ -564,12 +559,7 @@ void scmdatabase_unlock(struct scmdatabase *db)
LeaveCriticalSection(&db->cs); LeaveCriticalSection(&db->cs);
} }
void service_lock_shared(struct service_entry *service) void service_lock(struct service_entry *service)
{
EnterCriticalSection(&service->db->cs);
}
void service_lock_exclusive(struct service_entry *service)
{ {
EnterCriticalSection(&service->db->cs); EnterCriticalSection(&service->db->cs);
} }
...@@ -699,7 +689,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * ...@@ -699,7 +689,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE *
DWORD err; DWORD err;
BOOL r; BOOL r;
service_lock_exclusive(service_entry); service_lock(service_entry);
if (!env) if (!env)
{ {
...@@ -734,7 +724,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * ...@@ -734,7 +724,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE *
HeapFree(GetProcessHeap(),0,path); HeapFree(GetProcessHeap(),0,path);
if (!r) if (!r)
{ {
service_lock_exclusive(service_entry); service_lock(service_entry);
service_entry->status.dwCurrentState = SERVICE_STOPPED; service_entry->status.dwCurrentState = SERVICE_STOPPED;
service_unlock(service_entry); service_unlock(service_entry);
return GetLastError(); return GetLastError();
...@@ -758,7 +748,7 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL ...@@ -758,7 +748,7 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL
ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout );
if (ret != WAIT_OBJECT_0) if (ret != WAIT_OBJECT_0)
return ERROR_SERVICE_REQUEST_TIMEOUT; return ERROR_SERVICE_REQUEST_TIMEOUT;
service_lock_shared(service_entry); service_lock(service_entry);
state = service_entry->status.dwCurrentState; state = service_entry->status.dwCurrentState;
service_unlock(service_entry); service_unlock(service_entry);
if (state == SERVICE_START_PENDING) if (state == SERVICE_START_PENDING)
...@@ -906,7 +896,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * ...@@ -906,7 +896,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
void service_terminate(struct service_entry *service) void service_terminate(struct service_entry *service)
{ {
service_lock_exclusive(service); service_lock(service);
TerminateProcess(service->process, 0); TerminateProcess(service->process, 0);
CloseHandle(service->process); CloseHandle(service->process);
service->process = NULL; service->process = NULL;
......
programs/services/services.h
View file @ 34fd6398
...@@ -63,8 +63,7 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entr ...@@ -63,8 +63,7 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entr
DWORD scmdatabase_lock_startup(struct scmdatabase *db); DWORD scmdatabase_lock_startup(struct scmdatabase *db);
void scmdatabase_unlock_startup(struct scmdatabase *db); void scmdatabase_unlock_startup(struct scmdatabase *db);
void scmdatabase_lock_shared(struct scmdatabase *db); void scmdatabase_lock(struct scmdatabase *db);
void scmdatabase_lock_exclusive(struct scmdatabase *db);
void scmdatabase_unlock(struct scmdatabase *db); void scmdatabase_unlock(struct scmdatabase *db);
/* Service functions */ /* Service functions */
...@@ -75,8 +74,7 @@ BOOL validate_service_config(struct service_entry *entry); ...@@ -75,8 +74,7 @@ BOOL validate_service_config(struct service_entry *entry);
DWORD save_service_config(struct service_entry *entry); DWORD save_service_config(struct service_entry *entry);
void free_service_entry(struct service_entry *entry); void free_service_entry(struct service_entry *entry);
void release_service(struct service_entry *service); void release_service(struct service_entry *service);
void service_lock_shared(struct service_entry *service); void service_lock(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); void service_terminate(struct service_entry *service);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment