Piotr Caban : msi: Don' t check feature install level on features specified in arguments.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Thu Jul 24 12:35:37 2014 +0200

msi: Don't check feature install level on features specified in arguments.

---

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

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 9dc804c..41f367b 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1675,7 +1675,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level,
 
     LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry )
     {
-        if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level ))
+        if (feature->Level <= 0)
             continue;
 
         if (reinstall)
@@ -1838,6 +1838,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
         {
             FeatureList *fl;
 
+            if (!is_feature_selected( feature, level )) continue;
+
             LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry )
             {
                 if (fl->feature->Attributes & msidbFeatureAttributesFollowParent &&
@@ -1862,8 +1864,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
               debugstr_w(feature->Feature), feature->Level, feature->Installed,
               feature->ActionRequest, feature->Action);
 
-        if (!is_feature_selected( feature, level )) continue;
-
         /* features with components that have compressed files are made local */
         LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry )
         {