From 2b1973c7fc4be8dd2a3e0c95ef43d3742278d0cd Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 17 Jan 2021 20:19:24 -0600
Subject: Remove dead code.
---
.../inc/BootstrapperEngine.h | 14 --------------
src/engine/apply.cpp | 4 ----
src/engine/dependency.cpp | 2 --
src/engine/exeengine.cpp | 2 +-
src/engine/logging.cpp | 6 ------
src/engine/msiengine.cpp | 8 +-------
src/engine/mspengine.cpp | 2 +-
src/engine/msuengine.cpp | 2 +-
src/engine/package.h | 12 +++++++++++-
src/engine/plan.cpp | 6 ------
src/engine/plan.h | 6 ------
src/stub/stub.vcxproj | 2 +-
12 files changed, 16 insertions(+), 50 deletions(-)
diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
index 98a9d77d..9642748b 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
@@ -36,12 +36,9 @@ enum BOOTSTRAPPER_ACTION_STATE
BOOTSTRAPPER_ACTION_STATE_NONE,
BOOTSTRAPPER_ACTION_STATE_UNINSTALL,
BOOTSTRAPPER_ACTION_STATE_INSTALL,
- BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL,
BOOTSTRAPPER_ACTION_STATE_MODIFY,
BOOTSTRAPPER_ACTION_STATE_REPAIR,
BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE,
- BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE,
- BOOTSTRAPPER_ACTION_STATE_PATCH,
};
enum BOOTSTRAPPER_PACKAGE_STATE
@@ -73,17 +70,6 @@ enum BOOTSTRAPPER_FEATURE_STATE
BOOTSTRAPPER_FEATURE_STATE_SOURCE,
};
-enum BOOTSTRAPPER_FEATURE_ACTION
-{
- BOOTSTRAPPER_FEATURE_ACTION_NONE,
- BOOTSTRAPPER_FEATURE_ACTION_ADDLOCAL,
- BOOTSTRAPPER_FEATURE_ACTION_ADDSOURCE,
- BOOTSTRAPPER_FEATURE_ACTION_ADDDEFAULT,
- BOOTSTRAPPER_FEATURE_ACTION_REINSTALL,
- BOOTSTRAPPER_FEATURE_ACTION_ADVERTISE,
- BOOTSTRAPPER_FEATURE_ACTION_REMOVE,
-};
-
enum BOOTSTRAPPER_LOG_LEVEL
{
BOOTSTRAPPER_LOG_LEVEL_NONE, // turns off report (only valid for XXXSetLevel())
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
index 833d750c..c5d27277 100644
--- a/src/engine/apply.cpp
+++ b/src/engine/apply.cpp
@@ -1743,8 +1743,6 @@ static HRESULT DoExecuteAction(
ExitOnFailure(hr, "Failed to execute commit MSI transaction action.");
break;
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP: __fallthrough;
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_START: __fallthrough;
default:
hr = E_UNEXPECTED;
ExitOnFailure(hr, "Invalid execute action.");
@@ -1854,8 +1852,6 @@ static HRESULT DoRollbackActions(
IgnoreRollbackError(hr, "Failed to uncache package for rollback.");
break;
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP: __fallthrough;
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_START: __fallthrough;
default:
hr = E_UNEXPECTED;
ExitOnFailure(hr, "Invalid rollback action: %d.", pRollbackAction->type);
diff --git a/src/engine/dependency.cpp b/src/engine/dependency.cpp
index c01449b6..af4ab0a1 100644
--- a/src/engine/dependency.cpp
+++ b/src/engine/dependency.cpp
@@ -922,8 +922,6 @@ static void CalculateDependencyActionStates(
case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough;
- case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE: __fallthrough;
- case BOOTSTRAPPER_ACTION_STATE_PATCH:
*pDependencyExecuteAction = BURN_DEPENDENCY_ACTION_REGISTER;
break;
}
diff --git a/src/engine/exeengine.cpp b/src/engine/exeengine.cpp
index d3ec7676..fd33d926 100644
--- a/src/engine/exeengine.cpp
+++ b/src/engine/exeengine.cpp
@@ -223,7 +223,7 @@ extern "C" HRESULT ExeEnginePlanCalculatePackage(
// Calculate the rollback action if there is an execute action.
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute)
{
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
+ switch (pPackage->currentState)
{
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT:
switch (pPackage->requested)
diff --git a/src/engine/logging.cpp b/src/engine/logging.cpp
index 512b562c..49b2bcc3 100644
--- a/src/engine/logging.cpp
+++ b/src/engine/logging.cpp
@@ -301,18 +301,12 @@ extern "C" LPCSTR LoggingActionStateToString(
return "Uninstall";
case BOOTSTRAPPER_ACTION_STATE_INSTALL:
return "Install";
- case BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL:
- return "AdminInstall";
case BOOTSTRAPPER_ACTION_STATE_MODIFY:
return "Modify";
case BOOTSTRAPPER_ACTION_STATE_REPAIR:
return "Repair";
case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
return "MinorUpgrade";
- case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE:
- return "MajorUpgrade";
- case BOOTSTRAPPER_ACTION_STATE_PATCH:
- return "Patch";
default:
return "Invalid";
}
diff --git a/src/engine/msiengine.cpp b/src/engine/msiengine.cpp
index c298e219..688be7af 100644
--- a/src/engine/msiengine.cpp
+++ b/src/engine/msiengine.cpp
@@ -856,7 +856,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
// Calculate the rollback action if there is an execute action.
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute && !fInsideMsiTransaction)
{
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
+ switch (pPackage->currentState)
{
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough;
case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED:
@@ -1322,12 +1322,6 @@ extern "C" HRESULT MsiEngineExecutePackage(
//
switch (pExecuteAction->msiPackage.action)
{
- case BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL:
- hr = StrAllocConcatSecure(&sczProperties, L" ACTION=ADMIN", 0);
- ExitOnFailure(hr, "Failed to add ADMIN property on admin install.");
- __fallthrough;
-
- case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE: __fallthrough;
case BOOTSTRAPPER_ACTION_STATE_INSTALL:
hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0);
ExitOnFailure(hr, "Failed to add reboot suppression property on install.");
diff --git a/src/engine/mspengine.cpp b/src/engine/mspengine.cpp
index e14173d1..c432b78b 100644
--- a/src/engine/mspengine.cpp
+++ b/src/engine/mspengine.cpp
@@ -332,7 +332,7 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
// Calculate the rollback action if there is an execute action.
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute && !fInsideMsiTransaction)
{
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
+ switch (pPackage->currentState)
{
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT:
switch (requested)
diff --git a/src/engine/msuengine.cpp b/src/engine/msuengine.cpp
index 0c81873e..641d55b1 100644
--- a/src/engine/msuengine.cpp
+++ b/src/engine/msuengine.cpp
@@ -146,7 +146,7 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage(
// Calculate the rollback action if there is an execute action.
if (BOOTSTRAPPER_ACTION_STATE_NONE != execute)
{
- switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState)
+ switch (pPackage->currentState)
{
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT:
switch (pPackage->requested)
diff --git a/src/engine/package.h b/src/engine/package.h
index f3e817eb..ec176f8c 100644
--- a/src/engine/package.h
+++ b/src/engine/package.h
@@ -67,6 +67,17 @@ enum BURN_PATCH_TARGETCODE_TYPE
BURN_PATCH_TARGETCODE_TYPE_UPGRADE,
};
+enum BOOTSTRAPPER_FEATURE_ACTION
+{
+ BOOTSTRAPPER_FEATURE_ACTION_NONE,
+ BOOTSTRAPPER_FEATURE_ACTION_ADDLOCAL,
+ BOOTSTRAPPER_FEATURE_ACTION_ADDSOURCE,
+ BOOTSTRAPPER_FEATURE_ACTION_ADDDEFAULT,
+ BOOTSTRAPPER_FEATURE_ACTION_REINSTALL,
+ BOOTSTRAPPER_FEATURE_ACTION_ADVERTISE,
+ BOOTSTRAPPER_FEATURE_ACTION_REMOVE,
+};
+
// structs
typedef struct _BURN_EXE_EXIT_CODE
@@ -188,7 +199,6 @@ typedef struct _BURN_PACKAGE
BOOTSTRAPPER_PACKAGE_STATE currentState; // only valid after Detect.
BURN_CACHE_STATE cache; // only valid after Detect.
- BOOTSTRAPPER_PACKAGE_STATE expected; // only valid during Plan.
BOOTSTRAPPER_REQUEST_STATE defaultRequested;// only valid during Plan.
BOOTSTRAPPER_REQUEST_STATE requested; // only valid during Plan.
BOOL fAcquire; // only valid during Plan.
diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp
index ccb7b3ce..0dba36c6 100644
--- a/src/engine/plan.cpp
+++ b/src/engine/plan.cpp
@@ -306,11 +306,6 @@ extern "C" void PlanUninitializeExecuteAction(
ReleaseStr(pExecuteAction->msuPackage.sczLogPath);
break;
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP: __fallthrough;
- case BURN_EXECUTE_ACTION_TYPE_SERVICE_START:
- ReleaseStr(pExecuteAction->service.sczServiceName);
- break;
-
case BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY:
ReleaseStr(pExecuteAction->packageDependency.sczBundleProviderKey);
break;
@@ -1958,7 +1953,6 @@ static void ResetPlannedPackageState(
)
{
// Reset package state that is a result of planning.
- pPackage->expected = BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN;
pPackage->defaultRequested = BOOTSTRAPPER_REQUEST_STATE_NONE;
pPackage->requested = BOOTSTRAPPER_REQUEST_STATE_NONE;
pPackage->fAcquire = FALSE;
diff --git a/src/engine/plan.h b/src/engine/plan.h
index e9f3a341..9d7debe1 100644
--- a/src/engine/plan.h
+++ b/src/engine/plan.h
@@ -61,8 +61,6 @@ enum BURN_EXECUTE_ACTION_TYPE
BURN_EXECUTE_ACTION_TYPE_MSI_PACKAGE,
BURN_EXECUTE_ACTION_TYPE_MSP_TARGET,
BURN_EXECUTE_ACTION_TYPE_MSU_PACKAGE,
- BURN_EXECUTE_ACTION_TYPE_SERVICE_STOP,
- BURN_EXECUTE_ACTION_TYPE_SERVICE_START,
BURN_EXECUTE_ACTION_TYPE_PACKAGE_PROVIDER,
BURN_EXECUTE_ACTION_TYPE_PACKAGE_DEPENDENCY,
BURN_EXECUTE_ACTION_TYPE_ROLLBACK_BOUNDARY,
@@ -284,10 +282,6 @@ typedef struct _BURN_EXECUTE_ACTION
BOOTSTRAPPER_ACTION_STATE action;
} msuPackage;
struct
- {
- LPWSTR sczServiceName;
- } service;
- struct
{
BOOL fKeep;
} registration;
diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj
index aa2f964e..082b80e5 100644
--- a/src/stub/stub.vcxproj
+++ b/src/stub/stub.vcxproj
@@ -55,7 +55,7 @@
<PropertyGroup>
<ProjectAdditionalIncludeDirectories>$(ProjectDir)..\engine\inc</ProjectAdditionalIncludeDirectories>
- <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;gdiplus.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;wuguid.lib;engine.lib;engine.res</ProjectAdditionalLinkLibraries>
+ <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;wuguid.lib;engine.lib;engine.res</ProjectAdditionalLinkLibraries>
</PropertyGroup>
<ItemDefinitionGroup>
--
cgit v1.2.3-55-g6feb