system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 20:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Wait up to 30 seconds for services to start up.

Browse source
This commit is contained in:
Hans Leidekker 2011-10-27 13:35:29 +02:00 committed by Alexandre Julliard
parent d1e49da2f5
commit 319081cbf6
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/msi/action.c
View file

@ -5649,8 +5649,10 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
SC_HANDLE scm = NULL, service = NULL;
LPCWSTR component, *vector = NULL;
LPWSTR name, args, display_name = NULL;
DWORD event, numargs, len;
DWORD event, numargs, len, wait, dummy;
UINT r = ERROR_FUNCTION_FAILED;
SERVICE_STATUS_PROCESS status;
ULONGLONG start_time;
component = MSI_RecordGetString(rec, 6);
comp = msi_get_loaded_component(package, component);
@ -5667,6 +5669,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
deformat_string(package, MSI_RecordGetString(rec, 2), &name);
deformat_string(package, MSI_RecordGetString(rec, 4), &args);
event = MSI_RecordGetInteger(rec, 3);
wait = MSI_RecordGetInteger(rec, 5);
if (!(event & msidbServiceControlEventStart))
{
@ -5689,7 +5692,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
GetServiceDisplayNameW( scm, name, display_name, &len );
}
service = OpenServiceW(scm, name, SERVICE_START);
service = OpenServiceW(scm, name, SERVICE_START|SERVICE_QUERY_STATUS);
if (!service)
{
ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError());
@ -5706,6 +5709,33 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param)
}
r = ERROR_SUCCESS;
if (wait)
{
/* wait for at most 30 seconds for the service to be up and running */
if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO,
(BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy))
{
TRACE("failed to query service status (%u)\n", GetLastError());
goto done;
}
start_time = GetTickCount64();
while (status.dwCurrentState == SERVICE_START_PENDING)
{
if (GetTickCount64() - start_time > 30000) break;
Sleep(1000);
if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO,
(BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy))
{
TRACE("failed to query service status (%u)\n", GetLastError());
goto done;
}
}
if (status.dwCurrentState != SERVICE_RUNNING)
{
WARN("service failed to start %u\n", status.dwCurrentState);
r = ERROR_FUNCTION_FAILED;
}
}
done:
uirow = MSI_CreateRecord( 2 );