[6/8] comctl32/trackbar: Default to TBTS_TOP position on creation

Nikolay Sivov bunglehead at gmail.com
Sun Sep 6 15:00:42 CDT 2009


Next three patches are just resent and include some Trackbar fixes.

Changelog:
    - Default to TBTS_TOP position on creation

>From ae69618ed629a0b8f6a080179197c5f1b14de4a4 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Sun, 6 Sep 2009 14:01:47 +0400
Subject: Default to TBTS_TOP position on creation

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

diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 68fdb96..a200b91 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -868,15 +868,13 @@ static void test_tool_tips(HWND hWndTrackbar){
     flush_sequences(sequences, NUM_MSG_SEQUENCE);
     /* testing TBM_SETTIPSIDE */
     r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_TOP, 0);
-    todo_wine{
-        expect(0, r);
-    }
+    expect(TBTS_TOP, r);
     r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_LEFT, 0);
-    expect(0, r);
+    expect(TBTS_TOP, r);
     r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_BOTTOM, 0);
-    expect(1, r);
+    expect(TBTS_LEFT, r);
     r = SendMessage(hWndTrackbar, TBM_SETTIPSIDE, TBTS_RIGHT, 0);
-    expect(2, r);
+    expect(TBTS_BOTTOM, r);
 
     /* testing TBM_SETTOOLTIPS */
     hWndTooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, 0,
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 979be11..5b0b87d 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1408,7 +1408,7 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
     infoPtr->lSelMin   = 0;
     infoPtr->lSelMax   = 0;
     infoPtr->lPos      = 0;
-    infoPtr->fLocation = -1;
+    infoPtr->fLocation = TBTS_TOP;
     infoPtr->uNumTics  = 0;    /* start and end tic are not included in count*/
     infoPtr->uTicFreq  = 1;
     infoPtr->tics      = NULL;
-- 
1.5.6.5







More information about the wine-patches mailing list