Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4333,7 +4333,14 @@ class CWixStandardBootstrapperApplication : public CBootstrapperApplicationBase
BalExitOnFailure(hr, "Failed to format launch working directory variable: %ls", sczUnformattedLaunchFolder);
}

hr = ShelExec(sczLaunchTarget, sczArguments, L"open", sczLaunchFolder, nCmdShow, m_hWnd, NULL);
// Launch through the shell so the target does not inherit this process's mitigation policies (aka RedirectionGuard).
hr = ShelExecUnelevated(sczLaunchTarget, sczArguments, L"open", sczLaunchFolder, nCmdShow);
if (FAILED(hr) && HRESULT_FROM_WIN32(ERROR_CANCELLED) != hr)
{
BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Could not launch target through the shell, error: 0x%x. Launching directly instead.", hr);

hr = ShelExec(sczLaunchTarget, sczArguments, L"open", sczLaunchFolder, nCmdShow, m_hWnd, NULL);
}
BalExitOnFailure(hr, "Failed to launch target: %ls", sczLaunchTarget);

::PostMessageW(m_hWnd, WM_CLOSE, 0, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/wix/WixToolset.Core/Compiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ private Identifier ParseBinaryElement(XElement node)
{
this.Core.Write(ErrorMessages.StreamNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", id.Id, id.Id.Length, 55));
}
else if (!this.compilingProduct) // if we're not doing a product then we can't be sure that a binary identifier will fit when modularized
else if (!this.compilingProduct && suppressModularization != YesNoType.Yes) // if we're not doing a product and we're not suppressing modularization, then we can't be sure that a binary identifier will fit when modularized
{
if (18 < id.Id.Length)
{
Expand Down
Loading