Add RepairCondition.

Fixes 6758

6 files changed, 29 insertions, 5 deletions

diff --git a/src/burn/engine/package.cpp b/src/burn/engine/package.cpp
index 89203ada..88e7cb9d 100644
--- a/src/burn/engine/package.cpp
+++ b/src/burn/engine/package.cpp
@@ -178,6 +178,10 @@ extern "C" HRESULT PackagesParseFromXml(
         hr = XmlGetAttributeEx(pixnNode, L"InstallCondition", &pPackage->sczInstallCondition);
         ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @InstallCondition.");
 
+        // @RepairCondition
+        hr = XmlGetAttributeEx(pixnNode, L"RepairCondition", &pPackage->sczRepairCondition);
+        ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @RepairCondition.");
+
         // @RollbackBoundaryForward
         hr = XmlGetAttributeEx(pixnNode, L"RollbackBoundaryForward", &scz);
         ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @RollbackBoundaryForward.");
@@ -362,6 +366,7 @@ extern "C" void PackageUninitialize(
     ReleaseStr(pPackage->sczLogPathVariable);
     ReleaseStr(pPackage->sczRollbackLogPathVariable);
     ReleaseStr(pPackage->sczInstallCondition);
+    ReleaseStr(pPackage->sczRepairCondition);
     ReleaseStr(pPackage->sczCacheId);
 
     if (pPackage->rgDependencyProviders)
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index eb8e7543..3ec77baf 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -250,6 +250,7 @@ typedef struct _BURN_PACKAGE
     LPWSTR sczRollbackLogPathVariable;  // name of the variable that will be set to the rollback path.
 
     LPWSTR sczInstallCondition;
+    LPWSTR sczRepairCondition;
     BOOL fPerMachine;
     BOOL fPermanent;
     BOOL fVital;
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index 2c267415..47da22c0 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -347,6 +347,7 @@ extern "C" HRESULT PlanDefaultPackageRequestState(
     __in BOOTSTRAPPER_PACKAGE_STATE currentState,
     __in BOOTSTRAPPER_ACTION action,
     __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
+    __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __out BOOTSTRAPPER_REQUEST_STATE* pRequestState
     )
@@ -408,6 +409,10 @@ extern "C" HRESULT PlanDefaultPackageRequestState(
             {
                 defaultRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT <= defaultRequestState ? BOOTSTRAPPER_REQUEST_STATE_NONE : defaultRequestState;
             }
+            else if (BOOTSTRAPPER_ACTION_REPAIR == action && BOOTSTRAPPER_PACKAGE_CONDITION_FALSE == repairCondition)
+            {
+                defaultRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT;
+            }
         }
 
         *pRequestState = defaultRequestState;
@@ -905,7 +910,8 @@ static HRESULT InitializePackage(
 {
     HRESULT hr = S_OK;
     BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition = BOOTSTRAPPER_PACKAGE_CONDITION_DEFAULT;
-    BOOL fInstallCondition = FALSE;
+    BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition = BOOTSTRAPPER_PACKAGE_CONDITION_DEFAULT;
+    BOOL fEvaluatedCondition = FALSE;
     BOOL fBeginCalled = FALSE;
     BOOTSTRAPPER_RELATION_TYPE relationType = pPlan->pCommand->relationType;
 
@@ -927,20 +933,28 @@ static HRESULT InitializePackage(
 
     if (pPackage->sczInstallCondition && *pPackage->sczInstallCondition)
     {
-        hr = ConditionEvaluate(pVariables, pPackage->sczInstallCondition, &fInstallCondition);
+        hr = ConditionEvaluate(pVariables, pPackage->sczInstallCondition, &fEvaluatedCondition);
         ExitOnFailure(hr, "Failed to evaluate install condition.");
 
-        installCondition = fInstallCondition ? BOOTSTRAPPER_PACKAGE_CONDITION_TRUE : BOOTSTRAPPER_PACKAGE_CONDITION_FALSE;
+        installCondition = fEvaluatedCondition ? BOOTSTRAPPER_PACKAGE_CONDITION_TRUE : BOOTSTRAPPER_PACKAGE_CONDITION_FALSE;
+    }
+
+    if (pPackage->sczRepairCondition && *pPackage->sczRepairCondition)
+    {
+        hr = ConditionEvaluate(pVariables, pPackage->sczRepairCondition, &fEvaluatedCondition);
+        ExitOnFailure(hr, "Failed to evaluate repair condition.");
+
+        repairCondition = fEvaluatedCondition ? BOOTSTRAPPER_PACKAGE_CONDITION_TRUE : BOOTSTRAPPER_PACKAGE_CONDITION_FALSE;
     }
 
     // Remember the default requested state so the engine doesn't get blamed for planning the wrong thing if the BA changes it.
-    hr = PlanDefaultPackageRequestState(pPackage->type, pPackage->currentState, pPlan->action, installCondition, relationType, &pPackage->defaultRequested);
+    hr = PlanDefaultPackageRequestState(pPackage->type, pPackage->currentState, pPlan->action, installCondition, repairCondition, relationType, &pPackage->defaultRequested);
     ExitOnFailure(hr, "Failed to set default package state.");
 
     pPackage->requested = pPackage->defaultRequested;
     fBeginCalled = TRUE;
 
-    hr = UserExperienceOnPlanPackageBegin(pUX, pPackage->sczId, pPackage->currentState, pPackage->fCached, installCondition, &pPackage->requested, &pPackage->cacheType);
+    hr = UserExperienceOnPlanPackageBegin(pUX, pPackage->sczId, pPackage->currentState, pPackage->fCached, installCondition, repairCondition, &pPackage->requested, &pPackage->cacheType);
     ExitOnRootFailure(hr, "BA aborted plan package begin.");
 
     if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
diff --git a/src/burn/engine/plan.h b/src/burn/engine/plan.h
index 87214cc8..fbb7a5a1 100644
--- a/src/burn/engine/plan.h
+++ b/src/burn/engine/plan.h
@@ -342,6 +342,7 @@ HRESULT PlanDefaultPackageRequestState(
     __in BOOTSTRAPPER_PACKAGE_STATE currentState,
     __in BOOTSTRAPPER_ACTION action,
     __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
+    __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __out BOOTSTRAPPER_REQUEST_STATE* pRequestState
     );
diff --git a/src/burn/engine/userexperience.cpp b/src/burn/engine/userexperience.cpp
index a1a010d2..a3cbcd4a 100644
--- a/src/burn/engine/userexperience.cpp
+++ b/src/burn/engine/userexperience.cpp
@@ -2169,6 +2169,7 @@ EXTERN_C BAAPI UserExperienceOnPlanPackageBegin(
     __in BOOTSTRAPPER_PACKAGE_STATE state,
     __in BOOL fCached,
     __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
+    __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
     __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType
     )
@@ -2182,6 +2183,7 @@ EXTERN_C BAAPI UserExperienceOnPlanPackageBegin(
     args.state = state;
     args.fCached = fCached;
     args.installCondition = installCondition;
+    args.repairCondition = repairCondition;
     args.recommendedState = *pRequestedState;
     args.recommendedCacheType = *pRequestedCacheType;
 
diff --git a/src/burn/engine/userexperience.h b/src/burn/engine/userexperience.h
index 90a047ed..2059b521 100644
--- a/src/burn/engine/userexperience.h
+++ b/src/burn/engine/userexperience.h
@@ -501,6 +501,7 @@ BAAPI UserExperienceOnPlanPackageBegin(
     __in BOOTSTRAPPER_PACKAGE_STATE state,
     __in BOOL fCached,
     __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
+    __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
     __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType
     );