aboutsummaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-11-10 14:37:55 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-11-10 17:33:25 -0600
commit0013447068dfde42c60fa802e5387e9bc4d0b2e2 (patch)
tree012f04462429e318f433f8885fac544ec488472e /src/libs
parent9d3af7547bb790d39157dd36dfa862a1abf47beb (diff)
downloadwix-0013447068dfde42c60fa802e5387e9bc4d0b2e2.tar.gz
wix-0013447068dfde42c60fa802e5387e9bc4d0b2e2.tar.bz2
wix-0013447068dfde42c60fa802e5387e9bc4d0b2e2.zip
Move ImageList element back under Theme since it's not a control.
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/thmutil.cpp8
1 files changed, 4 insertions, 4 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(
1834 hr = ParseImages(hModule, wzRelativePath, pThemeElement, pTheme); 1834 hr = ParseImages(hModule, wzRelativePath, pThemeElement, pTheme);
1835 ThmExitOnFailure(hr, "Failed to parse theme images."); 1835 ThmExitOnFailure(hr, "Failed to parse theme images.");
1836 1836
1837 // Parse any image lists.
1838 hr = ParseImageLists(hModule, wzRelativePath, pThemeElement, pTheme);
1839 ThmExitOnFailure(hr, "Failed to parse image lists.");
1840
1837 // Parse the window element. 1841 // Parse the window element.
1838 hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme); 1842 hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme);
1839 ThmExitOnFailure(hr, "Failed to parse theme window element."); 1843 ThmExitOnFailure(hr, "Failed to parse theme window element.");
@@ -2598,10 +2602,6 @@ static HRESULT ParseWindow(
2598 ThmExitWithRootFailure(hr, E_INVALIDDATA, "Window elements must contain either the Caption or StringId attribute."); 2602 ThmExitWithRootFailure(hr, E_INVALIDDATA, "Window elements must contain either the Caption or StringId attribute.");
2599 } 2603 }
2600 2604
2601 // Parse any image lists.
2602 hr = ParseImageLists(hModule, wzRelativePath, pixn, pTheme);
2603 ThmExitOnFailure(hr, "Failed to parse image lists.");
2604
2605 // Parse the pages. 2605 // Parse the pages.
2606 hr = ParsePages(hModule, wzRelativePath, pixn, pTheme); 2606 hr = ParsePages(hModule, wzRelativePath, pixn, pTheme);
2607 ThmExitOnFailure(hr, "Failed to parse theme pages."); 2607 ThmExitOnFailure(hr, "Failed to parse theme pages.");