Nikolay Sivov : comctl32/trackbar: TBM_SETTIC processing shouldn' t be affected by TBS_AUTOTICKS style.
Alexandre Julliard
julliard at winehq.org
Tue Sep 8 08:53:42 CDT 2009
Module: wine
Branch: master
Commit: 629eb23a11df48fadbfb5a8033e0edd633a5c36b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=629eb23a11df48fadbfb5a8033e0edd633a5c36b
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Wed Sep 2 21:06:08 2009 +0400
comctl32/trackbar: TBM_SETTIC processing shouldn't be affected by TBS_AUTOTICKS style.
---
dlls/comctl32/tests/trackbar.c | 16 ++++++++++------
dlls/comctl32/trackbar.c | 3 ---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index a200b91..cd4772b 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -786,18 +786,22 @@ static void test_thumb_length(HWND hWndTrackbar){
static void test_tic_settings(HWND hWndTrackbar){
int r;
- flush_sequences(sequences, NUM_MSG_SEQUENCE);
/* testing TBM_SETTIC */
/* Set tics at 5 and 10 */
/* 0 and 20 are out of range and should not be set */
+ r = SendMessage(hWndTrackbar, TBM_GETRANGEMAX, 0, 0);
+ expect(10, r);
+ r = SendMessage(hWndTrackbar, TBM_GETRANGEMIN, 0, 0);
+ expect(5, r);
+
+ flush_sequences(sequences, NUM_MSG_SEQUENCE);
r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 0);
ok(r == FALSE, "Expected FALSE, got %d\n", r);
r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 5);
- todo_wine{
- ok(r == TRUE, "Expected TRUE, got %d\n", r);
- r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 10);
- ok(r == TRUE, "Expected TRUE, got %d\n", r);
- }
+ ok(r == TRUE, "Expected TRUE, got %d\n", r);
+ r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 10);
+ ok(r == TRUE, "Expected TRUE, got %d\n", r);
+
r = SendMessage(hWndTrackbar, TBM_SETTIC, 0, 20);
ok(r == FALSE, "Expected False, got %d\n", r);
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 5b0b87d..88f1df1 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1294,9 +1294,6 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
static inline LRESULT
TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
{
- if (infoPtr->dwStyle & TBS_AUTOTICKS)
- return FALSE;
-
if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax))
return FALSE;
More information about the wine-cvs
mailing list