Remove dead code.
Sean Hall committed
Jan 17, 2021 at 20:19 UTC
2b1973c7fc4be8dd2a3e0c95ef43d3742278d0cd
12 files changed
+16
-50
src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
-14
@@ -36,12 +36,9 @@ enum BOOTSTRAPPER_ACTION_STATE
36
BOOTSTRAPPER_ACTION_STATE_NONE,
37
BOOTSTRAPPER_ACTION_STATE_UNINSTALL,
38
BOOTSTRAPPER_ACTION_STATE_INSTALL,
39
- BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL,
39
BOOTSTRAPPER_ACTION_STATE_MODIFY,
40
BOOTSTRAPPER_ACTION_STATE_REPAIR,
41
BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE,
43
- BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE,
44
- BOOTSTRAPPER_ACTION_STATE_PATCH,
42
};
43
44
enum BOOTSTRAPPER_PACKAGE_STATE
@@ -73,17 +70,6 @@ enum BOOTSTRAPPER_FEATURE_STATE
70
BOOTSTRAPPER_FEATURE_STATE_SOURCE,
71
};
72
76
-enum BOOTSTRAPPER_FEATURE_ACTION
77
-{
78
- BOOTSTRAPPER_FEATURE_ACTION_NONE,
79
- BOOTSTRAPPER_FEATURE_ACTION_ADDLOCAL,
80
- BOOTSTRAPPER_FEATURE_ACTION_ADDSOURCE,
81
- BOOTSTRAPPER_FEATURE_ACTION_ADDDEFAULT,
82
- BOOTSTRAPPER_FEATURE_ACTION_REINSTALL,
83
- BOOTSTRAPPER_FEATURE_ACTION_ADVERTISE,
84
- BOOTSTRAPPER_FEATURE_ACTION_REMOVE,
85
-};
86
-
73
enum BOOTSTRAPPER_LOG_LEVEL
74
{
75
BOOTSTRAPPER_LOG_LEVEL_NONE, // turns off report (only valid for XXXSetLevel())
src/engine/apply.cpp
-4
@@ -1743,8 +1743,6 @@ static HRESULT DoExecuteAction(
1743
ExitOnFailure(hr, "Failed to execute commit MSI transaction action.");
1744
break;
1745
1746
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP: __fallthrough;
1747
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_START: __fallthrough;
1746
default:
1747
hr = E_UNEXPECTED;
1748
ExitOnFailure(hr, "Invalid execute action.");
@@ -1854,8 +1852,6 @@ static HRESULT DoRollbackActions(
1852
IgnoreRollbackError(hr, "Failed to uncache package for rollback.");
1853
break;
1854
1857
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP: __fallthrough;
1858
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_START: __fallthrough;
1855
default:
1856
hr = E_UNEXPECTED;
1857
ExitOnFailure(hr, "Invalid rollback action: %d.", pRollbackAction->type);
src/engine/dependency.cpp
-2
@@ -922,8 +922,6 @@ static void CalculateDependencyActionStates(
922
case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
923
case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
924
case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough;
925
- case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE: __fallthrough;
926
- case BOOTSTRAPPER_ACTION_STATE_PATCH:
925
*pDependencyExecuteAction = BURN_DEPENDENCY_ACTION_REGISTER;
926
break;
927
}
src/engine/exeengine.cpp
+1
-1
@@ -223,7 +223,7 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
223
// Calculate the rollback action if there is an execute action.
224
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute)
225
{
226
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
226
+ switch (pPackage->currentState)
227
{
228
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT:
229
switch (pPackage->requested)
src/engine/logging.cpp
-6
@@ -301,18 +301,12 @@ extern "C" LPCSTR LoggingActionStateToString(
301
return "Uninstall";
302
case BOOTSTRAPPER_ACTION_STATE_INSTALL:
303
return "Install";
304
- case BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL:
305
- return "AdminInstall";
304
case BOOTSTRAPPER_ACTION_STATE_MODIFY:
305
return "Modify";
306
case BOOTSTRAPPER_ACTION_STATE_REPAIR:
307
return "Repair";
308
case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
309
return "MinorUpgrade";
312
- case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE:
313
- return "MajorUpgrade";
314
- case BOOTSTRAPPER_ACTION_STATE_PATCH:
315
- return "Patch";
310
default:
311
return "Invalid";
312
}
src/engine/msiengine.cpp
+1
-7
@@ -856,7 +856,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
856
// Calculate the rollback action if there is an execute action.
857
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute && !fInsideMsiTransaction)
858
{
859
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
859
+ switch (pPackage->currentState)
860
{
861
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough;
862
case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED:
@@ -1322,12 +1322,6 @@ extern "C" HRESULT MsiEngineExecutePackage(
1322
//
1323
switch (pExecuteAction->msiPackage.action)
1324
{
1325
- case BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL:
1326
- hr = StrAllocConcatSecure(&sczProperties, L" ACTION=ADMIN", 0);
1327
- ExitOnFailure(hr, "Failed to add ADMIN property on admin install.");
1328
- __fallthrough;
1329
-
1330
- case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE: __fallthrough;
1325
case BOOTSTRAPPER_ACTION_STATE_INSTALL:
1326
hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0);
1327
ExitOnFailure(hr, "Failed to add reboot suppression property on install.");
src/engine/mspengine.cpp
+1
-1
@@ -332,7 +332,7 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
332
// Calculate the rollback action if there is an execute action.
333
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute && !fInsideMsiTransaction)
334
{
335
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
335
+ switch (pPackage->currentState)
336
{
337
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT:
338
switch (requested)
src/engine/msuengine.cpp
+1
-1
@@ -146,7 +146,7 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage(
146
// Calculate the rollback action if there is an execute action.
147
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute)
148
{
149
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
149
+ switch (pPackage->currentState)
150
{
151
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT:
152
switch (pPackage->requested)
src/engine/package.h
+11
-1
@@ -67,6 +67,17 @@ enum BURN_PATCH_TARGETCODE_TYPE
67
BURN_PATCH_TARGETCODE_TYPE_UPGRADE,
68
};
69
70
+enum BOOTSTRAPPER_FEATURE_ACTION
71
+{
72
+ BOOTSTRAPPER_FEATURE_ACTION_NONE,
73
+ BOOTSTRAPPER_FEATURE_ACTION_ADDLOCAL,
74
+ BOOTSTRAPPER_FEATURE_ACTION_ADDSOURCE,
75
+ BOOTSTRAPPER_FEATURE_ACTION_ADDDEFAULT,
76
+ BOOTSTRAPPER_FEATURE_ACTION_REINSTALL,
77
+ BOOTSTRAPPER_FEATURE_ACTION_ADVERTISE,
78
+ BOOTSTRAPPER_FEATURE_ACTION_REMOVE,
79
+};
80
+
81
// structs
82
83
typedef struct _BURN_EXE_EXIT_CODE
@@ -188,7 +199,6 @@ typedef struct _BURN_PACKAGE
199
200
BOOTSTRAPPER_PACKAGE_STATE currentState; // only valid after Detect.
201
BURN_CACHE_STATE cache; // only valid after Detect.
191
- BOOTSTRAPPER_PACKAGE_STATE expected; // only valid during Plan.
202
BOOTSTRAPPER_REQUEST_STATE defaultRequested;// only valid during Plan.
203
BOOTSTRAPPER_REQUEST_STATE requested; // only valid during Plan.
204
BOOL fAcquire; // only valid during Plan.
src/engine/plan.cpp
-6
@@ -306,11 +306,6 @@ extern "C" void PlanUninitializeExecuteAction(
306
ReleaseStr(pExecuteAction->msuPackage.sczLogPath);
307
break;
308
309
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP: __fallthrough;
310
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_START:
311
- ReleaseStr(pExecuteAction->service.sczServiceName);
312
- break;
313
-
309
case BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY:
310
ReleaseStr(pExecuteAction->packageDependency.sczBundleProviderKey);
311
break;
@@ -1958,7 +1953,6 @@ static void ResetPlannedPackageState(
1953
)
1954
{
1955
// Reset package state that is a result of planning.
1961
- pPackage->expected = BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN;
1956
pPackage->defaultRequested = BOOTSTRAPPER_REQUEST_STATE_NONE;
1957
pPackage->requested = BOOTSTRAPPER_REQUEST_STATE_NONE;
1958
pPackage->fAcquire = FALSE;
src/engine/plan.h
-6
@@ -61,8 +61,6 @@ enum BURN_EXECUTE_ACTION_TYPE
61
BURN_EXECUTE_ACTION_TYPE_MSI_PACKAGE,
62
BURN_EXECUTE_ACTION_TYPE_MSP_TARGET,
63
BURN_EXECUTE_ACTION_TYPE_MSU_PACKAGE,
64
- BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP,
65
- BURN_EXECUTE_ACTION_TYPE_SERVICE_START,
64
BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER,
65
BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY,
66
BURN_EXECUTE_ACTION_TYPE_ROLLBACK_BOUNDARY,
@@ -284,10 +282,6 @@ typedef struct _BURN_EXECUTE_ACTION
282
BOOTSTRAPPER_ACTION_STATE action;
283
} msuPackage;
284
struct
287
- {
288
- LPWSTR sczServiceName;
289
- } service;
290
- struct
285
{
286
BOOL fKeep;
287
} registration;
src/stub/stub.vcxproj
+1
-1
@@ -55,7 +55,7 @@
55
56
<PropertyGroup>
57
<ProjectAdditionalIncludeDirectories>$(ProjectDir)..\engine\inc</ProjectAdditionalIncludeDirectories>
58
- <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;gdiplus.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;wuguid.lib;engine.lib;engine.res</ProjectAdditionalLinkLibraries>
58
+ <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;wuguid.lib;engine.lib;engine.res</ProjectAdditionalLinkLibraries>
59
</PropertyGroup>
60
61
<ItemDefinitionGroup>