diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-14 20:48:01 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-16 10:30:28 -0600 |
| commit | abe316b80fae80eba54b0b79e76b6362105fa098 (patch) | |
| tree | 699290ccc7e924a5ef498e487924834c1018b80e /src/burn/engine/msiengine.cpp | |
| parent | 47bca2dc51525fcad86f325278b14953ac5b137e (diff) | |
| download | wix-abe316b80fae80eba54b0b79e76b6362105fa098.tar.gz wix-abe316b80fae80eba54b0b79e76b6362105fa098.tar.bz2 wix-abe316b80fae80eba54b0b79e76b6362105fa098.zip | |
Refactor some dependency detection.
* Run DependencyDetect earlier
* Do package dependency checking during each package/related bundle
Diffstat (limited to 'src/burn/engine/msiengine.cpp')
| -rw-r--r-- | src/burn/engine/msiengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp index adc266f1..87ae77e9 100644 --- a/src/burn/engine/msiengine.cpp +++ b/src/burn/engine/msiengine.cpp | |||
| @@ -432,6 +432,7 @@ LExit: | |||
| 432 | 432 | ||
| 433 | extern "C" HRESULT MsiEngineDetectPackage( | 433 | extern "C" HRESULT MsiEngineDetectPackage( |
| 434 | __in BURN_PACKAGE* pPackage, | 434 | __in BURN_PACKAGE* pPackage, |
| 435 | __in BURN_REGISTRATION* pRegistration, | ||
| 435 | __in BURN_USER_EXPERIENCE* pUserExperience | 436 | __in BURN_USER_EXPERIENCE* pUserExperience |
| 436 | ) | 437 | ) |
| 437 | { | 438 | { |
| @@ -704,6 +705,9 @@ extern "C" HRESULT MsiEngineDetectPackage( | |||
| 704 | pPackage->installRegistrationState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState ? BURN_PACKAGE_REGISTRATION_STATE_PRESENT : BURN_PACKAGE_REGISTRATION_STATE_ABSENT; | 705 | pPackage->installRegistrationState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState ? BURN_PACKAGE_REGISTRATION_STATE_PRESENT : BURN_PACKAGE_REGISTRATION_STATE_ABSENT; |
| 705 | } | 706 | } |
| 706 | 707 | ||
| 708 | hr = DependencyDetectChainPackage(pPackage, pRegistration); | ||
| 709 | ExitOnFailure(hr, "Failed to detect dependencies for MSI package."); | ||
| 710 | |||
| 707 | LExit: | 711 | LExit: |
| 708 | ReleaseStr(sczInstalledLanguage); | 712 | ReleaseStr(sczInstalledLanguage); |
| 709 | ReleaseStr(sczInstalledVersion); | 713 | ReleaseStr(sczInstalledVersion); |
