Mike McCormack : msi: Check whether the component is enabled first.

[Alexandre Julliard]

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

Author: Mike McCormack 
Date:   Fri Nov 10 15:38:51 2006 +0900

msi: Check whether the component is enabled first.

---

dlls/msi/action.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index f5e75b3..c518c57 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1800,6 +1800,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa
         {
             component = cl->component;

+            if (!component->Enabled)
+                continue;
+
             if (component->Attributes & msidbComponentAttributesOptional)
                 msi_component_set_state( component, INSTALLSTATE_DEFAULT );
             else
@@ -1813,9 +1816,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa
             if (component->ForceLocalState)
                 msi_component_set_state( component, INSTALLSTATE_LOCAL );

-            if (!component->Enabled)
-                msi_component_set_state( component, INSTALLSTATE_UNKNOWN );
-            else if (feature->Attributes == msidbFeatureAttributesFavorLocal)
+            if (feature->Attributes == msidbFeatureAttributesFavorLocal)
             {
                 if (!(component->Attributes & msidbComponentAttributesSourceOnly))
                     msi_component_set_state( component, INSTALLSTATE_LOCAL );