[ros-diffs] [reactos] 03/03: [USER32] Fixed issue with thumb scrolling on IDC_PICKICON_LIST

[Jose Carlos Jesus]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad591d02692217b537ee1…

commit ad591d02692217b537ee137d3eff6c1a86e29c1b
Author:     Jose Carlos Jesus <zecarlos1957(a)hotmail.com>
AuthorDate: Wed Apr 1 16:34:50 2020 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Thu Apr 30 18:58:20 2020 +0200

    [USER32] Fixed issue with thumb scrolling on IDC_PICKICON_LIST
---
 win32ss/user/user32/controls/listbox.c | 4 ++++
 win32ss/user/user32/windows/defwnd.c   | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/win32ss/user/user32/controls/listbox.c
b/win32ss/user/user32/controls/listbox.c
index 072ff67dfb1..8e909f9857e 100644
--- a/win32ss/user/user32/controls/listbox.c
+++ b/win32ss/user/user32/controls/listbox.c
@@ -1965,7 +1965,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD
scrollReq, WORD pos
         case SB_THUMBTRACK:
             info.cbSize = sizeof(info);
             info.fMask  = SIF_TRACKPOS;
+#ifdef __REACTOS__
+            GetScrollInfo( descr->self, SB_HORZ, &info );
+#else
             GetScrollInfo( descr->self, SB_VERT, &info );
+#endif
             LISTBOX_SetTopItem( descr, info.nTrackPos*descr->page_size,
                                 TRUE );
             break;
diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c
index 9171d0f693b..9a2272d3c89 100644
--- a/win32ss/user/user32/windows/defwnd.c
+++ b/win32ss/user/user32/windows/defwnd.c
@@ -1042,8 +1042,10 @@ RealDefWindowProcW(HWND hWnd,
                if (!Wnd->pSBInfo)
                {
                   SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0};
-                  SetScrollInfo( hWnd, SB_HORZ, &si, FALSE );
-                  SetScrollInfo( hWnd, SB_VERT, &si, FALSE );
+                  if (Wnd->style & WS_HSCROLL)
+                     SetScrollInfo( hWnd, SB_HORZ, &si, FALSE );
+                  if (Wnd->style & WS_VSCROLL)
+                     SetScrollInfo( hWnd, SB_VERT, &si, FALSE );
                }
             }