aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/msuengine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-01-14 20:48:01 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-01-16 10:30:28 -0600
commitabe316b80fae80eba54b0b79e76b6362105fa098 (patch)
tree699290ccc7e924a5ef498e487924834c1018b80e /src/burn/engine/msuengine.cpp
parent47bca2dc51525fcad86f325278b14953ac5b137e (diff)
downloadwix-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/msuengine.cpp')
-rw-r--r--src/burn/engine/msuengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/burn/engine/msuengine.cpp b/src/burn/engine/msuengine.cpp
index 693bb64b..4f5f2cd4 100644
--- a/src/burn/engine/msuengine.cpp
+++ b/src/burn/engine/msuengine.cpp
@@ -53,6 +53,7 @@ extern "C" void MsuEnginePackageUninitialize(
53 53
54extern "C" HRESULT MsuEngineDetectPackage( 54extern "C" HRESULT MsuEngineDetectPackage(
55 __in BURN_PACKAGE* pPackage, 55 __in BURN_PACKAGE* pPackage,
56 __in BURN_REGISTRATION* pRegistration,
56 __in BURN_VARIABLES* pVariables 57 __in BURN_VARIABLES* pVariables
57 ) 58 )
58{ 59{
@@ -74,6 +75,9 @@ extern "C" HRESULT MsuEngineDetectPackage(
74 pPackage->installRegistrationState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState ? BURN_PACKAGE_REGISTRATION_STATE_PRESENT : BURN_PACKAGE_REGISTRATION_STATE_ABSENT; 75 pPackage->installRegistrationState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState ? BURN_PACKAGE_REGISTRATION_STATE_PRESENT : BURN_PACKAGE_REGISTRATION_STATE_ABSENT;
75 } 76 }
76 77
78 hr = DependencyDetectChainPackage(pPackage, pRegistration);
79 ExitOnFailure(hr, "Failed to detect dependencies for MSU package.");
80
77LExit: 81LExit:
78 return hr; 82 return hr;
79} 83}