From 1d58b3333d1d694d08b68f6c87223aa504bfe773 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 7 Dec 2021 18:40:09 -0600
Subject: Remove MEND.

---
 src/burn/engine/dependency.cpp |  2 --
 src/burn/engine/logging.cpp    |  4 ----
 src/burn/engine/msiengine.cpp  | 10 +---------
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'src/burn')

diff --git a/src/burn/engine/dependency.cpp b/src/burn/engine/dependency.cpp
index f6cfe2c6..bd86fe11 100644
--- a/src/burn/engine/dependency.cpp
+++ b/src/burn/engine/dependency.cpp
@@ -1045,7 +1045,6 @@ static void CalculateDependencyActionStates(
                 }
                 break;
             case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
-            case BOOTSTRAPPER_REQUEST_STATE_MEND: __fallthrough;
             case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
                 // Register if the package is requested but already installed.
                 switch (pPackage->currentState)
@@ -1069,7 +1068,6 @@ static void CalculateDependencyActionStates(
             break;
         case BOOTSTRAPPER_ACTION_STATE_INSTALL: __fallthrough;
         case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
-        case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
         case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
         case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough;
             *pDependencyExecuteAction = BURN_DEPENDENCY_ACTION_REGISTER;
diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp
index 21e010bc..1e436f68 100644
--- a/src/burn/engine/logging.cpp
+++ b/src/burn/engine/logging.cpp
@@ -365,8 +365,6 @@ extern "C" LPCSTR LoggingActionStateToString(
         return "Install";
     case BOOTSTRAPPER_ACTION_STATE_MODIFY:
         return "Modify";
-    case BOOTSTRAPPER_ACTION_STATE_MEND:
-        return "Mend";
     case BOOTSTRAPPER_ACTION_STATE_REPAIR:
         return "Repair";
     case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
@@ -738,8 +736,6 @@ extern "C" LPCSTR LoggingRequestStateToString(
         return "Cache";
     case BOOTSTRAPPER_REQUEST_STATE_PRESENT:
         return "Present";
-    case BOOTSTRAPPER_REQUEST_STATE_MEND:
-        return "Mend";
     case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
         return "Repair";
     default:
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index 509fbb7a..adc266f1 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -790,7 +790,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
     {
     case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough;
     case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED:
-        if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
+        if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
         {
             hr = VerCompareParsedVersions(pVersion, pInstalledVersion, &nCompareResult);
             ExitOnFailure(hr, "Failed to compare '%ls' to '%ls' for planning.", pVersion->sczVersion, pInstalledVersion->sczVersion);
@@ -802,10 +802,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
             {
                 execute = BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE;
             }
-            else if (BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested)
-            {
-                execute = BOOTSTRAPPER_ACTION_STATE_MEND;
-            }
             else if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
             {
                 execute = BOOTSTRAPPER_ACTION_STATE_REPAIR;
@@ -835,7 +831,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
         switch (pPackage->requested)
         {
         case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
-        case BOOTSTRAPPER_REQUEST_STATE_MEND: __fallthrough;
         case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
             execute = BOOTSTRAPPER_ACTION_STATE_INSTALL;
             break;
@@ -882,7 +877,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
             // remove the package during rollback.
             if (pPackage->fUninstallable &&
                 (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested ||
-                 BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested ||
                  BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested))
             {
                 rollback = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
@@ -1201,7 +1195,6 @@ extern "C" HRESULT MsiEngineExecutePackage(
         break;
 
     case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
-    case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
     case BOOTSTRAPPER_ACTION_STATE_REPAIR:
         hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart);
         ExitOnFailure(hr, "Failed to run maintenance mode for MSI package.");
@@ -1281,7 +1274,6 @@ extern "C" HRESULT MsiEngineConcatBurnProperties(
         }
         break;
     case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
-    case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
     case BOOTSTRAPPER_ACTION_STATE_MODIFY:
         if (fMsiPackage)
         {
-- 
cgit v1.2.3-55-g6feb