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/mspengine.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/mspengine.cpp')
| -rw-r--r-- | src/burn/engine/mspengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/burn/engine/mspengine.cpp b/src/burn/engine/mspengine.cpp index a88d0cb2..85eb1536 100644 --- a/src/burn/engine/mspengine.cpp +++ b/src/burn/engine/mspengine.cpp | |||
| @@ -250,6 +250,7 @@ LExit: | |||
| 250 | 250 | ||
| 251 | extern "C" HRESULT MspEngineDetectPackage( | 251 | extern "C" HRESULT MspEngineDetectPackage( |
| 252 | __in BURN_PACKAGE* pPackage, | 252 | __in BURN_PACKAGE* pPackage, |
| 253 | __in BURN_REGISTRATION* pRegistration, | ||
| 253 | __in BURN_USER_EXPERIENCE* pUserExperience | 254 | __in BURN_USER_EXPERIENCE* pUserExperience |
| 254 | ) | 255 | ) |
| 255 | { | 256 | { |
| @@ -328,6 +329,9 @@ extern "C" HRESULT MspEngineDetectPackage( | |||
| 328 | } | 329 | } |
| 329 | } | 330 | } |
| 330 | 331 | ||
| 332 | hr = DependencyDetectChainPackage(pPackage, pRegistration); | ||
| 333 | ExitOnFailure(hr, "Failed to detect dependencies for MSP package."); | ||
| 334 | |||
| 331 | LExit: | 335 | LExit: |
| 332 | ReleaseStr(sczState); | 336 | ReleaseStr(sczState); |
| 333 | 337 | ||