Keith Stevens : comctl32: trackbar: Return the correct number of tics for TBM_GETNUMTICS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3a58b51aa380b0e87fbcf5843976d92a62988372
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3a58b51aa380b0e87fbcf58439...

Author: Keith Stevens <fozziethebeat(a)gmail.com>
Date:   Thu Mar 15 22:11:14 2007 -0700

comctl32: trackbar: Return the correct number of tics for TBM_GETNUMTICS.

---

 dlls/comctl32/tests/trackbar.c |   10 ++++------
 dlls/comctl32/trackbar.c       |    5 ++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 3cecd88..db3910b 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -775,12 +775,10 @@ static void test_tic_settings(HWND hWndTrackbar){
     SendMessage(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10));
     SendMessage(hWndTrackbar, TBM_SETTICFREQ, 2, 0);
     r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
-    todo_wine{
-        expect(6, r);
-        SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0);
-        r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
-        expect(3, r);
-    }
+    expect(6, r);
+    SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0);
+    r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
+    expect(3, r);
     SendMessage(hWndTrackbar, TBM_SETTICFREQ, 15, 0);
     r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0);
     expect(2, r);
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index d718e00..9858d58 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1042,7 +1042,10 @@ TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr)
     if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS)
         return 0;
 
-    return infoPtr->uNumTics + 2;
+    if(infoPtr->uNumTics == 0)
+        return 2;
+    else
+        return infoPtr->uNumTics + 1;
 }