Rename fUninstallable to fPermanent.

Refactoring for #6459

10 files changed, 17 insertions, 17 deletions

diff --git a/src/burn/engine/bundlepackageengine.cpp b/src/burn/engine/bundlepackageengine.cpp
index 10022b6a..ece0fc3a 100644
--- a/src/burn/engine/bundlepackageengine.cpp
+++ b/src/burn/engine/bundlepackageengine.cpp
@@ -55,7 +55,7 @@ extern "C" HRESULT BundlePackageEnginePlanCalculatePackage(
             break;
         case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
         case BOOTSTRAPPER_REQUEST_STATE_CACHE:
-            execute = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+            execute = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
             break;
         case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
             execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
@@ -111,7 +111,7 @@ extern "C" HRESULT BundlePackageEnginePlanCalculatePackage(
             {
             case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
             case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
-                rollback = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+                rollback = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
                 break;
             case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: __fallthrough;
             case BOOTSTRAPPER_REQUEST_STATE_ABSENT:
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp
index 27844c69..7a36f882 100644
--- a/src/burn/engine/exeengine.cpp
+++ b/src/burn/engine/exeengine.cpp
@@ -169,7 +169,7 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
             break;
         case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
         case BOOTSTRAPPER_REQUEST_STATE_CACHE:
-            execute = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+            execute = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
             break;
         case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
             execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
@@ -225,7 +225,7 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
             {
             case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
             case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
-                rollback = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+                rollback = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
                 break;
             case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: __fallthrough;
             case BOOTSTRAPPER_REQUEST_STATE_ABSENT:
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index 68582d29..9dd2312e 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -912,7 +912,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
             }
         }
         else if ((BOOTSTRAPPER_REQUEST_STATE_ABSENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_CACHE == pPackage->requested) &&
-                 pPackage->fUninstallable) // removing a package that can be removed.
+                 !pPackage->fPermanent) // removing a package that should be removed.
         {
             execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
         }
@@ -973,9 +973,9 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
 
         case BOOTSTRAPPER_PACKAGE_STATE_OBSOLETE: __fallthrough;
         case BOOTSTRAPPER_PACKAGE_STATE_ABSENT: __fallthrough;
-            // If the package is uninstallable and we requested to put the package on the machine then
+            // If the package is not permanent and we requested to put the package on the machine then
             // remove the package during rollback.
-            if (pPackage->fUninstallable &&
+            if (!pPackage->fPermanent &&
                 (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested ||
                  BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested))
             {
diff --git a/src/burn/engine/mspengine.cpp b/src/burn/engine/mspengine.cpp
index 85eb1536..bc6a482a 100644
--- a/src/burn/engine/mspengine.cpp
+++ b/src/burn/engine/mspengine.cpp
@@ -397,7 +397,7 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
 
             case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
             case BOOTSTRAPPER_REQUEST_STATE_CACHE:
-                execute = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+                execute = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
                 break;
 
             case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
@@ -458,7 +458,7 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
                 {
                 case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
                 case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
-                    rollback = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+                    rollback = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
                     break;
 
                 default:
diff --git a/src/burn/engine/msuengine.cpp b/src/burn/engine/msuengine.cpp
index 4f5f2cd4..4db425be 100644
--- a/src/burn/engine/msuengine.cpp
+++ b/src/burn/engine/msuengine.cpp
@@ -110,7 +110,7 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage(
 
         case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
         case BOOTSTRAPPER_REQUEST_STATE_CACHE:
-            execute = fAllowUninstall && pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
+            execute = fAllowUninstall && !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
             break;
 
         case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
diff --git a/src/burn/engine/package.cpp b/src/burn/engine/package.cpp
index d9f92d3d..20b728f4 100644
--- a/src/burn/engine/package.cpp
+++ b/src/burn/engine/package.cpp
@@ -159,10 +159,9 @@ extern "C" HRESULT PackagesParseFromXml(
         ExitOnRequiredXmlQueryFailure(hr, "Failed to get @PerMachine.");
 
         // @Permanent
-        hr = XmlGetYesNoAttribute(pixnNode, L"Permanent", &pPackage->fUninstallable);
+        hr = XmlGetYesNoAttribute(pixnNode, L"Permanent", &pPackage->fPermanent);
         ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Permanent.");
-        pPackage->fUninstallable = !pPackage->fUninstallable; // TODO: change "Uninstallable" variable name to permanent, until then Uninstallable is the opposite of Permanent so fix the variable.
-        pPackage->fCanAffectRegistration = pPackage->fUninstallable;
+        pPackage->fCanAffectRegistration = !pPackage->fPermanent;
 
         // @Vital
         hr = XmlGetYesNoAttribute(pixnNode, L"Vital", &pPackage->fVital);
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index 934355e1..5a7aefa3 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -244,7 +244,7 @@ typedef struct _BURN_PACKAGE
 
     LPWSTR sczInstallCondition;
     BOOL fPerMachine;
-    BOOL fUninstallable;
+    BOOL fPermanent;
     BOOL fVital;
     BOOL fCanAffectRegistration;
 
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index 1dd78773..b714aab8 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -880,7 +880,7 @@ static HRESULT InitializePackage(
     }
 
     // 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, !pPackage->fUninstallable, pPlan->action, installCondition, relationType, &pPackage->defaultRequested);
+    hr = PlanDefaultPackageRequestState(pPackage->type, pPackage->currentState, pPackage->fPermanent, pPlan->action, installCondition, relationType, &pPackage->defaultRequested);
     ExitOnFailure(hr, "Failed to set default package state.");
 
     pPackage->requested = pPackage->defaultRequested;
diff --git a/src/burn/engine/pseudobundle.cpp b/src/burn/engine/pseudobundle.cpp
index 7b670035..b343f810 100644
--- a/src/burn/engine/pseudobundle.cpp
+++ b/src/burn/engine/pseudobundle.cpp
@@ -50,7 +50,7 @@ extern "C" HRESULT PseudoBundleInitializeRelated(
     pPackage->qwSize = qwSize;
     pPackage->fVital = FALSE;
 
-    pPackage->fUninstallable = TRUE;
+    pPackage->fPermanent = FALSE;
     pPackage->Bundle.fPseudoBundle = TRUE;
     pPackage->Bundle.fRepairable = TRUE;
     pPackage->Bundle.fSupportsBurnProtocol = fSupportsBurnProtocol;
@@ -112,6 +112,7 @@ extern "C" HRESULT PseudoBundleInitializePassthrough(
     pPassthroughPackage->qwInstallSize = pPackage->qwInstallSize;
     pPassthroughPackage->qwSize = pPackage->qwSize;
     pPassthroughPackage->fVital = pPackage->fVital;
+    pPassthroughPackage->fPermanent = TRUE;
 
     pPassthroughPackage->Exe.fPseudoBundle = TRUE;
     pPassthroughPackage->Exe.protocol = pPackage->Bundle.fSupportsBurnProtocol ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE;
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp
index fc2b8472..281c32e0 100644
--- a/src/burn/test/BurnUnitTest/PlanTest.cpp
+++ b/src/burn/test/BurnUnitTest/PlanTest.cpp
@@ -1207,7 +1207,7 @@ namespace Bootstrapper
             for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i)
             {
                 BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i;
-                if (pPackage->fUninstallable)
+                if (!pPackage->fPermanent)
                 {
                     DetectPackageAsAbsent(pPackage);
                 }