Commit 59270157 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

msi: Simplify ACTION_FinishCustomActions.

parent 5f1a1bbc
...@@ -789,30 +789,18 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, ...@@ -789,30 +789,18 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source,
return wait_process_handle(package, type, info.hProcess, action); return wait_process_handle(package, type, info.hProcess, action);
} }
void ACTION_FinishCustomActions(MSIPACKAGE* package) void ACTION_FinishCustomActions(MSIPACKAGE* package)
{ {
struct list *item, *cursor; struct list *item;
DWORD rc;
LIST_FOR_EACH_SAFE( item, cursor, &package->RunningActions ) while ((item = list_head( &package->RunningActions )))
{ {
MSIRUNNINGACTION *action = LIST_ENTRY( item, MSIRUNNINGACTION, entry ); MSIRUNNINGACTION *action = LIST_ENTRY( item, MSIRUNNINGACTION, entry );
TRACE("Checking on action %s\n", debugstr_w(action->name));
list_remove( &action->entry ); list_remove( &action->entry );
if (action->process) TRACE("waiting for %s\n", debugstr_w( action->name ) );
GetExitCodeProcess( action->handle, &rc ); msi_dialog_check_messages( action->handle );
else
GetExitCodeThread( action->handle, &rc );
if (rc == STILL_ACTIVE)
{
TRACE("Waiting on action %s\n", debugstr_w( action->name) );
msi_dialog_check_messages( action->handle );
}
CloseHandle( action->handle ); CloseHandle( action->handle );
msi_free( action->name ); msi_free( action->name );
......
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