Hans Leidekker : msi: MsiGet/ SetFeatureState must get and set the requested feature action, not the action taken.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9ae062f63e58a175641bd10b69603aa0edc47ec2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9ae062f63e58a175641bd10b69...

Author: Hans Leidekker 
Date:   Thu Nov 11 10:44:37 2010 +0100

msi: MsiGet/SetFeatureState must get and set the requested feature action, not the action taken.

---

dlls/msi/install.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 730e27e..9463a52 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -821,7 +821,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature,
         feature->Attributes & msidbFeatureAttributesDisallowAdvertise)
         return ERROR_FUNCTION_FAILED;

-    msi_feature_set_state(package, feature, iState);
+    feature->ActionRequest = iState;

ACTION_UpdateComponentStates(package,szFeature);

@@ -917,9 +917,9 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature,
         *piInstalled = feature->Installed;

if (piAction)
-        *piAction = feature->Action;
+        *piAction = feature->ActionRequest;

-    TRACE("returning %i %i\n", feature->Installed, feature->Action);
+    TRACE("returning %i %i\n", feature->Installed, feature->ActionRequest);

return ERROR_SUCCESS;
 }