Commit 1533cab3 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit 10.0.3 upon wine-1.3.9

parent 295a590b
......@@ -1754,8 +1754,7 @@ static void ACTION_GetComponentInstallStates(MSIPACKAGE *package)
LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry)
{
if (!comp->Enabled || !comp->ComponentId)
continue;
if (!comp->ComponentId) continue;
if (state != INSTALLSTATE_LOCAL && state != INSTALLSTATE_DEFAULT)
comp->Installed = INSTALLSTATE_ABSENT;
......@@ -1949,8 +1948,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
/* features with components that have compressed files are made local */
LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry )
{
if (!cl->component->Enabled) continue;
if (cl->component->ForceLocalState &&
feature->ActionRequest == INSTALLSTATE_SOURCE)
{
......@@ -1963,8 +1960,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
{
component = cl->component;
if (!component->Enabled) continue;
switch (feature->ActionRequest)
{
case INSTALLSTATE_ABSENT:
......@@ -1995,8 +1990,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry )
{
if (!component->Enabled) continue;
/* check if it's local or source */
if (!(component->Attributes & msidbComponentAttributesOptional) &&
(component->hasLocalFeature || component->hasSourceFeature))
......@@ -2035,8 +2028,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package)
LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry )
{
if (!component->Enabled) continue;
if (component->ActionRequest == INSTALLSTATE_DEFAULT)
{
TRACE("%s was default, setting to local\n", debugstr_w(component->Component));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment