Module: wine Branch: master Commit: bfe5e58d3a3e3e829fa1dd5a08c874dc8744bc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe5e58d3a3e3e829fa1dd5a08...
Author: Hans Leidekker hans@codeweavers.com Date: Fri Feb 15 16:45:04 2013 +0100
msi: Don't remove products if msidbUpgradeAttributesOnlyDetect is set.
---
dlls/msi/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5abe040..d48ecdd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7260,12 +7260,14 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); + int attrs = MSI_RecordGetInteger( rec, 5 ); UINT len = sizeof(fmtW)/sizeof(fmtW[0]); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL ret;
+ if (attrs & msidbUpgradeAttributesOnlyDetect) return ERROR_SUCCESS; if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS;
deformat_string( package, MSI_RecordGetString( rec, 6 ), &features );