Make thmutil automatically load controls during window creation.

Add control loaded event.

3 files changed, 234 insertions, 48 deletions

diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
index a5bcba3e..8304403a 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
@@ -230,18 +230,14 @@ private:
             return lres;
         }
 
-        case WM_CREATE:
-            if (!pBaf->OnCreate(hWnd))
-            {
-                return -1;
-            }
-            break;
-
         case WM_THMUTIL_LOADING_CONTROL:
             return pBaf->OnThemeLoadingControl(reinterpret_cast<THEME_LOADINGCONTROL_ARGS*>(wParam), reinterpret_cast<THEME_LOADINGCONTROL_RESULTS*>(lParam));
 
+        case WM_THMUTIL_LOADED_CONTROL:
+            return pBaf->OnThemeLoadedControl(hWnd, reinterpret_cast<THEME_LOADEDCONTROL_ARGS*>(wParam), reinterpret_cast<THEME_LOADEDCONTROL_RESULTS*>(lParam));
+
         case WM_TIMER:
-            if (!lParam && pBaf)
+            if (!lParam && BAFTHMUTILTESTING_CONTROL_PROGRESSBAR_IMAGE == wParam && pBaf)
             {
                 pBaf->UpdateProgressBarProgress();
 
@@ -253,33 +249,14 @@ private:
         return ThemeDefWindowProc(pBaf ? pBaf->m_pBafTheme : NULL, hWnd, uMsg, wParam, lParam);
     }
 
