comctl32/trackbar: Protect from negative tic count in recalculation helper
Nikolay Sivov
bunglehead at gmail.com
Thu Sep 17 17:21:26 CDT 2009
Fixes bug http://bugs.winehq.org/show_bug.cgi?id=20027
Changelog:
- Protect from negative tic count in recalculation helper, tests added.
>From 7c549d217bb90bec022f5b225315c25c10f34977 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Fri, 18 Sep 2009 02:18:48 +0400
Subject: Protect from negative tic count in recalculation helper.
Fix for regression introduced in 42c83b9dc7b5094384e718926eddd4b297c7bbae
---
dlls/comctl32/tests/trackbar.c | 27 +++++++++++++++++++++++----
dlls/comctl32/trackbar.c | 2 +-
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index d790206..22fbbfe 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -785,22 +785,41 @@ static void test_tic_settings(HWND hWndTrackbar){
/* test TBM_SETTICFREQ */
SendMessage(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10));
SendMessage(hWndTrackbar, TBM_SETTICFREQ, 2, 0);
- r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
expect(6, r);
SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0);
- r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
expect(3, r);
SendMessage(hWndTrackbar, TBM_SETTICFREQ, 15, 0);
- r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
expect(2, r);
/* test TBM_GETNUMTICS */
/* since TIC FREQ is 15, there should be only 2 tics now */
- r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
expect(2, r);
ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tic_settings_test_seq, "tic settings test sequence", TRUE);
ok_sequence(sequences, PARENT_SEQ_INDEX, parent_tic_settings_test_seq, "parent tic settings test sequence", TRUE);
+
+ /* range [0,0], freq = 1 */
+ SendMessage(hWndTrackbar, TBM_SETRANGEMAX, TRUE, 0);
+ SendMessage(hWndTrackbar, TBM_SETRANGEMIN, TRUE, 0);
+ SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
+ expect(2, r);
+ /* range [0,1], freq = 1 */
+ SendMessage(hWndTrackbar, TBM_SETRANGEMAX, TRUE, 1);
+ SendMessage(hWndTrackbar, TBM_SETRANGEMIN, TRUE, 0);
+ SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
+ expect(2, r);
+ /* range [0,2], freq = 1 */
+ SendMessage(hWndTrackbar, TBM_SETRANGEMAX, TRUE, 2);
+ SendMessage(hWndTrackbar, TBM_SETRANGEMIN, TRUE, 0);
+ SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0);
+ r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0);
+ expect(3, r);
}
static void test_tic_placement(HWND hWndTrackbar){
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 88f1df1..5abc77f 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -155,7 +155,7 @@ static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr)
if (infoPtr->uTicFreq && infoPtr->lRangeMax >= infoPtr->lRangeMin) {
nrTics=(infoPtr->lRangeMax - infoPtr->lRangeMin)/infoPtr->uTicFreq;
/* don't add extra tic if there's no remainder */
- if ((infoPtr->lRangeMax - infoPtr->lRangeMin) % infoPtr->uTicFreq == 0)
+ if (nrTics && ((infoPtr->lRangeMax - infoPtr->lRangeMin) % infoPtr->uTicFreq == 0))
nrTics--;
}
else {
--
1.5.6.5
More information about the wine-patches
mailing list