Mike McCormack : msi: Simplify ACTION_FinishCustomActions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5927015726907075b2f0da30edd358ded3150377
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5927015726907075b2f0da30ed...

Author: Mike McCormack 
Date:   Mon Feb 12 11:30:43 2007 +0900

msi: Simplify ACTION_FinishCustomActions.

---

dlls/msi/custom.c |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index fd6bae6..4cb21fd 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -789,30 +789,18 @@ static UINT HANDLE_CustomType34(MSIPACKA
     return wait_process_handle(package, type, info.hProcess, action);
 }

-
 void ACTION_FinishCustomActions(MSIPACKAGE* package)
 {
-    struct list *item, *cursor;
-    DWORD rc;
+    struct list *item;

-    LIST_FOR_EACH_SAFE( item, cursor, &package->RunningActions )
+    while ((item = list_head( &package->RunningActions )))
     {
         MSIRUNNINGACTION *action = LIST_ENTRY( item, MSIRUNNINGACTION, entry );

-        TRACE("Checking on action %s\n", debugstr_w(action->name));
-
         list_remove( &action->entry );

-        if (action->process)
-            GetExitCodeProcess( action->handle, &rc );
-        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 );
-        }
+        TRACE("waiting for %s\n", debugstr_w( action->name ) );
+        msi_dialog_check_messages( action->handle );

CloseHandle( action->handle );
         msi_free( action->name );