From b4b87987bb86338833f85e888f7b7ab0bbc928fa Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Thu, 20 Jan 2022 15:17:21 +0800
Subject: [PATCH] comctl32/listview: Support themed check boxes for
 LVS_EX_CHECKBOXES style.

Fix check boxes in the list items of 7-zip options dialog not being themed even when theming is on.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/comctl32/listview.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 9e35f7879b7..044e64bfa53 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -139,6 +139,7 @@
 #include "commctrl.h"
 #include "comctl32.h"
 #include "uxtheme.h"
+#include "vsstyle.h"
 #include "shlwapi.h"
 
 #include "wine/debug.h"
@@ -8424,15 +8425,62 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx)
  * Creates the checkbox imagelist.  Helper for LISTVIEW_SetExtendedListViewStyle
  *
  */
+static HIMAGELIST LISTVIEW_CreateThemedCheckBoxImageList(const LISTVIEW_INFO *info)
+{
+    HBITMAP bitmap, old_bitmap;
+    HIMAGELIST image_list;
+    HDC hdc, mem_hdc;
+    HTHEME theme;
+    RECT rect;
+    SIZE size;
+
+    if (!GetWindowTheme(info->hwndSelf))
+        return NULL;
+
+    theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwndSelf));
+    if (!theme)
+        return NULL;
+
+    hdc = GetDC(info->hwndSelf);
+    GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size);
+    SetRect(&rect, 0, 0, size.cx, size.cy);
+    image_list = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 2, 2);
+    mem_hdc = CreateCompatibleDC(hdc);
+    bitmap = CreateCompatibleBitmap(hdc, size.cx, size.cy);
+    old_bitmap = SelectObject(mem_hdc, bitmap);
+    ReleaseDC(info->hwndSelf, hdc);
+
+    if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL))
+        FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1));
+    DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL);
+    ImageList_Add(image_list, bitmap, NULL);
+
+    if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_CHECKEDNORMAL))
+        FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1));
+    DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL);
+    ImageList_Add(image_list, bitmap, NULL);
+
+    SelectObject(mem_hdc, old_bitmap);
+    DeleteObject(bitmap);
+    DeleteDC(mem_hdc);
+    CloseThemeData(theme);
+    return image_list;
+}
+
 static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr)
 {
     HDC hdc_wnd, hdc;
     HBITMAP hbm_im, hbm_mask, hbm_orig;
     RECT rc;
-    HBRUSH hbr_white = GetStockObject(WHITE_BRUSH);
-    HBRUSH hbr_black = GetStockObject(BLACK_BRUSH);
+    HBRUSH hbr_white, hbr_black;
     HIMAGELIST himl;
 
+    himl = LISTVIEW_CreateThemedCheckBoxImageList(infoPtr);
+    if (himl)
+        return himl;
+
+    hbr_white = GetStockObject(WHITE_BRUSH);
+    hbr_black = GetStockObject(BLACK_BRUSH);
     himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
                             ILC_COLOR | ILC_MASK, 2, 2);
     hdc_wnd = GetDC(infoPtr->hwndSelf);
-- 
2.11.4.GIT