msi: Don't set the Preselected property for a full reinstall.

Hans Leidekker hans at codeweavers.com
Tue Dec 11 07:04:16 CST 2012


Fixes http://bugs.winehq.org/show_bug.cgi?id=32387
---
 dlls/msi/action.c  |    3 ++-
 dlls/msi/msipriv.h |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 076d1b3..babf0f0 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1784,7 +1784,7 @@ static BOOL process_overrides( MSIPACKAGE *package, int level )
     ret |= process_state_property( package, level, szReinstall, INSTALLSTATE_UNKNOWN );
     ret |= process_state_property( package, level, szAdvertise, INSTALLSTATE_ADVERTISED );
 
-    if (ret)
+    if (ret && !package->full_reinstall)
         msi_set_property( package->db, szPreselected, szOne, -1 );
 
     return ret;
@@ -7785,6 +7785,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
     {
         TRACE("setting REINSTALL property to ALL\n");
         msi_set_property( package->db, szReinstall, szAll, -1 );
+        package->full_reinstall = 1;
     }
 
     /* properties may have been added by a transform */
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 4110ec6..c7a42cb 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -414,6 +414,7 @@ typedef struct tagMSIPACKAGE
     unsigned char need_reboot_at_end : 1;
     unsigned char need_reboot_now : 1;
     unsigned char need_rollback : 1;
+    unsigned char full_reinstall : 1;
 } MSIPACKAGE;
 
 typedef struct tagMSIPREVIEW
-- 
1.7.10.4






More information about the wine-patches mailing list