Remove BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING.
Thanks to @rseanhall's sharp eyes.
Bob Arnson committed
Dec 27, 2021 at 14:29 UTC
9d75d94dfbda512bd3d26aec0d9d100101272a63
5 files changed
+1
-18
src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
-1
@@ -23,7 +23,6 @@ enum BOOTSTRAPPER_RESUME_TYPE
23
BOOTSTRAPPER_RESUME_TYPE_NONE,
24
BOOTSTRAPPER_RESUME_TYPE_INVALID, // resume information is present but invalid
25
BOOTSTRAPPER_RESUME_TYPE_INTERRUPTED, // relaunched after an unexpected interruption
26
- BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING, // reboot has not taken place yet
26
BOOTSTRAPPER_RESUME_TYPE_REBOOT, // relaunched after reboot
27
BOOTSTRAPPER_RESUME_TYPE_SUSPEND, // relaunched after suspend
28
BOOTSTRAPPER_RESUME_TYPE_ARP, // launched from ARP
src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
-5
@@ -1393,11 +1393,6 @@ namespace WixToolset.Mba.Core
1393
/// </summary>
1394
Interrupted,
1395
1396
- /// <summary>
1397
- /// A reboot is pending.
1398
- /// </summary>
1399
- RebootPending,
1400
-
1396
/// <summary>
1397
/// The bundle was re-launched after a reboot.
1398
/// </summary>
src/burn/engine/apply.cpp
+1
-1
@@ -387,7 +387,7 @@ extern "C" HRESULT ApplyRegister(
387
ExitOnRootFailure(hr, "BA aborted register begin.");
388
389
// If we have a resume mode that suggests the bundle is on the machine.
390
- if (BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING < pEngineState->command.resumeType)
390
+ if (BOOTSTRAPPER_RESUME_TYPE_REBOOT <= pEngineState->command.resumeType)
391
{
392
// resume previous session
393
if (pEngineState->registration.fPerMachine)
src/burn/engine/core.cpp
-10
@@ -676,16 +676,6 @@ extern "C" HRESULT CoreApply(
676
677
pEngineState->plan.fAffectedMachineState = pEngineState->plan.fCanAffectMachineState;
678
679
- // Abort if could affect machine state and this bundle already requires a restart.
680
- if (pEngineState->plan.fCanAffectMachineState && BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING == pEngineState->command.resumeType)
681
- {
682
- restart = BOOTSTRAPPER_APPLY_RESTART_REQUIRED;
683
-
684
- hr = HRESULT_FROM_WIN32(ERROR_FAIL_NOACTION_REBOOT);
685
- UserExperienceSendError(&pEngineState->userExperience, BOOTSTRAPPER_ERROR_TYPE_APPLY, NULL, hr, NULL, MB_ICONERROR | MB_OK, IDNOACTION); // ignore return value.
686
- ExitFunction();
687
- }
688
-
679
hr = ApplyLock(FALSE, &hLock);
680
ExitOnFailure(hr, "Another per-user setup is already executing.");
681
src/burn/test/BurnUnitTest/RegistrationTest.cpp
-1
@@ -854,7 +854,6 @@ namespace Bootstrapper
854
//BOOTSTRAPPER_RESUME_TYPE_NONE,
855
//BOOTSTRAPPER_RESUME_TYPE_INVALID, // resume information is present but invalid
856
//BOOTSTRAPPER_RESUME_TYPE_UNEXPECTED, // relaunched after an unexpected interruption
857
- //BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING, // reboot has not taken place yet
857
//BOOTSTRAPPER_RESUME_TYPE_REBOOT, // relaunched after reboot
858
//BOOTSTRAPPER_RESUME_TYPE_SUSPEND, // relaunched after suspend
859
//BOOTSTRAPPER_RESUME_TYPE_ARP, // launched from ARP