[PATCH v3 0/2] MR8447: comctl32/listview: Test WM_PAINT with a subclassed header that paints without...

[Zhiyi Zhang (＠zhiyi)]

comctl32/listview: Test WM_PAINT with a subclassed header that paints without validating update regions.

--
  v3: comctl32/listview: Validate header region after painting it.
      comctl32/listview: Test WM_PAINT with a subclassed header that paints without validating update regions.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8447

[PATCH v3 1/2] comctl32/listview: Test WM_PAINT with a subclassed header that paints without validating update regions.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47985
---
 dlls/comctl32/tests/listview.c | 105 +++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 9b738b0976b..eb5adced0a6 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -608,6 +608,16 @@ static const struct message listview_end_label_edit_kill_focus[] = {
     { 0 }
 };
 
+static const struct message subclassed_header_no_validate_wmpaint[] = {
+    { WM_PAINT, sent|id, 0, 0, LISTVIEW_ID },
+    { WM_PAINT, sent|id, 0, 0, HEADER_ID },
+    { WM_NCPAINT, sent|id, 0, 0, HEADER_ID },
+    { WM_ERASEBKGND, sent|id, 0, 0, HEADER_ID },
+    { WM_ERASEBKGND, sent|id|defwinproc, 0, 0, LISTVIEW_ID },
+    { LVM_GETHEADER, sent|id|defwinproc, 0, 0, LISTVIEW_ID },
+    { 0 }
+};
+
 static void hold_key(int vk)
 {
     BYTE kstate[256];
@@ -7689,6 +7699,99 @@ static void test_LVM_GETHOTCURSOR(void)
     DestroyWindow(hwnd);
 }
 
+static LRESULT WINAPI header_subclass_wmpaint_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp)
+{
+    WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA);
+    static LONG defwndproc_counter = 0;
+    struct message msg = {0};
+    LRESULT ret;
+
+    msg.message = message;
+    msg.flags = sent | wparam | lparam;
+    if (defwndproc_counter)
+        msg.flags |= defwinproc;
+    msg.wParam = wp;
+    msg.lParam = lp;
+    msg.id = HEADER_ID;
+    add_message(sequences, LISTVIEW_SEQ_INDEX, &msg);
+
+    /* Handle WM_PAINT by returning directly and not validating update regions */
+    if (message == WM_PAINT)
+        return 0;
+
+    defwndproc_counter++;
+    ret = CallWindowProcA(oldproc, hwnd, message, wp, lp);
+    defwndproc_counter--;
+    return ret;
+}
+
+static LRESULT WINAPI listview_subclass_wmpaint_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp)
+{
+    WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA);
+    RECT rect, header_client_rect, tmp_rect;
+    static LONG defwndproc_counter = 0;
+    struct message msg = {0};
+    int region_type;
+    HWND header;
+    LRESULT ret;
+
+    msg.message = message;
+    msg.flags = sent | wparam | lparam;
+    if (defwndproc_counter)
+        msg.flags |= defwinproc;
+    msg.wParam = wp;
+    msg.lParam = lp;
+    msg.id = LISTVIEW_ID;
+    add_message(sequences, LISTVIEW_SEQ_INDEX, &msg);
+
+    if (message == WM_ERASEBKGND)
+    {
+        region_type = GetClipBox((HDC)wp, &rect);
+        ok(region_type == SIMPLEREGION, "Got unexpected region type %d.\n", region_type);
+
+        header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0);
+        GetClientRect(header, &header_client_rect);
+        todo_wine
+        ok(!IntersectRect(&tmp_rect, &header_client_rect, &rect),
+           "WM_ERASEBKGND dc clip box intersects with the header rectangle.\n");
+    }
+
+    defwndproc_counter++;
+    ret = CallWindowProcA(oldproc, hwnd, message, wp, lp);
+    defwndproc_counter--;
+    return ret;
+}
+
+static void test_WM_PAINT(void)
+{
+    HWND hwnd, header;
+    LVCOLUMNA column;
+    WNDPROC oldproc;
+    LRESULT lr;
+
+    /* Test WM_PAINT with a subclassed header that paints without validating update regions */
+    hwnd = create_listview_control(LVS_REPORT);
+    column.mask = LVCF_WIDTH;
+    column.cx = 100;
+    lr = SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&column);
+    ok(!lr, "LVM_INSERTCOLUMNA failed.\n");
+    flush_events();
+
+    header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0);
+    oldproc = (WNDPROC)SetWindowLongPtrA(header, GWLP_WNDPROC, (LONG_PTR)header_subclass_wmpaint_proc);
+    SetWindowLongPtrA(header, GWLP_USERDATA, (LONG_PTR)oldproc);
+    SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)listview_subclass_wmpaint_proc);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    InvalidateRect(hwnd, NULL, TRUE);
+    lr = SendMessageA(hwnd, WM_PAINT, 0, 0);
+    ok(!lr, "WM_PAINT failed.\n");
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, subclassed_header_no_validate_wmpaint,
+                "Subclassed header WM_PAINT without validating update regions", TRUE);
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(listview)
 {
     ULONG_PTR ctx_cookie;
@@ -7760,6 +7863,7 @@ START_TEST(listview)
     test_custom_sort();
     test_LVM_GETNEXTITEM();
     test_LVM_GETHOTCURSOR();
+    test_WM_PAINT();
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
     {
@@ -7813,6 +7917,7 @@ START_TEST(listview)
     test_LVM_GETHOTCURSOR();
     test_LVM_GETORIGIN(TRUE);
     test_customdraw_background(TRUE);
+    test_WM_PAINT();
 
     uninit_winevent_hook();
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8447

[PATCH v3 2/2] comctl32/listview: Validate header region after painting it.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

If the listview header is a subclassed header that doesn't validate update regions when painting
itself, for example, it paints without calling BeginPaint(), then after calling UpdateWindow() to
paint the header, the update region for the header area is still there. Thus, the BeginPaint() call
for the listview will end up sending a WM_ERASEBKGND to fill the header area, overwriting the
content the subclassed header just painted. Tests show that header area should be validated even
though the subclassed header doesn't do anything in its WM_PAINT handler.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47985
---
 dlls/comctl32/listview.c       | 10 +++++++++-
 dlls/comctl32/tests/listview.c |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index a87a9ae37b2..fd2abfd1928 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -10828,7 +10828,15 @@ static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc)
 	LISTVIEW_UpdateScroll(infoPtr);
     }
 
-    if (infoPtr->hwndHeader)  UpdateWindow(infoPtr->hwndHeader);
+    if (infoPtr->hwndHeader)
+    {
+        RECT rect;
+
+        UpdateWindow(infoPtr->hwndHeader);
+        GetClientRect(infoPtr->hwndHeader, &rect);
+        MapWindowPoints(infoPtr->hwndHeader, infoPtr->hwndSelf, (POINT *)&rect, 2);
+        ValidateRect(infoPtr->hwndSelf, &rect);
+    }
 
     if (hdc) 
         LISTVIEW_Refresh(infoPtr, hdc, NULL);
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index eb5adced0a6..951def8fe0f 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -7751,7 +7751,6 @@ static LRESULT WINAPI listview_subclass_wmpaint_proc(HWND hwnd, UINT message, WP
 
         header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0);
         GetClientRect(header, &header_client_rect);
-        todo_wine
         ok(!IntersectRect(&tmp_rect, &header_client_rect, &rect),
            "WM_ERASEBKGND dc clip box intersects with the header rectangle.\n");
     }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8447