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/RegistrationTest.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/RegistrationTest.cpp')
-rw-r--r-- | src/burn/test/BurnUnitTest/RegistrationTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp index 6a10961d..86ea86b0 100644 --- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp +++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp | |||
@@ -218,7 +218,7 @@ namespace Bootstrapper | |||
218 | 218 | ||
219 | // verify that registration was updated | 219 | // verify that registration was updated |
220 | this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ARP)); | 220 | this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ARP)); |
221 | this->ValidateUninstallKeyInstalled(1); | 221 | this->ValidateUninstallKeyInstalled(0); |
222 | this->ValidateRunOnceKeyString(TEST_BUNDLE_ID, nullptr); | 222 | this->ValidateRunOnceKeyString(TEST_BUNDLE_ID, nullptr); |
223 | 223 | ||
224 | // | 224 | // |
@@ -231,7 +231,7 @@ namespace Bootstrapper | |||
231 | 231 | ||
232 | // verify that registration was updated | 232 | // verify that registration was updated |
233 | this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ACTIVE)); | 233 | this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ACTIVE)); |
234 | this->ValidateUninstallKeyInstalled(1); | 234 | this->ValidateUninstallKeyInstalled(0); |
235 | this->ValidateRunOnceKeyEntry(cacheExePath); | 235 | this->ValidateRunOnceKeyEntry(cacheExePath); |
236 | 236 | ||
237 | // delete registration | 237 | // delete registration |
@@ -337,7 +337,7 @@ namespace Bootstrapper | |||
337 | 337 | ||
338 | // verify that registration variables were updated | 338 | // verify that registration variables were updated |
339 | this->ValidateUninstallKeyDisplayName(L"Product1"); | 339 | this->ValidateUninstallKeyDisplayName(L"Product1"); |
340 | registration.fInstalled = TRUE; | 340 | registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL; |
341 | 341 | ||
342 | hr = RegistrationSetVariables(®istration, &variables); | 342 | hr = RegistrationSetVariables(®istration, &variables); |
343 | TestThrowOnFailure(hr, L"Failed to set registration variables."); | 343 | TestThrowOnFailure(hr, L"Failed to set registration variables."); |