diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index aaa94efed..4eae7c0ee 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp @@ -197,6 +197,9 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati hr = BalGetStringVariable(L"WixBundleVersion", &m_sczBundleVersion); BalExitOnFailure(hr, "CWixStandardBootstrapperApplication initialization failed."); + hr = InitializeData(); + BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application."); + #ifdef TODO_REWRITE // TODO: need to load the m_pPrereqData #endif @@ -2734,9 +2737,6 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati hr = ThemeInitialize(pThis->m_hModule); BalExitOnFailure(hr, "Failed to initialize theme manager."); - hr = pThis->InitializeData(); - BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application."); - // Create main window. pThis->InitializeTaskbarButton(); hr = pThis->CreateMainWindow(); @@ -4781,8 +4781,8 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati // TODO: load this data OnCreate(). m_pPrereqData = NULL; m_fPrereq = NULL != m_pPrereqData; - m_fPreplanPrereqs = FALSE; m_fPerformHelp = !m_fPrereq || m_pPrereqData->fPerformHelp; + m_fPreplanPrereqs = FALSE; m_fPrereqPackagePlanned = FALSE; m_fPrereqInstalled = FALSE; m_fPrereqSkipped = FALSE; diff --git a/src/ext/Bal/wixstdba/wixstdba.manifest b/src/ext/Bal/wixstdba/wixstdba.manifest index b56db2c46..4db8767d8 100644 --- a/src/ext/Bal/wixstdba/wixstdba.manifest +++ b/src/ext/Bal/wixstdba/wixstdba.manifest @@ -1,7 +1,7 @@ - WiX Toolset Standard Bootstrapper Application + WiX Toolset Bootstrapper Applications diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs index f12c9461a..7c3b5f738 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs +++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs @@ -1,9 +1,9 @@  - - + @@ -11,6 +11,8 @@ + + diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs index 1e04ed2f0..c7003a2a4 100644 --- a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs +++ b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs @@ -110,7 +110,7 @@ public static Message TooManyBootstrapperApplications(SourceLineNumber sourceLin { var secondary = symbol.Secondary == true ? "secondary " : String.Empty; - return Message(sourceLineNumbers, Ids.MultipleSingletonSymbolsFound, "Multiple {1}BootstrapperApplications defined. You can have at most one BootstrapperAppplication of primary and secondary.", secondary); + return Message(sourceLineNumbers, Ids.MultipleSingletonSymbolsFound, "Multiple {0}BootstrapperApplications defined. You can have at most one BootstrapperAppplication of primary and secondary.", secondary); } public static Message BundleMissingBootstrapperApplicationContainer(SourceLineNumber sourceLineNumbers, string path)