-    BOOL OnCreate(
-        __in HWND hWnd
+    HRESULT OnCreatedListView(
+        __in HWND hWndListView
         )
     {
         HRESULT hr = S_OK;
         LVITEMW lvitem = { };
         LVGROUP lvgroup = { };
         static UINT puColumns[] = { 0, 1, 2 };
-        HWND hwndTopLeft = NULL;
-        HWND hwndTopRight = NULL;
-        HWND hwndBottomLeft = NULL;
-        HWND hwndBottomRight = NULL;
-
-        hr = ThemeLoadControls(m_pBafTheme);
-        BalExitOnFailure(hr, "Failed to load theme controls.");
-
-        hwndTopLeft = ::GetDlgItem(m_pBafTheme->hwndParent, BAFTHMUTILTESTING_CONTROL_LISTVIEW_TOP_LEFT);
-        BalExitOnNull(hwndTopLeft, hr, E_INVALIDSTATE, "Failed to get top left list view hWnd.");
-
-        hwndTopRight = ::GetDlgItem(m_pBafTheme->hwndParent, BAFTHMUTILTESTING_CONTROL_LISTVIEW_TOP_RIGHT);
-        BalExitOnNull(hwndTopRight, hr, E_INVALIDSTATE, "Failed to get top right list view hWnd.");
-
-        hwndBottomLeft = ::GetDlgItem(m_pBafTheme->hwndParent, BAFTHMUTILTESTING_CONTROL_LISTVIEW_BOTTOM_LEFT);
-        BalExitOnNull(hwndBottomLeft, hr, E_INVALIDSTATE, "Failed to get bottom left list view hWnd.");
-
-        hwndBottomRight = ::GetDlgItem(m_pBafTheme->hwndParent, BAFTHMUTILTESTING_CONTROL_LISTVIEW_BOTTOM_RIGHT);
-        BalExitOnNull(hwndBottomRight, hr, E_INVALIDSTATE, "Failed to get bottom right list view hWnd.");
 
         lvgroup.cbSize = sizeof(LVGROUP);
         lvgroup.mask = LVGF_GROUPID | LVGF_TITLEIMAGE | LVGF_DESCRIPTIONTOP | LVGF_HEADER;
@@ -295,10 +272,7 @@ private:
             hr = StrAllocFormatted(&lvgroup.pszHeader, L"Header_%d", i);
             BalExitOnFailure(hr, "Failed to alloc list view group header.");
 
-            ListView_InsertGroup(hwndTopLeft, -1, &lvgroup);
-            ListView_InsertGroup(hwndTopRight, -1, &lvgroup);
-            ListView_InsertGroup(hwndBottomLeft, -1, &lvgroup);
-            ListView_InsertGroup(hwndBottomRight, -1, &lvgroup);
+            ListView_InsertGroup(hWndListView, -1, &lvgroup);
 
             lvitem.mask = LVIF_COLUMNS | LVIF_GROUPID | LVIF_IMAGE | LVIF_TEXT;
             lvitem.iItem = i;
@@ -312,10 +286,7 @@ private:
             lvitem.cColumns = countof(puColumns);
             lvitem.puColumns = puColumns;
 
-            ListView_InsertItem(hwndTopLeft, &lvitem);
-            ListView_InsertItem(hwndTopRight, &lvitem);
-            ListView_InsertItem(hwndBottomLeft, &lvitem);
-            ListView_InsertItem(hwndBottomRight, &lvitem);
+            ListView_InsertItem(hWndListView, &lvitem);
 
             for (int j = 0; j < 3; ++j)
             {
@@ -325,23 +296,16 @@ private:
                 hr = StrAllocFormatted(&lvitem.pszText, L"%d_%d", j, i);
                 BalExitOnFailure(hr, "Failed to alloc list view subitem text.");
 
-                ListView_InsertItem(hwndTopLeft, &lvitem);
-                ListView_InsertItem(hwndTopRight, &lvitem);
-                ListView_InsertItem(hwndBottomLeft, &lvitem);
-                ListView_InsertItem(hwndBottomRight, &lvitem);
+                ListView_InsertItem(hWndListView, &lvitem);
             }
         }
 
-        ListView_EnableGroupView(hwndTopRight, TRUE);
-
-        ::SetTimer(hWnd, BAFTHMUTILTESTING_CONTROL_PROGRESSBAR_IMAGE, 500, NULL);
-
     LExit:
         ReleaseStr(lvgroup.pszDescriptionTop);
         ReleaseStr(lvgroup.pszHeader);
         ReleaseStr(lvitem.pszText);
 
-        return SUCCEEDED(hr);
+        return hr;
     }
 
     BOOL OnThemeLoadingControl(
@@ -349,17 +313,60 @@ private:
         __in THEME_LOADINGCONTROL_RESULTS* pResults
         )
     {
+        HRESULT hr = S_OK;
+        BOOL fProcessed = FALSE;
+        
         for (DWORD iAssignControl = 0; iAssignControl < countof(vrgInitControls); ++iAssignControl)
         {
             if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pArgs->pThemeControl->sczName, -1, vrgInitControls[iAssignControl].wzName, -1))
             {
+                fProcessed = TRUE;
                 pResults->wId = vrgInitControls[iAssignControl].wId;
                 break;
             }
         }
 
