commit 9c8458514cbafa83e79a6742584267204ed2e701
author Mike McCormack <mike@codeweavers.com> Sat Oct 29 11:29:17 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Oct 29 11:29:17 2005 +0000
tree da9e4a6f204e29f194f6797748de606b0053a03e
parent c2584306435ba0003c2971262276ae32ffa1afd5

Some installers don't call the CreateFolders action before the
InstallFiles action as MSDN specifies, but it still seems to work, so
make sure that we create component directories in the InstallFiles
action anyway.

dlls/msi/action.c

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 7ac9b10..e0fc0cb 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1074,6 +1074,21 @@
     return rc;
 }
 
+UINT msi_create_component_directories( MSIPACKAGE *package )
+{
+    MSICOMPONENT *comp;
+
+    /* create all the folders required by the components are going to install */
+    LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry )
+    {
+        if (!ACTION_VerifyComponentForAction(package, comp, INSTALLSTATE_LOCAL))
+            continue;
+        msi_create_directory( package, comp->Directory );
+    }
+
+    return ERROR_SUCCESS;
+}
+
 /*
  * Also we cannot enable/disable components either, so for now I am just going 
  * to do all the directories for all the components.
@@ -1087,7 +1102,6 @@
          '`','C','r','e','a','t','e','F','o','l','d','e','r','`',0 };
     UINT rc;
     MSIQUERY *view;
-    MSICOMPONENT *comp;
 
     /* create all the empty folders specified in the CreateFolder table */
     rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view );
@@ -1097,13 +1111,7 @@
     rc = MSI_IterateRecords(view, NULL, ITERATE_CreateFolders, package);
     msiobj_release(&view->hdr);
 
-    /* create all the folders required by the components are going to install */
-    LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry )
-    {
-        if (!ACTION_VerifyComponentForAction(package, comp, INSTALLSTATE_LOCAL))
-            continue;
-        msi_create_directory( package, comp->Directory );
-    }
+    msi_create_component_directories( package );
 
     return rc;
 }