Hans Leidekker : msi: Only set the property in the Reinstall event.
Alexandre Julliard
julliard at winehq.org
Wed Apr 28 16:35:50 CDT 2010
Module: wine
Branch: master
Commit: d9510f5962560a122e3ac93073c32a7d0ee8be85
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9510f5962560a122e3ac93073c32a7d0ee8be85
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue Apr 27 13:29:31 2010 +0200
msi: Only set the property in the Reinstall event.
---
dlls/msi/events.c | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/dlls/msi/events.c b/dlls/msi/events.c
index 190fea3..4ed395b 100644
--- a/dlls/msi/events.c
+++ b/dlls/msi/events.c
@@ -386,19 +386,7 @@ static UINT ControlEvent_ReinstallMode(MSIPACKAGE *package, LPCWSTR argument,
static UINT ControlEvent_Reinstall( MSIPACKAGE *package, LPCWSTR argument,
msi_dialog *dialog )
{
- static const WCHAR szReinstallEq[] = {'R','E','I','N','S','T','A','L','L','=',0};
- UINT r = ERROR_OUTOFMEMORY;
- WCHAR *cmd;
-
- cmd = msi_alloc( (strlenW( szReinstallEq ) + strlenW( argument ) + 1) * sizeof(WCHAR) );
- if (cmd)
- {
- strcpyW( cmd, szReinstallEq );
- strcatW( cmd, argument );
- r = MsiConfigureProductExW( package->ProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd );
- msi_free( cmd );
- }
- return r;
+ return msi_set_property( package->db, szReinstall, argument );
}
static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument,
More information about the wine-cvs
mailing list