-        pResults->hr = S_OK;
-        return TRUE;
+        pResults->hr = hr;
+        return fProcessed || FAILED(hr);
+    }
+
+    BOOL OnThemeLoadedControl(
+        __in HWND hWndParent,
+        __in const THEME_LOADEDCONTROL_ARGS* pArgs,
+        __in THEME_LOADEDCONTROL_RESULTS* pResults
+        )
+    {
+        HRESULT hr = S_OK;
+        BOOL fProcessed = FALSE;
+
+        switch (pArgs->pThemeControl->wId)
+        {
+        case BAFTHMUTILTESTING_CONTROL_LISTVIEW_TOP_LEFT:
+        case BAFTHMUTILTESTING_CONTROL_LISTVIEW_TOP_RIGHT:
+        case BAFTHMUTILTESTING_CONTROL_LISTVIEW_BOTTOM_LEFT:
+        case BAFTHMUTILTESTING_CONTROL_LISTVIEW_BOTTOM_RIGHT:
+            fProcessed = TRUE;
+
+            hr = OnCreatedListView(pArgs->pThemeControl->hWnd);
+            ExitOnFailure(hr, "Failed to populate list view.");
+
+            if (BAFTHMUTILTESTING_CONTROL_LISTVIEW_TOP_RIGHT == pArgs->pThemeControl->wId)
+            {
+                ListView_EnableGroupView(pArgs->pThemeControl->hWnd, TRUE);
+            }
+
+            break;
+            
+        case BAFTHMUTILTESTING_CONTROL_PROGRESSBAR_STANDARD:
+            fProcessed = TRUE;
+
+            ::SetTimer(hWndParent, BAFTHMUTILTESTING_CONTROL_PROGRESSBAR_IMAGE, 500, NULL);
+            break;
+        }
+
+    LExit:
+        pResults->hr = hr;
+        return fProcessed || FAILED(hr);
     }
 
     void UpdateProgressBarProgress()
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
index 0d0dabf5..7491ab1c 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
@@ -124,6 +124,27 @@ There are currently four states for a button: default, focus, hover, and selecte
                 <Text>Back</Text>
                 <ChangePageAction Page="Button" />
             </Button>
