marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: Add a 3000 ms timeout to StartService. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Dmitry Timoshkov 2018-04-09 19:29:02 +08:00 committed by Alexandre Julliard
parent f1b88ab1f6
commit b5c1a8f635
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/services/rpc.c
View File

@ -1212,7 +1212,7 @@ DWORD __cdecl svcctl_StartServiceW(
if (service->service_entry->config.dwStartType == SERVICE_DISABLED)
return ERROR_SERVICE_DISABLED;
if (!scmdatabase_lock_startup(service->service_entry->db))
if (!scmdatabase_lock_startup(service->service_entry->db, 3000))
return ERROR_SERVICE_DATABASE_LOCKED;
err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors);
@ -1374,7 +1374,7 @@ DWORD __cdecl svcctl_LockServiceDatabase(
if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS)
return err;
if (!scmdatabase_lock_startup(manager->db))
if (!scmdatabase_lock_startup(manager->db, 0))
return ERROR_SERVICE_DATABASE_LOCKED;
lock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock));

15
programs/services/services.c
View File

@ -361,7 +361,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db)
scmdatabase_unlock(db);
qsort(services_list, size, sizeof(services_list[0]), compare_tags);
while (!scmdatabase_lock_startup(db)) Sleep(10);
scmdatabase_lock_startup(db, INFINITE);
for (i = 0; i < size; i++)
{
@ -619,9 +619,18 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db)
return ERROR_SUCCESS;
}
BOOL scmdatabase_lock_startup(struct scmdatabase *db)
BOOL scmdatabase_lock_startup(struct scmdatabase *db, int timeout)
{
return !InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE);
while (InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE))
{
if (timeout != INFINITE)
{
timeout -= 10;
if (timeout <= 0) return FALSE;
}
Sleep(10);
}
return TRUE;
}
void scmdatabase_unlock_startup(struct scmdatabase *db)

2
programs/services/services.h
View File

@ -77,7 +77,7 @@ struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR n
struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name);
DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry);
BOOL scmdatabase_lock_startup(struct scmdatabase *db);
BOOL scmdatabase_lock_startup(struct scmdatabase *db, int timeout);
void scmdatabase_unlock_startup(struct scmdatabase *db);
void scmdatabase_lock(struct scmdatabase *db);