Rename fUninstallable to fPermanent.
Refactoring for #6459
Sean Hall committed
Jan 16, 2022 at 10:59 UTC
934cacdc8fc7c35c94d3b1eee6cc8ab5c8a8ce4d
10 files changed
+17
-17
src/burn/engine/bundlepackageengine.cpp
+2
-2
@@ -55,7 +55,7 @@ extern "C" HRESULT BundlePackageEnginePlanCalculatePackage(
55
break;
56
case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
57
case BOOTSTRAPPER_REQUEST_STATE_CACHE:
58
- execute = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
58
+ execute = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
59
break;
60
case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
61
execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
@@ -111,7 +111,7 @@ extern "C" HRESULT BundlePackageEnginePlanCalculatePackage(
111
{
112
case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
113
case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
114
- rollback = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
114
+ rollback = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
115
break;
116
case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: __fallthrough;
117
case BOOTSTRAPPER_REQUEST_STATE_ABSENT:
src/burn/engine/exeengine.cpp
+2
-2
@@ -169,7 +169,7 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
169
break;
170
case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
171
case BOOTSTRAPPER_REQUEST_STATE_CACHE:
172
- execute = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
172
+ execute = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
173
break;
174
case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
175
execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
@@ -225,7 +225,7 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
225
{
226
case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
227
case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
228
- rollback = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
228
+ rollback = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
229
break;
230
case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: __fallthrough;
231
case BOOTSTRAPPER_REQUEST_STATE_ABSENT:
src/burn/engine/msiengine.cpp
+3
-3
@@ -912,7 +912,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
912
}
913
}
914
else if ((BOOTSTRAPPER_REQUEST_STATE_ABSENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_CACHE == pPackage->requested) &&
915
- pPackage->fUninstallable) // removing a package that can be removed.
915
+ !pPackage->fPermanent) // removing a package that should be removed.
916
{
917
execute = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
918
}
@@ -973,9 +973,9 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
973
974
case BOOTSTRAPPER_PACKAGE_STATE_OBSOLETE: __fallthrough;
975
case BOOTSTRAPPER_PACKAGE_STATE_ABSENT: __fallthrough;
976
- // If the package is uninstallable and we requested to put the package on the machine then
976
+ // If the package is not permanent and we requested to put the package on the machine then
977
// remove the package during rollback.
978
- if (pPackage->fUninstallable &&
978
+ if (!pPackage->fPermanent &&
979
(BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested ||
980
BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested))
981
{
src/burn/engine/mspengine.cpp
+2
-2
@@ -397,7 +397,7 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
397
398
case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
399
case BOOTSTRAPPER_REQUEST_STATE_CACHE:
400
- execute = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
400
+ execute = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
401
break;
402
403
case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
@@ -458,7 +458,7 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
458
{
459
case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
460
case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
461
- rollback = pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
461
+ rollback = !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
462
break;
463
464
default:
src/burn/engine/msuengine.cpp
+1
-1
@@ -110,7 +110,7 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage(
110
111
case BOOTSTRAPPER_REQUEST_STATE_ABSENT: __fallthrough;
112
case BOOTSTRAPPER_REQUEST_STATE_CACHE:
113
- execute = fAllowUninstall && pPackage->fUninstallable ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
113
+ execute = fAllowUninstall && !pPackage->fPermanent ? BOOTSTRAPPER_ACTION_STATE_UNINSTALL : BOOTSTRAPPER_ACTION_STATE_NONE;
114
break;
115
116
case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
src/burn/engine/package.cpp
+2
-3
@@ -159,10 +159,9 @@ extern "C" HRESULT PackagesParseFromXml(
159
ExitOnRequiredXmlQueryFailure(hr, "Failed to get @PerMachine.");
160
161
// @Permanent
162
- hr = XmlGetYesNoAttribute(pixnNode, L"Permanent", &pPackage->fUninstallable);
162
+ hr = XmlGetYesNoAttribute(pixnNode, L"Permanent", &pPackage->fPermanent);
163
ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Permanent.");
164
- pPackage->fUninstallable = !pPackage->fUninstallable; // TODO: change "Uninstallable" variable name to permanent, until then Uninstallable is the opposite of Permanent so fix the variable.
165
- pPackage->fCanAffectRegistration = pPackage->fUninstallable;
164
+ pPackage->fCanAffectRegistration = !pPackage->fPermanent;
165
166
// @Vital
167
hr = XmlGetYesNoAttribute(pixnNode, L"Vital", &pPackage->fVital);
src/burn/engine/package.h
+1
-1
@@ -244,7 +244,7 @@ typedef struct _BURN_PACKAGE
244
245
LPWSTR sczInstallCondition;
246
BOOL fPerMachine;
247
- BOOL fUninstallable;
247
+ BOOL fPermanent;
248
BOOL fVital;
249
BOOL fCanAffectRegistration;
250
src/burn/engine/plan.cpp
+1
-1
@@ -880,7 +880,7 @@ static HRESULT InitializePackage(
880
}
881
882
// Remember the default requested state so the engine doesn't get blamed for planning the wrong thing if the BA changes it.
883
- hr = PlanDefaultPackageRequestState(pPackage->type, pPackage->currentState, !pPackage->fUninstallable, pPlan->action, installCondition, relationType, &pPackage->defaultRequested);
883
+ hr = PlanDefaultPackageRequestState(pPackage->type, pPackage->currentState, pPackage->fPermanent, pPlan->action, installCondition, relationType, &pPackage->defaultRequested);
884
ExitOnFailure(hr, "Failed to set default package state.");
885
886
pPackage->requested = pPackage->defaultRequested;
src/burn/engine/pseudobundle.cpp
+2
-1
@@ -50,7 +50,7 @@ extern "C" HRESULT PseudoBundleInitializeRelated(
50
pPackage->qwSize = qwSize;
51
pPackage->fVital = FALSE;
52
53
- pPackage->fUninstallable = TRUE;
53
+ pPackage->fPermanent = FALSE;
54
pPackage->Bundle.fPseudoBundle = TRUE;
55
pPackage->Bundle.fRepairable = TRUE;
56
pPackage->Bundle.fSupportsBurnProtocol = fSupportsBurnProtocol;
@@ -112,6 +112,7 @@ extern "C" HRESULT PseudoBundleInitializePassthrough(
112
pPassthroughPackage->qwInstallSize = pPackage->qwInstallSize;
113
pPassthroughPackage->qwSize = pPackage->qwSize;
114
pPassthroughPackage->fVital = pPackage->fVital;
115
+ pPassthroughPackage->fPermanent = TRUE;
116
117
pPassthroughPackage->Exe.fPseudoBundle = TRUE;
118
pPassthroughPackage->Exe.protocol = pPackage->Bundle.fSupportsBurnProtocol ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE;
src/burn/test/BurnUnitTest/PlanTest.cpp
+1
-1
@@ -1207,7 +1207,7 @@ namespace Bootstrapper
1207
for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i)
1208
{
1209
BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i;
1210
- if (pPackage->fUninstallable)
1210
+ if (!pPackage->fPermanent)
1211
{
1212
DetectPackageAsAbsent(pPackage);
1213
}