msi: MsiGet/SetFeatureState must get and set the requested feature action, not the action taken.
This commit is contained in:
parent
d2ee7aa790
commit
9ae062f63e
|
@ -821,7 +821,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature,
|
||||||
feature->Attributes & msidbFeatureAttributesDisallowAdvertise)
|
feature->Attributes & msidbFeatureAttributesDisallowAdvertise)
|
||||||
return ERROR_FUNCTION_FAILED;
|
return ERROR_FUNCTION_FAILED;
|
||||||
|
|
||||||
msi_feature_set_state(package, feature, iState);
|
feature->ActionRequest = iState;
|
||||||
|
|
||||||
ACTION_UpdateComponentStates(package,szFeature);
|
ACTION_UpdateComponentStates(package,szFeature);
|
||||||
|
|
||||||
|
@ -917,9 +917,9 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature,
|
||||||
*piInstalled = feature->Installed;
|
*piInstalled = feature->Installed;
|
||||||
|
|
||||||
if (piAction)
|
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;
|
return ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue