aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Bal/dnchost/dnchost.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Bal/dnchost/dnchost.cpp')
-rw-r--r--src/ext/Bal/dnchost/dnchost.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ext/Bal/dnchost/dnchost.cpp b/src/ext/Bal/dnchost/dnchost.cpp
index cdf204fb..8faf292c 100644
--- a/src/ext/Bal/dnchost/dnchost.cpp
+++ b/src/ext/Bal/dnchost/dnchost.cpp
@@ -110,18 +110,18 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
110 { 110 {
111 if (DNCHOSTTYPE_SCD == vstate.type) 111 if (DNCHOSTTYPE_SCD == vstate.type)
112 { 112 {
113 vstate.prereqData.hrHostInitialization = E_DNCHOST_SCD_RUNTIME_FAILURE; 113 vstate.prereqData.hrFatalError = E_DNCHOST_SCD_RUNTIME_FAILURE;
114 BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error."); 114 BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error.");
115 } 115 }
116 else if (vstate.prereqData.fCompleted) 116 else if (vstate.prereqData.fCompleted)
117 { 117 {
118 hr = E_PREREQBA_INFINITE_LOOP; 118 hr = E_PREREQBA_INFINITE_LOOP;
119 BalLogError(hr, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop."); 119 BalLogError(hr, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop.");
120 vstate.prereqData.hrHostInitialization = hr; 120 vstate.prereqData.hrFatalError = hr;
121 } 121 }
122 else 122 else
123 { 123 {
124 vstate.prereqData.hrHostInitialization = S_OK; 124 vstate.prereqData.hrFatalError = S_OK;
125 } 125 }
126 BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr); 126 BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr);
127 127
@@ -233,6 +233,8 @@ static HRESULT LoadDncConfiguration(
233 BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get AlwaysInstallPrereqs value."); 233 BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get AlwaysInstallPrereqs value.");
234 } 234 }
235 235
236 pState->prereqData.fPerformHelp = !pState->prereqData.fAlwaysInstallPrereqs;
237
236 pState->type = DNCHOSTTYPE_FDD; 238 pState->type = DNCHOSTTYPE_FDD;
237 239
238 hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost); 240 hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost);