1 files changed, 29 insertions, 6 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
index 32382793..2a7cabb9 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
@@ -75,6 +75,13 @@ typedef enum THEME_CONTROL_TYPE
     THEME_CONTROL_TYPE_TAB,
 } THEME_CONTROL_TYPE;
 
+typedef enum THEME_IMAGE_REFERENCE_TYPE
+{
+    THEME_IMAGE_REFERENCE_TYPE_NONE,
+    THEME_IMAGE_REFERENCE_TYPE_PARTIAL,
+    THEME_IMAGE_REFERENCE_TYPE_COMPLETE,
+} THEME_IMAGE_REFERENCE_TYPE;
+
 typedef enum THEME_SHOW_PAGE_REASON
 {
     THEME_SHOW_PAGE_REASON_DEFAULT,
@@ -100,6 +107,22 @@ struct THEME_COLUMN
 };
 
 
+struct THEME_IMAGE_REFERENCE
+{
+    THEME_IMAGE_REFERENCE_TYPE type;
+    DWORD dwImageInstanceIndex;
+    int nX;
+    int nY;
+    int nHeight;
+    int nWidth;
+};
+
+struct THEME_IMAGE_INSTANCE
+{
+    Gdiplus::Bitmap* pBitmap;
+};
+
+
 struct THEME_TAB
 {
     LPWSTR pszName;
@@ -159,15 +182,13 @@ struct THEME_CONTROL
     int nY;
     int nHeight;
     int nWidth;
-    int nSourceX;
-    int nSourceY;
     UINT uStringId;
 
     LPWSTR sczEnableCondition;
     LPWSTR sczVisibleCondition;
     BOOL fDisableVariableFunctionality;
 
-    Gdiplus::Bitmap* pBitmap;
+    THEME_IMAGE_REFERENCE imageRef;
     HBITMAP hImage;
     HICON hIcon;
 
@@ -293,15 +314,17 @@ struct THEME
     int nMinimumWidth;
     int nWindowHeight;
     int nWindowWidth;
-    int nSourceX;
-    int nSourceY;
     UINT uStringId;
 
-    Gdiplus::Bitmap* pBitmap;
+    DWORD dwSourceImageInstanceIndex;
+    THEME_IMAGE_REFERENCE windowImageRef;
 
     DWORD cFonts;
     THEME_FONT* rgFonts;
 
+    DWORD cStandaloneImages;
+    THEME_IMAGE_INSTANCE* rgStandaloneImages;
+
     DWORD cPages;
     THEME_PAGE* rgPages;