Hans Leidekker : msi: Install global assemblies after install custom actions and before commit custom actions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 27f5470ff4c20121b9eacd702c888400191c7d9e
URL:    https://gitlab.winehq.org/wine/wine/-/commit/27f5470ff4c20121b9eacd702c88840...

Author: Hans Leidekker 
Date:   Sun Apr 28 12:39:51 2024 +0200

msi: Install global assemblies after install custom actions and before commit custom actions.

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

---

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

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index e3c7c23b2bd..17f9db0c73a 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -5139,6 +5139,11 @@ 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;
+
     /* install global assemblies */
     LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
     {
@@ -5177,11 +5182,6 @@ 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)