[PATCH 1/6] user32: Call SCROLL_DrawScrollBar() to draw moving thumb in SCROLL_HandleScrollEvent().

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/user32/scroll.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
index 01868bd4238..4abb13d5199 100644
--- a/dlls/user32/scroll.c
+++ b/dlls/user32/scroll.c
@@ -863,8 +863,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
                                                         SCROLL_TrackingPos );
 	    if (!SCROLL_MovingThumb)
             {
-		SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize);
                 SCROLL_MovingThumb = TRUE;
+                SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE );
             }
         }
         else if (msg == WM_LBUTTONUP)
@@ -893,8 +893,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
                 SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal),
                                 (LPARAM)hwndCtl );
-                SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize );
                 SCROLL_MovingThumb = TRUE;
+                SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE );
             }
         }
         break;
-- 
2.30.2

[Marvin]

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=93677

Your paranoid android.


=== debiant2 (32 bit report) ===

user32:
win.c:10366: Test failed: Expected foreground window 00150128, got 00E400F2