Commit 27f5470f authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

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

parent a27b9551
...@@ -5139,6 +5139,11 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) ...@@ -5139,6 +5139,11 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
MSIFILE *file; MSIFILE *file;
MSIFILEPATCH *patch; MSIFILEPATCH *patch;
/* first do the same as an InstallExecute */
rc = execute_script(package, SCRIPT_INSTALL);
if (rc != ERROR_SUCCESS)
return rc;
/* install global assemblies */ /* install global assemblies */
LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )
{ {
...@@ -5177,11 +5182,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) ...@@ -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 */ /* then handle commit actions */
rc = execute_script(package, SCRIPT_COMMIT); rc = execute_script(package, SCRIPT_COMMIT);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment