Remove an unnecessary level of indent.
This commit is contained in:
parent
9c1cfe79ba
commit
1228ce2684
|
@ -865,39 +865,37 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature)
|
||||||
|
|
||||||
if (!component->Enabled)
|
if (!component->Enabled)
|
||||||
continue;
|
continue;
|
||||||
else
|
|
||||||
|
if (newstate == INSTALLSTATE_LOCAL)
|
||||||
{
|
{
|
||||||
if (newstate == INSTALLSTATE_LOCAL)
|
component->ActionRequest = INSTALLSTATE_LOCAL;
|
||||||
{
|
component->Action = INSTALLSTATE_LOCAL;
|
||||||
component->ActionRequest = INSTALLSTATE_LOCAL;
|
}
|
||||||
component->Action = INSTALLSTATE_LOCAL;
|
else
|
||||||
}
|
{
|
||||||
else
|
ComponentList *clist;
|
||||||
{
|
MSIFEATURE *f;
|
||||||
ComponentList *clist;
|
|
||||||
MSIFEATURE *f;
|
|
||||||
|
|
||||||
component->ActionRequest = newstate;
|
component->ActionRequest = newstate;
|
||||||
component->Action = newstate;
|
component->Action = newstate;
|
||||||
|
|
||||||
/*if any other feature wants is local we need to set it local*/
|
/*if any other feature wants is local we need to set it local*/
|
||||||
LIST_FOR_EACH_ENTRY( f, &package->features, MSIFEATURE, entry )
|
LIST_FOR_EACH_ENTRY( f, &package->features, MSIFEATURE, entry )
|
||||||
|
{
|
||||||
|
if ( component->ActionRequest != INSTALLSTATE_LOCAL )
|
||||||
|
break;
|
||||||
|
|
||||||
|
LIST_FOR_EACH_ENTRY( clist, &f->Components, ComponentList, entry )
|
||||||
{
|
{
|
||||||
if ( component->ActionRequest != INSTALLSTATE_LOCAL )
|
if ( clist->component == component )
|
||||||
break;
|
|
||||||
|
|
||||||
LIST_FOR_EACH_ENTRY( clist, &f->Components, ComponentList, entry )
|
|
||||||
{
|
{
|
||||||
if ( clist->component == component )
|
if (f->ActionRequest == INSTALLSTATE_LOCAL)
|
||||||
{
|
{
|
||||||
if (f->ActionRequest == INSTALLSTATE_LOCAL)
|
TRACE("Saved by %s\n", debugstr_w(f->Feature));
|
||||||
{
|
component->ActionRequest = INSTALLSTATE_LOCAL;
|
||||||
TRACE("Saved by %s\n", debugstr_w(f->Feature));
|
component->Action = INSTALLSTATE_LOCAL;
|
||||||
component->ActionRequest = INSTALLSTATE_LOCAL;
|
|
||||||
component->Action = INSTALLSTATE_LOCAL;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -930,7 +928,7 @@ UINT register_unique_action(MSIPACKAGE *package, LPCWSTR action)
|
||||||
newbuf[count] = strdupW(action);
|
newbuf[count] = strdupW(action);
|
||||||
package->script->UniqueActions = newbuf;
|
package->script->UniqueActions = newbuf;
|
||||||
|
|
||||||
return ERROR_SUCCESS;
|
return ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL check_unique_action(MSIPACKAGE *package, LPCWSTR action)
|
BOOL check_unique_action(MSIPACKAGE *package, LPCWSTR action)
|
||||||
|
|
Loading…
Reference in New Issue