aboutsummaryrefslogtreecommitdiff
path: root/src/wixstdba/wixstdba.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-03-30 19:25:36 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-03-30 21:47:13 +1000
commitd5b89ecb2ba931cd5429e00a78b9457f8a63c6d2 (patch)
tree8e63d6e71579a143e10a8715d3b73089bb71855a /src/wixstdba/wixstdba.cpp
parent16f6a68d0bb1a0d5892a8cef10b835acc4e2a317 (diff)
downloadwix-d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2.tar.gz
wix-d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2.tar.bz2
wix-d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2.zip
Upgrade to latest dependencies.
Stop skipping CanBuildUsingWixStdBa. Fix memory leak in wixstdba.
Diffstat (limited to 'src/wixstdba/wixstdba.cpp')
-rw-r--r--src/wixstdba/wixstdba.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp
index f47c1f4e..2767c74e 100644
--- a/src/wixstdba/wixstdba.cpp
+++ b/src/wixstdba/wixstdba.cpp
@@ -3,6 +3,7 @@
3#include "precomp.h" 3#include "precomp.h"
4 4
5static HINSTANCE vhInstance = NULL; 5static HINSTANCE vhInstance = NULL;
6static IBootstrapperApplication* vpApplication = NULL;
6 7
7extern "C" BOOL WINAPI DllMain( 8extern "C" BOOL WINAPI DllMain(
8 IN HINSTANCE hInstance, 9 IN HINSTANCE hInstance,
@@ -37,7 +38,7 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
37 hr = BalInitializeFromCreateArgs(pArgs, &pEngine); 38 hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
38 ExitOnFailure(hr, "Failed to initialize Bal."); 39 ExitOnFailure(hr, "Failed to initialize Bal.");
39 40
40 hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults); 41 hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults, &vpApplication);
41 BalExitOnFailure(hr, "Failed to create bootstrapper application interface."); 42 BalExitOnFailure(hr, "Failed to create bootstrapper application interface.");
42 43
43LExit: 44LExit:
@@ -49,6 +50,7 @@ LExit:
49 50
50extern "C" void WINAPI BootstrapperApplicationDestroy() 51extern "C" void WINAPI BootstrapperApplicationDestroy()
51{ 52{
53 ReleaseNullObject(vpApplication);
52 BalUninitialize(); 54 BalUninitialize();
53} 55}
54 56
@@ -64,7 +66,7 @@ extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate(
64 66
65 BalInitialize(pEngine); 67 BalInitialize(pEngine);
66 68
67 hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults); 69 hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication);
68 BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface."); 70 BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface.");
69 71
70LExit: 72LExit:
@@ -74,5 +76,6 @@ LExit:
74 76
75extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy() 77extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy()
76{ 78{
79 ReleaseNullObject(vpApplication);
77 BalUninitialize(); 80 BalUninitialize();
78} 81}