+            <Button Name="BillboardButton" X="-183" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Next</Text>
+                <ChangePageAction Page="Billboard" />
+            </Button>
+        </Page>
+        <Page Name="Billboard">
+            <Label X="6" Y="6" Width="-6" Height="43" FontId="Default">
+                This page has a billboard. It loops between two panels every 1.5 seconds. Only one button should be visible at all times (this is currently broken).
+            </Label>
+            <Billboard Name="FirstBillboard" X="11" Y="59" Width="-11" Height="-39" Interval="1500" Loop="yes">
+                <BillboardPanel>
+                    <Button Name="FirstBillboardButton1" X="11" Y="11" Width="75" Height="23" TabStop="yes" FontId="Default">First Panel</Button>
+                </BillboardPanel>
+                <BillboardPanel>
+                    <Button Name="FirstBillboardButton2" X="11" Y="39" Width="75" Height="23" TabStop="yes" FontId="Default">Second Panel</Button>
+                </BillboardPanel>
+            </Billboard>
+            <Button Name="BillboardBackButton" X="-269" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Back</Text>
+                <ChangePageAction Page="Progressbar" />
+            </Button>
         </Page>
         <Button Name="StartButton" X="-97" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default" Visible="yes">
             <Text>Start</Text>
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
new file mode 100644
index 00000000..7e360544
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
+    <Font Id="Default" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
+    <Image Id="star_transparent.bmp" ImageFile="star_transparent.bmp" />
+    <Image Id="star_opaque.bmp" ImageFile="star_opaque.bmp" />
+    <Image Id="star_transparent.png" ImageFile="star_transparent.png" />
+    <Image Id="square_default" ImageFile="16x16.png">
+        <AlternateResolution ImageFile="32x32.png" />
+        <AlternateResolution ImageFile="64x64.png" />
+        <AlternateResolution ImageFile="128x128.png" />
+        <AlternateResolution ImageFile="256x256.png" />
+    </Image>
+    <Image Id="square_focus" ImageFile="64x64_focus.png">
+        <AlternateResolution ImageFile="128x128_focus.png" />
+        <AlternateResolution ImageFile="256x256_focus.png" />
+    </Image>
+    <Image Id="square_hover" ImageFile="64x64_hover.png">
+        <AlternateResolution ImageFile="128x128_hover.png" />
+        <AlternateResolution ImageFile="256x256_hover.png" />
+    </Image>
+    <Image Id="square_selected" ImageFile="64x64_selected.png">
+        <AlternateResolution ImageFile="128x128_selected.png" />
+        <AlternateResolution ImageFile="256x256_selected.png" />
+    </Image>
+    <Image Id="progressbar" ImageFile="progressbar.bmp" />
+    <Image Id="progressbar_reverse" ImageFile="progressbar_reverse.bmp" />
+
+    <Window Width="600" Height="450" FontId="Default" Caption="BafThmUtilTestingTheme" HexStyle="10cf0000" AutoResize="yes">
+        <ImageList Name="Stars">
+            <ImageListItem ImageFile="star_transparent.bmp" />
+            <ImageListItem ImageFile="star_opaque.bmp" />
+            <ImageListItem ImageFile="star_transparent.png" />
+        </ImageList>
+        <Page Name="Transparency">
+            <Label X="6" Y="6" Width="-6" Height="94" FontId="Default">
+                This page has three versions of an image. The top image is a bitmap with a transparent background, the yellow star should be visible but its black background should not (this is currently broken). The middle image is the same bitmap except the black background is fully opaque so the yellow star should be visible on a black background. The bottom image in a PNG version of the top image and should look exactly the same.
+            </Label>
+            <ImageControl X="6" Y="106" Width="64" Height="64" ImageId="star_transparent.bmp" />
+            <ImageControl X="6" Y="176" Width="64" Height="64" ImageId="star_opaque.bmp" />
+            <ImageControl X="6" Y="246" Width="64" Height="64" ImageId="star_transparent.png" />
+            <Button Name="ListViewButton" X="-183" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Next</Text>
+                <ChangePageAction Page="ListView" />
+            </Button>
+        </Page>
+        <Page Name="ListView">
+            <Label X="6" Y="6" Width="-6" Height="18" FontId="Default">
+                This page is for testing ListView.
+            </Label>
+            <ListView Name="ListViewTopLeft" X="6" Y="30" Width="288" Height="176" FontId="Default" HexStyle="00" ImageList="Stars">
+                <Column Width="100">TL One</Column>
+                <Column Width="100">TL Two</Column>
+                <Column Width="88">TL Three</Column>
+            </ListView>
+            <ListView Name="ListViewTopRight" X="300" Y="30" Width="-11" Height="176" FontId="Default" HexStyle="01" ImageListGroupHeader="Stars">
+                <Column Width="100">TR One</Column>
+                <Column Width="100">TR Two</Column>
+                <Column Width="88" Expands="yes">TR Exp</Column>
+            </ListView>
+            <ListView Name="ListViewBottomLeft" X="6" Y="212" Width="288" Height="176" FontId="Default" HexStyle="02" ImageListSmall="Stars">
+                <Column Width="100">BL One</Column>
+                <Column Width="100">BL Two</Column>
+                <Column Width="88">BL Three</Column>
+            </ListView>
+            <ListView Name="ListViewBottomRight" X="300" Y="212" Width="-11" Height="176" FontId="Default" HexStyle="03">
+                <Column Width="100">BR One</Column>
+                <Column Width="100">BR Two</Column>
+                <Column Width="88" Expands="yes">BR Exp</Column>
+            </ListView>
+            <Button Name="ListViewBackButton" X="-269" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Back</Text>
+                <ChangePageAction Page="Transparency" />
+            </Button>
+            <Button Name="ButtonButton" X="-183" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Next</Text>
+                <ChangePageAction Page="Button" />
+            </Button>
+        </Page>
+        <Page Name="Button">
+            <Label X="6" Y="6" Width="-6" Height="132" FontId="Default">
+                This page is for testing graphical buttons. The left image is 16x16 at 100% scaling, the middle image is 32x32 at 100% scaling. The images for the buttons display their dimensions, so the left should be 16x16 at 100% but 32x32 at 200%. The right button starts at 32x32 at 100%, but grows and shrinks with the window and its image should also change.
+
+There are currently four states for a button: default, focus, hover, and selected (in that priority order). There should be a different image for each state, although the left button should have a focus rectangle over the default image since it didn't specify an image for the focused state.
+            </Label>
+            <Button Name="Square16Button" X="6" Y="140" Width="16" Height="16" FontId="Default" TabStop="yes">
+                <ButtonImage ImageId="square_default" />
+                <ButtonHoverImage ImageId="square_hover" />
+                <ButtonSelectedImage ImageId="square_selected" />
+            </Button>
+            <Button Name="Square32Button" X="54" Y="140" Width="32" Height="32" FontId="Default" TabStop="yes">
+                <ButtonImage ImageId="square_default" />
+                <ButtonFocusImage ImageId="square_focus" />
+                <ButtonHoverImage ImageId="square_hover" />
+                <ButtonSelectedImage ImageId="square_selected" />
+            </Button>
+            <Button Name="SquareExpandButton" X="92" Y="140" Width="-476" Height="-278" FontId="Default" TabStop="yes">
+                <ButtonImage ImageId="square_default" />
+                <ButtonFocusImage ImageId="square_focus" />
+                <ButtonHoverImage ImageId="square_hover" />
+                <ButtonSelectedImage ImageId="square_selected" />
+            </Button>
+            <Button Name="ButtonBackButton" X="-269" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Back</Text>
+                <ChangePageAction Page="ListView" />
+            </Button>
+            <Button Name="ProgressbarButton" X="-183" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Next</Text>
+                <ChangePageAction Page="Progressbar" />
+            </Button>
+        </Page>
+        <Page Name="Progressbar">
+            <Label X="6" Y="6" Width="-6" Height="94" FontId="Default">
+                This page has two progress bars. The top progress bar is a standard control, the bottom one is custom drawn from an image. The bottom one should have its left side one pixel wide as black, the right side one pixel wide as grey, the progress as green, and the remaining as blue. The colors should be reversed when the progress goes backward (this is a way to test different colors, not a standard feature of thmutil).
+            </Label>
+            <Progressbar Name="StandardProgressBar" X="6" Y="106" Width="-6" Height="23" />
+            <Progressbar Name="ImageProgressBar" X="6" Y="141" Width="-6" Height="23">
+                <ProgressbarImage ImageId="progressbar" />
+                <ProgressbarImage ImageId="progressbar_reverse" />
+            </Progressbar>
+            <Button Name="ProgressbarBackButton" X="-269" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Back</Text>
+                <ChangePageAction Page="Button" />
+            </Button>
+            <Button Name="BillboardButton" X="-183" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Next</Text>
+                <ChangePageAction Page="Billboard" />
+            </Button>
+        </Page>
+        <Page Name="Billboard">
+            <Label X="6" Y="6" Width="-6" Height="43" FontId="Default">
+                This page has a billboard. It loops between two panels every 1.5 seconds. Only one button should be visible at all times (this is currently broken).
+            </Label>
+            <Billboard Name="FirstBillboard" X="11" Y="59" Width="-11" Height="-39" Interval="1500" Loop="yes">
+                <BillboardPanel>
+                    <Button Name="FirstBillboardButton1" X="11" Y="11" Width="75" Height="23" TabStop="yes" FontId="Default">First Panel</Button>
+                </BillboardPanel>
+                <BillboardPanel>
+                    <Button Name="FirstBillboardButton2" X="11" Y="39" Width="75" Height="23" TabStop="yes" FontId="Default">Second Panel</Button>
+                </BillboardPanel>
+            </Billboard>
+            <Button Name="BillboardBackButton" X="-269" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default">
+                <Text>Back</Text>
+                <ChangePageAction Page="Progressbar" />
+            </Button>
+        </Page>
+        <Button Name="StartButton" X="-97" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default" Visible="yes">
+            <Text>Start</Text>
+            <ChangePageAction Page="Transparency" />
+        </Button>
+        <Button Name="CloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="Default" Visible="yes">
+            <Text>ThemeClose</Text>
+            <CloseWindowAction />
+        </Button>
+    </Window>
+</Theme>