From: Esme Povirk <esme@codeweavers.com> --- dlls/comctl32/tests/misc.c | 2 +- dlls/user32/scroll.c | 1 + dlls/win32u/scroll.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 98a7f8ac041..be31bedc848 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -444,7 +444,7 @@ static void test_builtin_classes(void) check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE, 0x10005, FALSE ); check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE, 0x10004, FALSE ); check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE, 0x10000, FALSE ); - check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE, 0x1000a, TRUE ); + check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE, 0x1000a, FALSE ); check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE, 0x10003, FALSE ); check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW, FALSE, 0x10000, FALSE ); } diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 02693dddbfc..b0e46a5840d 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -240,6 +240,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA case WM_KEYDOWN: case WM_KEYUP: case WM_ENABLE: + case WM_GETOBJECT: case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: case WM_LBUTTONUP: diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 719cd5bfc5e..052a571194f 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -1307,6 +1307,11 @@ LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara } return 0; + case WM_GETOBJECT: + if ((LONG)lparam == OBJID_QUERYCLASSNAMEIDX) + return 0x1000a; + return default_window_proc( hwnd, msg, wparam, lparam, ansi ); + case WM_SETFOCUS: { /* Create a caret when a ScrollBar get focus */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10824