From 0013447068dfde42c60fa802e5387e9bc4d0b2e2 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 10 Nov 2021 14:37:55 -0600
Subject: Move ImageList element back under Theme since it's not a control.

---
 src/libs/dutil/WixToolset.DUtil/thmutil.cpp                   |  8 ++++----
 .../Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml | 11 ++++++-----
 .../BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml   | 11 ++++++-----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index b76d6483..b5dfbae4 100644
--- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -1834,6 +1834,10 @@ static HRESULT ParseTheme(
     hr = ParseImages(hModule, wzRelativePath, pThemeElement, pTheme);
     ThmExitOnFailure(hr, "Failed to parse theme images.");
 
+    // Parse any image lists.
+    hr = ParseImageLists(hModule, wzRelativePath, pThemeElement, pTheme);
+    ThmExitOnFailure(hr, "Failed to parse image lists.");
+
     // Parse the window element.
     hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme);
     ThmExitOnFailure(hr, "Failed to parse theme window element.");
@@ -2598,10 +2602,6 @@ static HRESULT ParseWindow(
         ThmExitWithRootFailure(hr, E_INVALIDDATA, "Window elements must contain either the Caption or StringId attribute.");
     }
 
-    // Parse any image lists.
-    hr = ParseImageLists(hModule, wzRelativePath, pixn, pTheme);
-    ThmExitOnFailure(hr, "Failed to parse image lists.");
-
     // Parse the pages.
     hr = ParsePages(hModule, wzRelativePath, pixn, pTheme);
     ThmExitOnFailure(hr, "Failed to parse theme pages.");
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
index 7491ab1c..104474b8 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
@@ -28,12 +28,13 @@
     <Image Id="progressbar" ImageResource="30" />
     <Image Id="progressbar_reverse" ImageResource="31" />
 
+    <ImageList Name="Stars">
+        <ImageListItem ImageResource="2" />
+        <ImageListItem ImageResource="3" />
+        <ImageListItem ImageResource="4" />
+    </ImageList>
+
     <Window Width="600" Height="450" FontId="Default" Caption="BafThmUtilTestingTheme" HexStyle="10cf0000" AutoResize="yes">
-        <ImageList Name="Stars">
-            <ImageListItem ImageResource="2" />
-            <ImageListItem ImageResource="3" />
-            <ImageListItem ImageResource="4" />
-        </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.
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
index 7e360544..718571db 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
@@ -28,12 +28,13 @@
     <Image Id="progressbar" ImageFile="progressbar.bmp" />
     <Image Id="progressbar_reverse" ImageFile="progressbar_reverse.bmp" />
 
+    <ImageList Name="Stars">
+        <ImageListItem ImageFile="star_transparent.bmp" />
+        <ImageListItem ImageFile="star_opaque.bmp" />
+        <ImageListItem ImageFile="star_transparent.png" />
+    </ImageList>
+
     <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.
-- 
cgit v1.2.3-55-g6feb