Provide Bundle Icon in BA container and update wixstdba to use itHEADmain

Fixes 8104

2 files changed, 35 insertions, 0 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
index 45e4fc51..14e20c0d 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
@@ -567,6 +567,19 @@ void DAPI ThemeInitializeWindowClass(
     );
 
 /********************************************************************
+ ThemeInitializeWindowClassEx - sets defaults for the window class
+                                from the given theme.
+
+*******************************************************************/
+void DAPI ThemeInitializeWindowClassEx(
+    __in THEME* pTheme,
+    __in WNDCLASSEXW* pWndClass,
+    __in WNDPROC pfnWndProc,
+    __in HINSTANCE hInstance,
+    __in LPCWSTR wzClassName
+    );
+
+/********************************************************************
  ThemeCreateParentWindow - creates a parent window for the theme.
 
 *******************************************************************/
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index a7a7e45b..4482c96e 100644
--- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -856,6 +856,28 @@ DAPI_(void) ThemeInitializeWindowClass(
 }
 
 
+DAPI_(void) ThemeInitializeWindowClassEx(
+    __in THEME* pTheme,
+    __in WNDCLASSEXW* pWndClass,
+    __in WNDPROC pfnWndProc,
+    __in HINSTANCE hInstance,
+    __in LPCWSTR wzClassName
+    )
+{
+    pWndClass->cbSize = sizeof(WNDCLASSEXW);
+    pWndClass->style = CS_HREDRAW | CS_VREDRAW;
+    pWndClass->cbWndExtra = DLGWINDOWEXTRA;
+    pWndClass->hCursor = ::LoadCursorW(NULL, (LPCWSTR)IDC_ARROW);
+
+    pWndClass->lpfnWndProc = pfnWndProc;
+    pWndClass->hInstance = hInstance;
+    pWndClass->lpszClassName = wzClassName;
+
+    pWndClass->hIcon = reinterpret_cast<HICON>(pTheme->hIcon);
+    pWndClass->hbrBackground = pTheme->rgFonts[pTheme->dwFontId].hBackground;
+}
+
+
 DAPI_(HRESULT) ThemeCreateParentWindow(
     __in THEME* pTheme,
     __in DWORD dwExStyle,