Hans Leidekker : msi: Don' t set the REINSTALL property if the product will be patched.
Alexandre Julliard
julliard at winehq.org
Mon Nov 19 13:38:38 CST 2012
Module: wine
Branch: master
Commit: ed4ce217d3fef4446fcb7a2108056953bf21cefb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4ce217d3fef4446fcb7a2108056953bf21cefb
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Nov 19 15:49:02 2012 +0100
msi: Don't set the REINSTALL property if the product will be patched.
---
dlls/msi/action.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 246b90c..076d1b3 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -7727,7 +7727,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0};
static const WCHAR szAction[] = {'A','C','T','I','O','N',0};
static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0};
- WCHAR *reinstall, *remove;
+ WCHAR *reinstall, *remove, *patch;
BOOL ui_exists;
UINT rc;
@@ -7778,9 +7778,10 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
msi_apply_transforms( package );
msi_apply_patches( package );
+ patch = msi_dup_property( package->db, szPatch );
remove = msi_dup_property( package->db, szRemove );
reinstall = msi_dup_property( package->db, szReinstall );
- if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall)
+ if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall && !patch)
{
TRACE("setting REINSTALL property to ALL\n");
msi_set_property( package->db, szReinstall, szAll, -1 );
@@ -7841,6 +7842,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
}
msi_free( reinstall );
msi_free( remove );
+ msi_free( patch );
if (rc == ERROR_SUCCESS && package->need_reboot_at_end)
return ERROR_SUCCESS_REBOOT_REQUIRED;
More information about the wine-cvs
mailing list