James Hawkins : msi: Factor schedule_install_files out of ACTION_InstallFiles.

[Alexandre Julliard]

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

Author: James Hawkins 
Date:   Tue Nov  7 15:11:26 2006 -0800

msi: Factor schedule_install_files out of ACTION_InstallFiles.

---

dlls/msi/files.c |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 3359dc1..deda59f 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -581,6 +581,22 @@ static UINT get_file_target(MSIPACKAGE *
     return ERROR_FUNCTION_FAILED;
 }

+static void schedule_install_files(MSIPACKAGE *package)
+{
+    MSIFILE *file;
+
+    LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry)
+    {
+        if (!ACTION_VerifyComponentForAction(file->Component, INSTALLSTATE_LOCAL))
+        {
+            TRACE("File %s is not scheduled for install\n", debugstr_w(file->File));
+
+            ui_progress(package,2,file->FileSize,0,0);
+            file->state = msifs_skipped;
+        }
+    }
+}
+
 /*
  * ACTION_InstallFiles()
  * 
@@ -608,20 +624,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac
                 MSICODE_PRODUCT,
                 INSTALLPROPERTY_PACKAGENAMEW, ptr);
     }
-    /* FIXME("Write DiskPrompt\n"); */
-    
-    /* Pass 1 */
-    LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
-    {
-        if (!ACTION_VerifyComponentForAction( file->Component, INSTALLSTATE_LOCAL ))
-        {
-            ui_progress(package,2,file->FileSize,0,0);
-            TRACE("File %s is not scheduled for install\n",
-                   debugstr_w(file->File));

-            file->state = msifs_skipped;
-        }
-    }
+    schedule_install_files(package);

/*
      * Despite MSDN specifying that the CreateFolders action