diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-29 19:31:01 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-29 19:53:29 +1000 |
commit | b7faab06259d3afdc3205024a0004ace72157cbe (patch) | |
tree | 4d9797f017b564c0fe6e8a602950c876daba612f /src/wixstdba/wixstdba.cpp | |
parent | 39e930d9aaff250e0fd5019eeedaa40717a6c6fe (diff) | |
download | wix-b7faab06259d3afdc3205024a0004ace72157cbe.tar.gz wix-b7faab06259d3afdc3205024a0004ace72157cbe.tar.bz2 wix-b7faab06259d3afdc3205024a0004ace72157cbe.zip |
Treat failing to load SCD like mbahost treats .NET 4.5.2 on Win7 RTM.
Diffstat (limited to 'src/wixstdba/wixstdba.cpp')
-rw-r--r-- | src/wixstdba/wixstdba.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp index 2767c74e..727c8cb0 100644 --- a/src/wixstdba/wixstdba.cpp +++ b/src/wixstdba/wixstdba.cpp | |||
@@ -55,6 +55,32 @@ extern "C" void WINAPI BootstrapperApplicationDestroy() | |||
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | extern "C" HRESULT WINAPI DncPrereqBootstrapperApplicationCreate( | ||
59 | __in HRESULT hrHostInitialization, | ||
60 | __in IBootstrapperEngine* pEngine, | ||
61 | __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, | ||
62 | __inout BOOTSTRAPPER_CREATE_RESULTS* pResults | ||
63 | ) | ||
64 | { | ||
65 | HRESULT hr = S_OK; | ||
66 | |||
67 | BalInitialize(pEngine); | ||
68 | |||
69 | hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); | ||
70 | BalExitOnFailure(hr, "Failed to create .NET Core prerequisite bootstrapper application interface."); | ||
71 | |||
72 | LExit: | ||
73 | return hr; | ||
74 | } | ||
75 | |||
76 | |||
77 | extern "C" void WINAPI DncPrereqBootstrapperApplicationDestroy() | ||
78 | { | ||
79 | ReleaseNullObject(vpApplication); | ||
80 | BalUninitialize(); | ||
81 | } | ||
82 | |||
83 | |||
58 | extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( | 84 | extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( |
59 | __in HRESULT hrHostInitialization, | 85 | __in HRESULT hrHostInitialization, |
60 | __in IBootstrapperEngine* pEngine, | 86 | __in IBootstrapperEngine* pEngine, |