[PATCH resend 1/2] comctl32/listbox: Don't try to paint non-visible items for multi-column listboxes
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Although these were reviewed and signed off by Nikolay, they slipped through the cracks, so they have been resent. I hope that's not an issue. dlls/comctl32/listbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e71b34d..8fd556c 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1148,6 +1148,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) rect.right += descr->column_width; rect.top = 0; col_pos = descr->page_size - 1; + if (rect.left >= descr->width) break; } else { -- 2.21.0
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 95621b8..52f01a7 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1191,6 +1191,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) rect.right += descr->column_width; rect.top = 0; col_pos = descr->page_size - 1; + if (rect.left >= descr->width) break; } else { -- 2.21.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=53076 Your paranoid android. === debian9 (64 bit WoW report) === user32: win.c:10150: Test failed: Expected foreground window 000E0120, got 00E300D4 win.c:10152: Test failed: GetActiveWindow() = 00000000 win.c:10152: Test failed: GetFocus() = 00000000 win.c:10153: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10154: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. win.c:10162: Test failed: Expected foreground window 000E0120, got 00000000 win.c:10164: Test failed: GetActiveWindow() = 00000000 win.c:10164: Test failed: GetFocus() = 00000000 win.c:10172: Test failed: Received WM_ACTIVATEAPP(1), did not expect it.
participants (2)
-
Gabriel Ivăncescu -
Marvin