Hans Leidekker : msi: Install global assemblies before running deferred custom actions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7f0ca9c284d15d03f14a8fefefac834990d622cd
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7f0ca9c284d15d03f14a8fefefac834...

Author: Hans Leidekker 
Date:   Fri Apr  5 09:22:06 2024 +0200

msi: Install global assemblies before running deferred custom actions.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56493

---

dlls/msi/action.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 06f399223f4..e3c7c23b2bd 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -5139,16 +5139,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
     MSIFILE *file;
     MSIFILEPATCH *patch;

-    /* first do the same as an InstallExecute */
-    rc = execute_script(package, SCRIPT_INSTALL);
-    if (rc != ERROR_SUCCESS)
-        return rc;
-
-    /* then handle commit actions */
-    rc = execute_script(package, SCRIPT_COMMIT);
-    if (rc != ERROR_SUCCESS)
-        return rc;
-
     /* install global assemblies */
     LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
     {
@@ -5187,6 +5177,16 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
         }
     }

+    /* first do the same as an InstallExecute */
+    rc = execute_script(package, SCRIPT_INSTALL);
+    if (rc != ERROR_SUCCESS)
+        return rc;
+
+    /* then handle commit actions */
+    rc = execute_script(package, SCRIPT_COMMIT);
+    if (rc != ERROR_SUCCESS)
+        return rc;
+
     if (is_full_uninstall(package))
         rc = ACTION_UnpublishProduct(package);