Hans Leidekker : msi: Install assemblies only if the component action request is set to INSTALLSTATE_LOCAL .

Alexandre Julliard julliard at winehq.org
Thu Nov 18 11:09:29 CST 2010


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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Thu Nov 18 12:08:37 2010 +0100

msi: Install assemblies only if the component action request is set to INSTALLSTATE_LOCAL.

---

 dlls/msi/files.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 9aeaaf3..182e027 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -293,7 +293,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
     }
     LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry )
     {
-        if (comp->Enabled && comp->assembly && !comp->assembly->installed)
+        if (comp->ActionRequest == INSTALLSTATE_LOCAL && comp->Enabled &&
+            comp->assembly && !comp->assembly->installed)
         {
             rc = install_assembly( package, comp );
             if (rc != ERROR_SUCCESS)




More information about the wine-cvs mailing list