diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-07 18:40:09 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-08 17:14:11 -0600 |
commit | 1d58b3333d1d694d08b68f6c87223aa504bfe773 (patch) | |
tree | c9f0849b7d517c9362fbdee8822ec756f23d602b /src/burn/engine/msiengine.cpp | |
parent | 19d85eed389fbd964f64c2fbb85e40ec20439d26 (diff) | |
download | wix-1d58b3333d1d694d08b68f6c87223aa504bfe773.tar.gz wix-1d58b3333d1d694d08b68f6c87223aa504bfe773.tar.bz2 wix-1d58b3333d1d694d08b68f6c87223aa504bfe773.zip |
Remove MEND.
Diffstat (limited to 'src/burn/engine/msiengine.cpp')
-rw-r--r-- | src/burn/engine/msiengine.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
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( | |||
790 | { | 790 | { |
791 | case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough; | 791 | case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough; |
792 | case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED: | 792 | case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED: |
793 | if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested) | 793 | if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested) |
794 | { | 794 | { |
795 | hr = VerCompareParsedVersions(pVersion, pInstalledVersion, &nCompareResult); | 795 | hr = VerCompareParsedVersions(pVersion, pInstalledVersion, &nCompareResult); |
796 | ExitOnFailure(hr, "Failed to compare '%ls' to '%ls' for planning.", pVersion->sczVersion, pInstalledVersion->sczVersion); | 796 | ExitOnFailure(hr, "Failed to compare '%ls' to '%ls' for planning.", pVersion->sczVersion, pInstalledVersion->sczVersion); |
@@ -802,10 +802,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
802 | { | 802 | { |
803 | execute = BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE; | 803 | execute = BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE; |
804 | } | 804 | } |
805 | else if (BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested) | ||
806 | { | ||
807 | execute = BOOTSTRAPPER_ACTION_STATE_MEND; | ||
808 | } | ||
809 | else if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested) | 805 | else if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested) |
810 | { | 806 | { |
811 | execute = BOOTSTRAPPER_ACTION_STATE_REPAIR; | 807 | execute = BOOTSTRAPPER_ACTION_STATE_REPAIR; |
@@ -835,7 +831,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
835 | switch (pPackage->requested) | 831 | switch (pPackage->requested) |
836 | { | 832 | { |
837 | case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough; | 833 | case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough; |
838 | case BOOTSTRAPPER_REQUEST_STATE_MEND: __fallthrough; | ||
839 | case BOOTSTRAPPER_REQUEST_STATE_REPAIR: | 834 | case BOOTSTRAPPER_REQUEST_STATE_REPAIR: |
840 | execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; | 835 | execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; |
841 | break; | 836 | break; |
@@ -882,7 +877,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
882 | // remove the package during rollback. | 877 | // remove the package during rollback. |
883 | if (pPackage->fUninstallable && | 878 | if (pPackage->fUninstallable && |
884 | (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || | 879 | (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || |
885 | BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested || | ||
886 | BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)) | 880 | BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)) |
887 | { | 881 | { |
888 | rollback = BOOTSTRAPPER_ACTION_STATE_UNINSTALL; | 882 | rollback = BOOTSTRAPPER_ACTION_STATE_UNINSTALL; |
@@ -1201,7 +1195,6 @@ extern "C" HRESULT MsiEngineExecutePackage( | |||
1201 | break; | 1195 | break; |
1202 | 1196 | ||
1203 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough; | 1197 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough; |
1204 | case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough; | ||
1205 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: | 1198 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: |
1206 | hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart); | 1199 | hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart); |
1207 | ExitOnFailure(hr, "Failed to run maintenance mode for MSI package."); | 1200 | ExitOnFailure(hr, "Failed to run maintenance mode for MSI package."); |
@@ -1281,7 +1274,6 @@ extern "C" HRESULT MsiEngineConcatBurnProperties( | |||
1281 | } | 1274 | } |
1282 | break; | 1275 | break; |
1283 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough; | 1276 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough; |
1284 | case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough; | ||
1285 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: | 1277 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: |
1286 | if (fMsiPackage) | 1278 | if (fMsiPackage) |
1287 | { | 1279 | { |