Hans Leidekker : msi: Handle ADVERTISE overrides.
Alexandre Julliard
julliard at winehq.org
Fri Mar 13 09:14:00 CDT 2009
Module: wine
Branch: master
Commit: 4da865f324aacc722c04d0e42da10e4aca6e5460
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da865f324aacc722c04d0e42da10e4aca6e5460
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Mar 13 11:34:46 2009 +0100
msi: Handle ADVERTISE overrides.
---
dlls/msi/action.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index ba2e802..49f7298 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1841,6 +1841,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
{'R','E','M','O','V','E',0};
static const WCHAR szReinstall[] =
{'R','E','I','N','S','T','A','L','L',0};
+ static const WCHAR szAdvertise[] =
+ {'A','D','V','E','R','T','I','S','E',0};
BOOL override = FALSE;
MSICOMPONENT* component;
MSIFEATURE *feature;
@@ -1855,12 +1857,13 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
/* ok here is the _real_ rub
* all these activation/deactivation things happen in order and things
* later on the list override things earlier on the list.
- * 1) INSTALLLEVEL processing
- * 2) ADDLOCAL
- * 3) REMOVE
- * 4) ADDSOURCE
- * 5) ADDDEFAULT
- * 6) REINSTALL
+ * 0) INSTALLLEVEL processing
+ * 1) ADDLOCAL
+ * 2) REMOVE
+ * 3) ADDSOURCE
+ * 4) ADDDEFAULT
+ * 5) REINSTALL
+ * 6) ADVERTISE
* 7) COMPADDLOCAL
* 8) COMPADDSOURCE
* 9) FILEADDLOCAL
@@ -1875,6 +1878,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
override |= process_state_property(package, level, szRemove, INSTALLSTATE_ABSENT);
override |= process_state_property(package, level, szAddSource, INSTALLSTATE_SOURCE);
override |= process_state_property(package, level, szReinstall, INSTALLSTATE_UNKNOWN);
+ override |= process_state_property(package, level, szAdvertise, INSTALLSTATE_ADVERTISED);
if (!override)
{
More information about the wine-cvs
mailing list