ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-01-12 17:22:25 +03:00 committed by Alexandre Julliard
parent 531dcf2dd3
commit bb1d68ede0
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/comctl32/tests/trackbar.c
View File

@ -775,6 +775,32 @@ static void test_range(void)
SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1);
ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n");
/* test position update on range change */
/* set to [20, 50], position at 30, reduce range to [20,25] */
SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20);
SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50);
SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30);
SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 25);
r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0);
ok(r == 25, "Unexpected position %d\n", r);
/* set to [20, 50], position at 30, flip max to 10 */
SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20);
SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50);
SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30);
SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10);
r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0);
ok(r == 20, "Unexpected position %d\n", r);
/* set to [20, 50], position at 30, flip min to 70 */
SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20);
SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50);
SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30);
SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 70);
r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0);
ok(r == 70, "Unexpected position %d\n", r);
DestroyWindow(hWndTrackbar); DestroyWindow(hWndTrackbar);
} }

5
dlls/comctl32/trackbar.c
View File

@ -1275,10 +1275,11 @@ static inline LRESULT
TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax)
{ {
BOOL changed = infoPtr->lRangeMax != lMax; BOOL changed = infoPtr->lRangeMax != lMax;
LONG rightmost = max(lMax, infoPtr->lRangeMin);
infoPtr->lRangeMax = lMax; infoPtr->lRangeMax = lMax;
if (infoPtr->lPos > infoPtr->lRangeMax) { if (infoPtr->lPos > rightmost) {
infoPtr->lPos = infoPtr->lRangeMax; infoPtr->lPos = rightmost;
infoPtr->flags |= TB_THUMBPOSCHANGED; infoPtr->flags |= TB_THUMBPOSCHANGED;
} }