diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-04 17:55:17 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-05 16:22:04 -0600 |
commit | e027c6c571a4bc8c818244e2b0c5015eb4ef3110 (patch) | |
tree | 8149aa491766bfe8a883f921831a52133abceea5 /src/burn/test/BurnUnitTest/PlanTest.cpp | |
parent | baf09c19c5a0f0d3f9533f9084f094066c1be7d9 (diff) | |
download | wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.gz wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.bz2 wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.zip |
Change ARP property Installed to 0 when registrationType is InProgress.
Being registered in ARP and "installed" were always separate concepts, and some things like fEligibleForCleanup were looking at the wrong thing. This also allows the BA to tell the difference.
Diffstat (limited to 'src/burn/test/BurnUnitTest/PlanTest.cpp')
-rw-r--r-- | src/burn/test/BurnUnitTest/PlanTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp index ba28713f..685d2ca9 100644 --- a/src/burn/test/BurnUnitTest/PlanTest.cpp +++ b/src/burn/test/BurnUnitTest/PlanTest.cpp | |||
@@ -792,7 +792,7 @@ namespace Bootstrapper | |||
792 | InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState); | 792 | InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState); |
793 | DetectPackagesAsAbsent(pEngineState); | 793 | DetectPackagesAsAbsent(pEngineState); |
794 | 794 | ||
795 | pEngineState->registration.fInstalled = TRUE; | 795 | pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL; |
796 | 796 | ||
797 | hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_MODIFY); | 797 | hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_MODIFY); |
798 | NativeAssert::Succeeded(hr, "CorePlan failed"); | 798 | NativeAssert::Succeeded(hr, "CorePlan failed"); |
@@ -1457,7 +1457,7 @@ namespace Bootstrapper | |||
1457 | { | 1457 | { |
1458 | PlanTestDetect(pEngineState); | 1458 | PlanTestDetect(pEngineState); |
1459 | 1459 | ||
1460 | pEngineState->registration.fInstalled = TRUE; | 1460 | pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL; |
1461 | 1461 | ||
1462 | for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) | 1462 | for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) |
1463 | { | 1463 | { |
@@ -1486,7 +1486,7 @@ namespace Bootstrapper | |||
1486 | { | 1486 | { |
1487 | PlanTestDetect(pEngineState); | 1487 | PlanTestDetect(pEngineState); |
1488 | 1488 | ||
1489 | pEngineState->registration.fInstalled = TRUE; | 1489 | pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL; |
1490 | 1490 | ||
1491 | for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) | 1491 | for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) |
1492 | { | 1492 | { |