Changeset 110 for trunk/src

Timestamp:

Jun 16, 1999, 10:25:45 PM (26 years ago)

Author:

cbratschi

Message:

comctl32 wine conversion bugs fixed
trackbar: TRACKBAR_Draw prototype

Location:

trunk/src

Files:

• comctl32/progress.c (modified) (4 diffs)
• comctl32/status.c (modified) (47 diffs)
• comctl32/toolbar.c (modified) (114 diffs)
• comctl32/tooltips.c (modified) (77 diffs)
• comctl32/trackbar.c (modified) (28 diffs)
• comctl32/treeview.c (modified) (168 diffs)
• comctl32/updown.c (modified) (48 diffs)
• kernel32/winmod.cpp (modified) (2 diffs)

trunk/src/comctl32/progress.c

@@ -1 @@
-/* $Id: progress.c,v 1.4 1999-06-16 15:29:26 cbratschi Exp $ */
+/* $Id: progress.c,v 1.5 1999-06-16 20:25:43 cbratschi Exp $ */
 /*
  * Progress control
@@ -8 +8 @@
  * Copyright 1999 Christoph Bratschi
  *
+ * Status: complete
  */
 
@@ -374 +375 @@
       temp = infoPtr->CurVal;
       if(temp != wParam){
-        infoPtr->CurVal = (UINT16)wParam;
+        infoPtr->CurVal = (UINT16)wParam; //CB: 0..65535 allowed
         PROGRESS_CoercePos(hwnd);
         PROGRESS_Update (hwnd,temp);
@@ -398 +399 @@
         UNKNOWN_PARAM(PBM_SETSTEP, wParam, lParam);
       temp = infoPtr->Step;
-      infoPtr->Step = (INT)wParam;
+      infoPtr->Step = (INT)wParam; //CB: negative steps allowed
       return temp;
 

trunk/src/comctl32/status.c

@@ -1 @@
-/* $Id: status.c,v 1.3 1999-06-10 16:22:01 achimha Exp $ */
+/* $Id: status.c,v 1.4 1999-06-16 20:25:43 cbratschi Exp $ */
 /*
  * Interface code to StatusWindow widget/control
@@ -6 +6 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  */
 
@@ -56 +57 @@
     SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW));
     for (i = 1; i < 11; i += 4) {
-        MoveToEx (hdc, pt.x - i, pt.y, NULL);
-        LineTo (hdc, pt.x, pt.y - i);
-
-        MoveToEx (hdc, pt.x - i-1, pt.y, NULL);
-        LineTo (hdc, pt.x, pt.y - i-1);
+        MoveToEx (hdc, pt.x - i, pt.y, NULL);
+        LineTo (hdc, pt.x, pt.y - i);
+
+        MoveToEx (hdc, pt.x - i-1, pt.y, NULL);
+        LineTo (hdc, pt.x, pt.y - i-1);
     }
 
     SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT));
     for (i = 3; i < 13; i += 4) {
-        MoveToEx (hdc, pt.x - i, pt.y, NULL);
-        LineTo (hdc, pt.x, pt.y - i);
+        MoveToEx (hdc, pt.x - i, pt.y, NULL);
+        LineTo (hdc, pt.x, pt.y - i);
     }
 
@@ -73 +74 @@
 
 
-static void 
+static void
 STATUSBAR_DrawPart (HDC hdc, STATUSWINDOWPART *part)
 {
@@ -88 +89 @@
     /* draw the icon */
     if (part->hIcon) {
-        INT cy = r.bottom - r.top;
-
-        r.left += 2;
-        DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
-        r.left += cy;
+        INT cy = r.bottom - r.top;
+
+        r.left += 2;
+        DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
+        r.left += cy;
     }
 
@@ -101 +102 @@
       UINT align = DT_LEFT;
       if (*p == L'\t') {
-        p++;
-        align = DT_CENTER;
-
-        if (*p == L'\t') {
-          p++;
-          align = DT_RIGHT;
-        }
+        p++;
+        align = DT_CENTER;
+
+        if (*p == L'\t') {
+          p++;
+          align = DT_RIGHT;
+        }
       }
       r.left += 3;
       DrawTextW (hdc, p, lstrlenW (p), &r, align|DT_VCENTER|DT_SINGLELINE);
       if (oldbkmode != TRANSPARENT)
-        SetBkMode(hdc, oldbkmode);
+        SetBkMode(hdc, oldbkmode);
     }
 }
@@ -128 +129 @@
 
     if (self->clrBk != CLR_DEFAULT)
-        hbrBk = CreateSolidBrush (self->clrBk);
+        hbrBk = CreateSolidBrush (self->clrBk);
     else
-        hbrBk = GetSysColorBrush (COLOR_3DFACE);
+        hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &part->bound, hbrBk);
 
@@ -136 +137 @@
 
     if (part->style == SBT_OWNERDRAW) {
-        DRAWITEMSTRUCT dis;
-
-        dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
-        dis.itemID = -1;
-        dis.hwndItem = hwnd;
-        dis.hDC = hdc;
-        dis.rcItem = part->bound;
-        dis.itemData = (INT)part->text;
-        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-                (WPARAM)dis.CtlID, (LPARAM)&dis);
+        DRAWITEMSTRUCT dis;
+
+        dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
+        dis.itemID = -1;
+        dis.hwndItem = hwnd;
+        dis.hDC = hdc;
+        dis.rcItem = part->bound;
+        dis.itemData = (INT)part->text;
+        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
+                (WPARAM)dis.CtlID, (LPARAM)&dis);
     }
     else
-        STATUSBAR_DrawPart (hdc, part);
+        STATUSBAR_DrawPart (hdc, part);
 
     SelectObject (hdc, hOldFont);
 
     if (self->clrBk != CLR_DEFAULT)
-        DeleteObject (hbrBk);
+        DeleteObject (hbrBk);
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & SBARS_SIZEGRIP) {
-        RECT rect;
-
-        GetClientRect (hwnd, &rect);
-        STATUSBAR_DrawSizeGrip (hdc, &rect);
+        RECT rect;
+
+        GetClientRect (hwnd, &rect);
+        STATUSBAR_DrawSizeGrip (hdc, &rect);
     }
 }
@@ -179 +180 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-        hbrBk = CreateSolidBrush (infoPtr->clrBk);
+        hbrBk = CreateSolidBrush (infoPtr->clrBk);
     else
-        hbrBk = GetSysColorBrush (COLOR_3DFACE);
+        hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &rect, hbrBk);
 
@@ -187 +188 @@
 
     if (infoPtr->simple) {
-        STATUSBAR_DrawPart (hdc, &infoPtr->part0);
+        STATUSBAR_DrawPart (hdc, &infoPtr->part0);
     }
     else {
-        for (i = 0; i < infoPtr->numParts; i++) {
-            if (infoPtr->parts[i].style == SBT_OWNERDRAW) {
-                DRAWITEMSTRUCT dis;
-
-                dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
-                dis.itemID = -1;
-                dis.hwndItem = hwnd;
-                dis.hDC = hdc;
-                dis.rcItem = infoPtr->parts[i].bound;
-                dis.itemData = (INT)infoPtr->parts[i].text;
-                SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-                        (WPARAM)dis.CtlID, (LPARAM)&dis);
-            }
-            else
-                STATUSBAR_DrawPart (hdc, &infoPtr->parts[i]);
-        }
+        for (i = 0; i < infoPtr->numParts; i++) {
+            if (infoPtr->parts[i].style == SBT_OWNERDRAW) {
+                DRAWITEMSTRUCT dis;
+
+                dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
+                dis.itemID = -1;
+                dis.hwndItem = hwnd;
+                dis.hDC = hdc;
+                dis.rcItem = infoPtr->parts[i].bound;
+                dis.itemData = (INT)infoPtr->parts[i].text;
+                SendMessageA (GetParent (hwnd), WM_DRAWITEM,
+                        (WPARAM)dis.CtlID, (LPARAM)&dis);
+            }
+            else
+                STATUSBAR_DrawPart (hdc, &infoPtr->parts[i]);
+        }
     }
 
@@ -211 +212 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-        DeleteObject (hbrBk);
+        DeleteObject (hbrBk);
 
     if (GetWindowLongA(hwnd, GWL_STYLE) & SBARS_SIZEGRIP)
-        STATUSBAR_DrawSizeGrip (hdc, &rect);
+        STATUSBAR_DrawSizeGrip (hdc, &rect);
 
     return TRUE;
@@ -226 +227 @@
     STATUSWINDOWPART *part;
     RECT rect, *r;
-    int i;
+    int i;
 
     /* get our window size */
@@ -238 +239 @@
     /* set bounds for non-simple rectangles */
     for (i = 0; i < self->numParts; i++) {
-        part = &self->parts[i];
-        r = &self->parts[i].bound;
-        r->top = rect.top;
-        r->bottom = rect.bottom;
-        if (i == 0)
-            r->left = 0;
-        else
-            r->left = self->parts[i-1].bound.right + HORZ_GAP;
-        if (part->x == -1)
-            r->right = rect.right;
-        else
-            r->right = part->x;
-
-        if (self->hwndToolTip) {
-            TTTOOLINFOA ti;
-
-            ti.cbSize = sizeof(TTTOOLINFOA);
-            ti.hwnd = hwnd;
-            ti.uId = i;
-            ti.rect = *r;
-            SendMessageA (self->hwndToolTip, TTM_NEWTOOLRECTA,
-                            0, (LPARAM)&ti);
-        }
+        part = &self->parts[i];
+        r = &self->parts[i].bound;
+        r->top = rect.top;
+        r->bottom = rect.bottom;
+        if (i == 0)
+            r->left = 0;
+        else
+            r->left = self->parts[i-1].bound.right + HORZ_GAP;
+        if (part->x == -1)
+            r->right = rect.right;
+        else
+            r->right = part->x;
+
+        if (self->hwndToolTip) {
+            TTTOOLINFOA ti;
+
+            ti.cbSize = sizeof(TTTOOLINFOA);
+            ti.hwnd = hwnd;
+            ti.uId = i;
+            ti.rect = *r;
+            SendMessageA (self->hwndToolTip, TTM_NEWTOOLRECTA,
+                            0, (LPARAM)&ti);
+        }
     }
 }
@@ -267 +268 @@
 static VOID
 STATUSBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
-                      WPARAM wParam, LPARAM lParam)
+                      WPARAM wParam, LPARAM lParam)
 {
     MSG msg;
@@ -304 +305 @@
     nPart = (INT)wParam & 0x00ff;
     if ((nPart < -1) || (nPart >= self->numParts))
-        return 0;
+        return 0;
 
     if (nPart == -1)
@@ -324 +325 @@
     parts = (LPINT) lParam;
     if (parts) {
-        return (infoPtr->numParts);
-        for (i = 0; i < num_parts; i++) {
-            parts[i] = infoPtr->parts[i].x;
-        }
+        return (infoPtr->numParts);
+        for (i = 0; i < num_parts; i++) {
+            parts[i] = infoPtr->parts[i].x;
+        }
     }
     return (infoPtr->numParts);
@@ -337 +338 @@
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr (hwnd);
-    int part_num;
+    int part_num;
     LPRECT  rect;
 
@@ -343 +344 @@
     rect = (LPRECT) lParam;
     if (infoPtr->simple)
-        *rect = infoPtr->part0.bound;
+        *rect = infoPtr->part0.bound;
     else
-        *rect = infoPtr->parts[part_num].bound;
+        *rect = infoPtr->parts[part_num].bound;
     return TRUE;
 }
@@ -360 +361 @@
     nPart = ((INT) wParam) & 0x00ff;
     if (self->simple)
-        part = &self->part0;
+        part = &self->part0;
     else
-        part = &self->parts[nPart];
+        part = &self->parts[nPart];
 
     if (part->style == SBT_OWNERDRAW)
-        result = (LRESULT)part->text;
+        result = (LRESULT)part->text;
     else {
-        result = part->text ? lstrlenW (part->text) : 0;
-        result |= (part->style << 16);
-        if (lParam && LOWORD(result))
-            lstrcpyWtoA((LPSTR)lParam, part->text);
+        result = part->text ? lstrlenW (part->text) : 0;
+        result |= (part->style << 16);
+        if (lParam && LOWORD(result))
+            lstrcpyWtoA((LPSTR)lParam, part->text);
     }
     return result;
@@ -386 +387 @@
     nPart = ((INT)wParam) & 0x00ff;
     if (infoPtr->simple)
-        part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else
-        part = &infoPtr->parts[nPart];
+        part = &infoPtr->parts[nPart];
 
     if (part->style == SBT_OWNERDRAW)
-        result = (LRESULT)part->text;
+        result = (LRESULT)part->text;
     else {
-        result = part->text ? lstrlenW (part->text) : 0;
-        result |= (part->style << 16);
-        if (lParam)
-            lstrcpyW ((LPWSTR)lParam, part->text);
+        result = part->text ? lstrlenW (part->text) : 0;
+        result |= (part->style << 16);
+        if (lParam)
+            lstrcpyW ((LPWSTR)lParam, part->text);
     }
     return result;
@@ -413 +414 @@
 
     if (infoPtr->simple)
-        part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else
-        part = &infoPtr->parts[part_num];
+        part = &infoPtr->parts[part_num];
 
     if (part->text)
-        result = lstrlenW(part->text);
+        result = lstrlenW(part->text);
     else
-        result = 0;
+        result = 0;
 
     result |= (part->style << 16);
@@ -433 +434 @@
 
     if (infoPtr->hwndToolTip) {
-        TTTOOLINFOA ti;
-        ti.cbSize = sizeof(TTTOOLINFOA);
-        ti.hwnd = hwnd;
-        ti.uId = LOWORD(wParam);
-        SendMessageA (infoPtr->hwndToolTip, TTM_GETTEXTA, 0, (LPARAM)&ti);
-
-        if (ti.lpszText)
-            lstrcpynA ((LPSTR)lParam, ti.lpszText, HIWORD(wParam));
+        TTTOOLINFOA ti;
+        ti.cbSize = sizeof(TTTOOLINFOA);
+        ti.hwnd = hwnd;
+        ti.uId = LOWORD(wParam);
+        SendMessageA (infoPtr->hwndToolTip, TTM_GETTEXTA, 0, (LPARAM)&ti);
+
+        if (ti.lpszText)
+            lstrcpynA ((LPSTR)lParam, ti.lpszText, HIWORD(wParam));
     }
 
@@ -453 +454 @@
 
     if (infoPtr->hwndToolTip) {
-        TTTOOLINFOW ti;
-        ti.cbSize = sizeof(TTTOOLINFOW);
-        ti.hwnd = hwnd;
-        ti.uId = LOWORD(wParam);
-        SendMessageW (infoPtr->hwndToolTip, TTM_GETTEXTW, 0, (LPARAM)&ti);
-
-        if (ti.lpszText)
-            lstrcpynW ((LPWSTR)lParam, ti.lpszText, HIWORD(wParam));
+        TTTOOLINFOW ti;
+        ti.cbSize = sizeof(TTTOOLINFOW);
+        ti.hwnd = hwnd;
+        ti.uId = LOWORD(wParam);
+        SendMessageW (infoPtr->hwndToolTip, TTM_GETTEXTW, 0, (LPARAM)&ti);
+
+        if (ti.lpszText)
+            lstrcpynW ((LPWSTR)lParam, ti.lpszText, HIWORD(wParam));
     }
 
@@ -505 +506 @@
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (hwnd);
     INT nPart = (INT)wParam & 0x00ff;
-    HDC hdc; 
+    HDC hdc;
 
     if ((nPart < -1) || (nPart >= self->numParts))
-        return FALSE;
+        return FALSE;
 
     hdc = GetDC (hwnd);
     if (nPart == -1) {
-        self->part0.hIcon = (HICON)lParam;
-        if (self->simple)
-            STATUSBAR_RefreshPart (hwnd, &self->part0, hdc);
+        self->part0.hIcon = (HICON)lParam;
+        if (self->simple)
+            STATUSBAR_RefreshPart (hwnd, &self->part0, hdc);
     }
     else {
-        self->parts[nPart].hIcon = (HICON)lParam;
-        if (!(self->simple))
-            STATUSBAR_RefreshPart (hwnd, &self->parts[nPart], hdc);
+        self->parts[nPart].hIcon = (HICON)lParam;
+        if (!(self->simple))
+            STATUSBAR_RefreshPart (hwnd, &self->parts[nPart], hdc);
     }
     ReleaseDC (hwnd, hdc);
@@ -533 +534 @@
 
     if (IsWindowVisible (hwnd)) {
-        HWND parent = GetParent (hwnd);
-        INT  width, x, y;
-        RECT parent_rect;
-
-        GetClientRect (parent, &parent_rect);
-        self->height = (INT)wParam + VERT_BORDER;
-        width = parent_rect.right - parent_rect.left;
-        x = parent_rect.left;
-        y = parent_rect.bottom - self->height;
-        MoveWindow (hwnd, parent_rect.left,
-                      parent_rect.bottom - self->height,
-                      width, self->height, TRUE);
-        STATUSBAR_SetPartBounds (hwnd);
+        HWND parent = GetParent (hwnd);
+        INT  width, x, y;
+        RECT parent_rect;
+
+        GetClientRect (parent, &parent_rect);
+        self->height = (INT)wParam + VERT_BORDER;
+        width = parent_rect.right - parent_rect.left;
+        x = parent_rect.left;
+        y = parent_rect.bottom - self->height;
+        MoveWindow (hwnd, parent_rect.left,
+                      parent_rect.bottom - self->height,
+                      width, self->height, TRUE);
+        STATUSBAR_SetPartBounds (hwnd);
     }
 
@@ -557 +558 @@
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (hwnd);
     STATUSWINDOWPART *tmp;
-    HDC hdc;
+    HDC hdc;
     LPINT parts;
-    int i;
-    int oldNumParts;
+    int i;
+    int oldNumParts;
 
     if (self->simple)
-        self->simple = FALSE;
+        self->simple = FALSE;
 
     oldNumParts = self->numParts;
@@ -569 +570 @@
     parts = (LPINT) lParam;
     if (oldNumParts > self->numParts) {
-        for (i = self->numParts ; i < oldNumParts; i++) {
-            if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
-                COMCTL32_Free (self->parts[i].text);
-        }
+        for (i = self->numParts ; i < oldNumParts; i++) {
+            if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
+                COMCTL32_Free (self->parts[i].text);
+        }
     }
     else if (oldNumParts < self->numParts) {
-        tmp = COMCTL32_Alloc (sizeof(STATUSWINDOWPART) * self->numParts);
-        for (i = 0; i < oldNumParts; i++) {
-            tmp[i] = self->parts[i];
-        }
-        if (self->parts)
-            COMCTL32_Free (self->parts);
-        self->parts = tmp;
-    }
-    
+        tmp = COMCTL32_Alloc (sizeof(STATUSWINDOWPART) * self->numParts);
+        for (i = 0; i < oldNumParts; i++) {
+            tmp[i] = self->parts[i];
+        }
+        if (self->parts)
+            COMCTL32_Free (self->parts);
+        self->parts = tmp;
+    }
+
     for (i = 0; i < self->numParts; i++) {
-        self->parts[i].x = parts[i];
+        self->parts[i].x = parts[i];
     }
 
     if (self->hwndToolTip) {
-        INT nTipCount =
-            SendMessageA (self->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
-
-        if (nTipCount < self->numParts) {
-            /* add tools */
-            TTTOOLINFOA ti;
-            INT i;
-
-            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-            ti.cbSize = sizeof(TTTOOLINFOA);
-            ti.hwnd = hwnd;
-            for (i = nTipCount; i < self->numParts; i++) {
-//              TRACE (statusbar, "add tool %d\n", i);
-                ti.uId = i;
-                SendMessageA (self->hwndToolTip, TTM_ADDTOOLA,
-                                0, (LPARAM)&ti);
-            }
-        }
-        else if (nTipCount > self->numParts) {
-            /* delete tools */
-            INT i;
-
-            for (i = nTipCount - 1; i >= self->numParts; i--) {
-
-//              FIXME (statusbar, "delete tool %d\n", i);
-
-            }
-        }
+        INT nTipCount =
+            SendMessageA (self->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
+
+        if (nTipCount < self->numParts) {
+            /* add tools */
+            TTTOOLINFOA ti;
+            INT i;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+            ti.cbSize = sizeof(TTTOOLINFOA);
+            ti.hwnd = hwnd;
+            for (i = nTipCount; i < self->numParts; i++) {
+//              TRACE (statusbar, "add tool %d\n", i);
+                ti.uId = i;
+                SendMessageA (self->hwndToolTip, TTM_ADDTOOLA,
+                                0, (LPARAM)&ti);
+            }
+        }
+        else if (nTipCount > self->numParts) {
+            /* delete tools */
+            INT i;
+
+            for (i = nTipCount - 1; i >= self->numParts; i--) {
+
+//              FIXME (statusbar, "delete tool %d\n", i);
+
+            }
+        }
     }
 
@@ -634 +635 @@
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (hwnd);
     STATUSWINDOWPART *part;
-    int part_num;
-    int style;
+    int part_num;
+    int style;
     LPSTR text;
-    int len;
+    int len;
     HDC hdc;
 
@@ -645 +646 @@
 
     if ((self->simple) || (self->parts==NULL) || (part_num==255))
-        part = &self->part0;
+        part = &self->part0;
     else
-        part = &self->parts[part_num];
+        part = &self->parts[part_num];
     if (!part) return FALSE;
     part->style = style;
     if (style == SBT_OWNERDRAW) {
-        part->text = (LPWSTR)text;
+        part->text = (LPWSTR)text;
     }
     else {
-        /* duplicate string */
-        if (part->text)
-            COMCTL32_Free (part->text);
-        part->text = 0;
-        if (text && (len = lstrlenA(text))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyAtoW (part->text, text);
-        }
+        /* duplicate string */
+        if (part->text)
+            COMCTL32_Free (part->text);
+        part->text = 0;
+        if (text && (len = lstrlenA(text))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyAtoW (part->text, text);
+        }
     }
 
@@ -686 +687 @@
 
     if ((self->simple) || (self->parts==NULL) || (part_num==255))
-        part = &self->part0;
+        part = &self->part0;
     else
-        part = &self->parts[part_num];
+        part = &self->parts[part_num];
     if (!part) return FALSE;
     part->style = style;
     if (style == SBT_OWNERDRAW) {
-        part->text = text;
+        part->text = text;
     }
     else {
-        /* duplicate string */
-        if (part->text)
-            COMCTL32_Free (part->text);
-        part->text = 0;
-        if (text && (len = lstrlenW(text))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyW(part->text, text);
-        }
+        /* duplicate string */
+        if (part->text)
+            COMCTL32_Free (part->text);
+        part->text = 0;
+        if (text && (len = lstrlenW(text))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyW(part->text, text);
+        }
     }
 
@@ -720 +721 @@
 //    TRACE (statusbar, "part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
     if (infoPtr->hwndToolTip) {
-        TTTOOLINFOA ti;
-        ti.cbSize = sizeof(TTTOOLINFOA);
-        ti.hwnd = hwnd;
-        ti.uId = (INT)wParam;
-        ti.hinst = 0;
-        ti.lpszText = (LPSTR)lParam;
-        SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
-                        0, (LPARAM)&ti);
+        TTTOOLINFOA ti;
+        ti.cbSize = sizeof(TTTOOLINFOA);
+        ti.hwnd = hwnd;
+        ti.uId = (INT)wParam;
+        ti.hinst = 0;
+        ti.lpszText = (LPSTR)lParam;
+        SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
+                        0, (LPARAM)&ti);
     }
 
@@ -741 +742 @@
 //    TRACE (statusbar, "part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
     if (infoPtr->hwndToolTip) {
-        TTTOOLINFOW ti;
-        ti.cbSize = sizeof(TTTOOLINFOW);
-        ti.hwnd = hwnd;
-        ti.uId = (INT)wParam;
-        ti.hinst = 0;
-        ti.lpszText = (LPWSTR)lParam;
-        SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
-                        0, (LPARAM)&ti);
+        TTTOOLINFOW ti;
+        ti.cbSize = sizeof(TTTOOLINFOW);
+        ti.hwnd = hwnd;
+        ti.uId = (INT)wParam;
+        ti.hinst = 0;
+        ti.lpszText = (LPWSTR)lParam;
+        SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
+                        0, (LPARAM)&ti);
     }
 
@@ -796 +797 @@
     LPCREATESTRUCTA lpCreate = (LPCREATESTRUCTA)lParam;
     NONCLIENTMETRICSA nclm;
-    RECT        rect;
-    int         width, len;
-    HDC hdc;
+    RECT        rect;
+    int         width, len;
+    HDC hdc;
     STATUSWINDOWINFO *self;
 
@@ -831 +832 @@
 
     if (IsWindowUnicode (hwnd)) {
-        self->bUnicode = TRUE;
-        if ((len = lstrlenW ((LPCWSTR)lpCreate->lpszName))) {
-            self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyW (self->parts[0].text, (LPCWSTR)lpCreate->lpszName);
-        }
+        self->bUnicode = TRUE;
+        if ((len = lstrlenW ((LPCWSTR)lpCreate->lpszName))) {
+            self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyW (self->parts[0].text, (LPCWSTR)lpCreate->lpszName);
+        }
     }
     else {
-        if ((len = lstrlenA ((LPCSTR)lpCreate->lpszName))) {
-            self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyAtoW (self->parts[0].text, (LPCSTR)lpCreate->lpszName);
-        }
+        if ((len = lstrlenA ((LPCSTR)lpCreate->lpszName))) {
+            self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyAtoW (self->parts[0].text, (LPCSTR)lpCreate->lpszName);
+        }
     }
 
     if ((hdc = GetDC (0))) {
-        TEXTMETRICA tm;
-        HFONT hOldFont;
-
-        hOldFont = SelectObject (hdc,self->hDefaultFont);
-        GetTextMetricsA(hdc, &tm);
-        self->textHeight = tm.tmHeight;
-        SelectObject (hdc, hOldFont);
-        ReleaseDC(0, hdc);
+        TEXTMETRICA tm;
+        HFONT hOldFont;
+
+        hOldFont = SelectObject (hdc,self->hDefaultFont);
+        GetTextMetricsA(hdc, &tm);
+        self->textHeight = tm.tmHeight;
+        SelectObject (hdc, hOldFont);
+        ReleaseDC(0, hdc);
     }
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & SBT_TOOLTIPS) {
-        self->hwndToolTip =
-            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                               CW_USEDEFAULT, CW_USEDEFAULT,
-                               CW_USEDEFAULT, CW_USEDEFAULT,
-                             hwnd, 0,
-                             GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
-
-        if (self->hwndToolTip) {
-            NMTOOLTIPSCREATED nmttc;
-
-            nmttc.hdr.hwndFrom = hwnd;
-            nmttc.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
-            nmttc.hdr.code = NM_TOOLTIPSCREATED;
-            nmttc.hwndToolTips = self->hwndToolTip;
-
-            SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                            (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
-        }
+        self->hwndToolTip =
+            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                             hwnd, 0,
+                             GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+
+        if (self->hwndToolTip) {
+            NMTOOLTIPSCREATED nmttc;
+
+            nmttc.hdr.hwndFrom = hwnd;
+            nmttc.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
+            nmttc.hdr.code = NM_TOOLTIPSCREATED;
+            nmttc.hwndToolTips = self->hwndToolTip;
+
+            SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                            (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
+        }
     }
 
@@ -880 +881 @@
     self->height = self->textHeight + 4 + VERT_BORDER;
     MoveWindow (hwnd, lpCreate->x, lpCreate->y-1,
-                  width, self->height, FALSE);
+                  width, self->height, FALSE);
     STATUSBAR_SetPartBounds (hwnd);
 
@@ -891 +892 @@
 {
     STATUSWINDOWINFO *self = STATUSBAR_GetInfoPtr (hwnd);
-    int i;
+    int i;
 
     for (i = 0; i < self->numParts; i++) {
-        if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
-            COMCTL32_Free (self->parts[i].text);
+        if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
+            COMCTL32_Free (self->parts[i].text);
     }
     if (self->part0.text && (self->part0.style != SBT_OWNERDRAW))
-        COMCTL32_Free (self->part0.text);
+        COMCTL32_Free (self->part0.text);
     COMCTL32_Free (self->parts);
 
     /* delete default font */
     if (self->hDefaultFont)
-        DeleteObject (self->hDefaultFont);
+        DeleteObject (self->hDefaultFont);
 
     /* delete tool tip control */
     if (self->hwndToolTip)
-        DestroyWindow (self->hwndToolTip);
+        DestroyWindow (self->hwndToolTip);
 
     COMCTL32_Free (self);
@@ -933 +934 @@
     len = lstrlenW (infoPtr->parts[0].text);
     if (wParam > len) {
-        if (infoPtr->bUnicode)
-            lstrcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
-        else
-            lstrcpyWtoA ((LPSTR)lParam, infoPtr->parts[0].text);
-        return len;
+        if (infoPtr->bUnicode)
+            lstrcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
+        else
+            lstrcpyWtoA ((LPSTR)lParam, infoPtr->parts[0].text);
+        return len;
     }
 
@@ -950 +951 @@
 
     if (infoPtr->hwndToolTip)
-        STATUSBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                              WM_MOUSEMOVE, wParam, lParam);
+        STATUSBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                              WM_MOUSEMOVE, wParam, lParam);
     return 0;
 }
@@ -960 +961 @@
 {
     if (GetWindowLongA (hwnd, GWL_STYLE) & SBARS_SIZEGRIP) {
-        RECT  rect;
-        POINT pt;
-
-        GetClientRect (hwnd, &rect);
-
-        pt.x = (INT)LOWORD(lParam);
-        pt.y = (INT)HIWORD(lParam);
-        ScreenToClient (hwnd, &pt);
-
-        rect.left = rect.right - 13;
-        rect.top += 2;
-
-        if (PtInRect (&rect, pt))
-            return HTBOTTOMRIGHT;
+        RECT  rect;
+        POINT pt;
+
+        GetClientRect (hwnd, &rect);
+
+        pt.x = (INT)LOWORD(lParam);
+        pt.y = (INT)HIWORD(lParam);
+        ScreenToClient (hwnd, &pt);
+
+        rect.left = rect.right - 13;
+        rect.top += 2;
+
+        if (PtInRect (&rect, pt))
+            return HTBOTTOMRIGHT;
     }
 
@@ -1005 +1006 @@
     STATUSBAR_Refresh (hwnd, hdc);
     if (!wParam)
-        EndPaint (hwnd, &ps);
+        EndPaint (hwnd, &ps);
 
     return 0;
@@ -1018 +1019 @@
     infoPtr->hFont = (HFONT)wParam;
     if (LOWORD(lParam) == TRUE) {
-        HDC hdc = GetDC (hwnd);
+        HDC hdc = GetDC (hwnd);
         STATUSBAR_Refresh (hwnd, hdc);
         ReleaseDC (hwnd, hdc);
@@ -1036 +1037 @@
 
     if (infoPtr->numParts == 0)
-        return FALSE;
+        return FALSE;
 
     part = &infoPtr->parts[0];
@@ -1044 +1045 @@
     part->text = 0;
     if (infoPtr->bUnicode) {
-        if (lParam && (len = lstrlenW((LPCWSTR)lParam))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyW (part->text, (LPCWSTR)lParam);
-        }
+        if (lParam && (len = lstrlenW((LPCWSTR)lParam))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyW (part->text, (LPCWSTR)lParam);
+        }
     }
     else {
-        if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyAtoW (part->text, (LPCSTR)lParam);
-        }
+        if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyAtoW (part->text, (LPCSTR)lParam);
+        }
     }
 
@@ -1080 +1081 @@
 
     if (flags == SIZE_RESTORED) {
-        /* width and height don't apply */
-        parent = GetParent (hwnd);
-        GetClientRect (parent, &parent_rect);
-        width = parent_rect.right - parent_rect.left;
-        x = parent_rect.left;
-        y = parent_rect.bottom - infoPtr->height;
-        MoveWindow (hwnd, parent_rect.left, 
-                      parent_rect.bottom - infoPtr->height,
-                      width, infoPtr->height, TRUE);
-        STATUSBAR_SetPartBounds (hwnd);
+        /* width and height don't apply */
+        parent = GetParent (hwnd);
+        GetClientRect (parent, &parent_rect);
+        width = parent_rect.right - parent_rect.left;
+        x = parent_rect.left;
+        y = parent_rect.bottom - infoPtr->height;
+        MoveWindow (hwnd, parent_rect.left,
+                      parent_rect.bottom - infoPtr->height,
+                      width, infoPtr->height, TRUE);
+        STATUSBAR_SetPartBounds (hwnd);
     }
     return 0;
@@ -1113 +1114 @@
 {
     switch (msg) {
-        case SB_GETBORDERS:
-            return STATUSBAR_GetBorders (lParam);
-
-        case SB_GETICON:
-            return STATUSBAR_GetIcon (hwnd, wParam);
-
-        case SB_GETPARTS:
-            return STATUSBAR_GetParts (hwnd, wParam, lParam);
-
-        case SB_GETRECT:
-            return STATUSBAR_GetRect (hwnd, wParam, lParam);
-
-        case SB_GETTEXTA:
-            return STATUSBAR_GetTextA (hwnd, wParam, lParam);
-
-        case SB_GETTEXTW:
-            return STATUSBAR_GetTextW (hwnd, wParam, lParam);
-
-        case SB_GETTEXTLENGTHA:
-        case SB_GETTEXTLENGTHW:
-            return STATUSBAR_GetTextLength (hwnd, wParam);
-
-        case SB_GETTIPTEXTA:
-            return STATUSBAR_GetTipTextA (hwnd, wParam, lParam);
-
-        case SB_GETTIPTEXTW:
-            return STATUSBAR_GetTipTextW (hwnd, wParam, lParam);
-
-        case SB_GETUNICODEFORMAT:
-            return STATUSBAR_GetUnicodeFormat (hwnd);
-
-        case SB_ISSIMPLE:
-            return STATUSBAR_IsSimple (hwnd);
-
-        case SB_SETBKCOLOR:
-            return STATUSBAR_SetBkColor (hwnd, wParam, lParam);
-
-        case SB_SETICON:
-            return STATUSBAR_SetIcon (hwnd, wParam, lParam);
-
-        case SB_SETMINHEIGHT:
-            return STATUSBAR_SetMinHeight (hwnd, wParam, lParam);
-
-        case SB_SETPARTS:       
-            return STATUSBAR_SetParts (hwnd, wParam, lParam);
-
-        case SB_SETTEXTA:
-            return STATUSBAR_SetTextA (hwnd, wParam, lParam);
-
-        case SB_SETTEXTW:
-            return STATUSBAR_SetTextW (hwnd, wParam, lParam);
-
-        case SB_SETTIPTEXTA:
-            return STATUSBAR_SetTipTextA (hwnd, wParam, lParam);
-
-        case SB_SETTIPTEXTW:
-            return STATUSBAR_SetTipTextW (hwnd, wParam, lParam);
-
-        case SB_SETUNICODEFORMAT:
-            return STATUSBAR_SetUnicodeFormat (hwnd, wParam);
-
-        case SB_SIMPLE:
-            return STATUSBAR_Simple (hwnd, wParam, lParam);
-
-
-        case WM_CREATE:
-            return STATUSBAR_WMCreate (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return STATUSBAR_WMDestroy (hwnd);
-
-        case WM_GETFONT:
+        case SB_GETBORDERS:
+            return STATUSBAR_GetBorders (lParam);
+
+        case SB_GETICON:
+            return STATUSBAR_GetIcon (hwnd, wParam);
+
+        case SB_GETPARTS:
+            return STATUSBAR_GetParts (hwnd, wParam, lParam);
+
+        case SB_GETRECT:
+            return STATUSBAR_GetRect (hwnd, wParam, lParam);
+
+        case SB_GETTEXTA:
+            return STATUSBAR_GetTextA (hwnd, wParam, lParam);
+
+        case SB_GETTEXTW:
+            return STATUSBAR_GetTextW (hwnd, wParam, lParam);
+
+        case SB_GETTEXTLENGTHA:
+        case SB_GETTEXTLENGTHW:
+            return STATUSBAR_GetTextLength (hwnd, wParam);
+
+        case SB_GETTIPTEXTA:
+            return STATUSBAR_GetTipTextA (hwnd, wParam, lParam);
+
+        case SB_GETTIPTEXTW:
+            return STATUSBAR_GetTipTextW (hwnd, wParam, lParam);
+
+        case SB_GETUNICODEFORMAT:
+            return STATUSBAR_GetUnicodeFormat (hwnd);
+
+        case SB_ISSIMPLE:
+            return STATUSBAR_IsSimple (hwnd);
+
+        case SB_SETBKCOLOR:
+            return STATUSBAR_SetBkColor (hwnd, wParam, lParam);
+
+        case SB_SETICON:
+            return STATUSBAR_SetIcon (hwnd, wParam, lParam);
+
+        case SB_SETMINHEIGHT:
+            return STATUSBAR_SetMinHeight (hwnd, wParam, lParam);
+
+        case SB_SETPARTS:
+            return STATUSBAR_SetParts (hwnd, wParam, lParam);
+
+        case SB_SETTEXTA:
+            return STATUSBAR_SetTextA (hwnd, wParam, lParam);
+
+        case SB_SETTEXTW:
+            return STATUSBAR_SetTextW (hwnd, wParam, lParam);
+
+        case SB_SETTIPTEXTA:
+            return STATUSBAR_SetTipTextA (hwnd, wParam, lParam);
+
+        case SB_SETTIPTEXTW:
+            return STATUSBAR_SetTipTextW (hwnd, wParam, lParam);
+
+        case SB_SETUNICODEFORMAT:
+            return STATUSBAR_SetUnicodeFormat (hwnd, wParam);
+
+        case SB_SIMPLE:
+            return STATUSBAR_Simple (hwnd, wParam, lParam);
+
+
+        case WM_CREATE:
+            return STATUSBAR_WMCreate (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return STATUSBAR_WMDestroy (hwnd);
+
+        case WM_GETFONT:
             return STATUSBAR_WMGetFont (hwnd);
 
-        case WM_GETTEXT:
+        case WM_GETTEXT:
             return STATUSBAR_WMGetText (hwnd, wParam, lParam);
 
-        case WM_GETTEXTLENGTH:
-            return STATUSBAR_GetTextLength (hwnd, 0);
-
-        case WM_LBUTTONDBLCLK:
+        case WM_GETTEXTLENGTH:
+            return STATUSBAR_GetTextLength (hwnd, 0);
+
+        case WM_LBUTTONDBLCLK:
             return STATUSBAR_SendNotify (hwnd, NM_DBLCLK);
 
-        case WM_LBUTTONUP:
-            return STATUSBAR_SendNotify (hwnd, NM_CLICK);
-
-        case WM_MOUSEMOVE:
+        case WM_LBUTTONUP:
+            return STATUSBAR_SendNotify (hwnd, NM_CLICK);
+
+        case WM_MOUSEMOVE:
             return STATUSBAR_WMMouseMove (hwnd, wParam, lParam);
 
-        case WM_NCHITTEST:
+        case WM_NCHITTEST:
             return STATUSBAR_WMNCHitTest (hwnd, wParam, lParam);
 
-        case WM_NCLBUTTONDOWN:
-            return STATUSBAR_WMNCLButtonDown (hwnd, wParam, lParam);
-
-        case WM_NCLBUTTONUP:
-            return STATUSBAR_WMNCLButtonUp (hwnd, wParam, lParam);
-
-        case WM_PAINT:
-            return STATUSBAR_WMPaint (hwnd, wParam);
-
-        case WM_RBUTTONDBLCLK:
-            return STATUSBAR_SendNotify (hwnd, NM_RDBLCLK);
-
-        case WM_RBUTTONUP:
-            return STATUSBAR_SendNotify (hwnd, NM_RCLICK);
-
-        case WM_SETFONT:
-            return STATUSBAR_WMSetFont (hwnd, wParam, lParam);
-
-        case WM_SETTEXT:
-            return STATUSBAR_WMSetText (hwnd, wParam, lParam);
-
-        case WM_SIZE:
-            return STATUSBAR_WMSize (hwnd, wParam, lParam);
-
-        default:
-            if (msg >= WM_USER)
-//              ERR (statusbar, "unknown msg %04x wp=%04x lp=%08lx\n",
-//                   msg, wParam, lParam);
-            return DefWindowProcA (hwnd, msg, wParam, lParam);
+        case WM_NCLBUTTONDOWN:
+            return STATUSBAR_WMNCLButtonDown (hwnd, wParam, lParam);
+
+        case WM_NCLBUTTONUP:
+            return STATUSBAR_WMNCLButtonUp (hwnd, wParam, lParam);
+
+        case WM_PAINT:
+            return STATUSBAR_WMPaint (hwnd, wParam);
+
+        case WM_RBUTTONDBLCLK:
+            return STATUSBAR_SendNotify (hwnd, NM_RDBLCLK);
+
+        case WM_RBUTTONUP:
+            return STATUSBAR_SendNotify (hwnd, NM_RCLICK);
+
+        case WM_SETFONT:
+            return STATUSBAR_WMSetFont (hwnd, wParam, lParam);
+
+        case WM_SETTEXT:
+            return STATUSBAR_WMSetText (hwnd, wParam, lParam);
+
+        case WM_SIZE:
+            return STATUSBAR_WMSize (hwnd, wParam, lParam);
+
+        default:
+//            if (msg >= WM_USER)
+//              ERR (statusbar, "unknown msg %04x wp=%04x lp=%08lx\n",
+//                   msg, wParam, lParam);
+            return DefWindowProcA (hwnd, msg, wParam, lParam);
     }
     return 0;
@@ -1260 +1261 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = STATUSCLASSNAMEA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -1275 +1276 @@
 {
     if (GlobalFindAtomA (STATUSCLASSNAMEA))
-        UnregisterClassA (STATUSCLASSNAMEA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (STATUSCLASSNAMEA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.4 1999-06-10 16:22:02 achimha Exp $ */
+/* $Id: toolbar.c,v 1.5 1999-06-16 20:25:43 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -5 +5 @@
  * Copyright 1998,1999 Eric Kohl
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * TODO:
@@ -65 +66 @@
 static void
 TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-                    HDC hdc, INT nState)
+                    HDC hdc, INT nState)
 {
     RECT   rcText = btnPtr->rect;
@@ -74 +75 @@
     /* draw text */
     if ((btnPtr->iString > -1) && (btnPtr->iString < infoPtr->nNumStrings)) {
-        InflateRect (&rcText, -3, -3);
-        rcText.top += infoPtr->nBitmapHeight;
-        if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
-            OffsetRect (&rcText, 1, 1);
-
-        hOldFont = SelectObject (hdc, infoPtr->hFont);
-        nOldBkMode = SetBkMode (hdc, TRANSPARENT);
-        if (!(nState & TBSTATE_ENABLED)) {
-            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DHILIGHT));
-            OffsetRect (&rcText, 1, 1);
-            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
-                         &rcText, infoPtr->dwDTFlags);
-            SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
-            OffsetRect (&rcText, -1, -1);
-            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
-                         &rcText, infoPtr->dwDTFlags);
-        }
-        else if (nState & TBSTATE_INDETERMINATE) {
-            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
-            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
-                         &rcText, infoPtr->dwDTFlags);
-        }
-        else {
-            clrOld = SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
-            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
-                         &rcText, infoPtr->dwDTFlags);
-        }
-
-        SetTextColor (hdc, clrOld);
-        SelectObject (hdc, hOldFont);
-        if (nOldBkMode != TRANSPARENT)
-            SetBkMode (hdc, nOldBkMode);
+        InflateRect (&rcText, -3, -3);
+        rcText.top += infoPtr->nBitmapHeight;
+        if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
+            OffsetRect (&rcText, 1, 1);
+
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
+        nOldBkMode = SetBkMode (hdc, TRANSPARENT);
+        if (!(nState & TBSTATE_ENABLED)) {
+            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DHILIGHT));
+            OffsetRect (&rcText, 1, 1);
+            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
+                         &rcText, infoPtr->dwDTFlags);
+            SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
+            OffsetRect (&rcText, -1, -1);
+            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
+                         &rcText, infoPtr->dwDTFlags);
+        }
+        else if (nState & TBSTATE_INDETERMINATE) {
+            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
+            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
+                         &rcText, infoPtr->dwDTFlags);
+        }
+        else {
+            clrOld = SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
+            DrawTextW (hdc, infoPtr->strings[btnPtr->iString], -1,
+                         &rcText, infoPtr->dwDTFlags);
+        }
+
+        SetTextColor (hdc, clrOld);
+        SelectObject (hdc, hOldFont);
+        if (nOldBkMode != TRANSPARENT)
+            SetBkMode (hdc, nOldBkMode);
     }
 }
@@ -123 +124 @@
 static void
 TOOLBAR_DrawMasked (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-                    HDC hdc, INT x, INT y)
+                    HDC hdc, INT x, INT y)
 {
     /* FIXME: this function is a hack since it uses image list
-              internals directly */
+              internals directly */
 
     HDC hdcImageList = CreateCompatibleDC (0);
@@ -142 +143 @@
     SetTextColor (hdcImageList, RGB(0, 0, 0));
     BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
-              hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
+              hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
 
 #if 0
@@ -149 +150 @@
     SetBkColor (hdcImageList, RGB(0, 0, 0));
     BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
-              hdcImageList, himl->cx * btnPtr->iBitmap, 0, MERGEPAINT);
+              hdcImageList, himl->cx * btnPtr->iBitmap, 0, MERGEPAINT);
 #endif
 
@@ -155 +156 @@
     SelectObject (hdc, GetSysColorBrush (COLOR_3DHILIGHT));
     BitBlt (hdc, x+1, y+1, himl->cx, himl->cy,
-              hdcMask, 0, 0, 0xB8074A);
+              hdcMask, 0, 0, 0xB8074A);
 
     SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
     BitBlt (hdc, x, y, himl->cx, himl->cy,
-              hdcMask, 0, 0, 0xB8074A);
+              hdcMask, 0, 0, 0xB8074A);
 
     DeleteObject (hbmMask);
@@ -175 +176 @@
 
     if (btnPtr->fsState & TBSTATE_HIDDEN)
-        return;
+        return;
 
     rc = btnPtr->rect;
     if (btnPtr->fsStyle & TBSTYLE_SEP) {
-        if ((dwStyle & TBSTYLE_FLAT) && (btnPtr->idCommand == 0))
-            TOOLBAR_DrawFlatSeparator (&btnPtr->rect, hdc);
-        return;
+        if ((dwStyle & TBSTYLE_FLAT) && (btnPtr->idCommand == 0))
+            TOOLBAR_DrawFlatSeparator (&btnPtr->rect, hdc);
+        return;
     }
 
     /* disabled */
     if (!(btnPtr->fsState & TBSTATE_ENABLED)) {
-        DrawEdge (hdc, &rc, EDGE_RAISED,
-                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-
-        if (dwStyle & TBSTYLE_FLAT) {
-/*          if (infoPtr->himlDis) */
-                ImageList_Draw (infoPtr->himlDis, btnPtr->iBitmap, hdc,
-                                rc.left+1, rc.top+1, ILD_NORMAL);
-/*          else */
-/*              TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1); */
-        }
-        else
-            TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
-
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
-        return;
+        DrawEdge (hdc, &rc, EDGE_RAISED,
+                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        if (dwStyle & TBSTYLE_FLAT) {
+/*          if (infoPtr->himlDis) */
+                ImageList_Draw (infoPtr->himlDis, btnPtr->iBitmap, hdc,
+                                rc.left+1, rc.top+1, ILD_NORMAL);
+/*          else */
+/*              TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1); */
+        }
+        else
+            TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+        return;
     }
 
     /* pressed TBSTYLE_BUTTON */
     if (btnPtr->fsState & TBSTATE_PRESSED) {
-        DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
-        ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
-                        rc.left+2, rc.top+2, ILD_NORMAL);
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
-        return;
+        DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+        ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
+                        rc.left+2, rc.top+2, ILD_NORMAL);
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+        return;
     }
 
     /* checked TBSTYLE_CHECK*/
     if ((btnPtr->fsStyle & TBSTYLE_CHECK) &&
-        (btnPtr->fsState & TBSTATE_CHECKED)) {
-        if (dwStyle & TBSTYLE_FLAT)
-            DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
-                        BF_RECT | BF_MIDDLE | BF_ADJUST);
-        else
-            DrawEdge (hdc, &rc, EDGE_SUNKEN,
-                        BF_RECT | BF_MIDDLE | BF_ADJUST);
-
-        TOOLBAR_DrawPattern (hdc, &rc);
-        if (dwStyle & TBSTYLE_FLAT)
-        {
-            if (infoPtr->himlDef != NULL)
-            ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
-                            rc.left+2, rc.top+2, ILD_NORMAL);
-        else
-            ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
-                            rc.left+2, rc.top+2, ILD_NORMAL);
-        }
-        else
-            ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
-                            rc.left+2, rc.top+2, ILD_NORMAL);
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
-        return;
-    }
-
-    /* indeterminate */ 
+        (btnPtr->fsState & TBSTATE_CHECKED)) {
+        if (dwStyle & TBSTYLE_FLAT)
+            DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
+                        BF_RECT | BF_MIDDLE | BF_ADJUST);
+        else
+            DrawEdge (hdc, &rc, EDGE_SUNKEN,
+                        BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        TOOLBAR_DrawPattern (hdc, &rc);
+        if (dwStyle & TBSTYLE_FLAT)
+        {
+            if (infoPtr->himlDef != NULL)
+            ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
+                            rc.left+2, rc.top+2, ILD_NORMAL);
+        else
+            ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
+                            rc.left+2, rc.top+2, ILD_NORMAL);
+        }
+        else
+            ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
+                            rc.left+2, rc.top+2, ILD_NORMAL);
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+        return;
+    }
+
+    /* indeterminate */
     if (btnPtr->fsState & TBSTATE_INDETERMINATE) {
-        DrawEdge (hdc, &rc, EDGE_RAISED,
-                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-
-        TOOLBAR_DrawPattern (hdc, &rc);
-        TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
-        return;
+        DrawEdge (hdc, &rc, EDGE_RAISED,
+                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        TOOLBAR_DrawPattern (hdc, &rc);
+        TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+        return;
     }
 
     if (dwStyle & TBSTYLE_FLAT)
     {
-        if(btnPtr->bHot)
-            DrawEdge (hdc, &rc, BDR_RAISEDINNER,
-                       BF_RECT | BF_MIDDLE | BF_SOFT);
-
-        if(infoPtr->himlDef != NULL)
-            ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
-                            rc.left +2, rc.top +2, ILD_NORMAL);
-        else
-            ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
-                            rc.left +2, rc.top +2, ILD_NORMAL);
+        if(btnPtr->bHot)
+            DrawEdge (hdc, &rc, BDR_RAISEDINNER,
+                       BF_RECT | BF_MIDDLE | BF_SOFT);
+
+        if(infoPtr->himlDef != NULL)
+            ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
+                            rc.left +2, rc.top +2, ILD_NORMAL);
+        else
+            ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
+                            rc.left +2, rc.top +2, ILD_NORMAL);
     }
     else{
     /* normal state */
     DrawEdge (hdc, &rc, EDGE_RAISED,
-                BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-
-        ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
-                        rc.left+1, rc.top+1, ILD_NORMAL);
+                BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        ImageList_Draw (infoPtr->himlStd, btnPtr->iBitmap, hdc,
+                        rc.left+1, rc.top+1, ILD_NORMAL);
     }
 
@@ -286 +287 @@
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
-        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
 }
 
@@ -307 +308 @@
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
-        if (!(btnPtr->fsState & TBSTATE_HIDDEN) &&
-            (btnPtr->iString > -1) &&
-            (btnPtr->iString < infoPtr->nNumStrings)) {
-            LPWSTR lpText = infoPtr->strings[btnPtr->iString];
-            GetTextExtentPoint32W (hdc, lpText, lstrlenW (lpText), &sz);
-            if (sz.cx > lpSize->cx)
-                lpSize->cx = sz.cx;
-            if (sz.cy > lpSize->cy)
-                lpSize->cy = sz.cy;
-        }
+        if (!(btnPtr->fsState & TBSTATE_HIDDEN) &&
+            (btnPtr->iString > -1) &&
+            (btnPtr->iString < infoPtr->nNumStrings)) {
+            LPWSTR lpText = infoPtr->strings[btnPtr->iString];
+            GetTextExtentPoint32W (hdc, lpText, lstrlenW (lpText), &sz);
+            if (sz.cx > lpSize->cx)
+                lpSize->cx = sz.cx;
+            if (sz.cy > lpSize->cy)
+                lpSize->cy = sz.cy;
+        }
     }
 
@@ -326 +327 @@
 
 /***********************************************************************
-*               TOOLBAR_WrapToolbar
+*               TOOLBAR_WrapToolbar
 *
-* This function walks through the buttons and seperators in the 
-* toolbar, and sets the TBSTATE_WRAP flag only on those items where 
-* wrapping should occur based on the width of the toolbar window.  
-* It does *not* calculate button placement itself.  That task 
-* takes place in TOOLBAR_CalcToolbar. If the program wants to manage 
-* the toolbar wrapping on it's own, it can use the TBSTYLE_WRAPPABLE 
+* This function walks through the buttons and seperators in the
+* toolbar, and sets the TBSTATE_WRAP flag only on those items where
+* wrapping should occur based on the width of the toolbar window.
+* It does *not* calculate button placement itself.  That task
+* takes place in TOOLBAR_CalcToolbar. If the program wants to manage
+* the toolbar wrapping on it's own, it can use the TBSTYLE_WRAPPABLE
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
-*/ 
+*/
 
 static void
@@ -347 +348 @@
     BOOL bWrap, bButtonWrap;
 
-    /*  When the toolbar window style is not TBSTYLE_WRAPABLE,  */ 
-    /*  no layout is necessary. Applications may use this style */
-    /*  to perform their own layout on the toolbar.             */
+    /*  When the toolbar window style is not TBSTYLE_WRAPABLE,  */
+    /*  no layout is necessary. Applications may use this style */
+    /*  to perform their own layout on the toolbar.             */
     if( !(dwStyle & TBSTYLE_WRAPABLE) )
-        return;
+        return;
 
     btnPtr = infoPtr->buttons;
@@ -362 +363 @@
     for (i = 0; i < infoPtr->nNumButtons; i++ )
     {
-        bWrap = FALSE;
-        btnPtr[i].fsState &= ~TBSTATE_WRAP;
-        
-        if (btnPtr[i].fsState & TBSTATE_HIDDEN)
-            continue;
-
-        /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
-        /* it is the actual width of the separator. This is used for */
-        /* custom controls in toolbars.                              */
-        if (btnPtr[i].fsStyle & TBSTYLE_SEP)
-            cx = (btnPtr[i].iBitmap > 0) ?  
-                        btnPtr[i].iBitmap : SEPARATOR_WIDTH;
-        else
-            cx = infoPtr->nButtonWidth;
-
-        /* Two or more adjacent separators form a separator group.   */ 
-        /* The first separator in a group should be wrapped to the   */
-        /* next row if the previous wrapping is on a button.         */
-        if( bButtonWrap &&
-                (btnPtr[i].fsStyle & TBSTYLE_SEP) && 
-                (i + 1 < infoPtr->nNumButtons ) &&
-                (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) ) 
-        {
-            btnPtr[i].fsState |= TBSTATE_WRAP;
-            x = infoPtr->nIndent;
-            i++;
-            bButtonWrap = FALSE;
-            continue;
-        }
-
-        /* The layout makes sure the bitmap is visible, but not the button. */
-        if ( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 
-                 > infoPtr->nWidth ) 
-        {
-            BOOL bFound = FALSE;
-
-            /*  If the current button is a separator and not hidden,  */ 
-            /*  go to the next until it reaches a non separator.      */
-            /*  Wrap the last separator if it is before a button.     */
-            while( ( (btnPtr[i].fsStyle & TBSTYLE_SEP) || 
-                        (btnPtr[i].fsState & TBSTATE_HIDDEN) ) && 
-                        i < infoPtr->nNumButtons )
-            {
-                i++;
-                bFound = TRUE;
-            }
-    
-            if( bFound && i < infoPtr->nNumButtons )
-            {
-                i--;
-                btnPtr[i].fsState |= TBSTATE_WRAP;
-                x = infoPtr->nIndent;
-                bButtonWrap = FALSE;
-                continue;
-            }
-            else if ( i >= infoPtr->nNumButtons)
-                break;
-
-            /*  If the current button is not a separator, find the last  */ 
-            /*  separator and wrap it.                                   */
-            for ( j = i - 1; j >= 0  &&  !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
-            {
-                if ((btnPtr[j].fsStyle & TBSTYLE_SEP) &&
-                        !(btnPtr[j].fsState & TBSTATE_HIDDEN))
-                {
-                    bFound = TRUE; 
-                    i = j; 
-                    x = infoPtr->nIndent;
-                    btnPtr[j].fsState |= TBSTATE_WRAP;
-                    bButtonWrap = FALSE; 
-                    break;
-                }
-            }
-
-            /*  If no separator available for wrapping, wrap one of     */
-            /*  non-hidden previous button.                             */
-            if (!bFound)
-            {
-                for ( j = i - 1; 
-                        j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
-                {
-                    if (btnPtr[j].fsState & TBSTATE_HIDDEN) 
-                        continue;
-
-                    bFound = TRUE; 
-                    i = j; 
-                    x = infoPtr->nIndent;
-                    btnPtr[j].fsState |= TBSTATE_WRAP;
-                    bButtonWrap = TRUE;
-                    break;
-                }
-            }
-
-            /* If all above failed, wrap the current button. */
-            if (!bFound)  
-            {
-                btnPtr[i].fsState |= TBSTATE_WRAP;
-                bFound = TRUE;
-                x = infoPtr->nIndent;
-                if (btnPtr[i].fsState & TBSTYLE_SEP )
-                    bButtonWrap = FALSE;
-                else
-                    bButtonWrap = TRUE;
-            }               
-        }
-        else
-            x += cx;
-    }
-}
-                                                                                        
+        bWrap = FALSE;
+        btnPtr[i].fsState &= ~TBSTATE_WRAP;
+
+        if (btnPtr[i].fsState & TBSTATE_HIDDEN)
+            continue;
+
+        /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
+        /* it is the actual width of the separator. This is used for */
+        /* custom controls in toolbars.                              */
+        if (btnPtr[i].fsStyle & TBSTYLE_SEP)
+            cx = (btnPtr[i].iBitmap > 0) ?
+                        btnPtr[i].iBitmap : SEPARATOR_WIDTH;
+        else
+            cx = infoPtr->nButtonWidth;
+
+        /* Two or more adjacent separators form a separator group.   */
+        /* The first separator in a group should be wrapped to the   */
+        /* next row if the previous wrapping is on a button.         */
+        if( bButtonWrap &&
+                (btnPtr[i].fsStyle & TBSTYLE_SEP) &&
+                (i + 1 < infoPtr->nNumButtons ) &&
+                (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) )
+        {
+            btnPtr[i].fsState |= TBSTATE_WRAP;
+            x = infoPtr->nIndent;
+            i++;
+            bButtonWrap = FALSE;
+            continue;
+        }
+
+        /* The layout makes sure the bitmap is visible, but not the button. */
+        if ( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2
+                 > infoPtr->nWidth )
+        {
+            BOOL bFound = FALSE;
+
+            /*  If the current button is a separator and not hidden,  */
+            /*  go to the next until it reaches a non separator.      */
+            /*  Wrap the last separator if it is before a button.     */
+            while( ( (btnPtr[i].fsStyle & TBSTYLE_SEP) ||
+                        (btnPtr[i].fsState & TBSTATE_HIDDEN) ) &&
+                        i < infoPtr->nNumButtons )
+            {
+                i++;
+                bFound = TRUE;
+            }
+
+            if( bFound && i < infoPtr->nNumButtons )
+            {
+                i--;
+                btnPtr[i].fsState |= TBSTATE_WRAP;
+                x = infoPtr->nIndent;
+                bButtonWrap = FALSE;
+                continue;
+            }
+            else if ( i >= infoPtr->nNumButtons)
+                break;
+
+            /*  If the current button is not a separator, find the last  */
+            /*  separator and wrap it.                                   */
+            for ( j = i - 1; j >= 0  &&  !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
+            {
+                if ((btnPtr[j].fsStyle & TBSTYLE_SEP) &&
+                        !(btnPtr[j].fsState & TBSTATE_HIDDEN))
+                {
+                    bFound = TRUE;
+                    i = j;
+                    x = infoPtr->nIndent;
+                    btnPtr[j].fsState |= TBSTATE_WRAP;
+                    bButtonWrap = FALSE;
+                    break;
+                }
+            }
+
+            /*  If no separator available for wrapping, wrap one of     */
+            /*  non-hidden previous button.                             */
+            if (!bFound)
+            {
+                for ( j = i - 1;
+                        j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
+                {
+                    if (btnPtr[j].fsState & TBSTATE_HIDDEN)
+                        continue;
+
+                    bFound = TRUE;
+                    i = j;
+                    x = infoPtr->nIndent;
+                    btnPtr[j].fsState |= TBSTATE_WRAP;
+                    bButtonWrap = TRUE;
+                    break;
+                }
+            }
+
+            /* If all above failed, wrap the current button. */
+            if (!bFound)
+            {
+                btnPtr[i].fsState |= TBSTATE_WRAP;
+                bFound = TRUE;
+                x = infoPtr->nIndent;
+                if (btnPtr[i].fsState & TBSTYLE_SEP )
+                    bButtonWrap = FALSE;
+                else
+                    bButtonWrap = TRUE;
+            }
+        }
+        else
+            x += cx;
+    }
+}
+
 /***********************************************************************
-*               TOOLBAR_CalcToolbar
+*               TOOLBAR_CalcToolbar
 *
-* This function calculates button and separator placement. It first 
-* calculates the button sizes, gets the toolbar window width and then 
-* calls TOOLBAR_WrapToolbar to determine which buttons we need to wrap 
+* This function calculates button and separator placement. It first
+* calculates the button sizes, gets the toolbar window width and then
+* calls TOOLBAR_WrapToolbar to determine which buttons we need to wrap
 * on. It assigns a new location to each item and sends this location to
-* the tooltip window if appropriate. Finally, it updates the rcBound 
-* rect and calculates the new required toolbar window height. 
-*/  
+* the tooltip window if appropriate. Finally, it updates the rcBound
+* rect and calculates the new required toolbar window height.
+*/
 
 static void
@@ -497 +498 @@
 
     if (sizeString.cy > 0)
-        infoPtr->nButtonHeight = sizeString.cy + infoPtr->nBitmapHeight + 6;
+        infoPtr->nButtonHeight = sizeString.cy + infoPtr->nBitmapHeight + 6;
     else if (infoPtr->nButtonHeight < infoPtr->nBitmapHeight + 6)
-        infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
+        infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
 
     if (sizeString.cx > infoPtr->nBitmapWidth)
-        infoPtr->nButtonWidth = sizeString.cx + 6;
+        infoPtr->nButtonWidth = sizeString.cx + 6;
     else if (infoPtr->nButtonWidth < infoPtr->nBitmapWidth + 6)
-        infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
+        infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
 
     TOOLBAR_WrapToolbar( hwnd );
@@ -525 +526 @@
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++ )
     {
-        bWrap = FALSE;
-        if (btnPtr->fsState & TBSTATE_HIDDEN)
-        {
-            SetRectEmpty (&btnPtr->rect);
-            continue;
-        }
-
-            /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
-            /* it is the actual width of the separator. This is used for */
-            /* custom controls in toolbars.                              */
-        if (btnPtr->fsStyle & TBSTYLE_SEP)
-                cx = (btnPtr->iBitmap > 0) ?
-                     btnPtr->iBitmap : SEPARATOR_WIDTH;
-        else
-            cx = infoPtr->nButtonWidth;
-
-        if (btnPtr->fsState & TBSTATE_WRAP )
-                    bWrap = TRUE;
-
-        SetRect (&btnPtr->rect, x, y, x + cx, y + cy);
-
-        if (infoPtr->rcBound.left > x)
-            infoPtr->rcBound.left = x;
-        if (infoPtr->rcBound.right < x + cx)
-            infoPtr->rcBound.right = x + cx;
-        if (infoPtr->rcBound.bottom < y + cy)
-            infoPtr->rcBound.bottom = y + cy;
-
-        /* Set the toolTip only for non-hidden, non-separator button */
-        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP )) 
-        {
-            TTTOOLINFOA ti;
-
-            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-            ti.cbSize = sizeof(TTTOOLINFOA);
-            ti.hwnd = hwnd;
-            ti.uId = btnPtr->idCommand;
-            ti.rect = btnPtr->rect;
-            SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
-                            0, (LPARAM)&ti);
-        }
-
-        /* btnPtr->nRow is zero based. The space between the rows is    */
-        /* also considered as a row.                                    */
-        btnPtr->nRow = nRows + nSepRows;
-        if( bWrap )
-        {
-            if ( !(btnPtr->fsStyle & TBSTYLE_SEP) )
-            y += cy;
-            else 
-            {   
-                /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
-                /* it is the actual width of the separator. This is used for */
-                /* custom controls in toolbars.                              */
-                y += cy + ( (btnPtr->iBitmap > 0 ) ? 
-                        btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; 
-             
-                /* nSepRows is used to calculate the extra height follwoing  */          
-                /* the last row.                                             */
-                nSepRows++;
-            }
-            x = infoPtr->nIndent;
-                nRows++;
-        }
-        else
-            x += cx;
+        bWrap = FALSE;
+        if (btnPtr->fsState & TBSTATE_HIDDEN)
+        {
+            SetRectEmpty (&btnPtr->rect);
+            continue;
+        }
+
+            /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
+            /* it is the actual width of the separator. This is used for */
+            /* custom controls in toolbars.                              */
+        if (btnPtr->fsStyle & TBSTYLE_SEP)
+                cx = (btnPtr->iBitmap > 0) ?
+                     btnPtr->iBitmap : SEPARATOR_WIDTH;
+        else
+            cx = infoPtr->nButtonWidth;
+
+        if (btnPtr->fsState & TBSTATE_WRAP )
+                    bWrap = TRUE;
+
+        SetRect (&btnPtr->rect, x, y, x + cx, y + cy);
+
+        if (infoPtr->rcBound.left > x)
+            infoPtr->rcBound.left = x;
+        if (infoPtr->rcBound.right < x + cx)
+            infoPtr->rcBound.right = x + cx;
+        if (infoPtr->rcBound.bottom < y + cy)
+            infoPtr->rcBound.bottom = y + cy;
+
+        /* Set the toolTip only for non-hidden, non-separator button */
+        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP ))
+        {
+            TTTOOLINFOA ti;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+            ti.cbSize = sizeof(TTTOOLINFOA);
+            ti.hwnd = hwnd;
+            ti.uId = btnPtr->idCommand;
+            ti.rect = btnPtr->rect;
+            SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
+                            0, (LPARAM)&ti);
+        }
+
+        /* btnPtr->nRow is zero based. The space between the rows is    */
+        /* also considered as a row.                                    */
+        btnPtr->nRow = nRows + nSepRows;
+        if( bWrap )
+        {
+            if ( !(btnPtr->fsStyle & TBSTYLE_SEP) )
+            y += cy;
+            else
+            {
+                /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
+                /* it is the actual width of the separator. This is used for */
+                /* custom controls in toolbars.                              */
+                y += cy + ( (btnPtr->iBitmap > 0 ) ?
+                        btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3;
+
+                /* nSepRows is used to calculate the extra height follwoing  */
+                /* the last row.                                             */
+                nSepRows++;
+            }
+            x = infoPtr->nIndent;
+                nRows++;
+        }
+        else
+            x += cx;
     }
 
@@ -596 +597 @@
     infoPtr->nRows = nRows + nSepRows + 1;
 
-    /* nSepRows * (infoPtr->nBitmapHeight + 1) is the space following   */
-    /* the last row.                                                    */
-    infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight + 
-                        nSepRows * SEPARATOR_WIDTH * 2 / 3 +
-                        nSepRows * (infoPtr->nBitmapHeight + 1) + 
-                        BOTTOM_BORDER; 
+    /* nSepRows * (infoPtr->nBitmapHeight + 1) is the space following   */
+    /* the last row.                                                    */
+    infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight +
+                        nSepRows * SEPARATOR_WIDTH * 2 / 3 +
+                        nSepRows * (infoPtr->nBitmapHeight + 1) +
+                        BOTTOM_BORDER;
 //    TRACE (toolbar, "toolbar height %d\n", infoPtr->nHeight);
 }
@@ -612 +613 @@
     TBUTTON_INFO *btnPtr;
     INT i;
-    
+
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
-        if (btnPtr->fsState & TBSTATE_HIDDEN)
-            continue;
-
-        if (btnPtr->fsStyle & TBSTYLE_SEP) {
-            if (PtInRect (&btnPtr->rect, *lpPt)) {
-//              TRACE (toolbar, " ON SEPARATOR %d!\n", i);
-                return -i;
-            }
-        }
-        else {
-            if (PtInRect (&btnPtr->rect, *lpPt)) {
-//              TRACE (toolbar, " ON BUTTON %d!\n", i);
-                return i;
-            }
-        }
+        if (btnPtr->fsState & TBSTATE_HIDDEN)
+            continue;
+
+        if (btnPtr->fsStyle & TBSTYLE_SEP) {
+            if (PtInRect (&btnPtr->rect, *lpPt)) {
+//              TRACE (toolbar, " ON SEPARATOR %d!\n", i);
+                return -i;
+            }
+        }
+        else {
+            if (PtInRect (&btnPtr->rect, *lpPt)) {
+//              TRACE (toolbar, " ON BUTTON %d!\n", i);
+                return i;
+            }
+        }
     }
 
@@ -645 +646 @@
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
-        if (btnPtr->idCommand == idCommand) {
-//          TRACE (toolbar, "command=%d index=%d\n", idCommand, i);
-            return i;
-        }
+        if (btnPtr->idCommand == idCommand) {
+//          TRACE (toolbar, "command=%d index=%d\n", idCommand, i);
+            return i;
+        }
     }
 //    TRACE (toolbar, "no index found for command=%d\n", idCommand);
@@ -662 +663 @@
 
     if ((nIndex < 0) || (nIndex > infoPtr->nNumButtons))
-        return -1;
+        return -1;
 
     /* check index button */
     btnPtr = &infoPtr->buttons[nIndex];
     if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
-        if (btnPtr->fsState & TBSTATE_CHECKED)
-            return nIndex;
+        if (btnPtr->fsState & TBSTATE_CHECKED)
+            return nIndex;
     }
 
@@ -674 +675 @@
     nRunIndex = nIndex - 1;
     while (nRunIndex >= 0) {
-        btnPtr = &infoPtr->buttons[nRunIndex];
-        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
-            if (btnPtr->fsState & TBSTATE_CHECKED)
-                return nRunIndex;
-        }
-        else
-            break;
-        nRunIndex--;
+        btnPtr = &infoPtr->buttons[nRunIndex];
+        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
+            if (btnPtr->fsState & TBSTATE_CHECKED)
+                return nRunIndex;
+        }
+        else
+            break;
+        nRunIndex--;
     }
 
@@ -687 +688 @@
     nRunIndex = nIndex + 1;
     while (nRunIndex < infoPtr->nNumButtons) {
-        btnPtr = &infoPtr->buttons[nRunIndex];  
-        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
-            if (btnPtr->fsState & TBSTATE_CHECKED)
-                return nRunIndex;
-        }
-        else
-            break;
-        nRunIndex++;
+        btnPtr = &infoPtr->buttons[nRunIndex];
+        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
+            if (btnPtr->fsState & TBSTATE_CHECKED)
+                return nRunIndex;
+        }
+        else
+            break;
+        nRunIndex++;
     }
 
@@ -703 +704 @@
 static VOID
 TOOLBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
-                    WPARAM wParam, LPARAM lParam)
+                    WPARAM wParam, LPARAM lParam)
 {
     MSG msg;
@@ -731 +732 @@
     switch (uMsg)
     {
-        case WM_INITDIALOG:
-            infoPtr = (TOOLBAR_INFO *)lParam;
-            SetWindowLongA (hwnd, DWL_USER, (DWORD)infoPtr);
-
-            hDsa = DSA_Create (sizeof(TBUTTON_INFO), 5);
-
-            if (infoPtr)
-            {
-                TBUTTON_INFO *btnPtr;
-                INT i;
-
-                /* insert 'virtual' separator button into 'available buttons' list */
-                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
-
-                /* copy all buttons and append them to the right listbox */             
-                btnPtr = infoPtr->buttons;
-                for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
-                {
-                    DSA_InsertItem (hDsa, i, btnPtr);
-
-                    if (btnPtr->fsState & TBSTATE_HIDDEN)
-                    {
-                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
-                    }
-                    else
-                    {
-                        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
-                    }
-                }
-
-                /* append 'virtual' sepatator button to the 'toolbar buttons' list */
-                /* TODO */
-            }
-            return TRUE;
-
-        case WM_CLOSE:
-            EndDialog(hwnd, FALSE);
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam))
-            {
-                case IDCANCEL:
-                    EndDialog(hwnd, FALSE);
-                    break;
-            }
-            return TRUE;
-
-        case WM_DESTROY:
-            if (hDsa)
-                DSA_Destroy (hDsa);
-            return TRUE;
-
-        case WM_DRAWITEM:
-            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
-            {
-                LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
-                RECT rcButton;
-                RECT rcText;
-                HPEN hOldPen;
-                HBRUSH hOldBrush;
-                COLORREF oldText = 0;
-                COLORREF oldBk = 0;
-
-//              FIXME(toolbar, "action: %x itemState: %x\n",
-//                    lpdis->itemAction, lpdis->itemState);             
-
-                if (lpdis->itemState & ODS_FOCUS)
-                {
-                    oldBk = SetBkColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHT));
-                    oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-                }
-
-                hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-                hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-
-                /* fill background rectangle */
-                Rectangle (lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
-                           lpdis->rcItem.right, lpdis->rcItem.bottom);
-
-                /* calculate button and text rectangles */
-                CopyRect (&rcButton, &lpdis->rcItem);
-                InflateRect (&rcButton, -1, -1);
-                CopyRect (&rcText, &rcButton);
-                rcButton.right = rcButton.left + infoPtr->nBitmapWidth + 6;
-                rcText.left = rcButton.right + 2;
-
-                /* draw focus rectangle */
-                if (lpdis->itemState & ODS_FOCUS)
-                    DrawFocusRect (lpdis->hDC, &lpdis->rcItem);
-
-                /* draw button */
-                DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
-
-                /* draw text */
-                if (wParam == IDC_AVAILBTN_LBOX && lpdis->itemID == 0)
-                    DrawTextA (lpdis->hDC, "Separator", -1, &rcText,
-                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
-
-                if (lpdis->itemState & ODS_FOCUS)
-                {
-                    SetBkColor (lpdis->hDC, oldBk);
-                    SetTextColor (lpdis->hDC, oldText);
-                }
-
-                SelectObject (lpdis->hDC, hOldBrush);
-                SelectObject (lpdis->hDC, hOldPen);
-
-                return TRUE;
-            }
-            return FALSE;
-
-        case WM_MEASUREITEM:
-            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
-            {
-                MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*)lParam;
-
-                if (infoPtr)
-                    lpmis->itemHeight = infoPtr->nBitmapHeight + 8;
-                else
-                    lpmis->itemHeight = 16 + 8; /* default height */
-
-                return TRUE;
-            }
-            return FALSE;
-
-        default:
-            return FALSE;
+        case WM_INITDIALOG:
+            infoPtr = (TOOLBAR_INFO *)lParam;
+            SetWindowLongA (hwnd, DWL_USER, (DWORD)infoPtr);
+
+            hDsa = DSA_Create (sizeof(TBUTTON_INFO), 5);
+
+            if (infoPtr)
+            {
+                TBUTTON_INFO *btnPtr;
+                INT i;
+
+                /* insert 'virtual' separator button into 'available buttons' list */
+                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
+
+                /* copy all buttons and append them to the right listbox */
+                btnPtr = infoPtr->buttons;
+                for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
+                {
+                    DSA_InsertItem (hDsa, i, btnPtr);
+
+                    if (btnPtr->fsState & TBSTATE_HIDDEN)
+                    {
+                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
+                    }
+                    else
+                    {
+                        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
+                    }
+                }
+
+                /* append 'virtual' sepatator button to the 'toolbar buttons' list */
+                /* TODO */
+            }
+            return TRUE;
+
+        case WM_CLOSE:
+            EndDialog(hwnd, FALSE);
+            return TRUE;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDCANCEL:
+                    EndDialog(hwnd, FALSE);
+                    break;
+            }
+            return TRUE;
+
+        case WM_DESTROY:
+            if (hDsa)
+                DSA_Destroy (hDsa);
+            return TRUE;
+
+        case WM_DRAWITEM:
+            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
+            {
+                LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
+                RECT rcButton;
+                RECT rcText;
+                HPEN hOldPen;
+                HBRUSH hOldBrush;
+                COLORREF oldText = 0;
+                COLORREF oldBk = 0;
+
+//              FIXME(toolbar, "action: %x itemState: %x\n",
+//                    lpdis->itemAction, lpdis->itemState);
+
+                if (lpdis->itemState & ODS_FOCUS)
+                {
+                    oldBk = SetBkColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHT));
+                    oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+                }
+
+                hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+
+                /* fill background rectangle */
+                Rectangle (lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
+                           lpdis->rcItem.right, lpdis->rcItem.bottom);
+
+                /* calculate button and text rectangles */
+                CopyRect (&rcButton, &lpdis->rcItem);
+                InflateRect (&rcButton, -1, -1);
+                CopyRect (&rcText, &rcButton);
+                rcButton.right = rcButton.left + infoPtr->nBitmapWidth + 6;
+                rcText.left = rcButton.right + 2;
+
+                /* draw focus rectangle */
+                if (lpdis->itemState & ODS_FOCUS)
+                    DrawFocusRect (lpdis->hDC, &lpdis->rcItem);
+
+                /* draw button */
+                DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
+
+                /* draw text */
+                if (wParam == IDC_AVAILBTN_LBOX && lpdis->itemID == 0)
+                    DrawTextA (lpdis->hDC, "Separator", -1, &rcText,
+                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
+
+                if (lpdis->itemState & ODS_FOCUS)
+                {
+                    SetBkColor (lpdis->hDC, oldBk);
+                    SetTextColor (lpdis->hDC, oldText);
+                }
+
+                SelectObject (lpdis->hDC, hOldBrush);
+                SelectObject (lpdis->hDC, hOldPen);
+
+                return TRUE;
+            }
+            return FALSE;
+
+        case WM_MEASUREITEM:
+            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
+            {
+                MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*)lParam;
+
+                if (infoPtr)
+                    lpmis->itemHeight = infoPtr->nBitmapHeight + 8;
+                else
+                    lpmis->itemHeight = 16 + 8; /* default height */
+
+                return TRUE;
+            }
+            return FALSE;
+
+        default:
+            return FALSE;
     }
 }
@@ -875 +876 @@
 
     if ((!lpAddBmp) || ((INT)wParam <= 0))
-        return -1;
+        return -1;
 
 //    TRACE (toolbar, "adding %d bitmaps!\n", wParam);
 
     if (!(infoPtr->himlStd)) {
-        /* create new standard image list */
-
-//      TRACE (toolbar, "creating standard image list!\n");
-
-
-        /* Windows resize all the buttons to the size of a newly added STandard Image*/
-        /* TODO: The resizing  should be done each time a standard image is added*/
-        if (lpAddBmp->hInst == HINST_COMMCTRL)
-        {
-
-            if (lpAddBmp->nID & 1) 
-            {
-                SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
-                              MAKELPARAM((WORD)26, (WORD)26));
-                SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
-                              MAKELPARAM((WORD)33, (WORD)33));
-            }
-            else 
-            {
-                SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
-                              MAKELPARAM((WORD)16, (WORD)16));
-
-                SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
-                              MAKELPARAM((WORD)22, (WORD)22));
-            }
-
-            TOOLBAR_CalcToolbar (hwnd);
-        }
-
-        infoPtr->himlStd =
-            ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-                              ILC_COLOR | ILC_MASK, (INT)wParam, 2);
+        /* create new standard image list */
+
+//      TRACE (toolbar, "creating standard image list!\n");
+
+
+        /* Windows resize all the buttons to the size of a newly added STandard Image*/
+        /* TODO: The resizing  should be done each time a standard image is added*/
+        if (lpAddBmp->hInst == HINST_COMMCTRL)
+        {
+
+            if (lpAddBmp->nID & 1)
+            {
+                SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
+                              MAKELPARAM((WORD)26, (WORD)26));
+                SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
+                              MAKELPARAM((WORD)33, (WORD)33));
+            }
+            else
+            {
+                SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
+                              MAKELPARAM((WORD)16, (WORD)16));
+
+                SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
+                              MAKELPARAM((WORD)22, (WORD)22));
+            }
+
+            TOOLBAR_CalcToolbar (hwnd);
+        }
+
+        infoPtr->himlStd =
+            ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
+                              ILC_COLOR | ILC_MASK, (INT)wParam, 2);
     }
 
     /* Add bitmaps to the standard image list */
     if (lpAddBmp->hInst == (HINSTANCE)0) {
-        nIndex = 
-            ImageList_AddMasked (infoPtr->himlStd, (HBITMAP)lpAddBmp->nID,
-                                 CLR_DEFAULT);
+        nIndex =
+            ImageList_AddMasked (infoPtr->himlStd, (HBITMAP)lpAddBmp->nID,
+                                 CLR_DEFAULT);
     }
     else if (lpAddBmp->hInst == HINST_COMMCTRL) {
-        /* add internal bitmaps */
-        
-//      FIXME (toolbar, "internal bitmaps not supported!\n");
-        /* TODO: Resize all the buttons when a new standard image is added */
-
-        /* Hack to "add" some reserved images within the image list 
-           to get the right image indices */
-        nIndex = ImageList_GetImageCount (infoPtr->himlStd);
-        ImageList_SetImageCount (infoPtr->himlStd, nIndex + (INT)wParam);
-        
+        /* add internal bitmaps */
+
+//      FIXME (toolbar, "internal bitmaps not supported!\n");
+        /* TODO: Resize all the buttons when a new standard image is added */
+
+        /* Hack to "add" some reserved images within the image list
+           to get the right image indices */
+        nIndex = ImageList_GetImageCount (infoPtr->himlStd);
+        ImageList_SetImageCount (infoPtr->himlStd, nIndex + (INT)wParam);
+
     }
     else {
-        HBITMAP hBmp =
-            LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-        nIndex = ImageList_AddMasked (infoPtr->himlStd, hBmp, CLR_DEFAULT);
-
-        DeleteObject (hBmp); 
+        HBITMAP hBmp =
+            LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
+        nIndex = ImageList_AddMasked (infoPtr->himlStd, hBmp, CLR_DEFAULT);
+
+        DeleteObject (hBmp);
     }
 
@@ -960 +961 @@
 
     if (infoPtr->nNumButtons == 0) {
-        infoPtr->buttons =
-            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
     }
     else {
-        TBUTTON_INFO *oldButtons = infoPtr->buttons;
-        infoPtr->buttons =
-            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
-        memcpy (&infoPtr->buttons[0], &oldButtons[0],
-                nOldButtons * sizeof(TBUTTON_INFO));
+        TBUTTON_INFO *oldButtons = infoPtr->buttons;
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nOldButtons * sizeof(TBUTTON_INFO));
         COMCTL32_Free (oldButtons);
     }
@@ -976 +977 @@
     /* insert new button data */
     for (nCount = 0; nCount < nAddButtons; nCount++) {
-        TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
-        btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
-        btnPtr->idCommand = lpTbb[nCount].idCommand;
-        btnPtr->fsState   = lpTbb[nCount].fsState;
-        btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
-        btnPtr->dwData    = lpTbb[nCount].dwData;
-        btnPtr->iString   = lpTbb[nCount].iString;
-        btnPtr->bHot      = FALSE;
-
-        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
-            TTTOOLINFOA ti;
-
-            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-            ti.cbSize   = sizeof (TTTOOLINFOA);
-            ti.hwnd     = hwnd;
-            ti.uId      = btnPtr->idCommand;
-            ti.hinst    = 0;
-            ti.lpszText = LPSTR_TEXTCALLBACKA;
-
-            SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
-                            0, (LPARAM)&ti);
-        }
+        TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
+        btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
+        btnPtr->idCommand = lpTbb[nCount].idCommand;
+        btnPtr->fsState   = lpTbb[nCount].fsState;
+        btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
+        btnPtr->dwData    = lpTbb[nCount].dwData;
+        btnPtr->iString   = lpTbb[nCount].iString;
+        btnPtr->bHot      = FALSE;
+
+        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
+            TTTOOLINFOA ti;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+            ti.cbSize   = sizeof (TTTOOLINFOA);
+            ti.hwnd     = hwnd;
+            ti.uId      = btnPtr->idCommand;
+            ti.hinst    = 0;
+            ti.lpszText = LPSTR_TEXTCALLBACKA;
+
+            SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
+                            0, (LPARAM)&ti);
+        }
     }
 
@@ -1018 +1019 @@
 
     if ((wParam) && (HIWORD(lParam) == 0)) {
-        char szString[256];
-        INT len;
-//      TRACE (toolbar, "adding string from resource!\n");
-
-        len = LoadStringA ((HINSTANCE)wParam, (UINT)lParam,
-                             szString, 256);
-
-//      TRACE (toolbar, "len=%d \"%s\"\n", len, szString);
-        nIndex = infoPtr->nNumStrings;
-        if (infoPtr->nNumStrings == 0) {
-            infoPtr->strings =
-                COMCTL32_Alloc (sizeof(LPWSTR));
-        }
-        else {
-            LPWSTR *oldStrings = infoPtr->strings;
-            infoPtr->strings =
-                COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-            memcpy (&infoPtr->strings[0], &oldStrings[0],
-                    sizeof(LPWSTR) * infoPtr->nNumStrings);
-            COMCTL32_Free (oldStrings);
-        }
-
-        infoPtr->strings[infoPtr->nNumStrings] =
-            COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-        lstrcpyAtoW (infoPtr->strings[infoPtr->nNumStrings], szString);
-        infoPtr->nNumStrings++;
+        char szString[256];
+        INT len;
+//      TRACE (toolbar, "adding string from resource!\n");
+
+        len = LoadStringA ((HINSTANCE)wParam, (UINT)lParam,
+                             szString, 256);
+
+//      TRACE (toolbar, "len=%d \"%s\"\n", len, szString);
+        nIndex = infoPtr->nNumStrings;
+        if (infoPtr->nNumStrings == 0) {
+            infoPtr->strings =
+                COMCTL32_Alloc (sizeof(LPWSTR));
+        }
+        else {
+            LPWSTR *oldStrings = infoPtr->strings;
+            infoPtr->strings =
+                COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+            memcpy (&infoPtr->strings[0], &oldStrings[0],
+                    sizeof(LPWSTR) * infoPtr->nNumStrings);
+            COMCTL32_Free (oldStrings);
+        }
+
+        infoPtr->strings[infoPtr->nNumStrings] =
+            COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+        lstrcpyAtoW (infoPtr->strings[infoPtr->nNumStrings], szString);
+        infoPtr->nNumStrings++;
     }
     else {
-        LPSTR p = (LPSTR)lParam;
-        INT len;
-
-        if (p == NULL)
-            return -1;
-//      TRACE (toolbar, "adding string(s) from array!\n");
-        nIndex = infoPtr->nNumStrings;
-        while (*p) {
-            len = lstrlenA (p);
-//          TRACE (toolbar, "len=%d \"%s\"\n", len, p);
-
-            if (infoPtr->nNumStrings == 0) {
-                infoPtr->strings =
-                    COMCTL32_Alloc (sizeof(LPWSTR));
-            }
-            else {
-                LPWSTR *oldStrings = infoPtr->strings;
-                infoPtr->strings =
-                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-                memcpy (&infoPtr->strings[0], &oldStrings[0],
-                        sizeof(LPWSTR) * infoPtr->nNumStrings);
-                COMCTL32_Free (oldStrings);
-            }
-
-            infoPtr->strings[infoPtr->nNumStrings] =
-                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-            lstrcpyAtoW (infoPtr->strings[infoPtr->nNumStrings], p);
-            infoPtr->nNumStrings++;
-
-            p += (len+1);
-        }
+        LPSTR p = (LPSTR)lParam;
+        INT len;
+
+        if (p == NULL)
+            return -1;
+//      TRACE (toolbar, "adding string(s) from array!\n");
+        nIndex = infoPtr->nNumStrings;
+        while (*p) {
+            len = lstrlenA (p);
+//          TRACE (toolbar, "len=%d \"%s\"\n", len, p);
+
+            if (infoPtr->nNumStrings == 0) {
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR));
+            }
+            else {
+                LPWSTR *oldStrings = infoPtr->strings;
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                memcpy (&infoPtr->strings[0], &oldStrings[0],
+                        sizeof(LPWSTR) * infoPtr->nNumStrings);
+                COMCTL32_Free (oldStrings);
+            }
+
+            infoPtr->strings[infoPtr->nNumStrings] =
+                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+            lstrcpyAtoW (infoPtr->strings[infoPtr->nNumStrings], p);
+            infoPtr->nNumStrings++;
+
+            p += (len+1);
+        }
     }
 
@@ -1090 +1091 @@
 
     if ((wParam) && (HIWORD(lParam) == 0)) {
-        WCHAR szString[256];
-        INT len;
-//      TRACE (toolbar, "adding string from resource!\n");
-
-        len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
-                             szString, 256);
-
-//      TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(szString));
-        nIndex = infoPtr->nNumStrings;
-        if (infoPtr->nNumStrings == 0) {
-            infoPtr->strings =
-                COMCTL32_Alloc (sizeof(LPWSTR));
-        }
-        else {
-            LPWSTR *oldStrings = infoPtr->strings;
-            infoPtr->strings =
-                COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-            memcpy (&infoPtr->strings[0], &oldStrings[0],
-                    sizeof(LPWSTR) * infoPtr->nNumStrings);
-            COMCTL32_Free (oldStrings);
-        }
-
-        infoPtr->strings[infoPtr->nNumStrings] =
-            COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-        lstrcpyW (infoPtr->strings[infoPtr->nNumStrings], szString);
-        infoPtr->nNumStrings++;
+        WCHAR szString[256];
+        INT len;
+//      TRACE (toolbar, "adding string from resource!\n");
+
+        len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
+                             szString, 256);
+
+//      TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(szString));
+        nIndex = infoPtr->nNumStrings;
+        if (infoPtr->nNumStrings == 0) {
+            infoPtr->strings =
+                COMCTL32_Alloc (sizeof(LPWSTR));
+        }
+        else {
+            LPWSTR *oldStrings = infoPtr->strings;
+            infoPtr->strings =
+                COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+            memcpy (&infoPtr->strings[0], &oldStrings[0],
+                    sizeof(LPWSTR) * infoPtr->nNumStrings);
+            COMCTL32_Free (oldStrings);
+        }
+
+        infoPtr->strings[infoPtr->nNumStrings] =
+            COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+        lstrcpyW (infoPtr->strings[infoPtr->nNumStrings], szString);
+        infoPtr->nNumStrings++;
     }
     else {
-        LPWSTR p = (LPWSTR)lParam;
-        INT len;
-
-        if (p == NULL)
-            return -1;
-//      TRACE (toolbar, "adding string(s) from array!\n");
-        nIndex = infoPtr->nNumStrings;
-        while (*p) {
-            len = lstrlenW (p);
-//          TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(p));
-
-            if (infoPtr->nNumStrings == 0) {
-                infoPtr->strings =
-                    COMCTL32_Alloc (sizeof(LPWSTR));
-            }
-            else {
-                LPWSTR *oldStrings = infoPtr->strings;
-                infoPtr->strings =
-                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-                memcpy (&infoPtr->strings[0], &oldStrings[0],
-                        sizeof(LPWSTR) * infoPtr->nNumStrings);
-                COMCTL32_Free (oldStrings);
-            }
-
-            infoPtr->strings[infoPtr->nNumStrings] =
-                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-            lstrcpyW (infoPtr->strings[infoPtr->nNumStrings], p);
-            infoPtr->nNumStrings++;
-
-            p += (len+1);
-        }
+        LPWSTR p = (LPWSTR)lParam;
+        INT len;
+
+        if (p == NULL)
+            return -1;
+//      TRACE (toolbar, "adding string(s) from array!\n");
+        nIndex = infoPtr->nNumStrings;
+        while (*p) {
+            len = lstrlenW (p);
+//          TRACE (toolbar, "len=%d \"%s\"\n", len, debugstr_w(p));
+
+            if (infoPtr->nNumStrings == 0) {
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR));
+            }
+            else {
+                LPWSTR *oldStrings = infoPtr->strings;
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                memcpy (&infoPtr->strings[0], &oldStrings[0],
+                        sizeof(LPWSTR) * infoPtr->nNumStrings);
+                COMCTL32_Free (oldStrings);
+            }
+
+            infoPtr->strings[infoPtr->nNumStrings] =
+                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+            lstrcpyW (infoPtr->strings[infoPtr->nNumStrings], p);
+            infoPtr->nNumStrings++;
+
+            p += (len+1);
+        }
     }
 
@@ -1172 +1173 @@
 
     if (dwStyle & CCS_NORESIZE) {
-        uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
-        cx = 0;
-        cy = 0;
+        uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
+        cx = 0;
+        cy = 0;
     }
     else {
-        infoPtr->nWidth = parent_rect.right - parent_rect.left;
-        TOOLBAR_CalcToolbar (hwnd);
-        InvalidateRect( hwnd, NULL, TRUE );
-        cy = infoPtr->nHeight;
-        cx = infoPtr->nWidth;
+        infoPtr->nWidth = parent_rect.right - parent_rect.left;
+        TOOLBAR_CalcToolbar (hwnd);
+        InvalidateRect( hwnd, NULL, TRUE );
+        cy = infoPtr->nHeight;
+        cx = infoPtr->nWidth;
     }
 
     if (dwStyle & CCS_NOPARENTALIGN)
-        uPosFlags |= SWP_NOMOVE;
+        uPosFlags |= SWP_NOMOVE;
 
     if (!(dwStyle & CCS_NODIVIDER))
-        cy += GetSystemMetrics(SM_CYEDGE);
+        cy += GetSystemMetrics(SM_CYEDGE);
 
     infoPtr->bAutoSize = TRUE;
     SetWindowPos (hwnd, HWND_TOP, parent_rect.left, parent_rect.top,
-                    cx, cy, uPosFlags);
+                    cx, cy, uPosFlags);
 
     return 0;
@@ -1213 +1214 @@
 
     if (infoPtr == NULL) {
-//      ERR (toolbar, "(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
-//      ERR (toolbar, "infoPtr == NULL!\n");
-        return 0;
+//      ERR (toolbar, "(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
+//      ERR (toolbar, "infoPtr == NULL!\n");
+        return 0;
     }
 
@@ -1234 +1235 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -1258 +1259 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
 
     if (!(btnPtr->fsStyle & TBSTYLE_CHECK))
-        return FALSE;
+        return FALSE;
 
     if (LOWORD(lParam) == FALSE)
-        btnPtr->fsState &= ~TBSTATE_CHECKED;
+        btnPtr->fsState &= ~TBSTATE_CHECKED;
     else {
-        if (btnPtr->fsStyle & TBSTYLE_GROUP) {
-            nOldIndex = 
-                TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nIndex);
-            if (nOldIndex == nIndex)
-                return 0;
-            if (nOldIndex != -1)
-                infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
-        }
-        btnPtr->fsState |= TBSTATE_CHECKED;
+        if (btnPtr->fsStyle & TBSTYLE_GROUP) {
+            nOldIndex =
+                TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nIndex);
+            if (nOldIndex == nIndex)
+                return 0;
+            if (nOldIndex != -1)
+                infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
+        }
+        btnPtr->fsState |= TBSTATE_CHECKED;
     }
 
     hdc = GetDC (hwnd);
     if (nOldIndex != -1)
-        TOOLBAR_DrawButton (hwnd, &infoPtr->buttons[nOldIndex], hdc);
+        TOOLBAR_DrawButton (hwnd, &infoPtr->buttons[nOldIndex], hdc);
     TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
     ReleaseDC (hwnd, hdc);
@@ -1315 +1316 @@
 
     SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
-                  (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+                  (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
 
     if (!(hRes = FindResourceA (COMCTL32_hModule,
                                 MAKEINTRESOURCEA(IDD_TBCUSTOMIZE),
                                 RT_DIALOGA)))
-        return FALSE;
+        return FALSE;
 
     if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes)))
-        return FALSE;
+        return FALSE;
 
     ret = DialogBoxIndirectParamA (GetWindowLongA (hwnd, GWL_HINSTANCE),
@@ -1335 +1336 @@
 
     SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
-                  (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+                  (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
 
     return ret;
@@ -1348 +1349 @@
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-        return FALSE;
-
-    if ((infoPtr->hwndToolTip) && 
-        !(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
-        TTTOOLINFOA ti;
-
-        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-        ti.cbSize   = sizeof (TTTOOLINFOA);
-        ti.hwnd     = hwnd;
-        ti.uId      = infoPtr->buttons[nIndex].idCommand;
-
-        SendMessageA (infoPtr->hwndToolTip, TTM_DELTOOLA, 0, (LPARAM)&ti);
+        return FALSE;
+
+    if ((infoPtr->hwndToolTip) &&
+        !(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
+        TTTOOLINFOA ti;
+
+        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+        ti.cbSize   = sizeof (TTTOOLINFOA);
+        ti.hwnd     = hwnd;
+        ti.uId      = infoPtr->buttons[nIndex].idCommand;
+
+        SendMessageA (infoPtr->hwndToolTip, TTM_DELTOOLA, 0, (LPARAM)&ti);
     }
 
     if (infoPtr->nNumButtons == 1) {
-//      TRACE (toolbar, " simple delete!\n");
-        COMCTL32_Free (infoPtr->buttons);
-        infoPtr->buttons = NULL;
-        infoPtr->nNumButtons = 0;
+//      TRACE (toolbar, " simple delete!\n");
+        COMCTL32_Free (infoPtr->buttons);
+        infoPtr->buttons = NULL;
+        infoPtr->nNumButtons = 0;
     }
     else {
-        TBUTTON_INFO *oldButtons = infoPtr->buttons;
+        TBUTTON_INFO *oldButtons = infoPtr->buttons;
 //        TRACE(toolbar, "complex delete! [nIndex=%d]\n", nIndex);
 
-        infoPtr->nNumButtons--;
-        infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
+        infoPtr->nNumButtons--;
+        infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
         if (nIndex > 0) {
             memcpy (&infoPtr->buttons[0], &oldButtons[0],
@@ -1384 +1385 @@
         }
 
-        COMCTL32_Free (oldButtons);
+        COMCTL32_Free (oldButtons);
     }
 
@@ -1405 +1406 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-        btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED);
+        btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED);
     else
-        btnPtr->fsState |= TBSTATE_ENABLED;
+        btnPtr->fsState |= TBSTATE_ENABLED;
 
     hdc = GetDC (hwnd);
@@ -1432 +1433 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return -1;
+        return -1;
 
     return infoPtr->buttons[nIndex].iBitmap;
@@ -1454 +1455 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
 
     if (lpTbb == NULL)
-        return FALSE;
+        return FALSE;
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -1483 +1484 @@
 
     if (infoPtr == NULL)
-        return -1;
+        return -1;
     if (lpTbInfo == NULL)
-        return -1;
+        return -1;
     if (lpTbInfo->cbSize < sizeof(TBBUTTONINFOA))
-        return -1;
+        return -1;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return -1;
+        return -1;
 
     btnPtr = &infoPtr->buttons[nIndex];
 
     if (lpTbInfo->dwMask & TBIF_COMMAND)
-        lpTbInfo->idCommand = btnPtr->idCommand;
+        lpTbInfo->idCommand = btnPtr->idCommand;
     if (lpTbInfo->dwMask & TBIF_IMAGE)
-        lpTbInfo->iImage = btnPtr->iBitmap;
+        lpTbInfo->iImage = btnPtr->iBitmap;
     if (lpTbInfo->dwMask & TBIF_LPARAM)
-        lpTbInfo->lParam = btnPtr->dwData;
+        lpTbInfo->lParam = btnPtr->dwData;
     if (lpTbInfo->dwMask & TBIF_SIZE)
-        lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
+        lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
     if (lpTbInfo->dwMask & TBIF_STATE)
-        lpTbInfo->fsState = btnPtr->fsState;
+        lpTbInfo->fsState = btnPtr->fsState;
     if (lpTbInfo->dwMask & TBIF_STYLE)
-        lpTbInfo->fsStyle = btnPtr->fsStyle;
+        lpTbInfo->fsStyle = btnPtr->fsStyle;
     if (lpTbInfo->dwMask & TBIF_TEXT) {
-        if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
-            lstrcpynA (lpTbInfo->pszText, 
-                         (LPSTR)infoPtr->strings[btnPtr->iString],
-                         lpTbInfo->cchText);
+        if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
+            lstrcpynA (lpTbInfo->pszText,
+                         (LPSTR)infoPtr->strings[btnPtr->iString],
+                         lpTbInfo->cchText);
     }
 
@@ -1527 +1528 @@
 
     return MAKELONG((WORD)infoPtr->nButtonWidth,
-                    (WORD)infoPtr->nButtonHeight);
+                    (WORD)infoPtr->nButtonHeight);
 }
 
@@ -1539 +1540 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return -1;
+        return -1;
 
     nStringIndex = infoPtr->buttons[nIndex].iString;
@@ -1546 +1547 @@
 
     if ((nStringIndex < 0) || (nStringIndex >= infoPtr->nNumStrings))
-        return -1;
+        return -1;
 
     if (lParam == 0) return -1;
@@ -1566 +1567 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT)
-        return (LRESULT)infoPtr->himlDis;
+        return (LRESULT)infoPtr->himlDis;
     else
-        return 0;
+        return 0;
 }
 
@@ -1587 +1588 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT)
-        return (LRESULT)infoPtr->himlHot;
+        return (LRESULT)infoPtr->himlHot;
     else
-        return 0;
+        return 0;
 }
 
@@ -1602 +1603 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT)
-        return (LRESULT)infoPtr->himlDef;
+        return (LRESULT)infoPtr->himlDef;
     else
-        return 0;
+        return 0;
 }
 
@@ -1621 +1622 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
     nIndex = (INT)wParam;
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-        return FALSE;
+        return FALSE;
     lpRect = (LPRECT)lParam;
     if (lpRect == NULL)
-        return FALSE;
+        return FALSE;
     if (btnPtr->fsState & TBSTATE_HIDDEN)
-        return FALSE;
-    
+        return FALSE;
+
     TOOLBAR_CalcToolbar( hwnd );
-    
+
     lpRect->left   = btnPtr->rect.left;
     lpRect->right  = btnPtr->rect.right;
@@ -1650 +1651 @@
 
     if (lpSize == NULL)
-        return FALSE;
+        return FALSE;
 
     lpSize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left;
@@ -1656 +1657 @@
 
 //    TRACE (toolbar, "maximum size %d x %d\n",
-//         infoPtr->rcBound.right - infoPtr->rcBound.left,
-//         infoPtr->rcBound.bottom - infoPtr->rcBound.top);
+//         infoPtr->rcBound.right - infoPtr->rcBound.left,
+//         infoPtr->rcBound.bottom - infoPtr->rcBound.top);
 
     return TRUE;
@@ -1676 +1677 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
     nIndex = (INT)wParam;
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-        return FALSE;
+        return FALSE;
     lpRect = (LPRECT)lParam;
     if (lpRect == NULL)
-        return FALSE;
-    
+        return FALSE;
+
     lpRect->left   = btnPtr->rect.left;
     lpRect->right  = btnPtr->rect.right;
@@ -1700 +1701 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_WRAPABLE)
-        return infoPtr->nRows;
+        return infoPtr->nRows;
     else
-        return 1;
+        return 1;
 }
 
@@ -1714 +1715 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return -1;
+        return -1;
 
     return infoPtr->buttons[nIndex].fsState;
@@ -1728 +1729 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return -1;
+        return -1;
 
     return infoPtr->buttons[nIndex].fsStyle;
@@ -1740 +1741 @@
 
     if (infoPtr == NULL)
-        return 0;
+        return 0;
 
     return infoPtr->nMaxTextRows;
@@ -1752 +1753 @@
 
     if (infoPtr == NULL)
-        return 0;
+        return 0;
     return infoPtr->hwndToolTip;
 }
@@ -1762 +1763 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-//    TRACE (toolbar, "%s hwnd=0x%x stub!\n", 
-//         infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
+//    TRACE (toolbar, "%s hwnd=0x%x stub!\n",
+//         infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
 
     return infoPtr->bUnicode;
@@ -1778 +1779 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-        btnPtr->fsState &= ~TBSTATE_HIDDEN;
+        btnPtr->fsState &= ~TBSTATE_HIDDEN;
     else
-        btnPtr->fsState |= TBSTATE_HIDDEN;
+        btnPtr->fsState |= TBSTATE_HIDDEN;
 
     TOOLBAR_CalcToolbar (hwnd);
@@ -1811 +1812 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-        btnPtr->fsState &= ~TBSTATE_INDETERMINATE;
+        btnPtr->fsState &= ~TBSTATE_INDETERMINATE;
     else
-        btnPtr->fsState |= TBSTATE_INDETERMINATE;
+        btnPtr->fsState |= TBSTATE_INDETERMINATE;
 
     hdc = GetDC (hwnd);
@@ -1836 +1837 @@
 
     if (lpTbb == NULL)
-        return FALSE;
+        return FALSE;
     if (nIndex < 0)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (toolbar, "inserting button index=%d\n", nIndex);
     if (nIndex > infoPtr->nNumButtons) {
-        nIndex = infoPtr->nNumButtons;
-//      TRACE (toolbar, "adjust index=%d\n", nIndex);
+        nIndex = infoPtr->nNumButtons;
+//      TRACE (toolbar, "adjust index=%d\n", nIndex);
     }
 
@@ -1851 +1852 @@
     /* pre insert copy */
     if (nIndex > 0) {
-        memcpy (&infoPtr->buttons[0], &oldButtons[0],
-                nIndex * sizeof(TBUTTON_INFO));
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nIndex * sizeof(TBUTTON_INFO));
     }
 
@@ -1864 +1865 @@
 
     if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & TBSTYLE_SEP)) {
-        TTTOOLINFOA ti;
-
-        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-        ti.cbSize   = sizeof (TTTOOLINFOA);
-        ti.hwnd     = hwnd;
-        ti.uId      = lpTbb->idCommand;
-        ti.hinst    = 0;
-        ti.lpszText = LPSTR_TEXTCALLBACKA;
-
-        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
-                        0, (LPARAM)&ti);
+        TTTOOLINFOA ti;
+
+        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+        ti.cbSize   = sizeof (TTTOOLINFOA);
+        ti.hwnd     = hwnd;
+        ti.uId      = lpTbb->idCommand;
+        ti.hinst    = 0;
+        ti.lpszText = LPSTR_TEXTCALLBACKA;
+
+        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
+                        0, (LPARAM)&ti);
     }
 
     /* post insert copy */
     if (nIndex < infoPtr->nNumButtons - 1) {
-        memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex],
-                (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO));
+        memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex],
+                (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO));
     }
 
@@ -1905 +1906 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_CHECKED);
@@ -1919 +1920 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_ENABLED);
@@ -1933 +1934 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_HIDDEN);
@@ -1947 +1948 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_MARKED);
@@ -1961 +1962 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_INDETERMINATE);
@@ -1975 +1976 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_PRESSED);
@@ -1997 +1998 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-        btnPtr->fsState &= ~TBSTATE_PRESSED;
+        btnPtr->fsState &= ~TBSTATE_PRESSED;
     else
-        btnPtr->fsState |= TBSTATE_PRESSED;
+        btnPtr->fsState |= TBSTATE_PRESSED;
 
     hdc = GetDC (hwnd);
@@ -2026 +2027 @@
 
     if ((BOOL)wParam) {
-        /* save toolbar information */
-//      FIXME (toolbar, "save to \"%s\" \"%s\"\n",
-//             lpSave->pszSubKey, lpSave->pszValueName);
+        /* save toolbar information */
+//      FIXME (toolbar, "save to \"%s\" \"%s\"\n",
+//             lpSave->pszSubKey, lpSave->pszValueName);
 
 
     }
     else {
-        /* restore toolbar information */
-
-//      FIXME (toolbar, "restore from \"%s\" \"%s\"\n",
-//             lpSave->pszSubKey, lpSave->pszValueName);
+        /* restore toolbar information */
+
+//      FIXME (toolbar, "restore from \"%s\" \"%s\"\n",
+//             lpSave->pszSubKey, lpSave->pszValueName);
 
 
@@ -2056 +2057 @@
 
     if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
-        return FALSE;
+        return FALSE;
 
     infoPtr->nBitmapWidth = (INT)LOWORD(lParam);
@@ -2074 +2075 @@
 
     if (lptbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lptbbi->cbSize < sizeof(TBBUTTONINFOA))
-        return FALSE;
-    
+        return FALSE;
+
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (lptbbi->dwMask & TBIF_COMMAND)
-        btnPtr->idCommand = lptbbi->idCommand;
+        btnPtr->idCommand = lptbbi->idCommand;
     if (lptbbi->dwMask & TBIF_IMAGE)
-        btnPtr->iBitmap = lptbbi->iImage;
+        btnPtr->iBitmap = lptbbi->iImage;
     if (lptbbi->dwMask & TBIF_LPARAM)
-        btnPtr->dwData = lptbbi->lParam;
+        btnPtr->dwData = lptbbi->lParam;
 /*    if (lptbbi->dwMask & TBIF_SIZE) */
-/*      btnPtr->cx = lptbbi->cx; */
+/*      btnPtr->cx = lptbbi->cx; */
     if (lptbbi->dwMask & TBIF_STATE)
-        btnPtr->fsState = lptbbi->fsState;
+        btnPtr->fsState = lptbbi->fsState;
     if (lptbbi->dwMask & TBIF_STYLE)
-        btnPtr->fsStyle = lptbbi->fsStyle;
+        btnPtr->fsStyle = lptbbi->fsStyle;
 
     if (lptbbi->dwMask & TBIF_TEXT) {
-        if ((btnPtr->iString >= 0) || 
-            (btnPtr->iString < infoPtr->nNumStrings)) {
+        if ((btnPtr->iString >= 0) ||
+            (btnPtr->iString < infoPtr->nNumStrings)) {
 #if 0
-            CHAR **lpString = &infoPtr->strings[btnPtr->iString];
-            INT len = lstrlenA (lptbbi->pszText);
-            *lpString = COMCTL32_ReAlloc (lpString, sizeof(char)*(len+1));
+            CHAR **lpString = &infoPtr->strings[btnPtr->iString];
+            INT len = lstrlenA (lptbbi->pszText);
+            *lpString = COMCTL32_ReAlloc (lpString, sizeof(char)*(len+1));
 #endif
 
-            /* this is the ultimate sollution */
-/*          Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
-        }
+            /* this is the ultimate sollution */
+/*          Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
+        }
     }
 
@@ -2123 +2124 @@
 
     if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
-        return FALSE;
+        return FALSE;
 
     infoPtr->nButtonWidth = (INT)LOWORD(lParam);
@@ -2138 +2139 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
 
     infoPtr->cxMin = (INT)LOWORD(lParam);
@@ -2154 +2155 @@
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-        return FALSE;
+        return FALSE;
 
     infoPtr->buttons[nIndex].idCommand = (INT)lParam;
@@ -2160 +2161 @@
     if (infoPtr->hwndToolTip) {
 
-//      FIXME (toolbar, "change tool tip!\n");
+//      FIXME (toolbar, "change tool tip!\n");
 
     }
@@ -2178 +2179 @@
 
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT))
-        return 0;
+        return 0;
 
     himlTemp = infoPtr->himlDis;
@@ -2185 +2186 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp; 
+    return (LRESULT)himlTemp;
 }
 
@@ -2197 +2198 @@
     dwTemp = infoPtr->dwDTFlags;
     infoPtr->dwDTFlags =
-        (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam;
+        (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam;
 
     return (LRESULT)dwTemp;
@@ -2212 +2213 @@
     infoPtr->dwExStyle = (DWORD)lParam;
 
-    return (LRESULT)dwTemp; 
+    return (LRESULT)dwTemp;
 }
 
@@ -2223 +2224 @@
 
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT))
-        return 0;
+        return 0;
 
     himlTemp = infoPtr->himlHot;
@@ -2230 +2231 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp; 
+    return (LRESULT)himlTemp;
 }
 
@@ -2244 +2245 @@
 
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT))
-        return 0;
+        return 0;
 
     himlTemp = infoPtr->himlDef;
@@ -2251 +2252 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp; 
+    return (LRESULT)himlTemp;
 }
 
@@ -2292 +2293 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
 
     infoPtr->nMaxTextRows = (INT)wParam;
@@ -2310 +2311 @@
 
     if (infoPtr == NULL)
-        return 0;
+        return 0;
     hwndOldNotify = infoPtr->hwndNotify;
     infoPtr->hwndNotify = (HWND)wParam;
@@ -2326 +2327 @@
     if (LOWORD(wParam) > 1) {
 
-//      FIXME (toolbar, "multiple rows not supported!\n");
+//      FIXME (toolbar, "multiple rows not supported!\n");
 
     }
@@ -2335 +2336 @@
     /* return bounding rectangle */
     if (lprc) {
-        lprc->left   = infoPtr->rcBound.left;
-        lprc->right  = infoPtr->rcBound.right;
-        lprc->top    = infoPtr->rcBound.top;
-        lprc->bottom = infoPtr->rcBound.bottom;
+        lprc->left   = infoPtr->rcBound.left;
+        lprc->right  = infoPtr->rcBound.right;
+        lprc->top    = infoPtr->rcBound.top;
+        lprc->bottom = infoPtr->rcBound.bottom;
     }
 
@@ -2358 +2359 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -2381 +2382 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-        return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -2392 +2393 @@
     if (infoPtr->hwndToolTip) {
 
-//      FIXME (toolbar, "change tool tip!\n");
+//      FIXME (toolbar, "change tool tip!\n");
 
     }
@@ -2406 +2407 @@
 
     if (infoPtr == NULL)
-        return 0;
+        return 0;
     infoPtr->hwndToolTip = (HWND)wParam;
     return 0;
@@ -2418 +2419 @@
     BOOL bTemp;
 
-//    TRACE (toolbar, "%s hwnd=0x%04x stub!\n", 
-//         ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
+//    TRACE (toolbar, "%s hwnd=0x%04x stub!\n",
+//         ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
 
     bTemp = infoPtr->bUnicode;
@@ -2460 +2461 @@
 
     if (dwStyle & TBSTYLE_TOOLTIPS) {
-        /* Create tooltip control */
-        infoPtr->hwndToolTip =
-            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                               CW_USEDEFAULT, CW_USEDEFAULT,
-                               CW_USEDEFAULT, CW_USEDEFAULT,
-                               hwnd, 0, 0, 0);
-
-        /* Send NM_TOOLTIPSCREATED notification */
-        if (infoPtr->hwndToolTip) {
-            NMTOOLTIPSCREATED nmttc;
-
-            nmttc.hdr.hwndFrom = hwnd;
-            nmttc.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmttc.hdr.code = NM_TOOLTIPSCREATED;
-            nmttc.hwndToolTips = infoPtr->hwndToolTip;
-
-            SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
-                          (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
-        }
+        /* Create tooltip control */
+        infoPtr->hwndToolTip =
+            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                               hwnd, 0, 0, 0);
+
+        /* Send NM_TOOLTIPSCREATED notification */
+        if (infoPtr->hwndToolTip) {
+            NMTOOLTIPSCREATED nmttc;
+
+            nmttc.hdr.hwndFrom = hwnd;
+            nmttc.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+            nmttc.hdr.code = NM_TOOLTIPSCREATED;
+            nmttc.hwndToolTips = infoPtr->hwndToolTip;
+
+            SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
+                          (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
+        }
     }
 
@@ -2492 +2493 @@
     /* delete tooltip control */
     if (infoPtr->hwndToolTip)
-        DestroyWindow (infoPtr->hwndToolTip);
+        DestroyWindow (infoPtr->hwndToolTip);
 
     /* delete button data */
     if (infoPtr->buttons)
-        COMCTL32_Free (infoPtr->buttons);
+        COMCTL32_Free (infoPtr->buttons);
 
     /* delete strings */
     if (infoPtr->strings) {
-        INT i;
-        for (i = 0; i < infoPtr->nNumStrings; i++)
-            if (infoPtr->strings[i])
-                COMCTL32_Free (infoPtr->strings[i]);
-
-        COMCTL32_Free (infoPtr->strings);
+        INT i;
+        for (i = 0; i < infoPtr->nNumStrings; i++)
+            if (infoPtr->strings[i])
+                COMCTL32_Free (infoPtr->strings[i]);
+
+        COMCTL32_Free (infoPtr->strings);
     }
 
     /* destroy default image list */
     if (infoPtr->himlDef)
-        ImageList_Destroy (infoPtr->himlDef);
+        ImageList_Destroy (infoPtr->himlDef);
 
     /* destroy disabled image list */
     if (infoPtr->himlDis)
-        ImageList_Destroy (infoPtr->himlDis);
+        ImageList_Destroy (infoPtr->himlDis);
 
     /* destroy hot image list */
     if (infoPtr->himlHot)
-        ImageList_Destroy (infoPtr->himlHot);
+        ImageList_Destroy (infoPtr->himlHot);
 
     /* delete default font */
     if (infoPtr->hFont)
-        DeleteObject (infoPtr->hFont);
+        DeleteObject (infoPtr->hFont);
 
     /* free toolbar info data */
@@ -2537 +2538 @@
 
     if (infoPtr->bTransparent)
-        return SendMessageA (GetParent (hwnd), WM_ERASEBKGND, wParam, lParam);
+        return SendMessageA (GetParent (hwnd), WM_ERASEBKGND, wParam, lParam);
 
     return DefWindowProcA (hwnd, WM_ERASEBKGND, wParam, lParam);
@@ -2557 +2558 @@
 
     if (nHit >= 0) {
-        btnPtr = &infoPtr->buttons[nHit];
-        if (!(btnPtr->fsState & TBSTATE_ENABLED))
-            return 0;
-        SetCapture (hwnd);
-        infoPtr->bCaptured = TRUE;
-        infoPtr->nButtonDown = nHit;
-
-        btnPtr->fsState |= TBSTATE_PRESSED;
-
-        hdc = GetDC (hwnd);
-        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-        ReleaseDC (hwnd, hdc);
+        btnPtr = &infoPtr->buttons[nHit];
+        if (!(btnPtr->fsState & TBSTATE_ENABLED))
+            return 0;
+        SetCapture (hwnd);
+        infoPtr->bCaptured = TRUE;
+        infoPtr->nButtonDown = nHit;
+
+        btnPtr->fsState |= TBSTATE_PRESSED;
+
+        hdc = GetDC (hwnd);
+        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+        ReleaseDC (hwnd, hdc);
     }
     else if (GetWindowLongA (hwnd, GWL_STYLE) & CCS_ADJUSTABLE)
-        TOOLBAR_Customize (hwnd);
+        TOOLBAR_Customize (hwnd);
 
     return 0;
@@ -2587 +2588 @@
 
     if (infoPtr->hwndToolTip)
-        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                            WM_LBUTTONDOWN, wParam, lParam);
+        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                            WM_LBUTTONDOWN, wParam, lParam);
 
     pt.x = (INT)LOWORD(lParam);
@@ -2595 +2596 @@
 
     if (nHit >= 0) {
-        btnPtr = &infoPtr->buttons[nHit];
-        if (!(btnPtr->fsState & TBSTATE_ENABLED))
-            return 0;
-
-        SetCapture (hwnd);
-        infoPtr->bCaptured = TRUE;
-        infoPtr->nButtonDown = nHit;
-        infoPtr->nOldHit = nHit;
-
-        btnPtr->fsState |= TBSTATE_PRESSED;
-
-        hdc = GetDC (hwnd);
-        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-        ReleaseDC (hwnd, hdc);
+        btnPtr = &infoPtr->buttons[nHit];
+        if (!(btnPtr->fsState & TBSTATE_ENABLED))
+            return 0;
+
+        SetCapture (hwnd);
+        infoPtr->bCaptured = TRUE;
+        infoPtr->nButtonDown = nHit;
+        infoPtr->nOldHit = nHit;
+
+        btnPtr->fsState |= TBSTATE_PRESSED;
+
+        hdc = GetDC (hwnd);
+        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+        ReleaseDC (hwnd, hdc);
     }
 
@@ -2627 +2628 @@
 
     if (infoPtr->hwndToolTip)
-        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                            WM_LBUTTONUP, wParam, lParam);
+        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                            WM_LBUTTONUP, wParam, lParam);
 
     pt.x = (INT)LOWORD(lParam);
@@ -2635 +2636 @@
 
     if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0)) {
-        infoPtr->bCaptured = FALSE;
-        ReleaseCapture ();
-        btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
-        btnPtr->fsState &= ~TBSTATE_PRESSED;
-
-        if (nHit == infoPtr->nButtonDown) {
-            if (btnPtr->fsStyle & TBSTYLE_CHECK) {
-                if (btnPtr->fsStyle & TBSTYLE_GROUP) {
-                    nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr,
-                        infoPtr->nButtonDown);
-                    if (nOldIndex == infoPtr->nButtonDown)
-                        bSendMessage = FALSE;
-                    if ((nOldIndex != infoPtr->nButtonDown) && 
-                        (nOldIndex != -1))
-                        infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
-                    btnPtr->fsState |= TBSTATE_CHECKED;
-                }
-                else {
-                    if (btnPtr->fsState & TBSTATE_CHECKED)
-                        btnPtr->fsState &= ~TBSTATE_CHECKED;
-                    else
-                        btnPtr->fsState |= TBSTATE_CHECKED;
-                }
-            }
-        }
-        else
-            bSendMessage = FALSE;
-
-        hdc = GetDC (hwnd);
-        if (nOldIndex != -1)
-            TOOLBAR_DrawButton (hwnd, &infoPtr->buttons[nOldIndex], hdc);
-        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-        ReleaseDC (hwnd, hdc);
-
-        if (bSendMessage)
-            SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
-                          MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
-
-        infoPtr->nButtonDown = -1;
-        infoPtr->nOldHit = -1;
+        infoPtr->bCaptured = FALSE;
+        ReleaseCapture ();
+        btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
+        btnPtr->fsState &= ~TBSTATE_PRESSED;
+
+        if (nHit == infoPtr->nButtonDown) {
+            if (btnPtr->fsStyle & TBSTYLE_CHECK) {
+                if (btnPtr->fsStyle & TBSTYLE_GROUP) {
+                    nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr,
+                        infoPtr->nButtonDown);
+                    if (nOldIndex == infoPtr->nButtonDown)
+                        bSendMessage = FALSE;
+                    if ((nOldIndex != infoPtr->nButtonDown) &&
+                        (nOldIndex != -1))
+                        infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
+                    btnPtr->fsState |= TBSTATE_CHECKED;
+                }
+                else {
+                    if (btnPtr->fsState & TBSTATE_CHECKED)
+                        btnPtr->fsState &= ~TBSTATE_CHECKED;
+                    else
+                        btnPtr->fsState |= TBSTATE_CHECKED;
+                }
+            }
+        }
+        else
+            bSendMessage = FALSE;
+
+        hdc = GetDC (hwnd);
+        if (nOldIndex != -1)
+            TOOLBAR_DrawButton (hwnd, &infoPtr->buttons[nOldIndex], hdc);
+        TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+        ReleaseDC (hwnd, hdc);
+
+        if (bSendMessage)
+            SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
+                          MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
+
+        infoPtr->nButtonDown = -1;
+        infoPtr->nOldHit = -1;
     }
 
@@ -2691 +2692 @@
 
     if (infoPtr->hwndToolTip)
-        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                            WM_MOUSEMOVE, wParam, lParam);
+        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                            WM_MOUSEMOVE, wParam, lParam);
 
     pt.x = (INT)LOWORD(lParam);
@@ -2702 +2703 @@
     {
         /* Remove the effect of an old hot button */
-        if(infoPtr->nOldHit == infoPtr->nHotItem)
-        {
-            oldBtnPtr = &infoPtr->buttons[infoPtr->nOldHit];
-            oldBtnPtr->bHot = FALSE;
-                    
-            InvalidateRect (hwnd, &oldBtnPtr->rect, TRUE);
-        }
-
-        /* It's not a separator or in nowhere. It's a hot button. */
-        if (nHit >= 0)
-        {
-            btnPtr = &infoPtr->buttons[nHit];
-            btnPtr->bHot = TRUE;
-
-            hdc = GetDC (hwnd);
-            TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-            ReleaseDC (hwnd, hdc);
-
-            infoPtr->nHotItem = nHit;
-        }
+        if(infoPtr->nOldHit == infoPtr->nHotItem)
+        {
+            oldBtnPtr = &infoPtr->buttons[infoPtr->nOldHit];
+            oldBtnPtr->bHot = FALSE;
+
+            InvalidateRect (hwnd, &oldBtnPtr->rect, TRUE);
+        }
+
+        /* It's not a separator or in nowhere. It's a hot button. */
+        if (nHit >= 0)
+        {
+            btnPtr = &infoPtr->buttons[nHit];
+            btnPtr->bHot = TRUE;
+
+            hdc = GetDC (hwnd);
+            TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+            ReleaseDC (hwnd, hdc);
+
+            infoPtr->nHotItem = nHit;
+        }
 
     if (infoPtr->bCaptured) {
-            btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
-            if (infoPtr->nOldHit == infoPtr->nButtonDown) {
-                btnPtr->fsState &= ~TBSTATE_PRESSED;
-                hdc = GetDC (hwnd);
-                TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-                ReleaseDC (hwnd, hdc);
-            }
-            else if (nHit == infoPtr->nButtonDown) {
-                btnPtr->fsState |= TBSTATE_PRESSED;
-                hdc = GetDC (hwnd);
-                TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-                ReleaseDC (hwnd, hdc);
-            }
-        }
-        infoPtr->nOldHit = nHit;
+            btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
+            if (infoPtr->nOldHit == infoPtr->nButtonDown) {
+                btnPtr->fsState &= ~TBSTATE_PRESSED;
+                hdc = GetDC (hwnd);
+                TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+                ReleaseDC (hwnd, hdc);
+            }
+            else if (nHit == infoPtr->nButtonDown) {
+                btnPtr->fsState |= TBSTATE_PRESSED;
+                hdc = GetDC (hwnd);
+                TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+                ReleaseDC (hwnd, hdc);
+            }
+        }
+        infoPtr->nOldHit = nHit;
     }
     return 0;
@@ -2748 +2749 @@
 {
 /*    if (wndPtr->dwStyle & CCS_NODIVIDER) */
-        return DefWindowProcA (hwnd, WM_NCACTIVATE, wParam, lParam);
+        return DefWindowProcA (hwnd, WM_NCACTIVATE, wParam, lParam);
 /*    else */
-/*      return TOOLBAR_NCPaint (wndPtr, wParam, lParam); */
+/*      return TOOLBAR_NCPaint (wndPtr, wParam, lParam); */
 }
 
@@ -2758 +2759 @@
 {
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & CCS_NODIVIDER))
-        ((LPRECT)lParam)->top += GetSystemMetrics(SM_CYEDGE);
+        ((LPRECT)lParam)->top += GetSystemMetrics(SM_CYEDGE);
 
     return DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
@@ -2779 +2780 @@
     if (!GetWindowLongA (hwnd, GWL_HINSTANCE)) {
         HINSTANCE hInst = (HINSTANCE)GetWindowLongA (GetParent (hwnd), GWL_HINSTANCE);
-        SetWindowLongA (hwnd, GWL_HINSTANCE, (DWORD)hInst);
+        SetWindowLongA (hwnd, GWL_HINSTANCE, (DWORD)hInst);
     }
 
@@ -2794 +2795 @@
 
     if (dwStyle & WS_MINIMIZE)
-        return 0; /* Nothing to do */
+        return 0; /* Nothing to do */
 
     DefWindowProcA (hwnd, WM_NCPAINT, wParam, lParam);
 
     if (!(hdc = GetDCEx (hwnd, 0, DCX_USESTYLE | DCX_WINDOW)))
-        return 0;
+        return 0;
 
     if (!(dwStyle & CCS_NODIVIDER))
     {
-        GetWindowRect (hwnd, &rcWindow);
-        OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
-        DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP);
+        GetWindowRect (hwnd, &rcWindow);
+        OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
+        DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP);
     }
 
@@ -2823 +2824 @@
 
     if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
-        SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,   wParam, lParam);
+        SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,   wParam, lParam);
 
 #if 0
-        if (lpnmh->code == TTN_GETDISPINFOA) {
-            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
-
-//          FIXME (toolbar, "retrieving ASCII string\n");
-
-        }
-        else if (lpnmh->code == TTN_GETDISPINFOW) {
-            LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
-
-//          FIXME (toolbar, "retrieving UNICODE string\n");
-
-        }
+        if (lpnmh->code == TTN_GETDISPINFOA) {
+            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
+
+//          FIXME (toolbar, "retrieving ASCII string\n");
+
+        }
+        else if (lpnmh->code == TTN_GETDISPINFOW) {
+            LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
+
+//          FIXME (toolbar, "retrieving UNICODE string\n");
+
+        }
 #endif
     }
@@ -2855 +2856 @@
     TOOLBAR_Refresh (hwnd, hdc);
     if (!wParam)
-        EndPaint (hwnd, &ps);
+        EndPaint (hwnd, &ps);
     return 0;
 }
@@ -2874 +2875 @@
     /* Resize deadlock check */
     if (infoPtr->bAutoSize) {
-        infoPtr->bAutoSize = FALSE;
-        return 0;
+        infoPtr->bAutoSize = FALSE;
+        return 0;
     }
 
@@ -2887 +2888 @@
 
     if (flags == SIZE_RESTORED) {
-        /* width and height don't apply */
-        parent = GetParent (hwnd);
-        GetClientRect(parent, &parent_rect);
-
-        if (dwStyle & CCS_NORESIZE) {
-            uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
-
-            /* FIXME */
-/*          infoPtr->nWidth = parent_rect.right - parent_rect.left; */
-            cy = infoPtr->nHeight;
-            cx = infoPtr->nWidth;
-            TOOLBAR_CalcToolbar (hwnd);
-            infoPtr->nWidth = cx;
-            infoPtr->nHeight = cy;
-        }
-        else {
-            infoPtr->nWidth = parent_rect.right - parent_rect.left;
-            TOOLBAR_CalcToolbar (hwnd);
-            cy = infoPtr->nHeight;
-            cx = infoPtr->nWidth;
-        }
-
-        if (dwStyle & CCS_NOPARENTALIGN) {
-            uPosFlags |= SWP_NOMOVE;
-            cy = infoPtr->nHeight;
-            cx = infoPtr->nWidth;
-        }
-
-        if (!(dwStyle & CCS_NODIVIDER))
-            cy += GetSystemMetrics(SM_CYEDGE);
-
-        SetWindowPos (hwnd, 0, parent_rect.left, parent_rect.top,
-                        cx, cy, uPosFlags | SWP_NOZORDER);
+        /* width and height don't apply */
+        parent = GetParent (hwnd);
+        GetClientRect(parent, &parent_rect);
+
+        if (dwStyle & CCS_NORESIZE) {
+            uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
+
+            /* FIXME */
+/*          infoPtr->nWidth = parent_rect.right - parent_rect.left; */
+            cy = infoPtr->nHeight;
+            cx = infoPtr->nWidth;
+            TOOLBAR_CalcToolbar (hwnd);
+            infoPtr->nWidth = cx;
+            infoPtr->nHeight = cy;
+        }
+        else {
+            infoPtr->nWidth = parent_rect.right - parent_rect.left;
+            TOOLBAR_CalcToolbar (hwnd);
+            cy = infoPtr->nHeight;
+            cx = infoPtr->nWidth;
+        }
+
+        if (dwStyle & CCS_NOPARENTALIGN) {
+            uPosFlags |= SWP_NOMOVE;
+            cy = infoPtr->nHeight;
+            cx = infoPtr->nWidth;
+        }
+
+        if (!(dwStyle & CCS_NODIVIDER))
+            cy += GetSystemMetrics(SM_CYEDGE);
+
+        SetWindowPos (hwnd, 0, parent_rect.left, parent_rect.top,
+                        cx, cy, uPosFlags | SWP_NOZORDER);
     }
     return 0;
@@ -2942 +2943 @@
     switch (uMsg)
     {
-        case TB_ADDBITMAP:
-            return TOOLBAR_AddBitmap (hwnd, wParam, lParam);
-
-        case TB_ADDBUTTONSA:
-            return TOOLBAR_AddButtonsA (hwnd, wParam, lParam);
-
-/*      case TB_ADDBUTTONSW: */
-
-        case TB_ADDSTRINGA:
-            return TOOLBAR_AddStringA (hwnd, wParam, lParam);
-
-        case TB_ADDSTRINGW:
-            return TOOLBAR_AddStringW (hwnd, wParam, lParam);
-
-        case TB_AUTOSIZE:
-            return TOOLBAR_AutoSize (hwnd, wParam, lParam);
-
-        case TB_BUTTONCOUNT:
-            return TOOLBAR_ButtonCount (hwnd, wParam, lParam);
-
-        case TB_BUTTONSTRUCTSIZE:
-            return TOOLBAR_ButtonStructSize (hwnd, wParam, lParam);
-
-        case TB_CHANGEBITMAP:
-            return TOOLBAR_ChangeBitmap (hwnd, wParam, lParam);
-
-        case TB_CHECKBUTTON:
-            return TOOLBAR_CheckButton (hwnd, wParam, lParam);
-
-        case TB_COMMANDTOINDEX:
-            return TOOLBAR_CommandToIndex (hwnd, wParam, lParam);
-
-        case TB_CUSTOMIZE:
-            return TOOLBAR_Customize (hwnd);
-
-        case TB_DELETEBUTTON:
-            return TOOLBAR_DeleteButton (hwnd, wParam, lParam);
-
-        case TB_ENABLEBUTTON:
-            return TOOLBAR_EnableButton (hwnd, wParam, lParam);
-
-/*      case TB_GETANCHORHIGHLIGHT:             */ /* 4.71 */
-
-        case TB_GETBITMAP:
-            return TOOLBAR_GetBitmap (hwnd, wParam, lParam);
-
-        case TB_GETBITMAPFLAGS:
-            return TOOLBAR_GetBitmapFlags (hwnd, wParam, lParam);
-
-        case TB_GETBUTTON:
-            return TOOLBAR_GetButton (hwnd, wParam, lParam);
-
-        case TB_GETBUTTONINFOA:
-            return TOOLBAR_GetButtonInfoA (hwnd, wParam, lParam);
-
-/*      case TB_GETBUTTONINFOW:         */ /* 4.71 */
-
-        case TB_GETBUTTONSIZE:
-            return TOOLBAR_GetButtonSize (hwnd);
-
-        case TB_GETBUTTONTEXTA:
-            return TOOLBAR_GetButtonTextA (hwnd, wParam, lParam);
-
-/*      case TB_GETBUTTONTEXTW: */
-/*      case TB_GETCOLORSCHEME:                 */ /* 4.71 */
-
-        case TB_GETDISABLEDIMAGELIST:
-            return TOOLBAR_GetDisabledImageList (hwnd, wParam, lParam);
-
-        case TB_GETEXTENDEDSTYLE:
-            return TOOLBAR_GetExtendedStyle (hwnd);
-
-        case TB_GETHOTIMAGELIST:
-            return TOOLBAR_GetHotImageList (hwnd, wParam, lParam);
-
-/*      case TB_GETHOTITEM:                     */ /* 4.71 */
-
-        case TB_GETIMAGELIST:
-            return TOOLBAR_GetImageList (hwnd, wParam, lParam);
-
-/*      case TB_GETINSERTMARK:                  */ /* 4.71 */
-/*      case TB_GETINSERTMARKCOLOR:             */ /* 4.71 */
-
-        case TB_GETITEMRECT:
-            return TOOLBAR_GetItemRect (hwnd, wParam, lParam);
-
-        case TB_GETMAXSIZE:
-            return TOOLBAR_GetMaxSize (hwnd, wParam, lParam);
-
-/*      case TB_GETOBJECT:                      */ /* 4.71 */
-/*      case TB_GETPADDING:                     */ /* 4.71 */
-
-        case TB_GETRECT:
-            return TOOLBAR_GetRect (hwnd, wParam, lParam);
-
-        case TB_GETROWS:
-            return TOOLBAR_GetRows (hwnd, wParam, lParam);
-
-        case TB_GETSTATE:
-            return TOOLBAR_GetState (hwnd, wParam, lParam);
-
-        case TB_GETSTYLE:
-            return TOOLBAR_GetStyle (hwnd, wParam, lParam);
-
-        case TB_GETTEXTROWS:
-            return TOOLBAR_GetTextRows (hwnd, wParam, lParam);
-
-        case TB_GETTOOLTIPS:
-            return TOOLBAR_GetToolTips (hwnd, wParam, lParam);
-
-        case TB_GETUNICODEFORMAT:
-            return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam);
-
-        case TB_HIDEBUTTON:
-            return TOOLBAR_HideButton (hwnd, wParam, lParam);
-
-        case TB_HITTEST:
-            return TOOLBAR_HitTest (hwnd, wParam, lParam);
-
-        case TB_INDETERMINATE:
-            return TOOLBAR_Indeterminate (hwnd, wParam, lParam);
-
-        case TB_INSERTBUTTONA:
-            return TOOLBAR_InsertButtonA (hwnd, wParam, lParam);
-
-/*      case TB_INSERTBUTTONW: */
-/*      case TB_INSERTMARKHITTEST:              */ /* 4.71 */
-
-        case TB_ISBUTTONCHECKED:
-            return TOOLBAR_IsButtonChecked (hwnd, wParam, lParam);
-
-        case TB_ISBUTTONENABLED:
-            return TOOLBAR_IsButtonEnabled (hwnd, wParam, lParam);
-
-        case TB_ISBUTTONHIDDEN:
-            return TOOLBAR_IsButtonHidden (hwnd, wParam, lParam);
-
-        case TB_ISBUTTONHIGHLIGHTED:
-            return TOOLBAR_IsButtonHighlighted (hwnd, wParam, lParam);
-
-        case TB_ISBUTTONINDETERMINATE:
-            return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam);
-
-        case TB_ISBUTTONPRESSED:
-            return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam);
-
-/*      case TB_LOADIMAGES:                     */ /* 4.70 */
-/*      case TB_MAPACCELERATORA:                */ /* 4.71 */
-/*      case TB_MAPACCELERATORW:                */ /* 4.71 */
-/*      case TB_MARKBUTTON:                     */ /* 4.71 */
-/*      case TB_MOVEBUTTON:                     */ /* 4.71 */
-
-        case TB_PRESSBUTTON:
-            return TOOLBAR_PressButton (hwnd, wParam, lParam);
-
-/*      case TB_REPLACEBITMAP: */
-
-        case TB_SAVERESTOREA:
-            return TOOLBAR_SaveRestoreA (hwnd, wParam, lParam);
-
-/*      case TB_SAVERESTOREW: */
-/*      case TB_SETANCHORHIGHLIGHT:             */ /* 4.71 */
-
-        case TB_SETBITMAPSIZE:
-            return TOOLBAR_SetBitmapSize (hwnd, wParam, lParam);
-
-        case TB_SETBUTTONINFOA:
-            return TOOLBAR_SetButtonInfoA (hwnd, wParam, lParam);
-
-/*      case TB_SETBUTTONINFOW:                 */ /* 4.71 */
-
-        case TB_SETBUTTONSIZE:
-            return TOOLBAR_SetButtonSize (hwnd, wParam, lParam);
-
-        case TB_SETBUTTONWIDTH:
-            return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam);
-
-        case TB_SETCMDID:
-            return TOOLBAR_SetCmdId (hwnd, wParam, lParam);
-
-/*      case TB_SETCOLORSCHEME:                 */ /* 4.71 */
-
-        case TB_SETDISABLEDIMAGELIST:
-            return TOOLBAR_SetDisabledImageList (hwnd, wParam, lParam);
-
-        case TB_SETDRAWTEXTFLAGS:
-            return TOOLBAR_SetDrawTextFlags (hwnd, wParam, lParam);
-
-        case TB_SETEXTENDEDSTYLE:
-            return TOOLBAR_SetExtendedStyle (hwnd, wParam, lParam);
-
-        case TB_SETHOTIMAGELIST:
-            return TOOLBAR_SetHotImageList (hwnd, wParam, lParam);
-
-/*      case TB_SETHOTITEM:                     */ /* 4.71 */
-
-        case TB_SETIMAGELIST:
-            return TOOLBAR_SetImageList (hwnd, wParam, lParam);
-
-        case TB_SETINDENT:
-            return TOOLBAR_SetIndent (hwnd, wParam, lParam);
-
-/*      case TB_SETINSERTMARK:                  */ /* 4.71 */
-
-        case TB_SETINSERTMARKCOLOR:
-            return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam);
-
-        case TB_SETMAXTEXTROWS:
-            return TOOLBAR_SetMaxTextRows (hwnd, wParam, lParam);
-
-/*      case TB_SETPADDING:                     */ /* 4.71 */
-
-        case TB_SETPARENT:
-            return TOOLBAR_SetParent (hwnd, wParam, lParam);
-
-        case TB_SETROWS:
-            return TOOLBAR_SetRows (hwnd, wParam, lParam);
-
-        case TB_SETSTATE:
-            return TOOLBAR_SetState (hwnd, wParam, lParam);
-
-        case TB_SETSTYLE:
-            return TOOLBAR_SetStyle (hwnd, wParam, lParam);
-
-        case TB_SETTOOLTIPS:
-            return TOOLBAR_SetToolTips (hwnd, wParam, lParam);
-
-        case TB_SETUNICODEFORMAT:
-            return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
-
-
-/*      case WM_CHAR: */
-
-        case WM_CREATE:
-            return TOOLBAR_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return TOOLBAR_Destroy (hwnd, wParam, lParam);
-
-        case WM_ERASEBKGND:
-            return TOOLBAR_EraseBackground (hwnd, wParam, lParam);
-
-/*      case WM_GETFONT: */
-/*      case WM_KEYDOWN: */
-/*      case WM_KILLFOCUS: */
-
-        case WM_LBUTTONDBLCLK:
-            return TOOLBAR_LButtonDblClk (hwnd, wParam, lParam);
-
-        case WM_LBUTTONDOWN:
-            return TOOLBAR_LButtonDown (hwnd, wParam, lParam);
-
-        case WM_LBUTTONUP:
-            return TOOLBAR_LButtonUp (hwnd, wParam, lParam);
-
-        case WM_MOUSEMOVE:
-            return TOOLBAR_MouseMove (hwnd, wParam, lParam);
-
-        case WM_NCACTIVATE:
-            return TOOLBAR_NCActivate (hwnd, wParam, lParam);
-
-        case WM_NCCALCSIZE:
-            return TOOLBAR_NCCalcSize (hwnd, wParam, lParam);
-
-        case WM_NCCREATE:
-            return TOOLBAR_NCCreate (hwnd, wParam, lParam);
-
-        case WM_NCPAINT:
-            return TOOLBAR_NCPaint (hwnd, wParam, lParam);
-
-        case WM_NOTIFY:
-            return TOOLBAR_Notify (hwnd, wParam, lParam);
-
-/*      case WM_NOTIFYFORMAT: */
-
-        case WM_PAINT:
-            return TOOLBAR_Paint (hwnd, wParam);
-
-        case WM_SIZE:
-            return TOOLBAR_Size (hwnd, wParam, lParam);
-
-        case WM_STYLECHANGED:
-            return TOOLBAR_StyleChanged (hwnd, wParam, lParam);
-
-/*      case WM_SYSCOLORCHANGE: */
-
-/*      case WM_WININICHANGE: */
-
-        case WM_CHARTOITEM:
-        case WM_COMMAND:
-        case WM_DRAWITEM:
-        case WM_MEASUREITEM:
-        case WM_VKEYTOITEM:
-            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
-
-        default:
-            if (uMsg >= WM_USER)
-//              ERR (toolbar, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case TB_ADDBITMAP:
+            return TOOLBAR_AddBitmap (hwnd, wParam, lParam);
+
+        case TB_ADDBUTTONSA:
+            return TOOLBAR_AddButtonsA (hwnd, wParam, lParam);
+
+/*      case TB_ADDBUTTONSW: */
+
+        case TB_ADDSTRINGA:
+            return TOOLBAR_AddStringA (hwnd, wParam, lParam);
+
+        case TB_ADDSTRINGW:
+            return TOOLBAR_AddStringW (hwnd, wParam, lParam);
+
+        case TB_AUTOSIZE:
+            return TOOLBAR_AutoSize (hwnd, wParam, lParam);
+
+        case TB_BUTTONCOUNT:
+            return TOOLBAR_ButtonCount (hwnd, wParam, lParam);
+
+        case TB_BUTTONSTRUCTSIZE:
+            return TOOLBAR_ButtonStructSize (hwnd, wParam, lParam);
+
+        case TB_CHANGEBITMAP:
+            return TOOLBAR_ChangeBitmap (hwnd, wParam, lParam);
+
+        case TB_CHECKBUTTON:
+            return TOOLBAR_CheckButton (hwnd, wParam, lParam);
+
+        case TB_COMMANDTOINDEX:
+            return TOOLBAR_CommandToIndex (hwnd, wParam, lParam);
+
+        case TB_CUSTOMIZE:
+            return TOOLBAR_Customize (hwnd);
+
+        case TB_DELETEBUTTON:
+            return TOOLBAR_DeleteButton (hwnd, wParam, lParam);
+
+        case TB_ENABLEBUTTON:
+            return TOOLBAR_EnableButton (hwnd, wParam, lParam);
+
+/*      case TB_GETANCHORHIGHLIGHT:             */ /* 4.71 */
+
+        case TB_GETBITMAP:
+            return TOOLBAR_GetBitmap (hwnd, wParam, lParam);
+
+        case TB_GETBITMAPFLAGS:
+            return TOOLBAR_GetBitmapFlags (hwnd, wParam, lParam);
+
+        case TB_GETBUTTON:
+            return TOOLBAR_GetButton (hwnd, wParam, lParam);
+
+        case TB_GETBUTTONINFOA:
+            return TOOLBAR_GetButtonInfoA (hwnd, wParam, lParam);
+
+/*      case TB_GETBUTTONINFOW:         */ /* 4.71 */
+
+        case TB_GETBUTTONSIZE:
+            return TOOLBAR_GetButtonSize (hwnd);
+
+        case TB_GETBUTTONTEXTA:
+            return TOOLBAR_GetButtonTextA (hwnd, wParam, lParam);
+
+/*      case TB_GETBUTTONTEXTW: */
+/*      case TB_GETCOLORSCHEME:                 */ /* 4.71 */
+
+        case TB_GETDISABLEDIMAGELIST:
+            return TOOLBAR_GetDisabledImageList (hwnd, wParam, lParam);
+
+        case TB_GETEXTENDEDSTYLE:
+            return TOOLBAR_GetExtendedStyle (hwnd);
+
+        case TB_GETHOTIMAGELIST:
+            return TOOLBAR_GetHotImageList (hwnd, wParam, lParam);
+
+/*      case TB_GETHOTITEM:                     */ /* 4.71 */
+
+        case TB_GETIMAGELIST:
+            return TOOLBAR_GetImageList (hwnd, wParam, lParam);
+
+/*      case TB_GETINSERTMARK:                  */ /* 4.71 */
+/*      case TB_GETINSERTMARKCOLOR:             */ /* 4.71 */
+
+        case TB_GETITEMRECT:
+            return TOOLBAR_GetItemRect (hwnd, wParam, lParam);
+
+        case TB_GETMAXSIZE:
+            return TOOLBAR_GetMaxSize (hwnd, wParam, lParam);
+
+/*      case TB_GETOBJECT:                      */ /* 4.71 */
+/*      case TB_GETPADDING:                     */ /* 4.71 */
+
+        case TB_GETRECT:
+            return TOOLBAR_GetRect (hwnd, wParam, lParam);
+
+        case TB_GETROWS:
+            return TOOLBAR_GetRows (hwnd, wParam, lParam);
+
+        case TB_GETSTATE:
+            return TOOLBAR_GetState (hwnd, wParam, lParam);
+
+        case TB_GETSTYLE:
+            return TOOLBAR_GetStyle (hwnd, wParam, lParam);
+
+        case TB_GETTEXTROWS:
+            return TOOLBAR_GetTextRows (hwnd, wParam, lParam);
+
+        case TB_GETTOOLTIPS:
+            return TOOLBAR_GetToolTips (hwnd, wParam, lParam);
+
+        case TB_GETUNICODEFORMAT:
+            return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam);
+
+        case TB_HIDEBUTTON:
+            return TOOLBAR_HideButton (hwnd, wParam, lParam);
+
+        case TB_HITTEST:
+            return TOOLBAR_HitTest (hwnd, wParam, lParam);
+
+        case TB_INDETERMINATE:
+            return TOOLBAR_Indeterminate (hwnd, wParam, lParam);
+
+        case TB_INSERTBUTTONA:
+            return TOOLBAR_InsertButtonA (hwnd, wParam, lParam);
+
+/*      case TB_INSERTBUTTONW: */
+/*      case TB_INSERTMARKHITTEST:              */ /* 4.71 */
+
+        case TB_ISBUTTONCHECKED:
+            return TOOLBAR_IsButtonChecked (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONENABLED:
+            return TOOLBAR_IsButtonEnabled (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONHIDDEN:
+            return TOOLBAR_IsButtonHidden (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONHIGHLIGHTED:
+            return TOOLBAR_IsButtonHighlighted (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONINDETERMINATE:
+            return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONPRESSED:
+            return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam);
+
+/*      case TB_LOADIMAGES:                     */ /* 4.70 */
+/*      case TB_MAPACCELERATORA:                */ /* 4.71 */
+/*      case TB_MAPACCELERATORW:                */ /* 4.71 */
+/*      case TB_MARKBUTTON:                     */ /* 4.71 */
+/*      case TB_MOVEBUTTON:                     */ /* 4.71 */
+
+        case TB_PRESSBUTTON:
+            return TOOLBAR_PressButton (hwnd, wParam, lParam);
+
+/*      case TB_REPLACEBITMAP: */
+
+        case TB_SAVERESTOREA:
+            return TOOLBAR_SaveRestoreA (hwnd, wParam, lParam);
+
+/*      case TB_SAVERESTOREW: */
+/*      case TB_SETANCHORHIGHLIGHT:             */ /* 4.71 */
+
+        case TB_SETBITMAPSIZE:
+            return TOOLBAR_SetBitmapSize (hwnd, wParam, lParam);
+
+        case TB_SETBUTTONINFOA:
+            return TOOLBAR_SetButtonInfoA (hwnd, wParam, lParam);
+
+/*      case TB_SETBUTTONINFOW:                 */ /* 4.71 */
+
+        case TB_SETBUTTONSIZE:
+            return TOOLBAR_SetButtonSize (hwnd, wParam, lParam);
+
+        case TB_SETBUTTONWIDTH:
+            return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam);
+
+        case TB_SETCMDID:
+            return TOOLBAR_SetCmdId (hwnd, wParam, lParam);
+
+/*      case TB_SETCOLORSCHEME:                 */ /* 4.71 */
+
+        case TB_SETDISABLEDIMAGELIST:
+            return TOOLBAR_SetDisabledImageList (hwnd, wParam, lParam);
+
+        case TB_SETDRAWTEXTFLAGS:
+            return TOOLBAR_SetDrawTextFlags (hwnd, wParam, lParam);
+
+        case TB_SETEXTENDEDSTYLE:
+            return TOOLBAR_SetExtendedStyle (hwnd, wParam, lParam);
+
+        case TB_SETHOTIMAGELIST:
+            return TOOLBAR_SetHotImageList (hwnd, wParam, lParam);
+
+/*      case TB_SETHOTITEM:                     */ /* 4.71 */
+
+        case TB_SETIMAGELIST:
+            return TOOLBAR_SetImageList (hwnd, wParam, lParam);
+
+        case TB_SETINDENT:
+            return TOOLBAR_SetIndent (hwnd, wParam, lParam);
+
+/*      case TB_SETINSERTMARK:                  */ /* 4.71 */
+
+        case TB_SETINSERTMARKCOLOR:
+            return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam);
+
+        case TB_SETMAXTEXTROWS:
+            return TOOLBAR_SetMaxTextRows (hwnd, wParam, lParam);
+
+/*      case TB_SETPADDING:                     */ /* 4.71 */
+
+        case TB_SETPARENT:
+            return TOOLBAR_SetParent (hwnd, wParam, lParam);
+
+        case TB_SETROWS:
+            return TOOLBAR_SetRows (hwnd, wParam, lParam);
+
+        case TB_SETSTATE:
+            return TOOLBAR_SetState (hwnd, wParam, lParam);
+
+        case TB_SETSTYLE:
+            return TOOLBAR_SetStyle (hwnd, wParam, lParam);
+
+        case TB_SETTOOLTIPS:
+            return TOOLBAR_SetToolTips (hwnd, wParam, lParam);
+
+        case TB_SETUNICODEFORMAT:
+            return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
+
+
+/*      case WM_CHAR: */
+
+        case WM_CREATE:
+            return TOOLBAR_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return TOOLBAR_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return TOOLBAR_EraseBackground (hwnd, wParam, lParam);
+
+/*      case WM_GETFONT: */
+/*      case WM_KEYDOWN: */
+/*      case WM_KILLFOCUS: */
+
+        case WM_LBUTTONDBLCLK:
+            return TOOLBAR_LButtonDblClk (hwnd, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+            return TOOLBAR_LButtonDown (hwnd, wParam, lParam);
+
+        case WM_LBUTTONUP:
+            return TOOLBAR_LButtonUp (hwnd, wParam, lParam);
+
+        case WM_MOUSEMOVE:
+            return TOOLBAR_MouseMove (hwnd, wParam, lParam);
+
+        case WM_NCACTIVATE:
+            return TOOLBAR_NCActivate (hwnd, wParam, lParam);
+
+        case WM_NCCALCSIZE:
+            return TOOLBAR_NCCalcSize (hwnd, wParam, lParam);
+
+        case WM_NCCREATE:
+            return TOOLBAR_NCCreate (hwnd, wParam, lParam);
+
+        case WM_NCPAINT:
+            return TOOLBAR_NCPaint (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+            return TOOLBAR_Notify (hwnd, wParam, lParam);
+
+/*      case WM_NOTIFYFORMAT: */
+
+        case WM_PAINT:
+            return TOOLBAR_Paint (hwnd, wParam);
+
+        case WM_SIZE:
+            return TOOLBAR_Size (hwnd, wParam, lParam);
+
+        case WM_STYLECHANGED:
+            return TOOLBAR_StyleChanged (hwnd, wParam, lParam);
+
+/*      case WM_SYSCOLORCHANGE: */
+
+/*      case WM_WININICHANGE: */
+
+        case WM_CHARTOITEM:
+        case WM_COMMAND:
+        case WM_DRAWITEM:
+        case WM_MEASUREITEM:
+        case WM_VKEYTOITEM:
+            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+
+        default:
+//            if (uMsg >= WM_USER)
+//              ERR (toolbar, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -3262 +3263 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = TOOLBARCLASSNAMEA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -3271 +3272 @@
 {
     if (GlobalFindAtomA (TOOLBARCLASSNAMEA))
-        UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/tooltips.c

@@ -1 @@
-/* $Id: tooltips.c,v 1.4 1999-06-10 16:22:02 achimha Exp $ */
+/* $Id: tooltips.c,v 1.5 1999-06-16 20:25:44 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -5 +5 @@
  * Copyright 1998 Eric Kohl
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * TODO:
@@ -53 +54 @@
 
     if (infoPtr->nMaxTipWidth > -1)
-        uFlags |= DT_WORDBREAK;
+        uFlags |= DT_WORDBREAK;
     if (GetWindowLongA (hwnd, GWL_STYLE) & TTS_NOPREFIX)
-        uFlags |= DT_NOPREFIX;
+        uFlags |= DT_NOPREFIX;
     GetClientRect (hwnd, &rc);
 
@@ -76 +77 @@
     SelectObject (hdc, hOldFont);
     if (oldBkMode != TRANSPARENT)
-        SetBkMode (hdc, oldBkMode);
+        SetBkMode (hdc, oldBkMode);
 }
 
@@ -86 +87 @@
 
     if ((toolPtr->hinst) && (HIWORD((UINT)toolPtr->lpszText) == 0)) {
-        /* load a resource */
-//      TRACE (tooltips, "load res string %x %x\n",
-//             toolPtr->hinst, (int)toolPtr->lpszText);
-        LoadStringW (toolPtr->hinst, (UINT)toolPtr->lpszText,
-                       infoPtr->szTipText, INFOTIPSIZE);
+        /* load a resource */
+//      TRACE (tooltips, "load res string %x %x\n",
+//             toolPtr->hinst, (int)toolPtr->lpszText);
+        LoadStringW (toolPtr->hinst, (UINT)toolPtr->lpszText,
+                       infoPtr->szTipText, INFOTIPSIZE);
     }
     else if (toolPtr->lpszText) {
-        if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) {
-            NMTTDISPINFOA ttnmdi;
-
-            /* fill NMHDR struct */
-            ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOA));
-            ttnmdi.hdr.hwndFrom = hwnd;
-            ttnmdi.hdr.idFrom = toolPtr->uId;
-            ttnmdi.hdr.code = TTN_GETDISPINFOA;
-            ttnmdi.lpszText = (LPSTR)&ttnmdi.szText;
-            ttnmdi.uFlags = toolPtr->uFlags;
-            ttnmdi.lParam = toolPtr->lParam;
-
-//          TRACE (tooltips, "hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
-            SendMessageA (toolPtr->hwnd, WM_NOTIFY,
-                            (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi);
-
-            if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.szText) == 0)) {
-                LoadStringW (ttnmdi.hinst, (UINT)ttnmdi.szText,
-                               infoPtr->szTipText, INFOTIPSIZE);
-                if (ttnmdi.uFlags & TTF_DI_SETITEM) {
-                    toolPtr->hinst = ttnmdi.hinst;
-                    toolPtr->lpszText = (LPWSTR)ttnmdi.szText;
-                }
-            }
-            else if (ttnmdi.szText[0]) {
-                lstrcpynAtoW (infoPtr->szTipText, ttnmdi.szText, 80);
-                if (ttnmdi.uFlags & TTF_DI_SETITEM) {
-                    INT len = lstrlenA (ttnmdi.szText);
-                    toolPtr->hinst = 0;
-                    toolPtr->lpszText = COMCTL32_Alloc ((len+1)* sizeof(WCHAR));
-                    lstrcpyAtoW (toolPtr->lpszText, ttnmdi.szText);
-                }
-            }
-            else if (ttnmdi.lpszText == 0) {
-                /* no text available */
-                infoPtr->szTipText[0] = L'\0';
-            }
-            else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) {
-                lstrcpynAtoW (infoPtr->szTipText, ttnmdi.lpszText, INFOTIPSIZE);
-                if (ttnmdi.uFlags & TTF_DI_SETITEM) {
-                    INT len = lstrlenA (ttnmdi.lpszText);
-                    toolPtr->hinst = 0;
-                    toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                    lstrcpyAtoW (toolPtr->lpszText, ttnmdi.lpszText);
-                }
-            }
-            else {
-//              ERR (tooltips, "recursive text callback!\n");
-                infoPtr->szTipText[0] = '\0';
-            }
-        }
-        else {
-            /* the item is a usual (unicode) text */
-//          lstrcpynW (infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE);
-            strncpy(infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE);
-        }
+        if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) {
+            NMTTDISPINFOA ttnmdi;
+
+            /* fill NMHDR struct */
+            ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOA));
+            ttnmdi.hdr.hwndFrom = hwnd;
+            ttnmdi.hdr.idFrom = toolPtr->uId;
+            ttnmdi.hdr.code = TTN_GETDISPINFOA;
+            ttnmdi.lpszText = (LPSTR)&ttnmdi.szText;
+            ttnmdi.uFlags = toolPtr->uFlags;
+            ttnmdi.lParam = toolPtr->lParam;
+
+//          TRACE (tooltips, "hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
+            SendMessageA (toolPtr->hwnd, WM_NOTIFY,
+                            (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi);
+
+            if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.szText) == 0)) {
+                LoadStringW (ttnmdi.hinst, (UINT)ttnmdi.szText,
+                               infoPtr->szTipText, INFOTIPSIZE);
+                if (ttnmdi.uFlags & TTF_DI_SETITEM) {
+                    toolPtr->hinst = ttnmdi.hinst;
+                    toolPtr->lpszText = (LPWSTR)ttnmdi.szText;
+                }
+            }
+            else if (ttnmdi.szText[0]) {
+                lstrcpynAtoW (infoPtr->szTipText, ttnmdi.szText, 80);
+                if (ttnmdi.uFlags & TTF_DI_SETITEM) {
+                    INT len = lstrlenA (ttnmdi.szText);
+                    toolPtr->hinst = 0;
+                    toolPtr->lpszText = COMCTL32_Alloc ((len+1)* sizeof(WCHAR));
+                    lstrcpyAtoW (toolPtr->lpszText, ttnmdi.szText);
+                }
+            }
+            else if (ttnmdi.lpszText == 0) {
+                /* no text available */
+                infoPtr->szTipText[0] = L'\0';
+            }
+            else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) {
+                lstrcpynAtoW (infoPtr->szTipText, ttnmdi.lpszText, INFOTIPSIZE);
+                if (ttnmdi.uFlags & TTF_DI_SETITEM) {
+                    INT len = lstrlenA (ttnmdi.lpszText);
+                    toolPtr->hinst = 0;
+                    toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                    lstrcpyAtoW (toolPtr->lpszText, ttnmdi.lpszText);
+                }
+            }
+            else {
+//              ERR (tooltips, "recursive text callback!\n");
+                infoPtr->szTipText[0] = '\0';
+            }
+        }
+        else {
+            /* the item is a usual (unicode) text */
+//          lstrcpynW (infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE);
+            strncpy(infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE);
+        }
     }
     else {
-        /* no text available */
-        infoPtr->szTipText[0] = L'\0';
+        /* no text available */
+        infoPtr->szTipText[0] = L'\0';
     }
 
@@ -168 +169 @@
 
     if (infoPtr->nMaxTipWidth > -1) {
-        rc.right = infoPtr->nMaxTipWidth;
-        uFlags |= DT_WORDBREAK;
+        rc.right = infoPtr->nMaxTipWidth;
+        uFlags |= DT_WORDBREAK;
     }
     if (GetWindowLongA (hwnd, GWL_STYLE) & TTS_NOPREFIX)
-        uFlags |= DT_NOPREFIX;
+        uFlags |= DT_NOPREFIX;
 //    TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 
@@ -181 +182 @@
     ReleaseDC (hwnd, hdc);
 
-    lpSize->cx = rc.right - rc.left + 4 + 
-                 infoPtr->rcMargin.left + infoPtr->rcMargin.right;
+    lpSize->cx = rc.right - rc.left + 4 +
+                 infoPtr->rcMargin.left + infoPtr->rcMargin.right;
     lpSize->cy = rc.bottom - rc.top + 4 +
-                 infoPtr->rcMargin.bottom + infoPtr->rcMargin.top;
+                 infoPtr->rcMargin.bottom + infoPtr->rcMargin.top;
 }
 
@@ -198 +199 @@
 
     if (infoPtr->nTool == -1) {
-//      TRACE (tooltips, "invalid tool (-1)!\n");
-        return;
+//      TRACE (tooltips, "invalid tool (-1)!\n");
+        return;
     }
 
@@ -209 +210 @@
 
     if (infoPtr->szTipText[0] == L'\0') {
-        infoPtr->nCurrentTool = -1;
-        return;
+        infoPtr->nCurrentTool = -1;
+        return;
     }
 
@@ -220 +221 @@
     hdr.code = TTN_SHOW;
     SendMessageA (toolPtr->hwnd, WM_NOTIFY,
-                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
+                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
 //    TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
@@ -228 +229 @@
 
     if (toolPtr->uFlags & TTF_CENTERTIP) {
-        RECT rc;
-
-        if (toolPtr->uFlags & TTF_IDISHWND)
-            GetWindowRect ((HWND)toolPtr->uId, &rc);
-        else {
-            rc = toolPtr->rect;
-            MapWindowPoints (toolPtr->hwnd, (HWND)0, (LPPOINT)&rc, 2);
-        }
-        rect.left = (rc.left + rc.right - size.cx) / 2;
-        rect.top  = rc.bottom + 2;
+        RECT rc;
+
+        if (toolPtr->uFlags & TTF_IDISHWND)
+            GetWindowRect ((HWND)toolPtr->uId, &rc);
+        else {
+            rc = toolPtr->rect;
+            MapWindowPoints (toolPtr->hwnd, (HWND)0, (LPPOINT)&rc, 2);
+        }
+        rect.left = (rc.left + rc.right - size.cx) / 2;
+        rect.top  = rc.bottom + 2;
     }
     else {
-        GetCursorPos ((LPPOINT)&rect);
-        rect.top += 20;
+        GetCursorPos ((LPPOINT)&rect);
+        rect.top += 20;
     }
 
@@ -252 +253 @@
 
     AdjustWindowRectEx (&rect, GetWindowLongA (hwnd, GWL_STYLE),
-                        FALSE, GetWindowLongA (hwnd, GWL_EXSTYLE));
+                        FALSE, GetWindowLongA (hwnd, GWL_EXSTYLE));
 
     SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top,
-                    rect.right - rect.left, rect.bottom - rect.top,
-                    SWP_SHOWWINDOW | SWP_NOACTIVATE);
+                    rect.right - rect.left, rect.bottom - rect.top,
+                    SWP_SHOWWINDOW | SWP_NOACTIVATE);
 
     /* repaint the tooltip */
@@ -274 +275 @@
 
     if (infoPtr->nCurrentTool == -1)
-        return;
+        return;
 
     toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
@@ -284 +285 @@
     hdr.code = TTN_POP;
     SendMessageA (toolPtr->hwnd, WM_NOTIFY,
-                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
+                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
     infoPtr->nCurrentTool = -1;
 
     SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0,
-                    SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
+                    SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
 }
 
@@ -303 +304 @@
 
     if (infoPtr->nTrackTool == -1) {
-//      TRACE (tooltips, "invalid tracking tool (-1)!\n");
-        return;
+//      TRACE (tooltips, "invalid tracking tool (-1)!\n");
+        return;
     }
 
@@ -312 +313 @@
 
     if (infoPtr->szTipText[0] == L'\0') {
-        infoPtr->nTrackTool = -1;
-        return;
+        infoPtr->nTrackTool = -1;
+        return;
     }
 
@@ -323 +324 @@
     hdr.code = TTN_SHOW;
     SendMessageA (toolPtr->hwnd, WM_NOTIFY,
-                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
+                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
 //    TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
@@ -331 +332 @@
 
     if (toolPtr->uFlags & TTF_ABSOLUTE) {
-        rect.left = infoPtr->xTrackPos;
-        rect.top  = infoPtr->yTrackPos;
-
-        if (toolPtr->uFlags & TTF_CENTERTIP) {
-            rect.left -= (size.cx / 2);
-            rect.top  -= (size.cy / 2);
-        }
+        rect.left = infoPtr->xTrackPos;
+        rect.top  = infoPtr->yTrackPos;
+
+        if (toolPtr->uFlags & TTF_CENTERTIP) {
+            rect.left -= (size.cx / 2);
+            rect.top  -= (size.cy / 2);
+        }
     }
     else {
-        RECT rcTool;
-
-        if (toolPtr->uFlags & TTF_IDISHWND)
-            GetWindowRect ((HWND)toolPtr->uId, &rcTool);
-        else {
-            rcTool = toolPtr->rect;
-            MapWindowPoints (toolPtr->hwnd, (HWND)0, (LPPOINT)&rcTool, 2);
-        }
-
-        GetCursorPos ((LPPOINT)&rect);
-        rect.top += 20;
-
-        if (toolPtr->uFlags & TTF_CENTERTIP) {
-            rect.left -= (size.cx / 2);
-            rect.top  -= (size.cy / 2);
-        }
-
-        /* smart placement */
-        if ((rect.left + size.cx > rcTool.left) && (rect.left < rcTool.right) &&
-            (rect.top + size.cy > rcTool.top) && (rect.top < rcTool.bottom))
-            rect.left = rcTool.right;
+        RECT rcTool;
+
+        if (toolPtr->uFlags & TTF_IDISHWND)
+            GetWindowRect ((HWND)toolPtr->uId, &rcTool);
+        else {
+            rcTool = toolPtr->rect;
+            MapWindowPoints (toolPtr->hwnd, (HWND)0, (LPPOINT)&rcTool, 2);
+        }
+
+        GetCursorPos ((LPPOINT)&rect);
+        rect.top += 20;
+
+        if (toolPtr->uFlags & TTF_CENTERTIP) {
+            rect.left -= (size.cx / 2);
+            rect.top  -= (size.cy / 2);
+        }
+
+        /* smart placement */
+        if ((rect.left + size.cx > rcTool.left) && (rect.left < rcTool.right) &&
+            (rect.top + size.cy > rcTool.top) && (rect.top < rcTool.bottom))
+            rect.left = rcTool.right;
     }
 
@@ -369 +370 @@
 
     AdjustWindowRectEx (&rect, GetWindowLongA (hwnd, GWL_STYLE),
-                        FALSE, GetWindowLongA (hwnd, GWL_EXSTYLE));
+                        FALSE, GetWindowLongA (hwnd, GWL_EXSTYLE));
 
     SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top,
-                    rect.right - rect.left, rect.bottom - rect.top,
-                    SWP_SHOWWINDOW | SWP_NOACTIVATE );
+                    rect.right - rect.left, rect.bottom - rect.top,
+                    SWP_SHOWWINDOW | SWP_NOACTIVATE );
 
     hdc = GetDC (hwnd);
@@ -388 +389 @@
 
     if (infoPtr->nTrackTool == -1)
-        return;
+        return;
 
     toolPtr = &infoPtr->tools[infoPtr->nTrackTool];
@@ -397 +398 @@
     hdr.code = TTN_POP;
     SendMessageA (toolPtr->hwnd, WM_NOTIFY,
-                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
+                    (WPARAM)toolPtr->uId, (LPARAM)&hdr);
 
     SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0,
-                    SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
+                    SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
 }
 
@@ -411 +412 @@
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        if (!(toolPtr->uFlags & TTF_IDISHWND) && 
-            (lpToolInfo->hwnd == toolPtr->hwnd) &&
-            (lpToolInfo->uId == toolPtr->uId))
-            return nTool;
+        toolPtr = &infoPtr->tools[nTool];
+
+        if (!(toolPtr->uFlags & TTF_IDISHWND) &&
+            (lpToolInfo->hwnd == toolPtr->hwnd) &&
+            (lpToolInfo->uId == toolPtr->uId))
+            return nTool;
     }
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        if ((toolPtr->uFlags & TTF_IDISHWND) &&
-            (lpToolInfo->uId == toolPtr->uId))
-            return nTool;
+        toolPtr = &infoPtr->tools[nTool];
+
+        if ((toolPtr->uFlags & TTF_IDISHWND) &&
+            (lpToolInfo->uId == toolPtr->uId))
+            return nTool;
     }
 
@@ -438 +439 @@
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        if (!(toolPtr->uFlags & TTF_IDISHWND) && 
-            (lpToolInfo->hwnd == toolPtr->hwnd) &&
-            (lpToolInfo->uId == toolPtr->uId))
-            return nTool;
+        toolPtr = &infoPtr->tools[nTool];
+
+        if (!(toolPtr->uFlags & TTF_IDISHWND) &&
+            (lpToolInfo->hwnd == toolPtr->hwnd) &&
+            (lpToolInfo->uId == toolPtr->uId))
+            return nTool;
     }
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        if ((toolPtr->uFlags & TTF_IDISHWND) &&
-            (lpToolInfo->uId == toolPtr->uId))
-            return nTool;
+        toolPtr = &infoPtr->tools[nTool];
+
+        if ((toolPtr->uFlags & TTF_IDISHWND) &&
+            (lpToolInfo->uId == toolPtr->uId))
+            return nTool;
     }
 
@@ -465 +466 @@
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        if (!(toolPtr->uFlags & TTF_IDISHWND)) {
-            if (hwnd != toolPtr->hwnd)
-                continue;
-            if (!PtInRect (&toolPtr->rect, *lpPt))
-                continue;
-            return nTool;
-        }
+        toolPtr = &infoPtr->tools[nTool];
+
+        if (!(toolPtr->uFlags & TTF_IDISHWND)) {
+            if (hwnd != toolPtr->hwnd)
+                continue;
+            if (!PtInRect (&toolPtr->rect, *lpPt))
+                continue;
+            return nTool;
+        }
     }
 
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        if (toolPtr->uFlags & TTF_IDISHWND) {
-            if ((HWND)toolPtr->uId == hwnd)
-                return nTool;
-        }
+        toolPtr = &infoPtr->tools[nTool];
+
+        if (toolPtr->uFlags & TTF_IDISHWND) {
+            if ((HWND)toolPtr->uId == hwnd)
+                return nTool;
+        }
     }
 
@@ -509 +510 @@
     HWND hwndActive = GetActiveWindow ();
     if (!hwndActive)
-        return FALSE;
+        return FALSE;
     if (hwndActive == hwnd)
-        return TRUE;
+        return TRUE;
     return IsChild (hwndActive, hwnd);
 }
@@ -527 +528 @@
     hwndTool = SendMessageA (hwnd, TTM_WINDOWFROMPOINT, 0, (LPARAM)&pt);
     if (hwndTool == 0)
-        return -1;
+        return -1;
 
     ScreenToClient (hwndTool, &pt);
     nTool = TOOLTIPS_GetToolFromPoint (infoPtr, hwndTool, &pt);
     if (nTool == -1)
-        return -1;
+        return -1;
 
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) {
-        if (!TOOLTIPS_IsWindowActive (GetWindow (hwnd, GW_OWNER)))
-            return -1;
+        if (!TOOLTIPS_IsWindowActive (GetWindow (hwnd, GW_OWNER)))
+            return -1;
     }
 
@@ -553 +554 @@
 
 //    if (infoPtr->bActive)
-//      TRACE (tooltips, "activate!\n");
-
-    if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1)) 
-        TOOLTIPS_Hide (hwnd, infoPtr);
+//      TRACE (tooltips, "activate!\n");
+
+    if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1))
+        TOOLTIPS_Hide (hwnd, infoPtr);
 
     return 0;
@@ -570 +571 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "add tool (%x) %x %d%s!\n",
-//         hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
-//         (lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
+//         hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
+//         (lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
 
     if (infoPtr->uNumTools == 0) {
-        infoPtr->tools = COMCTL32_Alloc (sizeof(TTTOOL_INFO));
-        toolPtr = infoPtr->tools;
+        infoPtr->tools = COMCTL32_Alloc (sizeof(TTTOOL_INFO));
+        toolPtr = infoPtr->tools;
     }
     else {
-        TTTOOL_INFO *oldTools = infoPtr->tools;
-        infoPtr->tools =
-            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools + 1));
-        memcpy (infoPtr->tools, oldTools,
-                infoPtr->uNumTools * sizeof(TTTOOL_INFO));
-        COMCTL32_Free (oldTools);
-        toolPtr = &infoPtr->tools[infoPtr->uNumTools];
+        TTTOOL_INFO *oldTools = infoPtr->tools;
+        infoPtr->tools =
+            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools + 1));
+        memcpy (infoPtr->tools, oldTools,
+                infoPtr->uNumTools * sizeof(TTTOOL_INFO));
+        COMCTL32_Free (oldTools);
+        toolPtr = &infoPtr->tools[infoPtr->uNumTools];
     }
 
@@ -602 +603 @@
 
     if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
-//      TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
-        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
+//      TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
+        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA) {
-//          TRACE (tooltips, "add CALLBACK!\n");
-            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
-        }
-        else {
-            INT len = lstrlenA (lpToolInfo->lpszText);
-//          TRACE (tooltips, "add text \"%s\"!\n", lpToolInfo->lpszText);
-            toolPtr->lpszText = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
-        }
+        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA) {
+//          TRACE (tooltips, "add CALLBACK!\n");
+            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
+        }
+        else {
+            INT len = lstrlenA (lpToolInfo->lpszText);
+//          TRACE (tooltips, "add text \"%s\"!\n", lpToolInfo->lpszText);
+            toolPtr->lpszText = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
+        }
     }
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
-        toolPtr->lParam = lpToolInfo->lParam;
+        toolPtr->lParam = lpToolInfo->lParam;
 
     /* install subclassing hook */
     if (toolPtr->uFlags & TTF_SUBCLASS) {
-        if (toolPtr->uFlags & TTF_IDISHWND) {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-            if (lpttsi == NULL) {
-                lpttsi =
-                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
-                lpttsi->wpOrigProc = 
-                    (WNDPROC)SetWindowLongA ((HWND)toolPtr->uId,
-                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
-                lpttsi->hwndToolTip = hwnd;
-                lpttsi->uRefCount++;
-                SetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass,
-                            (HANDLE)lpttsi);
-            }
-//          else
-//              WARN (tooltips, "A window tool must only be listed once!\n");
-        }
-        else {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
-            if (lpttsi == NULL) {
-                lpttsi =
-                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
-                lpttsi->wpOrigProc = 
-                    (WNDPROC)SetWindowLongA (toolPtr->hwnd,
-                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
-                lpttsi->hwndToolTip = hwnd;
-                lpttsi->uRefCount++;
-                SetPropA (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE)lpttsi);
-            }
-            else
-                lpttsi->uRefCount++;
-        }
-//      TRACE (tooltips, "subclassing installed!\n");
+        if (toolPtr->uFlags & TTF_IDISHWND) {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+            if (lpttsi == NULL) {
+                lpttsi =
+                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
+                lpttsi->wpOrigProc =
+                    (WNDPROC)SetWindowLongA ((HWND)toolPtr->uId,
+                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
+                lpttsi->hwndToolTip = hwnd;
+                lpttsi->uRefCount++;
+                SetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass,
+                            (HANDLE)lpttsi);
+            }
+//          else
+//              WARN (tooltips, "A window tool must only be listed once!\n");
+        }
+        else {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
+            if (lpttsi == NULL) {
+                lpttsi =
+                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
+                lpttsi->wpOrigProc =
+                    (WNDPROC)SetWindowLongA (toolPtr->hwnd,
+                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
+                lpttsi->hwndToolTip = hwnd;
+                lpttsi->uRefCount++;
+                SetPropA (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE)lpttsi);
+            }
+            else
+                lpttsi->uRefCount++;
+        }
+//      TRACE (tooltips, "subclassing installed!\n");
     }
 
@@ -671 +672 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "add tool (%x) %x %d%s!\n",
-//         hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
-//         (lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
+//         hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
+//         (lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
 
     if (infoPtr->uNumTools == 0) {
-        infoPtr->tools = COMCTL32_Alloc (sizeof(TTTOOL_INFO));
-        toolPtr = infoPtr->tools;
+        infoPtr->tools = COMCTL32_Alloc (sizeof(TTTOOL_INFO));
+        toolPtr = infoPtr->tools;
     }
     else {
-        TTTOOL_INFO *oldTools = infoPtr->tools;
-        infoPtr->tools =
-            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools + 1));
-        memcpy (infoPtr->tools, oldTools,
-                infoPtr->uNumTools * sizeof(TTTOOL_INFO));
-        COMCTL32_Free (oldTools);
-        toolPtr = &infoPtr->tools[infoPtr->uNumTools];
+        TTTOOL_INFO *oldTools = infoPtr->tools;
+        infoPtr->tools =
+            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools + 1));
+        memcpy (infoPtr->tools, oldTools,
+                infoPtr->uNumTools * sizeof(TTTOOL_INFO));
+        COMCTL32_Free (oldTools);
+        toolPtr = &infoPtr->tools[infoPtr->uNumTools];
     }
 
@@ -703 +704 @@
 
     if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
-//      TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
-        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
+//      TRACE (tooltips, "add string id %x!\n", (int)lpToolInfo->lpszText);
+        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) {
-//          TRACE (tooltips, "add CALLBACK!\n");
-            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
-        }
-        else {
-            INT len = lstrlenW (lpToolInfo->lpszText);
-//          TRACE (tooltips, "add text \"%s\"!\n",
-//                 debugstr_w(lpToolInfo->lpszText));
-            toolPtr->lpszText = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
-        }
+        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) {
+//          TRACE (tooltips, "add CALLBACK!\n");
+            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
+        }
+        else {
+            INT len = lstrlenW (lpToolInfo->lpszText);
+//          TRACE (tooltips, "add text \"%s\"!\n",
+//                 debugstr_w(lpToolInfo->lpszText));
+            toolPtr->lpszText = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
+        }
     }
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
-        toolPtr->lParam = lpToolInfo->lParam;
+        toolPtr->lParam = lpToolInfo->lParam;
 
     /* install subclassing hook */
     if (toolPtr->uFlags & TTF_SUBCLASS) {
-        if (toolPtr->uFlags & TTF_IDISHWND) {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-            if (lpttsi == NULL) {
-                lpttsi =
-                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
-                lpttsi->wpOrigProc = 
-                    (WNDPROC)SetWindowLongA ((HWND)toolPtr->uId,
-                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
-                lpttsi->hwndToolTip = hwnd;
-                lpttsi->uRefCount++;
-                SetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass,
-                            (HANDLE)lpttsi);
-            }
-//          else
-//              WARN (tooltips, "A window tool must only be listed once!\n");
-        }
-        else {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
-            if (lpttsi == NULL) {
-                lpttsi =
-                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
-                lpttsi->wpOrigProc = 
-                    (WNDPROC)SetWindowLongA (toolPtr->hwnd,
-                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
-                lpttsi->hwndToolTip = hwnd;
-                lpttsi->uRefCount++;
-                SetPropA (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE)lpttsi);
-            }
-            else
-                lpttsi->uRefCount++;
-        }
-//      TRACE (tooltips, "subclassing installed!\n");
+        if (toolPtr->uFlags & TTF_IDISHWND) {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+            if (lpttsi == NULL) {
+                lpttsi =
+                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
+                lpttsi->wpOrigProc =
+                    (WNDPROC)SetWindowLongA ((HWND)toolPtr->uId,
+                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
+                lpttsi->hwndToolTip = hwnd;
+                lpttsi->uRefCount++;
+                SetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass,
+                            (HANDLE)lpttsi);
+            }
+//          else
+//              WARN (tooltips, "A window tool must only be listed once!\n");
+        }
+        else {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
+            if (lpttsi == NULL) {
+                lpttsi =
+                    (LPTT_SUBCLASS_INFO)COMCTL32_Alloc (sizeof(TT_SUBCLASS_INFO));
+                lpttsi->wpOrigProc =
+                    (WNDPROC)SetWindowLongA (toolPtr->hwnd,
+                    GWL_WNDPROC,(LONG)TOOLTIPS_SubclassProc);
+                lpttsi->hwndToolTip = hwnd;
+                lpttsi->uRefCount++;
+                SetPropA (toolPtr->hwnd, COMCTL32_aSubclass, (HANDLE)lpttsi);
+            }
+            else
+                lpttsi->uRefCount++;
+        }
+//      TRACE (tooltips, "subclassing installed!\n");
     }
 
@@ -774 +775 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return 0;
+        return 0;
     if (infoPtr->uNumTools == 0)
-        return 0;
+        return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -786 +787 @@
 
     /* delete text string */
-    toolPtr = &infoPtr->tools[nTool]; 
+    toolPtr = &infoPtr->tools[nTool];
     if ((toolPtr->hinst) && (toolPtr->lpszText)) {
-        if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
-            COMCTL32_Free (toolPtr->lpszText);
+        if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+            COMCTL32_Free (toolPtr->lpszText);
     }
 
     /* remove subclassing */
     if (toolPtr->uFlags & TTF_SUBCLASS) {
-        if (toolPtr->uFlags & TTF_IDISHWND) {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-            if (lpttsi) {
-                SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
-                                  (LONG)lpttsi->wpOrigProc);
-                RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                COMCTL32_Free (&lpttsi);
-            }
-//          else
-//              ERR (tooltips, "Invalid data handle!\n");
-        }
-        else {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
-            if (lpttsi) {
-                if (lpttsi->uRefCount == 1) {
-                    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
-                                      (LONG)lpttsi->wpOrigProc);
-                    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                    COMCTL32_Free (&lpttsi);
-                }
-                else
-                    lpttsi->uRefCount--;
-            }
-//          else
-//              ERR (tooltips, "Invalid data handle!\n");
-        }
+        if (toolPtr->uFlags & TTF_IDISHWND) {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+            if (lpttsi) {
+                SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
+                                  (LONG)lpttsi->wpOrigProc);
+                RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+                COMCTL32_Free (&lpttsi);
+            }
+//          else
+//              ERR (tooltips, "Invalid data handle!\n");
+        }
+        else {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
+            if (lpttsi) {
+                if (lpttsi->uRefCount == 1) {
+                    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
+                                      (LONG)lpttsi->wpOrigProc);
+                    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+                    COMCTL32_Free (&lpttsi);
+                }
+                else
+                    lpttsi->uRefCount--;
+            }
+//          else
+//              ERR (tooltips, "Invalid data handle!\n");
+        }
     }
 
     /* delete tool from tool list */
     if (infoPtr->uNumTools == 1) {
-        COMCTL32_Free (infoPtr->tools);
-        infoPtr->tools = NULL;
+        COMCTL32_Free (infoPtr->tools);
+        infoPtr->tools = NULL;
     }
     else {
-        TTTOOL_INFO *oldTools = infoPtr->tools;
-        infoPtr->tools =
-            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools - 1));
-
-        if (nTool > 0)
-            memcpy (&infoPtr->tools[0], &oldTools[0],
-                    nTool * sizeof(TTTOOL_INFO));
-
-        if (nTool < infoPtr->uNumTools - 1)
-            memcpy (&infoPtr->tools[nTool], &oldTools[nTool + 1],
-                    (infoPtr->uNumTools - nTool - 1) * sizeof(TTTOOL_INFO));
-
-        COMCTL32_Free (oldTools);
+        TTTOOL_INFO *oldTools = infoPtr->tools;
+        infoPtr->tools =
+            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools - 1));
+
+        if (nTool > 0)
+            memcpy (&infoPtr->tools[0], &oldTools[0],
+                    nTool * sizeof(TTTOOL_INFO));
+
+        if (nTool < infoPtr->uNumTools - 1)
+            memcpy (&infoPtr->tools[nTool], &oldTools[nTool + 1],
+                    (infoPtr->uNumTools - nTool - 1) * sizeof(TTTOOL_INFO));
+
+        COMCTL32_Free (oldTools);
     }
 
@@ -860 +861 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return 0;
+        return 0;
     if (infoPtr->uNumTools == 0)
-        return 0;
+        return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -872 +873 @@
 
     /* delete text string */
-    toolPtr = &infoPtr->tools[nTool]; 
+    toolPtr = &infoPtr->tools[nTool];
     if ((toolPtr->hinst) && (toolPtr->lpszText)) {
-        if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
-            COMCTL32_Free (toolPtr->lpszText);
+        if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+            COMCTL32_Free (toolPtr->lpszText);
     }
 
     /* remove subclassing */
     if (toolPtr->uFlags & TTF_SUBCLASS) {
-        if (toolPtr->uFlags & TTF_IDISHWND) {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-            if (lpttsi) {
-                SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
-                                  (LONG)lpttsi->wpOrigProc);
-                RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                COMCTL32_Free (&lpttsi);
-            }
-//          else
-//              ERR (tooltips, "Invalid data handle!\n");
-        }
-        else {
-            LPTT_SUBCLASS_INFO lpttsi =
-                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
-            if (lpttsi) {
-                if (lpttsi->uRefCount == 1) {
-                    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
-                                      (LONG)lpttsi->wpOrigProc);
-                    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                    COMCTL32_Free (&lpttsi);
-                }
-                else
-                    lpttsi->uRefCount--;
-            }
-//          else
-//              ERR (tooltips, "Invalid data handle!\n");
-        }
+        if (toolPtr->uFlags & TTF_IDISHWND) {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+            if (lpttsi) {
+                SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
+                                  (LONG)lpttsi->wpOrigProc);
+                RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+                COMCTL32_Free (&lpttsi);
+            }
+//          else
+//              ERR (tooltips, "Invalid data handle!\n");
+        }
+        else {
+            LPTT_SUBCLASS_INFO lpttsi =
+                (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
+            if (lpttsi) {
+                if (lpttsi->uRefCount == 1) {
+                    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
+                                      (LONG)lpttsi->wpOrigProc);
+                    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+                    COMCTL32_Free (&lpttsi);
+                }
+                else
+                    lpttsi->uRefCount--;
+            }
+//          else
+//              ERR (tooltips, "Invalid data handle!\n");
+        }
     }
 
     /* delete tool from tool list */
     if (infoPtr->uNumTools == 1) {
-        COMCTL32_Free (infoPtr->tools);
-        infoPtr->tools = NULL;
+        COMCTL32_Free (infoPtr->tools);
+        infoPtr->tools = NULL;
     }
     else {
-        TTTOOL_INFO *oldTools = infoPtr->tools;
-        infoPtr->tools =
-            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools - 1));
-
-        if (nTool > 0)
-            memcpy (&infoPtr->tools[0], &oldTools[0],
-                    nTool * sizeof(TTTOOL_INFO));
-
-        if (nTool < infoPtr->uNumTools - 1)
-            memcpy (&infoPtr->tools[nTool], &oldTools[nTool + 1],
-                    (infoPtr->uNumTools - nTool - 1) * sizeof(TTTOOL_INFO));
-
-        COMCTL32_Free (oldTools);
+        TTTOOL_INFO *oldTools = infoPtr->tools;
+        infoPtr->tools =
+            COMCTL32_Alloc (sizeof(TTTOOL_INFO) * (infoPtr->uNumTools - 1));
+
+        if (nTool > 0)
+            memcpy (&infoPtr->tools[0], &oldTools[0],
+                    nTool * sizeof(TTTOOL_INFO));
+
+        if (nTool < infoPtr->uNumTools - 1)
+            memcpy (&infoPtr->tools[nTool], &oldTools[nTool + 1],
+                    (infoPtr->uNumTools - nTool - 1) * sizeof(TTTOOL_INFO));
+
+        COMCTL32_Free (oldTools);
     }
 
@@ -946 +947 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
     if (uIndex >= infoPtr->uNumTools)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "index=%u\n", uIndex);
@@ -966 +967 @@
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
-        lpToolInfo->lParam = toolPtr->lParam;
+        lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -981 +982 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+        return FALSE;
     if (uIndex >= infoPtr->uNumTools)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "index=%u\n", uIndex);
@@ -1001 +1002 @@
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
-        lpToolInfo->lParam = toolPtr->lParam;
+        lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -1015 +1016 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
 
     if (lpToolInfo) {
-        if (infoPtr->nCurrentTool > -1) {
-            toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
-
-            /* copy tool data */
-            lpToolInfo->uFlags   = toolPtr->uFlags;
-            lpToolInfo->rect     = toolPtr->rect;
-            lpToolInfo->hinst    = toolPtr->hinst;
-/*          lpToolInfo->lpszText = toolPtr->lpszText; */
-            lpToolInfo->lpszText = NULL;  /* FIXME */
-
-            if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
-                lpToolInfo->lParam = toolPtr->lParam;
-
-            return TRUE;
-        }
-        else
-            return FALSE;
+        if (infoPtr->nCurrentTool > -1) {
+            toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
+
+            /* copy tool data */
+            lpToolInfo->uFlags   = toolPtr->uFlags;
+            lpToolInfo->rect     = toolPtr->rect;
+            lpToolInfo->hinst    = toolPtr->hinst;
+/*          lpToolInfo->lpszText = toolPtr->lpszText; */
+            lpToolInfo->lpszText = NULL;  /* FIXME */
+
+            if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
+                lpToolInfo->lParam = toolPtr->lParam;
+
+            return TRUE;
+        }
+        else
+            return FALSE;
     }
     else
-        return (infoPtr->nCurrentTool != -1);
+        return (infoPtr->nCurrentTool != -1);
 
     return FALSE;
@@ -1053 +1054 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+        return FALSE;
 
     if (lpToolInfo) {
-        if (infoPtr->nCurrentTool > -1) {
-            toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
-
-            /* copy tool data */
-            lpToolInfo->uFlags   = toolPtr->uFlags;
-            lpToolInfo->rect     = toolPtr->rect;
-            lpToolInfo->hinst    = toolPtr->hinst;
-/*          lpToolInfo->lpszText = toolPtr->lpszText; */
-            lpToolInfo->lpszText = NULL;  /* FIXME */
-
-            if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
-                lpToolInfo->lParam = toolPtr->lParam;
-
-            return TRUE;
-        }
-        else
-            return FALSE;
+        if (infoPtr->nCurrentTool > -1) {
+            toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
+
+            /* copy tool data */
+            lpToolInfo->uFlags   = toolPtr->uFlags;
+            lpToolInfo->rect     = toolPtr->rect;
+            lpToolInfo->hinst    = toolPtr->hinst;
+/*          lpToolInfo->lpszText = toolPtr->lpszText; */
+            lpToolInfo->lpszText = NULL;  /* FIXME */
+
+            if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
+                lpToolInfo->lParam = toolPtr->lParam;
+
+            return TRUE;
+        }
+        else
+            return FALSE;
     }
     else
-        return (infoPtr->nCurrentTool != -1);
+        return (infoPtr->nCurrentTool != -1);
 
     return FALSE;
@@ -1089 +1090 @@
 
     switch (wParam) {
-        case TTDT_AUTOMATIC:
-            return infoPtr->nAutomaticTime;
-
-        case TTDT_RESHOW:
-            return infoPtr->nReshowTime;
-
-        case TTDT_AUTOPOP:
-            return infoPtr->nAutoPopTime;
-
-        case TTDT_INITIAL:
-            return infoPtr->nInitialTime;
+        case TTDT_AUTOMATIC:
+            return infoPtr->nAutomaticTime;
+
+        case TTDT_RESHOW:
+            return infoPtr->nReshowTime;
+
+        case TTDT_AUTOPOP:
+            return infoPtr->nAutoPopTime;
+
+        case TTDT_INITIAL:
+            return infoPtr->nInitialTime;
     }
 
@@ -1138 +1139 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return 0;
+        return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1159 +1160 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return 0;
+        return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1205 +1206 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
     if (infoPtr->uNumTools == 0)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
     if (nTool == -1)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "tool %d\n", nTool);
@@ -1227 +1228 @@
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
-        lpToolInfo->lParam = toolPtr->lParam;
+        lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -1242 +1243 @@
 
     if (lpToolInfo == NULL)
-        return FALSE;
+        return FALSE;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+        return FALSE;
     if (infoPtr->uNumTools == 0)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
     if (nTool == -1)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "tool %d\n", nTool);
@@ -1264 +1265 @@
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
-        lpToolInfo->lParam = toolPtr->lParam;
+        lpToolInfo->lParam = toolPtr->lParam;
 
     return TRUE;
@@ -1279 +1280 @@
 
     if (lptthit == 0)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lptthit->hwnd, &lptthit->pt);
     if (nTool == -1)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "tool %d!\n", nTool);
@@ -1289 +1290 @@
     /* copy tool data */
     if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOA)) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        lptthit->ti.uFlags   = toolPtr->uFlags;
-        lptthit->ti.hwnd     = toolPtr->hwnd;
-        lptthit->ti.uId      = toolPtr->uId;
-        lptthit->ti.rect     = toolPtr->rect;
-        lptthit->ti.hinst    = toolPtr->hinst;
-/*      lptthit->ti.lpszText = toolPtr->lpszText; */
-        lptthit->ti.lpszText = NULL;  /* FIXME */
-        lptthit->ti.lParam   = toolPtr->lParam;
+        toolPtr = &infoPtr->tools[nTool];
+
+        lptthit->ti.uFlags   = toolPtr->uFlags;
+        lptthit->ti.hwnd     = toolPtr->hwnd;
+        lptthit->ti.uId      = toolPtr->uId;
+        lptthit->ti.rect     = toolPtr->rect;
+        lptthit->ti.hinst    = toolPtr->hinst;
+/*      lptthit->ti.lpszText = toolPtr->lpszText; */
+        lptthit->ti.lpszText = NULL;  /* FIXME */
+        lptthit->ti.lParam   = toolPtr->lParam;
     }
 
@@ -1314 +1315 @@
 
     if (lptthit == 0)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lptthit->hwnd, &lptthit->pt);
     if (nTool == -1)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (tooltips, "tool %d!\n", nTool);
@@ -1324 +1325 @@
     /* copy tool data */
     if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOW)) {
-        toolPtr = &infoPtr->tools[nTool];
-
-        lptthit->ti.uFlags   = toolPtr->uFlags;
-        lptthit->ti.hwnd     = toolPtr->hwnd;
-        lptthit->ti.uId      = toolPtr->uId;
-        lptthit->ti.rect     = toolPtr->rect;
-        lptthit->ti.hinst    = toolPtr->hinst;
-/*      lptthit->ti.lpszText = toolPtr->lpszText; */
-        lptthit->ti.lpszText = NULL;  /* FIXME */
-        lptthit->ti.lParam   = toolPtr->lParam;
+        toolPtr = &infoPtr->tools[nTool];
+
+        lptthit->ti.uFlags   = toolPtr->uFlags;
+        lptthit->ti.hwnd     = toolPtr->hwnd;
+        lptthit->ti.uId      = toolPtr->uId;
+        lptthit->ti.rect     = toolPtr->rect;
+        lptthit->ti.hinst    = toolPtr->hinst;
+/*      lptthit->ti.lpszText = toolPtr->lpszText; */
+        lptthit->ti.lpszText = NULL;  /* FIXME */
+        lptthit->ti.lParam   = toolPtr->lParam;
     }
 
@@ -1348 +1349 @@
 
     if (lpti == NULL)
-        return 0;
+        return 0;
     if (lpti->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpti);
@@ -1369 +1370 @@
 
     if (lpti == NULL)
-        return 0;
+        return 0;
     if (lpti->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpti);
@@ -1401 +1402 @@
 
     if (lParam == 0) {
-//      ERR (tooltips, "lpMsg == NULL!\n");
-        return 0;
+//      ERR (tooltips, "lpMsg == NULL!\n");
+        return 0;
     }
 
     switch (lpMsg->message) {
-        case WM_LBUTTONDOWN:
-        case WM_LBUTTONUP:
-        case WM_MBUTTONDOWN:
-        case WM_MBUTTONUP:
-        case WM_RBUTTONDOWN:
-        case WM_RBUTTONUP:
-            pt = lpMsg->pt;
-            ScreenToClient (lpMsg->hwnd, &pt);
-            infoPtr->nOldTool = infoPtr->nTool;
-            infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
-//          TRACE (tooltips, "tool (%x) %d %d\n",
-//                 hwnd, infoPtr->nOldTool, infoPtr->nTool);
-            TOOLTIPS_Hide (hwnd, infoPtr);
-            break;
-
-        case WM_MOUSEMOVE:
-            pt = lpMsg->pt;
-            ScreenToClient (lpMsg->hwnd, &pt);
-            infoPtr->nOldTool = infoPtr->nTool;
-            infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
-//          TRACE (tooltips, "tool (%x) %d %d\n",
-//                 hwnd, infoPtr->nOldTool, infoPtr->nTool);
-//          TRACE (tooltips, "WM_MOUSEMOVE (%04x %ld %ld)\n",
-//                 hwnd, pt.x, pt.y);
-            if ((infoPtr->bActive) && (infoPtr->nTool != infoPtr->nOldTool)) {
-                if (infoPtr->nOldTool == -1) {
-                    SetTimer (hwnd, ID_TIMERSHOW, infoPtr->nInitialTime, 0);
-//                  TRACE (tooltips, "timer 1 started!\n");
-                }
-                else {
-                    TOOLTIPS_Hide (hwnd, infoPtr);
-                    SetTimer (hwnd, ID_TIMERSHOW, infoPtr->nReshowTime, 0);
-//                  TRACE (tooltips, "timer 2 started!\n");
-                }
-            }
-            if (infoPtr->nCurrentTool != -1) {
-                SetTimer (hwnd, ID_TIMERLEAVE, 100, 0);
-//              TRACE (tooltips, "timer 3 started!\n");
-            }
-            break;
+        case WM_LBUTTONDOWN:
+        case WM_LBUTTONUP:
+        case WM_MBUTTONDOWN:
+        case WM_MBUTTONUP:
+        case WM_RBUTTONDOWN:
+        case WM_RBUTTONUP:
+            pt = lpMsg->pt;
+            ScreenToClient (lpMsg->hwnd, &pt);
+            infoPtr->nOldTool = infoPtr->nTool;
+            infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
+//          TRACE (tooltips, "tool (%x) %d %d\n",
+//                 hwnd, infoPtr->nOldTool, infoPtr->nTool);
+            TOOLTIPS_Hide (hwnd, infoPtr);
+            break;
+
+        case WM_MOUSEMOVE:
+            pt = lpMsg->pt;
+            ScreenToClient (lpMsg->hwnd, &pt);
+            infoPtr->nOldTool = infoPtr->nTool;
+            infoPtr->nTool = TOOLTIPS_GetToolFromPoint (infoPtr, lpMsg->hwnd, &pt);
+//          TRACE (tooltips, "tool (%x) %d %d\n",
+//                 hwnd, infoPtr->nOldTool, infoPtr->nTool);
+//          TRACE (tooltips, "WM_MOUSEMOVE (%04x %ld %ld)\n",
+//                 hwnd, pt.x, pt.y);
+            if ((infoPtr->bActive) && (infoPtr->nTool != infoPtr->nOldTool)) {
+                if (infoPtr->nOldTool == -1) {
+                    SetTimer (hwnd, ID_TIMERSHOW, infoPtr->nInitialTime, 0);
+//                  TRACE (tooltips, "timer 1 started!\n");
+                }
+                else {
+                    TOOLTIPS_Hide (hwnd, infoPtr);
+                    SetTimer (hwnd, ID_TIMERSHOW, infoPtr->nReshowTime, 0);
+//                  TRACE (tooltips, "timer 2 started!\n");
+                }
+            }
+            if (infoPtr->nCurrentTool != -1) {
+                SetTimer (hwnd, ID_TIMERLEAVE, 100, 0);
+//              TRACE (tooltips, "timer 3 started!\n");
+            }
+            break;
     }
 
@@ -1459 +1460 @@
 
     switch (wParam) {
-        case TTDT_AUTOMATIC:
-            if (nTime == 0) {
-                infoPtr->nAutomaticTime = 500;
-                infoPtr->nReshowTime    = 100;
-                infoPtr->nAutoPopTime   = 5000;
-                infoPtr->nInitialTime   = 500;
-            }
-            else {
-                infoPtr->nAutomaticTime = nTime;
-                infoPtr->nReshowTime    = nTime / 5;
-                infoPtr->nAutoPopTime   = nTime * 10;
-                infoPtr->nInitialTime   = nTime;
-            }
-            break;
-
-        case TTDT_RESHOW:
-            infoPtr->nReshowTime = nTime;
-            break;
-
-        case TTDT_AUTOPOP:
-            infoPtr->nAutoPopTime = nTime;
-            break;
-
-        case TTDT_INITIAL:
-            infoPtr->nInitialTime = nTime;
-            break;
+        case TTDT_AUTOMATIC:
+            if (nTime == 0) {
+                infoPtr->nAutomaticTime = 500;
+                infoPtr->nReshowTime    = 100;
+                infoPtr->nAutoPopTime   = 5000;
+                infoPtr->nInitialTime   = 500;
+            }
+            else {
+                infoPtr->nAutomaticTime = nTime;
+                infoPtr->nReshowTime    = nTime / 5;
+                infoPtr->nAutoPopTime   = nTime * 10;
+                infoPtr->nInitialTime   = nTime;
+            }
+            break;
+
+        case TTDT_RESHOW:
+            infoPtr->nReshowTime = nTime;
+            break;
+
+        case TTDT_AUTOPOP:
+            infoPtr->nAutoPopTime = nTime;
+            break;
+
+        case TTDT_INITIAL:
+            infoPtr->nInitialTime = nTime;
+            break;
     }
 
@@ -1549 +1550 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return 0;
+        return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1568 +1569 @@
 
     if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
-//      TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
-        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
+//      TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
+        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA)
-            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
-        else {
-            if (toolPtr->lpszText) {
-                COMCTL32_Free (toolPtr->lpszText);
-                toolPtr->lpszText = NULL;
-            }
-            if (lpToolInfo->lpszText) {
-                INT len = lstrlenA (lpToolInfo->lpszText);
-                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
-            }
-        }
+        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA)
+            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
+        else {
+            if (toolPtr->lpszText) {
+                COMCTL32_Free (toolPtr->lpszText);
+                toolPtr->lpszText = NULL;
+            }
+            if (lpToolInfo->lpszText) {
+                INT len = lstrlenA (lpToolInfo->lpszText);
+                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
+            }
+        }
     }
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
-        toolPtr->lParam = lpToolInfo->lParam;
+        toolPtr->lParam = lpToolInfo->lParam;
 
     return 0;
@@ -1603 +1604 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return 0;
+        return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1622 +1623 @@
 
     if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)) {
-//      TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
-        toolPtr->lpszText = lpToolInfo->lpszText;
+//      TRACE (tooltips, "set string id %x!\n", (INT)lpToolInfo->lpszText);
+        toolPtr->lpszText = lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW)
-            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
-        else {
-            if (toolPtr->lpszText) {
-                COMCTL32_Free (toolPtr->lpszText);
-                toolPtr->lpszText = NULL;
-            }
-            if (lpToolInfo->lpszText) {
-                INT len = lstrlenW (lpToolInfo->lpszText);
-                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
-            }
-        }
+        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW)
+            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
+        else {
+            if (toolPtr->lpszText) {
+                COMCTL32_Free (toolPtr->lpszText);
+                toolPtr->lpszText = NULL;
+            }
+            if (lpToolInfo->lpszText) {
+                INT len = lstrlenW (lpToolInfo->lpszText);
+                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
+            }
+        }
     }
 
     if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW))
-        toolPtr->lParam = lpToolInfo->lParam;
+        toolPtr->lParam = lpToolInfo->lParam;
 
     return 0;
@@ -1655 +1656 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
 
     if ((BOOL)wParam) {
-        /* activate */
-        infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
-        if (infoPtr->nTrackTool != -1) {
-//          TRACE (tooltips, "activated!\n");
-            infoPtr->bTrackActive = TRUE;
-            TOOLTIPS_TrackShow (hwnd, infoPtr);
-        }
+        /* activate */
+        infoPtr->nTrackTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
+        if (infoPtr->nTrackTool != -1) {
+//          TRACE (tooltips, "activated!\n");
+            infoPtr->bTrackActive = TRUE;
+            TOOLTIPS_TrackShow (hwnd, infoPtr);
+        }
     }
     else {
-        /* deactivate */
-        TOOLTIPS_TrackHide (hwnd, infoPtr);
-
-        infoPtr->bTrackActive = FALSE;
-        infoPtr->nTrackTool = -1;
-
-//      TRACE (tooltips, "deactivated!\n");
+        /* deactivate */
+        TOOLTIPS_TrackHide (hwnd, infoPtr);
+
+        infoPtr->bTrackActive = FALSE;
+        infoPtr->nTrackTool = -1;
+
+//      TRACE (tooltips, "deactivated!\n");
     }
 
@@ -1691 +1692 @@
 
     if (infoPtr->bTrackActive) {
-//      TRACE (tooltips, "[%d %d]\n",
-//             infoPtr->xTrackPos, infoPtr->yTrackPos);
-
-        TOOLTIPS_TrackShow (hwnd, infoPtr);
+//      TRACE (tooltips, "[%d %d]\n",
+//             infoPtr->xTrackPos, infoPtr->yTrackPos);
+
+        TOOLTIPS_TrackShow (hwnd, infoPtr);
     }
 
@@ -1707 +1708 @@
 
     if (infoPtr->nCurrentTool != -1)
-        UpdateWindow (hwnd);
+        UpdateWindow (hwnd);
 
     return 0;
@@ -1722 +1723 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1737 +1738 @@
 
     if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)){
-        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
+        toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA)
-            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
-        else {
-            if (toolPtr->lpszText) {
-                COMCTL32_Free (toolPtr->lpszText);
-                toolPtr->lpszText = NULL;
-            }
-            if (lpToolInfo->lpszText) {
-                INT len = lstrlenA (lpToolInfo->lpszText);
-                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
-            }
-        }
+        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKA)
+            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
+        else {
+            if (toolPtr->lpszText) {
+                COMCTL32_Free (toolPtr->lpszText);
+                toolPtr->lpszText = NULL;
+            }
+            if (lpToolInfo->lpszText) {
+                INT len = lstrlenA (lpToolInfo->lpszText);
+                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                lstrcpyAtoW (toolPtr->lpszText, lpToolInfo->lpszText);
+            }
+        }
     }
 
     /* force repaint */
     if (infoPtr->bActive)
-        TOOLTIPS_Show (hwnd, infoPtr);
+        TOOLTIPS_Show (hwnd, infoPtr);
     else if (infoPtr->bTrackActive)
-        TOOLTIPS_TrackShow (hwnd, infoPtr);
+        TOOLTIPS_TrackShow (hwnd, infoPtr);
 
     return 0;
@@ -1774 +1775 @@
 
     if (lpToolInfo == NULL)
-        return 0;
+        return 0;
     if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+        return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
     if (nTool == -1)
-        return 0;
+        return 0;
 
 //    TRACE (tooltips, "tool %d\n", nTool);
@@ -1790 +1791 @@
 
     if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0)){
-        toolPtr->lpszText = lpToolInfo->lpszText;
+        toolPtr->lpszText = lpToolInfo->lpszText;
     }
     else if (lpToolInfo->lpszText) {
-        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW)
-            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
-        else {
-            if (toolPtr->lpszText) {
-                COMCTL32_Free (toolPtr->lpszText);
-                toolPtr->lpszText = NULL;
-            }
-            if (lpToolInfo->lpszText) {
-                INT len = lstrlenW (lpToolInfo->lpszText);
-                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
-            }
-        }
+        if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW)
+            toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
+        else {
+            if (toolPtr->lpszText) {
+                COMCTL32_Free (toolPtr->lpszText);
+                toolPtr->lpszText = NULL;
+            }
+            if (lpToolInfo->lpszText) {
+                INT len = lstrlenW (lpToolInfo->lpszText);
+                toolPtr->lpszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                lstrcpyW (toolPtr->lpszText, lpToolInfo->lpszText);
+            }
+        }
     }
 
     /* force repaint */
     if (infoPtr->bActive)
-        TOOLTIPS_Show (hwnd, infoPtr);
+        TOOLTIPS_Show (hwnd, infoPtr);
     else if (infoPtr->bTrackActive)
-        TOOLTIPS_TrackShow (hwnd, infoPtr);
+        TOOLTIPS_TrackShow (hwnd, infoPtr);
 
     return 0;
@@ -1859 +1860 @@
 
     nResult = (INT) SendMessageA (GetParent (hwnd), WM_NOTIFYFORMAT,
-                                  (WPARAM)hwnd, (LPARAM)NF_QUERY);
+                                  (WPARAM)hwnd, (LPARAM)NF_QUERY);
 //    if (nResult == NFR_ANSI)
-//      TRACE (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
+//      TRACE (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
 //    else if (nResult == NFR_UNICODE)
-//      FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n");
+//      FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n");
 //    else
-//      FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n");
+//      FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n");
 
     SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
@@ -1882 +1883 @@
     /* free tools */
     if (infoPtr->tools) {
-        for (i = 0; i < infoPtr->uNumTools; i++) {
-            toolPtr = &infoPtr->tools[i];
-            if ((toolPtr->hinst) && (toolPtr->lpszText)) {
-                if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
-                    COMCTL32_Free (toolPtr->lpszText);
-            }
-
-            /* remove subclassing */
-            if (toolPtr->uFlags & TTF_SUBCLASS) {
-                LPTT_SUBCLASS_INFO lpttsi;
-
-                if (toolPtr->uFlags & TTF_IDISHWND)
-                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                else
-                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
-
-                if (lpttsi) {
-                    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
-                                      (LONG)lpttsi->wpOrigProc);
-                    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
-                    COMCTL32_Free (&lpttsi);
-                }
-            }
-        }
-        COMCTL32_Free (infoPtr->tools);
+        for (i = 0; i < infoPtr->uNumTools; i++) {
+            toolPtr = &infoPtr->tools[i];
+            if ((toolPtr->hinst) && (toolPtr->lpszText)) {
+                if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+                    COMCTL32_Free (toolPtr->lpszText);
+            }
+
+            /* remove subclassing */
+            if (toolPtr->uFlags & TTF_SUBCLASS) {
+                LPTT_SUBCLASS_INFO lpttsi;
+
+                if (toolPtr->uFlags & TTF_IDISHWND)
+                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+                else
+                    lpttsi = (LPTT_SUBCLASS_INFO)GetPropA (toolPtr->hwnd, COMCTL32_aSubclass);
+
+                if (lpttsi) {
+                    SetWindowLongA ((HWND)toolPtr->uId, GWL_WNDPROC,
+                                      (LONG)lpttsi->wpOrigProc);
+                    RemovePropA ((HWND)toolPtr->uId, COMCTL32_aSubclass);
+                    COMCTL32_Free (&lpttsi);
+                }
+            }
+        }
+        COMCTL32_Free (infoPtr->tools);
     }
 
@@ -1977 +1978 @@
 
     if ((nTool > -1) && (nTool < infoPtr->uNumTools)) {
-        if (infoPtr->tools[nTool].uFlags & TTF_TRANSPARENT) {
-//          TRACE (tooltips, "-- in transparent mode!\n");
-            return HTTRANSPARENT;
-        }
+        if (infoPtr->tools[nTool].uFlags & TTF_TRANSPARENT) {
+//          TRACE (tooltips, "-- in transparent mode!\n");
+            return HTTRANSPARENT;
+        }
     }
 
@@ -1996 +1997 @@
     TOOLTIPS_Refresh (hwnd, hdc);
     if (!wParam)
-        EndPaint (hwnd, &ps);
+        EndPaint (hwnd, &ps);
     return 0;
 }
@@ -2009 +2010 @@
 
     if ((LOWORD(lParam)) & (infoPtr->nCurrentTool != -1)) {
-//      FIXME (tooltips, "full redraw needed!\n");
+//      FIXME (tooltips, "full redraw needed!\n");
     }
 
@@ -2072 +2073 @@
     switch (wParam)
     {
-        case ID_TIMERSHOW:
-            KillTimer (hwnd, ID_TIMERSHOW);
-            if (TOOLTIPS_CheckTool (hwnd, TRUE) == infoPtr->nTool)
-                TOOLTIPS_Show (hwnd, infoPtr);
-            break;
-
-        case ID_TIMERPOP:
-            TOOLTIPS_Hide (hwnd, infoPtr);
-            break;
-
-        case ID_TIMERLEAVE:
-            KillTimer (hwnd, ID_TIMERLEAVE);
-            if (TOOLTIPS_CheckTool (hwnd, FALSE) == -1) {
-                infoPtr->nTool = -1;
-                infoPtr->nOldTool = -1;
-                TOOLTIPS_Hide (hwnd, infoPtr);
-            }
-            break;
+        case ID_TIMERSHOW:
+            KillTimer (hwnd, ID_TIMERSHOW);
+            if (TOOLTIPS_CheckTool (hwnd, TRUE) == infoPtr->nTool)
+                TOOLTIPS_Show (hwnd, infoPtr);
+            break;
+
+        case ID_TIMERPOP:
+            TOOLTIPS_Hide (hwnd, infoPtr);
+            break;
+
+        case ID_TIMERLEAVE:
+            KillTimer (hwnd, ID_TIMERLEAVE);
+            if (TOOLTIPS_CheckTool (hwnd, FALSE) == -1) {
+                infoPtr->nTool = -1;
+                infoPtr->nOldTool = -1;
+                TOOLTIPS_Hide (hwnd, infoPtr);
+            }
+            break;
     }
     return 0;
@@ -2117 +2118 @@
 {
     LPTT_SUBCLASS_INFO lpttsi =
-        (LPTT_SUBCLASS_INFO)GetPropA (hwnd, COMCTL32_aSubclass);
+        (LPTT_SUBCLASS_INFO)GetPropA (hwnd, COMCTL32_aSubclass);
     TOOLTIPS_INFO *infoPtr;
     UINT nTool;
 
     switch (uMsg) {
-        case WM_LBUTTONDOWN:
-        case WM_LBUTTONUP:
-        case WM_MBUTTONDOWN:
-        case WM_MBUTTONUP:
-        case WM_RBUTTONDOWN:
-        case WM_RBUTTONUP:
-            infoPtr = TOOLTIPS_GetInfoPtr(lpttsi->hwndToolTip);
-                nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
-
-//              TRACE (tooltips, "subclassed mouse message %04x\n", uMsg);
-                infoPtr->nOldTool = infoPtr->nTool;
-                infoPtr->nTool = nTool;
-            TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
-            break;
-
-        case WM_MOUSEMOVE:
-            infoPtr = TOOLTIPS_GetInfoPtr (lpttsi->hwndToolTip);
-                nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
-
-//              TRACE (tooltips, "subclassed WM_MOUSEMOVE\n");
-                infoPtr->nOldTool = infoPtr->nTool;
-                infoPtr->nTool = nTool;
-
-                if ((infoPtr->bActive) &&
-                    (infoPtr->nTool != infoPtr->nOldTool)) {
-                    if (infoPtr->nOldTool == -1) {
-                    SetTimer (hwnd, ID_TIMERSHOW,
-                                    infoPtr->nInitialTime, 0);
-//                      TRACE (tooltips, "timer 1 started!\n");
-                    }
-                    else {
-                    TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
-                    SetTimer (hwnd, ID_TIMERSHOW,
-                                infoPtr->nReshowTime, 0);
-//                      TRACE (tooltips, "timer 2 started!\n");
-                    }
-                }
-                if (infoPtr->nCurrentTool != -1) {
-                SetTimer (hwnd, ID_TIMERLEAVE, 100, 0);
-//                  TRACE (tooltips, "timer 3 started!\n");
-                }
-            break;
+        case WM_LBUTTONDOWN:
+        case WM_LBUTTONUP:
+        case WM_MBUTTONDOWN:
+        case WM_MBUTTONUP:
+        case WM_RBUTTONDOWN:
+        case WM_RBUTTONUP:
+            infoPtr = TOOLTIPS_GetInfoPtr(lpttsi->hwndToolTip);
+                nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
+
+//              TRACE (tooltips, "subclassed mouse message %04x\n", uMsg);
+                infoPtr->nOldTool = infoPtr->nTool;
+                infoPtr->nTool = nTool;
+            TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
+            break;
+
+        case WM_MOUSEMOVE:
+            infoPtr = TOOLTIPS_GetInfoPtr (lpttsi->hwndToolTip);
+                nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);
+
+//              TRACE (tooltips, "subclassed WM_MOUSEMOVE\n");
+                infoPtr->nOldTool = infoPtr->nTool;
+                infoPtr->nTool = nTool;
+
+                if ((infoPtr->bActive) &&
+                    (infoPtr->nTool != infoPtr->nOldTool)) {
+                    if (infoPtr->nOldTool == -1) {
+                    SetTimer (hwnd, ID_TIMERSHOW,
+                                    infoPtr->nInitialTime, 0);
+//                      TRACE (tooltips, "timer 1 started!\n");
+                    }
+                    else {
+                    TOOLTIPS_Hide (lpttsi->hwndToolTip, infoPtr);
+                    SetTimer (hwnd, ID_TIMERSHOW,
+                                infoPtr->nReshowTime, 0);
+//                      TRACE (tooltips, "timer 2 started!\n");
+                    }
+                }
+                if (infoPtr->nCurrentTool != -1) {
+                SetTimer (hwnd, ID_TIMERLEAVE, 100, 0);
+//                  TRACE (tooltips, "timer 3 started!\n");
+                }
+            break;
     }
 
@@ -2175 +2176 @@
     switch (uMsg)
     {
-        case TTM_ACTIVATE:
-            return TOOLTIPS_Activate (hwnd, wParam, lParam);
-
-        case TTM_ADDTOOLA:
-            return TOOLTIPS_AddToolA (hwnd, wParam, lParam);
-
-        case TTM_ADDTOOLW:
-            return TOOLTIPS_AddToolW (hwnd, wParam, lParam);
-
-        case TTM_DELTOOLA:
-            return TOOLTIPS_DelToolA (hwnd, wParam, lParam);
-
-        case TTM_DELTOOLW:
-            return TOOLTIPS_DelToolW (hwnd, wParam, lParam);
-
-        case TTM_ENUMTOOLSA:
-            return TOOLTIPS_EnumToolsA (hwnd, wParam, lParam);
-
-        case TTM_ENUMTOOLSW:
-            return TOOLTIPS_EnumToolsW (hwnd, wParam, lParam);
-
-        case TTM_GETCURRENTTOOLA:
-            return TOOLTIPS_GetCurrentToolA (hwnd, wParam, lParam);
-
-        case TTM_GETCURRENTTOOLW:
-            return TOOLTIPS_GetCurrentToolW (hwnd, wParam, lParam);
-
-        case TTM_GETDELAYTIME:
-            return TOOLTIPS_GetDelayTime (hwnd, wParam, lParam);
-
-        case TTM_GETMARGIN:
-            return TOOLTIPS_GetMargin (hwnd, wParam, lParam);
-
-        case TTM_GETMAXTIPWIDTH:
-            return TOOLTIPS_GetMaxTipWidth (hwnd, wParam, lParam);
-
-        case TTM_GETTEXTA:
-            return TOOLTIPS_GetTextA (hwnd, wParam, lParam);
-
-        case TTM_GETTEXTW:
-            return TOOLTIPS_GetTextW (hwnd, wParam, lParam);
-
-        case TTM_GETTIPBKCOLOR:
-            return TOOLTIPS_GetTipBkColor (hwnd, wParam, lParam);
-
-        case TTM_GETTIPTEXTCOLOR:
-            return TOOLTIPS_GetTipTextColor (hwnd, wParam, lParam);
-
-        case TTM_GETTOOLCOUNT:
-            return TOOLTIPS_GetToolCount (hwnd, wParam, lParam);
-
-        case TTM_GETTOOLINFOA:
-            return TOOLTIPS_GetToolInfoA (hwnd, wParam, lParam);
-
-        case TTM_GETTOOLINFOW:
-            return TOOLTIPS_GetToolInfoW (hwnd, wParam, lParam);
-
-        case TTM_HITTESTA:
-            return TOOLTIPS_HitTestA (hwnd, wParam, lParam);
-
-        case TTM_HITTESTW:
-            return TOOLTIPS_HitTestW (hwnd, wParam, lParam);
-
-        case TTM_NEWTOOLRECTA:
-            return TOOLTIPS_NewToolRectA (hwnd, wParam, lParam);
-
-        case TTM_NEWTOOLRECTW:
-            return TOOLTIPS_NewToolRectW (hwnd, wParam, lParam);
-
-        case TTM_POP:
-            return TOOLTIPS_Pop (hwnd, wParam, lParam);
-
-        case TTM_RELAYEVENT:
-            return TOOLTIPS_RelayEvent (hwnd, wParam, lParam);
-
-        case TTM_SETDELAYTIME:
-            return TOOLTIPS_SetDelayTime (hwnd, wParam, lParam);
-
-        case TTM_SETMARGIN:
-            return TOOLTIPS_SetMargin (hwnd, wParam, lParam);
-
-        case TTM_SETMAXTIPWIDTH:
-            return TOOLTIPS_SetMaxTipWidth (hwnd, wParam, lParam);
-
-        case TTM_SETTIPBKCOLOR:
-            return TOOLTIPS_SetTipBkColor (hwnd, wParam, lParam);
-
-        case TTM_SETTIPTEXTCOLOR:
-            return TOOLTIPS_SetTipTextColor (hwnd, wParam, lParam);
-
-        case TTM_SETTOOLINFOA:
-            return TOOLTIPS_SetToolInfoA (hwnd, wParam, lParam);
-
-        case TTM_SETTOOLINFOW:
-            return TOOLTIPS_SetToolInfoW (hwnd, wParam, lParam);
-
-        case TTM_TRACKACTIVATE:
-            return TOOLTIPS_TrackActivate (hwnd, wParam, lParam);
-
-        case TTM_TRACKPOSITION:
-            return TOOLTIPS_TrackPosition (hwnd, wParam, lParam);
-
-        case TTM_UPDATE:
-            return TOOLTIPS_Update (hwnd, wParam, lParam);
-
-        case TTM_UPDATETIPTEXTA:
-            return TOOLTIPS_UpdateTipTextA (hwnd, wParam, lParam);
-
-        case TTM_UPDATETIPTEXTW:
-            return TOOLTIPS_UpdateTipTextW (hwnd, wParam, lParam);
-
-        case TTM_WINDOWFROMPOINT:
-            return TOOLTIPS_WindowFromPoint (hwnd, wParam, lParam);
-
-
-        case WM_CREATE:
-            return TOOLTIPS_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return TOOLTIPS_Destroy (hwnd, wParam, lParam);
-
-        case WM_ERASEBKGND:
-            return TOOLTIPS_EraseBackground (hwnd, wParam, lParam);
-
-        case WM_GETFONT:
-            return TOOLTIPS_GetFont (hwnd, wParam, lParam);
+        case TTM_ACTIVATE:
+            return TOOLTIPS_Activate (hwnd, wParam, lParam);
+
+        case TTM_ADDTOOLA:
+            return TOOLTIPS_AddToolA (hwnd, wParam, lParam);
+
+        case TTM_ADDTOOLW:
+            return TOOLTIPS_AddToolW (hwnd, wParam, lParam);
+
+        case TTM_DELTOOLA:
+            return TOOLTIPS_DelToolA (hwnd, wParam, lParam);
+
+        case TTM_DELTOOLW:
+            return TOOLTIPS_DelToolW (hwnd, wParam, lParam);
+
+        case TTM_ENUMTOOLSA:
+            return TOOLTIPS_EnumToolsA (hwnd, wParam, lParam);
+
+        case TTM_ENUMTOOLSW:
+            return TOOLTIPS_EnumToolsW (hwnd, wParam, lParam);
+
+        case TTM_GETCURRENTTOOLA:
+            return TOOLTIPS_GetCurrentToolA (hwnd, wParam, lParam);
+
+        case TTM_GETCURRENTTOOLW:
+            return TOOLTIPS_GetCurrentToolW (hwnd, wParam, lParam);
+
+        case TTM_GETDELAYTIME:
+            return TOOLTIPS_GetDelayTime (hwnd, wParam, lParam);
+
+        case TTM_GETMARGIN:
+            return TOOLTIPS_GetMargin (hwnd, wParam, lParam);
+
+        case TTM_GETMAXTIPWIDTH:
+            return TOOLTIPS_GetMaxTipWidth (hwnd, wParam, lParam);
+
+        case TTM_GETTEXTA:
+            return TOOLTIPS_GetTextA (hwnd, wParam, lParam);
+
+        case TTM_GETTEXTW:
+            return TOOLTIPS_GetTextW (hwnd, wParam, lParam);
+
+        case TTM_GETTIPBKCOLOR:
+            return TOOLTIPS_GetTipBkColor (hwnd, wParam, lParam);
+
+        case TTM_GETTIPTEXTCOLOR:
+            return TOOLTIPS_GetTipTextColor (hwnd, wParam, lParam);
+
+        case TTM_GETTOOLCOUNT:
+            return TOOLTIPS_GetToolCount (hwnd, wParam, lParam);
+
+        case TTM_GETTOOLINFOA:
+            return TOOLTIPS_GetToolInfoA (hwnd, wParam, lParam);
+
+        case TTM_GETTOOLINFOW:
+            return TOOLTIPS_GetToolInfoW (hwnd, wParam, lParam);
+
+        case TTM_HITTESTA:
+            return TOOLTIPS_HitTestA (hwnd, wParam, lParam);
+
+        case TTM_HITTESTW:
+            return TOOLTIPS_HitTestW (hwnd, wParam, lParam);
+
+        case TTM_NEWTOOLRECTA:
+            return TOOLTIPS_NewToolRectA (hwnd, wParam, lParam);
+
+        case TTM_NEWTOOLRECTW:
+            return TOOLTIPS_NewToolRectW (hwnd, wParam, lParam);
+
+        case TTM_POP:
+            return TOOLTIPS_Pop (hwnd, wParam, lParam);
+
+        case TTM_RELAYEVENT:
+            return TOOLTIPS_RelayEvent (hwnd, wParam, lParam);
+
+        case TTM_SETDELAYTIME:
+            return TOOLTIPS_SetDelayTime (hwnd, wParam, lParam);
+
+        case TTM_SETMARGIN:
+            return TOOLTIPS_SetMargin (hwnd, wParam, lParam);
+
+        case TTM_SETMAXTIPWIDTH:
+            return TOOLTIPS_SetMaxTipWidth (hwnd, wParam, lParam);
+
+        case TTM_SETTIPBKCOLOR:
+            return TOOLTIPS_SetTipBkColor (hwnd, wParam, lParam);
+
+        case TTM_SETTIPTEXTCOLOR:
+            return TOOLTIPS_SetTipTextColor (hwnd, wParam, lParam);
+
+        case TTM_SETTOOLINFOA:
+            return TOOLTIPS_SetToolInfoA (hwnd, wParam, lParam);
+
+        case TTM_SETTOOLINFOW:
+            return TOOLTIPS_SetToolInfoW (hwnd, wParam, lParam);
+
+        case TTM_TRACKACTIVATE:
+            return TOOLTIPS_TrackActivate (hwnd, wParam, lParam);
+
+        case TTM_TRACKPOSITION:
+            return TOOLTIPS_TrackPosition (hwnd, wParam, lParam);
+
+        case TTM_UPDATE:
+            return TOOLTIPS_Update (hwnd, wParam, lParam);
+
+        case TTM_UPDATETIPTEXTA:
+            return TOOLTIPS_UpdateTipTextA (hwnd, wParam, lParam);
+
+        case TTM_UPDATETIPTEXTW:
+            return TOOLTIPS_UpdateTipTextW (hwnd, wParam, lParam);
+
+        case TTM_WINDOWFROMPOINT:
+            return TOOLTIPS_WindowFromPoint (hwnd, wParam, lParam);
+
+
+        case WM_CREATE:
+            return TOOLTIPS_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return TOOLTIPS_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return TOOLTIPS_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_GETFONT:
+            return TOOLTIPS_GetFont (hwnd, wParam, lParam);
 
         case WM_GETTEXT:
             return TOOLTIPS_OnWMGetText (hwnd, wParam, lParam);
-        
+
         case WM_GETTEXTLENGTH:
             return TOOLTIPS_OnWMGetTextLength (hwnd, wParam, lParam);
- 
-
-        case WM_LBUTTONDOWN:
-        case WM_LBUTTONUP:
-        case WM_MBUTTONDOWN:
-        case WM_MBUTTONUP:
-        case WM_RBUTTONDOWN:
-        case WM_RBUTTONUP:
-        case WM_MOUSEMOVE:
-            return TOOLTIPS_MouseMessage (hwnd, uMsg, wParam, lParam);
-
-        case WM_NCCREATE:
-            return TOOLTIPS_NCCreate (hwnd, wParam, lParam);
-
-        case WM_NCHITTEST:
-            return TOOLTIPS_NCHitTest (hwnd, wParam, lParam);
-
-/*      case WM_NOTIFYFORMAT: */
-/*          return TOOLTIPS_NotifyFormat (hwnd, wParam, lParam); */
-
-        case WM_PAINT:
-            return TOOLTIPS_Paint (hwnd, wParam, lParam);
-
-        case WM_SETFONT:
-            return TOOLTIPS_SetFont (hwnd, wParam, lParam);
-
-        case WM_TIMER:
-            return TOOLTIPS_Timer (hwnd, wParam, lParam);
-
-        case WM_WININICHANGE:
-            return TOOLTIPS_WinIniChange (hwnd, wParam, lParam);
-
-        default:
-            if (uMsg >= WM_USER)
-//              ERR (tooltips, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+
+
+        case WM_LBUTTONDOWN:
+        case WM_LBUTTONUP:
+        case WM_MBUTTONDOWN:
+        case WM_MBUTTONUP:
+        case WM_RBUTTONDOWN:
+        case WM_RBUTTONUP:
+        case WM_MOUSEMOVE:
+            return TOOLTIPS_MouseMessage (hwnd, uMsg, wParam, lParam);
+
+        case WM_NCCREATE:
+            return TOOLTIPS_NCCreate (hwnd, wParam, lParam);
+
+        case WM_NCHITTEST:
+            return TOOLTIPS_NCHitTest (hwnd, wParam, lParam);
+
+/*      case WM_NOTIFYFORMAT: */
+/*          return TOOLTIPS_NotifyFormat (hwnd, wParam, lParam); */
+
+        case WM_PAINT:
+            return TOOLTIPS_Paint (hwnd, wParam, lParam);
+
+        case WM_SETFONT:
+            return TOOLTIPS_SetFont (hwnd, wParam, lParam);
+
+        case WM_TIMER:
+            return TOOLTIPS_Timer (hwnd, wParam, lParam);
+
+        case WM_WININICHANGE:
+            return TOOLTIPS_WinIniChange (hwnd, wParam, lParam);
+
+        default:
+//            if (uMsg >= WM_USER)
+//              ERR (tooltips, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2364 +2365 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = TOOLTIPS_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -2373 +2374 @@
 {
     if (GlobalFindAtomA (TOOLTIPS_CLASSA))
-        UnregisterClassA (TOOLTIPS_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (TOOLTIPS_CLASSA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.4 1999-06-16 15:29:27 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.5 1999-06-16 20:25:44 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -15 +15 @@
  *   - better tic handling.
  *   - more notifications.
+ *   - implement TRACKBAR_Draw with inUpdate
  *
  */
@@ -345 +346 @@
 }
 
-
-static VOID
-TRACKBAR_Refresh (HWND hwnd, HDC hdc)
+//draw the trackbar
+
+static VOID TRACKBAR_Draw(HWND hwnd,HDC hdc,INT lastPos,BOOL inUpdate)
 {
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
@@ -356 +357 @@
 
     GetClientRect (hwnd, &rcClient);
-    hBrush = CreateSolidBrush (infoPtr->clrBk);
-    FillRect (hdc, &rcClient, hBrush);
-    DeleteObject (hBrush);
+    if (!inUpdate)
+    {
+      hBrush = CreateSolidBrush (infoPtr->clrBk);
+      FillRect (hdc, &rcClient, hBrush);
+      DeleteObject (hBrush);
+    }
 
     if (infoPtr->flags & TB_DRAGPOSVALID)  {
@@ -478 +482 @@
 }
 
+//update display
+
+static VOID TRACKBAR_Update(HWND hwnd,INT lastPos)
+{
+   TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
+   HDC hdc;
+
+   if (infoPtr->flags & TB_DRAGPOSVALID && lastPos == infoPtr->dragPos) return;
+   if (!infoPtr->flags & TB_DRAGPOSVALID && lastPos == infoPtr->nPos) return;
+   hdc = GetDC(hwnd);
+   TRACKBAR_Draw(hwnd,hdc,lastPos,TRUE);
+   ReleaseDC(hwnd,hdc);
+}
+
+//redraw everything
+
+static VOID TRACKBAR_Refresh (HWND hwnd)
+{
+   HDC hdc;
+
+   hdc = GetDC (hwnd);
+   TRACKBAR_Draw(hwnd,hdc,0,FALSE);
+   ReleaseDC(hwnd,hdc);
+}
 
 static VOID
@@ -541 +569 @@
     infoPtr->flags |= TB_SELECTIONCHANGED;
 
-    if ((BOOL)wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if ((BOOL)wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -559 +586 @@
     }
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -811 +837 @@
     TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr (hwnd);
 
+    INT lastPos = infoPtr->nPos;
     infoPtr->nPos = (INT)LOWORD(lParam);
 
@@ -820 +847 @@
     infoPtr->flags |= TB_THUMBPOSCHANGED;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Update(hwnd,lastPos);
 
     return 0;
@@ -849 +875 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -872 +897 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -895 +919 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -912 +935 @@
     TRACKBAR_RecalculateTics (infoPtr);
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd); //CB: necessary?
 
     return 0;
@@ -935 +958 @@
         infoPtr->nSelMax = infoPtr->nRangeMax;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
 
@@ -957 +979 @@
         infoPtr->nSelMax = infoPtr->nRangeMax;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -978 +999 @@
         infoPtr->nSelMin = infoPtr->nRangeMin;
 
-    if (wParam)
-        InvalidateRect (hwnd, NULL, FALSE);
+    if (wParam) TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -995 +1015 @@
     infoPtr->flags |= TB_THUMBSIZECHANGED;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd);
 
     return 0;
@@ -1015 +1035 @@
     infoPtr->tics[infoPtr->uNumTics-1]=nPos;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd);
 
     return TRUE;
@@ -1149 +1169 @@
     infoPtr->flags &= ~TB_DRAG_MODE;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd); //CB: make changes here
 
     return 0;
@@ -1215 +1235 @@
     if (prevPos!=infoPtr->nPos) {
         infoPtr->flags |= TB_THUMBPOSCHANGED;
-        InvalidateRect (hwnd, NULL, FALSE);
+        TRACKBAR_Update(hwnd,prevPos);
     }
 
@@ -1247 +1267 @@
     }
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    //TRACKBAR_Refresh(hwnd); //CB: nothing changed
 
     return 0;
@@ -1259 +1279 @@
 
     if (infoPtr->flags & TB_DRAGPOSVALID) {
+        int lastPos = infoPtr->nPos;
         infoPtr->nPos=infoPtr->dragPos;
-        InvalidateRect (hwnd, NULL, FALSE);
+        TRACKBAR_Update(hwnd,lastPos);
     }
 
@@ -1277 +1298 @@
 
     hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
-    TRACKBAR_Refresh (hwnd, hdc);
+    TRACKBAR_Draw(hwnd,hdc,0,FALSE);
     if(!wParam)
         EndPaint (hwnd, &ps);
@@ -1292 +1313 @@
     infoPtr->bFocus = TRUE;
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Refresh(hwnd); //CB: make changes here
 
     return 0;
@@ -1332 +1353 @@
     DOUBLE dragPos;
     char buf[80];
+    INT lastDragPos;
 
 //    TRACE (trackbar, "%x\n",wParam);
@@ -1344 +1366 @@
 
     SetCapture (hwnd);
+    lastDragPos = infoPtr->dragPos;
     dragPos = TRACKBAR_ConvertPlaceToPosition (infoPtr, clickPlace,
                                                dwStyle & TBS_VERT);
@@ -1377 +1400 @@
     }
 
-    InvalidateRect (hwnd, NULL, FALSE);
+    TRACKBAR_Update(hwnd,lastDragPos);
     UpdateWindow (hwnd);
 
@@ -1438 +1461 @@
     if (pos!=infoPtr->nPos) {
         infoPtr->flags |=TB_THUMBPOSCHANGED;
-        InvalidateRect (hwnd, NULL, FALSE);
+        TRACKBAR_Update(hwnd,pos);
     }
 

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.3 1999-06-10 16:22:03 achimha Exp $ */
+/* $Id: treeview.c,v 1.4 1999-06-16 20:25:44 cbratschi Exp $ */
 /* Treeview control
  *
@@ -6 +6 @@
  * Copyright 1999 Sylvain St-Germain
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  *
  * TODO:
  *   Using DPA to store the item ptr would be good.
- *   Node label edition is implemented but something appened in wine in the 
+ *   Node label edition is implemented but something appened in wine in the
  *   two last weeks of march 99 that broke it.
- *   refreshtreeview:   
-                -small array containing info about positions.
-                -better implementation of RefreshItem:
+ *   refreshtreeview:
+                -small array containing info about positions.
+                -better implementation of RefreshItem:
               1) draw lines between parents
               2) draw items
-                          3) draw lines from parent<->items.
-                -implement partial drawing?
+                          3) draw lines from parent<->items.
+                -implement partial drawing?
  *  -drag&drop: TVM_CREATEDRAGIMAGE should create drag bitmap.
  *  -scrollbars: horizontal scrollbar doesn't work.
@@ -26 +27 @@
  *   FIXME: check fontsize. (uRealItemHeight)
  *          test focusItem  (redraw in different color)
-                        uHotItem
-                        Edit: needs timer
-                                  better implementation.
+                        uHotItem
+                        Edit: needs timer
+                                  better implementation.
  *   WM_HSCROLL is broken.
  *   use separate routine to get item text/image.
- *  
+ *
  *   Separate drawing/calculation.
  *
  * FIXMEs  (for personal use)
-    Expand:             -ctlmacro expands twice ->toggle.
-   -DblClick:   ctlmacro.exe's NM_DBLCLK seems to go wrong (returns FALSE).
-   -treehelper: stack corruption makes big window. 
-             
+    Expand:             -ctlmacro expands twice ->toggle.
+   -DblClick:   ctlmacro.exe's NM_DBLCLK seems to go wrong (returns FALSE).
+   -treehelper: stack corruption makes big window.
+
  */
 
@@ -54 +55 @@
  * has no side effects in this file.
  */
-#define tv_test_bit(nr,bf)      (((LPBYTE)bf)[nr>>3]&(1<<(nr&7)))
-#define tv_set_bit(nr,bf)       ((LPBYTE)bf)[nr>>3]|=(1<<(nr&7))
-#define tv_clear_bit(nr,bf)     ((LPBYTE)bf)[nr>>3]&=~(1<<(nr&7))
+#define tv_test_bit(nr,bf)      (((LPBYTE)bf)[nr>>3]&(1<<(nr&7)))
+#define tv_set_bit(nr,bf)       ((LPBYTE)bf)[nr>>3]|=(1<<(nr&7))
+#define tv_clear_bit(nr,bf)     ((LPBYTE)bf)[nr>>3]&=~(1<<(nr&7))
 
 
@@ -65 +66 @@
 TREEVIEW_SendSimpleNotify (HWND hwnd, UINT code);
 static BOOL
-TREEVIEW_SendTreeviewNotify (HWND hwnd, UINT code, UINT action, 
-                        HTREEITEM oldItem, HTREEITEM newItem);
+TREEVIEW_SendTreeviewNotify (HWND hwnd, UINT code, UINT action,
+                        HTREEITEM oldItem, HTREEITEM newItem);
 static BOOL
-TREEVIEW_SendTreeviewDnDNotify (HWND hwnd, UINT code, HTREEITEM dragItem, 
-                        POINT pt);
+TREEVIEW_SendTreeviewDnDNotify (HWND hwnd, UINT code, HTREEITEM dragItem,
+                        POINT pt);
 static BOOL
-TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem, 
-                        UINT code, UINT what);
+TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem,
+                        UINT code, UINT what);
 static BOOL
 TREEVIEW_SendCustomDrawNotify (HWND hwnd, DWORD dwDrawStage, HDC hdc,
-                        RECT rc);
+                        RECT rc);
 static BOOL
 TREEVIEW_SendCustomDrawItemNotify (HWND hwnd, HDC hdc,
@@ -85 +86 @@
 
 static LRESULT CALLBACK
-TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, 
-                                                        LPARAM lParam);
+TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam,
+                                                        LPARAM lParam);
 
 LRESULT WINAPI
@@ -94 +95 @@
 
 
-/* helper functions. Work with the assumption that validity of operands 
+/* helper functions. Work with the assumption that validity of operands
    is checked beforehand, and that tree state is valid.  */
 
-/* FIXME: MS documentation says `GetNextVisibleItem' returns NULL 
+/* FIXME: MS documentation says `GetNextVisibleItem' returns NULL
    if not succesfull'. Probably only applies to derefencing infoPtr
    (ie we are offered a valid treeview structure)
-   and not whether there is a next `visible' child. 
+   and not whether there is a next `visible' child.
    FIXME: check other failures.
  */
@@ -111 +112 @@
   HTREEITEM  handle)
 {
-  if ((!handle) || (handle>infoPtr->uMaxHandle)) 
+  if ((!handle) || (handle>infoPtr->uMaxHandle))
     return NULL;
 
-  if (tv_test_bit ((INT)handle, infoPtr->freeList)) 
+  if (tv_test_bit ((INT)handle, infoPtr->freeList))
     return NULL;
 
@@ -130 +131 @@
   TREEVIEW_ITEM *wineItem = tvItem;
 
-  /* 
-   * Get this item last sibling 
+  /*
+   * Get this item last sibling
    */
-  while (wineItem->sibling) 
-          wineItem=& infoPtr->items [(INT)wineItem->sibling];
-
-  /* 
+  while (wineItem->sibling)
+          wineItem=& infoPtr->items [(INT)wineItem->sibling];
+
+  /*
    * If the last sibling has expanded children, restart.
    */
   if ( ( wineItem->cChildren > 0 ) && ( wineItem->state & TVIS_EXPANDED) )
     return TREEVIEW_GetLastListItem(
-             infoPtr, 
+             infoPtr,
              &(infoPtr->items[(INT)wineItem->firstChild]));
 
@@ -148 +149 @@
 
 /***************************************************************************
- * This method returns the previous physical item in the list not 
+ * This method returns the previous physical item in the list not
  * considering the tree hierarchy.
  */
 static TREEVIEW_ITEM *TREEVIEW_GetPrevListItem(
-  TREEVIEW_INFO *infoPtr, 
+  TREEVIEW_INFO *infoPtr,
   TREEVIEW_ITEM *tvItem)
 {
-  if (tvItem->upsibling) 
+  if (tvItem->upsibling)
   {
-    /* 
+    /*
      * This item has a upsibling, get the last item.  Since, GetLastListItem
      * first looks at siblings, we must feed it with the first child.
      */
     TREEVIEW_ITEM *upItem = &infoPtr->items[(INT)tvItem->upsibling];
-    
+
     if ( ( upItem->cChildren > 0 ) && ( upItem->state & TVIS_EXPANDED) )
-      return TREEVIEW_GetLastListItem( 
-               infoPtr, 
+      return TREEVIEW_GetLastListItem(
+               infoPtr,
                &infoPtr->items[(INT)upItem->firstChild]);
     else
@@ -175 +176 @@
      * this item does not have a upsibling, get the parent
      */
-    if (tvItem->parent) 
+    if (tvItem->parent)
       return &infoPtr->items[(INT)tvItem->parent];
   }
@@ -184 +185 @@
 
 /***************************************************************************
- * This method returns the next physical item in the treeview not 
+ * This method returns the next physical item in the treeview not
  * considering the tree hierarchy.
  */
 static TREEVIEW_ITEM *TREEVIEW_GetNextListItem(
-  TREEVIEW_INFO *infoPtr, 
+  TREEVIEW_INFO *infoPtr,
   TREEVIEW_ITEM *tvItem)
 {
   TREEVIEW_ITEM *wineItem = NULL;
 
-  /* 
+  /*
    * If this item has children and is expanded, return the first child
    */
-  if ((tvItem->firstChild) && (tvItem->state & TVIS_EXPANDED)) 
-                return (& infoPtr->items[(INT)tvItem->firstChild]);
+  if ((tvItem->firstChild) && (tvItem->state & TVIS_EXPANDED))
+                return (& infoPtr->items[(INT)tvItem->firstChild]);
 
 
@@ -203 +204 @@
    * try to get the sibling
    */
-  if (tvItem->sibling) 
-                return (& infoPtr->items[(INT)tvItem->sibling]);
+  if (tvItem->sibling)
+                return (& infoPtr->items[(INT)tvItem->sibling]);
 
   /*
@@ -212 +213 @@
   while (wineItem->parent) {
     wineItem=& infoPtr->items [(INT)wineItem->parent];
-        if (wineItem->sibling) 
+        if (wineItem->sibling)
       return (& infoPtr->items [(INT)wineItem->sibling]);
-  } 
-
-  return NULL;  
+  }
+
+  return NULL;
 }
 
 /***************************************************************************
- * This method returns the nth item starting at the given item.  It returns 
+ * This method returns the nth item starting at the given item.  It returns
  * the last item (or first) we we run out of items.
  *
@@ -227 +228 @@
  */
 static TREEVIEW_ITEM *TREEVIEW_GetListItem(
-  TREEVIEW_INFO *infoPtr, 
+  TREEVIEW_INFO *infoPtr,
   TREEVIEW_ITEM *tvItem,
   LONG          count)
@@ -241 +242 @@
     {
       /* Keep a pointer to the previous in case we ask for more than we got */
-      previousItem = wineItem; 
+      previousItem = wineItem;
       wineItem     = TREEVIEW_GetNextListItem(infoPtr, wineItem);
-    } 
+    }
 
     if (wineItem == NULL)
@@ -254 +255 @@
     {
       /* Keep a pointer to the previous in case we ask for more than we got */
-      previousItem = wineItem; 
+      previousItem = wineItem;
       wineItem = TREEVIEW_GetPrevListItem(infoPtr, wineItem);
     }
@@ -267 +268 @@
 }
 
- 
+
 /***************************************************************************
- * This method 
+ * This method
  */
 static void TREEVIEW_RemoveAllChildren(
@@ -277 +278 @@
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
  TREEVIEW_ITEM *killItem;
- INT    kill;
- 
+ INT    kill;
+
  kill=(INT)parentItem->firstChild;
  while (kill) {
-        tv_set_bit ( kill, infoPtr->freeList);
-        killItem=& infoPtr->items[kill];
-        if (killItem->pszText!=LPSTR_TEXTCALLBACKA) 
-                COMCTL32_Free (killItem->pszText);
-        TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)kill, 0);
-        if (killItem->firstChild) 
-                        TREEVIEW_RemoveAllChildren (hwnd, killItem);
-        kill=(INT)killItem->sibling;
+        tv_set_bit ( kill, infoPtr->freeList);
+        killItem=& infoPtr->items[kill];
+        if (killItem->pszText!=LPSTR_TEXTCALLBACKA)
+                COMCTL32_Free (killItem->pszText);
+        TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)kill, 0);
+        if (killItem->firstChild)
+                        TREEVIEW_RemoveAllChildren (hwnd, killItem);
+        kill=(INT)killItem->sibling;
  }
 
  if (parentItem->cChildren>0) {
-        infoPtr->uNumItems -= parentItem->cChildren;
-        parentItem->firstChild = 0;
-        parentItem->cChildren  = 0;
+        infoPtr->uNumItems -= parentItem->cChildren;
+        parentItem->firstChild = 0;
+        parentItem->cChildren  = 0;
  }
 
@@ -312 +313 @@
  infoPtr->uNumItems--;
  parentItem=NULL;
- if (wineItem->pszText!=LPSTR_TEXTCALLBACKA) 
-        COMCTL32_Free (wineItem->pszText);
+ if (wineItem->pszText!=LPSTR_TEXTCALLBACKA)
+        COMCTL32_Free (wineItem->pszText);
 
  TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)iItem, 0);
 
- if (wineItem->firstChild) 
-        TREEVIEW_RemoveAllChildren (hwnd,wineItem);
+ if (wineItem->firstChild)
+        TREEVIEW_RemoveAllChildren (hwnd,wineItem);
 
  if (wineItem->parent) {
-        parentItem=& infoPtr->items [(INT)wineItem->parent];
-        switch (parentItem->cChildren) {
-                case I_CHILDRENCALLBACK: 
-//                              FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
-                                break;
-                case 1:
-                        parentItem->cChildren=0;
-                        parentItem->firstChild=0;    
-                        return;
-                default:
-                        parentItem->cChildren--;
-                        if ((INT)parentItem->firstChild==iItem) 
-                                parentItem->firstChild=wineItem->sibling;
-                }
+        parentItem=& infoPtr->items [(INT)wineItem->parent];
+        switch (parentItem->cChildren) {
+                case I_CHILDRENCALLBACK:
+//                              FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
+                                break;
+                case 1:
+                        parentItem->cChildren=0;
+                        parentItem->firstChild=0;
+                        return;
+                default:
+                        parentItem->cChildren--;
+                        if ((INT)parentItem->firstChild==iItem)
+                                parentItem->firstChild=wineItem->sibling;
+                }
  }
 
- if (iItem==(INT)infoPtr->TopRootItem) 
-        infoPtr->TopRootItem=(HTREEITEM)wineItem->sibling;
+ if (iItem==(INT)infoPtr->TopRootItem)
+        infoPtr->TopRootItem=(HTREEITEM)wineItem->sibling;
  if (wineItem->upsibling) {
-        upsiblingItem=& infoPtr->items [(INT)wineItem->upsibling];
-        upsiblingItem->sibling=wineItem->sibling;
+        upsiblingItem=& infoPtr->items [(INT)wineItem->upsibling];
+        upsiblingItem->sibling=wineItem->sibling;
  }
  if (wineItem->sibling) {
-        siblingItem=& infoPtr->items [(INT)wineItem->sibling];
-        siblingItem->upsibling=wineItem->upsibling;
+        siblingItem=& infoPtr->items [(INT)wineItem->sibling];
+        siblingItem->upsibling=wineItem->upsibling;
  }
 }
@@ -356 +357 @@
 
 static void TREEVIEW_RemoveTree (HWND hwnd)
-                                           
+
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -362 +363 @@
  int i;
 
- for (i=1; i<=(INT)infoPtr->uMaxHandle; i++) 
-        if (!tv_test_bit (i, infoPtr->freeList)) {
-                killItem=& infoPtr->items [i];  
-                if (killItem->pszText!=LPSTR_TEXTCALLBACKA)
-                        COMCTL32_Free (killItem->pszText);
-                TREEVIEW_SendTreeviewNotify 
-                                        (hwnd, TVN_DELETEITEM, 0, killItem->hItem, 0);
-                } 
+ for (i=1; i<=(INT)infoPtr->uMaxHandle; i++)
+        if (!tv_test_bit (i, infoPtr->freeList)) {
+                killItem=& infoPtr->items [i];
+                if (killItem->pszText!=LPSTR_TEXTCALLBACKA)
+                        COMCTL32_Free (killItem->pszText);
+                TREEVIEW_SendTreeviewNotify
+                                        (hwnd, TVN_DELETEITEM, 0, killItem->hItem, 0);
+                }
 
  if (infoPtr->uNumPtrsAlloced) {
@@ -377 +378 @@
         infoPtr->uNumPtrsAlloced=0;
         infoPtr->uMaxHandle=0;
-    }   
+    }
 }
 
@@ -394 +395 @@
   if (infoPtr==NULL) return 0;
 
-  if ((INT)wParam == TVSIL_NORMAL) 
-        return (LRESULT) infoPtr->himlNormal;
-  if ((INT)wParam == TVSIL_STATE) 
-        return (LRESULT) infoPtr->himlState;
+  if ((INT)wParam == TVSIL_NORMAL)
+        return (LRESULT) infoPtr->himlNormal;
+  if ((INT)wParam == TVSIL_STATE)
+        return (LRESULT) infoPtr->himlState;
 
   return 0;
@@ -410 +411 @@
 //    TRACE (treeview,"\n");
     switch ((INT)wParam) {
-        case TVSIL_NORMAL:
-            himlTemp = infoPtr->himlNormal;
-            infoPtr->himlNormal = (HIMAGELIST)lParam;
-            return (LRESULT)himlTemp;
-
-        case TVSIL_STATE:
-            himlTemp = infoPtr->himlState;
-            infoPtr->himlState = (HIMAGELIST)lParam;
-            return (LRESULT)himlTemp;
+        case TVSIL_NORMAL:
+            himlTemp = infoPtr->himlNormal;
+            infoPtr->himlNormal = (HIMAGELIST)lParam;
+            return (LRESULT)himlTemp;
+
+        case TVSIL_STATE:
+            himlTemp = infoPtr->himlState;
+            infoPtr->himlState = (HIMAGELIST)lParam;
+            return (LRESULT)himlTemp;
     }
 
@@ -435 +436 @@
 //  TRACE (treeview,"\n");
   if (wParam==-1) {
-        hdc=GetDC (hwnd);
-        infoPtr->uItemHeight=-1;
-        return prevHeight;
+        hdc=GetDC (hwnd);
+        infoPtr->uItemHeight=-1;
+        return prevHeight;
   }
 
@@ -446 +447 @@
 
   if (!( GetWindowLongA( hwnd, GWL_STYLE) & TVS_NONEVENHEIGHT))
-        infoPtr->uItemHeight = (INT) wParam & 0xfffffffe;
+        infoPtr->uItemHeight = (INT) wParam & 0xfffffffe;
   return prevHeight;
 }
@@ -454 +455 @@
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-  
+
 //  TRACE (treeview,"\n");
   return infoPtr->uItemHeight;
 }
-  
+
 static LRESULT
 TREEVIEW_SetTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -474 +475 @@
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-        
+
 //  TRACE (treeview,"\n");
   return (LRESULT) infoPtr->clrText;
@@ -494 +495 @@
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-        
+
 //  TRACE (treeview,"\n");
   return (LRESULT) infoPtr->clrBk;
@@ -500 +501 @@
 
 
-/* cdmode: custom draw mode as received from app. in first NMCUSTOMDRAW 
+/* cdmode: custom draw mode as received from app. in first NMCUSTOMDRAW
            notification */
 
@@ -516 +517 @@
   RECT  r;
 
- 
-  if (wineItem->state & TVIS_BOLD) 
-        hOldFont = SelectObject (hdc, infoPtr->hBoldFont);
-  else 
-        hOldFont = SelectObject (hdc, infoPtr->hFont);
+
+  if (wineItem->state & TVIS_BOLD)
+        hOldFont = SelectObject (hdc, infoPtr->hBoldFont);
+  else
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
 
   cditem=0;
   if (infoPtr->cdmode & CDRF_NOTIFYITEMDRAW) {
-                drawmode=CDDS_ITEMPREPAINT;
-
-                if (infoPtr->cdmode & CDRF_NOTIFYSUBITEMDRAW) 
+                drawmode=CDDS_ITEMPREPAINT;
+
+                if (infoPtr->cdmode & CDRF_NOTIFYSUBITEMDRAW)
       drawmode|=CDDS_SUBITEM;
 
-                cditem=TREEVIEW_SendCustomDrawItemNotify (hwnd, hdc, wineItem, drawmode);
-
-//              TRACE (treeview,"cditem:%d\n",cditem);
-
-                if (cditem & CDRF_SKIPDEFAULT) 
-                        return;
-        }
-
-  /* 
-   * Set drawing starting points 
+                cditem=TREEVIEW_SendCustomDrawItemNotify (hwnd, hdc, wineItem, drawmode);
+
+//              TRACE (treeview,"cditem:%d\n",cditem);
+
+                if (cditem & CDRF_SKIPDEFAULT)
+                        return;
+        }
+
+  /*
+   * Set drawing starting points
    */
   r      = wineItem->rect;               /* this item rectangle */
@@ -544 +545 @@
   xpos   = r.left + TREEVIEW_LEFT_MARGIN;/* horizontal starting point */
 
-  /* 
-   * Display the tree hierarchy 
+  /*
+   * Display the tree hierarchy
    */
-  if ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASLINES) 
+  if ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASLINES)
   {
-    /* 
-     * Write links to parent node 
+    /*
+     * Write links to parent node
      * we draw the L starting from the child to the parent
      *
@@ -557 +558 @@
      * points[2] is attached to the parent or the up sibling
      */
-    if ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_LINESATROOT) 
+    if ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_LINESATROOT)
     {
       TREEVIEW_ITEM *upNode    = NULL;
-        BOOL  hasParentOrSibling = TRUE;
+        BOOL  hasParentOrSibling = TRUE;
       RECT  upRect             = {0,0,0,0};
       HPEN  hOldPen, hnewPen;
-        POINT points[3];
-      /* 
+        POINT points[3];
+      /*
        * determine the target location of the line at root, either be linked
        * to the up sibling or to the parent node.
        */
       if (wineItem->upsibling)
-        upNode  = TREEVIEW_ValidItem (infoPtr, wineItem->upsibling);
+        upNode  = TREEVIEW_ValidItem (infoPtr, wineItem->upsibling);
       else if (wineItem->parent)
-        upNode  = TREEVIEW_ValidItem (infoPtr, wineItem->parent);
+        upNode  = TREEVIEW_ValidItem (infoPtr, wineItem->parent);
       else
         hasParentOrSibling = FALSE;
@@ -582 +583 @@
         points[2].x = points[1].x = upRect.left+8;
         points[0].x = points[2].x + 10;
-        points[2].y = upRect.bottom-3;      
+        points[2].y = upRect.bottom-3;
         points[1].y = points[0].y = center;
       }
       else
       {
-        points[2].x = points[1].x = 8 + (20*wineItem->iLevel); 
-        points[2].y = ( upNode->cChildren == 0) ? 
+        points[2].x = points[1].x = 8 + (20*wineItem->iLevel);
+        points[2].y = ( upNode->cChildren == 0) ?
                         upRect.top :        /* is linked to the "L" above */
-                        ( wineItem->upsibling != NULL) ? 
+                        ( wineItem->upsibling != NULL) ?
                           upRect.bottom-3:  /* is linked to an icon       */
                           upRect.bottom+1;  /* is linked to a +/- box     */
         points[1].y = points[0].y = center;
-        points[0].x = points[1].x + 10; 
+        points[0].x = points[1].x + 10;
       }
-    
-      /* 
+
+      /*
        * Get a doted pen
-       */ 
+       */
       hnewPen = CreatePen(PS_DOT, 0, GetSysColor(COLOR_WINDOWTEXT) );
       hOldPen = SelectObject( hdc, hnewPen );
-  
+
       if (hasParentOrSibling)
-        Polyline (hdc,points,3); 
+        Polyline (hdc,points,3);
       else
-        Polyline (hdc,points,2); 
-      
+        Polyline (hdc,points,2);
+
       DeleteObject(hnewPen);
       SelectObject(hdc, hOldPen);
@@ -613 +614 @@
   }
 
-  /* 
+  /*
    * Display the (+/-) signs
    */
@@ -619 +620 @@
     xpos+=(5*wineItem->iLevel);
 
-  if (( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASBUTTONS) && 
+  if (( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASBUTTONS) &&
       ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASLINES))
   {
-          if ( (wineItem->cChildren) ||
-               (wineItem->cChildren == I_CHILDRENCALLBACK))
+          if ( (wineItem->cChildren) ||
+               (wineItem->cChildren == I_CHILDRENCALLBACK))
     {
       /* Setup expand box coordinate to facilitate the LMBClick handling */
@@ -631 +632 @@
       wineItem->expandBox.bottom = center+5;
 
-                Rectangle (
-        hdc, 
-        wineItem->expandBox.left, 
-        wineItem->expandBox.top , 
-        wineItem->expandBox.right, 
+                Rectangle (
+        hdc,
+        wineItem->expandBox.left,
+        wineItem->expandBox.top ,
+        wineItem->expandBox.right,
         wineItem->expandBox.bottom);
 
-                MoveToEx (hdc, xpos-2, center, NULL);
-                LineTo   (hdc, xpos+3, center);
-  
-                if (!(wineItem->state & TVIS_EXPANDED)) {
-                        MoveToEx (hdc, xpos,   center-2, NULL);
-                        LineTo   (hdc, xpos,   center+3);
-          }
+                MoveToEx (hdc, xpos-2, center, NULL);
+                LineTo   (hdc, xpos+3, center);
+
+                if (!(wineItem->state & TVIS_EXPANDED)) {
+                        MoveToEx (hdc, xpos,   center-2, NULL);
+                        LineTo   (hdc, xpos,   center+3);
+          }
     }
   }
 
-  /* 
+  /*
    * Display the image assiciated with this item
    */
@@ -656 +657 @@
     HIMAGELIST *himlp = NULL;
 
-          if (infoPtr->himlNormal) 
+          if (infoPtr->himlNormal)
       himlp=&infoPtr->himlNormal; /* get the image list */
 
-        if ( (wineItem->state & TVIS_SELECTED) && 
-         (wineItem->iSelectedImage)) { 
-        
+        if ( (wineItem->state & TVIS_SELECTED) &&
+         (wineItem->iSelectedImage)) {
+
       /* State images are displayed to the left of the Normal image*/
-      if (infoPtr->himlState) 
+      if (infoPtr->himlState)
         himlp=&infoPtr->himlState;
 
       /* The item is curently selected */
-                  if (wineItem->iSelectedImage == I_IMAGECALLBACK) 
-                        TREEVIEW_SendDispInfoNotify (
-          hwnd, 
-          wineItem, 
-          TVN_GETDISPINFO, 
+                  if (wineItem->iSelectedImage == I_IMAGECALLBACK)
+                        TREEVIEW_SendDispInfoNotify (
+          hwnd,
+          wineItem,
+          TVN_GETDISPINFO,
           TVIF_SELECTEDIMAGE);
 
       imageIndex = wineItem->iSelectedImage;
 
-          } else { 
+          } else {
       /* This item is not selected */
-                  if (wineItem->iImage == I_IMAGECALLBACK) 
-                          TREEVIEW_SendDispInfoNotify ( 
-          hwnd, 
-          wineItem, 
-          TVN_GETDISPINFO, 
+                  if (wineItem->iImage == I_IMAGECALLBACK)
+                          TREEVIEW_SendDispInfoNotify (
+          hwnd,
+          wineItem,
+          TVN_GETDISPINFO,
           TVIF_IMAGE);
 
       imageIndex = wineItem->iImage;
-        }
- 
+        }
+
     if (himlp)
-    { 
+    {
       /* We found an image to display? Draw it. */
-        ImageList_Draw (
-        *himlp, 
+        ImageList_Draw (
+        *himlp,
         wineItem->iImage,
-        hdc, 
-        xpos-2, 
-        r.top+1, 
+        hdc,
+        xpos-2,
+        r.top+1,
         ILD_NORMAL);
 
-          ImageList_GetIconSize (*himlp, &cx, &cy);
-          xpos+=cx;
+          ImageList_GetIconSize (*himlp, &cx, &cy);
+          xpos+=cx;
     }
   }
 
-  /* 
+  /*
    * Display the text assiciated with this item
    */
   r.left=xpos;
-  if ((wineItem->mask & TVIF_TEXT) && (wineItem->pszText)) 
+  if ((wineItem->mask & TVIF_TEXT) && (wineItem->pszText))
   {
     COLORREF oldBkColor = 0;
@@ -717 +718 @@
     r.right -= 3;
 
-    wineItem->text.left  = r.left;  
+    wineItem->text.left  = r.left;
     wineItem->text.right = r.right;
     wineItem->text.top   = r.top;
@@ -726 +727 @@
       oldBkColor   = SetBkColor  (hdc, GetSysColor( COLOR_HIGHLIGHT));
       oldTextColor = SetTextColor(hdc, GetSysColor( COLOR_HIGHLIGHTTEXT));
-    } 
-    else 
+    }
+    else
     {
       oldBkMode    = SetBkMode(hdc, TRANSPARENT);
@@ -740 +741 @@
     /* Draw it */
     DrawTextA (
-      hdc, 
-      wineItem->pszText, 
-      lstrlenA(wineItem->pszText), 
-      &wineItem->text, 
-      uTextJustify | DT_VCENTER | DT_SINGLELINE ); 
+      hdc,
+      wineItem->pszText,
+      lstrlenA(wineItem->pszText),
+      &wineItem->text,
+      uTextJustify | DT_VCENTER | DT_SINGLELINE );
 
     /* Obtain the text coordinate */
     DrawTextA (
-      hdc, 
-      wineItem->pszText, 
-      lstrlenA(wineItem->pszText), 
-      &wineItem->text, 
-      uTextJustify | DT_VCENTER | DT_SINGLELINE | DT_CALCRECT); 
+      hdc,
+      wineItem->pszText,
+      lstrlenA(wineItem->pszText),
+      &wineItem->text,
+      uTextJustify | DT_VCENTER | DT_SINGLELINE | DT_CALCRECT);
 
     /* Restore the hdc state */
@@ -763 +764 @@
 
     /* Draw the box arround the selected item */
-    if (wineItem->state & TVIS_SELECTED ) 
+    if (wineItem->state & TVIS_SELECTED )
     {
       HPEN  hnewPen     = CreatePen(PS_DOT, 0, GetSysColor(COLOR_WINDOWTEXT) );
       HPEN  hOldPen     = SelectObject( hdc, hnewPen );
       POINT points[4];
-      
+
       points[0].x = wineItem->text.left-1;
-      points[0].y = wineItem->text.top+1; 
+      points[0].y = wineItem->text.top+1;
       points[1].x = wineItem->text.right;
-      points[1].y = wineItem->text.top+1; 
+      points[1].y = wineItem->text.top+1;
       points[2].x = wineItem->text.right;
-      points[2].y = wineItem->text.bottom; 
+      points[2].y = wineItem->text.bottom;
       points[3].x = wineItem->text.left-1;
       points[3].y = wineItem->text.bottom;
 
-      Polyline (hdc,points,4); 
+      Polyline (hdc,points,4);
 
       DeleteObject(hnewPen);
@@ -786 +787 @@
 
   if (cditem & CDRF_NOTIFYPOSTPAINT)
-                TREEVIEW_SendCustomDrawItemNotify (hwnd, hdc, wineItem, CDDS_ITEMPOSTPAINT);
+                TREEVIEW_SendCustomDrawItemNotify (hwnd, hdc, wineItem, CDDS_ITEMPOSTPAINT);
 
   SelectObject (hdc, hOldFont);
@@ -800 +801 @@
 
 //  TRACE (treeview,"\n");
-  /* 
+  /*
    * validate parameters
    */
-  if ( (infoPtr==NULL) || (lpRect == NULL) ) 
+  if ( (infoPtr==NULL) || (lpRect == NULL) )
     return FALSE;
 
-  if (infoPtr->Timer & TV_REFRESH_TIMER_SET)          
-                TREEVIEW_Refresh (hwnd);        /* we want a rect for the current view */
- 
-  /* 
+  if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
+                TREEVIEW_Refresh (hwnd);        /* we want a rect for the current view */
+
+  /*
    * retrive the item ptr
-   */ 
+   */
   iItem = (HTREEITEM *) lParam;
   wineItem = TREEVIEW_ValidItem (infoPtr, *iItem);
-  if ((!wineItem) || (!wineItem->visible)) 
+  if ((!wineItem) || (!wineItem->visible))
     return FALSE;
 
-  /* 
-   * If wParam is TRUE return the text size otherwise return 
-   * the whole item size        
+  /*
+   * If wParam is TRUE return the text size otherwise return
+   * the whole item size
    */
   if ((INT) wParam) {
-        lpRect->left      = wineItem->text.left;
-    lpRect->right         = wineItem->text.right;
-    lpRect->bottom      = wineItem->text.bottom;
-    lpRect->top     = wineItem->text.top;
+        lpRect->left      = wineItem->text.left;
+    lpRect->right         = wineItem->text.right;
+    lpRect->bottom      = wineItem->text.bottom;
+    lpRect->top     = wineItem->text.top;
   } else {
-    lpRect->left          = wineItem->rect.left;
-    lpRect->right         = wineItem->rect.right;
+    lpRect->left          = wineItem->rect.left;
+    lpRect->right         = wineItem->rect.right;
     lpRect->bottom  = wineItem->rect.bottom;
-    lpRect->top     = wineItem->rect.top;
-  }
-
-//  TRACE (treeview,"[L:%d R:%d T:%d B:%d]\n", 
+    lpRect->top     = wineItem->rect.top;
+  }
+
+//  TRACE (treeview,"[L:%d R:%d T:%d B:%d]\n",
 //      lpRect->left,lpRect->right,
-//                      lpRect->top,lpRect->bottom);
+//                      lpRect->top,lpRect->bottom);
 
   return TRUE;
@@ -875 +876 @@
 
   if (tvItem->mask & TVIF_INTEGRAL) {
-        wineItem->iIntegral=tvItem->iIntegral; 
+        wineItem->iIntegral=tvItem->iIntegral;
 //        FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
   }
@@ -892 +893 @@
 
   if (tvItem->mask & TVIF_TEXT) {
-                if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) {
+                if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) {
         len=lstrlenA (tvItem->pszText);
-        if (len>wineItem->cchTextMax) 
-                        wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
+        if (len>wineItem->cchTextMax)
+                        wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
         lstrcpynA (wineItem->pszText, tvItem->pszText,len);
-                } else {
-                        if (wineItem->cchTextMax) {
-                                COMCTL32_Free (wineItem->pszText);
-                                wineItem->cchTextMax=0;
-                        }
-                wineItem->pszText=LPSTR_TEXTCALLBACKA;
-                }
+                } else {
+                        if (wineItem->cchTextMax) {
+                                COMCTL32_Free (wineItem->pszText);
+                                wineItem->cchTextMax=0;
+                        }
+                wineItem->pszText=LPSTR_TEXTCALLBACKA;
+                }
    }
 
@@ -918 +919 @@
 {
     TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-        TEXTMETRICA tm;
-        HBRUSH hbrBk;
+        TEXTMETRICA tm;
+        HBRUSH hbrBk;
     RECT rect;
-        HDC hdc;
+        HDC hdc;
     INT iItem, indent, x, y, cx, height, itemHeight;
     INT viewtop,viewbottom,viewleft,viewright;
@@ -928 +929 @@
 //    TRACE (treeview,"\n");
 
-        hdc=GetDC (hwnd);
+        hdc=GetDC (hwnd);
 
     if (infoPtr->Timer & TV_REFRESH_TIMER_SET) {
-                KillTimer (hwnd, TV_REFRESH_TIMER);
-                infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
+                KillTimer (hwnd, TV_REFRESH_TIMER);
+                infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
     }
 
-    
+
     GetClientRect (hwnd, &rect);
     if ((rect.left-rect.right ==0) || (rect.top-rect.bottom==0)) return;
 
-    infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify 
-                                                (hwnd, CDDS_PREPAINT, hdc, rect);
-
-        if (infoPtr->cdmode==CDRF_SKIPDEFAULT) {
-                  ReleaseDC (hwnd, hdc);
-                  return;
-        }
-
-        infoPtr->uVisibleHeight= rect.bottom-rect.top;
-        infoPtr->uVisibleWidth= rect.right-rect.left;
+    infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify
+                                                (hwnd, CDDS_PREPAINT, hdc, rect);
+
+        if (infoPtr->cdmode==CDRF_SKIPDEFAULT) {
+                  ReleaseDC (hwnd, hdc);
+                  return;
+        }
+
+        infoPtr->uVisibleHeight= rect.bottom-rect.top;
+        infoPtr->uVisibleWidth= rect.right-rect.left;
 
     viewtop=infoPtr->cy;
@@ -958 +959 @@
 
     /* draw background */
-    
+
     hbrBk = GetSysColorBrush (COLOR_WINDOW);
     FillRect(hdc, &rect, hbrBk);
@@ -971 +972 @@
 
     while (iItem) {
-                prevItem=wineItem;
+                prevItem=wineItem;
         wineItem= & infoPtr->items[iItem];
-                wineItem->iLevel=indent;
+                wineItem->iLevel=indent;
 
         ImageList_GetIconSize (infoPtr->himlNormal, &cx, &itemHeight);
         if (infoPtr->uItemHeight>itemHeight)
-                    itemHeight=infoPtr->uItemHeight;
-
-            GetTextMetricsA (hdc, &tm);
-            if ((tm.tmHeight + tm.tmExternalLeading) > itemHeight)
-                     itemHeight=tm.tmHeight + tm.tmExternalLeading;
-
-        infoPtr->uRealItemHeight=itemHeight;    
+                    itemHeight=infoPtr->uItemHeight;
+
+            GetTextMetricsA (hdc, &tm);
+            if ((tm.tmHeight + tm.tmExternalLeading) > itemHeight)
+                     itemHeight=tm.tmHeight + tm.tmExternalLeading;
+
+        infoPtr->uRealItemHeight=itemHeight;
 
 
 /* FIXME: remove this in later stage  */
 /*
-//              if (wineItem->pszText!=LPSTR_TEXTCALLBACK32A) 
-//              TRACE (treeview, "%d %d [%d %d %d %d] (%s)\n",y,x,
-//                      wineItem->rect.top, wineItem->rect.bottom,
-//                      wineItem->rect.left, wineItem->rect.right,
-//                      wineItem->pszText);
-//              else 
-//              TRACE (treeview, "%d [%d %d %d %d] (CALLBACK)\n",
-//                              wineItem->hItem,
-//                              wineItem->rect.top, wineItem->rect.bottom,
-//                              wineItem->rect.left, wineItem->rect.right);
+//              if (wineItem->pszText!=LPSTR_TEXTCALLBACK32A)
+//              TRACE (treeview, "%d %d [%d %d %d %d] (%s)\n",y,x,
+//                      wineItem->rect.top, wineItem->rect.bottom,
+//                      wineItem->rect.left, wineItem->rect.right,
+//                      wineItem->pszText);
+//              else
+//              TRACE (treeview, "%d [%d %d %d %d] (CALLBACK)\n",
+//                              wineItem->hItem,
+//                              wineItem->rect.top, wineItem->rect.bottom,
+//                              wineItem->rect.left, wineItem->rect.right);
 */
 
-                height=itemHeight * wineItem->iIntegral +1;
-                if ((y >= viewtop) && (y <= viewbottom) &&
-                (x >= viewleft  ) && (x <= viewright)) {
-                                wineItem->visible = TRUE;
-                        wineItem->rect.top = y - infoPtr->cy + rect.top;
-                        wineItem->rect.bottom = wineItem->rect.top + height ;
-                        wineItem->rect.left = x - infoPtr->cx + rect.left;
-                        wineItem->rect.right = rect.right;
-                        if (!infoPtr->firstVisible)
-                                infoPtr->firstVisible=wineItem->hItem;
-                TREEVIEW_DrawItem (hwnd, hdc, wineItem);
-                }
-                else {
-                        wineItem->visible   = FALSE;
-                        wineItem->rect.left = wineItem->rect.top    = 0;
-                        wineItem->rect.right= wineItem->rect.bottom = 0;
-                        wineItem->text.left = wineItem->text.top    = 0;
-                        wineItem->text.right= wineItem->text.bottom = 0;
-                }
-
-                /* look up next item */
-        
-                if ((wineItem->firstChild) && (wineItem->state & TVIS_EXPANDED)) {
-                        iItem=(INT)wineItem->firstChild;
-                        indent++;
-                        x+=infoPtr->uIndent;
-                        if (x>infoPtr->uTotalWidth)     
-                                infoPtr->uTotalWidth=x;
-                }
-                else {
-                        iItem=(INT)wineItem->sibling;
-                        while ((!iItem) && (indent>0)) {
-                                indent--;
-                                x-=infoPtr->uIndent;
-                                prevItem=wineItem;
-                                wineItem=&infoPtr->items[(INT)wineItem->parent];
-                                iItem=(INT)wineItem->sibling;
-                        }
-                }
+                height=itemHeight * wineItem->iIntegral +1;
+                if ((y >= viewtop) && (y <= viewbottom) &&
+                (x >= viewleft  ) && (x <= viewright)) {
+                                wineItem->visible = TRUE;
+                        wineItem->rect.top = y - infoPtr->cy + rect.top;
+                        wineItem->rect.bottom = wineItem->rect.top + height ;
+                        wineItem->rect.left = x - infoPtr->cx + rect.left;
+                        wineItem->rect.right = rect.right;
+                        if (!infoPtr->firstVisible)
+                                infoPtr->firstVisible=wineItem->hItem;
+                TREEVIEW_DrawItem (hwnd, hdc, wineItem);
+                }
+                else {
+                        wineItem->visible   = FALSE;
+                        wineItem->rect.left = wineItem->rect.top    = 0;
+                        wineItem->rect.right= wineItem->rect.bottom = 0;
+                        wineItem->text.left = wineItem->text.top    = 0;
+                        wineItem->text.right= wineItem->text.bottom = 0;
+                }
+
+                /* look up next item */
+
+                if ((wineItem->firstChild) && (wineItem->state & TVIS_EXPANDED)) {
+                        iItem=(INT)wineItem->firstChild;
+                        indent++;
+                        x+=infoPtr->uIndent;
+                        if (x>infoPtr->uTotalWidth)
+                                infoPtr->uTotalWidth=x;
+                }
+                else {
+                        iItem=(INT)wineItem->sibling;
+                        while ((!iItem) && (indent>0)) {
+                                indent--;
+                                x-=infoPtr->uIndent;
+                                prevItem=wineItem;
+                                wineItem=&infoPtr->items[(INT)wineItem->parent];
+                                iItem=(INT)wineItem->sibling;
+                        }
+                }
         y +=height;
-    }                           /* while */
+    }                           /* while */
 
 /* FIXME: infoPtr->uTotalWidth should also take item label into account */
@@ -1047 +1048 @@
     infoPtr->uTotalHeight=y;
     if (y >= (viewbottom-viewtop)) {
-                if (!(infoPtr->uInternalStatus & TV_VSCROLL))
-                        ShowScrollBar (hwnd, SB_VERT, TRUE);
-                infoPtr->uInternalStatus |=TV_VSCROLL;
-                SetScrollRange (hwnd, SB_VERT, 0, 
-                                        y - infoPtr->uVisibleHeight, FALSE);
-                SetScrollPos (hwnd, SB_VERT, infoPtr->cy, TRUE);
-        }
+                if (!(infoPtr->uInternalStatus & TV_VSCROLL))
+                        ShowScrollBar (hwnd, SB_VERT, TRUE);
+                infoPtr->uInternalStatus |=TV_VSCROLL;
+                SetScrollRange (hwnd, SB_VERT, 0,
+                                        y - infoPtr->uVisibleHeight, FALSE);
+                SetScrollPos (hwnd, SB_VERT, infoPtr->cy, TRUE);
+        }
     else {
-                if (infoPtr->uInternalStatus & TV_VSCROLL) 
-                        ShowScrollBar (hwnd, SB_VERT, FALSE);
-                infoPtr->uInternalStatus &= ~TV_VSCROLL;
-        }
-
-
-        if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) 
-        infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify 
-                                                                (hwnd, CDDS_POSTPAINT, hdc, rect);
+                if (infoPtr->uInternalStatus & TV_VSCROLL)
+                        ShowScrollBar (hwnd, SB_VERT, FALSE);
+                infoPtr->uInternalStatus &= ~TV_VSCROLL;
+        }
+
+
+        if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
+        infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify
+                                                                (hwnd, CDDS_POSTPAINT, hdc, rect);
 
     ReleaseDC (hwnd, hdc);
@@ -1070 +1071 @@
 
 
-static LRESULT 
+static LRESULT
 TREEVIEW_HandleTimer (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1079 +1080 @@
 
   switch (wParam) {
-        case TV_REFRESH_TIMER:
-                KillTimer (hwnd, TV_REFRESH_TIMER);
-                infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
+        case TV_REFRESH_TIMER:
+                KillTimer (hwnd, TV_REFRESH_TIMER);
+                infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
     InvalidateRect(hwnd, NULL, FALSE);
-                return 0;
-        case TV_EDIT_TIMER:
-                KillTimer (hwnd, TV_EDIT_TIMER);
-                infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
-                return 0;
-        default:
-//              ERR (treeview,"got unknown timer\n");
-                break;
+                return 0;
+        case TV_EDIT_TIMER:
+                KillTimer (hwnd, TV_EDIT_TIMER);
+                infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
+                return 0;
+        default:
+//              ERR (treeview,"got unknown timer\n");
+                break;
  }
-                
+
  return 1;
 }
@@ -1105 +1106 @@
 // TRACE (treeview,"\n");
  if (infoPtr->Timer & TV_REFRESH_TIMER_SET) {
-        KillTimer (hwnd, TV_REFRESH_TIMER);
+        KillTimer (hwnd, TV_REFRESH_TIMER);
  }
 
@@ -1129 +1130 @@
 
    if (tvItem->mask & TVIF_CHILDREN) {
-//              if (TVIF_CHILDREN==I_CHILDRENCALLBACK) 
-//                      FIXME (treeview,"I_CHILDRENCALLBACK not supported\n");
+//              if (TVIF_CHILDREN==I_CHILDRENCALLBACK)
+//                      FIXME (treeview,"I_CHILDRENCALLBACK not supported\n");
         tvItem->cChildren=wineItem->cChildren;
    }
@@ -1143 +1144 @@
 
    if (tvItem->mask & TVIF_INTEGRAL) {
-        tvItem->iIntegral=wineItem->iIntegral; 
-//              FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
+        tvItem->iIntegral=wineItem->iIntegral;
+//              FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
    }
 
@@ -1160 +1161 @@
 
    if (tvItem->mask & TVIF_TEXT) {
-        if (wineItem->pszText == LPSTR_TEXTCALLBACKA) {
-            tvItem->pszText = LPSTR_TEXTCALLBACKA;  /* FIXME:send notification? */
-//              ERR (treeview," GetItem called with LPSTR_TEXTCALLBACK\n");
-        }
-        else if (wineItem->pszText) {
-            lstrcpynA (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
-        }
+        if (wineItem->pszText == LPSTR_TEXTCALLBACKA) {
+            tvItem->pszText = LPSTR_TEXTCALLBACKA;  /* FIXME:send notification? */
+//              ERR (treeview," GetItem called with LPSTR_TEXTCALLBACK\n");
+        }
+        else if (wineItem->pszText) {
+            lstrcpynA (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
+        }
    }
 
-//  TRACE(treeview,"item %d<%p>, txt %p, img %p, action %x\n", 
+//  TRACE(treeview,"item %d<%p>, txt %p, img %p, action %x\n",
 //    iItem,
-//    tvItem, 
-//    tvItem->pszText, 
-//    & tvItem->iImage, 
+//    tvItem,
+//    tvItem->pszText,
+//    & tvItem->iImage,
 //    tvItem->mask);
 
@@ -1197 +1198 @@
   retval=0;
   switch (flag) {
-        case TVGN_ROOT: retval=(INT)infoPtr->TopRootItem;
-                                        break;
-        case TVGN_CARET:retval=(INT)infoPtr->selectedItem;
-                                        break;
-        case TVGN_FIRSTVISIBLE: 
-                                TREEVIEW_Refresh (hwnd);       
+        case TVGN_ROOT: retval=(INT)infoPtr->TopRootItem;
+                                        break;
+        case TVGN_CARET:retval=(INT)infoPtr->selectedItem;
+                                        break;
+        case TVGN_FIRSTVISIBLE:
+                                TREEVIEW_Refresh (hwnd);
 /* FIXME:we should only recalculate, not redraw */
-                                        retval=(INT)infoPtr->firstVisible;
-                                        break;
-        case TVGN_DROPHILITE:
-                                        retval=(INT)infoPtr->dropItem;
-                                        break;
-        }
+                                        retval=(INT)infoPtr->firstVisible;
+                                        break;
+        case TVGN_DROPHILITE:
+                                        retval=(INT)infoPtr->dropItem;
+                                        break;
+        }
   if (retval) {
-//              TRACE (treeview,"flags:%x, returns %u\n", flag, retval);
-                return retval;
-  }
- 
+//              TRACE (treeview,"flags:%x, returns %u\n", flag, retval);
+                return retval;
+  }
+
   wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
   returnItem = NULL;
   if (!wineItem) return FALSE;
 
-  switch (flag) {
-        case TVGN_NEXT: retval=(INT)wineItem->sibling;
-                                        break;
-        case TVGN_PREVIOUS:     
-                                        retval=(INT)wineItem->upsibling;
-                                        break;
-        case TVGN_PARENT:
-                                        retval=(INT)wineItem->parent;
-                                        break;
-        case TVGN_CHILD:
-                                        retval=(INT)wineItem->firstChild;
-                                        break;
-        case TVGN_LASTVISIBLE:  
-                                        returnItem=TREEVIEW_GetLastListItem (infoPtr,wineItem);
-                                        break;
-        case TVGN_NEXTVISIBLE:  
-                                        returnItem=TREEVIEW_GetNextListItem (infoPtr,wineItem);
-                                        break;
-        case TVGN_PREVIOUSVISIBLE: 
-                                        returnItem=TREEVIEW_GetPrevListItem (infoPtr, wineItem);
-                                        break;
-        default:        //      FIXME (treeview,"Unknown msg %x,item %x\n", flag,iItem);
-                                        break;
-        }
+  switch (flag) {
+        case TVGN_NEXT: retval=(INT)wineItem->sibling;
+                                        break;
+        case TVGN_PREVIOUS:
+                                        retval=(INT)wineItem->upsibling;
+                                        break;
+        case TVGN_PARENT:
+                                        retval=(INT)wineItem->parent;
+                                        break;
+        case TVGN_CHILD:
+                                        retval=(INT)wineItem->firstChild;
+                                        break;
+        case TVGN_LASTVISIBLE:
+                                        returnItem=TREEVIEW_GetLastListItem (infoPtr,wineItem);
+                                        break;
+        case TVGN_NEXTVISIBLE:
+                                        returnItem=TREEVIEW_GetNextListItem (infoPtr,wineItem);
+                                        break;
+        case TVGN_PREVIOUSVISIBLE:
+                                        returnItem=TREEVIEW_GetPrevListItem (infoPtr, wineItem);
+                                        break;
+        default:        //      FIXME (treeview,"Unknown msg %x,item %x\n", flag,iItem);
+                                        break;
+        }
 
   if (returnItem) {
-//                TRACE (treeview,"flags:%x, item %d;returns %d\n", flag, iItem,
-//                                                      (INT)returnItem->hItem);
-                  return (INT)returnItem->hItem;
+//                TRACE (treeview,"flags:%x, item %d;returns %d\n", flag, iItem,
+//                                                      (INT)returnItem->hItem);
+                  return (INT)returnItem->hItem;
   }
 
@@ -1265 +1266 @@
 
 /***************************************************************************
- * This method does the chaining of the insertion of a treeview item 
+ * This method does the chaining of the insertion of a treeview item
  * before an item.
  */
 static void TREEVIEW_InsertBefore(
     TREEVIEW_INFO *infoPtr,
-    TREEVIEW_ITEM *newItem, 
+    TREEVIEW_ITEM *newItem,
     TREEVIEW_ITEM *sibling,
     TREEVIEW_ITEM *parent)
@@ -1285 +1286 @@
 
   if (sibling != NULL) /* Insert before this sibling for this parent */
-  { 
+  {
     /* Store the new item sibling up sibling and sibling tem handle */
     siblingHandle   = sibling->hItem;
@@ -1292 +1293 @@
     if ( (INT)sibling->upsibling != 0 )
       upSibling = &infoPtr->items[(INT)sibling->upsibling];
-  
+
     /* Adjust the sibling pointer */
     sibling->upsibling = newItem->hItem;
-    
+
     /* Adjust the new item pointers */
     newItem->upsibling = upSiblingHandle;
     newItem->sibling   = siblingHandle;
-    
+
     /* Adjust the up sibling pointer */
-    if ( upSibling != NULL )        
+    if ( upSibling != NULL )
       upSibling->sibling = newItem->hItem;
     else
@@ -1312 +1313 @@
 
 /***************************************************************************
- * This method does the chaining of the insertion of a treeview item 
+ * This method does the chaining of the insertion of a treeview item
  * after an item.
  */
 static void TREEVIEW_InsertAfter(
     TREEVIEW_INFO *infoPtr,
-    TREEVIEW_ITEM *newItem, 
+    TREEVIEW_ITEM *newItem,
     TREEVIEW_ITEM *upSibling,
     TREEVIEW_ITEM *parent)
@@ -1332 +1333 @@
 
   if (upSibling != NULL) /* Insert after this upsibling for this parent */
-  { 
+  {
     /* Store the new item up sibling and sibling item handle */
     upSiblingHandle = upSibling->hItem;
@@ -1339 +1340 @@
     if ( (INT)upSibling->sibling != 0 )
       sibling = &infoPtr->items[(INT)upSibling->sibling];
-  
+
     /* Adjust the up sibling pointer */
     upSibling->sibling = newItem->hItem;
-    
+
     /* Adjust the new item pointers */
     newItem->upsibling = upSiblingHandle;
     newItem->sibling   = siblingHandle;
-    
+
     /* Adjust the sibling pointer */
-    if ( sibling != NULL )        
-      sibling->upsibling = newItem->hItem; 
+    if ( sibling != NULL )
+      sibling->upsibling = newItem->hItem;
     /*
-    else 
-      newItem is the last of the level, nothing else to do 
+    else
+      newItem is the last of the level, nothing else to do
     */
   }
@@ -1362 +1363 @@
  * Forward the DPA local callback to the treeview owner callback
  */
-static INT WINAPI TREEVIEW_CallBackCompare( 
-  LPVOID first, 
-  LPVOID second, 
+static INT WINAPI TREEVIEW_CallBackCompare(
+  LPVOID first,
+  LPVOID second,
   LPARAM tvInfoPtr)
 {
@@ -1380 +1381 @@
  */
 LRESULT WINAPI TREEVIEW_SortChildrenCB(
-  HWND   hwnd, 
-  WPARAM wParam, 
+  HWND   hwnd,
+  WPARAM wParam,
   LPARAM lParam)
 {
@@ -1390 +1391 @@
   infoPtr->pCallBackSort = (LPTVSORTCB)lParam;
 
-  /* Obtain the parent node to sort */  
+  /* Obtain the parent node to sort */
   sortMe = &infoPtr->items[ (INT)infoPtr->pCallBackSort->hParent ];
 
   /* Make sure there is something to sort */
-  if ( sortMe->cChildren > 1 ) 
+  if ( sortMe->cChildren > 1 )
   {
     /* pointer organization */
@@ -1408 +1409 @@
 
     /* Build the list of item to sort */
-    do 
+    do
     {
       DPA_InsertPtr(
         sortList,              /* the list */
         sortMe->cChildren+1,   /* force the insertion to be an append */
-        itemPtr);              /* the ptr to store */   
+        itemPtr);              /* the ptr to store */
 
       /* Get the next sibling */
@@ -1422 +1423 @@
     /* let DPA perform the sort activity */
     DPA_Sort(
-      sortList,                  /* what  */ 
+      sortList,                  /* what  */
       TREEVIEW_CallBackCompare,  /* how   */
       hwnd);                     /* owner */
 
-    /* 
-     * Reorganized TREEVIEW_ITEM structures. 
+    /*
+     * Reorganized TREEVIEW_ITEM structures.
      * Note that we know we have at least two elements.
      */
 
     /* Get the first item and get ready to start... */
-    item = DPA_GetPtr(sortList, count++);    
+    item = DPA_GetPtr(sortList, count++);
     while ( (nextItem = DPA_GetPtr(sortList, count++)) != NULL )
     {
@@ -1450 +1451 @@
 
       /* get ready for the next one */
-      prevItem = item; 
+      prevItem = item;
       item     = nextItem;
     }
 
     /* the last item is pointed to by item and never has a sibling */
-    ((TREEVIEW_ITEM*)item)->sibling = NULL; 
+    ((TREEVIEW_ITEM*)item)->sibling = NULL;
 
     DPA_Destroy(sortList);
@@ -1465 +1466 @@
 
 
-/* the method used below isn't the most memory-friendly, but it avoids 
-   a lot of memory reallocations */ 
+/* the method used below isn't the most memory-friendly, but it avoids
+   a lot of memory reallocations */
 
 /* BTW: we waste handle 0; 0 is not an allowed handle. */
@@ -1476 +1477 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
   TVINSERTSTRUCTA  *ptdi;
-  TVITEMEXA     *tvItem;
+  TVITEMEXA     *tvItem;
   TREEVIEW_ITEM *wineItem, *parentItem, *prevsib, *sibItem;
-  INT           iItem,listItems,i,len;
- 
+  INT           iItem,listItems,i,len;
+
   /* Item to insert */
   ptdi = (LPTVINSERTSTRUCTA) lParam;
 
-        /* check if memory is available */
+        /* check if memory is available */
 
   if (infoPtr->uNumPtrsAlloced==0) {
@@ -1489 +1490 @@
         infoPtr->freeList= COMCTL32_Alloc ((1+(TVITEM_ALLOC>>5)) * sizeof (INT));
         infoPtr->uNumPtrsAlloced=TVITEM_ALLOC;
-        infoPtr->TopRootItem=(HTREEITEM)1;
+        infoPtr->TopRootItem=(HTREEITEM)1;
    }
 
-  /* 
-   * Reallocate contiguous space for items 
+  /*
+   * Reallocate contiguous space for items
    */
   if (infoPtr->uNumItems == (infoPtr->uNumPtrsAlloced-1) ) {
-        TREEVIEW_ITEM *oldItems = infoPtr->items;
-        INT *oldfreeList = infoPtr->freeList;
-
-        infoPtr->uNumPtrsAlloced*=2;
+        TREEVIEW_ITEM *oldItems = infoPtr->items;
+        INT *oldfreeList = infoPtr->freeList;
+
+        infoPtr->uNumPtrsAlloced*=2;
     infoPtr->items = COMCTL32_Alloc (infoPtr->uNumPtrsAlloced*sizeof (TREEVIEW_ITEM));
     infoPtr->freeList= COMCTL32_Alloc ((1+(infoPtr->uNumPtrsAlloced>>5))*sizeof (INT));
@@ -1508 +1509 @@
                     infoPtr->uNumPtrsAlloced>>6 * sizeof(INT));
 
-    COMCTL32_Free (oldItems);  
-    COMCTL32_Free (oldfreeList);  
+    COMCTL32_Free (oldItems);
+    COMCTL32_Free (oldfreeList);
    }
 
-  /* 
+  /*
    * Reset infoPtr structure with new stat according to current TV picture
    */
   iItem=0;
   infoPtr->uNumItems++;
-  if ((INT)infoPtr->uMaxHandle==(infoPtr->uNumItems-1))  { 
-        iItem=infoPtr->uNumItems;
-        infoPtr->uMaxHandle = (HTREEITEM)((INT)infoPtr->uMaxHandle + 1);
-  } else {                                       /* check freelist */
-        for (i=0; i<infoPtr->uNumPtrsAlloced>>5; i++) {
-                if (infoPtr->freeList[i]) {
+  if ((INT)infoPtr->uMaxHandle==(infoPtr->uNumItems-1))  {
+        iItem=infoPtr->uNumItems;
+        infoPtr->uMaxHandle = (HTREEITEM)((INT)infoPtr->uMaxHandle + 1);
+  } else {                                       /* check freelist */
+        for (i=0; i<infoPtr->uNumPtrsAlloced>>5; i++) {
+                if (infoPtr->freeList[i]) {
 // WHAT IS FFS? NOT IN VAC++ C LIBRARY!!!
-//                      iItem=ffs (infoPtr->freeList[i])-1;
+//                      iItem=ffs (infoPtr->freeList[i])-1;
 //
-                        tv_clear_bit(iItem,&infoPtr->freeList[i]);
-                        iItem+=i<<5;
-                        break;
-                }
-    } 
-  }
-
-//  if (TRACE_ON(treeview)) { 
-//    for (i=0; i<infoPtr->uNumPtrsAlloced>>5; i++) 
-//          TRACE (treeview,"%8x\n",infoPtr->freeList[i]);
+                        tv_clear_bit(iItem,&infoPtr->freeList[i]);
+                        iItem+=i<<5;
+                        break;
+                }
+    }
+  }
+
+//  if (TRACE_ON(treeview)) {
+//    for (i=0; i<infoPtr->uNumPtrsAlloced>>5; i++)
+//          TRACE (treeview,"%8x\n",infoPtr->freeList[i]);
 //  }
 
 //  if (!iItem) ERR (treeview, "Argh -- can't find free item.\n");
 
-  /* 
-   * Find the parent item of the new item 
-   */  
+  /*
+   * Find the parent item of the new item
+   */
   tvItem= & ptdi->DUMMYUNIONNAME.itemex;
   wineItem=& infoPtr->items[iItem];
@@ -1548 +1549 @@
   if ((ptdi->hParent==TVI_ROOT) || (ptdi->hParent==0)) {
     parentItem       = NULL;
-    wineItem->parent = 0; 
+    wineItem->parent = 0;
     sibItem          = &infoPtr->items [(INT)infoPtr->TopRootItem];
     listItems        = infoPtr->uNumItems;
   }
   else  {
-        parentItem = &infoPtr->items[(INT)ptdi->hParent];
-  
+        parentItem = &infoPtr->items[(INT)ptdi->hParent];
+
     /* Do the insertion here it if it's the only item of this parent */
-        if (!parentItem->firstChild) 
-                parentItem->firstChild=(HTREEITEM)iItem;
-  
-        wineItem->parent = ptdi->hParent;
-        sibItem          = &infoPtr->items [(INT)parentItem->firstChild];
-        parentItem->cChildren++;
-        listItems        = parentItem->cChildren;
-  }
-
-  
-  /* NOTE: I am moving some setup of the wineItem object that was initialy 
-   *       done at the end of the function since some of the values are 
-   *       required by the Callback sorting 
+        if (!parentItem->firstChild)
+                parentItem->firstChild=(HTREEITEM)iItem;
+
+        wineItem->parent = ptdi->hParent;
+        sibItem          = &infoPtr->items [(INT)parentItem->firstChild];
+        parentItem->cChildren++;
+        listItems        = parentItem->cChildren;
+  }
+
+
+  /* NOTE: I am moving some setup of the wineItem object that was initialy
+   *       done at the end of the function since some of the values are
+   *       required by the Callback sorting
    */
 
-  if (tvItem->mask & TVIF_TEXT) 
+  if (tvItem->mask & TVIF_TEXT)
   {
     /*
@@ -1577 +1578 @@
      * when the insertion are ordered
      */
-    if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) 
+    if (tvItem->pszText!=LPSTR_TEXTCALLBACKA)
     {
-//      TRACE (treeview,"(%p,%s)\n", &tvItem->pszText, tvItem->pszText); 
+//      TRACE (treeview,"(%p,%s)\n", &tvItem->pszText, tvItem->pszText);
       len = lstrlenA (tvItem->pszText)+1;
       wineItem->pszText= COMCTL32_Alloc (len+1);
@@ -1585 +1586 @@
       wineItem->cchTextMax=len;
     }
-    else 
+    else
     {
 //      TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
@@ -1593 +1594 @@
   }
 
-  if (tvItem->mask & TVIF_PARAM) 
+  if (tvItem->mask & TVIF_PARAM)
     wineItem->lParam=tvItem->lParam;
 
 
-  wineItem->upsibling=0;  /* needed in case we're the first item in a list */ 
-  wineItem->sibling=0;     
+  wineItem->upsibling=0;  /* needed in case we're the first item in a list */
+  wineItem->sibling=0;
   wineItem->firstChild=0;
   wineItem->hItem=(HTREEITEM)iItem;
@@ -1606 +1607 @@
 
      switch ((DWORD) ptdi->hInsertAfter) {
-                case (DWORD) TVI_FIRST: 
-                        if (wineItem->parent) {
-                                wineItem->sibling=parentItem->firstChild;
-                                parentItem->firstChild=(HTREEITEM)iItem;
-                        } else {
-                                wineItem->sibling=infoPtr->TopRootItem;
-                                infoPtr->TopRootItem=(HTREEITEM)iItem;
-                        }
-                        sibItem->upsibling=(HTREEITEM)iItem;
-                        break;
-
-                case (DWORD) TVI_SORT:  
-          if (sibItem==wineItem) 
-        /* 
-         * This item is the first child of the level and it 
-         * has already been inserted 
-         */                
-        break; 
+                case (DWORD) TVI_FIRST:
+                        if (wineItem->parent) {
+                                wineItem->sibling=parentItem->firstChild;
+                                parentItem->firstChild=(HTREEITEM)iItem;
+                        } else {
+                                wineItem->sibling=infoPtr->TopRootItem;
+                                infoPtr->TopRootItem=(HTREEITEM)iItem;
+                        }
+                        sibItem->upsibling=(HTREEITEM)iItem;
+                        break;
+
+                case (DWORD) TVI_SORT:
+          if (sibItem==wineItem)
+        /*
+         * This item is the first child of the level and it
+         * has already been inserted
+         */
+        break;
       else
       {
-        TREEVIEW_ITEM *aChild        = 
+        TREEVIEW_ITEM *aChild        =
           &infoPtr->items[(INT)parentItem->firstChild];
-  
+
         TREEVIEW_ITEM *previousChild = NULL;
         BOOL bItemInserted           = FALSE;
-  
+
         /* Iterate the parent children to see where we fit in */
         while ( aChild != NULL )
@@ -1648 +1649 @@
                         ? NULL               /* if there is no more sibling */
                         : &infoPtr->items[(INT)aChild->sibling];
-  
+
             /* Look at the next item */
             continue;
@@ -1654 +1655 @@
           else if ( comp == 0 )
           {
-            /* 
-             * An item with this name is already existing, therefore,  
-             * we add after the one we found 
+            /*
+             * An item with this name is already existing, therefore,
+             * we add after the one we found
              */
             TREEVIEW_InsertAfter(infoPtr, wineItem, aChild, parentItem);
@@ -1663 +1664 @@
           }
         }
-      
-        /* 
+
+        /*
          * we reach the end of the child list and the item as not
          * yet been inserted, therefore, insert it after the last child.
@@ -1670 +1671 @@
         if ( (! bItemInserted ) && (aChild == NULL) )
           TREEVIEW_InsertAfter(infoPtr, wineItem, previousChild, parentItem);
-  
+
         break;
       }
 
 
-                case (DWORD) TVI_LAST:  
-                        if (sibItem==wineItem) break;
-                        while (sibItem->sibling) {
-                                prevsib=sibItem;
-                                sibItem=&infoPtr->items [(INT)sibItem->sibling];
-                        }
-                        sibItem->sibling=(HTREEITEM)iItem;
-                        wineItem->upsibling=sibItem->hItem;
-                        break;
-                default:
-                        while ((sibItem->sibling) && (sibItem->hItem!=ptdi->hInsertAfter))
-                                {
-                                prevsib=sibItem;
+                case (DWORD) TVI_LAST:
+                        if (sibItem==wineItem) break;
+                        while (sibItem->sibling) {
+                                prevsib=sibItem;
+                                sibItem=&infoPtr->items [(INT)sibItem->sibling];
+                        }
+                        sibItem->sibling=(HTREEITEM)iItem;
+                        wineItem->upsibling=sibItem->hItem;
+                        break;
+                default:
+                        while ((sibItem->sibling) && (sibItem->hItem!=ptdi->hInsertAfter))
+                                {
+                                prevsib=sibItem;
                 sibItem=&infoPtr->items [(INT)sibItem->sibling];
               }
-                        if (sibItem->hItem!=ptdi->hInsertAfter) {
-//                       ERR (treeview, "tried to insert item after nonexisting handle.\n");
-                         break;
-                        }
-                        prevsib=sibItem;
-                        if (sibItem->sibling) {
-                sibItem=&infoPtr->items [(INT)sibItem->sibling];
-                                sibItem->upsibling=(HTREEITEM)iItem;
-                                wineItem->sibling=sibItem->hItem;
-                        }
-                        prevsib->sibling=(HTREEITEM)iItem;
-                        wineItem->upsibling=prevsib->hItem;
-                        break;
-        }
-   }    
+                        if (sibItem->hItem!=ptdi->hInsertAfter) {
+//                       ERR (treeview, "tried to insert item after nonexisting handle.\n");
+                         break;
+                        }
+                        prevsib=sibItem;
+                        if (sibItem->sibling) {
+                sibItem=&infoPtr->items [(INT)sibItem->sibling];
+                                sibItem->upsibling=(HTREEITEM)iItem;
+                                wineItem->sibling=sibItem->hItem;
+                        }
+                        prevsib->sibling=(HTREEITEM)iItem;
+                        wineItem->upsibling=prevsib->hItem;
+                        break;
+        }
+   }
 
 
 /* Fill in info structure */
 
-//   TRACE (treeview,"new item %d; parent %d, mask %x\n", iItem, 
-//                      (INT)wineItem->parent,tvItem->mask);
+//   TRACE (treeview,"new item %d; parent %d, mask %x\n", iItem,
+//                      (INT)wineItem->parent,tvItem->mask);
 
    wineItem->mask=tvItem->mask;
-   wineItem->iIntegral=1; 
+   wineItem->iIntegral=1;
 
    if (tvItem->mask & TVIF_CHILDREN) {
-         wineItem->cChildren=tvItem->cChildren;
-//       if (tvItem->cChildren==I_CHILDRENCALLBACK) 
-//                      FIXME (treeview," I_CHILDRENCALLBACK not supported\n");
-        }
+         wineItem->cChildren=tvItem->cChildren;
+//       if (tvItem->cChildren==I_CHILDRENCALLBACK)
+//                      FIXME (treeview," I_CHILDRENCALLBACK not supported\n");
+        }
 
   wineItem->expandBox.left   = 0; /* Initialize the expandBox */
@@ -1726 +1727 @@
   wineItem->expandBox.bottom = 0;
 
-   if (tvItem->mask & TVIF_IMAGE) 
-        wineItem->iImage=tvItem->iImage;
-
-                /* If the application sets TVIF_INTEGRAL without
-                        supplying a TVITEMEX structure, it's toast */
-
-   if (tvItem->mask & TVIF_INTEGRAL) 
-                wineItem->iIntegral=tvItem->iIntegral;   
-
-   if (tvItem->mask & TVIF_SELECTEDIMAGE) 
-        wineItem->iSelectedImage=tvItem->iSelectedImage;
+   if (tvItem->mask & TVIF_IMAGE)
+        wineItem->iImage=tvItem->iImage;
+
+                /* If the application sets TVIF_INTEGRAL without
+                        supplying a TVITEMEX structure, it's toast */
+
+   if (tvItem->mask & TVIF_INTEGRAL)
+                wineItem->iIntegral=tvItem->iIntegral;
+
+   if (tvItem->mask & TVIF_SELECTEDIMAGE)
+        wineItem->iSelectedImage=tvItem->iSelectedImage;
 
    if (tvItem->mask & TVIF_STATE) {
-//     TRACE(treeview, "Changing item state from %d to %d\n", 
-//       wineItem->state, 
+//     TRACE(treeview, "Changing item state from %d to %d\n",
+//       wineItem->state,
 //       tvItem->state);
-        wineItem->state=tvItem->state;
-        wineItem->stateMask=tvItem->stateMask;
+        wineItem->state=tvItem->state;
+        wineItem->stateMask=tvItem->stateMask;
    }
 
@@ -1767 +1768 @@
 
   if (lParam == (INT)TVI_ROOT) {
-        TREEVIEW_RemoveTree (hwnd);
+        TREEVIEW_RemoveTree (hwnd);
   } else {
-        iItem= (INT) lParam;
-        wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
-        if (!wineItem) return FALSE;
+        iItem= (INT) lParam;
+        wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
+        if (!wineItem) return FALSE;
 //    TRACE (treeview,"%s\n",wineItem->pszText);
-        TREEVIEW_RemoveItem (hwnd, wineItem);
+        TREEVIEW_RemoveItem (hwnd, wineItem);
   }
 
@@ -1797 +1798 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
   INT newIndent;
-   
+
 //  TRACE (treeview,"\n");
   newIndent=(INT) wParam;
   if (newIndent < MINIMUM_INDENT) newIndent=MINIMUM_INDENT;
   infoPtr->uIndent=newIndent;
-  
+
   return 0;
 }
@@ -1842 +1843 @@
 
 LRESULT CALLBACK
-TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, 
-                                                        LPARAM lParam)
-{
-  switch (uMsg) 
+TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam,
+                                                        LPARAM lParam)
+{
+  switch (uMsg)
   {
-    case WM_ERASEBKGND: 
+    case WM_ERASEBKGND:
     {
       RECT rc;
@@ -1879 +1880 @@
 {
 //  TRACE (treeview, "%x %ld\n",wParam, lParam);
- 
-  switch (HIWORD(wParam)) 
+
+  switch (HIWORD(wParam))
   {
-                case EN_UPDATE:
+                case EN_UPDATE:
     {
-      /* 
-       * Adjust the edit window size 
+      /*
+       * Adjust the edit window size
        */
       TREEVIEW_INFO *infoPtr  = TREEVIEW_GetInfoPtr(hwnd);
@@ -1896 +1897 @@
       {
         LONG newWidth = (iLength * tm.tmAveCharWidth) + 15;
-            
-                SetWindowPos ( 
+
+                SetWindowPos (
           infoPtr->hwndEdit,
-          HWND_TOP, 
-          editItem->text.left - 2, 
+          HWND_TOP,
+          editItem->text.left - 2,
           editItem->text.top  - 1,
           newWidth,
@@ -1912 +1913 @@
 
     case EN_KILLFOCUS:
-/*      TREEVIEW_EndEditLabelNow(hwnd, (WPARAM)FALSE, 0); 
+/*      TREEVIEW_EndEditLabelNow(hwnd, (WPARAM)FALSE, 0);
 */
       break;
@@ -1929 +1930 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
 
-  if (infoPtr->bAutoSize) 
+  if (infoPtr->bAutoSize)
   {
     infoPtr->bAutoSize = FALSE;
@@ -1936 +1937 @@
   infoPtr->bAutoSize = TRUE;
 
-  if (wParam == SIZE_RESTORED)  
+  if (wParam == SIZE_RESTORED)
   {
     infoPtr->uTotalWidth  = LOWORD (lParam);
-        infoPtr->uTotalHeight = HIWORD (lParam);
+        infoPtr->uTotalHeight = HIWORD (lParam);
   } else {
-//      FIXME (treeview,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
+//      FIXME (treeview,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
   }
 
@@ -1956 +1957 @@
 
 //  TRACE (treeview,"(%x %lx)\n",wParam,lParam);
-  
-  if (wParam & (GWL_STYLE)) 
-         SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
-  if (wParam & (GWL_EXSTYLE)) 
-         SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
+
+  if (wParam & (GWL_STYLE))
+         SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
+  if (wParam & (GWL_EXSTYLE))
+         SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
 
   return 0;
@@ -1969 +1970 @@
 {
     TREEVIEW_INFO *infoPtr;
-        LOGFONTA logFont;
+        LOGFONTA logFont;
     TEXTMETRICA tm;
-        HDC hdc;
-  
+        HDC hdc;
+
 //    TRACE (treeview,"wnd %x\n",hwnd);
       /* allocate memory for info structure */
@@ -1980 +1981 @@
 
     if (infoPtr == NULL) {
-//              ERR (treeview, "could not allocate info memory!\n");
-                return 0;
+//              ERR (treeview, "could not allocate info memory!\n");
+                return 0;
     }
 
     if ((TREEVIEW_INFO*) GetWindowLongA( hwnd, 0) != infoPtr) {
-//              ERR (treeview, "pointer assignment error!\n");
-                return 0;
+//              ERR (treeview, "pointer assignment error!\n");
+                return 0;
     }
 
-        hdc=GetDC (hwnd);
+        hdc=GetDC (hwnd);
 
     /* set default settings */
@@ -2001 +2002 @@
     infoPtr->himlNormal = NULL;
     infoPtr->himlState = NULL;
-        infoPtr->uItemHeight = -1;
+        infoPtr->uItemHeight = -1;
     GetTextMetricsA (hdc, &tm);
     infoPtr->hFont = GetStockObject (DEFAULT_GUI_FONT);
-        GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
-        logFont.lfWeight=FW_BOLD;
+        GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
+        logFont.lfWeight=FW_BOLD;
     infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
-    
+
     infoPtr->items = NULL;
     infoPtr->selectedItem=0;
-    infoPtr->clrText=-1;        /* use system color */
+    infoPtr->clrText=-1;        /* use system color */
     infoPtr->dropItem=0;
     infoPtr->pCallBackSort=NULL;
@@ -2019 +2020 @@
 */
 
-        infoPtr->hwndToolTip=0;
+        infoPtr->hwndToolTip=0;
     if (!( GetWindowLongA( hwnd, GWL_STYLE) & TVS_NOTOOLTIPS)) {   /* Create tooltip control */
-                TTTOOLINFOA ti;
-
-                infoPtr->hwndToolTip =  
-                        CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                TTTOOLINFOA ti;
+
+                infoPtr->hwndToolTip =
+                        CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
                    CW_USEDEFAULT, CW_USEDEFAULT,
                    CW_USEDEFAULT, CW_USEDEFAULT,
@@ -2042 +2043 @@
         }
 
-                ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+                ZeroMemory (&ti, sizeof(TTTOOLINFOA));
         ti.cbSize   = sizeof(TTTOOLINFOA);
         ti.uFlags   = TTF_IDISHWND | TTF_TRACK | TTF_TRANSPARENT ;
@@ -2053 +2054 @@
     }
 
-        infoPtr->hwndEdit = CreateWindowExA ( 
-                          WS_EX_LEFT, 
+        infoPtr->hwndEdit = CreateWindowExA (
+                          WS_EX_LEFT,
                           "EDIT",
                           0,
-                          WS_CHILD | WS_BORDER | ES_AUTOHSCROLL | 
+                          WS_CHILD | WS_BORDER | ES_AUTOHSCROLL |
                           ES_WANTRETURN | ES_LEFT,
                           0, 0, 0, 0,
-                          hwnd, 
+                          hwnd,
                           0,0,0); /* FIXME: (HMENU)IDTVEDIT,pcs->hInstance,0);*/
 
   SendMessageA ( infoPtr->hwndEdit, WM_SETFONT, infoPtr->hFont, FALSE);
-        infoPtr->wpEditOrig = (WNDPROC)SetWindowLongA (
+        infoPtr->wpEditOrig = (WNDPROC)SetWindowLongA (
                                     infoPtr->hwndEdit,
-                                    GWL_WNDPROC, 
-                                                                (LONG) TREEVIEW_Edit_SubclassProc);
+                                    GWL_WNDPROC,
+                                                                (LONG) TREEVIEW_Edit_SubclassProc);
 
   ReleaseDC (hwnd, hdc);
@@ -2075 +2076 @@
 
 
-static LRESULT 
-TREEVIEW_Destroy (HWND hwnd) 
+static LRESULT
+TREEVIEW_Destroy (HWND hwnd)
 {
    TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-     
+
 //   TRACE (treeview,"\n");
    TREEVIEW_RemoveTree (hwnd);
-   if (infoPtr->Timer & TV_REFRESH_TIMER_SET) 
+   if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
         KillTimer (hwnd, TV_REFRESH_TIMER);
-   if (infoPtr->hwndToolTip) 
-                DestroyWindow (infoPtr->hwndToolTip);
+   if (infoPtr->hwndToolTip)
+                DestroyWindow (infoPtr->hwndToolTip);
 
    COMCTL32_Free (infoPtr);
@@ -2104 +2105 @@
         EndPaint (hwnd, &ps);
 //    TRACE (treeview,"done\n");
-      
+
     return DefWindowProcA (hwnd, WM_PAINT, wParam, lParam);
 }
@@ -2142 +2143 @@
 
 
-  
+
 /* Notifications */
 
-  
+
 
 
@@ -2166 +2167 @@
 
 static BOOL
-TREEVIEW_SendTreeviewNotify (HWND hwnd, UINT code, UINT action, 
-                        HTREEITEM oldItem, HTREEITEM newItem)
+TREEVIEW_SendTreeviewNotify (HWND hwnd, UINT code, UINT action,
+                        HTREEITEM oldItem, HTREEITEM newItem)
 
 {
@@ -2175 +2176 @@
 
 //  TRACE (treeview,"code:%x action:%x olditem:%x newitem:%x\n",
-//                code,action,(INT)oldItem,(INT)newItem);
+//                code,action,(INT)oldItem,(INT)newItem);
   nmhdr.hdr.hwndFrom = hwnd;
   nmhdr.hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
@@ -2181 +2182 @@
   nmhdr.action = action;
   if (oldItem) {
-        wineItem=& infoPtr->items[(INT)oldItem];
-        nmhdr.itemOld.mask              = wineItem->mask;
-        nmhdr.itemOld.hItem             = wineItem->hItem;
-        nmhdr.itemOld.state             = wineItem->state;
-        nmhdr.itemOld.stateMask = wineItem->stateMask;
-        nmhdr.itemOld.iImage    = wineItem->iImage;
-        nmhdr.itemOld.pszText   = wineItem->pszText;
-        nmhdr.itemOld.cchTextMax= wineItem->cchTextMax;
-        nmhdr.itemOld.iImage    = wineItem->iImage;
-        nmhdr.itemOld.iSelectedImage    = wineItem->iSelectedImage;
-        nmhdr.itemOld.cChildren = wineItem->cChildren;
-        nmhdr.itemOld.lParam    = wineItem->lParam;
+        wineItem=& infoPtr->items[(INT)oldItem];
+        nmhdr.itemOld.mask              = wineItem->mask;
+        nmhdr.itemOld.hItem             = wineItem->hItem;
+        nmhdr.itemOld.state             = wineItem->state;
+        nmhdr.itemOld.stateMask = wineItem->stateMask;
+        nmhdr.itemOld.iImage    = wineItem->iImage;
+        nmhdr.itemOld.pszText   = wineItem->pszText;
+        nmhdr.itemOld.cchTextMax= wineItem->cchTextMax;
+        nmhdr.itemOld.iImage    = wineItem->iImage;
+        nmhdr.itemOld.iSelectedImage    = wineItem->iSelectedImage;
+        nmhdr.itemOld.cChildren = wineItem->cChildren;
+        nmhdr.itemOld.lParam    = wineItem->lParam;
   }
 
   if (newItem) {
-        wineItem=& infoPtr->items[(INT)newItem];
-        nmhdr.itemNew.mask              = wineItem->mask;
-        nmhdr.itemNew.hItem             = wineItem->hItem;
-        nmhdr.itemNew.state             = wineItem->state;
-        nmhdr.itemNew.stateMask = wineItem->stateMask;
-        nmhdr.itemNew.iImage    = wineItem->iImage;
-        nmhdr.itemNew.pszText   = wineItem->pszText;
-        nmhdr.itemNew.cchTextMax= wineItem->cchTextMax;
-        nmhdr.itemNew.iImage    = wineItem->iImage;
-        nmhdr.itemNew.iSelectedImage    = wineItem->iSelectedImage;
-        nmhdr.itemNew.cChildren = wineItem->cChildren;
-        nmhdr.itemNew.lParam    = wineItem->lParam;
+        wineItem=& infoPtr->items[(INT)newItem];
+        nmhdr.itemNew.mask              = wineItem->mask;
+        nmhdr.itemNew.hItem             = wineItem->hItem;
+        nmhdr.itemNew.state             = wineItem->state;
+        nmhdr.itemNew.stateMask = wineItem->stateMask;
+        nmhdr.itemNew.iImage    = wineItem->iImage;
+        nmhdr.itemNew.pszText   = wineItem->pszText;
+        nmhdr.itemNew.cchTextMax= wineItem->cchTextMax;
+        nmhdr.itemNew.iImage    = wineItem->iImage;
+        nmhdr.itemNew.iSelectedImage    = wineItem->iSelectedImage;
+        nmhdr.itemNew.cChildren = wineItem->cChildren;
+        nmhdr.itemNew.lParam    = wineItem->lParam;
   }
 
@@ -2219 +2220 @@
 
 static BOOL
-TREEVIEW_SendTreeviewDnDNotify (HWND hwnd, UINT code, HTREEITEM dragItem, 
-                                                                POINT pt)
+TREEVIEW_SendTreeviewDnDNotify (HWND hwnd, UINT code, HTREEITEM dragItem,
+                                                                POINT pt)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2233 +2234 @@
   nmhdr.action = 0;
   wineItem=& infoPtr->items[(INT)dragItem];
-  nmhdr.itemNew.mask    = wineItem->mask;
-  nmhdr.itemNew.hItem   = wineItem->hItem;
-  nmhdr.itemNew.state   = wineItem->state;
-  nmhdr.itemNew.lParam  = wineItem->lParam;
+  nmhdr.itemNew.mask    = wineItem->mask;
+  nmhdr.itemNew.hItem   = wineItem->hItem;
+  nmhdr.itemNew.state   = wineItem->state;
+  nmhdr.itemNew.lParam  = wineItem->lParam;
 
   nmhdr.ptDrag.x = pt.x;
@@ -2249 +2250 @@
 
 static BOOL
-TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem, 
-                                                                UINT code, UINT what)
+TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem,
+                                                                UINT code, UINT what)
 {
   NMTVDISPINFOA tvdi;
@@ -2261 +2262 @@
 //    (INT)wineItem->state);
 
-  tvdi.hdr.hwndFrom     = hwnd;
-  tvdi.hdr.idFrom       =  GetWindowLongA( hwnd, GWL_ID);
-  tvdi.hdr.code         = code;
-  tvdi.item.mask        = what;
-  tvdi.item.hItem       = wineItem->hItem;
-  tvdi.item.state       = wineItem->state;
-  tvdi.item.lParam      = wineItem->lParam;
+  tvdi.hdr.hwndFrom     = hwnd;
+  tvdi.hdr.idFrom       =  GetWindowLongA( hwnd, GWL_ID);
+  tvdi.hdr.code         = code;
+  tvdi.item.mask        = what;
+  tvdi.item.hItem       = wineItem->hItem;
+  tvdi.item.state       = wineItem->state;
+  tvdi.item.lParam      = wineItem->lParam;
   tvdi.item.pszText = COMCTL32_Alloc (128*sizeof(char));
   buf = tvdi.item.pszText;
 
   retval=(BOOL)SendMessageA (
-                  GetParent(hwnd), 
+                  GetParent(hwnd),
                   WM_NOTIFY,
-                  (WPARAM)tvdi.hdr.idFrom, 
+                  (WPARAM)tvdi.hdr.idFrom,
                   (LPARAM)&tvdi);
 
   if (what & TVIF_TEXT) {
-                wineItem->pszText        = tvdi.item.pszText;
-                if (buf==tvdi.item.pszText) {
-                        wineItem->cchTextMax = 128;
-                } else { 
-//                      TRACE (treeview,"user-supplied buffer\n");
-                        COMCTL32_Free (buf);
-                        wineItem->cchTextMax = 0;
-                }
-        }
-  if (what & TVIF_SELECTEDIMAGE) 
-                wineItem->iSelectedImage = tvdi.item.iSelectedImage;
-  if (what & TVIF_IMAGE) 
-                wineItem->iImage         = tvdi.item.iImage;
-  if (what & TVIF_CHILDREN) 
-                wineItem->cChildren      = tvdi.item.cChildren;
+                wineItem->pszText        = tvdi.item.pszText;
+                if (buf==tvdi.item.pszText) {
+                        wineItem->cchTextMax = 128;
+                } else {
+//                      TRACE (treeview,"user-supplied buffer\n");
+                        COMCTL32_Free (buf);
+                        wineItem->cchTextMax = 0;
+                }
+        }
+  if (what & TVIF_SELECTEDIMAGE)
+                wineItem->iSelectedImage = tvdi.item.iSelectedImage;
+  if (what & TVIF_IMAGE)
+                wineItem->iImage         = tvdi.item.iImage;
+  if (what & TVIF_CHILDREN)
+                wineItem->cChildren      = tvdi.item.cChildren;
 
  return retval;
@@ -2301 +2302 @@
 static BOOL
 TREEVIEW_SendCustomDrawNotify (HWND hwnd, DWORD dwDrawStage, HDC hdc,
-                        RECT rc)
+                        RECT rc)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2314 +2315 @@
   nmcd->hdr.code   = NM_CUSTOMDRAW;
   nmcd->dwDrawStage= dwDrawStage;
-  nmcd->hdc                = hdc;
+  nmcd->hdc                = hdc;
   nmcd->rc.left    = rc.left;
   nmcd->rc.right   = rc.right;
@@ -2337 +2338 @@
 static BOOL
 TREEVIEW_SendCustomDrawItemNotify (HWND hwnd, HDC hdc,
-                        TREEVIEW_ITEM *wineItem, UINT uItemDrawState)
+                        TREEVIEW_ITEM *wineItem, UINT uItemDrawState)
 {
  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2344 +2345 @@
  DWORD dwDrawStage,dwItemSpec;
  UINT uItemState;
- 
+
  dwDrawStage=CDDS_ITEM | uItemDrawState;
  dwItemSpec=(DWORD)wineItem->hItem;
  uItemState=0;
  if (wineItem->hItem==infoPtr->selectedItem) uItemState|=CDIS_SELECTED;
- if (wineItem->hItem==infoPtr->focusItem)        uItemState|=CDIS_FOCUS;
+ if (wineItem->hItem==infoPtr->focusItem)        uItemState|=CDIS_FOCUS;
  if (wineItem->hItem==infoPtr->hotItem)      uItemState|=CDIS_HOT;
 
@@ -2357 +2358 @@
  nmcd->hdr.code   = NM_CUSTOMDRAW;
  nmcd->dwDrawStage= dwDrawStage;
- nmcd->hdc                = hdc;
+ nmcd->hdc                = hdc;
  nmcd->rc.left    = wineItem->rect.left;
  nmcd->rc.right   = wineItem->rect.right;
@@ -2371 +2372 @@
 
 // TRACE (treeview,"drawstage:%lx hdc:%x item:%lx, itemstate:%x\n",
-//                dwDrawStage, hdc, dwItemSpec, uItemState);
+//                dwDrawStage, hdc, dwItemSpec, uItemState);
 
  return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
@@ -2380 +2381 @@
 
 /* Note:If the specified item is the child of a collapsed parent item,
-   the parent's list of child items is (recursively) expanded to reveal the 
-   specified item. This is mentioned for TREEVIEW_SelectItem; don't 
+   the parent's list of child items is (recursively) expanded to reveal the
+   specified item. This is mentioned for TREEVIEW_SelectItem; don't
    know if it also applies here.
 */
@@ -2392 +2393 @@
   UINT flag;
   INT expand;
-  
+
   flag = (UINT) wParam;
   expand = (INT) lParam;
@@ -2398 +2399 @@
   wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)expand);
 
-  if (!wineItem) 
+  if (!wineItem)
     return 0;
-  if (!wineItem->cChildren) 
+  if (!wineItem->cChildren)
     return 0;
 
-//  TRACE (treeview,"For (%s) flags:%x item:%d state:%d\n", 
+//  TRACE (treeview,"For (%s) flags:%x item:%d state:%d\n",
 //    wineItem->pszText,
-//    flag, 
+//    flag,
 //    expand,
 //    wineItem->state);
@@ -2416 +2417 @@
   if (flag == TVE_TOGGLE) {    /* FIXME: check exact behaviour here */
    flag &= ~TVE_TOGGLE;    /* ie: bitwise ops or 'case' ops */
-   if (wineItem->state & TVIS_EXPANDED) 
+   if (wineItem->state & TVIS_EXPANDED)
      flag |= TVE_COLLAPSE;
    else
@@ -2422 +2423 @@
   }
 
-  switch (flag) 
+  switch (flag)
   {
-    case TVE_COLLAPSERESET: 
+    case TVE_COLLAPSERESET:
 //      TRACE(treeview, "  case TVE_COLLAPSERESET\n");
-      if (!wineItem->state & TVIS_EXPANDED) 
+      if (!wineItem->state & TVIS_EXPANDED)
         return 0;
 
@@ -2433 +2434 @@
        break;
 
-    case TVE_COLLAPSE: 
+    case TVE_COLLAPSE:
 //      TRACE(treeview, "  case TVE_COLLAPSE\n");
-      if (!wineItem->state & TVIS_EXPANDED) 
+      if (!wineItem->state & TVIS_EXPANDED)
         return 0;
 
@@ -2441 +2442 @@
       break;
 
-    case TVE_EXPAND: 
+    case TVE_EXPAND:
 //      TRACE(treeview, "  case TVE_EXPAND\n");
-      if (wineItem->state & TVIS_EXPANDED) 
+      if (wineItem->state & TVIS_EXPANDED)
         return 0;
 
 //      TRACE(treeview, "  is not expanded...\n");
-     
-      if (!(wineItem->state & TVIS_EXPANDEDONCE))  
-      { 
+
+      if (!(wineItem->state & TVIS_EXPANDEDONCE))
+      {
 //        TRACE(treeview, "  and has never been expanded...\n");
         wineItem->state |= TVIS_EXPANDED;
@@ -2455 +2456 @@
         /* this item has never been expanded */
         if (TREEVIEW_SendTreeviewNotify (
-              hwnd, 
-              TVN_ITEMEXPANDING, 
-              TVE_EXPAND, 
-              0, 
+              hwnd,
+              TVN_ITEMEXPANDING,
+              TVE_EXPAND,
+              0,
               (HTREEITEM)expand))
         {
 //          TRACE(treeview, "  TVN_ITEMEXPANDING returned TRUE, exiting...\n");
-          return FALSE;   
+          return FALSE;
         }
 
         /* FIXME
          * Since the TVN_ITEMEXPANDING message may has caused the parent to
-         * insert new items which in turn may have cause items placeholder 
-         * reallocation, I reassign the current item pointer so we have 
-         * something valid to work with... 
-         * However, this should not be necessary, 
+         * insert new items which in turn may have cause items placeholder
+         * reallocation, I reassign the current item pointer so we have
+         * something valid to work with...
+         * However, this should not be necessary,
          * investigation required in TREEVIEW_InsertItemA
          */
         wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)expand);
-        if (! wineItem) 
-        { 
-//          ERR(treeview, 
+        if (! wineItem)
+        {
+//          ERR(treeview,
 //            "Catastropic situation, cannot retreive item #%d\n",
 //            expand);
@@ -2486 +2487 @@
 
         TREEVIEW_SendTreeviewNotify (
-          hwnd, 
-          TVN_ITEMEXPANDED, 
-          TVE_EXPAND, 
-          0, 
+          hwnd,
+          TVN_ITEMEXPANDED,
+          TVE_EXPAND,
+          0,
           (HTREEITEM)expand);
 
@@ -2510 +2511 @@
   }
 
-//  TRACE(treeview, "Exiting, Item %d state is now %d...\n", 
-//    expand, 
+//  TRACE(treeview, "Exiting, Item %d state is now %d...\n",
+//    expand,
 //    wineItem->state);
-  
+
   TREEVIEW_QueueRefresh (hwnd);
   return TRUE;
@@ -2535 +2536 @@
  while ((wineItem!=NULL) && (pt.y > wineItem->rect.bottom))
        wineItem=TREEVIEW_GetNextListItem (infoPtr,wineItem);
-        
- if (!wineItem) 
-        return NULL;
+
+ if (!wineItem)
+        return NULL;
 
  return wineItem;
@@ -2568 +2569 @@
 
   wineItem=TREEVIEW_HitTestPoint (hwnd, lpht->pt);
-  if (!wineItem) {  
+  if (!wineItem) {
     lpht->flags=TVHT_NOWHERE;
     return 0;
@@ -2574 +2575 @@
 
   /* FIXME: implement other flags
-   * Assign the appropriate flags depending on the click location 
-   * Intitialize flags before to "|=" it... 
+   * Assign the appropriate flags depending on the click location
+   * Intitialize flags before to "|=" it...
    */
   lpht->flags=0;
 
-  if (x < wineItem->expandBox.left) 
+  if (x < wineItem->expandBox.left)
   {
     lpht->flags |= TVHT_ONITEMINDENT;
-  } 
-  else if ( ( x >= wineItem->expandBox.left) && 
+  }
+  else if ( ( x >= wineItem->expandBox.left) &&
             ( x <= wineItem->expandBox.right))
   {
     lpht->flags |= TVHT_ONITEMBUTTON;
   }
-  else if (x < wineItem->rect.right) 
+  else if (x < wineItem->rect.right)
   {
-    lpht->flags |= TVHT_ONITEMLABEL;    
-  } 
+    lpht->flags |= TVHT_ONITEMLABEL;
+  }
   else
   {
     lpht->flags|=TVHT_ONITEMRIGHT;
   }
- 
+
   lpht->hItem=wineItem->hItem;
 
@@ -2612 +2613 @@
   if ( ! (BOOL)wParam ) /* wParam is set to true to cancel the edition */
   {
-                if ( TREEVIEW_SendDispInfoNotify(  /* return true to cancel edition */
-           hwnd, 
+                if ( TREEVIEW_SendDispInfoNotify(  /* return true to cancel edition */
+           hwnd,
            editedItem,
-           TVN_ENDLABELEDIT, 
+           TVN_ENDLABELEDIT,
            0))
     {
       bRevert = TRUE;
-      bReturn = FALSE; 
+      bReturn = FALSE;
     }
   }
@@ -2629 +2630 @@
     bReturn      = FALSE;
 
-    if (iLength == 0) 
+    if (iLength == 0)
     {
 //      ERR( treeview, "Problem retreiving new item label.");
@@ -2635 +2636 @@
     else if (iLength >= 1023)
     {
-//      ERR( treeview, 
+//      ERR( treeview,
 //        "Insuficient space to retrieve new item label, new label ignored.");
     }
@@ -2646 +2647 @@
       {
         LPSTR tmpLabel = COMCTL32_Alloc( iLength+1 );
-  
+
 //        if ( tmpLabel == NULL )
-//          ERR( treeview, 
+//          ERR( treeview,
 //            "OutOfMemory, cannot allocate space for label");
 //        else
@@ -2660 +2661 @@
     }
 
-                ShowWindow(infoPtr->hwndEdit, SW_HIDE);
-                EnableWindow(infoPtr->hwndEdit, FALSE);
+                ShowWindow(infoPtr->hwndEdit, SW_HIDE);
+                EnableWindow(infoPtr->hwndEdit, FALSE);
     infoPtr->editItem = 0;
   }
@@ -2684 +2685 @@
   if (!wineItem) return 0;
 //  TRACE (treeview,"item %d \n",(INT)wineItem->hItem);
- 
+
   if (TREEVIEW_SendSimpleNotify (hwnd, NM_DBLCLK)!=TRUE) {     /* FIXME!*/
-        TREEVIEW_Expand (hwnd, (WPARAM) TVE_TOGGLE, (LPARAM) wineItem->hItem);
+        TREEVIEW_Expand (hwnd, (WPARAM) TVE_TOGGLE, (LPARAM) wineItem->hItem);
  }
  return TRUE;
@@ -2713 +2714 @@
     infoPtr->uInternalStatus|=TV_LDRAG;
   }
-  
+
   return 0;
 }
@@ -2724 +2725 @@
   TREEVIEW_ITEM *editItem;
   TVHITTESTINFO ht;
- 
+
   ht.pt.x = (INT)LOWORD(lParam);
   ht.pt.y = (INT)HIWORD(lParam);
- 
+
 //  TRACE (treeview,"\n");
 
@@ -2736 +2737 @@
   /* Get the item */
   iItem = TREEVIEW_HitTest (hwnd, (LPARAM) &ht);
-  if (!iItem) 
+  if (!iItem)
     return 0;
 
   editItem = TREEVIEW_ValidItem(infoPtr, (HTREEITEM)iItem);
- 
+
   infoPtr->uInternalStatus &= ~(TV_LDRAG | TV_LDRAGGING);
 
-  /* 
-   * If the style allow editing and the node is already selected 
+  /*
+   * If the style allow editing and the node is already selected
    * and the click occured on the item label...
    */
-  if ( ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_EDITLABELS ) && 
+  if ( ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_EDITLABELS ) &&
        ( editItem->state & TVIS_SELECTED ) &&
        ( ht.flags & TVHT_ONITEMLABEL ))
@@ -2753 +2754 @@
     if ( infoPtr->editItem == 0 ) /* If we are not curently editing */
     {
-                if ( TREEVIEW_SendDispInfoNotify(  /* Return true to cancel edition */
-              hwnd, 
-              editItem, 
-              TVN_BEGINLABELEDIT, 
+                if ( TREEVIEW_SendDispInfoNotify(  /* Return true to cancel edition */
+              hwnd,
+              editItem,
+              TVN_BEGINLABELEDIT,
               0))
       {
-        return 0; 
+        return 0;
       }
-  
-//              TRACE(treeview,"Edit started for %s.\n", editItem->pszText);
-                infoPtr->editItem = editItem->hItem;
-  
-                SetWindowPos ( 
-        infoPtr->hwndEdit, 
-        HWND_TOP, 
-        editItem->text.left - 2, 
+
+//              TRACE(treeview,"Edit started for %s.\n", editItem->pszText);
+                infoPtr->editItem = editItem->hItem;
+
+                SetWindowPos (
+        infoPtr->hwndEdit,
+        HWND_TOP,
+        editItem->text.left - 2,
         editItem->text.top  - 1,
         editItem->text.right  - editItem->text.left + 20 ,
         editItem->text.bottom - editItem->text.top  + 3,
         SWP_DRAWFRAME );
-  
-                SetWindowTextA( infoPtr->hwndEdit, editItem->pszText );
+
+                SetWindowTextA( infoPtr->hwndEdit, editItem->pszText );
       SendMessageA  ( infoPtr->hwndEdit, EM_SETSEL, 0, -1 );
-                SetFocus      ( infoPtr->hwndEdit); 
-      ShowWindow    ( infoPtr->hwndEdit, SW_SHOW); 
+                SetFocus      ( infoPtr->hwndEdit);
+      ShowWindow    ( infoPtr->hwndEdit, SW_SHOW);
     }
   }
@@ -2787 +2788 @@
   {
     TREEVIEW_DoSelectItem (
-      hwnd, 
-      TVGN_CARET, 
-      (HTREEITEM)iItem, 
+      hwnd,
+      TVGN_CARET,
+      (HTREEITEM)iItem,
       TVC_BYMOUSE);
   }
@@ -2835 +2836 @@
 
  if (infoPtr->uInternalStatus & TV_LDRAG) {
-        TREEVIEW_SendTreeviewDnDNotify (hwnd, TVN_BEGINDRAG, hotItem->hItem, pt);
-        infoPtr->uInternalStatus &= ~TV_LDRAG;
-        infoPtr->uInternalStatus |= TV_LDRAGGING;
-        infoPtr->dropItem=hotItem->hItem;
-        return 0;
+        TREEVIEW_SendTreeviewDnDNotify (hwnd, TVN_BEGINDRAG, hotItem->hItem, pt);
+        infoPtr->uInternalStatus &= ~TV_LDRAG;
+        infoPtr->uInternalStatus |= TV_LDRAGGING;
+        infoPtr->dropItem=hotItem->hItem;
+        return 0;
  }
 
  if (infoPtr->uInternalStatus & TV_RDRAG) {
-        TREEVIEW_SendTreeviewDnDNotify (hwnd, TVN_BEGINRDRAG, hotItem->hItem, pt);
-        infoPtr->uInternalStatus &= ~TV_RDRAG;
-        infoPtr->uInternalStatus |= TV_RDRAGGING;
-        infoPtr->dropItem=hotItem->hItem;
-        return 0;
+        TREEVIEW_SendTreeviewDnDNotify (hwnd, TVN_BEGINRDRAG, hotItem->hItem, pt);
+        infoPtr->uInternalStatus &= ~TV_RDRAG;
+        infoPtr->uInternalStatus |= TV_RDRAGGING;
+        infoPtr->dropItem=hotItem->hItem;
+        return 0;
  }
- 
+
  return 0;
 }
@@ -2867 +2868 @@
  HFONT hOldFont;
  char    *itemtxt;
- 
+
 // TRACE (treeview,"\n");
  if (!(infoPtr->himlNormal))  return 0;
  dragItem=TREEVIEW_ValidItem (infoPtr, (HTREEITEM) lParam);
- 
+
  if (!dragItem) return 0;
  itemtxt=dragItem->pszText;
@@ -2877 +2878 @@
  hwtop=GetDesktopWindow ();
  htopdc= GetDC (hwtop);
- hdc=CreateCompatibleDC (htopdc); 
- 
+ hdc=CreateCompatibleDC (htopdc);
+
  hOldFont=SelectObject (hdc, infoPtr->hFont);
  GetTextExtentPoint32A (hdc, itemtxt, lstrlenA (itemtxt), &size);
@@ -2924 +2925 @@
   wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)newSelect);
 
-//  TRACE (treeview,"Entering item %d, flag %x, cause %x, state %d\n", 
-//    (INT)newSelect, 
-//    action, 
+//  TRACE (treeview,"Entering item %d, flag %x, cause %x, state %d\n",
+//    (INT)newSelect,
+//    action,
 //    cause,
 //    wineItem->state);
@@ -2932 +2933 @@
   if ( (wineItem) && (wineItem->parent))
   {
-    /* 
-     * If the item has a collapse parent expand the parent so he 
-     * can expose the item 
+    /*
+     * If the item has a collapse parent expand the parent so he
+     * can expose the item
      */
     TREEVIEW_ITEM *parentItem = TREEVIEW_ValidItem (infoPtr, wineItem->parent);
-    if ( !(parentItem->state & TVIS_EXPANDED)) 
+    if ( !(parentItem->state & TVIS_EXPANDED))
       TREEVIEW_Expand (hwnd, TVE_EXPAND, (LPARAM) wineItem->parent);
   }
 
-  switch (action) 
+  switch (action)
   {
-    case TVGN_CARET: 
+    case TVGN_CARET:
       prevSelect=(INT)infoPtr->selectedItem;
 
-      if ((HTREEITEM)prevSelect==newSelect) 
+      if ((HTREEITEM)prevSelect==newSelect)
         return FALSE;
 
       prevItem= TREEVIEW_ValidItem (infoPtr, (HTREEITEM)prevSelect);
 
-      if (newSelect) 
+      if (newSelect)
         if (TREEVIEW_SendTreeviewNotify(
-              hwnd, 
-              TVN_SELCHANGING, 
-              cause, 
-              (HTREEITEM)prevSelect, 
-              (HTREEITEM)newSelect)) 
+              hwnd,
+              TVN_SELCHANGING,
+              cause,
+              (HTREEITEM)prevSelect,
+              (HTREEITEM)newSelect))
           return FALSE;       /* FIXME: OK? */
-    
-      if (prevItem) 
+
+      if (prevItem)
         prevItem->state &= ~TVIS_SELECTED;
-      if (wineItem) 
+      if (wineItem)
         wineItem->state |=  TVIS_SELECTED;
 
@@ -2968 +2969 @@
 
       TREEVIEW_SendTreeviewNotify(
-        hwnd, 
-        TVN_SELCHANGED, 
+        hwnd,
+        TVN_SELCHANGED,
         cause,
         (HTREEITEM)prevSelect,
@@ -2976 +2977 @@
       break;
 
-    case TVGN_DROPHILITE: 
+    case TVGN_DROPHILITE:
       prevItem= TREEVIEW_ValidItem (infoPtr, infoPtr->dropItem);
 
-      if (prevItem) 
+      if (prevItem)
         prevItem->state &= ~TVIS_DROPHILITED;
 
       infoPtr->dropItem=(HTREEITEM)newSelect;
 
-      if (wineItem) 
+      if (wineItem)
         wineItem->state |=TVIS_DROPHILITED;
 
@@ -2993 +2994 @@
       break;
  }
- 
+
  TREEVIEW_QueueRefresh (hwnd);
 
@@ -3010 +3011 @@
 
 
-   
+
 static LRESULT
 TREEVIEW_GetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -3033 +3034 @@
 
 // TRACE (treeview,"%x %lx\n",wParam, lParam);
- 
+
  infoPtr->hFont = (HFONT)wParam;
 
@@ -3046 +3047 @@
  GetTextMetricsA (hdc, &tm);
  height= tm.tmHeight + tm.tmExternalLeading;
- if (height>infoPtr->uRealItemHeight) 
-        infoPtr->uRealItemHeight=height;
+ if (height>infoPtr->uRealItemHeight)
+        infoPtr->uRealItemHeight=height;
  SelectObject (hdc, hOldFont);
  ReleaseDC (0, hdc);
 
- if (lParam)    
-        TREEVIEW_QueueRefresh (hwnd);
- 
+ if (lParam)
+        TREEVIEW_QueueRefresh (hwnd);
+
  return 0;
 }
@@ -3070 +3071 @@
 
   switch (LOWORD (wParam)) {
-        case SB_LINEUP: 
-                        if (!infoPtr->cy) return FALSE;
-                        infoPtr->cy -= infoPtr->uRealItemHeight;
-                        if (infoPtr->cy < 0) infoPtr->cy=0;
-                        break;
-        case SB_LINEDOWN: 
-                        maxHeight=infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
-                        if (infoPtr->cy == maxHeight) return FALSE;
-                        infoPtr->cy += infoPtr->uRealItemHeight;
-                        if (infoPtr->cy > maxHeight) 
-                                infoPtr->cy = maxHeight;
-                        break;
-        case SB_PAGEUP: 
-                        if (!infoPtr->cy) return FALSE;
-                        infoPtr->cy -= infoPtr->uVisibleHeight;
-                        if (infoPtr->cy < 0) infoPtr->cy=0;
-                        break;
-        case SB_PAGEDOWN:
-                        maxHeight=infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
-                        if (infoPtr->cy == maxHeight) return FALSE;
-                        infoPtr->cy += infoPtr->uVisibleHeight;
+        case SB_LINEUP:
+                        if (!infoPtr->cy) return FALSE;
+                        infoPtr->cy -= infoPtr->uRealItemHeight;
+                        if (infoPtr->cy < 0) infoPtr->cy=0;
+                        break;
+        case SB_LINEDOWN:
+                        maxHeight=infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
+                        if (infoPtr->cy == maxHeight) return FALSE;
+                        infoPtr->cy += infoPtr->uRealItemHeight;
+                        if (infoPtr->cy > maxHeight)
+                                infoPtr->cy = maxHeight;
+                        break;
+        case SB_PAGEUP:
+                        if (!infoPtr->cy) return FALSE;
+                        infoPtr->cy -= infoPtr->uVisibleHeight;
+                        if (infoPtr->cy < 0) infoPtr->cy=0;
+                        break;
+        case SB_PAGEDOWN:
+                        maxHeight=infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
+                        if (infoPtr->cy == maxHeight) return FALSE;
+                        infoPtr->cy += infoPtr->uVisibleHeight;
             if (infoPtr->cy > maxHeight)
                 infoPtr->cy = maxHeight;
-                        break;
-        case SB_THUMBTRACK: 
-                        infoPtr->cy = HIWORD (wParam);
-                        break;
-                        
-  }
-  
+                        break;
+        case SB_THUMBTRACK:
+                        infoPtr->cy = HIWORD (wParam);
+                        break;
+
+  }
+
   TREEVIEW_QueueRefresh (hwnd);
   return TRUE;
@@ -3105 +3106 @@
 
 static LRESULT
-TREEVIEW_HScroll (HWND hwnd, WPARAM wParam, LPARAM lParam) 
+TREEVIEW_HScroll (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -3111 +3112 @@
 
 //  TRACE (treeview,"wp %lx, lp %x\n", lParam, wParam);
-        
+
   if (!infoPtr->uInternalStatus & TV_HSCROLL) return FALSE;
 
   switch (LOWORD (wParam)) {
-        case SB_LINEUP: 
-                        if (!infoPtr->cx) return FALSE;
-                        infoPtr->cx -= infoPtr->uRealItemHeight;
-                        if (infoPtr->cx < 0) infoPtr->cx=0;
-                        break;
-        case SB_LINEDOWN: 
-                        maxWidth=infoPtr->uTotalWidth-infoPtr->uVisibleWidth;
-                        if (infoPtr->cx == maxWidth) return FALSE;
-                        infoPtr->cx += infoPtr->uRealItemHeight; /*FIXME */
-                        if (infoPtr->cx > maxWidth) 
-                                infoPtr->cx = maxWidth;
-                        break;
-        case SB_PAGEUP: 
-                        if (!infoPtr->cx) return FALSE;
-                        infoPtr->cx -= infoPtr->uVisibleWidth;
-                        if (infoPtr->cx < 0) infoPtr->cx=0;
-                        break;
-        case SB_PAGEDOWN:
-                        maxWidth=infoPtr->uTotalWidth-infoPtr->uVisibleWidth;
-                        if (infoPtr->cx == maxWidth) return FALSE;
-                        infoPtr->cx += infoPtr->uVisibleWidth;
+        case SB_LINEUP:
+                        if (!infoPtr->cx) return FALSE;
+                        infoPtr->cx -= infoPtr->uRealItemHeight;
+                        if (infoPtr->cx < 0) infoPtr->cx=0;
+                        break;
+        case SB_LINEDOWN:
+                        maxWidth=infoPtr->uTotalWidth-infoPtr->uVisibleWidth;
+                        if (infoPtr->cx == maxWidth) return FALSE;
+                        infoPtr->cx += infoPtr->uRealItemHeight; /*FIXME */
+                        if (infoPtr->cx > maxWidth)
+                                infoPtr->cx = maxWidth;
+                        break;
+        case SB_PAGEUP:
+                        if (!infoPtr->cx) return FALSE;
+                        infoPtr->cx -= infoPtr->uVisibleWidth;
+                        if (infoPtr->cx < 0) infoPtr->cx=0;
+                        break;
+        case SB_PAGEDOWN:
+                        maxWidth=infoPtr->uTotalWidth-infoPtr->uVisibleWidth;
+                        if (infoPtr->cx == maxWidth) return FALSE;
+                        infoPtr->cx += infoPtr->uVisibleWidth;
             if (infoPtr->cx > maxWidth)
                 infoPtr->cx = maxWidth;
-                        break;
-        case SB_THUMBTRACK: 
-                        infoPtr->cx = HIWORD (wParam);
-                        break;
-                        
-  }
-  
+                        break;
+        case SB_THUMBTRACK:
+                        infoPtr->cx = HIWORD (wParam);
+                        break;
+
+  }
+
   TREEVIEW_QueueRefresh (hwnd);
   return TRUE;
@@ -3159 +3160 @@
  INT           prevSelect      = (INT)infoPtr->selectedItem;
 
- TREEVIEW_ITEM *prevItem       = 
-    (prevSelect != 0 ) ? 
+ TREEVIEW_ITEM *prevItem       =
+    (prevSelect != 0 ) ?
       TREEVIEW_ValidItem (infoPtr, (HTREEITEM)prevSelect) :
       NULL;
@@ -3168 +3169 @@
 // TRACE (treeview,"%x %lx\n",wParam, lParam);
 
- if (prevSelect == 0) 
+ if (prevSelect == 0)
    return FALSE;
 
  switch (wParam) {
-        case VK_UP: 
-                newItem=TREEVIEW_GetPrevListItem (infoPtr, prevItem);
-
-                if (!newItem) 
-                        newItem=& infoPtr->items[(INT)infoPtr->TopRootItem];
+        case VK_UP:
+                newItem=TREEVIEW_GetPrevListItem (infoPtr, prevItem);
+
+                if (!newItem)
+                        newItem=& infoPtr->items[(INT)infoPtr->TopRootItem];
 
     hNewSelection = newItem->hItem;
@@ -3183 +3184 @@
       scrollNeeds = SB_LINEUP;
 
-                break;
-
-        case VK_DOWN: 
-                newItem=TREEVIEW_GetNextListItem (infoPtr, prevItem);
-
-                if (!newItem) 
+                break;
+
+        case VK_DOWN:
+                newItem=TREEVIEW_GetNextListItem (infoPtr, prevItem);
+
+                if (!newItem)
       newItem=prevItem;
 
@@ -3196 +3197 @@
       scrollNeeds = SB_LINEDOWN;
 
-                break;
-
-        case VK_HOME:
-                newItem       = &infoPtr->items[(INT)infoPtr->TopRootItem];
+                break;
+
+        case VK_HOME:
+                newItem       = &infoPtr->items[(INT)infoPtr->TopRootItem];
     hNewSelection = newItem->hItem;
     cyChangeNeeds = 0;
-                break;
-
-        case VK_END:
-                newItem       = &infoPtr->items[(INT)infoPtr->TopRootItem];
-                newItem       = TREEVIEW_GetLastListItem (infoPtr, newItem);
+                break;
+
+        case VK_END:
+                newItem       = &infoPtr->items[(INT)infoPtr->TopRootItem];
+                newItem       = TREEVIEW_GetLastListItem (infoPtr, newItem);
     hNewSelection = newItem->hItem;
 
@@ -3212 +3213 @@
       cyChangeNeeds = infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
 
-                break;
-
-        case VK_LEFT:
+                break;
+
+        case VK_LEFT:
     if ( (prevItem->cChildren > 0) && (prevItem->state & TVIS_EXPANDED) )
     {
       TREEVIEW_Expand(hwnd, TVE_COLLAPSE, prevSelect );
     }
-    else if ((INT)prevItem->parent) 
+    else if ((INT)prevItem->parent)
     {
       newItem = (& infoPtr->items[(INT)prevItem->parent]);
-      if (! newItem->visible) 
+      if (! newItem->visible)
         /* FIXME find a way to make this item the first visible... */
-        newItem = NULL; 
+        newItem = NULL;
 
       hNewSelection = newItem->hItem;
@@ -3231 +3232 @@
     break;
 
-        case VK_RIGHT:
-    if ( ( prevItem->cChildren > 0)  || 
+        case VK_RIGHT:
+    if ( ( prevItem->cChildren > 0)  ||
          ( prevItem->cChildren == I_CHILDRENCALLBACK))
     {
@@ -3257 +3258 @@
 
   case VK_PRIOR:
-    
-                newItem=TREEVIEW_GetListItem(
-              infoPtr, 
+
+                newItem=TREEVIEW_GetListItem(
+              infoPtr,
               prevItem,
               -1*(TREEVIEW_GetVisibleCount(hwnd,0,0)-3));
-                if (!newItem) 
+                if (!newItem)
       newItem=prevItem;
-  
+
     hNewSelection = newItem->hItem;
 
@@ -3270 +3271 @@
       scrollNeeds = SB_PAGEUP;
 
-                break;
+                break;
 
   case VK_NEXT:
-                newItem=TREEVIEW_GetListItem(
-              infoPtr, 
+                newItem=TREEVIEW_GetListItem(
+              infoPtr,
               prevItem,
               TREEVIEW_GetVisibleCount(hwnd,0,0)-3);
 
-                if (!newItem) 
+                if (!newItem)
       newItem=prevItem;
 
@@ -3286 +3287 @@
       scrollNeeds = SB_PAGEDOWN;
 
-                break;
-
-        case VK_BACK:
-
-        case VK_RETURN:
+                break;
+
+        case VK_BACK:
+
+        case VK_RETURN:
 
   default:
-//              FIXME (treeview, "%x not implemented\n", wParam);
-                break;
+//              FIXME (treeview, "%x not implemented\n", wParam);
+                break;
  }
 
-  if (hNewSelection) 
+  if (hNewSelection)
   {
-/* 
+/*
     This works but does not send notification...
 
@@ -3308 +3309 @@
 */
 
-    if ( TREEVIEW_DoSelectItem( 
-           hwnd, 
-           TVGN_CARET, 
-           (HTREEITEM)hNewSelection, 
+    if ( TREEVIEW_DoSelectItem(
+           hwnd,
+           TVGN_CARET,
+           (HTREEITEM)hNewSelection,
            TVC_BYKEYBOARD))
     {
@@ -3317 +3318 @@
       if (scrollNeeds != -1)
         TREEVIEW_VScroll(hwnd, scrollNeeds, 0);
-  
+
       if (cyChangeNeeds != -1)
         infoPtr->cy = cyChangeNeeds;
 
-      /* FIXME: Something happen in the load the in the two weeks before 
-         april 1st 1999 which makes this SetFocus mandatory otherwise, the focus 
+      /* FIXME: Something happen in the load the in the two weeks before
+         april 1st 1999 which makes this SetFocus mandatory otherwise, the focus
          is lost... However the SetFocus should not be required...*/
-               
+
       SetFocus(hwnd);
     }
@@ -3337 +3338 @@
 {
     switch (uMsg) {
-        case TVM_INSERTITEMA:
+        case TVM_INSERTITEMA:
           return TREEVIEW_InsertItemA (hwnd, wParam, lParam);
 
-        case TVM_INSERTITEMW:
-//                      FIXME (treeview, "Unimplemented msg TVM_INSERTITEM32W\n");
-                return 0;
-
-        case TVM_DELETEITEM:
-                return TREEVIEW_DeleteItem (hwnd, wParam, lParam);
-
-        case TVM_EXPAND:
-                return TREEVIEW_Expand (hwnd, wParam, lParam);
-
-        case TVM_GETITEMRECT:
-                return TREEVIEW_GetItemRect (hwnd, wParam, lParam);
-
-        case TVM_GETCOUNT:
-                return TREEVIEW_GetCount (hwnd, wParam, lParam);
-
-        case TVM_GETINDENT:
-                return TREEVIEW_GetIndent (hwnd);
-
-        case TVM_SETINDENT:
-                return TREEVIEW_SetIndent (hwnd, wParam);
-
-        case TVM_GETIMAGELIST:
-                return TREEVIEW_GetImageList (hwnd, wParam, lParam);
-
-                case TVM_SETIMAGELIST:
-                return TREEVIEW_SetImageList (hwnd, wParam, lParam);
-
-        case TVM_GETNEXTITEM:
-                return TREEVIEW_GetNextItem (hwnd, wParam, lParam);
-
-        case TVM_SELECTITEM:
-                return TREEVIEW_SelectItem (hwnd, wParam, lParam);
-
-        case TVM_GETITEMA:
-                return TREEVIEW_GetItemA (hwnd, wParam, lParam);
-
-        case TVM_GETITEMW:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETITEM32W\n");
-                return 0;
-
-        case TVM_SETITEMA:
-                return TREEVIEW_SetItemA (hwnd, wParam, lParam);
-
-        case TVM_SETITEMW:
-//                      FIXME (treeview, "Unimplemented msg TVM_SETITEMW\n");
-                return 0;
-
-        case TVM_EDITLABELA:
-//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32A \n");
-                return 0;
-
-        case TVM_EDITLABELW:
-//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32W \n");
-                return 0;
-
-        case TVM_GETEDITCONTROL:
-                return TREEVIEW_GetEditControl (hwnd);
-
-        case TVM_GETVISIBLECOUNT:
-                return TREEVIEW_GetVisibleCount (hwnd, wParam, lParam);
-
-        case TVM_HITTEST:
-                return TREEVIEW_HitTest (hwnd, lParam);
-
-        case TVM_CREATEDRAGIMAGE:
-                return TREEVIEW_CreateDragImage (hwnd, wParam, lParam);
-  
-        case TVM_SORTCHILDREN:
-//                      FIXME (treeview, "Unimplemented msg TVM_SORTCHILDREN\n");
-                return 0;
-  
-        case TVM_ENSUREVISIBLE:
-//                      FIXME (treeview, "Unimplemented msg TVM_ENSUREVISIBLE\n");
-                return 0;
-  
-        case TVM_SORTCHILDRENCB:
-                return TREEVIEW_SortChildrenCB(hwnd, wParam, lParam);
-  
-        case TVM_ENDEDITLABELNOW:
-                return TREEVIEW_EndEditLabelNow (hwnd, wParam, lParam);
-  
-        case TVM_GETISEARCHSTRINGA:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32A\n");
-                return 0;
-  
-        case TVM_GETISEARCHSTRINGW:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32W\n");
-                return 0;
-  
-        case TVM_GETTOOLTIPS:
-                return TREEVIEW_GetToolTips (hwnd);
-
-        case TVM_SETTOOLTIPS:
-                return TREEVIEW_SetToolTips (hwnd, wParam);
-  
-        case TVM_SETINSERTMARK:
-//                      FIXME (treeview, "Unimplemented msg TVM_SETINSERTMARK\n");
-                return 0;
-  
-        case TVM_SETITEMHEIGHT:
-                return TREEVIEW_SetItemHeight (hwnd, wParam);
-  
-        case TVM_GETITEMHEIGHT:
-                return TREEVIEW_GetItemHeight (hwnd);
-  
-        case TVM_SETBKCOLOR:
-                return TREEVIEW_SetBkColor (hwnd, wParam, lParam);
-        
-        case TVM_SETTEXTCOLOR:
-                return TREEVIEW_SetTextColor (hwnd, wParam, lParam);
-  
-        case TVM_GETBKCOLOR:
-                return TREEVIEW_GetBkColor (hwnd);
-  
-        case TVM_GETTEXTCOLOR:
-                return TREEVIEW_GetTextColor (hwnd);
-  
-        case TVM_SETSCROLLTIME:
-//                      FIXME (treeview, "Unimplemented msg TVM_SETSCROLLTIME\n");
-                return 0;
-  
-        case TVM_GETSCROLLTIME:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETSCROLLTIME\n");
-                return 0;
-  
-        case TVM_SETINSERTMARKCOLOR:
-//                      FIXME (treeview, "Unimplemented msg TVM_SETINSERTMARKCOLOR\n");
-                return 0;
-  
-        case TVM_SETUNICODEFORMAT:
-//                      FIXME (treeview, "Unimplemented msg TVM_SETUNICODEFORMAT\n");
-                return 0;
-  
-        case TVM_GETUNICODEFORMAT:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETUNICODEFORMAT\n");
-                return 0;
-  
-                case WM_COMMAND: 
-                         return TREEVIEW_Command (hwnd, wParam, lParam);
-  
-                case WM_CREATE:
-                        return TREEVIEW_Create (hwnd, wParam, lParam);
-  
-                case WM_DESTROY:
-                        return TREEVIEW_Destroy (hwnd);
-  
-/*              case WM_ENABLE: */
-  
-                case WM_ERASEBKGND:
-                        return TREEVIEW_EraseBackground (hwnd, wParam, lParam);
-  
-                case WM_GETDLGCODE:
-                return DLGC_WANTARROWS | DLGC_WANTCHARS;
-  
-                case WM_PAINT:
-                return TREEVIEW_Paint (hwnd, wParam, lParam);
-  
-                case WM_GETFONT:
-                return TREEVIEW_GetFont (hwnd, wParam, lParam);
-
-                case WM_SETFONT:
-                return TREEVIEW_SetFont (hwnd, wParam, lParam);
-  
-                case WM_KEYDOWN:
-                        return TREEVIEW_KeyDown (hwnd, wParam, lParam);
-  
-  
-                case WM_SETFOCUS: 
-                        return TREEVIEW_SetFocus (hwnd, wParam, lParam);
-
-                case WM_KILLFOCUS: 
-                        return TREEVIEW_KillFocus (hwnd, wParam, lParam);
-  
-  
-                case WM_LBUTTONDOWN:
-                        return TREEVIEW_LButtonDown (hwnd, wParam, lParam);
-
-                case WM_LBUTTONUP:
-                        return TREEVIEW_LButtonUp (hwnd, wParam, lParam);
-  
-                case WM_LBUTTONDBLCLK:
-                        return TREEVIEW_LButtonDoubleClick (hwnd, wParam, lParam);
-  
-                case WM_RBUTTONDOWN:
-                        return TREEVIEW_RButtonDown (hwnd, wParam, lParam);
-
-                case WM_RBUTTONUP:
-                        return TREEVIEW_RButtonUp (hwnd, wParam, lParam);
-
-                case WM_MOUSEMOVE:
-                        return TREEVIEW_MouseMove (hwnd, wParam, lParam);
-  
-  
-/*              case WM_SYSCOLORCHANGE: */
-                case WM_STYLECHANGED: 
-                        return TREEVIEW_StyleChanged (hwnd, wParam, lParam);
-
-/*              case WM_SETREDRAW: */
-  
-                case WM_TIMER:
-                        return TREEVIEW_HandleTimer (hwnd, wParam, lParam);
- 
-                case WM_SIZE: 
-                        return TREEVIEW_Size (hwnd, wParam,lParam);
-
-                case WM_HSCROLL: 
-                        return TREEVIEW_HScroll (hwnd, wParam, lParam);
-                case WM_VSCROLL: 
-                        return TREEVIEW_VScroll (hwnd, wParam, lParam);
-  
-                case WM_DRAWITEM:
-//                      printf ("drawItem\n");
-                        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-  
-                default:
-                if (uMsg >= WM_USER)
-//              FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case TVM_INSERTITEMW:
+//                      FIXME (treeview, "Unimplemented msg TVM_INSERTITEM32W\n");
+                return 0;
+
+        case TVM_DELETEITEM:
+                return TREEVIEW_DeleteItem (hwnd, wParam, lParam);
+
+        case TVM_EXPAND:
+                return TREEVIEW_Expand (hwnd, wParam, lParam);
+
+        case TVM_GETITEMRECT:
+                return TREEVIEW_GetItemRect (hwnd, wParam, lParam);
+
+        case TVM_GETCOUNT:
+                return TREEVIEW_GetCount (hwnd, wParam, lParam);
+
+        case TVM_GETINDENT:
+                return TREEVIEW_GetIndent (hwnd);
+
+        case TVM_SETINDENT:
+                return TREEVIEW_SetIndent (hwnd, wParam);
+
+        case TVM_GETIMAGELIST:
+                return TREEVIEW_GetImageList (hwnd, wParam, lParam);
+
+                case TVM_SETIMAGELIST:
+                return TREEVIEW_SetImageList (hwnd, wParam, lParam);
+
+        case TVM_GETNEXTITEM:
+                return TREEVIEW_GetNextItem (hwnd, wParam, lParam);
+
+        case TVM_SELECTITEM:
+                return TREEVIEW_SelectItem (hwnd, wParam, lParam);
+
+        case TVM_GETITEMA:
+                return TREEVIEW_GetItemA (hwnd, wParam, lParam);
+
+        case TVM_GETITEMW:
+//                      FIXME (treeview, "Unimplemented msg TVM_GETITEM32W\n");
+                return 0;
+
+        case TVM_SETITEMA:
+                return TREEVIEW_SetItemA (hwnd, wParam, lParam);
+
+        case TVM_SETITEMW:
+//                      FIXME (treeview, "Unimplemented msg TVM_SETITEMW\n");
+                return 0;
+
+        case TVM_EDITLABELA:
+//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32A \n");
+                return 0;
+
+        case TVM_EDITLABELW:
+//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32W \n");
+                return 0;
+
+        case TVM_GETEDITCONTROL:
+                return TREEVIEW_GetEditControl (hwnd);
+
+        case TVM_GETVISIBLECOUNT:
+                return TREEVIEW_GetVisibleCount (hwnd, wParam, lParam);
+
+        case TVM_HITTEST:
+                return TREEVIEW_HitTest (hwnd, lParam);
+
+        case TVM_CREATEDRAGIMAGE:
+                return TREEVIEW_CreateDragImage (hwnd, wParam, lParam);
+
+        case TVM_SORTCHILDREN:
+//                      FIXME (treeview, "Unimplemented msg TVM_SORTCHILDREN\n");
+                return 0;
+
+        case TVM_ENSUREVISIBLE:
+//                      FIXME (treeview, "Unimplemented msg TVM_ENSUREVISIBLE\n");
+                return 0;
+
+        case TVM_SORTCHILDRENCB:
+                return TREEVIEW_SortChildrenCB(hwnd, wParam, lParam);
+
+        case TVM_ENDEDITLABELNOW:
+                return TREEVIEW_EndEditLabelNow (hwnd, wParam, lParam);
+
+        case TVM_GETISEARCHSTRINGA:
+//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32A\n");
+                return 0;
+
+        case TVM_GETISEARCHSTRINGW:
+//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32W\n");
+                return 0;
+
+        case TVM_GETTOOLTIPS:
+                return TREEVIEW_GetToolTips (hwnd);
+
+        case TVM_SETTOOLTIPS:
+                return TREEVIEW_SetToolTips (hwnd, wParam);
+
+        case TVM_SETINSERTMARK:
+//                      FIXME (treeview, "Unimplemented msg TVM_SETINSERTMARK\n");
+                return 0;
+
+        case TVM_SETITEMHEIGHT:
+                return TREEVIEW_SetItemHeight (hwnd, wParam);
+
+        case TVM_GETITEMHEIGHT:
+                return TREEVIEW_GetItemHeight (hwnd);
+
+        case TVM_SETBKCOLOR:
+                return TREEVIEW_SetBkColor (hwnd, wParam, lParam);
+
+        case TVM_SETTEXTCOLOR:
+                return TREEVIEW_SetTextColor (hwnd, wParam, lParam);
+
+        case TVM_GETBKCOLOR:
+                return TREEVIEW_GetBkColor (hwnd);
+
+        case TVM_GETTEXTCOLOR:
+                return TREEVIEW_GetTextColor (hwnd);
+
+        case TVM_SETSCROLLTIME:
+//                      FIXME (treeview, "Unimplemented msg TVM_SETSCROLLTIME\n");
+                return 0;
+
+        case TVM_GETSCROLLTIME:
+//                      FIXME (treeview, "Unimplemented msg TVM_GETSCROLLTIME\n");
+                return 0;
+
+        case TVM_SETINSERTMARKCOLOR:
+//                      FIXME (treeview, "Unimplemented msg TVM_SETINSERTMARKCOLOR\n");
+                return 0;
+
+        case TVM_SETUNICODEFORMAT:
+//                      FIXME (treeview, "Unimplemented msg TVM_SETUNICODEFORMAT\n");
+                return 0;
+
+        case TVM_GETUNICODEFORMAT:
+//                      FIXME (treeview, "Unimplemented msg TVM_GETUNICODEFORMAT\n");
+                return 0;
+
+                case WM_COMMAND:
+                         return TREEVIEW_Command (hwnd, wParam, lParam);
+
+                case WM_CREATE:
+                        return TREEVIEW_Create (hwnd, wParam, lParam);
+
+                case WM_DESTROY:
+                        return TREEVIEW_Destroy (hwnd);
+
+/*              case WM_ENABLE: */
+
+                case WM_ERASEBKGND:
+                        return TREEVIEW_EraseBackground (hwnd, wParam, lParam);
+
+                case WM_GETDLGCODE:
+                return DLGC_WANTARROWS | DLGC_WANTCHARS;
+
+                case WM_PAINT:
+                return TREEVIEW_Paint (hwnd, wParam, lParam);
+
+                case WM_GETFONT:
+                return TREEVIEW_GetFont (hwnd, wParam, lParam);
+
+                case WM_SETFONT:
+                return TREEVIEW_SetFont (hwnd, wParam, lParam);
+
+                case WM_KEYDOWN:
+                        return TREEVIEW_KeyDown (hwnd, wParam, lParam);
+
+
+                case WM_SETFOCUS:
+                        return TREEVIEW_SetFocus (hwnd, wParam, lParam);
+
+                case WM_KILLFOCUS:
+                        return TREEVIEW_KillFocus (hwnd, wParam, lParam);
+
+
+                case WM_LBUTTONDOWN:
+                        return TREEVIEW_LButtonDown (hwnd, wParam, lParam);
+
+                case WM_LBUTTONUP:
+                        return TREEVIEW_LButtonUp (hwnd, wParam, lParam);
+
+                case WM_LBUTTONDBLCLK:
+                        return TREEVIEW_LButtonDoubleClick (hwnd, wParam, lParam);
+
+                case WM_RBUTTONDOWN:
+                        return TREEVIEW_RButtonDown (hwnd, wParam, lParam);
+
+                case WM_RBUTTONUP:
+                        return TREEVIEW_RButtonUp (hwnd, wParam, lParam);
+
+                case WM_MOUSEMOVE:
+                        return TREEVIEW_MouseMove (hwnd, wParam, lParam);
+
+
+/*              case WM_SYSCOLORCHANGE: */
+                case WM_STYLECHANGED:
+                        return TREEVIEW_StyleChanged (hwnd, wParam, lParam);
+
+/*              case WM_SETREDRAW: */
+
+                case WM_TIMER:
+                        return TREEVIEW_HandleTimer (hwnd, wParam, lParam);
+
+                case WM_SIZE:
+                        return TREEVIEW_Size (hwnd, wParam,lParam);
+
+                case WM_HSCROLL:
+                        return TREEVIEW_HScroll (hwnd, wParam, lParam);
+                case WM_VSCROLL:
+                        return TREEVIEW_VScroll (hwnd, wParam, lParam);
+
+                case WM_DRAWITEM:
+//                      printf ("drawItem\n");
+                        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+
+                default:
+//                if (uMsg >= WM_USER)
+//              FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
       }
     return 0;
@@ -3582 +3583 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = WC_TREEVIEWA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -3591 +3592 @@
 {
     if (GlobalFindAtomA (WC_TREEVIEWA))
-        UnregisterClassA (WC_TREEVIEWA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (WC_TREEVIEWA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/updown.c

@@ -1 @@
-/* $Id: updown.c,v 1.3 1999-06-10 16:22:04 achimha Exp $ */
-/*              
+/* $Id: updown.c,v 1.4 1999-06-16 20:25:45 cbratschi Exp $ */
+/*
  * Updown control
  *
  * Copyright 1997 Dimitrie O. Paun
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * TODO:
@@ -67 +68 @@
 //#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(updown, \
 //        "UpDown Ctrl: Unknown parameter(s) for message " #msg     \
-//      "(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam);
+//      "(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam);
 #define UNKNOWN_PARAM(msg, wParam, lParam)
 
@@ -101 +102 @@
     {
       delta += (delta < 0 ? -1 : 1) *
-        (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) *
-        (infoPtr->MinVal - infoPtr->MaxVal) +
-        (delta < 0 ? 1 : -1);
+        (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) *
+        (infoPtr->MinVal - infoPtr->MaxVal) +
+        (delta < 0 ? 1 : -1);
     }
     else
@@ -119 +120 @@
  * incr     - TRUE  get the "increment" rect (up or right)
  *            FALSE get the "decrement" rect (down or left)
- *          
+ *
  */
 static void UPDOWN_GetArrowRect (HWND hwnd, RECT *rect, BOOL incr)
@@ -130 +131 @@
     len = rect->right - rect->left; /* compute the width */
     if (incr)
-      rect->left = len/2+1; 
+      rect->left = len/2+1;
     else
       rect->right = len/2;
@@ -169 +170 @@
   char sep[2];
 
-  if(GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, 
-                      sep, sizeof(sep)) != 1)
+  if(GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND,
+                      sep, sizeof(sep)) != 1)
     return ',';
 
@@ -204 +205 @@
       return FALSE;
 
-    sep = UPDOWN_GetThousandSep(); 
+    sep = UPDOWN_GetThousandSep();
 
     /* now get rid of the separators */
     for(src = dst = txt; *src; src++)
       if(*src != sep)
-        *dst++ = *src;
+        *dst++ = *src;
     *dst = 0;
 
     /* try to convert the number and validate it */
     newVal = strtol(txt, &src, infoPtr->Base);
-    if(*src || !UPDOWN_InBounds (hwnd, newVal)) 
+    if(*src || !UPDOWN_InBounds (hwnd, newVal))
       return FALSE;
 
-//    TRACE(updown, "new value(%d) read from buddy (old=%d)\n", 
-//               newVal, infoPtr->CurVal);
-  }
-  
+//    TRACE(updown, "new value(%d) read from buddy (old=%d)\n",
+//               newVal, infoPtr->CurVal);
+  }
+
   infoPtr->CurVal = newVal;
   return TRUE;
@@ -239 +240 @@
   int len;
 
-  if (!IsWindow(infoPtr->Buddy)) 
+  if (!IsWindow(infoPtr->Buddy))
     return FALSE;
 
 //  TRACE(updown, "set new value(%d) to buddy.\n",
-//             infoPtr->CurVal);
+//             infoPtr->CurVal);
 
   /*if the buddy is a list window, we must set curr index */
@@ -252 +253 @@
     len = sprintf(txt1, (infoPtr->Base==16) ? "%X" : "%d", infoPtr->CurVal);
 
-    sep = UPDOWN_GetThousandSep(); 
+    sep = UPDOWN_GetThousandSep();
 
     /* Do thousands seperation if necessary */
@@ -258 +259 @@
       char txt2[20], *src = txt1, *dst = txt2;
       if(len%3 > 0){
-        lstrcpynA (dst, src, len%3 + 1);      /* need to include the null */ 
-        dst += len%3;
-        src += len%3;
+        lstrcpynA (dst, src, len%3 + 1);      /* need to include the null */
+        dst += len%3;
+        src += len%3;
       }
       for(len=0; *src; len++){
-        if(len%3==0)
-          *dst++ = sep;
-        *dst++ = *src++;
+        if(len%3==0)
+          *dst++ = sep;
+        *dst++ = *src++;
       }
       *dst = 0;           /* null terminate it */
@@ -274 +275 @@
 
   return TRUE;
-} 
+}
 
 /***********************************************************************
@@ -287 +288 @@
   BOOL prssed;
   RECT rect;
-  
+
   /* Draw the incr button */
   UPDOWN_GetArrowRect (hwnd, &rect, TRUE);
   prssed = (infoPtr->Flags & FLAG_INCR) && (infoPtr->Flags & FLAG_MOUSEIN);
-  DrawFrameControl(hdc, &rect, DFC_SCROLL, 
-        (dwStyle & UDS_HORZ ? DFCS_SCROLLLEFT : DFCS_SCROLLUP) |
-        (prssed ? DFCS_PUSHED : 0) |
-        (dwStyle&WS_DISABLED ? DFCS_INACTIVE : 0) );
+  DrawFrameControl(hdc, &rect, DFC_SCROLL,
+        (dwStyle & UDS_HORZ ? DFCS_SCROLLLEFT : DFCS_SCROLLUP) |
+        (prssed ? DFCS_PUSHED : 0) |
+        (dwStyle&WS_DISABLED ? DFCS_INACTIVE : 0) );
 
   /* Draw the space between the buttons */
   rect.top = rect.bottom; rect.bottom++;
   DrawEdge(hdc, &rect, 0, BF_MIDDLE);
-                    
+
   /* Draw the decr button */
   UPDOWN_GetArrowRect(hwnd, &rect, FALSE);
   prssed = (infoPtr->Flags & FLAG_DECR) && (infoPtr->Flags & FLAG_MOUSEIN);
-  DrawFrameControl(hdc, &rect, DFC_SCROLL, 
-        (dwStyle & UDS_HORZ ? DFCS_SCROLLRIGHT : DFCS_SCROLLDOWN) |
-        (prssed ? DFCS_PUSHED : 0) |
-        (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
+  DrawFrameControl(hdc, &rect, DFC_SCROLL,
+        (dwStyle & UDS_HORZ ? DFCS_SCROLLRIGHT : DFCS_SCROLLDOWN) |
+        (prssed ? DFCS_PUSHED : 0) |
+        (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
 }
 
@@ -318 +319 @@
 {
     HDC hdc;
-  
+
     hdc = GetDC (hwnd);
     UPDOWN_Draw (hwnd, hdc);
@@ -335 +336 @@
     PAINTSTRUCT ps;
     HDC hdc;
-  
+
     hdc = BeginPaint (hwnd, &ps);
     UPDOWN_Draw (hwnd, hdc);
@@ -345 +346 @@
  * Tests if 'hwndBud' is a valid window handle. If not, returns FALSE.
  * Else, sets it as a new Buddy.
- * Then, it should subclass the buddy 
+ * Then, it should subclass the buddy
  * If window has the UDS_ARROWKEYS, it subcalsses the buddy window to
  * process the UP/DOWN arrow keys.
@@ -353 +354 @@
 static BOOL UPDOWN_SetBuddy (HWND hwnd, HWND hwndBud)
 {
-  UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd); 
+  UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
   DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
   RECT budRect; /* new coord for the buddy */
   int x;          /* new x position and width for the up-down */
-          
+
   *infoPtr->szBuddyClass = '\0';
 
@@ -380 +381 @@
   GetWindowRect(infoPtr->Buddy, &budRect);
   MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Buddy),
-                  (POINT *)(&budRect.left), 2);
+                  (POINT *)(&budRect.left), 2);
 
   /* now do the positioning */
@@ -394 +395 @@
   /* first adjust the buddy to accomodate the up/down */
   SetWindowPos(infoPtr->Buddy, 0, budRect.left, budRect.top,
-               budRect.right  - budRect.left, budRect.bottom - budRect.top, 
-               SWP_NOACTIVATE|SWP_NOZORDER);
+               budRect.right  - budRect.left, budRect.bottom - budRect.top,
+               SWP_NOACTIVATE|SWP_NOZORDER);
 
   /* now position the up/down */
@@ -402 +403 @@
 
   SetWindowPos (hwnd, 0, x, budRect.top-DEFAULT_ADDTOP,DEFAULT_WIDTH,
-                 (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
-                 SWP_NOACTIVATE|SWP_NOZORDER);
+                 (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
+                 SWP_NOACTIVATE|SWP_NOZORDER);
 
   return TRUE;
-}         
+}
 
 /***********************************************************************
  *           UPDOWN_DoAction
  *
- * This function increments/decrements the CurVal by the 
+ * This function increments/decrements the CurVal by the
  * 'delta' amount according to the 'incr' flag
  * It notifies the parent as required.
@@ -419 +420 @@
 static void UPDOWN_DoAction (HWND hwnd, int delta, BOOL incr)
 {
-  UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd); 
+  UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
   DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
   int old_val = infoPtr->CurVal;
@@ -440 +441 @@
   ni.hdr.hwndFrom = hwnd;
   ni.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-  ni.hdr.code = UDN_DELTAPOS; 
+  ni.hdr.code = UDN_DELTAPOS;
   if (SendMessageA(GetParent (hwnd), WM_NOTIFY,
-                   (WPARAM)ni.hdr.idFrom, (LPARAM)&ni))
+                   (WPARAM)ni.hdr.idFrom, (LPARAM)&ni))
     return; /* we are not allowed to change */
-  
+
   /* Now adjust value with (maybe new) delta */
   if (!UPDOWN_OffsetVal (hwnd, ni.iDelta))
@@ -450 +451 @@
 
   /* Now take care about our buddy */
-  if(!IsWindow(infoPtr->Buddy)) 
+  if(!IsWindow(infoPtr->Buddy))
     return; /* Nothing else to do */
 
@@ -461 +462 @@
             we do not have the UDS_SETBUDDYINT style set? */
 
-  SendMessageA (GetParent (hwnd), 
-                dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL, 
-                 MAKELONG(incr ? SB_LINEUP : SB_LINEDOWN, infoPtr->CurVal),
-                hwnd);
+  SendMessageA (GetParent (hwnd),
+                dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL,
+                 MAKELONG(incr ? SB_LINEUP : SB_LINEDOWN, infoPtr->CurVal),
+                hwnd);
 }
 
@@ -487 +488 @@
  * Deletes any timers, releases the mouse and does  redraw if necessary.
  * If the control is not in "capture" mode, it does nothing.
- * If the control was not in cancel mode, it returns FALSE. 
+ * If the control was not in cancel mode, it returns FALSE.
  * If the control was in cancel mode, it returns TRUE.
  */
@@ -493 +494 @@
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
- 
+
   /* if not in 'capture' mode, do nothing */
   if(!(infoPtr->Flags & FLAG_CLICKED))
@@ -500 +501 @@
   KillTimer (hwnd, TIMERID1); /* kill all possible timers */
   KillTimer (hwnd, TIMERID2);
-  
+
   if (GetCapture() == hwnd)    /* let the mouse go         */
-    ReleaseCapture();          /* if we still have it      */  
-  
+    ReleaseCapture();          /* if we still have it      */
+
   infoPtr->Flags = 0;          /* get rid of any flags     */
   UPDOWN_Refresh (hwnd);       /* redraw the control just in case */
-  
+
   return TRUE;
 }
@@ -515 +516 @@
  * Handle a mouse event for the updown.
  * 'pt' is the location of the mouse event in client or
- * windows coordinates. 
+ * windows coordinates.
  */
 static void UPDOWN_HandleMouseEvent (HWND hwnd, UINT msg, POINT pt)
@@ -529 +530 @@
       /* If we are already in the 'clicked' mode, then nothing to do */
       if(infoPtr->Flags & FLAG_CLICKED)
-        return;
+        return;
 
       /* If the buddy is an edit, will set focus to it */
       if (!lstrcmpA (infoPtr->szBuddyClass, "Edit"))
-        SetFocus(infoPtr->Buddy);
+        SetFocus(infoPtr->Buddy);
 
       /* Now see which one is the 'active' arrow */
@@ -540 +541 @@
       /* Update the CurVal if necessary */
       if (dwStyle & UDS_SETBUDDYINT)
-        UPDOWN_GetBuddyInt (hwnd);
-        
+        UPDOWN_GetBuddyInt (hwnd);
+
       /* Before we proceed, see if we can spin... */
       if(!(dwStyle & UDS_WRAP))
-        if(( temp && infoPtr->CurVal==infoPtr->MaxVal) ||
-           (!temp && infoPtr->CurVal==infoPtr->MinVal))
-          return;
+        if(( temp && infoPtr->CurVal==infoPtr->MaxVal) ||
+           (!temp && infoPtr->CurVal==infoPtr->MinVal))
+          return;
 
       /* Set up the correct flags */
-      infoPtr->Flags  = 0; 
+      infoPtr->Flags  = 0;
       infoPtr->Flags |= temp ? FLAG_INCR : FLAG_DECR;
       infoPtr->Flags |= FLAG_MOUSEIN;
-      
+
       /* repaint the control */
       UPDOWN_Refresh (hwnd);
@@ -563 +564 @@
 
       /* and startup the first timer */
-      SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
+      SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
       break;
 
@@ -569 +570 @@
       /* If we are not in the 'clicked' mode, then nothing to do */
       if(!(infoPtr->Flags & FLAG_CLICKED))
-        return;
+        return;
 
       /* save the flags to see if any got modified */
@@ -576 +577 @@
       /* Now get the 'active' arrow rectangle */
       if (infoPtr->Flags & FLAG_INCR)
-        UPDOWN_GetArrowRect (hwnd, &rect, TRUE);
+        UPDOWN_GetArrowRect (hwnd, &rect, TRUE);
       else
-        UPDOWN_GetArrowRect (hwnd, &rect, FALSE);
+        UPDOWN_GetArrowRect (hwnd, &rect, FALSE);
 
       /* Update the flags if we are in/out */
       if(PtInRect(&rect, pt))
-        infoPtr->Flags |=  FLAG_MOUSEIN;
+        infoPtr->Flags |=  FLAG_MOUSEIN;
       else{
-        infoPtr->Flags &= ~FLAG_MOUSEIN;
-        if(accelIndex != -1) /* if we have accel info */
-          accelIndex = 0;    /* reset it              */
+        infoPtr->Flags &= ~FLAG_MOUSEIN;
+        if(accelIndex != -1) /* if we have accel info */
+          accelIndex = 0;    /* reset it              */
       }
       /* If state changed, redraw the control */
       if(temp != infoPtr->Flags)
-        UPDOWN_Refresh (hwnd);
+        UPDOWN_Refresh (hwnd);
       break;
 
       default:
-//      ERR(updown, "Impossible case!\n");
+//      ERR(updown, "Impossible case!\n");
         break;
     }
@@ -604 +605 @@
  */
 LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
-                                LPARAM lParam)
+                                LPARAM lParam)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
@@ -622 +623 @@
 
       /* initialize the info struct */
-      infoPtr->AccelCount=0; infoPtr->AccelVect=0; 
+      infoPtr->AccelCount=0; infoPtr->AccelVect=0;
       infoPtr->CurVal=0; infoPtr->MinVal=0; infoPtr->MaxVal=100; /*FIXME*/
       infoPtr->Base  = 10; /* Default to base 10  */
@@ -630 +631 @@
       /* Do we pick the buddy win ourselves? */
       if (dwStyle & UDS_AUTOBUDDY)
-        UPDOWN_SetBuddy (hwnd, GetWindow (hwnd, GW_HWNDPREV));
-        
+        UPDOWN_SetBuddy (hwnd, GetWindow (hwnd, GW_HWNDPREV));
+
 //      TRACE(updown, "UpDown Ctrl creation, hwnd=%04x\n", hwnd);
       break;
-    
+
     case WM_DESTROY:
       if(infoPtr->AccelVect)
-        COMCTL32_Free (infoPtr->AccelVect);
+        COMCTL32_Free (infoPtr->AccelVect);
 
       COMCTL32_Free (infoPtr);
@@ -643 +644 @@
 //      TRACE(updown, "UpDown Ctrl destruction, hwnd=%04x\n", hwnd);
       break;
-        
+
     case WM_ENABLE:
       if (dwStyle & WS_DISABLED)
-        UPDOWN_CancelMode (hwnd);
+        UPDOWN_CancelMode (hwnd);
       UPDOWN_Paint (hwnd);
       break;
@@ -653 +654 @@
       /* if initial timer, kill it and start the repeat timer */
       if(wParam == TIMERID1){
-        KillTimer(hwnd, TIMERID1);
-        /* if no accel info given, used default timer */
-        if(infoPtr->AccelCount==0 || infoPtr->AccelVect==0){
-          accelIndex = -1;
-          temp = REPEAT_DELAY;
-        }
-        else{
-          accelIndex = 0; /* otherwise, use it */
-          temp = infoPtr->AccelVect[accelIndex].nSec * 1000 + 1;
-        }
-        SetTimer(hwnd, TIMERID2, temp, 0);
+        KillTimer(hwnd, TIMERID1);
+        /* if no accel info given, used default timer */
+        if(infoPtr->AccelCount==0 || infoPtr->AccelVect==0){
+          accelIndex = -1;
+          temp = REPEAT_DELAY;
+        }
+        else{
+          accelIndex = 0; /* otherwise, use it */
+          temp = infoPtr->AccelVect[accelIndex].nSec * 1000 + 1;
+        }
+        SetTimer(hwnd, TIMERID2, temp, 0);
       }
 
       /* now, if the mouse is above us, do the thing...*/
       if(infoPtr->Flags & FLAG_MOUSEIN){
-        temp = accelIndex==-1 ? 1 : infoPtr->AccelVect[accelIndex].nInc;
-        UPDOWN_DoAction(hwnd, temp, infoPtr->Flags & FLAG_INCR);
-        
-        if(accelIndex!=-1 && accelIndex < infoPtr->AccelCount-1){
-          KillTimer(hwnd, TIMERID2);
-          accelIndex++; /* move to the next accel info */
-          temp = infoPtr->AccelVect[accelIndex].nSec * 1000 + 1;
-          /* make sure we have at least 1ms intervals */
-          SetTimer(hwnd, TIMERID2, temp, 0);        
-        }
+        temp = accelIndex==-1 ? 1 : infoPtr->AccelVect[accelIndex].nInc;
+        UPDOWN_DoAction(hwnd, temp, infoPtr->Flags & FLAG_INCR);
+
+        if(accelIndex!=-1 && accelIndex < infoPtr->AccelCount-1){
+          KillTimer(hwnd, TIMERID2);
+          accelIndex++; /* move to the next accel info */
+          temp = infoPtr->AccelVect[accelIndex].nSec * 1000 + 1;
+          /* make sure we have at least 1ms intervals */
+          SetTimer(hwnd, TIMERID2, temp, 0);
+        }
       }
       break;
@@ -687 +688 @@
     case WM_LBUTTONUP:
       if(!UPDOWN_CancelMode(hwnd))
-        break;
+        break;
       /*If we released the mouse and our buddy is an edit */
       /* we must select all text in it.                   */
       if (!lstrcmpA (infoPtr->szBuddyClass, "Edit"))
-          SendMessageA(infoPtr->Buddy, EM_SETSEL, 0, MAKELONG(0, -1));
-      break;
-      
+          SendMessageA(infoPtr->Buddy, EM_SETSEL, 0, MAKELONG(0, -1));
+      break;
+
     case WM_LBUTTONDOWN:
     case WM_MOUSEMOVE:
       if(UPDOWN_IsEnabled(hwnd)){
-        POINT pt;
-        CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
-        UPDOWN_HandleMouseEvent (hwnd, message, pt );
+        POINT pt;
+        CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
+        UPDOWN_HandleMouseEvent (hwnd, message, pt );
       }
     break;
@@ -705 +706 @@
     case WM_KEYDOWN:
       if((dwStyle & UDS_ARROWKEYS) && UPDOWN_IsEnabled(hwnd)){
-        switch(wParam){
-        case VK_UP:  
-        case VK_DOWN:
-          UPDOWN_GetBuddyInt (hwnd);
-          UPDOWN_DoAction (hwnd, 1, wParam==VK_UP);
-          break;
-        }
-      }
-      break;
-      
+        switch(wParam){
+        case VK_UP:
+        case VK_DOWN:
+          UPDOWN_GetBuddyInt (hwnd);
+          UPDOWN_DoAction (hwnd, 1, wParam==VK_UP);
+          break;
+        }
+      }
+      break;
+
     case WM_PAINT:
       UPDOWN_Paint (hwnd);
       break;
-    
+
     case UDM_GETACCEL:
       if (wParam==0 && lParam==0)    /*if both zero, */
-        return infoPtr->AccelCount;  /*just return the accel count*/
+        return infoPtr->AccelCount;  /*just return the accel count*/
       if (wParam || lParam){
-        UNKNOWN_PARAM(UDM_GETACCEL, wParam, lParam);
-        return 0;
+        UNKNOWN_PARAM(UDM_GETACCEL, wParam, lParam);
+        return 0;
       }
       temp = MIN(infoPtr->AccelCount, wParam);
@@ -733 +734 @@
 //      TRACE(updown, "UpDown Ctrl new accel info, hwnd=%04x\n", hwnd);
       if(infoPtr->AccelVect){
-        COMCTL32_Free (infoPtr->AccelVect);
-        infoPtr->AccelCount = 0;
-        infoPtr->AccelVect  = 0;
+        COMCTL32_Free (infoPtr->AccelVect);
+        infoPtr->AccelCount = 0;
+        infoPtr->AccelVect  = 0;
       }
       if(wParam==0)
-        return TRUE;
+        return TRUE;
       infoPtr->AccelVect = COMCTL32_Alloc (wParam*sizeof(UDACCEL));
       if(infoPtr->AccelVect==0)
-        return FALSE;
+        return FALSE;
       memcpy(infoPtr->AccelVect, (void*)lParam, wParam*sizeof(UDACCEL));
       return TRUE;
@@ -747 +748 @@
     case UDM_GETBASE:
       if (wParam || lParam)
-        UNKNOWN_PARAM(UDM_GETBASE, wParam, lParam);
+        UNKNOWN_PARAM(UDM_GETBASE, wParam, lParam);
       return infoPtr->Base;
 
     case UDM_SETBASE:
-//      TRACE(updown, "UpDown Ctrl new base(%d), hwnd=%04x\n", 
-//                   wParam, hwnd);
+//      TRACE(updown, "UpDown Ctrl new base(%d), hwnd=%04x\n",
+//                   wParam, hwnd);
       if ( !(wParam==10 || wParam==16) || lParam)
-        UNKNOWN_PARAM(UDM_SETBASE, wParam, lParam);
+        UNKNOWN_PARAM(UDM_SETBASE, wParam, lParam);
       if (wParam==10 || wParam==16){
-        temp = infoPtr->Base;
-        infoPtr->Base = wParam;
-        return temp;       /* return the prev base */
+        temp = infoPtr->Base;
+        infoPtr->Base = wParam;
+        return temp;       /* return the prev base */
       }
       break;
@@ -764 +765 @@
     case UDM_GETBUDDY:
       if (wParam || lParam)
-        UNKNOWN_PARAM(UDM_GETBUDDY, wParam, lParam);
+        UNKNOWN_PARAM(UDM_GETBUDDY, wParam, lParam);
       return infoPtr->Buddy;
 
     case UDM_SETBUDDY:
       if (lParam)
-        UNKNOWN_PARAM(UDM_SETBUDDY, wParam, lParam);
+        UNKNOWN_PARAM(UDM_SETBUDDY, wParam, lParam);
       temp = infoPtr->Buddy;
       infoPtr->Buddy = wParam;
       UPDOWN_SetBuddy (hwnd, wParam);
-//      TRACE(updown, "UpDown Ctrl new buddy(%04x), hwnd=%04x\n", 
-//                   infoPtr->Buddy, hwnd);
+//      TRACE(updown, "UpDown Ctrl new buddy(%04x), hwnd=%04x\n",
+//                   infoPtr->Buddy, hwnd);
       return temp;
 
     case UDM_GETPOS:
       if (wParam || lParam)
-        UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
+        UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
       temp = UPDOWN_GetBuddyInt (hwnd);
       return MAKELONG(infoPtr->CurVal, temp ? 0 : 1);
@@ -785 +786 @@
     case UDM_SETPOS:
       if (wParam || HIWORD(lParam))
-        UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
+        UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
       temp = SLOWORD(lParam);
 //      TRACE(updown, "UpDown Ctrl new value(%d), hwnd=%04x\n",
-//                   temp, hwnd);
+//                   temp, hwnd);
       if(!UPDOWN_InBounds(hwnd, temp)){
-        if(temp < infoPtr->MinVal)  
-          temp = infoPtr->MinVal;
-        if(temp > infoPtr->MaxVal)
-          temp = infoPtr->MaxVal;
+        if(temp < infoPtr->MinVal)
+          temp = infoPtr->MinVal;
+        if(temp > infoPtr->MaxVal)
+          temp = infoPtr->MaxVal;
       }
       wParam = infoPtr->CurVal; /* save prev value   */
       infoPtr->CurVal = temp;   /* set the new value */
       if(dwStyle & UDS_SETBUDDYINT)
-        UPDOWN_SetBuddyInt (hwnd);
+        UPDOWN_SetBuddyInt (hwnd);
       return wParam;            /* return prev value */
-      
+
     case UDM_GETRANGE:
       if (wParam || lParam)
-        UNKNOWN_PARAM(UDM_GETRANGE, wParam, lParam);
+        UNKNOWN_PARAM(UDM_GETRANGE, wParam, lParam);
       return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal);
 
     case UDM_SETRANGE:
       if (wParam)
-        UNKNOWN_PARAM(UDM_SETRANGE, wParam, lParam); /* we must have:     */
+        UNKNOWN_PARAM(UDM_SETRANGE, wParam, lParam); /* we must have:     */
       infoPtr->MaxVal = SLOWORD(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
       infoPtr->MinVal = SHIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
                                          /* |Max-Min| <= UD_MAXVAL        */
-//      TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n", 
-//                   infoPtr->MinVal, infoPtr->MaxVal, hwnd);
-      break;                             
+//      TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
+//                   infoPtr->MinVal, infoPtr->MaxVal, hwnd);
+      break;
 
     case UDM_GETRANGE32:
       if (wParam)
-        *(LPINT)wParam = infoPtr->MinVal;
+        *(LPINT)wParam = infoPtr->MinVal;
       if (lParam)
-        *(LPINT)lParam = infoPtr->MaxVal;
+        *(LPINT)lParam = infoPtr->MaxVal;
       break;
 
@@ -827 +828 @@
       infoPtr->MaxVal = (INT)lParam;
       if (infoPtr->MaxVal <= infoPtr->MinVal)
-        infoPtr->MaxVal = infoPtr->MinVal + 1;
-//      TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n", 
-//                   infoPtr->MinVal, infoPtr->MaxVal, hwnd);
-      break;
-
-    default: 
-      if (message >= WM_USER) 
-//      ERR (updown, "unknown msg %04x wp=%04x lp=%08lx\n", 
-//           message, wParam, lParam);
-      return DefWindowProcA (hwnd, message, wParam, lParam); 
-    } 
+        infoPtr->MaxVal = infoPtr->MinVal + 1;
+//      TRACE(updown, "UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
+//                   infoPtr->MinVal, infoPtr->MaxVal, hwnd);
+      break;
+
+    default:
+//      if (message >= WM_USER)
+//      ERR (updown, "unknown msg %04x wp=%04x lp=%08lx\n",
+//           message, wParam, lParam);
+      return DefWindowProcA (hwnd, message, wParam, lParam);
+    }
 
     return 0;
@@ -844 +845 @@
 
 /***********************************************************************
- *              UPDOWN_Register [Internal]
+ *              UPDOWN_Register [Internal]
  *
  * Registers the updown window class.
@@ -864 +865 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = UPDOWN_CLASSA;
- 
+
     RegisterClassA( &wndClass );
 }
@@ -870 +871 @@
 
 /***********************************************************************
- *              UPDOWN_Unregister       [Internal]
+ *              UPDOWN_Unregister       [Internal]
  *
  * Unregisters the updown window class.
@@ -879 +880 @@
 {
     if (GlobalFindAtomA (UPDOWN_CLASSA))
-        UnregisterClassA (UPDOWN_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (UPDOWN_CLASSA, (HINSTANCE)NULL);
+}
+

trunk/src/kernel32/winmod.cpp

@@ -1 @@
-/* $Id: winmod.cpp,v 1.3 1999-06-10 19:09:05 phaller Exp $ */
+/* $Id: winmod.cpp,v 1.4 1999-06-16 20:25:45 cbratschi Exp $ */
 
 /*
@@ -67 +67 @@
     curnid = (NameId *)((char *)curnid + sizeof(NameId) + strlen(curnid->name));
   }
+
   //try upper case search
   //SvL: Copy it, since string might be located in readonly object
-  upname = (char *)malloc(strlen(lpszName)+1);
+
+  upname = (char *)malloc(strlen(lpszName)+1); //CB: Trap with MFC Toolbar/UpDown samples
   strcpy(upname, lpszName);
   UpCase(upname);