Hans Leidekker : msi: Look at the requested action instead of the action taken in MSI_SetFeatureStates .
Alexandre Julliard
julliard at winehq.org
Wed Oct 6 14:04:17 CDT 2010
Module: wine
Branch: master
Commit: 85874c07b90986551a46f8c674e77887084e4924
URL: http://source.winehq.org/git/wine.git/?a=commit;h=85874c07b90986551a46f8c674e77887084e4924
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Oct 6 15:44:54 2010 +0200
msi: Look at the requested action instead of the action taken in MSI_SetFeatureStates.
---
dlls/msi/action.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index b17c074..4cebbea 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1785,7 +1785,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
BOOL feature_state = ((feature->Level > 0) &&
(feature->Level <= level));
- if ((feature_state) && (feature->Action == INSTALLSTATE_UNKNOWN))
+ if (feature_state && feature->ActionRequest == INSTALLSTATE_UNKNOWN)
{
if (feature->Attributes & msidbFeatureAttributesFavorSource)
msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE);
@@ -1814,7 +1814,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
{
BOOL selected = feature->Level > 0 && feature->Level <= level;
- if (selected && feature->Action == INSTALLSTATE_UNKNOWN)
+ if (selected && feature->ActionRequest == INSTALLSTATE_UNKNOWN)
{
msi_feature_set_state(package, feature, feature->Installed);
}
@@ -1839,7 +1839,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry )
{
if (cl->component->ForceLocalState &&
- feature->Action == INSTALLSTATE_SOURCE)
+ feature->ActionRequest == INSTALLSTATE_SOURCE)
{
msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL);
break;
@@ -1850,7 +1850,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
{
component = cl->component;
- switch (feature->Action)
+ switch (feature->ActionRequest)
{
case INSTALLSTATE_ABSENT:
component->anyAbsent = 1;
More information about the wine-cvs
mailing list