Felix Nawothnig : comctl32: Fix a typo.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Mar 12 08:28:30 CDT 2007


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

Author: Felix Nawothnig <flexo at holycrap.org>
Date:   Sat Mar 10 16:27:05 2007 +0100

comctl32: Fix a typo.

---

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

diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index 458b969..3c7e9f5 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -428,12 +428,10 @@ static void TestGetSetItemHeight(void)
     ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 );
     ok(ulNewHeight == 2*ulOldHeight, "New height not set properly, reported %d, expected %d\n", ulNewHeight, 2*ulOldHeight);
 
-    todo_wine {
-        /* Assuming tree doesn't have TVS_NONEVENHEIGHT set, so a set of 9 will round down to 8 */
-        SendMessage( hTree, TVM_SETITEMHEIGHT, 9, 0 );
-        ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 );
-        ok(ulNewHeight == 8, "Uneven height not set properly, reported %d, expected %d\n", ulNewHeight, 8);
-    }
+    /* Assuming tree doesn't have TVS_NONEVENHEIGHT set, so a set of 9 will round down to 8 */
+    SendMessage( hTree, TVM_SETITEMHEIGHT, 9, 0 );
+    ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 );
+    ok(ulNewHeight == 8, "Uneven height not set properly, reported %d, expected %d\n", ulNewHeight, 8);
 }
 
 static void TestGetSetScrollTime(void)
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 1130daa..676e56a 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -1825,7 +1825,7 @@ TREEVIEW_SetItemHeight(TREEVIEW_INFO *infoPtr, INT newHeight)
     }
 
     /* Round down, unless we support odd ("non even") heights. */
-    if (!(infoPtr->dwStyle) & TVS_NONEVENHEIGHT)
+    if (!(infoPtr->dwStyle & TVS_NONEVENHEIGHT))
 	infoPtr->uItemHeight &= ~1;
 
     if (infoPtr->uItemHeight != prevHeight)




More information about the wine-cvs mailing list