aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/exeengine.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/exeengine.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/exeengine.cpp')
-rw-r--r--src/burn/engine/exeengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp
index 45349ed0..27844c69 100644
--- a/src/burn/engine/exeengine.cpp
+++ b/src/burn/engine/exeengine.cpp
@@ -115,6 +115,7 @@ extern "C" void ExeEngineCommandLineArgumentUninitialize(
115 115
116extern "C" HRESULT ExeEngineDetectPackage( 116extern "C" HRESULT ExeEngineDetectPackage(
117 __in BURN_PACKAGE* pPackage, 117 __in BURN_PACKAGE* pPackage,
118 __in BURN_REGISTRATION* pRegistration,
118 __in BURN_VARIABLES* pVariables 119 __in BURN_VARIABLES* pVariables
119 ) 120 )
120{ 121{
@@ -136,6 +137,9 @@ extern "C" HRESULT ExeEngineDetectPackage(
136 pPackage->installRegistrationState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState ? BURN_PACKAGE_REGISTRATION_STATE_PRESENT : BURN_PACKAGE_REGISTRATION_STATE_ABSENT; 137 pPackage->installRegistrationState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState ? BURN_PACKAGE_REGISTRATION_STATE_PRESENT : BURN_PACKAGE_REGISTRATION_STATE_ABSENT;
137 } 138 }
138 139
140 hr = DependencyDetectChainPackage(pPackage, pRegistration);
141 ExitOnFailure(hr, "Failed to detect dependencies for EXE package.");
142
139LExit: 143LExit:
140 return hr; 144 return hr;
141} 145}