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

svchost: Simplify error handling, fix trace message.

oldstable
Nikolay Sivov 2014-04-15 23:20:49 +04:00 committed by Alexandre Julliard
parent 7e874aed75
commit 463f91dce1
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
programs/svchost/svchost.c
View File

@ -254,6 +254,7 @@ static BOOL StartGroupServices(LPWSTR services)
LPWSTR service_name = NULL;
SERVICE_TABLE_ENTRYW *service_table = NULL;
DWORD service_count;
BOOL ret;
/* Count the services to load */
service_count = 0;
@ -264,8 +265,7 @@ static BOOL StartGroupServices(LPWSTR services)
service_name = service_name + lstrlenW(service_name);
++service_name;
}
WINE_TRACE("Service group %s contains %d services\n",
wine_dbgstr_w(services), service_count);
WINE_TRACE("Service group contains %d services\n", service_count);
/* Populate the service table */
service_table = HeapAlloc(GetProcessHeap(), 0,
@ -287,15 +287,12 @@ static BOOL StartGroupServices(LPWSTR services)
service_table[service_count].lpServiceProc = NULL;
/* Start the services */
if (!StartServiceCtrlDispatcherW(service_table))
{
if (!(ret = StartServiceCtrlDispatcherW(service_table)))
WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %u\n",
wine_dbgstr_w(services), GetLastError());
HeapFree(GetProcessHeap(), 0, service_table);
return FALSE;
}
HeapFree(GetProcessHeap(), 0, service_table);
return TRUE;
return ret;
}
/* Find the list of services associated with a group name and start those
@ -327,14 +324,11 @@ static BOOL LoadGroup(PWCHAR group_name)
}
/* Start services */
if (StartGroupServices(services) == FALSE)
{
if (!(ret = StartGroupServices(services)))
WINE_TRACE("Failed to start service group\n");
HeapFree(GetProcessHeap(), 0, services);
return FALSE;
}
HeapFree(GetProcessHeap(), 0, services);
return TRUE;
return ret;
}
/* Load svchost group specified on the command line via the /k option */