diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h | 2 | ||||
-rw-r--r-- | src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | 10 | ||||
-rw-r--r-- | src/burn/engine/dependency.cpp | 2 | ||||
-rw-r--r-- | src/burn/engine/logging.cpp | 4 | ||||
-rw-r--r-- | src/burn/engine/msiengine.cpp | 10 |
5 files changed, 1 insertions, 27 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h index 9c9b38a5..56405685 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h | |||
@@ -37,7 +37,6 @@ enum BOOTSTRAPPER_ACTION_STATE | |||
37 | BOOTSTRAPPER_ACTION_STATE_UNINSTALL, | 37 | BOOTSTRAPPER_ACTION_STATE_UNINSTALL, |
38 | BOOTSTRAPPER_ACTION_STATE_INSTALL, | 38 | BOOTSTRAPPER_ACTION_STATE_INSTALL, |
39 | BOOTSTRAPPER_ACTION_STATE_MODIFY, | 39 | BOOTSTRAPPER_ACTION_STATE_MODIFY, |
40 | BOOTSTRAPPER_ACTION_STATE_MEND, | ||
41 | BOOTSTRAPPER_ACTION_STATE_REPAIR, | 40 | BOOTSTRAPPER_ACTION_STATE_REPAIR, |
42 | BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE, | 41 | BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE, |
43 | }; | 42 | }; |
@@ -58,7 +57,6 @@ enum BOOTSTRAPPER_REQUEST_STATE | |||
58 | BOOTSTRAPPER_REQUEST_STATE_ABSENT, | 57 | BOOTSTRAPPER_REQUEST_STATE_ABSENT, |
59 | BOOTSTRAPPER_REQUEST_STATE_CACHE, | 58 | BOOTSTRAPPER_REQUEST_STATE_CACHE, |
60 | BOOTSTRAPPER_REQUEST_STATE_PRESENT, | 59 | BOOTSTRAPPER_REQUEST_STATE_PRESENT, |
61 | BOOTSTRAPPER_REQUEST_STATE_MEND, | ||
62 | BOOTSTRAPPER_REQUEST_STATE_REPAIR, | 60 | BOOTSTRAPPER_REQUEST_STATE_REPAIR, |
63 | }; | 61 | }; |
64 | 62 | ||
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs index 4e19bf0f..681c6f2c 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | |||
@@ -310,11 +310,6 @@ namespace WixToolset.Mba.Core | |||
310 | /// <summary> | 310 | /// <summary> |
311 | /// | 311 | /// |
312 | /// </summary> | 312 | /// </summary> |
313 | Mend, | ||
314 | |||
315 | /// <summary> | ||
316 | /// | ||
317 | /// </summary> | ||
318 | Repair, | 313 | Repair, |
319 | 314 | ||
320 | /// <summary> | 315 | /// <summary> |
@@ -495,11 +490,6 @@ namespace WixToolset.Mba.Core | |||
495 | /// <summary> | 490 | /// <summary> |
496 | /// | 491 | /// |
497 | /// </summary> | 492 | /// </summary> |
498 | Mend, | ||
499 | |||
500 | /// <summary> | ||
501 | /// | ||
502 | /// </summary> | ||
503 | Repair, | 493 | Repair, |
504 | } | 494 | } |
505 | 495 | ||
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( | |||
1045 | } | 1045 | } |
1046 | break; | 1046 | break; |
1047 | case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough; | 1047 | case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough; |
1048 | case BOOTSTRAPPER_REQUEST_STATE_MEND: __fallthrough; | ||
1049 | case BOOTSTRAPPER_REQUEST_STATE_REPAIR: | 1048 | case BOOTSTRAPPER_REQUEST_STATE_REPAIR: |
1050 | // Register if the package is requested but already installed. | 1049 | // Register if the package is requested but already installed. |
1051 | switch (pPackage->currentState) | 1050 | switch (pPackage->currentState) |
@@ -1069,7 +1068,6 @@ static void CalculateDependencyActionStates( | |||
1069 | break; | 1068 | break; |
1070 | case BOOTSTRAPPER_ACTION_STATE_INSTALL: __fallthrough; | 1069 | case BOOTSTRAPPER_ACTION_STATE_INSTALL: __fallthrough; |
1071 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough; | 1070 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough; |
1072 | case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough; | ||
1073 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough; | 1071 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough; |
1074 | case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough; | 1072 | case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough; |
1075 | *pDependencyExecuteAction = BURN_DEPENDENCY_ACTION_REGISTER; | 1073 | *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( | |||
365 | return "Install"; | 365 | return "Install"; |
366 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: | 366 | case BOOTSTRAPPER_ACTION_STATE_MODIFY: |
367 | return "Modify"; | 367 | return "Modify"; |
368 | case BOOTSTRAPPER_ACTION_STATE_MEND: | ||
369 | return "Mend"; | ||
370 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: | 368 | case BOOTSTRAPPER_ACTION_STATE_REPAIR: |
371 | return "Repair"; | 369 | return "Repair"; |
372 | case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: | 370 | case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: |
@@ -738,8 +736,6 @@ extern "C" LPCSTR LoggingRequestStateToString( | |||
738 | return "Cache"; | 736 | return "Cache"; |
739 | case BOOTSTRAPPER_REQUEST_STATE_PRESENT: | 737 | case BOOTSTRAPPER_REQUEST_STATE_PRESENT: |
740 | return "Present"; | 738 | return "Present"; |
741 | case BOOTSTRAPPER_REQUEST_STATE_MEND: | ||
742 | return "Mend"; | ||
743 | case BOOTSTRAPPER_REQUEST_STATE_REPAIR: | 739 | case BOOTSTRAPPER_REQUEST_STATE_REPAIR: |
744 | return "Repair"; | 740 | return "Repair"; |
745 | default: | 741 | 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( | |||
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 | { |