diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-29 10:29:30 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-29 15:08:37 -0500 |
commit | 67e32a09c7ea80ba76d4278bbac46f63489e2f5e (patch) | |
tree | 269e7f91b778d28182a8c8bee159f5b2f0727b27 /src/burn/engine/bundlepackageengine.cpp | |
parent | ec413164bd0285d1e9b9d36538974641a109b579 (diff) | |
download | wix-67e32a09c7ea80ba76d4278bbac46f63489e2f5e.tar.gz wix-67e32a09c7ea80ba76d4278bbac46f63489e2f5e.tar.bz2 wix-67e32a09c7ea80ba76d4278bbac46f63489e2f5e.zip |
Make Burn ignore unknown embedded messages.
Diffstat (limited to 'src/burn/engine/bundlepackageengine.cpp')
-rw-r--r-- | src/burn/engine/bundlepackageengine.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/burn/engine/bundlepackageengine.cpp b/src/burn/engine/bundlepackageengine.cpp index 7ae12a1e..dafe1967 100644 --- a/src/burn/engine/bundlepackageengine.cpp +++ b/src/burn/engine/bundlepackageengine.cpp | |||
@@ -763,8 +763,7 @@ static HRESULT ExecuteBundle( | |||
763 | LPWSTR* argvArp = NULL; | 763 | LPWSTR* argvArp = NULL; |
764 | BOOL fRegistered = FALSE; | 764 | BOOL fRegistered = FALSE; |
765 | HANDLE hExecutableFile = INVALID_HANDLE_VALUE; | 765 | HANDLE hExecutableFile = INVALID_HANDLE_VALUE; |
766 | STARTUPINFOW si = { }; | 766 | BURN_PIPE_CONNECTION connection = { }; |
767 | PROCESS_INFORMATION pi = { }; | ||
768 | DWORD dwExitCode = 0; | 767 | DWORD dwExitCode = 0; |
769 | GENERIC_EXECUTE_MESSAGE message = { }; | 768 | GENERIC_EXECUTE_MESSAGE message = { }; |
770 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; | 769 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; |
@@ -1006,7 +1005,7 @@ static HRESULT ExecuteBundle( | |||
1006 | 1005 | ||
1007 | if (fRunEmbedded) | 1006 | if (fRunEmbedded) |
1008 | { | 1007 | { |
1009 | hr = EmbeddedRunBundle(sczExecutablePath, sczBaseCommand, sczUserArgs, pfnGenericMessageHandler, pvContext, &dwExitCode); | 1008 | hr = EmbeddedRunBundle(&connection, sczExecutablePath, sczBaseCommand, sczUserArgs, pfnGenericMessageHandler, pvContext, &dwExitCode); |
1010 | ExitOnFailure(hr, "Failed to run bundle as embedded from path: %ls", sczExecutablePath); | 1009 | ExitOnFailure(hr, "Failed to run bundle as embedded from path: %ls", sczExecutablePath); |
1011 | } | 1010 | } |
1012 | else | 1011 | else |
@@ -1033,8 +1032,6 @@ LExit: | |||
1033 | AppFreeCommandLineArgs(argvArp); | 1032 | AppFreeCommandLineArgs(argvArp); |
1034 | } | 1033 | } |
1035 | 1034 | ||
1036 | ReleaseHandle(pi.hThread); | ||
1037 | ReleaseHandle(pi.hProcess); | ||
1038 | ReleaseFileHandle(hExecutableFile); | 1035 | ReleaseFileHandle(hExecutableFile); |
1039 | 1036 | ||
1040 | // Best effort to clear the execute package cache folder and action variables. | 1037 | // Best effort to clear the execute package cache folder and action variables. |