Support dual-purpose packages in Burn.bob/ConfigurableScopeBundles

Fixes https://github.com/wixtoolset/issues/issues/8958

2 files changed, 9 insertions, 8 deletions

diff --git a/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
index bae098d4..e746ff75 100644
--- a/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
@@ -708,7 +708,10 @@ private:
 
         m_plannedAction = action;
 
-        hr = m_pEngine->Plan(action);
+        // InternalUiBootstrapperApplication isn't in a position to let the user
+        // choose the scope, so we use the default. Unfortunately, a scope choice
+        // in the MSI UI can't "flow" back to affect bundle scope.
+        hr = m_pEngine->Plan(action, BOOTSTRAPPER_SCOPE_DEFAULT);
         BalExitOnFailure(hr, "Failed to start planning packages.");
 
     LExit:
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index c1e8b2b3..74c6b4db 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -3420,7 +3420,7 @@ private:
 
 
     static LRESULT CallDefaultWndProc(
-        __in CWixStandardBootstrapperApplication* pBA,
+        __in_opt CWixStandardBootstrapperApplication* pBA,
         __in HWND hWnd,
         __in UINT uMsg,
         __in WPARAM wParam,
@@ -3824,7 +3824,7 @@ private:
 
         SetState(WIXSTDBA_STATE_PLANNING, hr);
 
-        hr = m_pEngine->Plan(action);
+        hr = m_pEngine->Plan(action, BOOTSTRAPPER_SCOPE_DEFAULT/*TODO*/);
         BalExitOnFailure(hr, "Failed to start planning packages.");
 
     LExit:
@@ -3848,7 +3848,7 @@ private:
 
         SetState(WIXSTDBA_STATE_PLANNING_PREREQS, hr);
 
-        hr = m_pEngine->Plan(action);
+        hr = m_pEngine->Plan(action, BOOTSTRAPPER_SCOPE_DEFAULT);
         BalExitOnFailure(hr, "Failed to start planning prereq packages.");
 
     LExit:
@@ -4546,6 +4546,8 @@ LExit:
         __out DWORD* pdwPageId
         )
     {
+        *pdwPageId = 0;
+
         if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_commandDisplay)
         {
             switch (state)
@@ -4574,10 +4576,6 @@ LExit:
             case WIXSTDBA_STATE_EXECUTED:
                 *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS];
                 break;
-
-            default:
-                *pdwPageId = 0;
-                break;
             }
         }
         else if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay)