New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIXBUG:4647 - Format ConfirmCancelMessage in WixStdBA #204

Merged
merged 1 commit into from Feb 10, 2015
Jump to file or symbol
Failed to load files and symbols.
+12 −0
Diff settings

Always

Just for now

View
@@ -1,3 +1,5 @@
* SeanHall: WIXBUG:4647 - Format ConfirmCancelMessage in WixStdBA.
* SeanHall: WIXBUG:4480 - Remove non-standard and unnecessary regex contructs from wix.xsd.
## WixBuild: Version 3.10.0.1403
@@ -1172,6 +1172,7 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
{
HRESULT hr = S_OK;
LPWSTR sczLocPath = NULL;
LPWSTR sczFormatted = NULL;
LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl";
hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath);
@@ -1191,7 +1192,16 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
hr = LocLocalizeString(m_pWixLoc, &m_sczConfirmCloseMessage);
BalExitOnFailure1(hr, "Failed to localize confirm close message: %ls", m_sczConfirmCloseMessage);
hr = BalFormatString(m_sczConfirmCloseMessage, &sczFormatted);
if (SUCCEEDED(hr))
{
ReleaseStr(m_sczConfirmCloseMessage);
m_sczConfirmCloseMessage = sczFormatted;
sczFormatted = NULL;
}
LExit:
ReleaseStr(sczFormatted);
ReleaseStr(sczLocPath);
return hr;