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/exeengine.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 '')
| -rw-r--r-- | src/burn/engine/exeengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp index 1168f5ea..ef0015ac 100644 --- a/src/burn/engine/exeengine.cpp +++ b/src/burn/engine/exeengine.cpp | |||
| @@ -434,6 +434,7 @@ extern "C" HRESULT ExeEngineExecutePackage( | |||
| 434 | LPWSTR* argvArp = NULL; | 434 | LPWSTR* argvArp = NULL; |
| 435 | BOOTSTRAPPER_PACKAGE_STATE applyState = BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN; | 435 | BOOTSTRAPPER_PACKAGE_STATE applyState = BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN; |
| 436 | HANDLE hExecutableFile = INVALID_HANDLE_VALUE; | 436 | HANDLE hExecutableFile = INVALID_HANDLE_VALUE; |
| 437 | BURN_PIPE_CONNECTION connection = { }; | ||
| 437 | DWORD dwExitCode = 0; | 438 | DWORD dwExitCode = 0; |
| 438 | BURN_PACKAGE* pPackage = pExecuteAction->exePackage.pPackage; | 439 | BURN_PACKAGE* pPackage = pExecuteAction->exePackage.pPackage; |
| 439 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; | 440 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; |
| @@ -633,7 +634,7 @@ extern "C" HRESULT ExeEngineExecutePackage( | |||
| 633 | 634 | ||
| 634 | if (!pPackage->Exe.fFireAndForget && BURN_EXE_PROTOCOL_TYPE_BURN == pPackage->Exe.protocol) | 635 | if (!pPackage->Exe.fFireAndForget && BURN_EXE_PROTOCOL_TYPE_BURN == pPackage->Exe.protocol) |
| 635 | { | 636 | { |
| 636 | hr = EmbeddedRunBundle(sczExecutablePath, sczBaseCommand, sczUserArgs, pfnGenericMessageHandler, pvContext, &dwExitCode); | 637 | hr = EmbeddedRunBundle(&connection, sczExecutablePath, sczBaseCommand, sczUserArgs, pfnGenericMessageHandler, pvContext, &dwExitCode); |
| 637 | ExitOnFailure(hr, "Failed to run exe with Burn protocol from path: %ls", sczExecutablePath); | 638 | ExitOnFailure(hr, "Failed to run exe with Burn protocol from path: %ls", sczExecutablePath); |
| 638 | } | 639 | } |
| 639 | else if (!pPackage->Exe.fFireAndForget && BURN_EXE_PROTOCOL_TYPE_NETFX4 == pPackage->Exe.protocol) | 640 | else if (!pPackage->Exe.fFireAndForget && BURN_EXE_PROTOCOL_TYPE_NETFX4 == pPackage->Exe.protocol) |
