Hans Leidekker : msi: Set the action taken in the ProcessComponents and InstallFiles actions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 27e90274b52fa560994614b84075a2dab17f8cb3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=27e90274b52fa560994614b840...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue Mar 23 11:46:24 2010 +0100

msi: Set the action taken in the ProcessComponents and InstallFiles actions.

---

 dlls/msi/action.c |    1 +
 dlls/msi/files.c  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 0d0e333..028b4f0 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2993,6 +2993,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package)
             else
                 MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL);
         }
+        comp->Action = comp->ActionRequest;
 
         /* UI stuff */
         uirow = MSI_CreateRecord(3);
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 4050163..bb5b197 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -98,6 +98,8 @@ static void schedule_install_files(MSIPACKAGE *package)
             ui_progress(package,2,file->FileSize,0,0);
             file->state = msifs_skipped;
         }
+        else
+            file->Component->Action = INSTALLSTATE_LOCAL;
     }
 }