From: Zhiyi Zhang <zzhang(a)codeweavers.com> Fix RoomKey UI freezes. The extra 1 pixel offset causes the application to handle infinite WM_PAINT messages. --- dlls/user32/tests/scroll.c | 2 -- dlls/win32u/scroll.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 3bf6d8f6eba..11178585c84 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -288,7 +288,6 @@ static void test_GetScrollBarInfo(void) width = sbi.rcScrollBar.right - sbi.rcScrollBar.left; GetClientRect( hMainWnd, &rect ); expected_width = rect.right - rect.left; - todo_wine ok( width == expected_width, "Expected width %d, got %d.\n", expected_width, width ); /* Test height when WS_HSCROLL is present */ @@ -299,7 +298,6 @@ static void test_GetScrollBarInfo(void) height = sbi.rcScrollBar.bottom - sbi.rcScrollBar.top; GetClientRect( hMainWnd, &rect ); expected_height = rect.bottom - rect.top; - todo_wine ok( height == expected_height, "Expected height %d, got %d.\n", expected_height, height ); DestroyWindow(hScroll); diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 8db26fc8aa6..719cd5bfc5e 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -199,7 +199,6 @@ static BOOL get_scroll_bar_rect( HWND hwnd, int bar, RECT *rect, int *arrow_size get_client_rect_rel( hwnd, COORDS_WINDOW, rect, get_thread_dpi() ); rect->top = rect->bottom; rect->bottom += get_system_metrics( SM_CYHSCROLL ); - if (win->dwStyle & WS_VSCROLL) rect->right++; vertical = FALSE; break; @@ -215,7 +214,6 @@ static BOOL get_scroll_bar_rect( HWND hwnd, int bar, RECT *rect, int *arrow_size rect->left = rect->right; rect->right += get_system_metrics( SM_CXVSCROLL ); } - if (win->dwStyle & WS_HSCROLL) rect->bottom++; vertical = TRUE; break; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9664