Changeset 236 for trunk/src

Timestamp:

Jun 28, 1999, 5:46:28 PM (26 years ago)

Author:

cbratschi

Message:

bug fixes (unicode) and improvements

Location:

trunk/src/comctl32

Files:

• header.c (modified) (39 diffs)
• listview.c (modified) (366 diffs)
• progress.c (modified) (4 diffs)
• rebar.c (modified) (53 diffs)
• status.c (modified) (9 diffs)
• tab.c (modified) (98 diffs)
• toolbar.c (modified) (9 diffs)
• tooltips.c (modified) (22 diffs)
• trackbar.c (modified) (3 diffs)
• treeview.c (modified) (4 diffs)

trunk/src/comctl32/header.c

@@ -1 @@
-/* $Id: header.c,v 1.5 1999-06-10 16:21:58 achimha Exp $ */
+/* $Id: header.c,v 1.6 1999-06-28 15:46:24 cbratschi Exp $ */
 /*
  *  Header control
@@ -5 +5 @@
  *  Copyright 1998 Eric Kohl
  *  Copyright 1999 Achim Hasenmueller
+ *  Copyright 1999 Christoph Bratschi
  *
  *  TODO:
@@ -49 +50 @@
     r = phdi->rect;
     if (r.right - r.left == 0)
-        return phdi->rect.right;
+        return phdi->rect.right;
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & HDS_BUTTONS) {
-        if (phdi->bDown) {
-            DrawEdge (hdc, &r, BDR_RAISEDOUTER,
-                        BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST);
-            r.left += 2;
+        if (phdi->bDown) {
+            DrawEdge (hdc, &r, BDR_RAISEDOUTER,
+                        BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST);
+            r.left += 2;
             r.top  += 2;
-        }
-        else
-            DrawEdge (hdc, &r, EDGE_RAISED,
-                        BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST);
+        }
+        else
+            DrawEdge (hdc, &r, EDGE_RAISED,
+                        BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST);
     }
     else
@@ -66 +67 @@
 
     if (phdi->fmt & HDF_OWNERDRAW) {
-        DRAWITEMSTRUCT dis;
-        dis.CtlType    = ODT_HEADER;
-        dis.CtlID      = GetWindowLongA (hwnd, GWL_ID);
-        dis.itemID     = iItem;
-        dis.itemAction = ODA_DRAWENTIRE;
-        dis.itemState  = phdi->bDown ? ODS_SELECTED : 0;
-        dis.hwndItem   = hwnd;
-        dis.hDC        = hdc;
-        dis.rcItem     = r;
-        dis.itemData   = phdi->lParam;
-        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-                        (WPARAM)dis.CtlID, (LPARAM)&dis);
+        DRAWITEMSTRUCT dis;
+        dis.CtlType    = ODT_HEADER;
+        dis.CtlID      = GetWindowLongA (hwnd, GWL_ID);
+        dis.itemID     = iItem;
+        dis.itemAction = ODA_DRAWENTIRE;
+        dis.itemState  = phdi->bDown ? ODS_SELECTED : 0;
+        dis.hwndItem   = hwnd;
+        dis.hDC        = hdc;
+        dis.rcItem     = r;
+        dis.itemData   = phdi->lParam;
+        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
+                        (WPARAM)dis.CtlID, (LPARAM)&dis);
     }
     else {
@@ -87 +88 @@
             uTextJustify = DT_RIGHT;
 
-        if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) {
-            BITMAP bmp;
-            HDC    hdcBitmap;
-            INT    yD, yS, cx, cy, rx, ry;
-
-            GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
-
-            ry = r.bottom - r.top;
-            rx = r.right - r.left;
-
-            if (ry >= bmp.bmHeight) {
-                cy = bmp.bmHeight;
-                yD = r.top + (ry - bmp.bmHeight) / 2;
-                yS = 0;
-            }
-            else {
-                cy = ry;
-                yD = r.top;
-                yS = (bmp.bmHeight - ry) / 2;
-
-            }
-
-            if (rx >= bmp.bmWidth + 6) {
-                cx = bmp.bmWidth;
-            }
-            else {
-                cx = rx - 6;
-            }
-
-            hdcBitmap = CreateCompatibleDC (hdc);
-            SelectObject (hdcBitmap, phdi->hbm);
-            BitBlt (hdc, r.left + 3, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
-            DeleteDC (hdcBitmap);
-
-            r.left += (bmp.bmWidth + 3);
-        }
-
-
-        if ((phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) {
-            BITMAP bmp;
-            HDC    hdcBitmap;
-            INT    xD, yD, yS, cx, cy, rx, ry, tx;
-            RECT   textRect;
-
-            GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
-
-            textRect = r;
+        if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) {
+            BITMAP bmp;
+            HDC    hdcBitmap;
+            INT    yD, yS, cx, cy, rx, ry;
+
+            GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
+
+            ry = r.bottom - r.top;
+            rx = r.right - r.left;
+
+            if (ry >= bmp.bmHeight) {
+                cy = bmp.bmHeight;
+                yD = r.top + (ry - bmp.bmHeight) / 2;
+                yS = 0;
+            }
+            else {
+                cy = ry;
+                yD = r.top;
+                yS = (bmp.bmHeight - ry) / 2;
+
+            }
+
+            if (rx >= bmp.bmWidth + 6) {
+                cx = bmp.bmWidth;
+            }
+            else {
+                cx = rx - 6;
+            }
+
+            hdcBitmap = CreateCompatibleDC (hdc);
+            SelectObject (hdcBitmap, phdi->hbm);
+            BitBlt (hdc, r.left + 3, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
+            DeleteDC (hdcBitmap);
+
+            r.left += (bmp.bmWidth + 3);
+        }
+
+
+        if ((phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) {
+            BITMAP bmp;
+            HDC    hdcBitmap;
+            INT    xD, yD, yS, cx, cy, rx, ry, tx;
+            RECT   textRect;
+
+            GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
+
+            textRect = r;
             DrawTextW (hdc, phdi->pszText, lstrlenW (phdi->pszText),
-                  &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT);
-            tx = textRect.right - textRect.left;
-            ry = r.bottom - r.top;
-            rx = r.right - r.left;
-
-            if (ry >= bmp.bmHeight) {
-                cy = bmp.bmHeight;
-                yD = r.top + (ry - bmp.bmHeight) / 2;
-                yS = 0;
-            }
-            else {
-                cy = ry;
-                yD = r.top;
-                yS = (bmp.bmHeight - ry) / 2;
-
-            }
-
-            if (r.left + tx + bmp.bmWidth + 9 <= r.right) {
-                cx = bmp.bmWidth;
-                xD = r.left + tx + 6;
-            }
-            else {
-                if (rx >= bmp.bmWidth + 6) {
-                    cx = bmp.bmWidth;
-                    xD = r.right - bmp.bmWidth - 3;
-                    r.right = xD - 3;
-                }
-                else {
-                    cx = rx - 3;
-                    xD = r.left;
-                    r.right = r.left;
-                }
-            }
-
-            hdcBitmap = CreateCompatibleDC (hdc);
-            SelectObject (hdcBitmap, phdi->hbm);
-            BitBlt (hdc, xD, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
-            DeleteDC (hdcBitmap);
-        }
-
-        if (phdi->fmt & HDF_IMAGE) {
-
-
-/*          ImageList_Draw (infoPtr->himl, phdi->iImage,...); */
-        }
+                  &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT);
+            tx = textRect.right - textRect.left;
+            ry = r.bottom - r.top;
+            rx = r.right - r.left;
+
+            if (ry >= bmp.bmHeight) {
+                cy = bmp.bmHeight;
+                yD = r.top + (ry - bmp.bmHeight) / 2;
+                yS = 0;
+            }
+            else {
+                cy = ry;
+                yD = r.top;
+                yS = (bmp.bmHeight - ry) / 2;
+
+            }
+
+            if (r.left + tx + bmp.bmWidth + 9 <= r.right) {
+                cx = bmp.bmWidth;
+                xD = r.left + tx + 6;
+            }
+            else {
+                if (rx >= bmp.bmWidth + 6) {
+                    cx = bmp.bmWidth;
+                    xD = r.right - bmp.bmWidth - 3;
+                    r.right = xD - 3;
+                }
+                else {
+                    cx = rx - 3;
+                    xD = r.left;
+                    r.right = r.left;
+                }
+            }
+
+            hdcBitmap = CreateCompatibleDC (hdc);
+            SelectObject (hdcBitmap, phdi->hbm);
+            BitBlt (hdc, xD, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY);
+            DeleteDC (hdcBitmap);
+        }
+
+        if (phdi->fmt & HDF_IMAGE) {
+
+
+/*          ImageList_Draw (infoPtr->himl, phdi->iImage,...); */
+        }
 
         if ((phdi->fmt & HDF_STRING) && (phdi->pszText)) {
             oldBkMode = SetBkMode(hdc, TRANSPARENT);
             r.left += 3;
-            r.right -= 3;
-            SetTextColor (hdc, bHotTrack ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
+            r.right -= 3;
+            SetTextColor (hdc, bHotTrack ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
             DrawTextW (hdc, phdi->pszText, lstrlenW (phdi->pszText),
-                  &r, uTextJustify|DT_VCENTER|DT_SINGLELINE);
+                  &r, uTextJustify|DT_VCENTER|DT_SINGLELINE);
             if (oldBkMode != TRANSPARENT)
                 SetBkMode(hdc, oldBkMode);
@@ -197 +198 @@
 
 
-static void 
+static void
 HEADER_Refresh (HWND hwnd, HDC hdc)
 {
@@ -279 +280 @@
 
     if (infoPtr->uNumItem == 0)
-        return;
+        return;
 
     x = 0;
     for (i = 0; i < infoPtr->uNumItem; i++) {
-        phdi = &infoPtr->items[i];
-        phdi->rect.top = 0;
-        phdi->rect.bottom = cy;
-        phdi->rect.left = x;
-        phdi->rect.right = phdi->rect.left + phdi->cxy;
-        x = phdi->rect.right;
+        phdi = &infoPtr->items[i];
+        phdi->rect.top = 0;
+        phdi->rect.bottom = cy;
+        phdi->rect.left = x;
+        phdi->rect.right = phdi->rect.left + phdi->cxy;
+        x = phdi->rect.right;
     }
 }
@@ -307 +308 @@
     if (PtInRect (&rect, *lpPt))
     {
-        if (infoPtr->uNumItem == 0) {
-            *pFlags |= HHT_NOWHERE;
-            *pItem = 1;
-//          TRACE (header, "NOWHERE\n");
-            return;
-        }
-        else {
-            /* somewhere inside */
-            for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) {
-                rect = infoPtr->items[iCount].rect;
-                width = rect.right - rect.left;
-                if (width == 0) {
-                    bNoWidth = TRUE;
-                    continue;
-                }
-                if (PtInRect (&rect, *lpPt)) {
-                    if (width <= 2 * DIVIDER_WIDTH) {
-                        *pFlags |= HHT_ONHEADER;
-                        *pItem = iCount;
-//                      TRACE (header, "ON HEADER %d\n", iCount);
-                        return;
-                    }
-                    if (iCount > 0) {
-                        rcTest = rect;
-                        rcTest.right = rcTest.left + DIVIDER_WIDTH;
-                        if (PtInRect (&rcTest, *lpPt)) {
-                            if (bNoWidth) {
-                                *pFlags |= HHT_ONDIVOPEN;
-                                *pItem = iCount - 1;
-//                              TRACE (header, "ON DIVOPEN %d\n", *pItem);
-                                return;
-                            }
-                            else {
-                                *pFlags |= HHT_ONDIVIDER;
-                                *pItem = iCount - 1;
-//                              TRACE (header, "ON DIVIDER %d\n", *pItem);
-                                return;
-                            }
-                        }
-                    }
-                    rcTest = rect;
-                    rcTest.left = rcTest.right - DIVIDER_WIDTH;
-                    if (PtInRect (&rcTest, *lpPt)) {
-                        *pFlags |= HHT_ONDIVIDER;
-                        *pItem = iCount;
-//                      TRACE (header, "ON DIVIDER %d\n", *pItem);
-                        return;
-                    }
-
-                    *pFlags |= HHT_ONHEADER;
-                    *pItem = iCount;
-//                  TRACE (header, "ON HEADER %d\n", iCount);
-                    return;
-                }
-            }
-
-            /* check for last divider part (on nowhere) */
-            rect = infoPtr->items[infoPtr->uNumItem-1].rect;
-            rect.left = rect.right;
-            rect.right += DIVIDER_WIDTH;
-            if (PtInRect (&rect, *lpPt)) {
-                if (bNoWidth) {
-                    *pFlags |= HHT_ONDIVOPEN;
-                    *pItem = infoPtr->uNumItem - 1;
-//                  TRACE (header, "ON DIVOPEN %d\n", *pItem);
-                    return;
-                }
-                else {
-                    *pFlags |= HHT_ONDIVIDER;
-                    *pItem = infoPtr->uNumItem-1;
-//                  TRACE (header, "ON DIVIDER %d\n", *pItem);
-                    return;
-                }
-            }
-
-            *pFlags |= HHT_NOWHERE;
-            *pItem = 1;
-//          TRACE (header, "NOWHERE\n");
-            return;
-        }
+        if (infoPtr->uNumItem == 0) {
+            *pFlags |= HHT_NOWHERE;
+            *pItem = 1;
+//          TRACE (header, "NOWHERE\n");
+            return;
+        }
+        else {
+            /* somewhere inside */
+            for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) {
+                rect = infoPtr->items[iCount].rect;
+                width = rect.right - rect.left;
+                if (width == 0) {
+                    bNoWidth = TRUE;
+                    continue;
+                }
+                if (PtInRect (&rect, *lpPt)) {
+                    if (width <= 2 * DIVIDER_WIDTH) {
+                        *pFlags |= HHT_ONHEADER;
+                        *pItem = iCount;
+//                      TRACE (header, "ON HEADER %d\n", iCount);
+                        return;
+                    }
+                    if (iCount > 0) {
+                        rcTest = rect;
+                        rcTest.right = rcTest.left + DIVIDER_WIDTH;
+                        if (PtInRect (&rcTest, *lpPt)) {
+                            if (bNoWidth) {
+                                *pFlags |= HHT_ONDIVOPEN;
+                                *pItem = iCount - 1;
+//                              TRACE (header, "ON DIVOPEN %d\n", *pItem);
+                                return;
+                            }
+                            else {
+                                *pFlags |= HHT_ONDIVIDER;
+                                *pItem = iCount - 1;
+//                              TRACE (header, "ON DIVIDER %d\n", *pItem);
+                                return;
+                            }
+                        }
+                    }
+                    rcTest = rect;
+                    rcTest.left = rcTest.right - DIVIDER_WIDTH;
+                    if (PtInRect (&rcTest, *lpPt)) {
+                        *pFlags |= HHT_ONDIVIDER;
+                        *pItem = iCount;
+//                      TRACE (header, "ON DIVIDER %d\n", *pItem);
+                        return;
+                    }
+
+                    *pFlags |= HHT_ONHEADER;
+                    *pItem = iCount;
+//                  TRACE (header, "ON HEADER %d\n", iCount);
+                    return;
+                }
+            }
+
+            /* check for last divider part (on nowhere) */
+            rect = infoPtr->items[infoPtr->uNumItem-1].rect;
+            rect.left = rect.right;
+            rect.right += DIVIDER_WIDTH;
+            if (PtInRect (&rect, *lpPt)) {
+                if (bNoWidth) {
+                    *pFlags |= HHT_ONDIVOPEN;
+                    *pItem = infoPtr->uNumItem - 1;
+//                  TRACE (header, "ON DIVOPEN %d\n", *pItem);
+                    return;
+                }
+                else {
+                    *pFlags |= HHT_ONDIVIDER;
+                    *pItem = infoPtr->uNumItem-1;
+//                  TRACE (header, "ON DIVIDER %d\n", *pItem);
+                    return;
+                }
+            }
+
+            *pFlags |= HHT_NOWHERE;
+            *pItem = 1;
+//          TRACE (header, "NOWHERE\n");
+            return;
+        }
     }
     else {
-        if (lpPt->x < rect.left) {
-//         TRACE (header, "TO LEFT\n");
-           *pFlags |= HHT_TOLEFT;
-        }
-        else if (lpPt->x > rect.right) {
-//          TRACE (header, "TO LEFT\n");
-            *pFlags |= HHT_TORIGHT;
-        }
-
-        if (lpPt->y < rect.top) {
-//          TRACE (header, "ABOVE\n");
-            *pFlags |= HHT_ABOVE;
-        }
-        else if (lpPt->y > rect.bottom) {
-//          TRACE (header, "BELOW\n");
-            *pFlags |= HHT_BELOW;
-        }
+        if (lpPt->x < rect.left) {
+//         TRACE (header, "TO LEFT\n");
+           *pFlags |= HHT_TOLEFT;
+        }
+        else if (lpPt->x > rect.right) {
+//          TRACE (header, "TO LEFT\n");
+            *pFlags |= HHT_TORIGHT;
+        }
+
+        if (lpPt->y < rect.top) {
+//          TRACE (header, "ABOVE\n");
+            *pFlags |= HHT_ABOVE;
+        }
+        else if (lpPt->y > rect.bottom) {
+//          TRACE (header, "BELOW\n");
+            *pFlags |= HHT_BELOW;
+        }
     }
 
@@ -442 +443 @@
 
     return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                                   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+                                   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
 }
 
@@ -472 +473 @@
 
     return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                               (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
+                               (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
 }
 
@@ -489 +490 @@
 
     return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                               (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
+                               (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr);
 }
 
@@ -509 +510 @@
 
 //    TRACE(header, "[iItem=%d]\n", iItem);
-    
+
     if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem))
         return FALSE;
@@ -550 +551 @@
     HEADER_Refresh (hwnd, hdc);
     ReleaseDC (hwnd, hdc);
-    
+
     return TRUE;
 }
@@ -573 +574 @@
 
     if (!phdi)
-        return FALSE;
+        return FALSE;
     if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
@@ -580 +581 @@
 
     if (phdi->mask == 0)
-        return TRUE;
+        return TRUE;
 
     lpItem = (HEADER_ITEM*)&infoPtr->items[nItem];
     if (phdi->mask & HDI_BITMAP)
-        phdi->hbm = lpItem->hbm;
+        phdi->hbm = lpItem->hbm;
 
     if (phdi->mask & HDI_FORMAT)
-        phdi->fmt = lpItem->fmt;
+        phdi->fmt = lpItem->fmt;
 
     if (phdi->mask & HDI_WIDTH)
-        phdi->cxy = lpItem->cxy;
+        phdi->cxy = lpItem->cxy;
 
     if (phdi->mask & HDI_LPARAM)
-        phdi->lParam = lpItem->lParam;
+        phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-        if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
-            lstrcpynWtoA (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
-        else
-            phdi->pszText = LPSTR_TEXTCALLBACKA;
+        if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
+            lstrcpynWtoA (phdi->pszText, lpItem->pszText, MIN(phdi->cchTextMax,lstrlenW(lpItem->pszText)));
+        else
+            phdi->pszText = LPSTR_TEXTCALLBACKA;
     }
 
     if (phdi->mask & HDI_IMAGE)
-        phdi->iImage = lpItem->iImage;
+        phdi->iImage = lpItem->iImage;
 
     if (phdi->mask & HDI_ORDER)
-        phdi->iOrder = lpItem->iOrder;
+        phdi->iOrder = lpItem->iOrder;
 
     return TRUE;
@@ -621 +622 @@
 
     if (!phdi)
-        return FALSE;
+        return FALSE;
     if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
@@ -628 +629 @@
 
     if (phdi->mask == 0)
-        return TRUE;
+        return TRUE;
 
     lpItem = (HEADER_ITEM*)&infoPtr->items[nItem];
     if (phdi->mask & HDI_BITMAP)
-        phdi->hbm = lpItem->hbm;
+        phdi->hbm = lpItem->hbm;
 
     if (phdi->mask & HDI_FORMAT)
-        phdi->fmt = lpItem->fmt;
+        phdi->fmt = lpItem->fmt;
 
     if (phdi->mask & HDI_WIDTH)
-        phdi->cxy = lpItem->cxy;
+        phdi->cxy = lpItem->cxy;
 
     if (phdi->mask & HDI_LPARAM)
-        phdi->lParam = lpItem->lParam;
+        phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-        if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
-            lstrcpynW (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
-        else
-            phdi->pszText = LPSTR_TEXTCALLBACKW;
+        if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
+            lstrcpynW (phdi->pszText, lpItem->pszText, MIN(phdi->cchTextMax,lstrlenW(lpItem->pszText)));
+        else
+            phdi->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_IMAGE)
-        phdi->iImage = lpItem->iImage;
+        phdi->iImage = lpItem->iImage;
 
     if (phdi->mask & HDI_ORDER)
-        phdi->iOrder = lpItem->iOrder;
+        phdi->iOrder = lpItem->iOrder;
 
     return TRUE;
@@ -720 +721 @@
 
     if ((phdi == NULL) || (nItem < 0))
-        return -1;
+        return -1;
 
     if (nItem > infoPtr->uNumItem)
@@ -752 +753 @@
             }
         }
-    
+
         COMCTL32_Free (oldItems);
     }
@@ -760 +761 @@
 
     if (phdi->mask & HDI_WIDTH)
-        lpItem->cxy = phdi->cxy;
+        lpItem->cxy = phdi->cxy;
 
     if (phdi->mask & HDI_TEXT) {
-        if (!phdi->pszText) /* null pointer check */
-            phdi->pszText = "";
-        if (phdi->pszText != LPSTR_TEXTCALLBACKA) {
-            len = lstrlenA (phdi->pszText);
-            lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyAtoW (lpItem->pszText, phdi->pszText);
-        }
-        else
-            lpItem->pszText = LPSTR_TEXTCALLBACKW;
+        if (!phdi->pszText) /* null pointer check */
+            phdi->pszText = "";
+        if (phdi->pszText != LPSTR_TEXTCALLBACKA) {
+            len = lstrlenA (phdi->pszText);
+            lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyAtoW (lpItem->pszText, phdi->pszText);
+        }
+        else
+            lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_FORMAT)
-        lpItem->fmt = phdi->fmt;
+        lpItem->fmt = phdi->fmt;
 
     if (lpItem->fmt == 0)
-        lpItem->fmt = HDF_LEFT;
+        lpItem->fmt = HDF_LEFT;
 
     if (phdi->mask & HDI_BITMAP)
@@ -813 +814 @@
 
     if ((phdi == NULL) || (nItem < 0))
-        return -1;
+        return -1;
 
     if (nItem > infoPtr->uNumItem)
@@ -839 +840 @@
         }
 
-        COMCTL32_Free (oldItems);
+        COMCTL32_Free (oldItems);
     }
 
@@ -846 +847 @@
 
     if (phdi->mask & HDI_WIDTH)
-        lpItem->cxy = phdi->cxy;
+        lpItem->cxy = phdi->cxy;
 
     if (phdi->mask & HDI_TEXT) {
-        WCHAR wide_null_char = 0;
-        if (!phdi->pszText) /* null pointer check */
-            phdi->pszText = &wide_null_char;    
-        if (phdi->pszText != LPSTR_TEXTCALLBACKW) {
-            len = lstrlenW (phdi->pszText);
-            lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyW (lpItem->pszText, phdi->pszText);
-        }
-        else
-            lpItem->pszText = LPSTR_TEXTCALLBACKW;
+        WCHAR wide_null_char = 0;
+        if (!phdi->pszText) /* null pointer check */
+            phdi->pszText = &wide_null_char;
+        if (phdi->pszText != LPSTR_TEXTCALLBACKW) {
+            len = lstrlenW (phdi->pszText);
+            lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyW (lpItem->pszText, phdi->pszText);
+        }
+        else
+            lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_FORMAT)
-        lpItem->fmt = phdi->fmt;
+        lpItem->fmt = phdi->fmt;
 
     if (lpItem->fmt == 0)
-        lpItem->fmt = HDF_LEFT;
+        lpItem->fmt = HDF_LEFT;
 
     if (phdi->mask & HDI_BITMAP)
@@ -947 +948 @@
 
     if (phdi == NULL)
-        return FALSE;
+        return FALSE;
     if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
@@ -954 +955 @@
 
     if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, nItem))
-        return FALSE;
+        return FALSE;
 
     lpItem = (HEADER_ITEM*)&infoPtr->items[nItem];
     if (phdi->mask & HDI_BITMAP)
-        lpItem->hbm = phdi->hbm;
+        lpItem->hbm = phdi->hbm;
 
     if (phdi->mask & HDI_FORMAT)
-        lpItem->fmt = phdi->fmt;
+        lpItem->fmt = phdi->fmt;
 
     if (phdi->mask & HDI_LPARAM)
-        lpItem->lParam = phdi->lParam;
+        lpItem->lParam = phdi->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-        if (phdi->pszText != LPSTR_TEXTCALLBACKA) {
-            if (lpItem->pszText) {
-                COMCTL32_Free (lpItem->pszText);
-                lpItem->pszText = NULL;
-            }
-            if (phdi->pszText) {
-                INT len = lstrlenA (phdi->pszText);
-                lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                lstrcpyAtoW (lpItem->pszText, phdi->pszText);
-            }
-        }
-        else
-            lpItem->pszText = LPSTR_TEXTCALLBACKW;
+        if (phdi->pszText != LPSTR_TEXTCALLBACKA) {
+            if (lpItem->pszText) {
+                COMCTL32_Free (lpItem->pszText);
+                lpItem->pszText = NULL;
+            }
+            if (phdi->pszText) {
+                INT len = lstrlenA (phdi->pszText);
+                lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                lstrcpyAtoW (lpItem->pszText, phdi->pszText);
+            }
+        }
+        else
+            lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_WIDTH)
-        lpItem->cxy = phdi->cxy;
+        lpItem->cxy = phdi->cxy;
 
     if (phdi->mask & HDI_IMAGE)
-        lpItem->iImage = phdi->iImage;
+        lpItem->iImage = phdi->iImage;
 
     if (phdi->mask & HDI_ORDER)
-        lpItem->iOrder = phdi->iOrder;
+        lpItem->iOrder = phdi->iOrder;
 
     HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem);
@@ -1012 +1013 @@
 
     if (phdi == NULL)
-        return FALSE;
+        return FALSE;
     if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
         return FALSE;
@@ -1019 +1020 @@
 
     if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, nItem))
-        return FALSE;
+        return FALSE;
 
     lpItem = (HEADER_ITEM*)&infoPtr->items[nItem];
     if (phdi->mask & HDI_BITMAP)
-        lpItem->hbm = phdi->hbm;
+        lpItem->hbm = phdi->hbm;
 
     if (phdi->mask & HDI_FORMAT)
-        lpItem->fmt = phdi->fmt;
+        lpItem->fmt = phdi->fmt;
 
     if (phdi->mask & HDI_LPARAM)
-        lpItem->lParam = phdi->lParam;
+        lpItem->lParam = phdi->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-        if (phdi->pszText != LPSTR_TEXTCALLBACKW) {
-            if (lpItem->pszText) {
-                COMCTL32_Free (lpItem->pszText);
-                lpItem->pszText = NULL;
-            }
-            if (phdi->pszText) {
-                INT len = lstrlenW (phdi->pszText);
-                lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-                lstrcpyW (lpItem->pszText, phdi->pszText);
-            }
-        }
-        else
-            lpItem->pszText = LPSTR_TEXTCALLBACKW;
+        if (phdi->pszText != LPSTR_TEXTCALLBACKW) {
+            if (lpItem->pszText) {
+                COMCTL32_Free (lpItem->pszText);
+                lpItem->pszText = NULL;
+            }
+            if (phdi->pszText) {
+                INT len = lstrlenW (phdi->pszText);
+                lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+                lstrcpyW (lpItem->pszText, phdi->pszText);
+            }
+        }
+        else
+            lpItem->pszText = LPSTR_TEXTCALLBACKW;
     }
 
     if (phdi->mask & HDI_WIDTH)
-        lpItem->cxy = phdi->cxy;
+        lpItem->cxy = phdi->cxy;
 
     if (phdi->mask & HDI_IMAGE)
-        lpItem->iImage = phdi->iImage;
+        lpItem->iImage = phdi->iImage;
 
     if (phdi->mask & HDI_ORDER)
-        lpItem->iOrder = phdi->iOrder;
+        lpItem->iOrder = phdi->iOrder;
 
     HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem);
@@ -1126 +1127 @@
 
     if (infoPtr->items) {
-        lpItem = (HEADER_ITEM*)infoPtr->items;
+        lpItem = (HEADER_ITEM*)infoPtr->items;
         for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) {
-            if ((lpItem->pszText) && (lpItem->pszText != LPSTR_TEXTCALLBACKW))
-                COMCTL32_Free (lpItem->pszText);
+            if ((lpItem->pszText) && (lpItem->pszText != LPSTR_TEXTCALLBACKW))
+                COMCTL32_Free (lpItem->pszText);
         }
         COMCTL32_Free (infoPtr->items);
@@ -1135 +1136 @@
 
     if (infoPtr->himl)
-        ImageList_Destroy (infoPtr->himl);
+        ImageList_Destroy (infoPtr->himl);
 
     COMCTL32_Free (infoPtr);
@@ -1159 +1160 @@
     INT   nItem;
 
-    pt.x = (INT)LOWORD(lParam); 
+    pt.x = (INT)LOWORD(lParam);
     pt.y = (INT)HIWORD(lParam);
     HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem);
 
     if ((GetWindowLongA (hwnd, GWL_STYLE) & HDS_BUTTONS) && (flags == HHT_ONHEADER))
-        HEADER_SendHeaderNotify (hwnd, HDN_ITEMDBLCLICKA, nItem);
+        HEADER_SendHeaderNotify (hwnd, HDN_ITEMDBLCLICKA, nItem);
     else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN))
-        HEADER_SendHeaderNotify (hwnd, HDN_DIVIDERDBLCLICKA, nItem);
+        HEADER_SendHeaderNotify (hwnd, HDN_DIVIDERDBLCLICKA, nItem);
 
     return 0;
@@ -1182 +1183 @@
     HDC   hdc;
 
-    pt.x = (INT)LOWORD(lParam); 
+    pt.x = (INT)LOWORD(lParam);
     pt.y = (INT)HIWORD(lParam);
     HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem);
 
     if ((dwStyle & HDS_BUTTONS) && (flags == HHT_ONHEADER)) {
-        SetCapture (hwnd);
-        infoPtr->bCaptured = TRUE;   
-        infoPtr->bPressed  = TRUE;
-        infoPtr->iMoveItem = nItem;
-
-        infoPtr->items[nItem].bDown = TRUE;
-
-        /* Send WM_CUSTOMDRAW */
-        hdc = GetDC (hwnd);
-        HEADER_RefreshItem (hwnd, hdc, nItem);
-        ReleaseDC (hwnd, hdc);
-
-//      TRACE (header, "Pressed item %d!\n", nItem);
-    } 
+        SetCapture (hwnd);
+        infoPtr->bCaptured = TRUE;
+        infoPtr->bPressed  = TRUE;
+        infoPtr->iMoveItem = nItem;
+
+        infoPtr->items[nItem].bDown = TRUE;
+
+        /* Send WM_CUSTOMDRAW */
+        hdc = GetDC (hwnd);
+        HEADER_RefreshItem (hwnd, hdc, nItem);
+        ReleaseDC (hwnd, hdc);
+
+//      TRACE (header, "Pressed item %d!\n", nItem);
+    }
     else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) {
-        if (!(HEADER_SendHeaderNotify (hwnd, HDN_BEGINTRACKA, nItem))) {
-            SetCapture (hwnd);
-            infoPtr->bCaptured = TRUE;   
-            infoPtr->bTracking = TRUE;
-            infoPtr->iMoveItem = nItem;
-            infoPtr->nOldWidth = infoPtr->items[nItem].cxy;
-            infoPtr->xTrackOffset = infoPtr->items[nItem].rect.right - pt.x;
-
-            if (!(dwStyle & HDS_FULLDRAG)) {
-                infoPtr->xOldTrack = infoPtr->items[nItem].rect.right;
-                hdc = GetDC (hwnd);
-                HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
-                ReleaseDC (hwnd, hdc);
-            }
-
-//          TRACE (header, "Begin tracking item %d!\n", nItem);
-        }
+        if (!(HEADER_SendHeaderNotify (hwnd, HDN_BEGINTRACKA, nItem))) {
+            SetCapture (hwnd);
+            infoPtr->bCaptured = TRUE;
+            infoPtr->bTracking = TRUE;
+            infoPtr->iMoveItem = nItem;
+            infoPtr->nOldWidth = infoPtr->items[nItem].cxy;
+            infoPtr->xTrackOffset = infoPtr->items[nItem].rect.right - pt.x;
+
+            if (!(dwStyle & HDS_FULLDRAG)) {
+                infoPtr->xOldTrack = infoPtr->items[nItem].rect.right;
+                hdc = GetDC (hwnd);
+                HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
+                ReleaseDC (hwnd, hdc);
+            }
+
+//          TRACE (header, "Begin tracking item %d!\n", nItem);
+        }
     }
 
@@ -1240 +1241 @@
 
     if (infoPtr->bPressed) {
-        if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) {
-            infoPtr->items[infoPtr->iMoveItem].bDown = FALSE;
-            hdc = GetDC (hwnd);
-            HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem);
-            ReleaseDC (hwnd, hdc);
-
-            HEADER_SendClickNotify (hwnd, HDN_ITEMCLICKA, infoPtr->iMoveItem);
-        }
-//      TRACE (header, "Released item %d!\n", infoPtr->iMoveItem);
-        infoPtr->bPressed = FALSE;
+        if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) {
+            infoPtr->items[infoPtr->iMoveItem].bDown = FALSE;
+            hdc = GetDC (hwnd);
+            HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem);
+            ReleaseDC (hwnd, hdc);
+
+            HEADER_SendClickNotify (hwnd, HDN_ITEMCLICKA, infoPtr->iMoveItem);
+        }
+//      TRACE (header, "Released item %d!\n", infoPtr->iMoveItem);
+        infoPtr->bPressed = FALSE;
     }
     else if (infoPtr->bTracking) {
-//      TRACE (header, "End tracking item %d!\n", infoPtr->iMoveItem);
-        infoPtr->bTracking = FALSE;
-
-        HEADER_SendHeaderNotify (hwnd, HDN_ENDTRACKA, infoPtr->iMoveItem);
-
-        if (!(dwStyle & HDS_FULLDRAG)) {
-            hdc = GetDC (hwnd);
-            HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
-            ReleaseDC (hwnd, hdc);
-            if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
-                infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
-            else {
-                nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
-                if (nWidth < 0)
-                    nWidth = 0;
-                infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
-                HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem);
-            }
-
-            HEADER_SetItemBounds (hwnd);
-            hdc = GetDC (hwnd);
-            HEADER_Refresh (hwnd, hdc);
-            ReleaseDC (hwnd, hdc);
-        }
+//      TRACE (header, "End tracking item %d!\n", infoPtr->iMoveItem);
+        infoPtr->bTracking = FALSE;
+
+        HEADER_SendHeaderNotify (hwnd, HDN_ENDTRACKA, infoPtr->iMoveItem);
+
+        if (!(dwStyle & HDS_FULLDRAG)) {
+            hdc = GetDC (hwnd);
+            HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
+            ReleaseDC (hwnd, hdc);
+            if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
+                infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
+            else {
+                nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
+                if (nWidth < 0)
+                    nWidth = 0;
+                infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
+                HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem);
+            }
+
+            HEADER_SetItemBounds (hwnd);
+            hdc = GetDC (hwnd);
+            HEADER_Refresh (hwnd, hdc);
+            ReleaseDC (hwnd, hdc);
+        }
     }
 
     if (infoPtr->bCaptured) {
-        infoPtr->bCaptured = FALSE;
-        ReleaseCapture ();
-        HEADER_SendSimpleNotify (hwnd, NM_RELEASEDCAPTURE);
+        infoPtr->bCaptured = FALSE;
+        ReleaseCapture ();
+        HEADER_SendSimpleNotify (hwnd, NM_RELEASEDCAPTURE);
     }
 
@@ -1303 +1304 @@
 
     if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) {
-        if (flags & (HHT_ONHEADER | HHT_ONDIVIDER | HHT_ONDIVOPEN))
-            infoPtr->iHotItem = nItem;
-        else
-            infoPtr->iHotItem = -1;
-        hdc = GetDC (hwnd);
-        HEADER_Refresh (hwnd, hdc);
-        ReleaseDC (hwnd, hdc);
+        if (flags & (HHT_ONHEADER | HHT_ONDIVIDER | HHT_ONDIVOPEN))
+            infoPtr->iHotItem = nItem;
+        else
+            infoPtr->iHotItem = -1;
+        hdc = GetDC (hwnd);
+        HEADER_Refresh (hwnd, hdc);
+        ReleaseDC (hwnd, hdc);
     }
 
     if (infoPtr->bCaptured) {
-        if (infoPtr->bPressed) {
-            if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER))
-                infoPtr->items[infoPtr->iMoveItem].bDown = TRUE;
-            else
-                infoPtr->items[infoPtr->iMoveItem].bDown = FALSE;
-            hdc = GetDC (hwnd);
-            HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem);
-            ReleaseDC (hwnd, hdc);
-
-//          TRACE (header, "Moving pressed item %d!\n", infoPtr->iMoveItem);
-        }
-        else if (infoPtr->bTracking) {
-            if (dwStyle & HDS_FULLDRAG) {
-                if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
-                    infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
-                else {
-                    nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
-                    if (nWidth < 0)
-                        nWidth = 0;
-                    infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
-                    HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA,
-                                             infoPtr->iMoveItem);
-                }
-                HEADER_SetItemBounds (hwnd);
-                hdc = GetDC (hwnd);
-                HEADER_Refresh (hwnd, hdc);
-                ReleaseDC (hwnd, hdc);
-            }
-            else {
-                hdc = GetDC (hwnd);
-                HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
-                infoPtr->xOldTrack = pt.x + infoPtr->xTrackOffset;
-                if (infoPtr->xOldTrack < infoPtr->items[infoPtr->iMoveItem].rect.left)
-                    infoPtr->xOldTrack = infoPtr->items[infoPtr->iMoveItem].rect.left;
-                infoPtr->items[infoPtr->iMoveItem].cxy = 
-                    infoPtr->xOldTrack - infoPtr->items[infoPtr->iMoveItem].rect.left;
-                HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
-                ReleaseDC (hwnd, hdc);
-            }
-
-            HEADER_SendHeaderNotify (hwnd, HDN_TRACKA, infoPtr->iMoveItem);
-//          TRACE (header, "Tracking item %d!\n", infoPtr->iMoveItem);
-        }
+        if (infoPtr->bPressed) {
+            if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER))
+                infoPtr->items[infoPtr->iMoveItem].bDown = TRUE;
+            else
+                infoPtr->items[infoPtr->iMoveItem].bDown = FALSE;
+            hdc = GetDC (hwnd);
+            HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem);
+            ReleaseDC (hwnd, hdc);
+
+//          TRACE (header, "Moving pressed item %d!\n", infoPtr->iMoveItem);
+        }
+        else if (infoPtr->bTracking) {
+            if (dwStyle & HDS_FULLDRAG) {
+                if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
+                    infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
+                else {
+                    nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
+                    if (nWidth < 0)
+                        nWidth = 0;
+                    infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
+                    HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA,
+                                             infoPtr->iMoveItem);
+                }
+                HEADER_SetItemBounds (hwnd);
+                hdc = GetDC (hwnd);
+                HEADER_Refresh (hwnd, hdc);
+                ReleaseDC (hwnd, hdc);
+            }
+            else {
+                hdc = GetDC (hwnd);
+                HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
+                infoPtr->xOldTrack = pt.x + infoPtr->xTrackOffset;
+                if (infoPtr->xOldTrack < infoPtr->items[infoPtr->iMoveItem].rect.left)
+                    infoPtr->xOldTrack = infoPtr->items[infoPtr->iMoveItem].rect.left;
+                infoPtr->items[infoPtr->iMoveItem].cxy =
+                    infoPtr->xOldTrack - infoPtr->items[infoPtr->iMoveItem].rect.left;
+                HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack);
+                ReleaseDC (hwnd, hdc);
+            }
+
+            HEADER_SendHeaderNotify (hwnd, HDN_TRACKA, infoPtr->iMoveItem);
+//          TRACE (header, "Tracking item %d!\n", infoPtr->iMoveItem);
+        }
     }
 
     if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) {
-//      FIXME (header, "hot track support!\n");
+//      FIXME (header, "hot track support!\n");
     }
 
@@ -1375 +1376 @@
     HEADER_Refresh (hwnd, hdc);
     if(!wParam)
-        EndPaint (hwnd, &ps);
+        EndPaint (hwnd, &ps);
     return 0;
 }
@@ -1447 +1448 @@
 {
     switch (msg) {
-        case HDM_CREATEDRAGIMAGE:
-            return HEADER_CreateDragImage (hwnd, wParam);
-
-        case HDM_DELETEITEM:
-            return HEADER_DeleteItem (hwnd, wParam);
-
-        case HDM_GETIMAGELIST:
-            return HEADER_GetImageList (hwnd);
-
-        case HDM_GETITEMA:
-            return HEADER_GetItemA (hwnd, wParam, lParam);
-
-        case HDM_GETITEMW:
-            return HEADER_GetItemW (hwnd, wParam, lParam);
-
-        case HDM_GETITEMCOUNT:
-            return HEADER_GetItemCount (hwnd);
-
-        case HDM_GETITEMRECT:
-            return HEADER_GetItemRect (hwnd, wParam, lParam);
-
-/*      case HDM_GETORDERARRAY: */
-
-        case HDM_GETUNICODEFORMAT:
-            return HEADER_GetUnicodeFormat (hwnd);
-
-        case HDM_HITTEST:
-            return HEADER_HitTest (hwnd, wParam, lParam);
-
-        case HDM_INSERTITEMA:
-            return HEADER_InsertItemA (hwnd, wParam, lParam);
-
-        case HDM_INSERTITEMW:
-            return HEADER_InsertItemW (hwnd, wParam, lParam);
-
-        case HDM_LAYOUT:
-            return HEADER_Layout (hwnd, wParam, lParam);
-
-        case HDM_SETIMAGELIST:
-            return HEADER_SetImageList (hwnd, wParam, lParam);
-
-        case HDM_SETITEMA:
-            return HEADER_SetItemA (hwnd, wParam, lParam);
-
-        case HDM_SETITEMW:
-            return HEADER_SetItemW (hwnd, wParam, lParam);
-
-/*      case HDM_SETORDERARRAY: */
-
-        case HDM_SETUNICODEFORMAT:
-            return HEADER_SetUnicodeFormat (hwnd, wParam);
+        case HDM_CREATEDRAGIMAGE:
+            return HEADER_CreateDragImage (hwnd, wParam);
+
+        case HDM_DELETEITEM:
+            return HEADER_DeleteItem (hwnd, wParam);
+
+        case HDM_GETIMAGELIST:
+            return HEADER_GetImageList (hwnd);
+
+        case HDM_GETITEMA:
+            return HEADER_GetItemA (hwnd, wParam, lParam);
+
+        case HDM_GETITEMW:
+            return HEADER_GetItemW (hwnd, wParam, lParam);
+
+        case HDM_GETITEMCOUNT:
+            return HEADER_GetItemCount (hwnd);
+
+        case HDM_GETITEMRECT:
+            return HEADER_GetItemRect (hwnd, wParam, lParam);
+
+/*      case HDM_GETORDERARRAY: */
+
+        case HDM_GETUNICODEFORMAT:
+            return HEADER_GetUnicodeFormat (hwnd);
+
+        case HDM_HITTEST:
+            return HEADER_HitTest (hwnd, wParam, lParam);
+
+        case HDM_INSERTITEMA:
+            return HEADER_InsertItemA (hwnd, wParam, lParam);
+
+        case HDM_INSERTITEMW:
+            return HEADER_InsertItemW (hwnd, wParam, lParam);
+
+        case HDM_LAYOUT:
+            return HEADER_Layout (hwnd, wParam, lParam);
+
+        case HDM_SETIMAGELIST:
+            return HEADER_SetImageList (hwnd, wParam, lParam);
+
+        case HDM_SETITEMA:
+            return HEADER_SetItemA (hwnd, wParam, lParam);
+
+        case HDM_SETITEMW:
+            return HEADER_SetItemW (hwnd, wParam, lParam);
+
+/*      case HDM_SETORDERARRAY: */
+
+        case HDM_SETUNICODEFORMAT:
+            return HEADER_SetUnicodeFormat (hwnd, wParam);
 
 
@@ -1527 +1528 @@
             return HEADER_MouseMove (hwnd, wParam, lParam);
 
-/*      case WM_NOTIFYFORMAT: */
+/*      case WM_NOTIFYFORMAT: */
 
         case WM_PAINT:
@@ -1542 +1543 @@
 
         default:
-//            if (msg >= WM_USER) 
-//              ERR (header, "unknown msg %04x wp=%04x lp=%08lx\n",
-//                   msg, wParam, lParam );
-            return DefWindowProcA (hwnd, msg, wParam, lParam);
+//            if (msg >= WM_USER)
+//              ERR (header, "unknown msg %04x wp=%04x lp=%08lx\n",
+//                   msg, wParam, lParam );
+            return DefWindowProcA (hwnd, msg, wParam, lParam);
     }
     return 0;
@@ -1565 +1566 @@
     wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.lpszClassName = WC_HEADERA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -1574 +1575 @@
 {
     if (GlobalFindAtomA (WC_HEADERA))
-        UnregisterClassA (WC_HEADERA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (WC_HEADERA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/listview.c

@@ -5 +5 @@
  * Copyright 1999 Luc Tourangeau
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * NOTES
- * Listview control implementation. 
+ * Listview control implementation.
  *
  * TODO:
@@ -17 +18 @@
  *
  * Data structure:
- *   LISTVIEW_SetItemCount : empty stub 
- * 
+ *   LISTVIEW_SetItemCount : empty stub
+ *
  * Unicode:
  *   LISTVIEW_SetItem32W : no unicode support
@@ -30 +31 @@
  *   LISTVIEW_GetHotItem : not implemented
  *   LISTVIEW_GetHoverTime : not implemented
- *   LISTVIEW_GetISearchString : not implemented 
+ *   LISTVIEW_GetISearchString : not implemented
  *   LISTVIEW_GetBkImage : not implemented
  *   LISTVIEW_EditLabel : REPORT (need to implement a timer)
@@ -36 +37 @@
  *   LISTVIEW_Arrange : empty stub
  *   LISTVIEW_ApproximateViewRect : incomplete
- *   LISTVIEW_Scroll : not implemented 
+ *   LISTVIEW_Scroll : not implemented
  *   LISTVIEW_RedrawItems : empty stub
  *   LISTVIEW_Update : not completed
@@ -48 +49 @@
 
 /*
- * constants 
+ * constants
  */
 
@@ -74 +75 @@
 
 /* default column width for items in list display mode */
-#define DEFAULT_COLUMN_WIDTH 96 
-
-/* 
+#define DEFAULT_COLUMN_WIDTH 96
+
+/*
  * macros
  */
@@ -87 +88 @@
 #define GETITEMCOUNT(infoPtr) ((infoPtr)->hdpaItems->nItemCount)
 
-/* 
- * forward declarations 
+/*
+ * forward declarations
  */
 static INT LISTVIEW_HitTestItem(HWND, LPLVHITTESTINFO);
@@ -127 +128 @@
 /***
  * DESCRIPTION:
- * Update the scrollbars. This functions should be called whenever 
+ * Update the scrollbars. This functions should be called whenever
  * the content, size or view changes.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -138 +139 @@
 static VOID LISTVIEW_UpdateScroll(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); 
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   UINT uView =  lStyle & LVS_TYPEMASK;
@@ -164 +165 @@
         scrollInfo.nMax = nHiddenItemCount / nCountPerColumn + 1;
       }
-      
+
       scrollInfo.nPos = ListView_GetTopIndex(hwnd) / nCountPerColumn;
       /*scrollInfo.nPage = LISTVIEW_GetCountPerRow(hwnd);*/
@@ -175 +176 @@
       if (lStyle & WS_HSCROLL)
       {
-        ShowScrollBar(hwnd, SB_HORZ, FALSE);
+        ShowScrollBar(hwnd, SB_HORZ, FALSE);
       }
     }
@@ -196 +197 @@
 /*     } */
 
-    /* horizontal scrolling has not been implemented yet! I experienced some 
+    /* horizontal scrolling has not been implemented yet! I experienced some
        problems when performing child window scrolling. */
   }
@@ -228 +229 @@
           scrollInfo.nPos = 0;
         }
-  
+
         if (nHiddenWidth % nScrollPosWidth == 0)
         {
-          scrollInfo.nMax = nHiddenWidth / nScrollPosWidth; 
+          scrollInfo.nMax = nHiddenWidth / nScrollPosWidth;
         }
         else
         {
-          scrollInfo.nMax = nHiddenWidth / nScrollPosWidth + 1; 
-        }
-          
+          scrollInfo.nMax = nHiddenWidth / nScrollPosWidth + 1;
+        }
+
         scrollInfo.nMin = 0;
         /*scrollInfo.nPage = 10;*/
@@ -274 +275 @@
         if (nHiddenHeight % nScrollPosHeight == 0)
         {
-          scrollInfo.nMax = nHiddenHeight / nScrollPosHeight; 
+          scrollInfo.nMax = nHiddenHeight / nScrollPosHeight;
         }
         else
         {
-          scrollInfo.nMax = nHiddenHeight / nScrollPosHeight + 1; 
+          scrollInfo.nMax = nHiddenHeight / nScrollPosHeight + 1;
         }
 
@@ -301 +302 @@
  * Prints a message for unsupported window styles.
  * A kind of TODO list for window styles.
- * 
+ *
  * PARAMETER(S):
  * [I] LONG : window style
@@ -354 +355 @@
  * DESCRIPTION:
  * Aligns the items with the top edge of the window.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -369 +370 @@
   RECT rcView;
   INT i;
-  
+
   if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
   {
     ZeroMemory(&ptItem, sizeof(POINT));
     ZeroMemory(&rcView, sizeof(RECT));
-    
+
     if (nListWidth > infoPtr->nItemWidth)
     {
@@ -384 +385 @@
           ptItem.y += infoPtr->nItemHeight;
         }
-        
+
         ListView_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
         ptItem.x += infoPtr->nItemWidth;
@@ -411 +412 @@
  * DESCRIPTION:
  * Aligns the items with the left edge of the window.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -426 +427 @@
   RECT rcView;
   INT i;
-  
+
   if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
   {
@@ -468 +469 @@
  * DESCRIPTION:
  * Set the bounding rectangle of all the items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -482 +483 @@
   BOOL bResult = FALSE;
 
-//  TRACE("(hwnd=%x, left=%d, top=%d, right=%d, bottom=%d)\n", hwnd, 
+//  TRACE("(hwnd=%x, left=%d, top=%d, right=%d, bottom=%d)\n", hwnd,
 //        lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
-  
+
   if (lprcView != NULL)
   {
@@ -500 +501 @@
  * DESCRIPTION:
  * Retrieves the bounding rectangle of all the items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -528 +529 @@
     }
 
-//    TRACE("(left=%d, top=%d, right=%d, bottom=%d)\n", 
+//    TRACE("(left=%d, top=%d, right=%d, bottom=%d)\n",
 //          lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
   }
@@ -538 +539 @@
  * DESCRIPTION:
  * Retrieves the subitem pointer associated with the subitem index.
- * 
+ *
  * PARAMETER(S):
  * [I] HDPA : DPA handle for a specific item
@@ -547 +548 @@
  *   FAILURE : NULL
  */
-static LISTVIEW_SUBITEM* LISTVIEW_GetSubItemPtr(HDPA hdpaSubItems, 
+static LISTVIEW_SUBITEM* LISTVIEW_GetSubItemPtr(HDPA hdpaSubItems,
                                                 INT nSubItem)
 {
@@ -571 +572 @@
  * DESCRIPTION:
  * Calculates the width of an item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -610 +611 @@
   {
     for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
-    { 
+    {
       nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, i);
       nItemWidth = max(nItemWidth, nLabelWidth);
     }
-    
+
     /* default label size */
     if (GETITEMCOUNT(infoPtr) == 0)
@@ -630 +631 @@
         /* add padding */
         nItemWidth += WIDTH_PADDING;
-      
+
         if (infoPtr->himlSmall != NULL)
         {
@@ -643 +644 @@
     }
   }
-  
+
   return nItemWidth;
 }
@@ -650 +651 @@
  * DESCRIPTION:
  * Calculates the height of an item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -668 +669 @@
     nItemHeight = infoPtr->iconSpacing.cy;
   }
-  else 
-  {
-    TEXTMETRICA tm; 
+  else
+  {
+    TEXTMETRICA tm;
     HDC hdc = GetDC(hwnd);
     HFONT hOldFont = SelectObject(hdc, infoPtr->hFont);
@@ -685 +686 @@
  * DESCRIPTION:
  * Adds a block of selections.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -703 +704 @@
   lvItem.state = LVIS_SELECTED;
   lvItem.stateMask= LVIS_SELECTED;
-  
+
   for (i = nFirst; i <= nLast; i++)
   {
     ListView_SetItemState(hwnd, i, &lvItem);
   }
-  
+
   LISTVIEW_SetItemFocus(hwnd, nItem);
   infoPtr->nSelectionMark = nItem;
@@ -716 +717 @@
  * DESCRIPTION:
  * Adds a single selection.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -741 +742 @@
  * DESCRIPTION:
  * Selects or unselects an item.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
- *
- * RETURN:
- *   SELECT: TRUE 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
+ *
+ * RETURN:
+ *   SELECT: TRUE
  *   UNSELECT : FALSE
  */
@@ -779 +780 @@
 /***
  * DESCRIPTION:
- * Selects items based on view coorddiantes. 
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] RECT : selection rectangle  
+ * Selects items based on view coorddiantes.
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] RECT : selection rectangle
  *
  * RETURN:
@@ -816 +817 @@
  * DESCRIPTION:
  * Sets a single group selection.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
- *
- * RETURN:
- * None 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
+ *
+ * RETURN:
+ * None
  */
 static VOID LISTVIEW_SetGroupSelection(HWND hwnd, INT nItem)
@@ -836 +837 @@
     INT nLast = max(infoPtr->nSelectionMark, nItem);
     lvItem.stateMask = LVIS_SELECTED;
-   
+
     for (i = 0; i <= GETITEMCOUNT(infoPtr); i++)
     {
@@ -871 +872 @@
  * DESCRIPTION:
  * Manages the item focus.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -891 +892 @@
     ZeroMemory(&lvItem, sizeof(LVITEMA));
     lvItem.stateMask = LVIS_FOCUSED;
-    ListView_SetItemState(hwnd, infoPtr->nFocusedItem, &lvItem); 
+    ListView_SetItemState(hwnd, infoPtr->nFocusedItem, &lvItem);
 
     lvItem.state =  LVIS_FOCUSED;
@@ -900 +901 @@
     ListView_EnsureVisible(hwnd, nItem, FALSE);
   }
-  
-  return bResult; 
+
+  return bResult;
 }
 
@@ -907 +908 @@
  * DESCRIPTION:
  * Sets a single selection.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -932 +933 @@
   ZeroMemory(&lvItem, sizeof(LVITEMA));
   lvItem.stateMask = LVIS_FOCUSED;
-  ListView_SetItemState(hwnd, infoPtr->nFocusedItem, &lvItem); 
-  
+  ListView_SetItemState(hwnd, infoPtr->nFocusedItem, &lvItem);
+
   lvItem.state =  LVIS_SELECTED | LVIS_FOCUSED;
   lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
@@ -945 +946 @@
  * DESCRIPTION:
  * Set selection(s) with keyboard.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -967 +968 @@
     {
       bResult = TRUE;
-      LISTVIEW_SetSelection(hwnd, nItem); 
+      LISTVIEW_SetSelection(hwnd, nItem);
       ListView_EnsureVisible(hwnd, nItem, FALSE);
     }
@@ -975 +976 @@
       {
         bResult = TRUE;
-        LISTVIEW_SetGroupSelection(hwnd, nItem); 
+        LISTVIEW_SetGroupSelection(hwnd, nItem);
       }
       else if (wCtrl)
@@ -984 +985 @@
       {
         bResult = TRUE;
-        LISTVIEW_SetSelection(hwnd, nItem); 
+        LISTVIEW_SetSelection(hwnd, nItem);
         ListView_EnsureVisible(hwnd, nItem, FALSE);
       }
@@ -992 +993 @@
   return bResult;
 }
-  
+
 /***
  * DESCRIPTION:
  * Selects an item based on coordinates.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1010 +1011 @@
   RECT rcItem;
   INT i;
-  
+
   for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
   {
@@ -1029 +1030 @@
  * DESCRIPTION:
  * Removes all selection states.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -1055 +1056 @@
  * DESCRIPTION:
  * Removes a column.
- * 
+ *
  * PARAMETER(S):
  * [IO] HDPA : dynamic pointer array handle
@@ -1081 +1082 @@
     }
   }
-    
+
   return bResult;
 }
@@ -1088 +1089 @@
  * DESCRIPTION:
  * Removes a subitem at a given position.
- * 
+ *
  * PARAMETER(S):
  * [IO] HDPA : dynamic pointer array handle
@@ -1110 +1111 @@
       {
         /* free string */
-        if ((lpSubItem->pszText != NULL) && 
+        if ((lpSubItem->pszText != NULL) &&
             (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
         {
           COMCTL32_Free(lpSubItem->pszText);
         }
-        
+
         /* free item */
         COMCTL32_Free(lpSubItem);
@@ -1130 +1131 @@
       }
     }
-  }    
-  
+  }
+
   return TRUE;
 }
@@ -1138 +1139 @@
  * DESCRIPTION:
  * Compares the item information.
- * 
- * PARAMETER(S):
- * [I] LISTVIEW_ITEM *: destination item 
- * [I] LPLVITEM : source item 
+ *
+ * PARAMETER(S):
+ * [I] LISTVIEW_ITEM *: destination item
+ * [I] LPLVITEM : source item
  *
  * RETURN:
@@ -1155 +1156 @@
     if (lpLVItem->mask & LVIF_STATE)
     {
-      if ((lpItem->state & lpLVItem->stateMask) != 
+      if ((lpItem->state & lpLVItem->stateMask) !=
           (lpLVItem->state & lpLVItem->stateMask))
       {
-        uChanged |= LVIF_STATE; 
+        uChanged |= LVIF_STATE;
       }
     }
@@ -1166 +1167 @@
       if (lpItem->iImage != lpLVItem->iImage)
       {
-        uChanged |= LVIF_IMAGE; 
-      }
-    }
-  
+        uChanged |= LVIF_IMAGE;
+      }
+    }
+
     if (lpLVItem->mask & LVIF_PARAM)
     {
       if (lpItem->lParam != lpLVItem->lParam)
       {
-        uChanged |= LVIF_PARAM; 
-      }
-    }
-    
+        uChanged |= LVIF_PARAM;
+      }
+    }
+
     if (lpLVItem->mask & LVIF_INDENT)
     {
       if (lpItem->iIndent != lpLVItem->iIndent)
       {
-        uChanged |= LVIF_INDENT; 
-      }
-    }
-
-    if (lpLVItem->mask & LVIF_TEXT) 
-    {
-      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA) 
+        uChanged |= LVIF_INDENT;
+      }
+    }
+
+    if (lpLVItem->mask & LVIF_TEXT)
+    {
+      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA)
       {
         if (lpItem->pszText != LPSTR_TEXTCALLBACKA)
         {
-          uChanged |= LVIF_TEXT; 
+          uChanged |= LVIF_TEXT;
         }
       }
@@ -1199 +1200 @@
         if (lpItem->pszText == LPSTR_TEXTCALLBACKA)
         {
-          uChanged |= LVIF_TEXT; 
-        }
-        else
-        {
-          if (lpLVItem->pszText)
-          {
-            if (lpItem->pszText)
-            {
-              if (strcmp(lpLVItem->pszText, lpItem->pszText) != 0)
-              {
-                uChanged |= LVIF_TEXT;
-              }
-            }
-            else
-            {
-              uChanged |= LVIF_TEXT;
-            }
-          }
-          else
-          {
-            if (lpItem->pszText)
-            {
-              uChanged |= LVIF_TEXT;
-            }
-          }
-        }
+          uChanged |= LVIF_TEXT;
+        }
+        else
+        {
+          if (lpLVItem->pszText)
+          {
+            if (lpItem->pszText)
+            {
+              if (strcmp(lpLVItem->pszText, lpItem->pszText) != 0)
+              {
+                uChanged |= LVIF_TEXT;
+              }
+            }
+            else
+            {
+              uChanged |= LVIF_TEXT;
+            }
+          }
+          else
+          {
+            if (lpItem->pszText)
+            {
+              uChanged |= LVIF_TEXT;
+            }
+          }
+        }
       }
     }
@@ -1234 +1235 @@
  * DESCRIPTION:
  * Initializes item attributes.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [O] LISTVIEW_ITEM *: destination item 
- * [I] LPLVITEM : source item 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [O] LISTVIEW_ITEM *: destination item
+ * [I] LPLVITEM : source item
  *
  * RETURN:
@@ -1244 +1245 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_InitItem(HWND hwnd, LISTVIEW_ITEM *lpItem, 
+static BOOL LISTVIEW_InitItem(HWND hwnd, LISTVIEW_ITEM *lpItem,
                               LPLVITEMA lpLVItem)
 {
@@ -1253 +1254 @@
   {
     bResult = TRUE;
-    
+
     if (lpLVItem->mask & LVIF_STATE)
     {
@@ -1259 +1260 @@
       lpItem->state |= (lpLVItem->state & lpLVItem->stateMask);
     }
-    
+
     if (lpLVItem->mask & LVIF_IMAGE)
     {
       lpItem->iImage = lpLVItem->iImage;
     }
-  
+
     if (lpLVItem->mask & LVIF_PARAM)
     {
       lpItem->lParam = lpLVItem->lParam;
     }
-    
+
     if (lpLVItem->mask & LVIF_INDENT)
     {
@@ -1275 +1276 @@
     }
 
-    if (lpLVItem->mask & LVIF_TEXT) 
-    {
-      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA) 
+    if (lpLVItem->mask & LVIF_TEXT)
+    {
+      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA)
       {
         if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
@@ -1284 +1285 @@
         }
 
-        if ((lpItem->pszText != NULL) && 
+        if ((lpItem->pszText != NULL) &&
             (lpItem->pszText != LPSTR_TEXTCALLBACKA))
         {
           COMCTL32_Free(lpItem->pszText);
         }
-    
+
         lpItem->pszText = LPSTR_TEXTCALLBACKA;
       }
-      else 
+      else
       {
         if (lpItem->pszText == LPSTR_TEXTCALLBACKA)
@@ -1298 +1299 @@
           lpItem->pszText = NULL;
         }
-        
+
         bResult = Str_SetPtrA(&lpItem->pszText, lpLVItem->pszText);
       }
@@ -1323 +1324 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_InitSubItem(HWND hwnd, LISTVIEW_SUBITEM *lpSubItem, 
+static BOOL LISTVIEW_InitSubItem(HWND hwnd, LISTVIEW_SUBITEM *lpSubItem,
                                    LPLVITEMA lpLVItem)
 {
   LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   BOOL bResult = FALSE;
-  
+
   if ((lpSubItem != NULL) && (lpLVItem != NULL))
   {
@@ -1342 +1343 @@
         lpSubItem->iImage = lpLVItem->iImage;
       }
-      
-      if (lpLVItem->mask & LVIF_TEXT) 
-      {
-        if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA) 
+
+      if (lpLVItem->mask & LVIF_TEXT)
+      {
+        if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA)
         {
           if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
           {
             return FALSE;
-          } 
-
-          if ((lpSubItem->pszText != NULL) && 
+          }
+
+          if ((lpSubItem->pszText != NULL) &&
               (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
           {
             COMCTL32_Free(lpSubItem->pszText);
           }
-    
+
           lpSubItem->pszText = LPSTR_TEXTCALLBACKA;
         }
-        else 
+        else
         {
           if (lpSubItem->pszText == LPSTR_TEXTCALLBACKA)
@@ -1366 +1367 @@
             lpSubItem->pszText = NULL;
           }
-        
+
           bResult = Str_SetPtrA(&lpSubItem->pszText, lpLVItem->pszText);
         }
@@ -1379 +1380 @@
  * DESCRIPTION:
  * Adds a subitem at a given position (column index).
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new subitem atttributes 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new subitem atttributes
  *
  * RETURN:
@@ -1406 +1407 @@
         if (LISTVIEW_InitSubItem(hwnd, lpSubItem, lpLVItem) != FALSE)
         {
-          nPosition = LISTVIEW_FindInsertPosition(hdpaSubItems, 
+          nPosition = LISTVIEW_FindInsertPosition(hdpaSubItems,
                                                   lpSubItem->iSubItem);
           nItem = DPA_InsertPtr(hdpaSubItems, nPosition, lpSubItem);
@@ -1412 +1413 @@
           {
             bResult = TRUE;
-          }            
-        }
-      }
-    }
-  }
-  
-  /* cleanup if unsuccessful */   
+          }
+        }
+      }
+    }
+  }
+
+  /* cleanup if unsuccessful */
   if ((bResult == FALSE) && (lpSubItem != NULL))
   {
     COMCTL32_Free(lpSubItem);
   }
-  
+
   return bResult;
 }
@@ -1430 +1431 @@
  * DESCRIPTION:
  * Finds the dpa insert position (array index).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1453 +1454 @@
         return i;
       }
-    } 
+    }
   }
 
@@ -1462 +1463 @@
  * DESCRIPTION:
  * Retrieves a listview subitem at a given position (column index).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1488 +1489 @@
       {
         return NULL;
-      }  
-    }
-  }
-  
+      }
+    }
+  }
+
   return NULL;
 }
@@ -1498 +1499 @@
  * DESCRIPTION:
  * Sets item attributes.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new item atttributes 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new item atttributes
  *
  * RETURN:
@@ -1540 +1541 @@
               nmlv.uOldState = lpItem->state & lpLVItem->stateMask;
             }
-            
+
             nmlv.uChanged = uChanged;
             nmlv.iItem = lpLVItem->iItem;
@@ -1571 +1572 @@
  * DESCRIPTION:
  * Sets subitem attributes.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new subitem atttributes 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new subitem atttributes
  *
  * RETURN:
@@ -1606 +1607 @@
             bResult = LISTVIEW_AddSubItem(hwnd, lpLVItem);
           }
-          
+
           InvalidateRect(hwnd, NULL, FALSE);
-        } 
+        }
       }
     }
@@ -1619 +1620 @@
  * DESCRIPTION:
  * Retrieves the index of the item at coordinate (0, 0) of the client area.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1636 +1637 @@
   scrollInfo.cbSize = sizeof(SCROLLINFO);
   scrollInfo.fMask = SIF_POS;
-  
+
   if (uView == LVS_LIST)
   {
@@ -1657 +1658 @@
     }
   }
-  
+
   return nItem;
 }
@@ -1664 +1665 @@
  * DESCRIPTION:
  * Draws a subitem.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1675 +1676 @@
  * None
  */
-static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem, 
+static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem,
                                  RECT rcItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); 
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   CHAR szDispText[DISP_TEXT_SIZE];
   LVITEMA lvItem;
 
-  TRACE("(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d\n", hwnd, hdc, 
+  TRACE("(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d\n", hwnd, hdc,
         nItem, nSubItem);
 
@@ -1697 +1698 @@
   SetBkColor(hdc, infoPtr->clrTextBk);
   SetTextColor(hdc, infoPtr->clrText);
-  
-  ExtTextOutA(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED, 
+
+  ExtTextOutA(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED,
               &rcItem, lvItem.pszText, lstrlenA(lvItem.pszText), NULL);
 }
@@ -1706 +1707 @@
  * DESCRIPTION:
  * Draws an item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1718 +1719 @@
 static VOID LISTVIEW_DrawItem(HWND hwnd, HDC hdc, INT nItem, RECT rcItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); 
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   CHAR szDispText[DISP_TEXT_SIZE];
   INT nLabelWidth;
@@ -1741 +1742 @@
   if (infoPtr->himlState != NULL)
   {
-     UINT uStateImage = (lvItem.state & LVIS_STATEIMAGEMASK) >> 12; 
+     UINT uStateImage = (lvItem.state & LVIS_STATEIMAGEMASK) >> 12;
      if (uStateImage != 0)
      {
-       ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, rcItem.left, 
+       ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, rcItem.left,
                       rcItem.top, ILD_NORMAL);
      }
- 
-     rcItem.left += infoPtr->iconSize.cx; 
-  }
-  
+
+     rcItem.left += infoPtr->iconSize.cx;
+  }
+
   /* small icons */
   if (infoPtr->himlSmall != NULL)
@@ -1757 +1758 @@
     {
       ImageList_SetBkColor(infoPtr->himlSmall, CLR_NONE);
-      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left, 
+      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left,
                      rcItem.top, ILD_SELECTED);
     }
@@ -1763 +1764 @@
     {
       ImageList_SetBkColor(infoPtr->himlSmall, CLR_NONE);
-      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left, 
+      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left,
                      rcItem.top, ILD_NORMAL);
     }
-    
-    rcItem.left += infoPtr->iconSize.cx; 
+
+    rcItem.left += infoPtr->iconSize.cx;
   }
 
   if ((lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus != FALSE))
   {
-    /* set item colors */ 
+    /* set item colors */
     dwBkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
     dwTextColor = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
@@ -1778 +1779 @@
     nMixMode = SetROP2(hdc, R2_XORPEN);
   }
-  else if ((GetWindowLongA(hwnd, GWL_STYLE) & LVS_SHOWSELALWAYS) && 
+  else if ((GetWindowLongA(hwnd, GWL_STYLE) & LVS_SHOWSELALWAYS) &&
            (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus == FALSE))
   {
@@ -1794 +1795 @@
     nMixMode = SetROP2(hdc, R2_COPYPEN);
   }
-  
+
   nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText);
   if (rcItem.left + nLabelWidth < rcItem.right)
@@ -1800 +1801 @@
     rcItem.right = rcItem.left + nLabelWidth;
   }
-  
-  /* draw label */  
-  ExtTextOutA(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED, 
+
+  /* draw label */
+  ExtTextOutA(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED,
               &rcItem, lvItem.pszText, lstrlenA(lvItem.pszText), NULL);
-  
+
   if ((lvItem.state & LVIS_FOCUSED) && (infoPtr->bFocus == TRUE))
   {
-    Rectangle(hdc, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom); 
+    Rectangle(hdc, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom);
   }
 
@@ -1821 +1822 @@
  * DESCRIPTION:
  * Draws an item when in large icon display mode.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1834 +1835 @@
 static VOID LISTVIEW_DrawLargeItem(HWND hwnd, HDC hdc, INT nItem, RECT rcItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); 
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   CHAR szDispText[DISP_TEXT_SIZE];
   INT nDrawPosX = rcItem.left;
@@ -1842 +1843 @@
 
   TRACE("(hwnd=%x, hdc=%x, nItem=%d, left=%d, top=%d, right=%d, \
-bottom=%d)\n", hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right, 
+bottom=%d)\n", hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right,
         rcItem.bottom);
 
@@ -1857 +1858 @@
   if (lvItem.state & LVIS_SELECTED)
   {
-    /* set item colors */ 
+    /* set item colors */
     SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
     SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
@@ -1878 +1879 @@
     if (lvItem.state & LVIS_SELECTED)
     {
-      ImageList_Draw(infoPtr->himlNormal, lvItem.iImage, hdc, nDrawPosX, 
+      ImageList_Draw(infoPtr->himlNormal, lvItem.iImage, hdc, nDrawPosX,
                      rcItem.top, ILD_SELECTED);
     }
     else
     {
-      ImageList_Draw(infoPtr->himlNormal, lvItem.iImage, hdc, nDrawPosX, 
+      ImageList_Draw(infoPtr->himlNormal, lvItem.iImage, hdc, nDrawPosX,
                      rcItem.top, ILD_NORMAL);
     }
   }
 
-  rcItem.top += infoPtr->iconSize.cy + ICON_BOTTOM_PADDING; 
+  rcItem.top += infoPtr->iconSize.cy + ICON_BOTTOM_PADDING;
   nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText);
   nDrawPosX = infoPtr->iconSpacing.cx - nLabelWidth;
@@ -1902 +1903 @@
   }
 
-  /* draw label */  
+  /* draw label */
   GetTextMetricsA(hdc, &tm);
-  rcItem.bottom = rcItem.top + tm.tmHeight + HEIGHT_PADDING; 
-  ExtTextOutA(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED, 
+  rcItem.bottom = rcItem.top + tm.tmHeight + HEIGHT_PADDING;
+  ExtTextOutA(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED,
               &rcItem, lvItem.pszText, lstrlenA(lvItem.pszText), NULL);
-        
+
   if (lvItem.state & LVIS_FOCUSED)
   {
-    Rectangle(hdc, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom); 
+    Rectangle(hdc, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom);
   }
 }
@@ -1917 +1918 @@
  * DESCRIPTION:
  * Draws listview items when in report display mode.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle
  *
  * RETURN:
@@ -1952 +1953 @@
       if (j == 0)
       {
-        LISTVIEW_DrawItem(hwnd, hdc, nItem, rcItem); 
-      }
-      else 
+        LISTVIEW_DrawItem(hwnd, hdc, nItem, rcItem);
+      }
+      else
       {
         LISTVIEW_DrawSubItem(hwnd, hdc, nItem, j, rcItem);
       }
     }
-    
+
     nDrawPosY += infoPtr->nItemHeight;
   }
@@ -1967 +1968 @@
  * DESCRIPTION:
  * Retrieves the number of items that can fit vertically in the client area.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2002 +2003 @@
 /***
  * DESCRIPTION:
- * Retrieves the number of items that can fit horizontally in the client 
+ * Retrieves the number of items that can fit horizontally in the client
  * area.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2031 +2032 @@
 /***
  * DESCRIPTION:
- * Retrieves the number of columns needed to display all the items when in 
+ * Retrieves the number of columns needed to display all the items when in
  * list display mode.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2040 +2041 @@
  * Number of columns.
  */
-static INT LISTVIEW_GetColumnCount(hwnd)
+static INT LISTVIEW_GetColumnCount(HWND hwnd)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
@@ -2059 +2060 @@
 
   return nColumnCount;
-}  
-  
+}
+
 
 /***
  * DESCRIPTION:
  * Draws listview items when in list display mode.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle
  *
  * RETURN:
@@ -2081 +2082 @@
   INT nColumnCount;
   INT nCountPerColumn;
-  
+
   /* get number of fully visible columns */
   nColumnCount = LISTVIEW_GetColumnCount(hwnd);
@@ -2106 +2107 @@
  * DESCRIPTION:
  * Draws listview items when in icon or small icon display mode.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle
  *
  * RETURN:
@@ -2128 +2129 @@
     ptPosition.x += ptOrigin.x;
     ptPosition.y += ptOrigin.y;
-      
+
     if (ptPosition.y + infoPtr->nItemHeight > infoPtr->rcList.top)
     {
@@ -2159 +2160 @@
  * DESCRIPTION:
  * Draws listview items.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle
  *
  * RETURN:
@@ -2182 +2183 @@
 
   /* select transparent brush (for drawing the focus box) */
-  SelectObject(hdc, GetStockObject(NULL_BRUSH)); 
+  SelectObject(hdc, GetStockObject(NULL_BRUSH));
 
   if (uView == LVS_LIST)
   {
-    LISTVIEW_RefreshList(hwnd, hdc); 
+    LISTVIEW_RefreshList(hwnd, hdc);
   }
   else if (uView == LVS_REPORT)
@@ -2204 +2205 @@
   SelectObject(hdc, hOldFont);
   SelectObject(hdc, hOldPen);
-  
+
   /* delete pen */
   DeleteObject(hPen);
@@ -2213 +2214 @@
  * DESCRIPTION:
  * Calculates the approximate width and height of a given number of items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2223 +2224 @@
  * Returns a DWORD. The width in the low word and the height in high word.
  */
-static LRESULT LISTVIEW_ApproximateViewRect(HWND hwnd, INT nItemCount, 
+static LRESULT LISTVIEW_ApproximateViewRect(HWND hwnd, INT nItemCount,
                                             WORD wWidth, WORD wHeight)
 {
@@ -2259 +2260 @@
           nItemCountPerColumn = 1;
         }
-        
+
         if (nItemCount % nItemCountPerColumn != 0)
         {
@@ -2289 +2290 @@
     /* TO DO */
   }
- 
+
   return dwViewRect;
 }
@@ -2296 +2297 @@
  * DESCRIPTION:
  * Arranges listview items in icon display mode.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2307 +2308 @@
 static LRESULT LISTVIEW_Arrange(HWND hwnd, INT nAlignCode)
 {
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK; 
+  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   BOOL bResult = FALSE;
 
@@ -2337 +2338 @@
  * DESCRIPTION:
  * Removes all listview items and subitems.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2366 +2367 @@
     /* initialize memory */
     ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-    
+
     /* send LVN_DELETEALLITEMS notification */
     nmlv.hdr.hwndFrom = hwnd;
@@ -2373 +2374 @@
     nmlv.iItem = -1;
 
-    /* verify if subsequent LVN_DELETEITEM notifications should be 
+    /* verify if subsequent LVN_DELETEITEM notifications should be
        suppressed */
     bSuppress = ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
@@ -2388 +2389 @@
           {
             /* free subitem string */
-            if ((lpSubItem->pszText != NULL) && 
+            if ((lpSubItem->pszText != NULL) &&
                 (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
             {
               COMCTL32_Free(lpSubItem->pszText);
             }
-            
+
             /* free subitem */
             COMCTL32_Free(lpSubItem);
-          }    
-        }
-    
+          }
+        }
+
         lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
         if (lpItem != NULL)
@@ -2412 +2413 @@
 
           /* free item string */
-          if ((lpItem->pszText != NULL) && 
+          if ((lpItem->pszText != NULL) &&
               (lpItem->pszText != LPSTR_TEXTCALLBACKA))
           {
             COMCTL32_Free(lpItem->pszText);
           }
-          
+
           /* free item */
           COMCTL32_Free(lpItem);
         }
-        
+
         DPA_Destroy(hdpaSubItems);
       }
@@ -2428 +2429 @@
     /* reinitialize listview memory */
     bResult = DPA_DeleteAllPtrs(infoPtr->hdpaItems);
-    
+
     /* align items (set position of each item) */
     if ((uView == LVS_ICON) || (uView == LVS_SMALLICON))
@@ -2441 +2442 @@
       }
     }
-    
+
     LISTVIEW_UpdateScroll(hwnd);
 
@@ -2447 +2448 @@
     InvalidateRect(hwnd, NULL, TRUE);
   }
-  
+
   return bResult;
 }
@@ -2454 +2455 @@
  * DESCRIPTION:
  * Removes a column from the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2468 +2469 @@
   UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   BOOL bResult = FALSE;
-  
+
   if (Header_DeleteItem(infoPtr->hwndHeader, nColumn) != FALSE)
   {
@@ -2490 +2491 @@
  * DESCRIPTION:
  * Removes an item from the listview control.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index  
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
  *
  * RETURN:
@@ -2528 +2529 @@
         {
           /* free item string */
-          if ((lpSubItem->pszText != NULL) && 
+          if ((lpSubItem->pszText != NULL) &&
               (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
           {
             COMCTL32_Free(lpSubItem->pszText);
           }
-          
+
           /* free item */
           COMCTL32_Free(lpSubItem);
-        }    
-      }
-    
+        }
+      }
+
       lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
       if (lpItem != NULL)
@@ -2548 +2549 @@
         nmlv.iItem = nItem;
         nmlv.lParam = lpItem->lParam;
-        SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
+        SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId,
                      (LPARAM)&nmlv);
 
         /* free item string */
-        if ((lpItem->pszText != NULL) && 
+        if ((lpItem->pszText != NULL) &&
             (lpItem->pszText != LPSTR_TEXTCALLBACKA))
         {
           COMCTL32_Free(lpItem->pszText);
         }
-        
+
         /* free item */
         COMCTL32_Free(lpItem);
       }
-      
+
       bResult = DPA_Destroy(hdpaSubItems);
     }
@@ -2583 +2584 @@
     InvalidateRect(hwnd, NULL, TRUE);
   }
-  
+
   return bResult;
 }
@@ -2592 +2593 @@
  * DESCRIPTION:
  * Ensures the specified item is visible, scrolling into view if necessary.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2637 +2638 @@
           rcItem.left += infoPtr->rcList.left;
         }
-        
+
         if (rcItem.left % nScrollPosWidth == 0)
         {
@@ -2646 +2647 @@
           scrollInfo.nPos += rcItem.left / nScrollPosWidth - 1;
         }
-        
+
         SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
       }
@@ -2678 +2679 @@
       }
     }
-    
+
     if (rcItem.top < infoPtr->rcList.top)
     {
@@ -2686 +2687 @@
         if (uView == LVS_REPORT)
         {
-          rcItem.top -= infoPtr->rcList.top; 
+          rcItem.top -= infoPtr->rcList.top;
           nScrollPosHeight = infoPtr->nItemHeight;
         }
@@ -2703 +2704 @@
           scrollInfo.nPos += rcItem.top / nScrollPosHeight - 1;
         }
-        
+
         SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
       }
@@ -2731 +2732 @@
           scrollInfo.nPos += rcItem.bottom / nScrollPosHeight + 1;
         }
-        
+
         SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
       }
     }
   }
-  
+
   return TRUE;
 }
@@ -2743 +2744 @@
  * DESCRIPTION:
  * Retrieves the nearest item, given a position and a direction.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2765 +2766 @@
     lvHitTestInfo.pt.x += pt.x;
     lvHitTestInfo.pt.y += pt.y;
-    
+
     do
-    { 
+    {
       if (vkDirection == VK_DOWN)
       {
         lvHitTestInfo.pt.y += infoPtr->nItemHeight;
-      }      
+      }
       else if (vkDirection == VK_UP)
       {
@@ -2799 +2800 @@
 
   return nItem;
-}  
+}
 
 /***
  * DESCRIPTION:
  * Searches for an item with specific characteristics.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : base item index
  * [I] LPLVFINDINFO : item information to look for
- * 
+ *
  * RETURN:
  *   SUCCESS : index of item
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_FindItem(HWND hwnd, INT nStart, 
+static LRESULT LISTVIEW_FindItem(HWND hwnd, INT nStart,
                                  LPLVFINDINFO lpFindInfo)
 {
@@ -2833 +2834 @@
       lvItem.mask |= LVIF_PARAM;
     }
-    
+
     if (lpFindInfo->flags & LVFI_STRING)
     {
@@ -2865 +2866 @@
         if (lpFindInfo->flags & LVFI_NEARESTXY)
         {
-          nItem = LISTVIEW_GetNearestItem(hwnd, ptItem, 
+          nItem = LISTVIEW_GetNearestItem(hwnd, ptItem,
                                           lpFindInfo->vkDirection);
           if (nItem != -1)
@@ -2880 +2881 @@
           nItem++;
         }
-        
+
         lvItem.iItem = nItem;
         lvItem.iSubItem = 0;
@@ -2898 +2899 @@
             }
           }
-          
+
           if (lvItem.mask & LVIF_PARAM)
           {
@@ -2904 +2905 @@
               continue;
           }
-          
+
           return nItem;
         }
@@ -2918 +2919 @@
       {
         return -1;
-      }       
-    }
-  }
-
- return -1; 
+      }
+    }
+  }
+
+ return -1;
 }
 
@@ -2928 +2929 @@
  * DESCRIPTION:
  * Retrieves the background color of the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2945 +2946 @@
  * DESCRIPTION:
  * Retrieves the background image of the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2963 +2964 @@
  * DESCRIPTION:
  * Retrieves the callback mask.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2980 +2981 @@
  * DESCRIPTION:
  * Retrieves column attributes.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2995 +2996 @@
   HDITEMA hdi;
   BOOL bResult = FALSE;
-  
+
   if (lpColumn != NULL)
   {
     /* initialize memory */
     ZeroMemory(&hdi, sizeof(HDITEMA));
-    
+
     if (lpColumn->mask & LVCF_FMT)
     {
@@ -3029 +3030 @@
     if (bResult != FALSE)
     {
-      if (lpColumn->mask & LVCF_FMT) 
+      if (lpColumn->mask & LVCF_FMT)
       {
         lpColumn->fmt = 0;
@@ -3056 +3057 @@
         lpColumn->cx = hdi.cxy;
       }
-      
+
       if ((lpColumn->mask & LVCF_TEXT) && (lpColumn->pszText) && (hdi.pszText))
       {
-        lstrcpynA (lpColumn->pszText, hdi.pszText, lpColumn->cchTextMax);
+        lstrcpynA (lpColumn->pszText, hdi.pszText, MIN(lpColumn->cchTextMax,lstrlenA(hdi.pszText)));
       }
 
@@ -3083 +3084 @@
  * DESCRIPTION:
  * Retrieves the column width.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3090 +3091 @@
  * RETURN:
  *   SUCCESS : column width
- *   FAILURE : zero 
+ *   FAILURE : zero
  */
 static LRESULT LISTVIEW_GetColumnWidth(HWND hwnd, INT nColumn)
@@ -3119 +3120 @@
 /***
  * DESCRIPTION:
- * In list or report display mode, retrieves the number of items that can fit 
- * vertically in the visible area. In icon or small icon display mode, 
+ * In list or report display mode, retrieves the number of items that can fit
+ * vertically in the visible area. In icon or small icon display mode,
  * retrieves the total number of visible items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3139 +3140 @@
     if (infoPtr->rcList.right > infoPtr->nItemWidth)
     {
-      nItemCount = LISTVIEW_GetCountPerRow(hwnd) * 
+      nItemCount = LISTVIEW_GetCountPerRow(hwnd) *
                    LISTVIEW_GetCountPerColumn(hwnd);
     }
@@ -3161 +3162 @@
  * DESCRIPTION:
  * Retrieves the handle to the header control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3182 +3183 @@
  * DESCRIPTION:
  * Retrieves an image list handle.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : image list identifier 
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : image list identifier
+ *
  * RETURN:
  *   SUCCESS : image list handle
@@ -3196 +3197 @@
   HIMAGELIST himl = NULL;
 
-  switch (nImageList) 
+  switch (nImageList)
   {
   case LVSIL_NORMAL:
@@ -3217 +3218 @@
  * DESCRIPTION:
  * Retrieves item attributes.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [IO] LPLVITEMA : item info
- * 
- * RETURN:
- *   SUCCESS : TRUE 
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
@@ -3257 +3258 @@
               dispInfo.item.mask |= LVIF_IMAGE;
             }
-            
-            if ((lpItem->pszText == LPSTR_TEXTCALLBACKA) && 
+
+            if ((lpItem->pszText == LPSTR_TEXTCALLBACKA) &&
                 (lpLVItem->mask & LVIF_TEXT))
             {
@@ -3266 +3267 @@
               dispInfo.item.cchTextMax = lpLVItem->cchTextMax;
             }
-            
+
             if ((infoPtr->uCallbackMask != 0) && (lpLVItem->mask & LVIF_STATE))
-            {        
+            {
               dispInfo.item.mask |= LVIF_STATE;
-              dispInfo.item.stateMask = infoPtr->uCallbackMask; 
+              dispInfo.item.stateMask = infoPtr->uCallbackMask;
             }
-            
+
             if (dispInfo.item.mask != 0)
             {
@@ -3283 +3284 @@
               ListView_Notify(GetParent(hwnd), lCtrlId, &dispInfo);
             }
-            
+
             if (dispInfo.item.mask & LVIF_IMAGE)
             {
@@ -3292 +3293 @@
               lpLVItem->iImage = lpItem->iImage;
             }
-            
+
             if (dispInfo.item.mask & LVIF_TEXT)
             {
@@ -3305 +3306 @@
               lpLVItem->pszText = lpItem->pszText;
             }
-            
+
             if (dispInfo.item.mask & LVIF_STATE)
             {
               lpLVItem->state = lpItem->state;
               lpLVItem->state &= ~dispInfo.item.stateMask;
-              lpLVItem->state |= (dispInfo.item.state & 
+              lpLVItem->state |= (dispInfo.item.state &
                                   dispInfo.item.stateMask);
             }
@@ -3322 +3323 @@
               lpLVItem->lParam = lpItem->lParam;
             }
-            
+
             if (lpLVItem->mask & LVIF_INDENT)
             {
@@ -3330 +3331 @@
           else
           {
-            lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, 
+            lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems,
                                                lpLVItem->iSubItem);
             if (lpSubItem != NULL)
@@ -3339 +3340 @@
                 dispInfo.item.mask |= LVIF_IMAGE;
               }
-              
-              if ((lpSubItem->pszText == LPSTR_TEXTCALLBACKA) && 
+
+              if ((lpSubItem->pszText == LPSTR_TEXTCALLBACKA) &&
                   (lpLVItem->mask & LVIF_TEXT))
               {
                 dispInfo.item.mask |= LVIF_TEXT;
-                ZeroMemory(lpLVItem->pszText, 
+                ZeroMemory(lpLVItem->pszText,
                            sizeof(CHAR)*lpLVItem->cchTextMax);
                 dispInfo.item.pszText = lpLVItem->pszText;
@@ -3356 +3357 @@
                 dispInfo.item.mask |= LVIF_IMAGE;
               }
-          
+
               if (lpLVItem->mask & LVIF_TEXT)
               {
                 dispInfo.item.mask |= LVIF_TEXT;
-                ZeroMemory(lpLVItem->pszText, 
+                ZeroMemory(lpLVItem->pszText,
                            sizeof(CHAR)*lpLVItem->cchTextMax);
                 dispInfo.item.pszText = lpLVItem->pszText;
@@ -3416 +3417 @@
  * DESCRIPTION:
  * Retrieves the number of items in the listview control.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  * Number of items.
@@ -3433 +3434 @@
  * DESCRIPTION:
  * Retrieves the position (upper-left) of the listview control item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3443 +3444 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem, 
+static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem,
                                      LPPOINT lpptPosition)
 {
@@ -3454 +3455 @@
   INT nRow;
 
-  TRACE("(hwnd=%x,nItem=%d,lpptPosition=%p)\n", hwnd, nItem, 
+  TRACE("(hwnd=%x,nItem=%d,lpptPosition=%p)\n", hwnd, nItem,
         lpptPosition);
 
-  if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) && 
+  if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) &&
       (lpptPosition != NULL))
   {
@@ -3476 +3477 @@
         {
           lpptPosition->x = (nItem / nCountPerColumn -1) * infoPtr->nItemWidth;
-          lpptPosition->y = (nRow + nCountPerColumn) * infoPtr->nItemHeight;  
+          lpptPosition->y = (nRow + nCountPerColumn) * infoPtr->nItemHeight;
         }
       }
@@ -3489 +3490 @@
       bResult = TRUE;
       lpptPosition->x = REPORT_MARGINX;
-      lpptPosition->y = ((nItem - ListView_GetTopIndex(hwnd)) * 
+      lpptPosition->y = ((nItem - ListView_GetTopIndex(hwnd)) *
                          infoPtr->nItemHeight) + infoPtr->rcList.top;
     }
@@ -3507 +3508 @@
     }
   }
-    
+
   return bResult;
 }
@@ -3514 +3515 @@
  * DESCRIPTION:
  * Retrieves the bounding rectangle for a listview control item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
  * [IO] LPRECT : bounding rectangle coordinates
- * 
+ *
  * RETURN:
  *   SUCCESS : TRUE
@@ -3538 +3539 @@
 
   TRACE("(hwnd=%x, nItem=%d, lprc=%p)\n", hwnd, nItem, lprc);
-  
+
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) && (lprc != NULL))
   {
     if (ListView_GetItemPosition(hwnd, nItem, &ptItem) != FALSE)
     {
-      switch(lprc->left)  
-      {  
-      case LVIR_ICON: 
+      switch(lprc->left)
+      {
+      case LVIR_ICON:
         if (uView == LVS_ICON)
         {
@@ -3556 +3557 @@
               lprc->top = ptItem.y + ptOrigin.y;
               lprc->right = lprc->left + infoPtr->iconSize.cx;
-              lprc->bottom = (lprc->top + infoPtr->iconSize.cy + 
+              lprc->bottom = (lprc->top + infoPtr->iconSize.cy +
                               ICON_BOTTOM_PADDING + ICON_TOP_PADDING);
             }
@@ -3572 +3573 @@
             if (infoPtr->himlState != NULL)
               lprc->left += infoPtr->iconSize.cx;
-              
+
             if (infoPtr->himlSmall != NULL)
               lprc->right = lprc->left + infoPtr->iconSize.cx;
@@ -3579 +3580 @@
           }
         }
-        else 
+        else
         {
           bResult = TRUE;
@@ -3590 +3591 @@
             lprc->left += infoPtr->iconSize.cx;
           }
-            
+
           if (infoPtr->himlSmall != NULL)
           {
@@ -3602 +3603 @@
         break;
 
-      case LVIR_LABEL: 
+      case LVIR_LABEL:
         if (uView == LVS_ICON)
         {
@@ -3624 +3625 @@
                 lprc->right = lprc->left + infoPtr->iconSpacing.cx - 1;
               }
-            
+
               hdc = GetDC(hwnd);
               hOldFont = SelectObject(hdc, infoPtr->hFont);
@@ -3631 +3632 @@
               SelectObject(hdc, hOldFont);
               ReleaseDC(hwnd, hdc);
-            }              
+            }
           }
         }
@@ -3639 +3640 @@
           {
             bResult = TRUE;
-            nMaxWidth = lprc->left = ptItem.x + ptOrigin.x; 
+            nMaxWidth = lprc->left = ptItem.x + ptOrigin.x;
             lprc->top = ptItem.y + ptOrigin.y;
             lprc->bottom = lprc->top + infoPtr->nItemHeight;
-            
+
             if (infoPtr->himlState != NULL)
             {
               lprc->left += infoPtr->iconSize.cx;
             }
-            
+
             if (infoPtr->himlSmall != NULL)
             {
               lprc->left += infoPtr->iconSize.cx;
             }
-            
+
             nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
             if (lprc->left + nLabelWidth < nMaxWidth + infoPtr->nItemWidth)
@@ -3667 +3668 @@
         {
           bResult = TRUE;
-          lprc->left = ptItem.x; 
+          lprc->left = ptItem.x;
           lprc->top = ptItem.y;
           lprc->bottom = lprc->top + infoPtr->nItemHeight;
@@ -3686 +3687 @@
 
       case LVIR_BOUNDS:
-        if (uView == LVS_ICON)
-        {
-          if (infoPtr->himlNormal != NULL)
-          {
-            if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
-            {
-              bResult = TRUE;
-              lprc->left = ptItem.x + ptOrigin.x;
-              lprc->top = ptItem.y + ptOrigin.y; 
-              lprc->right = lprc->left + infoPtr->iconSpacing.cx;
-              lprc->bottom = lprc->top + infoPtr->iconSpacing.cy;
-            }
-          } 
-        }
-        else if (uView == LVS_SMALLICON)
-        {
-          if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
-          {
-            bResult = TRUE;
-            lprc->left = ptItem.x + ptOrigin.x; 
-            lprc->right = lprc->left;
-            lprc->top = ptItem.y + ptOrigin.y;
-            lprc->bottom = lprc->top + infoPtr->nItemHeight;
-            if (infoPtr->himlState != NULL)
-              lprc->right += infoPtr->iconSize.cx;
-            if (infoPtr->himlSmall != NULL)
-              lprc->right += infoPtr->iconSize.cx;
-            lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
-          }
-        }
-        else
-        {
-          bResult = TRUE;
-          lprc->left = ptItem.x; 
-          lprc->right = lprc->left;
-          lprc->top = ptItem.y;
-          lprc->bottom = lprc->top + infoPtr->nItemHeight;
-
-          if (infoPtr->himlState != NULL)
-          {
-            lprc->right += infoPtr->iconSize.cx;
-          }
-
-          if (infoPtr->himlSmall != NULL)
-          {
-            lprc->right += infoPtr->iconSize.cx;
-          }
-
-          lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
-        }
-        break;
-        
-      case LVIR_SELECTBOUNDS:
         if (uView == LVS_ICON)
         {
@@ -3751 +3699 @@
               lprc->bottom = lprc->top + infoPtr->iconSpacing.cy;
             }
-          } 
+          }
         }
         else if (uView == LVS_SMALLICON)
@@ -3758 +3706 @@
           {
             bResult = TRUE;
-            lprc->left = ptItem.x + ptOrigin.x;  
+            lprc->left = ptItem.x + ptOrigin.x;
+            lprc->right = lprc->left;
             lprc->top = ptItem.y + ptOrigin.y;
             lprc->bottom = lprc->top + infoPtr->nItemHeight;
-            
+            if (infoPtr->himlState != NULL)
+              lprc->right += infoPtr->iconSize.cx;
+            if (infoPtr->himlSmall != NULL)
+              lprc->right += infoPtr->iconSize.cx;
+            lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
+          }
+        }
+        else
+        {
+          bResult = TRUE;
+          lprc->left = ptItem.x;
+          lprc->right = lprc->left;
+          lprc->top = ptItem.y;
+          lprc->bottom = lprc->top + infoPtr->nItemHeight;
+
+          if (infoPtr->himlState != NULL)
+          {
+            lprc->right += infoPtr->iconSize.cx;
+          }
+
+          if (infoPtr->himlSmall != NULL)
+          {
+            lprc->right += infoPtr->iconSize.cx;
+          }
+
+          lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
+        }
+        break;
+
+      case LVIR_SELECTBOUNDS:
+        if (uView == LVS_ICON)
+        {
+          if (infoPtr->himlNormal != NULL)
+          {
+            if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
+            {
+              bResult = TRUE;
+              lprc->left = ptItem.x + ptOrigin.x;
+              lprc->top = ptItem.y + ptOrigin.y;
+              lprc->right = lprc->left + infoPtr->iconSpacing.cx;
+              lprc->bottom = lprc->top + infoPtr->iconSpacing.cy;
+            }
+          }
+        }
+        else if (uView == LVS_SMALLICON)
+        {
+          if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
+          {
+            bResult = TRUE;
+            lprc->left = ptItem.x + ptOrigin.x;
+            lprc->top = ptItem.y + ptOrigin.y;
+            lprc->bottom = lprc->top + infoPtr->nItemHeight;
+
             if (infoPtr->himlState != NULL)
             {
               lprc->left += infoPtr->iconSize.cx;
             }
-            
+
             lprc->right = lprc->left;
-            
+
             if (infoPtr->himlSmall != NULL)
             {
               lprc->right += infoPtr->iconSize.cx;
             }
-            
+
             lprc->right += LISTVIEW_GetLabelWidth(hwnd, nItem);
           }
@@ -3780 +3781 @@
         {
           bResult = TRUE;
-          lprc->left = ptItem.x; 
+          lprc->left = ptItem.x;
           lprc->top = ptItem.y;
           lprc->bottom = lprc->top + infoPtr->nItemHeight;
@@ -3788 +3789 @@
             lprc->left += infoPtr->iconSize.cx;
           }
-          
+
           lprc->right = lprc->left;
-        
+
           if (infoPtr->himlSmall != NULL)
           {
@@ -3802 +3803 @@
     }
   }
-        
+
   return bResult;
 }
@@ -3809 +3810 @@
  * DESCRIPTION:
  * Retrieves the width of a label.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  *   SUCCESS : string width (in pixels)
@@ -3832 +3833 @@
   if (ListView_GetItemA(hwnd, &lvItem) != FALSE)
   {
-    nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText); 
-  }
-    
+    nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText);
+  }
+
   return nLabelWidth;
 }
@@ -3841 +3842 @@
  * DESCRIPTION:
  * Retrieves the spacing between listview control items.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] BOOL : flag for small or large icon 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] BOOL : flag for small or large icon
  *
  * RETURN:
@@ -3862 +3863 @@
     /* TODO: need to store width of smallicon item */
     lResult = MAKELONG(0, infoPtr->nItemHeight);
-  }  
-  
+  }
+
   return lResult;
 }
@@ -3870 +3871 @@
  * DESCRIPTION:
  * Retrieves the state of a listview control item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
  * [I] UINT : state mask
- * 
+ *
  * RETURN:
  * State specified by the mask.
@@ -3902 +3903 @@
 /***
  * DESCRIPTION:
- * Retrieves the text of a listview control item or subitem. 
- * 
+ * Retrieves the text of a listview control item or subitem.
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
  * [IO] LPLVITEMA : item information
- * 
+ *
  * RETURN:
  *   SUCCESS : string length
@@ -3917 +3918 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   INT nLength = 0;
-  
+
   if (lpLVItem != NULL)
   {
@@ -3937 +3938 @@
  * DESCRIPTION:
  * Searches for an item based on properties + relationships.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
  * [I] INT : relationship flag
- * 
+ *
  * RETURN:
  *   SUCCESS : item index
@@ -3955 +3956 @@
   INT nCountPerColumn;
   INT i;
-  
+
   if ((nItem >= -1) && (nItem < GETITEMCOUNT(infoPtr)))
-  { 
+  {
     ZeroMemory(&lvFindInfo, sizeof(LVFINDINFO));
 
     if (uFlags & LVNI_CUT)
       uMask |= LVIS_CUT;
-    
+
     if (uFlags & LVNI_DROPHILITED)
       uMask |= LVIS_DROPHILITED;
-          
+
     if (uFlags & LVNI_FOCUSED)
       uMask |= LVIS_FOCUSED;
@@ -4087 +4088 @@
  * DESCRIPTION:
  * Retrieves the origin coordinates when in icon or small icon display mode.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [O] LPPOINT : coordinate information
- * 
+ *
  * RETURN:
  *   SUCCESS : TRUE
@@ -4104 +4105 @@
   INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
   BOOL bResult = FALSE;
-  
+
   TRACE("(hwnd=%x, lpptOrigin=%p)\n", hwnd, lpptOrigin);
 
@@ -4117 +4118 @@
     {
       scrollInfo.fMask = SIF_POS;
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE) 
+      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
       {
         lpptOrigin->x = -scrollInfo.nPos * max(nListWidth / 10, 1);
@@ -4131 +4132 @@
       }
     }
-      
+
     bResult = TRUE;
   }
-  
+
   return bResult;
 }
@@ -4141 +4142 @@
  * DESCRIPTION:
  * Retrieves the number of items that are marked as selected.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  * Number of items selected.
@@ -4161 +4162 @@
     }
   }
-  
+
   return nSelectedCount;
 }
@@ -4168 +4169 @@
  * DESCRIPTION:
  * Retrieves item index that marks the start of a multiple selection.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  * Index number or -1 if there is no selection mark.
@@ -4185 +4186 @@
  * DESCRIPTION:
  * Retrieves the width of a string.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  *   SUCCESS : string width (in pixels)
@@ -4217 +4218 @@
  * DESCRIPTION:
  * Retrieves the text backgound color.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  * COLORREF associated with the the background.
@@ -4234 +4235 @@
  * DESCRIPTION:
  * Retrieves the text color.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  * COLORREF associated with the text.
@@ -4251 +4252 @@
  * DESCRIPTION:
  * Determines which section of the item was selected (if any).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4265 +4266 @@
   RECT rcItem;
   INT i;
-  
+
   TRACE("(hwnd=%x, x=%ld, y=%ld)\n", hwnd, lpHitTestInfo->pt.x,
         lpHitTestInfo->pt.y);
@@ -4287 +4288 @@
           }
         }
-      
+
         rcItem.left = LVIR_LABEL;
         if (LISTVIEW_GetItemRect(hwnd, i, &rcItem) != FALSE)
@@ -4299 +4300 @@
           }
         }
-        
+
         lpHitTestInfo->flags = LVHT_ONITEMSTATEICON;
         lpHitTestInfo->iItem = i;
@@ -4307 +4308 @@
     }
   }
-     
+
   lpHitTestInfo->flags = LVHT_NOWHERE;
 
@@ -4316 +4317 @@
  * DESCRIPTION:
  * Determines which listview item is located at the specified position.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4336 +4337 @@
     lpHitTestInfo->flags = LVHT_TOLEFT;
   }
-  else if (infoPtr->rcList.right < lpHitTestInfo->pt.x) 
+  else if (infoPtr->rcList.right < lpHitTestInfo->pt.x)
   {
     lpHitTestInfo->flags = LVHT_TORIGHT;
@@ -4344 +4345 @@
     lpHitTestInfo->flags |= LVHT_ABOVE;
   }
-  else if (infoPtr->rcList.bottom < lpHitTestInfo->pt.y) 
+  else if (infoPtr->rcList.bottom < lpHitTestInfo->pt.y)
   {
     lpHitTestInfo->flags |= LVHT_BELOW;
@@ -4353 +4354 @@
     nItem = LISTVIEW_HitTestItem(hwnd, lpHitTestInfo);
   }
-  
+
   return nItem;
 }
@@ -4360 +4361 @@
  * DESCRIPTION:
  * Inserts a new column.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4370 +4371 @@
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_InsertColumnA(HWND hwnd, INT nColumn, 
+static LRESULT LISTVIEW_InsertColumnA(HWND hwnd, INT nColumn,
                                       LPLVCOLUMNA lpColumn)
 {
@@ -4377 +4378 @@
   INT nNewColumn = -1;
 
-  TRACE("(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn, 
+  TRACE("(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn,
         lpColumn);
 
-  if (lpColumn != NULL) 
+  if (lpColumn != NULL)
   {
     /* initialize memory */
     ZeroMemory(&hdi, sizeof(HDITEMA));
 
-    if (lpColumn->mask & LVCF_FMT) 
+    if (lpColumn->mask & LVCF_FMT)
     {
       /* format member is valid */
@@ -4410 +4411 @@
         }
       }
- 
+
       if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
       {
@@ -4421 +4422 @@
         /* ??? */
       }
-      
+
       if (lpColumn->fmt & LVCFMT_IMAGE)
       {
@@ -4429 +4430 @@
     }
 
-    if (lpColumn->mask & LVCF_WIDTH) 
+    if (lpColumn->mask & LVCF_WIDTH)
     {
       hdi.mask |= HDI_WIDTH;
       hdi.cxy = lpColumn->cx;
     }
-  
-    if (lpColumn->mask & LVCF_TEXT) 
+
+    if (lpColumn->mask & LVCF_TEXT)
     {
       hdi.mask |= HDI_TEXT | HDI_FORMAT;
@@ -4442 +4443 @@
       hdi.fmt |= HDF_STRING;
     }
-  
-    if (lpColumn->mask & LVCF_IMAGE) 
+
+    if (lpColumn->mask & LVCF_IMAGE)
     {
       hdi.mask |= HDI_IMAGE;
@@ -4449 +4450 @@
     }
 
-    if (lpColumn->mask & LVCF_ORDER) 
+    if (lpColumn->mask & LVCF_ORDER)
     {
       hdi.mask |= HDI_ORDER;
@@ -4471 +4472 @@
  * DESCRIPTION:
  * Inserts a new item in the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4511 +4512 @@
             if (nItem != -1)
             {
-              nItem = DPA_InsertPtr(infoPtr->hdpaItems, lpLVItem->iItem, 
+              nItem = DPA_InsertPtr(infoPtr->hdpaItems, lpLVItem->iItem,
                                     hdpaSubItems);
               if (nItem != -1)
@@ -4521 +4522 @@
                   {
                     LISTVIEW_SetItemFocus(hwnd, nItem);
-                  }           
+                  }
                 }
-                
+
                 /* send LVN_INSERTITEM notification */
                 ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
@@ -4532 +4533 @@
                 nmlv.lParam = lpItem->lParam;;
                 ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
-                
+
                 /* align items (set position of each item) */
                 if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
@@ -4545 +4546 @@
                   }
                 }
-                
+
                 LISTVIEW_UpdateScroll(hwnd);
                 /* refresh client area */
@@ -4562 +4563 @@
     COMCTL32_Free(lpItem);
   }
-  
+
   return nItem;
 }
@@ -4571 +4572 @@
  * DESCRIPTION:
  * Redraws a range of items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4583 +4584 @@
 static LRESULT LISTVIEW_RedrawItems(HWND hwnd, INT nFirst, INT nLast)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); 
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
   BOOL bResult = FALSE;
   RECT rc;
@@ -4607 +4608 @@
  * DESCRIPTION:
  * Sets the background color.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4622 +4623 @@
   infoPtr->clrBk = clrBk;
   InvalidateRect(hwnd, NULL, TRUE);
-  
+
   return TRUE;
 }
@@ -4630 +4631 @@
  * Sets the callback mask. This mask will be used when the parent
  * window stores state information (some or all).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4651 +4652 @@
  * DESCRIPTION:
  * Sets the attributes of a header item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4661 +4662 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetColumnA(HWND hwnd, INT nColumn, 
+static LRESULT LISTVIEW_SetColumnA(HWND hwnd, INT nColumn,
                                    LPLVCOLUMNA lpColumn)
 {
@@ -4668 +4669 @@
   HDITEMA hdi;
 
-  if ((lpColumn != NULL) && (nColumn >= 0) && 
+  if ((lpColumn != NULL) && (nColumn >= 0) &&
       (nColumn < Header_GetItemCount(infoPtr->hwndHeader)))
   {
@@ -4674 +4675 @@
     ZeroMemory(&hdi, sizeof(HDITEMA));
 
-    if (lpColumn->mask & LVCF_FMT) 
+    if (lpColumn->mask & LVCF_FMT)
     {
       /* format member is valid */
@@ -4699 +4700 @@
         }
       }
-      
+
       if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
       {
@@ -4709 +4710 @@
         hdi.fmt |= HDF_IMAGE;
       }
-      
+
       if (lpColumn->fmt & LVCFMT_IMAGE)
       {
@@ -4717 +4718 @@
     }
 
-    if (lpColumn->mask & LVCF_WIDTH) 
+    if (lpColumn->mask & LVCF_WIDTH)
     {
       hdi.mask |= HDI_WIDTH;
       hdi.cxy = lpColumn->cx;
     }
-    
-    if (lpColumn->mask & LVCF_TEXT) 
+
+    if (lpColumn->mask & LVCF_TEXT)
     {
       hdi.mask |= HDI_TEXT | HDI_FORMAT;
@@ -4730 +4731 @@
       hdi.fmt |= HDF_STRING;
     }
-  
-    if (lpColumn->mask & LVCF_IMAGE) 
+
+    if (lpColumn->mask & LVCF_IMAGE)
     {
       hdi.mask |= HDI_IMAGE;
@@ -4737 +4738 @@
     }
 
-    if (lpColumn->mask & LVCF_ORDER) 
+    if (lpColumn->mask & LVCF_ORDER)
     {
       hdi.mask |= HDI_ORDER;
@@ -4746 +4747 @@
     bResult = Header_SetItemA(infoPtr->hwndHeader, nColumn, &hdi);
   }
-  
+
   return bResult;
 }
@@ -4773 +4774 @@
     lStyle = GetWindowLongA(hwnd, GWL_STYLE);
     if ((lStyle & LVS_TYPEMASK) != LVS_REPORT)
-        return (FALSE);
+        return (FALSE);
 
     // make sure we can get the listview info
     if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
-        return (FALSE);  
+        return (FALSE);
     if (!infoPtr->hwndHeader) // make sure we have a header
-        return (FALSE); 
-        
+        return (FALSE);
+
     // FIXME: currently ignoring LVSCW_AUTOSIZE (-1) and
     // LVSCV_AUTOSIZE_USEHEADER (-2)
-    if (cx < 0) 
-        return (FALSE);
-        
+    if (cx < 0)
+        return (FALSE);
+
     hdi.mask = HDI_WIDTH;
     hdi.cxy = cx;
@@ -4802 +4803 @@
  * DESCRIPTION:
  * Sets image lists.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : image list type  
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : image list type
  * [I] HIMAGELIST : image list handle
  *
@@ -4817 +4818 @@
   HIMAGELIST himlTemp = 0;
 
-  switch (nType) 
+  switch (nType)
   {
   case LVSIL_NORMAL:
@@ -4843 +4844 @@
  * DESCRIPTION:
  * Sets the attributes of an item.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : item information 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : item information
  *
  * RETURN:
@@ -4881 +4882 @@
  * DESCRIPTION:
  * Preallocates memory.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4897 +4898 @@
  * DESCRIPTION:
  * Sets the position of an item.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4908 +4909 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_SetItemPosition(HWND hwnd, INT nItem, 
+static BOOL LISTVIEW_SetItemPosition(HWND hwnd, INT nItem,
                                      INT nPosX, INT nPosY)
 {
@@ -4943 +4944 @@
  * DESCRIPTION:
  * Sets the state of one or many items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4967 +4968 @@
     lvItem.state = lpLVItem->state;
     lvItem.stateMask = lpLVItem->stateMask ;
-    
+
     /* apply to all items */
     for (i = 0; i< GETITEMCOUNT(infoPtr); i++)
@@ -4994 +4995 @@
  * DESCRIPTION:
  * Sets the text of an item or subitem.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5019 +5020 @@
     bResult = ListView_SetItemA(hwnd, &lvItem);
   }
-  
+
   return bResult;
 }
@@ -5026 +5027 @@
  * DESCRIPTION:
  * Sets the text background color.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5048 +5049 @@
  * DESCRIPTION:
  * Sets the text foreground color.
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] COLORREF : text color 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] COLORREF : text color
  *
  * RETURN:
@@ -5071 +5072 @@
  * DESCRIPTION:
  * Callback internally used by LISTVIEW_SortItems()
- * 
+ *
  * PARAMETER(S):
  * [I] LPVOID : first LISTVIEW_ITEM to compare
@@ -5082 +5083 @@
  *   if first and second are equivalent : zero
  */
-static INT WINAPI LISTVIEW_CallBackCompare( 
-  LPVOID first, 
-  LPVOID second, 
+static INT WINAPI LISTVIEW_CallBackCompare(
+  LPVOID first,
+  LPVOID second,
   LPARAM lParam)
 {
@@ -5100 +5101 @@
  * DESCRIPTION:
  * Sorts the listview items.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5117 +5118 @@
     int nCount, i;
     HDPA sortList;
-    
+
     if (!infoPtr || !infoPtr->hdpaItems)
-        return FALSE;
-    
+        return FALSE;
+
     nCount = GETITEMCOUNT(infoPtr);
     // if there are 0 or 1 items, there is no need to sort
     if (nCount > 1)
     {
-        sortList = DPA_Create(nCount);
-
-        infoPtr->pfnCompare = (PFNLVCOMPARE)lParam;
-        infoPtr->lParamSort = (LPARAM)wParam;
-        
-        // append pointers one by one to sortList
-        for (i = 0; i < nCount; i++)
-        {
-            if ((hdpaSubItems = (HDPA) DPA_GetPtr(infoPtr->hdpaItems, i)))
-                if ((lpItem = (LISTVIEW_ITEM *) DPA_GetPtr(hdpaSubItems, 0)))
-                    DPA_InsertPtr(sortList, nCount + 1, lpItem);
-        }
-
-        // sort the sortList
-        DPA_Sort(sortList, LISTVIEW_CallBackCompare, hwnd);
-
-        // copy the pointers back
-        for (i = 0; i < nCount; i++)
-        {
-            if ((hdpaSubItems = (HDPA) DPA_GetPtr(infoPtr->hdpaItems, i)) &&
-                (lpItem = (LISTVIEW_ITEM *) DPA_GetPtr(sortList, i)))
-                DPA_SetPtr(hdpaSubItems, 0, lpItem);
-        }
-
-        DPA_Destroy(sortList);
+        sortList = DPA_Create(nCount);
+
+        infoPtr->pfnCompare = (PFNLVCOMPARE)lParam;
+        infoPtr->lParamSort = (LPARAM)wParam;
+
+        // append pointers one by one to sortList
+        for (i = 0; i < nCount; i++)
+        {
+            if ((hdpaSubItems = (HDPA) DPA_GetPtr(infoPtr->hdpaItems, i)))
+                if ((lpItem = (LISTVIEW_ITEM *) DPA_GetPtr(hdpaSubItems, 0)))
+                    DPA_InsertPtr(sortList, nCount + 1, lpItem);
+        }
+
+        // sort the sortList
+        DPA_Sort(sortList, LISTVIEW_CallBackCompare, hwnd);
+
+        // copy the pointers back
+        for (i = 0; i < nCount; i++)
+        {
+            if ((hdpaSubItems = (HDPA) DPA_GetPtr(infoPtr->hdpaItems, i)) &&
+                (lpItem = (LISTVIEW_ITEM *) DPA_GetPtr(sortList, i)))
+                DPA_SetPtr(hdpaSubItems, 0, lpItem);
+        }
+
+        DPA_Destroy(sortList);
     }
 
@@ -5158 +5159 @@
  * DESCRIPTION:
  * Updates an items or rearranges the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5199 +5200 @@
  * DESCRIPTION:
  * Creates the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5217 +5218 @@
 
   /* determine the type of structures to use */
-  infoPtr->notifyFormat = SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT, 
+  infoPtr->notifyFormat = SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT,
                                        (WPARAM)hwnd, (LPARAM)NF_QUERY);
   if (infoPtr->notifyFormat != NFR_ANSI)
   {
-    FIXME("ANSI notify format is NOT used\n");
-  }
-  
+    //FIXME("ANSI notify format is NOT used\n");
+  }
+
   /* initialize color information  */
   infoPtr->clrBk = GetSysColor(COLOR_WINDOW);
   infoPtr->clrText = GetSysColor(COLOR_WINDOWTEXT);
-  infoPtr->clrTextBk = GetSysColor(COLOR_WINDOW); 
+  infoPtr->clrTextBk = GetSysColor(COLOR_WINDOW);
 
   /* set default values */
@@ -5241 +5242 @@
   infoPtr->hDefaultFont = CreateFontIndirectA(&logFont);
   infoPtr->hFont = infoPtr->hDefaultFont;
-  
+
   /* create header */
-  infoPtr->hwndHeader = CreateWindowA(WC_HEADERA, (LPCSTR)NULL, 
-                                      WS_CHILD | HDS_HORZ | HDS_BUTTONS, 
-                                      0, 0, 0, 0, hwnd, (HMENU)0, 
+
+  infoPtr->hwndHeader = CreateWindowA(WC_HEADERA, (LPCSTR)NULL,
+                                      WS_CHILD | HDS_HORZ | HDS_BUTTONS,
+                                      0, 0, 0, 0, hwnd, (HMENU)0,
                                       lpcs->hInstance, NULL);
 
   /* set header font */
-  SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, 
+  SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont,
                (LPARAM)TRUE);
-  
+
   if (uView == LVS_ICON)
   {
@@ -5289 +5291 @@
  * DESCRIPTION:
  * Erases the background of the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] WPARAM : device context handle
  * [I] LPARAM : not used
- * 
+ *
  * RETURN:
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_EraseBackground(HWND hwnd, WPARAM wParam, 
+static LRESULT LISTVIEW_EraseBackground(HWND hwnd, WPARAM wParam,
                                         LPARAM lParam)
 {
@@ -5305 +5307 @@
   BOOL bResult;
 
-  if (infoPtr->clrBk == CLR_NONE) 
+  if (infoPtr->clrBk == CLR_NONE)
   {
     bResult = SendMessageA(GetParent(hwnd), WM_ERASEBKGND, wParam, lParam);
   }
-  else 
+  else
   {
     RECT rc;
@@ -5325 +5327 @@
  * DESCRIPTION:
  * Retrieves the listview control font.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5342 +5344 @@
  * DESCRIPTION:
  * Performs vertical scrolling.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : scroll code
- * [I] SHORT : current scroll position if scroll code is SB_THIMBPOSITION 
+ * [I] SHORT : current scroll position if scroll code is SB_THIMBPOSITION
  *             or SB_THUMBTRACK.
  * [I] HWND : scrollbar control window handle
@@ -5362 +5364 @@
   scrollInfo.cbSize = sizeof(SCROLLINFO);
   scrollInfo.fMask = /*SIF_PAGE |*/ SIF_POS | SIF_RANGE;
- 
+
   if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
   {
@@ -5374 +5376 @@
       }
     break;
-    
+
     case SB_LINEDOWN:
       if (scrollInfo.nPos < scrollInfo.nMax)
@@ -5381 +5383 @@
       }
       break;
-      
+
     case SB_PAGEUP:
       if (scrollInfo.nPos > scrollInfo.nMin)
@@ -5406 +5408 @@
       }
       break;
-      
+
     case SB_PAGEDOWN:
       if (scrollInfo.nPos < scrollInfo.nMax)
@@ -5420 +5422 @@
           nPage = 10;
         }
-        
+
         if (scrollInfo.nPos <= scrollInfo.nMax - nPage)
         {
@@ -5443 +5445 @@
     }
   }
-    
+
   return 0;
 }
@@ -5450 +5452 @@
  * DESCRIPTION:
  * Performs horizontal scrolling.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : scroll code
- * [I] SHORT : current scroll position if scroll code is SB_THIMBPOSITION 
+ * [I] SHORT : current scroll position if scroll code is SB_THIMBPOSITION
  *             or SB_THUMBTRACK.
  * [I] HWND : scrollbar control window handle
@@ -5470 +5472 @@
   scrollInfo.cbSize = sizeof(SCROLLINFO);
   scrollInfo.fMask = /*SIF_PAGE |*/ SIF_POS | SIF_RANGE;
- 
+
   if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
   {
@@ -5483 +5485 @@
       }
       break;
-    
+
     case SB_LINERIGHT:
       if (scrollInfo.nPos < scrollInfo.nMax)
@@ -5490 +5492 @@
       }
       break;
-      
+
     case SB_PAGELEFT:
       if (scrollInfo.nPos > scrollInfo.nMin)
@@ -5504 +5506 @@
           nPage = 10;
         }
-        
+
         if (scrollInfo.nPos >= nPage)
         {
@@ -5515 +5517 @@
       }
       break;
-      
+
     case SB_PAGERIGHT:
       if (scrollInfo.nPos < scrollInfo.nMax)
@@ -5529 +5531 @@
           nPage = 10;
         }
-        
+
         if (scrollInfo.nPos <= scrollInfo.nMax - nPage)
         {
@@ -5552 +5554 @@
     }
   }
-    
+
   return 0;
 }
@@ -5558 +5560 @@
 /***
  * DESCRIPTION:
- * ??? 
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : virtual key 
+ * ???
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : virtual key
  * [I] LONG : key data
  *
@@ -5573 +5575 @@
   INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
   HWND hwndParent = GetParent(hwnd);
-  NMLVKEYDOWN nmKeyDown; 
+  NMLVKEYDOWN nmKeyDown;
   NMHDR nmh;
   INT nItem = -1;
@@ -5580 +5582 @@
   /* send LVN_KEYDOWN notification */
   ZeroMemory(&nmKeyDown, sizeof(NMLVKEYDOWN));
-  nmKeyDown.hdr.hwndFrom = hwnd;  
-  nmKeyDown.hdr.idFrom = nCtrlId;  
-  nmKeyDown.hdr.code = LVN_KEYDOWN;  
-  nmKeyDown.wVKey = nVirtualKey; 
-  nmKeyDown.flags = 0; 
-  SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)nCtrlId, (LPARAM)&nmKeyDown); 
-  
+  nmKeyDown.hdr.hwndFrom = hwnd;
+  nmKeyDown.hdr.idFrom = nCtrlId;
+  nmKeyDown.hdr.code = LVN_KEYDOWN;
+  nmKeyDown.wVKey = nVirtualKey;
+  nmKeyDown.flags = 0;
+  SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)nCtrlId, (LPARAM)&nmKeyDown);
+
   /* initialize */
   nmh.hwndFrom = hwnd;
@@ -5599 +5601 @@
       nmh.code = NM_RETURN;
       ListView_Notify(hwndParent, nCtrlId, &nmh);
-      
+
       /* send LVN_ITEMACTIVATE notification */
       nmh.code = LVN_ITEMACTIVATE;
@@ -5627 +5629 @@
     nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_ABOVE);
     break;
-    
+
   case VK_RIGHT:
     nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TORIGHT);
@@ -5662 +5664 @@
  * DESCRIPTION:
  * Kills the focus.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5693 +5695 @@
  * DESCRIPTION:
  * Processes double click messages (left mouse button).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5703 +5705 @@
  * Zero
  */
-static LRESULT LISTVIEW_LButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_LButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX,
                                       WORD wPosY)
 {
@@ -5727 +5729 @@
  * DESCRIPTION:
  * Processes mouse down messages (left mouse button).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5737 +5739 @@
  * Zero
  */
-static LRESULT LISTVIEW_LButtonDown(HWND hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_LButtonDown(HWND hwnd, WORD wKey, WORD wPosX,
                                     WORD wPosY)
 {
@@ -5748 +5750 @@
   INT nItem;
 
-  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX, 
+  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX,
         wPosY);
 
-  /* send NM_RELEASEDCAPTURE notification */ 
+  /* send NM_RELEASEDCAPTURE notification */
   nmh.hwndFrom = hwnd;
   nmh.idFrom = nCtrlId;
   nmh.code = NM_RELEASEDCAPTURE;
   ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
- 
+
   if (infoPtr->bFocus == FALSE)
   {
@@ -5764 +5766 @@
   /* set left button down flag */
   infoPtr->bLButtonDown = TRUE;
-  
+
   ptPosition.x = wPosX;
   ptPosition.y = wPosY;
@@ -5815 +5817 @@
  * DESCRIPTION:
  * Processes mouse up messages (left mouse button).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5825 +5827 @@
  * Zero
  */
-static LRESULT LISTVIEW_LButtonUp(HWND hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_LButtonUp(HWND hwnd, WORD wKey, WORD wPosX,
                                   WORD wPosY)
 {
@@ -5832 +5834 @@
   TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
-  if (infoPtr->bLButtonDown != FALSE) 
+  if (infoPtr->bLButtonDown != FALSE)
   {
     INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
@@ -5853 +5855 @@
  * DESCRIPTION:
  * Creates the listview control (called before WM_CREATE).
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] WPARAM : unhandled 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] WPARAM : unhandled
  * [I] LPARAM : widow creation info
- * 
+ *
  * RETURN:
  * Zero
@@ -5866 +5868 @@
   LISTVIEW_INFO *infoPtr;
 
-  TRACE("(hwnd=%x,wParam=%x,lParam=%lx)\n", hwnd, wParam, lParam);
+  //TRACE("(hwnd=%x,wParam=%x,lParam=%lx)\n", hwnd, wParam, lParam);
 
   /* allocate memory for info structure */
   infoPtr = (LISTVIEW_INFO *)COMCTL32_Alloc(sizeof(LISTVIEW_INFO));
-  SetWindowLongA(hwnd, 0, (LONG)infoPtr);
-  if (infoPtr == NULL) 
-  {
-    ERR("could not allocate info memory!\n");
+  SetWindowLongA(hwnd,0,(DWORD)infoPtr);
+  if (infoPtr == NULL)
+  {
+    //ERR("could not allocate info memory!\n");
     return 0;
   }
 
-  if ((LISTVIEW_INFO *)GetWindowLongA(hwnd, 0) != infoPtr) 
-  {
-    ERR("pointer assignment error!\n");
+  if ((LISTVIEW_INFO *)GetWindowLongA(hwnd, 0) != infoPtr)
+  {
+    //ERR("pointer assignment error!\n");
     return 0;
   }
 
-  return DefWindowProcA(hwnd, WM_NCCREATE, wParam, lParam);
+  return DefWindowProcA(hwnd,WM_NCCREATE,wParam,lParam);
 }
 
@@ -5889 +5891 @@
  * DESCRIPTION:
  * Destroys the listview control (called after WM_DESTROY).
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * 
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
  * RETURN:
  * Zero
@@ -5900 +5902 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 
-  TRACE("(hwnd=%x)\n", hwnd);
+  //TRACE("(hwnd=%x)\n", hwnd);
 
   /* delete all items */
@@ -5924 +5926 @@
  * DESCRIPTION:
  * Handles notifications from children.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : control identifier
  * [I] LPNMHDR : notification information
- * 
+ *
  * RETURN:
  * Zero
@@ -5936 +5938 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  
-  if (lpnmh->hwndFrom == infoPtr->hwndHeader) 
+
+  if (lpnmh->hwndFrom == infoPtr->hwndHeader)
   {
     /* handle notification from header control */
@@ -5953 +5955 @@
  * DESCRIPTION:
  * Determines the type of structure to use.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle of the sender
- * [I] HWND : listview window handle 
+ * [I] HWND : listview window handle
  * [I] INT : command specifying the nature of the WM_NOTIFYFORMAT
  *
@@ -5969 +5971 @@
   {
     /* determine the type of structure to use */
-    infoPtr->notifyFormat = SendMessageA(hwndFrom, WM_NOTIFYFORMAT, 
+    infoPtr->notifyFormat = SendMessageA(hwndFrom, WM_NOTIFYFORMAT,
                                          (WPARAM)hwnd, (LPARAM)NF_QUERY);
     if (infoPtr->notifyFormat == NFR_UNICODE)
@@ -5983 +5985 @@
  * DESCRIPTION:
  * Paints/Repaints the listview control.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6014 +6016 @@
  * DESCRIPTION:
  * Processes double click messages (right mouse button).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6024 +6026 @@
  * Zero
  */
-static LRESULT LISTVIEW_RButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_RButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX,
                                       WORD wPosY)
 {
   INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
   NMHDR nmh;
-
-  TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
-
-  /* send NM_RELEASEDCAPTURE notification */ 
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-  nmh.code = NM_RELEASEDCAPTURE;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
-
-  /* send NM_RDBLCLK notification */
-  nmh.code = NM_RDBLCLK;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
-
-  return 0;
-}
-
-/***
- * DESCRIPTION:
- * Processes mouse down messages (right mouse button).
- * 
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] WORD : key flag
- * [I] WORD : x coordinate
- * [I] WORD : y coordinate
- *
- * RETURN:
- * Zero
- */
-static LRESULT LISTVIEW_RButtonDown(HWND hwnd, WORD wKey, WORD wPosX, 
-                                    WORD wPosY)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  POINT ptPosition;
-  NMHDR nmh;
-  INT nItem;
 
   TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
@@ -6074 +6039 @@
   nmh.code = NM_RELEASEDCAPTURE;
   ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
- 
+
+  /* send NM_RDBLCLK notification */
+  nmh.code = NM_RDBLCLK;
+  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
+
+  return 0;
+}
+
+/***
+ * DESCRIPTION:
+ * Processes mouse down messages (right mouse button).
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] WORD : key flag
+ * [I] WORD : x coordinate
+ * [I] WORD : y coordinate
+ *
+ * RETURN:
+ * Zero
+ */
+static LRESULT LISTVIEW_RButtonDown(HWND hwnd, WORD wKey, WORD wPosX,
+                                    WORD wPosY)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  POINT ptPosition;
+  NMHDR nmh;
+  INT nItem;
+
+  TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+
+  /* send NM_RELEASEDCAPTURE notification */
+  nmh.hwndFrom = hwnd;
+  nmh.idFrom = nCtrlId;
+  nmh.code = NM_RELEASEDCAPTURE;
+  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
+
   /* make sure the listview control window has the focus */
   if (infoPtr->bFocus == FALSE)
@@ -6099 +6101 @@
     LISTVIEW_RemoveSelections(hwnd, 0, GETITEMCOUNT(infoPtr));
   }
-  
+
   return 0;
 }
@@ -6106 +6108 @@
  * DESCRIPTION:
  * Processes mouse up messages (right mouse button).
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6116 +6118 @@
  * Zero
  */
-static LRESULT LISTVIEW_RButtonUp(HWND hwnd, WORD wKey, WORD wPosX, 
+static LRESULT LISTVIEW_RButtonUp(HWND hwnd, WORD wKey, WORD wPosX,
                                   WORD wPosY)
 {
@@ -6125 +6127 @@
   TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
-  if (infoPtr->bRButtonDown != FALSE) 
+  if (infoPtr->bRButtonDown != FALSE)
   {
     /* send NM_RClICK notification */
@@ -6137 +6139 @@
     infoPtr->bRButtonDown = FALSE;
   }
-  
+
   return 0;
 }
@@ -6143 +6145 @@
 /***
  * DESCRIPTION:
- * Sets the focus.  
- * 
+ * Sets the focus.
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6172 +6174 @@
 /***
  * DESCRIPTION:
- * Sets the font.  
- * 
+ * Sets the font.
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6201 +6203 @@
   {
     /* set header font */
-    SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, 
+    SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont,
                    MAKELPARAM(fRedraw, 0));
   }
@@ -6207 +6209 @@
   /* invalidate listview control client area */
   InvalidateRect(hwnd, NULL, TRUE);
-  
+
   if (fRedraw != FALSE)
   {
@@ -6220 +6222 @@
  * Resizes the listview control. This function processes WM_SIZE
  * messages.  At this time, the width and height are not used.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6231 +6233 @@
 static LRESULT LISTVIEW_Size(HWND hwnd, int Width, int Height)
 {
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE); 
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
 
@@ -6251 +6253 @@
 
   LISTVIEW_UpdateScroll(hwnd);
-  
+
   /* invalidate client area + erase background */
   InvalidateRect(hwnd, NULL, TRUE);
@@ -6261 +6263 @@
  * DESCRIPTION:
  * Sets the size information.
- * 
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6274 +6276 @@
   UINT uView = lStyle & LVS_TYPEMASK;
   RECT rcList;
-  
+
   GetClientRect(hwnd, &rcList);
   infoPtr->rcList.left = 0;
@@ -6280 +6282 @@
   infoPtr->rcList.top = 0;
   infoPtr->rcList.bottom = max(rcList.bottom - rcList.top, 1);
-     
+
   if (uView == LVS_LIST)
   {
@@ -6287 +6289 @@
       INT nHScrollHeight = GetSystemMetrics(SM_CYHSCROLL);
       if (infoPtr->rcList.bottom > nHScrollHeight)
-      { 
+      {
         infoPtr->rcList.bottom -= nHScrollHeight;
       }
@@ -6309 +6311 @@
 /***
  * DESCRIPTION:
- * Processes WM_STYLECHANGED messages. 
- * 
+ * Processes WM_STYLECHANGED messages.
+ *
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6319 +6321 @@
  * Zero
  */
-static INT LISTVIEW_StyleChanged(HWND hwnd, WPARAM wStyleType, 
+static INT LISTVIEW_StyleChanged(HWND hwnd, WPARAM wStyleType,
                                  LPSTYLESTRUCT lpss)
 {
@@ -6327 +6329 @@
   RECT rcList = infoPtr->rcList;
 
-  TRACE("(hwnd=%x, styletype=%x, stylestruct=%p)\n", 
+  TRACE("(hwnd=%x, styletype=%x, stylestruct=%p)\n",
         hwnd, wStyleType, lpss);
 
@@ -6336 +6338 @@
       ShowWindow(infoPtr->hwndHeader, SW_HIDE);
     }
- 
+
     if ((lpss->styleOld & WS_HSCROLL) != 0)
     {
        ShowScrollBar(hwnd, SB_HORZ, FALSE);
     }
- 
+
     if ((lpss->styleOld & WS_VSCROLL) != 0)
     {
        ShowScrollBar(hwnd, SB_VERT, FALSE);
     }
- 
+
     if (uNewView == LVS_ICON)
     {
@@ -6370 +6372 @@
       hl.pwpos = &wp;
       Header_Layout(infoPtr->hwndHeader, &hl);
-      SetWindowPos(infoPtr->hwndHeader, hwnd, wp.x, wp.y, wp.cx, wp.cy, 
+      SetWindowPos(infoPtr->hwndHeader, hwnd, wp.x, wp.y, wp.cx, wp.cy,
                    wp.flags);
       if (!(LVS_NOCOLUMNHEADER & lpss->styleNew))
@@ -6409 +6411 @@
     /* add scrollbars if needed */
     LISTVIEW_UpdateScroll(hwnd);
-    
+
     /* invalidate client area + erase background */
     InvalidateRect(hwnd, NULL, TRUE);
@@ -6430 +6432 @@
   switch (uMsg)
   {
-  case LVM_APPROXIMATEVIEWRECT: 
-    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam, 
+  case LVM_APPROXIMATEVIEWRECT:
+    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam,
                                         LOWORD(lParam), HIWORD(lParam));
-  case LVM_ARRANGE: 
+  case LVM_ARRANGE:
     return LISTVIEW_Arrange(hwnd, (INT)wParam);
 
@@ -6447 +6449 @@
     return LISTVIEW_DeleteItem(hwnd, (INT)wParam);
 
-/*      case LVM_EDITLABEL: */
+/*      case LVM_EDITLABEL: */
 
   case LVM_ENSUREVISIBLE:
@@ -6458 +6460 @@
     return LISTVIEW_GetBkColor(hwnd);
 
-/*      case LVM_GETBKIMAGE: */
+/*      case LVM_GETBKIMAGE: */
 
   case LVM_GETCALLBACKMASK:
@@ -6466 +6468 @@
     return LISTVIEW_GetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
 
-/*      case LVM_GETCOLUMNW: */
-/*      case LVM_GETCOLUMNORDERARRAY: */
+/*      case LVM_GETCOLUMNW: */
+/*      case LVM_GETCOLUMNORDERARRAY: */
 
   case LVM_GETCOLUMNWIDTH:
@@ -6475 +6477 @@
     return LISTVIEW_GetCountPerPage(hwnd);
 
-/*      case LVM_GETEDITCONTROL: */
-/*      case LVM_GETEXTENDEDLISTVIEWSTYLE: */
+/*      case LVM_GETEDITCONTROL: */
+/*      case LVM_GETEXTENDEDLISTVIEWSTYLE: */
 
   case LVM_GETHEADER:
     return LISTVIEW_GetHeader(hwnd);
 
-/*      case LVM_GETHOTCURSOR: */
-/*      case LVM_GETHOTITEM: */
-/*      case LVM_GETHOVERTIME: */
+/*      case LVM_GETHOTCURSOR: */
+/*      case LVM_GETHOTITEM: */
+/*      case LVM_GETHOVERTIME: */
 
   case LVM_GETIMAGELIST:
     return LISTVIEW_GetImageList(hwnd, (INT)wParam);
 
-/*      case LVM_GETISEARCHSTRING: */
+/*      case LVM_GETISEARCHSTRING: */
 
   case LVM_GETITEMA:
     return LISTVIEW_GetItemA(hwnd, (LPLVITEMA)lParam);
 
-/*      case LVM_GETITEMW: */
+/*      case LVM_GETITEMW: */
 
   case LVM_GETITEMCOUNT:
@@ -6501 +6503 @@
     return LISTVIEW_GetItemPosition(hwnd, (INT)wParam, (LPPOINT)lParam);
 
-  case LVM_GETITEMRECT: 
+  case LVM_GETITEMRECT:
     return LISTVIEW_GetItemRect(hwnd, (INT)wParam, (LPRECT)lParam);
 
-  case LVM_GETITEMSPACING: 
+  case LVM_GETITEMSPACING:
     return LISTVIEW_GetItemSpacing(hwnd, (BOOL)wParam);
 
-  case LVM_GETITEMSTATE: 
+  case LVM_GETITEMSTATE:
     return LISTVIEW_GetItemState(hwnd, (INT)wParam, (UINT)lParam);
-    
+
   case LVM_GETITEMTEXTA:
     LISTVIEW_GetItemTextA(hwnd, (INT)wParam, (LPLVITEMA)lParam);
     break;
 
-/*      case LVM_GETITEMTEXTW: */
+/*      case LVM_GETITEMTEXTW: */
 
   case LVM_GETNEXTITEM:
     return LISTVIEW_GetNextItem(hwnd, (INT)wParam, LOWORD(lParam));
 
-/*      case LVM_GETNUMBEROFWORKAREAS: */
+/*      case LVM_GETNUMBEROFWORKAREAS: */
 
   case LVM_GETORIGIN:
@@ -6527 +6529 @@
     return LISTVIEW_GetSelectedCount(hwnd);
 
-  case LVM_GETSELECTIONMARK: 
+  case LVM_GETSELECTIONMARK:
     return LISTVIEW_GetSelectionMark(hwnd);
 
@@ -6533 +6535 @@
     return LISTVIEW_GetStringWidthA (hwnd, (LPCSTR)lParam);
 
-/*      case LVM_GETSTRINGWIDTHW: */
-/*      case LVM_GETSUBITEMRECT: */
+/*      case LVM_GETSTRINGWIDTHW: */
+/*      case LVM_GETSUBITEMRECT: */
 
   case LVM_GETTEXTBKCOLOR:
@@ -6542 +6544 @@
     return LISTVIEW_GetTextColor(hwnd);
 
-/*      case LVM_GETTOOLTIPS: */
+/*      case LVM_GETTOOLTIPS: */
 
   case LVM_GETTOPINDEX:
     return LISTVIEW_GetTopIndex(hwnd);
 
-/*      case LVM_GETUNICODEFORMAT: */
+/*      case LVM_GETUNICODEFORMAT: */
 
   case LVM_GETVIEWRECT:
     return LISTVIEW_GetViewRect(hwnd, (LPRECT)lParam);
 
-/*      case LVM_GETWORKAREAS: */
+/*      case LVM_GETWORKAREAS: */
 
   case LVM_HITTEST:
@@ -6558 +6560 @@
 
   case LVM_INSERTCOLUMNA:
-    return LISTVIEW_InsertColumnA(hwnd, (INT)wParam, 
+    return LISTVIEW_InsertColumnA(hwnd, (INT)wParam,
                                     (LPLVCOLUMNA)lParam);
 
-/*      case LVM_INSERTCOLUMNW: */
+/*      case LVM_INSERTCOLUMNW: */
 
   case LVM_INSERTITEMA:
     return LISTVIEW_InsertItemA(hwnd, (LPLVITEMA)lParam);
 
-/*      case LVM_INSERTITEMW: */
+/*      case LVM_INSERTITEMW: */
 
   case LVM_REDRAWITEMS:
@@ -6577 +6579 @@
     return LISTVIEW_SetBkColor(hwnd, (COLORREF)lParam);
 
-/*      case LVM_SETBKIMAGE: */
+/*      case LVM_SETBKIMAGE: */
 
   case LVM_SETCALLBACKMASK:
@@ -6585 +6587 @@
     return LISTVIEW_SetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
 
-/*      case LVM_SETCOLUMNW: */
-/*      case LVM_SETCOLUMNORDERARRAY: */
+/*      case LVM_SETCOLUMNW: */
+/*      case LVM_SETCOLUMNORDERARRAY: */
 
   case LVM_SETCOLUMNWIDTH:
     return LISTVIEW_SetColumnWidth(hwnd, (INT)wParam, (INT)lParam);
 
-/*      case LVM_SETEXTENDEDLISTVIEWSTYLE: */
-/*      case LVM_SETHOTCURSOR: */
-/*      case LVM_SETHOTITEM: */
-/*      case LVM_SETHOVERTIME: */
-/*      case LVM_SETICONSPACING: */
-        
+/*      case LVM_SETEXTENDEDLISTVIEWSTYLE: */
+/*      case LVM_SETHOTCURSOR: */
+/*      case LVM_SETHOTITEM: */
+/*      case LVM_SETHOVERTIME: */
+/*      case LVM_SETICONSPACING: */
+
   case LVM_SETIMAGELIST:
     return LISTVIEW_SetImageList(hwnd, (INT)wParam, (HIMAGELIST)lParam);
@@ -6603 +6605 @@
     return LISTVIEW_SetItemA(hwnd, (LPLVITEMA)lParam);
 
-/*      case LVM_SETITEMW: */
-
-  case LVM_SETITEMCOUNT: 
+/*      case LVM_SETITEMW: */
+
+  case LVM_SETITEMCOUNT:
     LISTVIEW_SetItemCount(hwnd, (INT)wParam);
     break;
-    
+
   case LVM_SETITEMPOSITION:
     return LISTVIEW_SetItemPosition(hwnd, (INT)wParam, (INT)LOWORD(lParam),
                                     (INT)HIWORD(lParam));
 
-/*      case LVM_SETITEMPOSITION: */
-
-  case LVM_SETITEMSTATE: 
+/*      case LVM_SETITEMPOSITION: */
+
+  case LVM_SETITEMSTATE:
     return LISTVIEW_SetItemState(hwnd, (INT)wParam, (LPLVITEMA)lParam);
 
@@ -6621 +6623 @@
     return LISTVIEW_SetItemTextA(hwnd, (INT)wParam, (LPLVITEMA)lParam);
 
-/*      case LVM_SETSELECTIONMARK: */
+/*      case LVM_SETSELECTIONMARK: */
 
   case LVM_SETTEXTBKCOLOR:
@@ -6629 +6631 @@
     return LISTVIEW_SetTextColor(hwnd, (COLORREF)lParam);
 
-/*      case LVM_SETTOOLTIPS: */
-/*      case LVM_SETUNICODEFORMAT: */
-/*      case LVM_SETWORKAREAS: */
+/*      case LVM_SETTOOLTIPS: */
+/*      case LVM_SETUNICODEFORMAT: */
+/*      case LVM_SETWORKAREAS: */
 
   case LVM_SORTITEMS:
     return LISTVIEW_SortItems(hwnd, wParam, lParam);
 
-/*      case LVM_SUBITEMHITTEST: */
-
-  case LVM_UPDATE: 
+/*      case LVM_SUBITEMHITTEST: */
+
+  case LVM_UPDATE:
     return LISTVIEW_Update(hwnd, (INT)wParam);
 
-/*      case WM_CHAR: */
-/*      case WM_COMMAND: */
+/*      case WM_CHAR: */
+/*      case WM_COMMAND: */
 
   case WM_CREATE:
     return LISTVIEW_Create(hwnd, wParam, lParam);
-    
+
   case WM_ERASEBKGND:
     return LISTVIEW_EraseBackground(hwnd, wParam, lParam);
@@ -6657 +6659 @@
 
   case WM_HSCROLL:
-    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam), 
+    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam),
                             (INT)HIWORD(wParam), (HWND)lParam);
 
@@ -6667 +6669 @@
 
   case WM_LBUTTONDBLCLK:
-    return LISTVIEW_LButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam), 
+    return LISTVIEW_LButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
                                 HIWORD(lParam));
-    
+
   case WM_LBUTTONDOWN:
-    return LISTVIEW_LButtonDown(hwnd, (WORD)wParam, LOWORD(lParam), 
+    return LISTVIEW_LButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
                                 HIWORD(lParam));
   case WM_LBUTTONUP:
-    return LISTVIEW_LButtonUp(hwnd, (WORD)wParam, LOWORD(lParam), 
+    return LISTVIEW_LButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
                               HIWORD(lParam));
-    
-/*      case WM_MOUSEMOVE: */
-/*          return LISTVIEW_MouseMove (hwnd, wParam, lParam); */
+
+/*      case WM_MOUSEMOVE: */
+/*          return LISTVIEW_MouseMove (hwnd, wParam, lParam); */
 
   case WM_NCCREATE:
@@ -6692 +6694 @@
     return LISTVIEW_NotifyFormat(hwnd, (HWND)wParam, (INT)lParam);
 
-  case WM_PAINT: 
-    return LISTVIEW_Paint(hwnd, (HDC)wParam); 
+  case WM_PAINT:
+    return LISTVIEW_Paint(hwnd, (HDC)wParam);
 
   case WM_RBUTTONDBLCLK:
-    return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam), 
+    return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
                                   HIWORD(lParam));
 
   case WM_RBUTTONDOWN:
-    return LISTVIEW_RButtonDown(hwnd, (WORD)wParam, LOWORD(lParam), 
+    return LISTVIEW_RButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
                                 HIWORD(lParam));
 
   case WM_RBUTTONUP:
-    return LISTVIEW_RButtonUp(hwnd, (WORD)wParam, LOWORD(lParam), 
+    return LISTVIEW_RButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
                               HIWORD(lParam));
 
@@ -6713 +6715 @@
     return LISTVIEW_SetFont(hwnd, (HFONT)wParam, (WORD)lParam);
 
-/*      case WM_SETREDRAW: */
+/*      case WM_SETREDRAW: */
 
   case WM_SIZE:
@@ -6721 +6723 @@
     return LISTVIEW_StyleChanged(hwnd, wParam, (LPSTYLESTRUCT)lParam);
 
-/*      case WM_TIMER: */
+/*      case WM_TIMER: */
 
   case WM_VSCROLL:
-    return LISTVIEW_VScroll(hwnd, (INT)LOWORD(wParam), 
+    return LISTVIEW_VScroll(hwnd, (INT)LOWORD(wParam),
                             (INT)HIWORD(wParam), (HWND)lParam);
 
-/*      case WM_WINDOWPOSCHANGED: */
-/*      case WM_WININICHANGE: */
+/*      case WM_WINDOWPOSCHANGED: */
+/*      case WM_WININICHANGE: */
 
   default:
-    if (uMsg >= WM_USER)
-    {
-      ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, 
-          lParam);
-    }
+    //if (uMsg >= WM_USER)
+    //{
+    //  ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam,
+    //      lParam);
+    //}
 
     /* call default window procedure */
@@ -6747 +6749 @@
  * DESCRIPTION:
  * Registers the window class.
- * 
+ *
  * PARAMETER(S):
  * None
@@ -6758 +6760 @@
   WNDCLASSA wndClass;
 
-  if (!GlobalFindAtomA(WC_LISTVIEWA)) 
+  if (!GlobalFindAtomA(WC_LISTVIEWA))
   {
     ZeroMemory(&wndClass, sizeof(WNDCLASSA));
@@ -6775 +6777 @@
  * DESCRIPTION:
  * Unregisters the window class.
- * 
+ *
  * PARAMETER(S):
  * None

trunk/src/comctl32/progress.c

@@ -1 @@
-/* $Id: progress.c,v 1.6 1999-06-26 14:20:31 cbratschi Exp $ */
+/* $Id: progress.c,v 1.7 1999-06-28 15:46:25 cbratschi Exp $ */
 /*
  * Progress control
@@ -284 +284 @@
 
 
+static LRESULT PROGRESS_NCCreate(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  DWORD dwExStyle;
+
+  dwExStyle = GetWindowLongA(hwnd,GWL_EXSTYLE);
+  SetWindowLongA(hwnd,GWL_EXSTYLE,dwExStyle | WS_EX_STATICEDGE);
+
+  return TRUE;
+}
+
+static LRESULT PROGRESS_Create(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr;
+
+  /* allocate memory for info struct */
+  infoPtr = (PROGRESS_INFO *)COMCTL32_Alloc(sizeof(PROGRESS_INFO));
+  SetWindowLongA(hwnd,0,(DWORD)infoPtr);
+
+  /* initialize the info struct */
+  infoPtr->MinVal = 0;
+  infoPtr->MaxVal = 100;
+  infoPtr->CurVal = 0;
+  infoPtr->Step = 10;
+  infoPtr->ColorBar = CLR_DEFAULT;
+  infoPtr->ColorBk = CLR_DEFAULT;
+  infoPtr->hFont = (HANDLE)NULL;
+//      TRACE(progress, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
+
+  return 0;
+}
+
+static LRESULT PROGRESS_Destroy(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+
+  //      TRACE (progress, "Progress Ctrl destruction, hwnd=%04x\n", hwnd);
+  COMCTL32_Free (infoPtr);
+
+  return 0;
+}
+
+static LRESULT PROGRESS_GetFont(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+
+  return (LRESULT)infoPtr->hFont;
+}
+
 /***********************************************************************
  *           PROGRESS_SetFont
  * Set new Font for progress bar
  */
-static HFONT
-PROGRESS_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+static HFONT PROGRESS_SetFont (HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
   HFONT hOldFont = infoPtr->hFont;
 
   infoPtr->hFont = (HFONT)wParam;
-  if (LOWORD(lParam))
-        PROGRESS_Refresh (hwnd);
+  if (LOWORD(lParam)) PROGRESS_Refresh (hwnd);
+
   return hOldFont;
 }
 
+static LRESULT PROGRESS_DeltaPos(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  INT temp;
+
+  //if(lParam) UNKNOWN_PARAM(PBM_DELTAPOS, wParam, lParam);
+  temp = infoPtr->CurVal;
+  if (wParam != 0)
+  {
+    infoPtr->CurVal += (INT)wParam;
+    PROGRESS_CoercePos(hwnd);
+    PROGRESS_Update(hwnd,temp);
+  }
+
+  return temp;
+}
+
+static LRESULT PROGRESS_SetPos(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  INT temp;
+
+  //if (lParam) UNKNOWN_PARAM(PBM_SETPOS, wParam, lParam);
+  temp = infoPtr->CurVal;
+  if (temp != wParam)
+  {
+    infoPtr->CurVal = (UINT16)wParam; //CB: 0..65535 allowed
+    PROGRESS_CoercePos(hwnd);
+    PROGRESS_Update(hwnd,temp);
+  }
+
+  return temp;
+}
+
+static LRESULT PROGRESS_SetRange(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  INT temp;
+
+  //if (wParam) UNKNOWN_PARAM(PBM_SETRANGE, wParam, lParam);
+  temp = MAKELONG(infoPtr->MinVal,infoPtr->MaxVal);
+  if (temp != lParam)
+  {
+    infoPtr->MinVal = LOWORD(lParam);
+    infoPtr->MaxVal = HIWORD(lParam);
+    if (infoPtr->MaxVal <= infoPtr->MinVal) infoPtr->MaxVal = infoPtr->MinVal+1;
+    PROGRESS_CoercePos(hwnd);
+    PROGRESS_Refresh(hwnd);
+  }
+
+  return temp;
+}
+
+static LRESULT PROGRESS_SetStep(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  INT temp;
+
+  //if (lParam) UNKNOWN_PARAM(PBM_SETSTEP, wParam, lParam);
+  temp = infoPtr->Step;
+  infoPtr->Step = (INT)wParam; //CB: negative steps allowed
+
+  return temp;
+}
+
+static LRESULT PROGRESS_StepIt(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  INT temp;
+
+  //if (wParam || lParam) UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
+  temp = infoPtr->CurVal;
+  infoPtr->CurVal += infoPtr->Step;
+  if(infoPtr->CurVal > infoPtr->MaxVal) infoPtr->CurVal = infoPtr->MinVal;
+  if(temp != infoPtr->CurVal) PROGRESS_Update (hwnd,temp);
+
+  return temp;
+}
+
+static LRESULT PROGRESS_SetRange32(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  INT temp;
+
+  temp = MAKELONG(infoPtr->MinVal,infoPtr->MaxVal);
+  if((infoPtr->MinVal != (INT)wParam) || (infoPtr->MaxVal != (INT)lParam))
+  {
+    infoPtr->MinVal = (INT)wParam;
+    infoPtr->MaxVal = (INT)lParam;
+    if(infoPtr->MaxVal <= infoPtr->MinVal) infoPtr->MaxVal = infoPtr->MinVal+1;
+    PROGRESS_CoercePos(hwnd);
+    PROGRESS_Refresh(hwnd);
+  }
+
+  return temp;
+}
+
+static LRESULT PROGRESS_GetRange(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+
+  if (lParam)
+  {
+    ((PPBRANGE)lParam)->iLow = infoPtr->MinVal;
+    ((PPBRANGE)lParam)->iHigh = infoPtr->MaxVal;
+  }
+
+  return (wParam) ? infoPtr->MinVal : infoPtr->MaxVal;
+}
+
+static LRESULT PROGRESS_GetPos(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+
+  //if (wParam || lParam) UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
+
+  return (infoPtr->CurVal);
+}
+
+static LRESULT PROGRESS_SetBarColor(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  COLORREF oldColorBar = infoPtr->ColorBar;
+
+  //if (wParam) UNKNOWN_PARAM(PBM_SETBARCOLOR, wParam, lParam);
+  infoPtr->ColorBar = (COLORREF)lParam;
+  if (infoPtr->ColorBar != oldColorBar) PROGRESS_Refresh(hwnd);
+
+  return 0;
+}
+
+static LRESULT PROGRESS_SetBkColor(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
+  COLORREF oldColorBk = infoPtr->ColorBk;
+
+  //if (wParam) UNKNOWN_PARAM(PBM_SETBKCOLOR, wParam, lParam);
+  infoPtr->ColorBk = (COLORREF)lParam;
+  if (infoPtr->ColorBk != oldColorBk) PROGRESS_Refresh (hwnd);
+
+  return 0;
+}
 
 /***********************************************************************
@@ -307 +496 @@
                                   WPARAM wParam, LPARAM lParam)
 {
-    PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd);
-  INT temp;
-
   switch(message)
     {
     case WM_NCCREATE:
-            {
-                DWORD dwExStyle;
-                dwExStyle = GetWindowLongA(hwnd, GWL_EXSTYLE);
-                SetWindowLongA(hwnd, GWL_EXSTYLE, dwExStyle | WS_EX_STATICEDGE);
-            }
-      return TRUE;
+      return PROGRESS_NCCreate(hwnd,wParam,lParam);
 
     case WM_CREATE:
-      /* allocate memory for info struct */
-      infoPtr =
-        (PROGRESS_INFO *)COMCTL32_Alloc (sizeof(PROGRESS_INFO));
-      SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
-
-      /* initialize the info struct */
-      infoPtr->MinVal=0;
-      infoPtr->MaxVal=100;
-      infoPtr->CurVal=0;
-      infoPtr->Step=10;
-      infoPtr->ColorBar=CLR_DEFAULT;
-      infoPtr->ColorBk=CLR_DEFAULT;
-      infoPtr->hFont=(HANDLE)NULL;
-//      TRACE(progress, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
-      break;
+      return PROGRESS_Create(hwnd,wParam,lParam);
 
     case WM_DESTROY:
-//      TRACE (progress, "Progress Ctrl destruction, hwnd=%04x\n", hwnd);
-      COMCTL32_Free (infoPtr);
-      break;
+      return PROGRESS_Destroy(hwnd,wParam,lParam);
 
     case WM_ERASEBKGND:
@@ -348 +513 @@
 
     case WM_GETFONT:
-      return (LRESULT)infoPtr->hFont;
+      return PROGRESS_GetFont(hwnd,wParam,lParam);
 
     case WM_SETFONT:
-      return PROGRESS_SetFont (hwnd, wParam, lParam);
+      return PROGRESS_SetFont (hwnd,wParam,lParam);
 
     case WM_PAINT:
-      PROGRESS_Paint (hwnd);
+      PROGRESS_Paint(hwnd);
       break;
 
     case PBM_DELTAPOS:
-      if(lParam)
-        UNKNOWN_PARAM(PBM_DELTAPOS, wParam, lParam);
-      temp = infoPtr->CurVal;
-      if(wParam != 0){
-        infoPtr->CurVal += (INT)wParam;
-        PROGRESS_CoercePos (hwnd);
-        PROGRESS_Update (hwnd,temp);
-      }
-      return temp;
+      return PROGRESS_DeltaPos(hwnd,wParam,lParam);
 
     case PBM_SETPOS:
-      if (lParam)
-        UNKNOWN_PARAM(PBM_SETPOS, wParam, lParam);
-      temp = infoPtr->CurVal;
-      if(temp != wParam){
-        infoPtr->CurVal = (UINT16)wParam; //CB: 0..65535 allowed
-        PROGRESS_CoercePos(hwnd);
-        PROGRESS_Update (hwnd,temp);
-      }
-      return temp;
+      return PROGRESS_SetPos(hwnd,wParam,lParam);
 
     case PBM_SETRANGE:
-      if (wParam)
-        UNKNOWN_PARAM(PBM_SETRANGE, wParam, lParam);
-      temp = MAKELONG(infoPtr->MinVal, infoPtr->MaxVal);
-      if(temp != lParam){
-        infoPtr->MinVal = LOWORD(lParam);
-        infoPtr->MaxVal = HIWORD(lParam);
-        if(infoPtr->MaxVal <= infoPtr->MinVal)
-          infoPtr->MaxVal = infoPtr->MinVal+1;
-        PROGRESS_CoercePos(hwnd);
-        PROGRESS_Refresh (hwnd);
-      }
-      return temp;
+      return PROGRESS_SetRange(hwnd,wParam,lParam);
 
     case PBM_SETSTEP:
-      if (lParam)
-        UNKNOWN_PARAM(PBM_SETSTEP, wParam, lParam);
-      temp = infoPtr->Step;
-      infoPtr->Step = (INT)wParam; //CB: negative steps allowed
-      return temp;
+      return PROGRESS_SetStep(hwnd,wParam,lParam);
 
     case PBM_STEPIT:
-      if (wParam || lParam)
-        UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
-      temp = infoPtr->CurVal;
-      infoPtr->CurVal += infoPtr->Step;
-      if(infoPtr->CurVal > infoPtr->MaxVal)
-        infoPtr->CurVal = infoPtr->MinVal;
-      if(temp != infoPtr->CurVal)
-        PROGRESS_Update (hwnd,temp);
-      return temp;
+      return PROGRESS_StepIt(hwnd,wParam,lParam);
 
     case PBM_SETRANGE32:
-      temp = MAKELONG(infoPtr->MinVal, infoPtr->MaxVal);
-      if((infoPtr->MinVal != (INT)wParam) ||
-         (infoPtr->MaxVal != (INT)lParam)) {
-        infoPtr->MinVal = (INT)wParam;
-        infoPtr->MaxVal = (INT)lParam;
-        if(infoPtr->MaxVal <= infoPtr->MinVal)
-          infoPtr->MaxVal = infoPtr->MinVal+1;
-        PROGRESS_CoercePos(hwnd);
-        PROGRESS_Refresh (hwnd);
-      }
-      return temp;
+      return PROGRESS_SetRange32(hwnd,wParam,lParam);
 
     case PBM_GETRANGE:
-      if (lParam){
-        ((PPBRANGE)lParam)->iLow = infoPtr->MinVal;
-        ((PPBRANGE)lParam)->iHigh = infoPtr->MaxVal;
-      }
-      return (wParam) ? infoPtr->MinVal : infoPtr->MaxVal;
+      return PROGRESS_GetRange(hwnd,wParam,lParam);
 
     case PBM_GETPOS:
-      if (wParam || lParam)
-        UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
-      return (infoPtr->CurVal);
+      return PROGRESS_GetPos(hwnd,wParam,lParam);
 
     case PBM_SETBARCOLOR:
-      if (wParam)
-        UNKNOWN_PARAM(PBM_SETBARCOLOR, wParam, lParam);
-      infoPtr->ColorBar = (COLORREF)lParam;
-      PROGRESS_Refresh (hwnd);
-      break;
+      return PROGRESS_SetBarColor(hwnd,wParam,lParam);
 
     case PBM_SETBKCOLOR:
-      if (wParam)
-        UNKNOWN_PARAM(PBM_SETBKCOLOR, wParam, lParam);
-      infoPtr->ColorBk = (COLORREF)lParam;
-      PROGRESS_Refresh (hwnd);
-      break;
+      return PROGRESS_SetBkColor(hwnd,wParam,lParam);
 
     default:

trunk/src/comctl32/rebar.c

@@ -1 @@
-/* $Id: rebar.c,v 1.4 1999-06-10 16:22:01 achimha Exp $ */
+/* $Id: rebar.c,v 1.5 1999-06-28 15:46:26 cbratschi Exp $ */
 /*
  * Rebar control
@@ -5 +5 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * NOTES
@@ -14 +15 @@
  *   - vertical placement
  *   - ComboBox and ComboBoxEx placement
- *   - center image 
+ *   - center image
  *   - Layout code.
  *   - Display code.
@@ -52 +53 @@
     /* draw gripper */
     if (lpBand->fDraw & DRAW_GRIPPER)
-        DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
+        DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
 
     /* draw caption image */
     if (lpBand->fDraw & DRAW_IMAGE) {
-        /* FIXME: center image */
-        POINT pt;
-
-        pt.y = (lpBand->rcCapImage.bottom + lpBand->rcCapImage.top - infoPtr->imageSize.cy)/2;
-        pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2;
-
-        ImageList_Draw (infoPtr->himl, lpBand->iImage, hdc,
-/*                      lpBand->rcCapImage.left, lpBand->rcCapImage.top, */
-                        pt.x, pt.y,
-                        ILD_TRANSPARENT);
+        /* FIXME: center image */
+        POINT pt;
+
+        pt.y = (lpBand->rcCapImage.bottom + lpBand->rcCapImage.top - infoPtr->imageSize.cy)/2;
+        pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2;
+
+        ImageList_Draw (infoPtr->himl, lpBand->iImage, hdc,
+/*                      lpBand->rcCapImage.left, lpBand->rcCapImage.top, */
+                        pt.x, pt.y,
+                        ILD_TRANSPARENT);
     }
 
     /* draw caption text */
     if (lpBand->fDraw & DRAW_TEXT) {
-        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
-        INT oldBkMode = SetBkMode (hdc, TRANSPARENT);
-        DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText,
-                     DT_CENTER | DT_VCENTER | DT_SINGLELINE);
-        if (oldBkMode != TRANSPARENT)
-            SetBkMode (hdc, oldBkMode);
-        SelectObject (hdc, hOldFont);
+        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+        INT oldBkMode = SetBkMode (hdc, TRANSPARENT);
+        DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText,
+                     DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+        if (oldBkMode != TRANSPARENT)
+            SetBkMode (hdc, oldBkMode);
+        SelectObject (hdc, hOldFont);
     }
 }
@@ -89 +90 @@
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-
-        if ((lpBand->fStyle & RBBS_HIDDEN) || 
-            ((GetWindowLongA (hwnd, GWL_STYLE) & CCS_VERT) &&
-             (lpBand->fStyle & RBBS_NOVERT)))
-            continue;
-
-        REBAR_DrawBand (hdc, infoPtr, lpBand);
+        lpBand = &infoPtr->bands[i];
+
+        if ((lpBand->fStyle & RBBS_HIDDEN) ||
+            ((GetWindowLongA (hwnd, GWL_STYLE) & CCS_VERT) &&
+             (lpBand->fStyle & RBBS_NOVERT)))
+            continue;
+
+        REBAR_DrawBand (hdc, infoPtr, lpBand);
 
     }
@@ -112 +113 @@
     /* image is visible */
     if ((lpBand->iImage > -1) && (infoPtr->himl)) {
-        lpBand->fDraw |= DRAW_IMAGE;
-
-        lpBand->rcCapImage.right  = lpBand->rcCapImage.left + infoPtr->imageSize.cx;
-        lpBand->rcCapImage.bottom = lpBand->rcCapImage.top + infoPtr->imageSize.cy;
-
-        /* update band height */
-        if (lpBand->uMinHeight < infoPtr->imageSize.cy + 2) {
-            lpBand->uMinHeight = infoPtr->imageSize.cy + 2;
-            lpBand->rcBand.bottom = lpBand->rcBand.top + lpBand->uMinHeight;
-        }
+        lpBand->fDraw |= DRAW_IMAGE;
+
+        lpBand->rcCapImage.right  = lpBand->rcCapImage.left + infoPtr->imageSize.cx;
+        lpBand->rcCapImage.bottom = lpBand->rcCapImage.top + infoPtr->imageSize.cy;
+
+        /* update band height */
+        if (lpBand->uMinHeight < infoPtr->imageSize.cy + 2) {
+            lpBand->uMinHeight = infoPtr->imageSize.cy + 2;
+            lpBand->rcBand.bottom = lpBand->rcBand.top + lpBand->uMinHeight;
+        }
     }
 
@@ -132 +133 @@
     /* text is visible */
     if (lpBand->lpText) {
-        HDC hdc = GetDC (0);
-        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
-        SIZE size;
-
-        lpBand->fDraw |= DRAW_TEXT;
-        GetTextExtentPoint32W (hdc, lpBand->lpText,
-                               lstrlenW (lpBand->lpText), &size);
-        lpBand->rcCapText.right += size.cx;
-
-        SelectObject (hdc, hOldFont);
-        ReleaseDC (0, hdc);
+        HDC hdc = GetDC (0);
+        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+        SIZE size;
+
+        lpBand->fDraw |= DRAW_TEXT;
+        GetTextExtentPoint32W (hdc, lpBand->lpText,
+                               lstrlenW (lpBand->lpText), &size);
+        lpBand->rcCapText.right += size.cx;
+
+        SelectObject (hdc, hOldFont);
+        ReleaseDC (0, hdc);
     }
 
     /* set initial child window rectangle */
     if (lpBand->fStyle & RBBS_FIXEDSIZE) {
-        lpBand->rcChild.left   = lpBand->rcCapText.right;
-        lpBand->rcChild.top    = lpBand->rcBand.top;
-        lpBand->rcChild.right  = lpBand->rcBand.right;
-        lpBand->rcChild.bottom = lpBand->rcBand.bottom;
+        lpBand->rcChild.left   = lpBand->rcCapText.right;
+        lpBand->rcChild.top    = lpBand->rcBand.top;
+        lpBand->rcChild.right  = lpBand->rcBand.right;
+        lpBand->rcChild.bottom = lpBand->rcBand.bottom;
     }
     else {
-        lpBand->rcChild.left   = lpBand->rcCapText.right + 4;
-        lpBand->rcChild.top    = lpBand->rcBand.top + 2;
-        lpBand->rcChild.right  = lpBand->rcBand.right - 4;
-        lpBand->rcChild.bottom = lpBand->rcBand.bottom - 2;
+        lpBand->rcChild.left   = lpBand->rcCapText.right + 4;
+        lpBand->rcChild.top    = lpBand->rcBand.top + 2;
+        lpBand->rcChild.right  = lpBand->rcBand.right - 4;
+        lpBand->rcChild.bottom = lpBand->rcBand.bottom - 2;
     }
 
     /* calculate gripper rectangle */
     if ((!(lpBand->fStyle & RBBS_NOGRIPPER)) &&
-        (!(lpBand->fStyle & RBBS_FIXEDSIZE)) &&
-        ((lpBand->fStyle & RBBS_GRIPPERALWAYS) || 
-         (infoPtr->uNumBands > 1))) {
-        lpBand->fDraw |= DRAW_GRIPPER;
-        lpBand->rcGripper.left   = lpBand->rcBand.left + 3;
-        lpBand->rcGripper.right  = lpBand->rcGripper.left + 3;
-        lpBand->rcGripper.top    = lpBand->rcBand.top + 3;
-        lpBand->rcGripper.bottom = lpBand->rcBand.bottom - 3;
-
-        /* move caption rectangles */
-        OffsetRect (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
-        OffsetRect (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
-
-        /* adjust child rectangle */
-        lpBand->rcChild.left += GRIPPER_WIDTH;
+        (!(lpBand->fStyle & RBBS_FIXEDSIZE)) &&
+        ((lpBand->fStyle & RBBS_GRIPPERALWAYS) ||
+         (infoPtr->uNumBands > 1))) {
+        lpBand->fDraw |= DRAW_GRIPPER;
+        lpBand->rcGripper.left   = lpBand->rcBand.left + 3;
+        lpBand->rcGripper.right  = lpBand->rcGripper.left + 3;
+        lpBand->rcGripper.top    = lpBand->rcBand.top + 3;
+        lpBand->rcGripper.bottom = lpBand->rcBand.bottom - 3;
+
+        /* move caption rectangles */
+        OffsetRect (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
+        OffsetRect (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
+
+        /* adjust child rectangle */
+        lpBand->rcChild.left += GRIPPER_WIDTH;
     }
 
@@ -192 +193 @@
     /* image is visible */
     if ((lpBand->iImage > -1) && (infoPtr->himl)) {
-        lpBand->fDraw |= DRAW_IMAGE;
-
-        lpBand->rcCapImage.right  = lpBand->rcCapImage.left + infoPtr->imageSize.cx;
-        lpBand->rcCapImage.bottom = lpBand->rcCapImage.top + infoPtr->imageSize.cy;
-
-        /* update band width */
-        if (lpBand->uMinHeight < infoPtr->imageSize.cx + 2) {
-            lpBand->uMinHeight = infoPtr->imageSize.cx + 2;
-            lpBand->rcBand.right = lpBand->rcBand.left + lpBand->uMinHeight;
-        }
+        lpBand->fDraw |= DRAW_IMAGE;
+
+        lpBand->rcCapImage.right  = lpBand->rcCapImage.left + infoPtr->imageSize.cx;
+        lpBand->rcCapImage.bottom = lpBand->rcCapImage.top + infoPtr->imageSize.cy;
+
+        /* update band width */
+        if (lpBand->uMinHeight < infoPtr->imageSize.cx + 2) {
+            lpBand->uMinHeight = infoPtr->imageSize.cx + 2;
+            lpBand->rcBand.right = lpBand->rcBand.left + lpBand->uMinHeight;
+        }
     }
 
@@ -212 +213 @@
     /* text is visible */
     if (lpBand->lpText) {
-        HDC hdc = GetDC (0);
-        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
-        SIZE size;
-
-        lpBand->fDraw |= DRAW_TEXT;
-        GetTextExtentPoint32W (hdc, lpBand->lpText,
-                               lstrlenW (lpBand->lpText), &size);
-/*      lpBand->rcCapText.right += size.cx; */
-        lpBand->rcCapText.bottom += size.cy;
-
-        SelectObject (hdc, hOldFont);
-        ReleaseDC (0, hdc);
+        HDC hdc = GetDC (0);
+        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+        SIZE size;
+
+        lpBand->fDraw |= DRAW_TEXT;
+        GetTextExtentPoint32W (hdc, lpBand->lpText,
+                               lstrlenW (lpBand->lpText), &size);
+/*      lpBand->rcCapText.right += size.cx; */
+        lpBand->rcCapText.bottom += size.cy;
+
+        SelectObject (hdc, hOldFont);
+        ReleaseDC (0, hdc);
     }
 
     /* set initial child window rectangle */
     if (lpBand->fStyle & RBBS_FIXEDSIZE) {
-        lpBand->rcChild.left   = lpBand->rcBand.left;
-        lpBand->rcChild.top    = lpBand->rcCapText.bottom;
-        lpBand->rcChild.right  = lpBand->rcBand.right;
-        lpBand->rcChild.bottom = lpBand->rcBand.bottom;
+        lpBand->rcChild.left   = lpBand->rcBand.left;
+        lpBand->rcChild.top    = lpBand->rcCapText.bottom;
+        lpBand->rcChild.right  = lpBand->rcBand.right;
+        lpBand->rcChild.bottom = lpBand->rcBand.bottom;
     }
     else {
-        lpBand->rcChild.left   = lpBand->rcBand.left + 2;
-        lpBand->rcChild.top    = lpBand->rcCapText.bottom + 4;
-        lpBand->rcChild.right  = lpBand->rcBand.right - 2;
-        lpBand->rcChild.bottom = lpBand->rcBand.bottom - 4;
+        lpBand->rcChild.left   = lpBand->rcBand.left + 2;
+        lpBand->rcChild.top    = lpBand->rcCapText.bottom + 4;
+        lpBand->rcChild.right  = lpBand->rcBand.right - 2;
+        lpBand->rcChild.bottom = lpBand->rcBand.bottom - 4;
     }
 
     /* calculate gripper rectangle */
     if ((!(lpBand->fStyle & RBBS_NOGRIPPER)) &&
-        (!(lpBand->fStyle & RBBS_FIXEDSIZE)) &&
-        ((lpBand->fStyle & RBBS_GRIPPERALWAYS) || 
-         (infoPtr->uNumBands > 1))) {
-        lpBand->fDraw |= DRAW_GRIPPER;
-
-        if (GetWindowLongA (hwnd, GWL_STYLE) & RBS_VERTICALGRIPPER) {
-            /* adjust band width */
-            lpBand->rcBand.right += GRIPPER_WIDTH;
-            lpBand->uMinHeight += GRIPPER_WIDTH;
-
-            lpBand->rcGripper.left   = lpBand->rcBand.left + 3;
-            lpBand->rcGripper.right  = lpBand->rcGripper.left + 3;
-            lpBand->rcGripper.top    = lpBand->rcBand.top + 3;
-            lpBand->rcGripper.bottom = lpBand->rcBand.bottom - 3;
-
-            /* move caption rectangles */
-            OffsetRect (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
-            OffsetRect (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
- 
-            /* adjust child rectangle */
-            lpBand->rcChild.left += GRIPPER_WIDTH;
-        }
-        else {
-            lpBand->rcGripper.left   = lpBand->rcBand.left + 3;
-            lpBand->rcGripper.right  = lpBand->rcBand.right - 3;
-            lpBand->rcGripper.top    = lpBand->rcBand.top + 3;
-            lpBand->rcGripper.bottom = lpBand->rcGripper.top + 3;
-
-            /* move caption rectangles */
-            OffsetRect (&lpBand->rcCapImage, 0, GRIPPER_WIDTH);
-            OffsetRect (&lpBand->rcCapText, 0, GRIPPER_WIDTH);
- 
-            /* adjust child rectangle */
-            lpBand->rcChild.top += GRIPPER_WIDTH;
-        }
+        (!(lpBand->fStyle & RBBS_FIXEDSIZE)) &&
+        ((lpBand->fStyle & RBBS_GRIPPERALWAYS) ||
+         (infoPtr->uNumBands > 1))) {
+        lpBand->fDraw |= DRAW_GRIPPER;
+
+        if (GetWindowLongA (hwnd, GWL_STYLE) & RBS_VERTICALGRIPPER) {
+            /* adjust band width */
+            lpBand->rcBand.right += GRIPPER_WIDTH;
+            lpBand->uMinHeight += GRIPPER_WIDTH;
+
+            lpBand->rcGripper.left   = lpBand->rcBand.left + 3;
+            lpBand->rcGripper.right  = lpBand->rcGripper.left + 3;
+            lpBand->rcGripper.top    = lpBand->rcBand.top + 3;
+            lpBand->rcGripper.bottom = lpBand->rcBand.bottom - 3;
+
+            /* move caption rectangles */
+            OffsetRect (&lpBand->rcCapImage, GRIPPER_WIDTH, 0);
+            OffsetRect (&lpBand->rcCapText, GRIPPER_WIDTH, 0);
+
+            /* adjust child rectangle */
+            lpBand->rcChild.left += GRIPPER_WIDTH;
+        }
+        else {
+            lpBand->rcGripper.left   = lpBand->rcBand.left + 3;
+            lpBand->rcGripper.right  = lpBand->rcBand.right - 3;
+            lpBand->rcGripper.top    = lpBand->rcBand.top + 3;
+            lpBand->rcGripper.bottom = lpBand->rcGripper.top + 3;
+
+            /* move caption rectangles */
+            OffsetRect (&lpBand->rcCapImage, 0, GRIPPER_WIDTH);
+            OffsetRect (&lpBand->rcCapText, 0, GRIPPER_WIDTH);
+
+            /* adjust child rectangle */
+            lpBand->rcChild.top += GRIPPER_WIDTH;
+        }
     }
 }
@@ -292 +293 @@
 
     if (lpRect)
-        rcClient = *lpRect;
+        rcClient = *lpRect;
     else
-        GetClientRect (hwnd, &rcClient);
+        GetClientRect (hwnd, &rcClient);
 
     x = 0;
@@ -300 +301 @@
 
     if (dwStyle & CCS_VERT) {
-        cx = 20;    /* FIXME: fixed height */
-        cy = rcClient.bottom - rcClient.top;
+        cx = 20;    /* FIXME: fixed height */
+        cy = rcClient.bottom - rcClient.top;
     }
     else {
-        cx = rcClient.right - rcClient.left;
-        cy = 20;    /* FIXME: fixed height */
+        cx = rcClient.right - rcClient.left;
+        cy = 20;    /* FIXME: fixed height */
     }
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-
-        if ((lpBand->fStyle & RBBS_HIDDEN) || 
-            ((dwStyle & CCS_VERT) && (lpBand->fStyle & RBBS_NOVERT)))
-            continue;
-
-
-        if (dwStyle & CCS_VERT) {
-            if (lpBand->fStyle & RBBS_VARIABLEHEIGHT)
-                cx = lpBand->cyMaxChild;
-            else if (lpBand->fStyle & RBBIM_CHILDSIZE)
-                cx = lpBand->cyMinChild;
-            else
-                cx = 20; /* FIXME */
-
-            lpBand->rcBand.left   = x;
-            lpBand->rcBand.right  = x + cx;
-            lpBand->rcBand.top    = y;
-            lpBand->rcBand.bottom = y + cy;
-            lpBand->uMinHeight = cx;
-        }
-        else {
-            if (lpBand->fStyle & RBBS_VARIABLEHEIGHT)
-                cy = lpBand->cyMaxChild;
-            else if (lpBand->fStyle & RBBIM_CHILDSIZE)
-                cy = lpBand->cyMinChild;
-            else
-                cy = 20; /* FIXME */
-
-            lpBand->rcBand.left   = x;
-            lpBand->rcBand.right  = x + cx;
-            lpBand->rcBand.top    = y;
-            lpBand->rcBand.bottom = y + cy;
-            lpBand->uMinHeight = cy;
-        }
-
-        if (dwStyle & CCS_VERT) {
-            REBAR_CalcVertBand (hwnd, infoPtr, lpBand);
-            x += lpBand->uMinHeight;
-        }
-        else {
-            REBAR_CalcHorzBand (infoPtr, lpBand);
-            y += lpBand->uMinHeight;
-        }
+        lpBand = &infoPtr->bands[i];
+
+        if ((lpBand->fStyle & RBBS_HIDDEN) ||
+            ((dwStyle & CCS_VERT) && (lpBand->fStyle & RBBS_NOVERT)))
+            continue;
+
+
+        if (dwStyle & CCS_VERT) {
+            if (lpBand->fStyle & RBBS_VARIABLEHEIGHT)
+                cx = lpBand->cyMaxChild;
+            else if (lpBand->fStyle & RBBIM_CHILDSIZE)
+                cx = lpBand->cyMinChild;
+            else
+                cx = 20; /* FIXME */
+
+            lpBand->rcBand.left   = x;
+            lpBand->rcBand.right  = x + cx;
+            lpBand->rcBand.top    = y;
+            lpBand->rcBand.bottom = y + cy;
+            lpBand->uMinHeight = cx;
+        }
+        else {
+            if (lpBand->fStyle & RBBS_VARIABLEHEIGHT)
+                cy = lpBand->cyMaxChild;
+            else if (lpBand->fStyle & RBBIM_CHILDSIZE)
+                cy = lpBand->cyMinChild;
+            else
+                cy = 20; /* FIXME */
+
+            lpBand->rcBand.left   = x;
+            lpBand->rcBand.right  = x + cx;
+            lpBand->rcBand.top    = y;
+            lpBand->rcBand.bottom = y + cy;
+            lpBand->uMinHeight = cy;
+        }
+
+        if (dwStyle & CCS_VERT) {
+            REBAR_CalcVertBand (hwnd, infoPtr, lpBand);
+            x += lpBand->uMinHeight;
+        }
+        else {
+            REBAR_CalcHorzBand (infoPtr, lpBand);
+            y += lpBand->uMinHeight;
+        }
     }
 
     if (dwStyle & CCS_VERT) {
-        infoPtr->calcSize.cx = x;
-        infoPtr->calcSize.cy = rcClient.bottom - rcClient.top;
+        infoPtr->calcSize.cx = x;
+        infoPtr->calcSize.cy = rcClient.bottom - rcClient.top;
     }
     else {
-        infoPtr->calcSize.cx = rcClient.right - rcClient.left;
-        infoPtr->calcSize.cy = y;
+        infoPtr->calcSize.cx = rcClient.right - rcClient.left;
+        infoPtr->calcSize.cy = y;
     }
 }
@@ -373 +374 @@
 
 //    TRACE (rebar, " to [%d x %d]!\n",
-//         infoPtr->calcSize.cx, infoPtr->calcSize.cy);
+//         infoPtr->calcSize.cx, infoPtr->calcSize.cy);
 
     infoPtr->bAutoResize = TRUE;
@@ -383 +384 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & WS_BORDER) {
-        InflateRect (&rc, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
+        InflateRect (&rc, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
     }
 
     SetWindowPos (hwnd, 0, 0, 0,
-                    rc.right - rc.left, rc.bottom - rc.top,
-                    SWP_NOMOVE | SWP_NOZORDER | SWP_SHOWWINDOW);
+                    rc.right - rc.left, rc.bottom - rc.top,
+                    SWP_NOMOVE | SWP_NOZORDER | SWP_SHOWWINDOW);
 }
 
@@ -401 +402 @@
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-
-        if (lpBand->fStyle & RBBS_HIDDEN)
-            continue;
-        if (lpBand->hwndChild) {
-//          TRACE (rebar, "hwndChild = %x\n", lpBand->hwndChild);
-
-            GetClassNameA (lpBand->hwndChild, szClassName, 40);
-            if (!lstrcmpA (szClassName, "ComboBox")) {
-                INT nEditHeight, yPos;
-                RECT rc;
-
-                /* special placement code for combo box */
-
-
-                /* get size of edit line */
-                GetWindowRect (lpBand->hwndChild, &rc);
-                nEditHeight = rc.bottom - rc.top;
-                yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
-
-                /* center combo box inside child area */
-                SetWindowPos (lpBand->hwndChild, HWND_TOP,
-                            lpBand->rcChild.left, /*lpBand->rcChild.top*/ yPos,
-                            lpBand->rcChild.right - lpBand->rcChild.left,
-                            nEditHeight,
-                            SWP_SHOWWINDOW);
-            }
+        lpBand = &infoPtr->bands[i];
+
+        if (lpBand->fStyle & RBBS_HIDDEN)
+            continue;
+        if (lpBand->hwndChild) {
+//          TRACE (rebar, "hwndChild = %x\n", lpBand->hwndChild);
+
+            GetClassNameA (lpBand->hwndChild, szClassName, 40);
+            if (!lstrcmpA (szClassName, "ComboBox")) {
+                INT nEditHeight, yPos;
+                RECT rc;
+
+                /* special placement code for combo box */
+
+
+                /* get size of edit line */
+                GetWindowRect (lpBand->hwndChild, &rc);
+                nEditHeight = rc.bottom - rc.top;
+                yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
+
+                /* center combo box inside child area */
+                SetWindowPos (lpBand->hwndChild, HWND_TOP,
+                            lpBand->rcChild.left, /*lpBand->rcChild.top*/ yPos,
+                            lpBand->rcChild.right - lpBand->rcChild.left,
+                            nEditHeight,
+                            SWP_SHOWWINDOW);
+            }
 #if 0
-            else if (!lstrcmpA (szClassName, WC_COMBOBOXEXA)) {
-                /* special placement code for extended combo box */
-
-
-            }
+            else if (!lstrcmpA (szClassName, WC_COMBOBOXEXA)) {
+                /* special placement code for extended combo box */
+
+
+            }
 #endif
-            else {
-                SetWindowPos (lpBand->hwndChild, HWND_TOP,
-                            lpBand->rcChild.left, lpBand->rcChild.top,
-                            lpBand->rcChild.right - lpBand->rcChild.left,
-                            lpBand->rcChild.bottom - lpBand->rcChild.top,
-                            SWP_SHOWWINDOW);
-            }
-        }
+            else {
+                SetWindowPos (lpBand->hwndChild, HWND_TOP,
+                            lpBand->rcChild.left, lpBand->rcChild.top,
+                            lpBand->rcChild.right - lpBand->rcChild.left,
+                            lpBand->rcChild.bottom - lpBand->rcChild.top,
+                            SWP_SHOWWINDOW);
+            }
+        }
     }
 }
@@ -460 +461 @@
     if (PtInRect (&rect, *lpPt))
     {
-        if (infoPtr->uNumBands == 0) {
-            *pFlags = RBHT_NOWHERE;
-            if (pBand)
-                *pBand = -1;
-//          TRACE (rebar, "NOWHERE\n");
-            return;
-        }
-        else {
-            /* somewhere inside */
-            for (iCount = 0; iCount < infoPtr->uNumBands; iCount++) {
-                lpBand = &infoPtr->bands[iCount];
-                if (PtInRect (&lpBand->rcBand, *lpPt)) {
-                    if (pBand)
-                        *pBand = iCount;
-                    if (PtInRect (&lpBand->rcGripper, *lpPt)) {
-                        *pFlags = RBHT_GRABBER;
-//                      TRACE (rebar, "ON GRABBER %d\n", iCount);
-                        return;
-                    }
-                    else if (PtInRect (&lpBand->rcCapImage, *lpPt)) {
-                        *pFlags = RBHT_CAPTION;
-//                      TRACE (rebar, "ON CAPTION %d\n", iCount);
-                        return;
-                    }
-                    else if (PtInRect (&lpBand->rcCapText, *lpPt)) {
-                        *pFlags = RBHT_CAPTION;
-//                      TRACE (rebar, "ON CAPTION %d\n", iCount);
-                        return;
-                    }
-                    else if (PtInRect (&lpBand->rcChild, *lpPt)) {
-                        *pFlags = RBHT_CLIENT;
-//                      TRACE (rebar, "ON CLIENT %d\n", iCount);
-                        return;
-                    }
-                    else {
-                        *pFlags = RBHT_NOWHERE;
-//                      TRACE (rebar, "NOWHERE %d\n", iCount);
-                        return;
-                    }
-                }
-            }
-
-            *pFlags = RBHT_NOWHERE;
-            if (pBand)
-                *pBand = -1;
-
-//          TRACE (rebar, "NOWHERE\n");
-            return;
-        }
+        if (infoPtr->uNumBands == 0) {
+            *pFlags = RBHT_NOWHERE;
+            if (pBand)
+                *pBand = -1;
+//          TRACE (rebar, "NOWHERE\n");
+            return;
+        }
+        else {
+            /* somewhere inside */
+            for (iCount = 0; iCount < infoPtr->uNumBands; iCount++) {
+                lpBand = &infoPtr->bands[iCount];
+                if (PtInRect (&lpBand->rcBand, *lpPt)) {
+                    if (pBand)
+                        *pBand = iCount;
+                    if (PtInRect (&lpBand->rcGripper, *lpPt)) {
+                        *pFlags = RBHT_GRABBER;
+//                      TRACE (rebar, "ON GRABBER %d\n", iCount);
+                        return;
+                    }
+                    else if (PtInRect (&lpBand->rcCapImage, *lpPt)) {
+                        *pFlags = RBHT_CAPTION;
+//                      TRACE (rebar, "ON CAPTION %d\n", iCount);
+                        return;
+                    }
+                    else if (PtInRect (&lpBand->rcCapText, *lpPt)) {
+                        *pFlags = RBHT_CAPTION;
+//                      TRACE (rebar, "ON CAPTION %d\n", iCount);
+                        return;
+                    }
+                    else if (PtInRect (&lpBand->rcChild, *lpPt)) {
+                        *pFlags = RBHT_CLIENT;
+//                      TRACE (rebar, "ON CLIENT %d\n", iCount);
+                        return;
+                    }
+                    else {
+                        *pFlags = RBHT_NOWHERE;
+//                      TRACE (rebar, "NOWHERE %d\n", iCount);
+                        return;
+                    }
+                }
+            }
+
+            *pFlags = RBHT_NOWHERE;
+            if (pBand)
+                *pBand = -1;
+
+//          TRACE (rebar, "NOWHERE\n");
+            return;
+        }
     }
     else {
-        *pFlags = RBHT_NOWHERE;
-        if (pBand)
-            *pBand = -1;
-//      TRACE (rebar, "NOWHERE\n");
-        return;
+        *pFlags = RBHT_NOWHERE;
+        if (pBand)
+            *pBand = -1;
+//      TRACE (rebar, "NOWHERE\n");
+        return;
     }
 
@@ -534 +535 @@
 
     if (uBand >= infoPtr->uNumBands)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "deleting band %u!\n", uBand);
 
     if (infoPtr->uNumBands == 1) {
-//      TRACE (rebar, " simple delete!\n");
-        COMCTL32_Free (infoPtr->bands);
-        infoPtr->bands = NULL;
-        infoPtr->uNumBands = 0;
+//      TRACE (rebar, " simple delete!\n");
+        COMCTL32_Free (infoPtr->bands);
+        infoPtr->bands = NULL;
+        infoPtr->uNumBands = 0;
     }
     else {
-        REBAR_BAND *oldBands = infoPtr->bands;
+        REBAR_BAND *oldBands = infoPtr->bands;
 //        TRACE(rebar, "complex delete! [uBand=%u]\n", uBand);
 
-        infoPtr->uNumBands--;
-        infoPtr->bands = COMCTL32_Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
+        infoPtr->uNumBands--;
+        infoPtr->bands = COMCTL32_Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
         if (uBand > 0) {
             memcpy (&infoPtr->bands[0], &oldBands[0],
@@ -560 +561 @@
         }
 
-        COMCTL32_Free (oldBands);
+        COMCTL32_Free (oldBands);
     }
 
@@ -583 +584 @@
 
     if (!lParam)
-        return 0;
+        return 0;
     if ((UINT)wParam >= infoPtr->uNumBands)
-        return 0;
+        return 0;
 
     lpBand = &infoPtr->bands[(UINT)wParam];
@@ -618 +619 @@
 
     if (lprbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
-        return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "index %u\n", (UINT)wParam);
@@ -630 +631 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-        lprbbi->fStyle = lpBand->fStyle;
+        lprbbi->fStyle = lpBand->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-        lprbbi->clrFore = lpBand->clrFore;
-        lprbbi->clrBack = lpBand->clrBack;
-    }
-
-    if ((lprbbi->fMask & RBBIM_TEXT) && 
-        (lprbbi->lpText) && (lpBand->lpText)) {
-            lstrcpynWtoA (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
+        lprbbi->clrFore = lpBand->clrFore;
+        lprbbi->clrBack = lpBand->clrBack;
+    }
+
+    if ((lprbbi->fMask & RBBIM_TEXT) &&
+        (lprbbi->lpText) && (lpBand->lpText)) {
+            lstrcpynWtoA (lprbbi->lpText, lpBand->lpText, MIN(lprbbi->cch,lstrlenW(lpBand->lpText)));
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-        lprbbi->iImage = lpBand->iImage;
+        lprbbi->iImage = lpBand->iImage;
 
     if (lprbbi->fMask & RBBIM_CHILD)
-        lprbbi->hwndChild = lpBand->hwndChild;
+        lprbbi->hwndChild = lpBand->hwndChild;
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-        lprbbi->cxMinChild = lpBand->cxMinChild;
-        lprbbi->cyMinChild = lpBand->cyMinChild;
-        lprbbi->cyMaxChild = lpBand->cyMaxChild;
-        lprbbi->cyChild    = lpBand->cyChild;
-        lprbbi->cyIntegral = lpBand->cyIntegral;
+        lprbbi->cxMinChild = lpBand->cxMinChild;
+        lprbbi->cyMinChild = lpBand->cyMinChild;
+        lprbbi->cyMaxChild = lpBand->cyMaxChild;
+        lprbbi->cyChild    = lpBand->cyChild;
+        lprbbi->cyIntegral = lpBand->cyIntegral;
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-        lprbbi->cx = lpBand->cx;
+        lprbbi->cx = lpBand->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-        lprbbi->hbmBack = lpBand->hbmBack;
+        lprbbi->hbmBack = lpBand->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-        lprbbi->wID = lpBand->wID;
+        lprbbi->wID = lpBand->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
-            lprbbi->cxIdeal = lpBand->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
-            lprbbi->lParam = lpBand->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
-            lprbbi->cxHeader = lpBand->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lprbbi->cxIdeal = lpBand->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lprbbi->lParam = lpBand->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lprbbi->cxHeader = lpBand->cxHeader;
     }
 
@@ -689 +690 @@
 
     if (lprbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
-        return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "index %u\n", (UINT)wParam);
@@ -701 +702 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-        lprbbi->fStyle = lpBand->fStyle;
+        lprbbi->fStyle = lpBand->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-        lprbbi->clrFore = lpBand->clrFore;
-        lprbbi->clrBack = lpBand->clrBack;
-    }
-
-    if ((lprbbi->fMask & RBBIM_TEXT) && 
-        (lprbbi->lpText) && (lpBand->lpText)) {
-            lstrcpynW (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
+        lprbbi->clrFore = lpBand->clrFore;
+        lprbbi->clrBack = lpBand->clrBack;
+    }
+
+    if ((lprbbi->fMask & RBBIM_TEXT) &&
+        (lprbbi->lpText) && (lpBand->lpText)) {
+            lstrcpynW (lprbbi->lpText, lpBand->lpText, MIN(lprbbi->cch,lstrlenW(lpBand->lpText)));
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-        lprbbi->iImage = lpBand->iImage;
+        lprbbi->iImage = lpBand->iImage;
 
     if (lprbbi->fMask & RBBIM_CHILD)
-        lprbbi->hwndChild = lpBand->hwndChild;
+        lprbbi->hwndChild = lpBand->hwndChild;
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-        lprbbi->cxMinChild = lpBand->cxMinChild;
-        lprbbi->cyMinChild = lpBand->cyMinChild;
-        lprbbi->cyMaxChild = lpBand->cyMaxChild;
-        lprbbi->cyChild    = lpBand->cyChild;
-        lprbbi->cyIntegral = lpBand->cyIntegral;
+        lprbbi->cxMinChild = lpBand->cxMinChild;
+        lprbbi->cyMinChild = lpBand->cyMinChild;
+        lprbbi->cyMaxChild = lpBand->cyMaxChild;
+        lprbbi->cyChild    = lpBand->cyChild;
+        lprbbi->cyIntegral = lpBand->cyIntegral;
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-        lprbbi->cx = lpBand->cx;
+        lprbbi->cx = lpBand->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-        lprbbi->hbmBack = lpBand->hbmBack;
+        lprbbi->hbmBack = lpBand->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-        lprbbi->wID = lpBand->wID;
+        lprbbi->wID = lpBand->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
-            lprbbi->cxIdeal = lpBand->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
-            lprbbi->lParam = lpBand->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
-            lprbbi->cxHeader = lpBand->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lprbbi->cxIdeal = lpBand->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lprbbi->lParam = lpBand->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lprbbi->cxHeader = lpBand->cxHeader;
     }
 
@@ -762 +763 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & WS_BORDER)
-        nHeight += (2 * GetSystemMetrics(SM_CYEDGE));
+        nHeight += (2 * GetSystemMetrics(SM_CYEDGE));
 
 
@@ -778 +779 @@
 
     if (lpInfo == NULL)
-        return FALSE;
+        return FALSE;
 
     if (lpInfo->cbSize < sizeof (REBARINFO))
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "getting bar info!\n");
 
     if (infoPtr->himl) {
-        lpInfo->himl = infoPtr->himl;
-        lpInfo->fMask |= RBIM_IMAGELIST;
+        lpInfo->himl = infoPtr->himl;
+        lpInfo->fMask |= RBIM_IMAGELIST;
     }
 
@@ -827 +828 @@
 
     if ((iBand < 0) && ((UINT)iBand >= infoPtr->uNumBands))
-        return FALSE;
+        return FALSE;
     if (!lprc)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "band %d\n", iBand);
@@ -899 +900 @@
 {
     /* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd); */
-    LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam; 
+    LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam;
 
     if (!lprbht)
-        return -1;
+        return -1;
 
     REBAR_InternalHitTest (hwnd, &lprbht->pt, &lprbht->flags, &lprbht->iBand);
@@ -917 +918 @@
 
     if (infoPtr == NULL)
-        return -1;
+        return -1;
 
     if (infoPtr->uNumBands < 1)
-        return -1;
+        return -1;
 
 //    TRACE (rebar, "id %u\n", (UINT)wParam);
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-        if (infoPtr->bands[i].wID == (UINT)wParam) {
-//          TRACE (rebar, "band %u found!\n", i);
-            return i;
-        }
+        if (infoPtr->bands[i].wID == (UINT)wParam) {
+//          TRACE (rebar, "band %u found!\n", i);
+            return i;
+        }
     }
 
@@ -945 +946 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "insert band at %u!\n", uIndex);
 
     if (infoPtr->uNumBands == 0) {
-        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
-        uIndex = 0;
+        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
+        uIndex = 0;
     }
     else {
-        REBAR_BAND *oldBands = infoPtr->bands;
-        infoPtr->bands =
-            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
-        if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
-            uIndex = infoPtr->uNumBands;
-
-        /* pre insert copy */
-        if (uIndex > 0) {
-            memcpy (&infoPtr->bands[0], &oldBands[0],
-                    uIndex * sizeof(REBAR_BAND));
-        }
-
-        /* post copy */
-        if (uIndex < infoPtr->uNumBands - 1) {
-            memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
-                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
-        }
-
-        COMCTL32_Free (oldBands);
+        REBAR_BAND *oldBands = infoPtr->bands;
+        infoPtr->bands =
+            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
+        if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
+            uIndex = infoPtr->uNumBands;
+
+        /* pre insert copy */
+        if (uIndex > 0) {
+            memcpy (&infoPtr->bands[0], &oldBands[0],
+                    uIndex * sizeof(REBAR_BAND));
+        }
+
+        /* post copy */
+        if (uIndex < infoPtr->uNumBands - 1) {
+            memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
+                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
+        }
+
+        COMCTL32_Free (oldBands);
     }
 
@@ -987 +988 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-        lpBand->fStyle = lprbbi->fStyle;
+        lpBand->fStyle = lprbbi->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-        lpBand->clrFore = lprbbi->clrFore;
-        lpBand->clrBack = lprbbi->clrBack;
+        lpBand->clrFore = lprbbi->clrFore;
+        lpBand->clrBack = lprbbi->clrBack;
     }
     else {
-        lpBand->clrFore = CLR_NONE;
-        lpBand->clrBack = CLR_NONE;
+        lpBand->clrFore = CLR_NONE;
+        lpBand->clrBack = CLR_NONE;
     }
 
     if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) {
-        INT len = lstrlenA (lprbbi->lpText);
-        if (len > 0) {
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
-        }
+        INT len = lstrlenA (lprbbi->lpText);
+        if (len > 0) {
+            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
+        }
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-        lpBand->iImage = lprbbi->iImage;
+        lpBand->iImage = lprbbi->iImage;
     else
-        lpBand->iImage = -1;
+        lpBand->iImage = -1;
 
     if (lprbbi->fMask & RBBIM_CHILD) {
-//      TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
-        lpBand->hwndChild = lprbbi->hwndChild;
-        lpBand->hwndPrevParent =
-            SetParent (lpBand->hwndChild, hwnd);
+//      TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
+        lpBand->hwndChild = lprbbi->hwndChild;
+        lpBand->hwndPrevParent =
+            SetParent (lpBand->hwndChild, hwnd);
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-        lpBand->cxMinChild = lprbbi->cxMinChild;
-        lpBand->cyMinChild = lprbbi->cyMinChild;
-        lpBand->cyMaxChild = lprbbi->cyMaxChild;
-        lpBand->cyChild    = lprbbi->cyChild;
-        lpBand->cyIntegral = lprbbi->cyIntegral;
+        lpBand->cxMinChild = lprbbi->cxMinChild;
+        lpBand->cyMinChild = lprbbi->cyMinChild;
+        lpBand->cyMaxChild = lprbbi->cyMaxChild;
+        lpBand->cyChild    = lprbbi->cyChild;
+        lpBand->cyIntegral = lprbbi->cyIntegral;
     }
     else {
-        lpBand->cxMinChild = -1;
-        lpBand->cyMinChild = -1;
-        lpBand->cyMaxChild = -1;
-        lpBand->cyChild    = -1;
-        lpBand->cyIntegral = -1;
+        lpBand->cxMinChild = -1;
+        lpBand->cyMinChild = -1;
+        lpBand->cyMaxChild = -1;
+        lpBand->cyChild    = -1;
+        lpBand->cyIntegral = -1;
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-        lpBand->cx = lprbbi->cx;
+        lpBand->cx = lprbbi->cx;
     else
-        lpBand->cx = -1;
+        lpBand->cx = -1;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-        lpBand->hbmBack = lprbbi->hbmBack;
+        lpBand->hbmBack = lprbbi->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-        lpBand->wID = lprbbi->wID;
+        lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
-            lpBand->cxIdeal = lprbbi->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
-            lpBand->lParam = lprbbi->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
-            lpBand->cxHeader = lprbbi->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lpBand->cxIdeal = lprbbi->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lpBand->lParam = lprbbi->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lpBand->cxHeader = lprbbi->cxHeader;
     }
 
@@ -1074 +1075 @@
 
     if (infoPtr == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "insert band at %u!\n", uIndex);
 
     if (infoPtr->uNumBands == 0) {
-        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
-        uIndex = 0;
+        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
+        uIndex = 0;
     }
     else {
-        REBAR_BAND *oldBands = infoPtr->bands;
-        infoPtr->bands =
-            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
-        if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
-            uIndex = infoPtr->uNumBands;
-
-        /* pre insert copy */
-        if (uIndex > 0) {
-            memcpy (&infoPtr->bands[0], &oldBands[0],
-                    uIndex * sizeof(REBAR_BAND));
-        }
-
-        /* post copy */
-        if (uIndex < infoPtr->uNumBands - 1) {
-            memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
-                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
-        }
-
-        COMCTL32_Free (oldBands);
+        REBAR_BAND *oldBands = infoPtr->bands;
+        infoPtr->bands =
+            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
+        if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
+            uIndex = infoPtr->uNumBands;
+
+        /* pre insert copy */
+        if (uIndex > 0) {
+            memcpy (&infoPtr->bands[0], &oldBands[0],
+                    uIndex * sizeof(REBAR_BAND));
+        }
+
+        /* post copy */
+        if (uIndex < infoPtr->uNumBands - 1) {
+            memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
+                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
+        }
+
+        COMCTL32_Free (oldBands);
     }
 
@@ -1116 +1117 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-        lpBand->fStyle = lprbbi->fStyle;
+        lpBand->fStyle = lprbbi->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-        lpBand->clrFore = lprbbi->clrFore;
-        lpBand->clrBack = lprbbi->clrBack;
+        lpBand->clrFore = lprbbi->clrFore;
+        lpBand->clrBack = lprbbi->clrBack;
     }
     else {
-        lpBand->clrFore = CLR_NONE;
-        lpBand->clrBack = CLR_NONE;
+        lpBand->clrFore = CLR_NONE;
+        lpBand->clrBack = CLR_NONE;
     }
 
     if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) {
-        INT len = lstrlenW (lprbbi->lpText);
-        if (len > 0) {
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyW (lpBand->lpText, lprbbi->lpText);
-        }
+        INT len = lstrlenW (lprbbi->lpText);
+        if (len > 0) {
+            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyW (lpBand->lpText, lprbbi->lpText);
+        }
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-        lpBand->iImage = lprbbi->iImage;
+        lpBand->iImage = lprbbi->iImage;
     else
-        lpBand->iImage = -1;
+        lpBand->iImage = -1;
 
     if (lprbbi->fMask & RBBIM_CHILD) {
-//      TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
-        lpBand->hwndChild = lprbbi->hwndChild;
-        lpBand->hwndPrevParent =
-            SetParent (lpBand->hwndChild, hwnd);
+//      TRACE (rebar, "hwndChild = %x\n", lprbbi->hwndChild);
+        lpBand->hwndChild = lprbbi->hwndChild;
+        lpBand->hwndPrevParent =
+            SetParent (lpBand->hwndChild, hwnd);
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-        lpBand->cxMinChild = lprbbi->cxMinChild;
-        lpBand->cyMinChild = lprbbi->cyMinChild;
-        lpBand->cyMaxChild = lprbbi->cyMaxChild;
-        lpBand->cyChild    = lprbbi->cyChild;
-        lpBand->cyIntegral = lprbbi->cyIntegral;
+        lpBand->cxMinChild = lprbbi->cxMinChild;
+        lpBand->cyMinChild = lprbbi->cyMinChild;
+        lpBand->cyMaxChild = lprbbi->cyMaxChild;
+        lpBand->cyChild    = lprbbi->cyChild;
+        lpBand->cyIntegral = lprbbi->cyIntegral;
     }
     else {
-        lpBand->cxMinChild = -1;
-        lpBand->cyMinChild = -1;
-        lpBand->cyMaxChild = -1;
-        lpBand->cyChild    = -1;
-        lpBand->cyIntegral = -1;
+        lpBand->cxMinChild = -1;
+        lpBand->cyMinChild = -1;
+        lpBand->cyMaxChild = -1;
+        lpBand->cyChild    = -1;
+        lpBand->cyIntegral = -1;
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-        lpBand->cx = lprbbi->cx;
+        lpBand->cx = lprbbi->cx;
     else
-        lpBand->cx = -1;
+        lpBand->cx = -1;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-        lpBand->hbmBack = lprbbi->hbmBack;
+        lpBand->hbmBack = lprbbi->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-        lpBand->wID = lprbbi->wID;
+        lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
-            lpBand->cxIdeal = lprbbi->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
-            lpBand->lParam = lprbbi->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
-            lpBand->cxHeader = lprbbi->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lpBand->cxIdeal = lprbbi->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lpBand->lParam = lprbbi->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lpBand->cxHeader = lprbbi->cxHeader;
     }
 
@@ -1200 +1201 @@
 
 //    FIXME (rebar, "(uBand = %u fIdeal = %s)\n",
-//         (UINT)wParam, lParam ? "TRUE" : "FALSE");
-
- 
+//         (UINT)wParam, lParam ? "TRUE" : "FALSE");
+
+
     return 0;
 }
@@ -1214 +1215 @@
 //    FIXME (rebar, "(uBand = %u)\n", (UINT)wParam);
 
- 
+
     return 0;
 }
@@ -1225 +1226 @@
 
 //    FIXME (rebar, "(iFrom = %u iTof = %u)\n",
-//         (UINT)wParam, (UINT)lParam);
-
- 
+//         (UINT)wParam, (UINT)lParam);
+
+
     return FALSE;
 }
@@ -1240 +1241 @@
 
     if (lprbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
-        return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "index %u\n", (UINT)wParam);
@@ -1252 +1253 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-        lpBand->fStyle = lprbbi->fStyle;
+        lpBand->fStyle = lprbbi->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-        lpBand->clrFore = lprbbi->clrFore;
-        lpBand->clrBack = lprbbi->clrBack;
+        lpBand->clrFore = lprbbi->clrFore;
+        lpBand->clrBack = lprbbi->clrBack;
     }
 
     if (lprbbi->fMask & RBBIM_TEXT) {
-        if (lpBand->lpText) {
-            COMCTL32_Free (lpBand->lpText);
-            lpBand->lpText = NULL;
-        }
-        if (lprbbi->lpText) {
-            INT len = lstrlenA (lprbbi->lpText);
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
-        }
+        if (lpBand->lpText) {
+            COMCTL32_Free (lpBand->lpText);
+            lpBand->lpText = NULL;
+        }
+        if (lprbbi->lpText) {
+            INT len = lstrlenA (lprbbi->lpText);
+            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
+        }
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-        lpBand->iImage = lprbbi->iImage;
+        lpBand->iImage = lprbbi->iImage;
 
     if (lprbbi->fMask & RBBIM_CHILD) {
-        if (lprbbi->hwndChild) {
-            lpBand->hwndChild = lprbbi->hwndChild;
-            lpBand->hwndPrevParent =
-                SetParent (lpBand->hwndChild, hwnd);
-        }
-        else {
-//          TRACE (rebar, "child: 0x%x  prev parent: 0x%x\n",
-//                 lpBand->hwndChild, lpBand->hwndPrevParent);
-            lpBand->hwndChild = 0;
-            lpBand->hwndPrevParent = 0;
-        }
+        if (lprbbi->hwndChild) {
+            lpBand->hwndChild = lprbbi->hwndChild;
+            lpBand->hwndPrevParent =
+                SetParent (lpBand->hwndChild, hwnd);
+        }
+        else {
+//          TRACE (rebar, "child: 0x%x  prev parent: 0x%x\n",
+//                 lpBand->hwndChild, lpBand->hwndPrevParent);
+            lpBand->hwndChild = 0;
+            lpBand->hwndPrevParent = 0;
+        }
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-        lpBand->cxMinChild = lprbbi->cxMinChild;
-        lpBand->cyMinChild = lprbbi->cyMinChild;
-        lpBand->cyMaxChild = lprbbi->cyMaxChild;
-        lpBand->cyChild    = lprbbi->cyChild;
-        lpBand->cyIntegral = lprbbi->cyIntegral;
+        lpBand->cxMinChild = lprbbi->cxMinChild;
+        lpBand->cyMinChild = lprbbi->cyMinChild;
+        lpBand->cyMaxChild = lprbbi->cyMaxChild;
+        lpBand->cyChild    = lprbbi->cyChild;
+        lpBand->cyIntegral = lprbbi->cyIntegral;
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-        lpBand->cx = lprbbi->cx;
+        lpBand->cx = lprbbi->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-        lpBand->hbmBack = lprbbi->hbmBack;
+        lpBand->hbmBack = lprbbi->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-        lpBand->wID = lprbbi->wID;
+        lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
-            lpBand->cxIdeal = lprbbi->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
-            lpBand->lParam = lprbbi->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
-            lpBand->cxHeader = lprbbi->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lpBand->cxIdeal = lprbbi->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lpBand->lParam = lprbbi->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lpBand->cxHeader = lprbbi->cxHeader;
     }
 
@@ -1333 +1334 @@
 
     if (lprbbi == NULL)
-        return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
-        return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "index %u\n", (UINT)wParam);
@@ -1345 +1346 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-        lpBand->fStyle = lprbbi->fStyle;
+        lpBand->fStyle = lprbbi->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-        lpBand->clrFore = lprbbi->clrFore;
-        lpBand->clrBack = lprbbi->clrBack;
+        lpBand->clrFore = lprbbi->clrFore;
+        lpBand->clrBack = lprbbi->clrBack;
     }
 
     if (lprbbi->fMask & RBBIM_TEXT) {
-        if (lpBand->lpText) {
-            COMCTL32_Free (lpBand->lpText);
-            lpBand->lpText = NULL;
-        }
-        if (lprbbi->lpText) {
-            INT len = lstrlenW (lprbbi->lpText);
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            lstrcpyW (lpBand->lpText, lprbbi->lpText);
-        }
+        if (lpBand->lpText) {
+            COMCTL32_Free (lpBand->lpText);
+            lpBand->lpText = NULL;
+        }
+        if (lprbbi->lpText) {
+            INT len = lstrlenW (lprbbi->lpText);
+            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lstrcpyW (lpBand->lpText, lprbbi->lpText);
+        }
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-        lpBand->iImage = lprbbi->iImage;
+        lpBand->iImage = lprbbi->iImage;
 
     if (lprbbi->fMask & RBBIM_CHILD) {
-        if (lprbbi->hwndChild) {
-            lpBand->hwndChild = lprbbi->hwndChild;
-            lpBand->hwndPrevParent =
-                SetParent (lpBand->hwndChild, hwnd);
-        }
-        else {
-//          TRACE (rebar, "child: 0x%x  prev parent: 0x%x\n",
-//                 lpBand->hwndChild, lpBand->hwndPrevParent);
-            lpBand->hwndChild = 0;
-            lpBand->hwndPrevParent = 0;
-        }
+        if (lprbbi->hwndChild) {
+            lpBand->hwndChild = lprbbi->hwndChild;
+            lpBand->hwndPrevParent =
+                SetParent (lpBand->hwndChild, hwnd);
+        }
+        else {
+//          TRACE (rebar, "child: 0x%x  prev parent: 0x%x\n",
+//                 lpBand->hwndChild, lpBand->hwndPrevParent);
+            lpBand->hwndChild = 0;
+            lpBand->hwndPrevParent = 0;
+        }
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-        lpBand->cxMinChild = lprbbi->cxMinChild;
-        lpBand->cyMinChild = lprbbi->cyMinChild;
-        lpBand->cyMaxChild = lprbbi->cyMaxChild;
-        lpBand->cyChild    = lprbbi->cyChild;
-        lpBand->cyIntegral = lprbbi->cyIntegral;
+        lpBand->cxMinChild = lprbbi->cxMinChild;
+        lpBand->cyMinChild = lprbbi->cyMinChild;
+        lpBand->cyMaxChild = lprbbi->cyMaxChild;
+        lpBand->cyChild    = lprbbi->cyChild;
+        lpBand->cyIntegral = lprbbi->cyIntegral;
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-        lpBand->cx = lprbbi->cx;
+        lpBand->cx = lprbbi->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-        lpBand->hbmBack = lprbbi->hbmBack;
+        lpBand->hbmBack = lprbbi->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-        lpBand->wID = lprbbi->wID;
+        lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
-            lpBand->cxIdeal = lprbbi->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
-            lpBand->lParam = lprbbi->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
-            lpBand->cxHeader = lprbbi->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lpBand->cxIdeal = lprbbi->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lpBand->lParam = lprbbi->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lpBand->cxHeader = lprbbi->cxHeader;
     }
 
@@ -1425 +1426 @@
 
     if (lpInfo == NULL)
-        return FALSE;
+        return FALSE;
 
     if (lpInfo->cbSize < sizeof (REBARINFO))
-        return FALSE;
+        return FALSE;
 
 //    TRACE (rebar, "setting bar info!\n");
 
     if (lpInfo->fMask & RBIM_IMAGELIST) {
-        infoPtr->himl = lpInfo->himl;
-        if (infoPtr->himl) {
-            ImageList_GetIconSize (infoPtr->himl, &infoPtr->imageSize.cx,
-                                   &infoPtr->imageSize.cy);
-        }
-        else {
-            infoPtr->imageSize.cx = 0;
-            infoPtr->imageSize.cy = 0;
-        }
+        infoPtr->himl = lpInfo->himl;
+        if (infoPtr->himl) {
+            ImageList_GetIconSize (infoPtr->himl, &infoPtr->imageSize.cx,
+                                   &infoPtr->imageSize.cy);
+        }
+        else {
+            infoPtr->imageSize.cx = 0;
+            infoPtr->imageSize.cy = 0;
+        }
     }
 
@@ -1514 +1515 @@
 
     if (((INT)wParam < 0) || ((INT)wParam > infoPtr->uNumBands))
-        return FALSE;
+        return FALSE;
 
     lpBand = &infoPtr->bands[(INT)wParam];
 
     if ((BOOL)lParam) {
-//      TRACE (rebar, "show band %d\n", (INT)wParam);
-        lpBand->fStyle = lpBand->fStyle & ~RBBS_HIDDEN;
-        if (IsWindow (lpBand->hwndChild))
-            ShowWindow (lpBand->hwndChild, SW_SHOW);
+//      TRACE (rebar, "show band %d\n", (INT)wParam);
+        lpBand->fStyle = lpBand->fStyle & ~RBBS_HIDDEN;
+        if (IsWindow (lpBand->hwndChild))
+            ShowWindow (lpBand->hwndChild, SW_SHOW);
     }
     else {
-//      TRACE (rebar, "hide band %d\n", (INT)wParam);
-        lpBand->fStyle = lpBand->fStyle | RBBS_HIDDEN;
-        if (IsWindow (lpBand->hwndChild))
-            ShowWindow (lpBand->hwndChild, SW_SHOW);
+//      TRACE (rebar, "hide band %d\n", (INT)wParam);
+        lpBand->fStyle = lpBand->fStyle | RBBS_HIDDEN;
+        if (IsWindow (lpBand->hwndChild))
+            ShowWindow (lpBand->hwndChild, SW_SHOW);
     }
 
@@ -1546 +1547 @@
 
     if (lpRect == NULL)
-        return FALSE;
+        return FALSE;
 
 //    FIXME (rebar, "layout change not implemented!\n");
 //    FIXME (rebar, "[%d %d %d %d]\n",
-//         lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
+//         lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
 
 #if 0
     SetWindowPos (hwnd, 0, lpRect->left, lpRect->top,
-                    lpRect->right - lpRect->left, lpRect->bottom - lpRect->top,
-                    SWP_NOZORDER);
+                    lpRect->right - lpRect->left, lpRect->bottom - lpRect->top,
+                    SWP_NOZORDER);
 #endif
 
@@ -1589 +1590 @@
 
 //    if (GetWindowLongA (hwnd, GWL_STYLE) & RBS_AUTOSIZE)
-//      FIXME (rebar, "style RBS_AUTOSIZE set!\n");
+//      FIXME (rebar, "style RBS_AUTOSIZE set!\n");
 
 #if 0
@@ -1610 +1611 @@
     /* free rebar bands */
     if ((infoPtr->uNumBands > 0) && infoPtr->bands) {
-        /* clean up each band */
-        for (i = 0; i < infoPtr->uNumBands; i++) {
-            lpBand = &infoPtr->bands[i];
-
-            /* delete text strings */
-            if (lpBand->lpText) {
-                COMCTL32_Free (lpBand->lpText);
-                lpBand->lpText = NULL;
-            }
-            /* destroy child window */
-            DestroyWindow (lpBand->hwndChild);
-        }
-
-        /* free band array */
-        COMCTL32_Free (infoPtr->bands);
-        infoPtr->bands = NULL;
+        /* clean up each band */
+        for (i = 0; i < infoPtr->uNumBands; i++) {
+            lpBand = &infoPtr->bands[i];
+
+            /* delete text strings */
+            if (lpBand->lpText) {
+                COMCTL32_Free (lpBand->lpText);
+                lpBand->lpText = NULL;
+            }
+            /* destroy child window */
+            DestroyWindow (lpBand->hwndChild);
+        }
+
+        /* free band array */
+        COMCTL32_Free (infoPtr->bands);
+        infoPtr->bands = NULL;
     }
 
@@ -1671 +1672 @@
 {
     if (GetWindowLongA (hwnd, GWL_STYLE) & WS_BORDER) {
-        ((LPRECT)lParam)->left   += GetSystemMetrics(SM_CXEDGE);
-        ((LPRECT)lParam)->top    += GetSystemMetrics(SM_CYEDGE);
-        ((LPRECT)lParam)->right  -= GetSystemMetrics(SM_CXEDGE);
-        ((LPRECT)lParam)->bottom -= GetSystemMetrics(SM_CYEDGE);
+        ((LPRECT)lParam)->left   += GetSystemMetrics(SM_CXEDGE);
+        ((LPRECT)lParam)->top    += GetSystemMetrics(SM_CYEDGE);
+        ((LPRECT)lParam)->right  -= GetSystemMetrics(SM_CXEDGE);
+        ((LPRECT)lParam)->bottom -= GetSystemMetrics(SM_CYEDGE);
     }
 
@@ -1689 +1690 @@
 
     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 & WS_BORDER) {
-        GetWindowRect (hwnd, &rcWindow);
-        OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
-        DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT);
+        GetWindowRect (hwnd, &rcWindow);
+        OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
+        DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT);
     }
 
@@ -1717 +1718 @@
     REBAR_Refresh (hwnd, hdc);
     if (!wParam)
-        EndPaint (hwnd, &ps);
+        EndPaint (hwnd, &ps);
     return 0;
 }
@@ -1738 +1739 @@
 
     if (flags == RBHT_GRABBER) {
-        if ((dwStyle & CCS_VERT) &&
-            !(dwStyle & RBS_VERTICALGRIPPER))
-            SetCursor (infoPtr->hcurVert);
-        else
-            SetCursor (infoPtr->hcurHorz);
+        if ((dwStyle & CCS_VERT) &&
+            !(dwStyle & RBS_VERTICALGRIPPER))
+            SetCursor (infoPtr->hcurVert);
+        else
+            SetCursor (infoPtr->hcurHorz);
     }
     else if (flags != RBHT_CLIENT)
-        SetCursor (infoPtr->hcurArrow);
+        SetCursor (infoPtr->hcurArrow);
 
     return 0;
@@ -1755 +1756 @@
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
-    
+
     /* TEXTMETRIC32A tm; */
     HFONT hFont /*, hOldFont */;
@@ -1793 +1794 @@
     /* auto resize deadlock check */
     if (infoPtr->bAutoResize) {
-        infoPtr->bAutoResize = FALSE;
-        return 0;
+        infoPtr->bAutoResize = FALSE;
+        return 0;
     }
 
@@ -1805 +1806 @@
 
     if (dwStyle & CCS_VERT) {
-        if (dwStyle & CCS_LEFT == CCS_LEFT) {
-            x = rcParent.left;
-            y = rcParent.top;
-            cx = infoPtr->calcSize.cx;
-            cy = infoPtr->calcSize.cy;
-        }
-        else {
-            x = rcParent.right - infoPtr->calcSize.cx;
-            y = rcParent.top;
-            cx = infoPtr->calcSize.cx;
-            cy = infoPtr->calcSize.cy;
-        }
+        if (dwStyle & CCS_LEFT == CCS_LEFT) {
+            x = rcParent.left;
+            y = rcParent.top;
+            cx = infoPtr->calcSize.cx;
+            cy = infoPtr->calcSize.cy;
+        }
+        else {
+            x = rcParent.right - infoPtr->calcSize.cx;
+            y = rcParent.top;
+            cx = infoPtr->calcSize.cx;
+            cy = infoPtr->calcSize.cy;
+        }
     }
     else {
-        if (dwStyle & CCS_TOP) {
-            x = rcParent.left;
-            y = rcParent.top;
-            cx = infoPtr->calcSize.cx;
-            cy = infoPtr->calcSize.cy;
-        }
-        else {
-            x = rcParent.left;
-            y = rcParent.bottom - infoPtr->calcSize.cy;
-            cx = infoPtr->calcSize.cx;
-            cy = infoPtr->calcSize.cy;
-        }
+        if (dwStyle & CCS_TOP) {
+            x = rcParent.left;
+            y = rcParent.top;
+            cx = infoPtr->calcSize.cx;
+            cy = infoPtr->calcSize.cy;
+        }
+        else {
+            x = rcParent.left;
+            y = rcParent.bottom - infoPtr->calcSize.cy;
+            cx = infoPtr->calcSize.cx;
+            cy = infoPtr->calcSize.cy;
+        }
     }
 
     SetWindowPos32 (hwnd, 0, x, y, cx, cy,
-                    SWP_NOZORDER | SWP_SHOWWINDOW);
+                    SWP_NOZORDER | SWP_SHOWWINDOW);
 */
     REBAR_Layout (hwnd, NULL);
@@ -1849 +1850 @@
     switch (uMsg)
     {
-/*      case RB_BEGINDRAG: */
-
-        case RB_DELETEBAND:
-            return REBAR_DeleteBand (hwnd, wParam, lParam);
-
-/*      case RB_DRAGMOVE: */
-/*      case RB_ENDDRAG: */
-
-        case RB_GETBANDBORDERS:
-            return REBAR_GetBandBorders (hwnd, wParam, lParam);
-
-        case RB_GETBANDCOUNT:
-            return REBAR_GetBandCount (hwnd);
-
-/*      case RB_GETBANDINFO32:  */ /* outdated, just for compatibility */
-
-        case RB_GETBANDINFOA:
-            return REBAR_GetBandInfoA (hwnd, wParam, lParam);
-
-        case RB_GETBANDINFOW:
-            return REBAR_GetBandInfoW (hwnd, wParam, lParam);
-
-        case RB_GETBARHEIGHT:
-            return REBAR_GetBarHeight (hwnd, wParam, lParam);
-
-        case RB_GETBARINFO:
-            return REBAR_GetBarInfo (hwnd, wParam, lParam);
-
-        case RB_GETBKCOLOR:
-            return REBAR_GetBkColor (hwnd);
-
-/*      case RB_GETCOLORSCHEME: */
-/*      case RB_GETDROPTARGET: */
-
-        case RB_GETPALETTE:
-            return REBAR_GetPalette (hwnd, wParam, lParam);
-
-        case RB_GETRECT:
-            return REBAR_GetRect (hwnd, wParam, lParam);
-
-        case RB_GETROWCOUNT:
-            return REBAR_GetRowCount (hwnd);
-
-        case RB_GETROWHEIGHT:
-            return REBAR_GetRowHeight (hwnd, wParam, lParam);
-
-        case RB_GETTEXTCOLOR:
-            return REBAR_GetTextColor (hwnd);
-
-        case RB_GETTOOLTIPS:
-            return REBAR_GetToolTips (hwnd);
-
-        case RB_GETUNICODEFORMAT:
-            return REBAR_GetUnicodeFormat (hwnd);
-
-        case RB_HITTEST:
-            return REBAR_HitTest (hwnd, wParam, lParam);
-
-        case RB_IDTOINDEX:
-            return REBAR_IdToIndex (hwnd, wParam, lParam);
-
-        case RB_INSERTBANDA:
-            return REBAR_InsertBandA (hwnd, wParam, lParam);
-
-        case RB_INSERTBANDW:
-            return REBAR_InsertBandW (hwnd, wParam, lParam);
-
-        case RB_MAXIMIZEBAND:
-            return REBAR_MaximizeBand (hwnd, wParam, lParam);
-
-        case RB_MINIMIZEBAND:
-            return REBAR_MinimizeBand (hwnd, wParam, lParam);
-
-        case RB_MOVEBAND:
-            return REBAR_MoveBand (hwnd, wParam, lParam);
-
-        case RB_SETBANDINFOA:
-            return REBAR_SetBandInfoA (hwnd, wParam, lParam);
-
-        case RB_SETBANDINFOW:
-            return REBAR_SetBandInfoW (hwnd, wParam, lParam);
-
-        case RB_SETBARINFO:
-            return REBAR_SetBarInfo (hwnd, wParam, lParam);
-
-        case RB_SETBKCOLOR:
-            return REBAR_SetBkColor (hwnd, wParam, lParam);
-
-/*      case RB_SETCOLORSCHEME: */
-/*      case RB_SETPALETTE: */
-/*          return REBAR_GetPalette (hwnd, wParam, lParam); */
-
-        case RB_SETPARENT:
-            return REBAR_SetParent (hwnd, wParam, lParam);
-
-        case RB_SETTEXTCOLOR:
-            return REBAR_SetTextColor (hwnd, wParam, lParam);
-
-/*      case RB_SETTOOLTIPS: */
-
-        case RB_SETUNICODEFORMAT:
-            return REBAR_SetUnicodeFormat (hwnd, wParam);
-
-        case RB_SHOWBAND:
-            return REBAR_ShowBand (hwnd, wParam, lParam);
-
-        case RB_SIZETORECT:
-            return REBAR_SizeToRect (hwnd, wParam, lParam);
-
-
-        case WM_COMMAND:
-            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
-
-        case WM_CREATE:
-            return REBAR_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return REBAR_Destroy (hwnd, wParam, lParam);
-
-        case WM_GETFONT:
-            return REBAR_GetFont (hwnd, wParam, lParam);
-
-/*      case WM_MOUSEMOVE: */
-/*          return REBAR_MouseMove (hwnd, wParam, lParam); */
-
-        case WM_NCCALCSIZE:
-            return REBAR_NCCalcSize (hwnd, wParam, lParam);
-
-        case WM_NCPAINT:
-            return REBAR_NCPaint (hwnd, wParam, lParam);
-
-        case WM_NOTIFY:
-            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
-
-        case WM_PAINT:
-            return REBAR_Paint (hwnd, wParam);
-
-        case WM_SETCURSOR:
-            return REBAR_SetCursor (hwnd, wParam, lParam);
-
-        case WM_SETFONT:
-            return REBAR_SetFont (hwnd, wParam, lParam);
-
-        case WM_SIZE:
-            return REBAR_Size (hwnd, wParam, lParam);
-
-/*      case WM_TIMER: */
-
-/*      case WM_WININICHANGE: */
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (rebar, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+/*      case RB_BEGINDRAG: */
+
+        case RB_DELETEBAND:
+            return REBAR_DeleteBand (hwnd, wParam, lParam);
+
+/*      case RB_DRAGMOVE: */
+/*      case RB_ENDDRAG: */
+
+        case RB_GETBANDBORDERS:
+            return REBAR_GetBandBorders (hwnd, wParam, lParam);
+
+        case RB_GETBANDCOUNT:
+            return REBAR_GetBandCount (hwnd);
+
+/*      case RB_GETBANDINFO32:  */ /* outdated, just for compatibility */
+
+        case RB_GETBANDINFOA:
+            return REBAR_GetBandInfoA (hwnd, wParam, lParam);
+
+        case RB_GETBANDINFOW:
+            return REBAR_GetBandInfoW (hwnd, wParam, lParam);
+
+        case RB_GETBARHEIGHT:
+            return REBAR_GetBarHeight (hwnd, wParam, lParam);
+
+        case RB_GETBARINFO:
+            return REBAR_GetBarInfo (hwnd, wParam, lParam);
+
+        case RB_GETBKCOLOR:
+            return REBAR_GetBkColor (hwnd);
+
+/*      case RB_GETCOLORSCHEME: */
+/*      case RB_GETDROPTARGET: */
+
+        case RB_GETPALETTE:
+            return REBAR_GetPalette (hwnd, wParam, lParam);
+
+        case RB_GETRECT:
+            return REBAR_GetRect (hwnd, wParam, lParam);
+
+        case RB_GETROWCOUNT:
+            return REBAR_GetRowCount (hwnd);
+
+        case RB_GETROWHEIGHT:
+            return REBAR_GetRowHeight (hwnd, wParam, lParam);
+
+        case RB_GETTEXTCOLOR:
+            return REBAR_GetTextColor (hwnd);
+
+        case RB_GETTOOLTIPS:
+            return REBAR_GetToolTips (hwnd);
+
+        case RB_GETUNICODEFORMAT:
+            return REBAR_GetUnicodeFormat (hwnd);
+
+        case RB_HITTEST:
+            return REBAR_HitTest (hwnd, wParam, lParam);
+
+        case RB_IDTOINDEX:
+            return REBAR_IdToIndex (hwnd, wParam, lParam);
+
+        case RB_INSERTBANDA:
+            return REBAR_InsertBandA (hwnd, wParam, lParam);
+
+        case RB_INSERTBANDW:
+            return REBAR_InsertBandW (hwnd, wParam, lParam);
+
+        case RB_MAXIMIZEBAND:
+            return REBAR_MaximizeBand (hwnd, wParam, lParam);
+
+        case RB_MINIMIZEBAND:
+            return REBAR_MinimizeBand (hwnd, wParam, lParam);
+
+        case RB_MOVEBAND:
+            return REBAR_MoveBand (hwnd, wParam, lParam);
+
+        case RB_SETBANDINFOA:
+            return REBAR_SetBandInfoA (hwnd, wParam, lParam);
+
+        case RB_SETBANDINFOW:
+            return REBAR_SetBandInfoW (hwnd, wParam, lParam);
+
+        case RB_SETBARINFO:
+            return REBAR_SetBarInfo (hwnd, wParam, lParam);
+
+        case RB_SETBKCOLOR:
+            return REBAR_SetBkColor (hwnd, wParam, lParam);
+
+/*      case RB_SETCOLORSCHEME: */
+/*      case RB_SETPALETTE: */
+/*          return REBAR_GetPalette (hwnd, wParam, lParam); */
+
+        case RB_SETPARENT:
+            return REBAR_SetParent (hwnd, wParam, lParam);
+
+        case RB_SETTEXTCOLOR:
+            return REBAR_SetTextColor (hwnd, wParam, lParam);
+
+/*      case RB_SETTOOLTIPS: */
+
+        case RB_SETUNICODEFORMAT:
+            return REBAR_SetUnicodeFormat (hwnd, wParam);
+
+        case RB_SHOWBAND:
+            return REBAR_ShowBand (hwnd, wParam, lParam);
+
+        case RB_SIZETORECT:
+            return REBAR_SizeToRect (hwnd, wParam, lParam);
+
+
+        case WM_COMMAND:
+            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+
+        case WM_CREATE:
+            return REBAR_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return REBAR_Destroy (hwnd, wParam, lParam);
+
+        case WM_GETFONT:
+            return REBAR_GetFont (hwnd, wParam, lParam);
+
+/*      case WM_MOUSEMOVE: */
+/*          return REBAR_MouseMove (hwnd, wParam, lParam); */
+
+        case WM_NCCALCSIZE:
+            return REBAR_NCCalcSize (hwnd, wParam, lParam);
+
+        case WM_NCPAINT:
+            return REBAR_NCPaint (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+
+        case WM_PAINT:
+            return REBAR_Paint (hwnd, wParam);
+
+        case WM_SETCURSOR:
+            return REBAR_SetCursor (hwnd, wParam, lParam);
+
+        case WM_SETFONT:
+            return REBAR_SetFont (hwnd, wParam, lParam);
+
+        case WM_SIZE:
+            return REBAR_Size (hwnd, wParam, lParam);
+
+/*      case WM_TIMER: */
+
+/*      case WM_WININICHANGE: */
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (rebar, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2024 +2025 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wndClass.lpszClassName = REBARCLASSNAMEA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -2033 +2034 @@
 {
     if (GlobalFindAtomA (REBARCLASSNAMEA))
-        UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/status.c

@@ -1 @@
-/* $Id: status.c,v 1.5 1999-06-23 19:45:01 achimha Exp $ */
+/* $Id: status.c,v 1.6 1999-06-28 15:46:26 cbratschi Exp $ */
 /*
  * Interface code to StatusWindow widget/control
@@ -192 +192 @@
     else {
         for (i = 0; i < infoPtr->numParts; i++) {
-            if (infoPtr->parts[i].style & SBT_OWNERDRAW) {
+            if (infoPtr->parts[i].style & SBT_OWNERDRAW) {
                 DRAWITEMSTRUCT dis;
 
@@ -441 +441 @@
 
         if (ti.lpszText)
-            lstrcpynA ((LPSTR)lParam, ti.lpszText, HIWORD(wParam));
+            lstrcpynA ((LPSTR)lParam, ti.lpszText, MIN(HIWORD(wParam),lstrlenA(ti.lpszText)));
     }
 
@@ -461 +461 @@
 
         if (ti.lpszText)
-            lstrcpynW ((LPWSTR)lParam, ti.lpszText, HIWORD(wParam));
+            lstrcpynW ((LPWSTR)lParam, ti.lpszText, MIN(HIWORD(wParam),lstrlenW(ti.lpszText)));
     }
 
@@ -571 +571 @@
     if (oldNumParts > self->numParts) {
         for (i = self->numParts ; i < oldNumParts; i++) {
-            if (self->parts[i].text && !(self->parts[i].style & SBT_OWNERDRAW))
+            if (self->parts[i].text && !(self->parts[i].style & SBT_OWNERDRAW))
                 COMCTL32_Free (self->parts[i].text);
         }
@@ -635 +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;
 
@@ -646 +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;
 
     if (!(part->style & SBT_OWNERDRAW) && part->text)
-        COMCTL32_Free (part->text);
+        COMCTL32_Free (part->text);
     part->text = 0;
 
     if (style & SBT_OWNERDRAW) {
-        part->text = (LPWSTR)text;
+        part->text = (LPWSTR)text;
     }
     else {
-        /* duplicate string */
-        if (text && (len = lstrlenA(text))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyAtoW (part->text, text);
-        }
+        /* duplicate string */
+        if (text && (len = lstrlenA(text))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyAtoW (part->text, text);
+        }
     }
     part->style = style;
@@ -689 +689 @@
 
     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;
 
     if (!(part->style & SBT_OWNERDRAW) && part->text)
-        COMCTL32_Free (part->text);
+        COMCTL32_Free (part->text);
     part->text = 0;
 
     if (style & SBT_OWNERDRAW) {
-        part->text = text;
+        part->text = text;
     }
     else {
-        /* duplicate string */
-        if (text && (len = lstrlenW(text))) {
-            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            lstrcpyW(part->text, text);
-        }
+        /* duplicate string */
+        if (text && (len = lstrlenW(text))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            lstrcpyW(part->text, text);
+        }
     }
     part->style = style;
@@ -896 +896 @@
 {
     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);

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.5 1999-06-23 19:45:01 achimha Exp $ */
+/* $Id: tab.c,v 1.6 1999-06-28 15:46:26 cbratschi Exp $ */
 /*
  * Tab control
@@ -7 +7 @@
  * Copyright 1999 Francis Beaudet
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
  * TODO:
@@ -83 +84 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- 
+
     return infoPtr->iSelected;
 }
@@ -91 +92 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- 
+
     return infoPtr->uFocus;
 }
@@ -111 +112 @@
   INT iItem=(INT) wParam;
   INT prevItem;
- 
+
   prevItem=-1;
   if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) {
@@ -125 +126 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   INT iItem=(INT) wParam;
- 
+
   if ((iItem < 0) || (iItem > infoPtr->uNumItem)) return 0;
 
@@ -131 +132 @@
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) {
 //    FIXME (tab,"Should set input focus\n");
-  } else { 
+  } else {
     if (infoPtr->iSelected != iItem) {
       if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE)  {
@@ -137 +138 @@
         TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
 
-        TAB_EnsureSelectionVisible(hwnd, infoPtr);
-        TAB_InvalidateTabArea(hwnd, infoPtr);
+        TAB_EnsureSelectionVisible(hwnd, infoPtr);
+        TAB_InvalidateTabArea(hwnd, infoPtr);
       }
     }
@@ -176 +177 @@
    * Perform a sanity check and a trivial visibility check.
    */
-  if ( (infoPtr->uNumItem <=0) || 
+  if ( (infoPtr->uNumItem == 0) ||
        (itemIndex >= infoPtr->uNumItem) ||
        (itemIndex < infoPtr->leftmostVisible) )
@@ -187 +188 @@
   if (itemRect==NULL)
     itemRect = &tmpItemRect;
-  
+
   /*
    * Retrieve the unmodified item rect.
@@ -194 +195 @@
 
   /*
-   * "scroll" it to make sure the item at the very left of the 
+   * "scroll" it to make sure the item at the very left of the
    * tab control is the leftmost visible tab.
    */
   OffsetRect(itemRect,
-             -infoPtr->items[infoPtr->leftmostVisible].rect.left, 
-             0);
-
-  /*
-   * Move the rectangle so the first item is slightly offset from 
+             -infoPtr->items[infoPtr->leftmostVisible].rect.left,
+             0);
+
+  /*
+   * Move the rectangle so the first item is slightly offset from
    * the left of the tab control.
    */
   OffsetRect(itemRect,
-             SELECTED_TAB_OFFSET,
-             0);
+             SELECTED_TAB_OFFSET,
+             0);
 
 
@@ -225 +226 @@
      * If it also a bit higher.
      */
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
-    {      
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
+    {
       selectedRect->top    -=2; /* the border is thicker on the bottom */
       selectedRect->bottom +=SELECTED_TAB_OFFSET;
@@ -242 +243 @@
 static BOOL TAB_GetItemRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam, 
+  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam,
                                  (LPRECT)lParam, (LPRECT)NULL);
 }
@@ -252 +253 @@
  */
 static LRESULT TAB_KeyUp(
-  HWND   hwnd, 
+  HWND   hwnd,
   WPARAM keyCode)
 {
@@ -267 +268 @@
       break;
   }
-  
+
   /*
    * If we changed to a valid item, change the selection
@@ -296 +297 @@
  */
 static LRESULT TAB_FocusChanging(
-  HWND   hwnd, 
-  UINT   uMsg, 
-  WPARAM wParam, 
+  HWND   hwnd,
+  UINT   uMsg,
+  WPARAM wParam,
   LPARAM lParam)
 {
@@ -309 +310 @@
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                                      infoPtr,
-                                      infoPtr->uFocus,
-                                      NULL,
-                                      &selectedRect);
-  
+                                      infoPtr,
+                                      infoPtr->uFocus,
+                                      NULL,
+                                      &selectedRect);
+
   /*
    * If the rectangle is not completely invisible, invalidate that
@@ -331 +332 @@
 static HWND TAB_InternalHitTest (
   HWND      hwnd,
-  TAB_INFO* infoPtr, 
-  POINT     pt, 
+  TAB_INFO* infoPtr,
+  POINT     pt,
   UINT*     flags)
 
 {
   RECT rect;
-  int iCount; 
-  
-  for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) 
+  int iCount;
+
+  for (iCount = 0; iCount < infoPtr->uNumItem; iCount++)
   {
     TAB_InternalGetItemRect(hwnd,
-                            infoPtr, 
-                            iCount,
-                            &rect,
-                            NULL);
+                            infoPtr,
+                            iCount,
+                            &rect,
+                            NULL);
 
     if (PtInRect (&rect, pt))
@@ -363 +364 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   LPTCHITTESTINFO lptest=(LPTCHITTESTINFO) lParam;
-  
+
   return TAB_InternalHitTest (hwnd, infoPtr,lptest->pt,&lptest->flags);
 }
@@ -375 +376 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                    WM_LBUTTONDOWN, wParam, lParam);
+                    WM_LBUTTONDOWN, wParam, lParam);
 
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_FOCUSONBUTTONDOWN ) {
@@ -389 +390 @@
   POINT pt;
   INT newItem,dummy;
-  
+
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                    WM_LBUTTONDOWN, wParam, lParam);
-  
+                    WM_LBUTTONDOWN, wParam, lParam);
+
   pt.x = (INT)LOWORD(lParam);
   pt.y = (INT)HIWORD(lParam);
-  
+
   newItem=TAB_InternalHitTest (hwnd, infoPtr,pt,(unsigned int*)&dummy);
-  
+
 //  TRACE(tab, "On Tab, item %d\n", newItem);
-    
+
   if ( (newItem!=-1) &&
        (infoPtr->iSelected != newItem) )
@@ -434 +435 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                    WM_LBUTTONDOWN, wParam, lParam);
+                    WM_LBUTTONDOWN, wParam, lParam);
   return 0;
 }
@@ -445 +446 @@
  */
 static LRESULT TAB_AdjustRect(
-  HWND   hwnd, 
-  WPARAM fLarger, 
+  HWND   hwnd,
+  WPARAM fLarger,
   LPRECT prc)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
 
-  if (fLarger) 
+  if (fLarger)
   {
     /*
@@ -460 +461 @@
      * Add the height of the tabs.
      */
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
       prc->bottom += infoPtr->tabHeight;
     else
@@ -475 +476 @@
     InflateRect(prc, CONTROL_BORDER_SIZEX, CONTROL_BORDER_SIZEX);
   }
-  else 
+  else
   {
     /*
      * Go from window rectangle.
      */
-  
+
     /*
      * Deflate the rectangle for the border
@@ -494 +495 @@
      * Remove the height of the tabs.
      */
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
       prc->bottom -= infoPtr->tabHeight;
     else
@@ -500 +501 @@
 
   }
-  
+
   return 0;
 }
@@ -511 +512 @@
  */
 static LRESULT TAB_OnHScroll(
-  HWND    hwnd, 
+  HWND    hwnd,
   int     nScrollCode,
   int     nPos,
@@ -543 +544 @@
  * TAB_SetupScroling
  *
- * This method will check the current scrolling state and make sure the 
+ * This method will check the current scrolling state and make sure the
  * scrolling control is displayed (or not).
  */
@@ -561 +562 @@
     controlPos.left  = controlPos.right - 2*GetSystemMetrics(SM_CXHSCROLL);
 
-    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
     {
       controlPos.top    = clientRect->bottom - infoPtr->tabHeight;
@@ -583 +584 @@
        */
       infoPtr->hwndUpDown = CreateWindowA("ScrollBar",
-                                          "",
-                                          WS_VISIBLE | WS_CHILD | WS_OVERLAPPED | SBS_HORZ,
-                                          controlPos.left, controlPos.top,
-                                          controlPos.right - controlPos.left,
-                                          controlPos.bottom - controlPos.top,
-                                          hwnd,
-                                          (HMENU)NULL, 
-                                          (HINSTANCE)NULL, 
-                                          NULL);        
+                                          "",
+                                          WS_VISIBLE | WS_CHILD | WS_OVERLAPPED | SBS_HORZ,
+                                          controlPos.left, controlPos.top,
+                                          controlPos.right - controlPos.left,
+                                          controlPos.bottom - controlPos.top,
+                                          hwnd,
+                                          (HMENU)NULL,
+                                          (HINSTANCE)NULL,
+                                          NULL);
     }
     else
     {
-      SetWindowPos(infoPtr->hwndUpDown, 
-                   (HWND)NULL,
-                   controlPos.left, controlPos.top,
-                   controlPos.right - controlPos.left,
-                   controlPos.bottom - controlPos.top,
-                   SWP_SHOWWINDOW | SWP_NOZORDER);                 
+      SetWindowPos(infoPtr->hwndUpDown,
+                   (HWND)NULL,
+                   controlPos.left, controlPos.top,
+                   controlPos.right - controlPos.left,
+                   controlPos.bottom - controlPos.top,
+                   SWP_SHOWWINDOW | SWP_NOZORDER);
     }
   }
@@ -641 +642 @@
    * a font.
    */
-  hdc = GetDC(hwnd); 
-    
+  hdc = GetDC(hwnd);
+
   hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
   hOldFont = SelectObject (hdc, hFont);
@@ -651 +652 @@
    */
   GetClientRect(hwnd, &clientRect);
-  
+
   /*
    * The leftmost item will be "0" aligned
@@ -665 +666 @@
 
     /*
-     * Make sure there is enough space for the letters + growing the 
-     * selected item + extra space for the selected item.   
-     */
-    infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +  
+     * Make sure there is enough space for the letters + growing the
+     * selected item + extra space for the selected item.
+     */
+    infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +
       SELECTED_TAB_OFFSET;
   }
@@ -677 +678 @@
      * Calculate the vertical position of the tab
      */
-    if (lStyle & TCS_BOTTOM) 
-    {
-      infoPtr->items[curItem].rect.bottom = clientRect.bottom - 
+    if (lStyle & TCS_BOTTOM)
+    {
+      infoPtr->items[curItem].rect.bottom = clientRect.bottom -
                                             SELECTED_TAB_OFFSET;
-      infoPtr->items[curItem].rect.top = clientRect.bottom - 
+      infoPtr->items[curItem].rect.top = clientRect.bottom -
                                          infoPtr->tabHeight;
     }
-    else 
-    {
-      infoPtr->items[curItem].rect.top = clientRect.top + 
+    else
+    {
+      infoPtr->items[curItem].rect.top = clientRect.top +
                                          SELECTED_TAB_OFFSET;
-      infoPtr->items[curItem].rect.bottom = clientRect.top + 
+      infoPtr->items[curItem].rect.bottom = clientRect.top +
                                             infoPtr->tabHeight;
     }
@@ -708 +709 @@
        * Calculate how wide the tab is depending on the text it contains
        */
-      GetTextExtentPoint32A(hdc, infoPtr->items[curItem].pszText, 
+      GetTextExtentPoint32A(hdc, infoPtr->items[curItem].pszText,
                             lstrlenA(infoPtr->items[curItem].pszText), &size);
-      
+
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
                                            size.cx + 2*HORIZONTAL_ITEM_PADDING;
@@ -716 +717 @@
 
 //    TRACE(tab, "TextSize: %i\n ", size.cx);
-//    TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n", 
-//        infoPtr->items[curItem].rect.top,
-//        infoPtr->items[curItem].rect.left,
-//        infoPtr->items[curItem].rect.bottom,
-//        infoPtr->items[curItem].rect.right);  
+//    TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n",
+//        infoPtr->items[curItem].rect.top,
+//        infoPtr->items[curItem].rect.left,
+//        infoPtr->items[curItem].rect.bottom,
+//        infoPtr->items[curItem].rect.right);
 
     /*
@@ -735 +736 @@
    * Check if we need a scrolling control.
    */
-  infoPtr->needsScrolling = (curItemLeftPos + (2*SELECTED_TAB_OFFSET) > 
+  infoPtr->needsScrolling = (curItemLeftPos + (2*SELECTED_TAB_OFFSET) >
                              clientRect.right);
 
-  TAB_SetupScrolling(hwnd, infoPtr, &clientRect);      
-  
+  TAB_SetupScrolling(hwnd, infoPtr, &clientRect);
+
   /*
    * Cleanup
@@ -751 +752 @@
  *
  * This method is used to draw a single tab into the tab control.
- */         
+ */
 static void TAB_DrawItem(
-  HWND hwnd, 
-  HDC  hdc, 
+  HWND hwnd,
+  HDC  hdc,
   INT  iItem)
 {
@@ -768 +769 @@
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                                      infoPtr,
-                                      iItem,
-                                      &itemRect,
-                                      &selectedRect);
+                                      infoPtr,
+                                      iItem,
+                                      &itemRect,
+                                      &selectedRect);
 
   if (isVisible)
   {
-    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));    
+    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));
     HPEN   hwPen     = GetSysColorPen (COLOR_3DHILIGHT);
     HPEN   hbPen     = GetSysColorPen (COLOR_BTNSHADOW);
@@ -782 +783 @@
     HPEN   holdPen;
     INT    oldBkMode;
-    INT    cx,cy; 
+    INT    cx,cy;
 
     if (lStyle & TCS_BUTTONS)
     {
-      /* 
+      /*
        * Get item rectangle.
        */
@@ -795 +796 @@
       if (iItem == infoPtr->iSelected)
       {
-        /* 
-         * Background color. 
+        /*
+         * Background color.
          */
         if (!(lStyle & TCS_OWNERDRAWFIXED))
-          hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));    
+          hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
 
         /*
          * Erase the background.
-         */     
+         */
         FillRect(hdc, &r, hbr);
 
@@ -819 +820 @@
         LineTo   (hdc, r.right, r.bottom);
         LineTo   (hdc, r.right, r.top);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -829 +830 @@
         /*
          * Erase the background.
-         */     
+         */
         FillRect(hdc, &r, hbr);
 
@@ -836 +837 @@
         LineTo   (hdc, r.left, r.top);
         LineTo   (hdc, r.right, r.top);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -845 +846 @@
     else
     {
-      /* 
-       * Background color. 
+      /*
+       * Background color.
        */
-      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));    
+      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
 
       /*
@@ -861 +862 @@
       /*
        * Erase the background.
-       * This is necessary when drawing the selected item since it is larger 
-       * than the others, it might overlap with stuff already drawn by the 
+       * This is necessary when drawing the selected item since it is larger
+       * than the others, it might overlap with stuff already drawn by the
        * other tabs
-       */     
+       */
       FillRect(hdc, &r, hbr);
 
@@ -875 +876 @@
       r.right--;
       r.bottom--;
-      
+
       holdPen = SelectObject (hdc, hwPen);
 
-      if (lStyle & TCS_BOTTOM) 
+      if (lStyle & TCS_BOTTOM)
       {
         /* highlight */
@@ -884 +885 @@
         LineTo   (hdc, r.left, r.bottom - ROUND_CORNER_SIZE);
         LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.bottom);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -891 +892 @@
         LineTo  (hdc, r.right, r.top);
       }
-      else 
+      else
       {
         /* highlight */
@@ -898 +899 @@
         LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.top);
         LineTo   (hdc, r.right - ROUND_CORNER_SIZE, r.top);
-        
+
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -905 +906 @@
       }
     }
-  
+
     /*
      * Text pen
      */
-    SelectObject(hdc, hsdPen); 
-
-    oldBkMode = SetBkMode(hdc, TRANSPARENT); 
+    SelectObject(hdc, hsdPen);
+
+    oldBkMode = SetBkMode(hdc, TRANSPARENT);
     SetTextColor (hdc, COLOR_BTNTEXT);
 
@@ -922 +923 @@
      * Draw the icon.
      */
-    if (infoPtr->himl) 
-    {
-      ImageList_Draw (infoPtr->himl, iItem, hdc, 
-                      r.left, r.top+1, ILD_NORMAL);
+    if (infoPtr->himl)
+    {
+      ImageList_Draw (infoPtr->himl, iItem, hdc,
+                      r.left, r.top+1, ILD_NORMAL);
       ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
       r.left+=cx;
@@ -934 +935 @@
      */
     DrawTextA(hdc,
-              infoPtr->items[iItem].pszText, 
-              lstrlenA(infoPtr->items[iItem].pszText),
-              &r, 
-              DT_LEFT|DT_SINGLELINE|DT_VCENTER);
+              infoPtr->items[iItem].pszText,
+              lstrlenA(infoPtr->items[iItem].pszText),
+              &r,
+              DT_LEFT|DT_SINGLELINE|DT_VCENTER);
 
     /*
@@ -943 +944 @@
      */
     if (((lStyle & TCS_FOCUSNEVER) == 0) &&
-         (GetFocus() == hwnd) &&
-         (iItem == infoPtr->uFocus) )
+         (GetFocus() == hwnd) &&
+         (iItem == infoPtr->uFocus) )
     {
       InflateRect(&r, FOCUS_RECT_HOFFSET, FOCUS_RECT_VOFFSET);
@@ -951 +952 @@
 
       MoveToEx (hdc, r.left,    r.top, NULL);
-      LineTo   (hdc, r.right-1, r.top); 
+      LineTo   (hdc, r.right-1, r.top);
       LineTo   (hdc, r.right-1, r.bottom -1);
       LineTo   (hdc, r.left,    r.bottom -1);
@@ -970 +971 @@
  * This method is used to draw the raised border around the tab control
  * "content" area.
- */         
+ */
 static void TAB_DrawBorder (HWND hwnd, HDC hdc)
 {
@@ -985 +986 @@
    * Adjust for the style
    */
-  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
   {
     rect.bottom -= infoPtr->tabHeight;
@@ -1003 +1004 @@
   /* highlight */
   htmPen = SelectObject (hdc, hwPen);
-  
+
   MoveToEx (hdc, rect.left, rect.bottom, NULL);
-  LineTo (hdc, rect.left, rect.top); 
+  LineTo (hdc, rect.left, rect.top);
   LineTo (hdc, rect.right, rect.top);
 
@@ -1026 +1027 @@
  *
  * This method repaints the tab control..
- */             
+ */
 static void TAB_Refresh (HWND hwnd, HDC hdc)
 {
@@ -1040 +1041 @@
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS)
   {
-    for (i = 0; i < infoPtr->uNumItem; i++) 
-    {
-        TAB_DrawItem (hwnd, hdc, i);
+    for (i = 0; i < infoPtr->uNumItem; i++)
+    {
+        TAB_DrawItem (hwnd, hdc, i);
     }
   }
@@ -1050 +1051 @@
      * Draw all the non selected item first.
      */
-    for (i = 0; i < infoPtr->uNumItem; i++) 
+    for (i = 0; i < infoPtr->uNumItem; i++)
     {
       if (i != infoPtr->iSelected)
-        TAB_DrawItem (hwnd, hdc, i);
+        TAB_DrawItem (hwnd, hdc, i);
     }
 
@@ -1075 +1076 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  
+
   infoPtr->DoRedraw=(BOOL) wParam;
   return 0;
@@ -1081 +1082 @@
 
 static LRESULT TAB_EraseBackground(
-  HWND hwnd, 
+  HWND hwnd,
   HDC  givenDC)
 {
@@ -1135 +1136 @@
   GetClientRect(infoPtr->hwndUpDown, &scrollerRect);
   visibleRect.right -= scrollerRect.right;
-  
+
   /*
    * Get the rectangle for the item
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                                      infoPtr,
-                                      infoPtr->iSelected,
-                                      NULL,
-                                      &selectedRect);
+                                      infoPtr,
+                                      infoPtr->iSelected,
+                                      NULL,
+                                      &selectedRect);
 
   /*
@@ -1163 +1164 @@
 
   while ( (infoPtr->leftmostVisible < infoPtr->iSelected) &&
-          !isVisible)
+          !isVisible)
   {
     infoPtr->leftmostVisible++;
@@ -1171 +1172 @@
      */
     isVisible = TAB_InternalGetItemRect(hwnd,
-                                        infoPtr,
-                                        infoPtr->iSelected,
-                                        NULL,
-                                        &selectedRect);
+                                        infoPtr,
+                                        infoPtr->iSelected,
+                                        NULL,
+                                        &selectedRect);
 
     /*
@@ -1189 +1190 @@
       pt2.x = selectedRect.right - 1;
       pt2.y = selectedRect.bottom - 1;
-      
+
       isVisible = PtInRect(&visibleRect, pt1) &&  PtInRect(&visibleRect, pt2);
     }
@@ -1210 +1211 @@
   GetClientRect(hwnd, &clientRect);
 
-  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM) 
+  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BOTTOM)
   {
     clientRect.top = clientRect.bottom - (infoPtr->tabHeight + 1);
@@ -1227 +1228 @@
   HDC hdc;
   PAINTSTRUCT ps;
-    
+
   hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
   TAB_Refresh (hwnd, hdc);
-    
+
   if(!wParam)
     EndPaint (hwnd, &ps);
@@ -1239 +1240 @@
 static LRESULT
 TAB_InsertItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{    
+{
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   TCITEMA *pti;
   INT iItem, len;
   RECT rect;
-  
+
   GetClientRect (hwnd, &rect);
 //  TRACE(tab, "Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
-//        rect.top, rect.left, rect.bottom, rect.right);  
-  
+//        rect.top, rect.left, rect.bottom, rect.right);
+
   pti = (TCITEMA *)lParam;
   iItem = (INT)wParam;
-  
+
   if (iItem < 0) return -1;
   if (iItem > infoPtr->uNumItem)
     iItem = infoPtr->uNumItem;
-  
+
   if (infoPtr->uNumItem == 0) {
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM));
@@ -1262 +1263 @@
   else {
     TAB_ITEM *oldItems = infoPtr->items;
-    
+
     infoPtr->uNumItem++;
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM) * infoPtr->uNumItem);
-    
+
     /* pre insert copy */
     if (iItem > 0) {
       memcpy (&infoPtr->items[0], &oldItems[0],
-              iItem * sizeof(TAB_ITEM));
-    }
-    
+              iItem * sizeof(TAB_ITEM));
+    }
+
     /* post insert copy */
     if (iItem < infoPtr->uNumItem - 1) {
       memcpy (&infoPtr->items[iItem+1], &oldItems[iItem],
-              (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
-      
-    }
-    
+              (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
+
+    }
+
     COMCTL32_Free (oldItems);
   }
-  
+
   infoPtr->items[iItem].mask = pti->mask;
   if (pti->mask & TCIF_TEXT) {
@@ -1289 +1290 @@
     infoPtr->items[iItem].cchTextMax = pti->cchTextMax;
   }
-  
+
   if (pti->mask & TCIF_IMAGE)
     infoPtr->items[iItem].iImage = pti->iImage;
-  
+
   if (pti->mask & TCIF_PARAM)
     infoPtr->items[iItem].lParam = pti->lParam;
-  
+
   TAB_InvalidateTabArea(hwnd, infoPtr);
-  
+
 //  TRACE(tab, "[%04x]: added item %d '%s'\n",
-//      hwnd, iItem, infoPtr->items[iItem].pszText);
+//      hwnd, iItem, infoPtr->items[iItem].pszText);
 
   TAB_SetItemBounds(hwnd);
@@ -1305 +1306 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_SetItemSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1322 +1323 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  TCITEMA *tabItem; 
-  TAB_ITEM *wineItem; 
+  TCITEMA *tabItem;
+  TAB_ITEM *wineItem;
   INT    iItem,len;
 
@@ -1337 +1338 @@
   wineItem=& infoPtr->items[iItem];
 
-  if (tabItem->mask & TCIF_IMAGE) 
+  if (tabItem->mask & TCIF_IMAGE)
     wineItem->iImage=tabItem->iImage;
 
-  if (tabItem->mask & TCIF_PARAM) 
+  if (tabItem->mask & TCIF_PARAM)
     wineItem->lParam=tabItem->lParam;
 
-//  if (tabItem->mask & TCIF_RTLREADING) 
+//  if (tabItem->mask & TCIF_RTLREADING)
 //    FIXME (tab,"TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE) 
+  if (tabItem->mask & TCIF_STATE)
     wineItem->dwState=tabItem->dwState;
 
   if (tabItem->mask & TCIF_TEXT) {
-   len=lstrlenA (tabItem->pszText);
-   if (len>wineItem->cchTextMax) 
-     wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
+   len = lstrlenA (tabItem->pszText);
+   if (len>wineItem->cchTextMax)
+     wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, len+1);
    lstrcpynA (wineItem->pszText, tabItem->pszText, len);
   }
@@ -1359 +1360 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_GetItemCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1368 +1369 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1383 +1384 @@
   wineItem=& infoPtr->items[iItem];
 
-  if (tabItem->mask & TCIF_IMAGE) 
+  if (tabItem->mask & TCIF_IMAGE)
     tabItem->iImage=wineItem->iImage;
 
-  if (tabItem->mask & TCIF_PARAM) 
+  if (tabItem->mask & TCIF_PARAM)
     tabItem->lParam=wineItem->lParam;
 
-//  if (tabItem->mask & TCIF_RTLREADING) 
+//  if (tabItem->mask & TCIF_RTLREADING)
 //    FIXME (tab, "TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE) 
+  if (tabItem->mask & TCIF_STATE)
     tabItem->dwState=wineItem->dwState;
 
-  if (tabItem->mask & TCIF_TEXT) 
+  if (tabItem->mask & TCIF_TEXT)
    lstrcpynA (tabItem->pszText, wineItem->pszText, tabItem->cchTextMax);
 
@@ -1401 +1402 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1411 +1412 @@
   {
     TAB_ITEM *oldItems = infoPtr->items;
-    
+
     infoPtr->uNumItem--;
     infoPtr->items = COMCTL32_Alloc(sizeof (TAB_ITEM) * infoPtr->uNumItem);
-    
-    if (iItem > 0) 
+
+    if (iItem > 0)
       memcpy(&infoPtr->items[0], &oldItems[0], iItem * sizeof(TAB_ITEM));
-    
-    if (iItem < infoPtr->uNumItem) 
+
+    if (iItem < infoPtr->uNumItem)
       memcpy(&infoPtr->items[iItem], &oldItems[iItem + 1],
               (infoPtr->uNumItem - iItem) * sizeof(TAB_ITEM));
-    
+
     COMCTL32_Free (oldItems);
 
@@ -1429 +1430 @@
     if ((iItem == infoPtr->iSelected) && (iItem > 0))
       infoPtr->iSelected--;
-      
+
     if (iItem < infoPtr->iSelected)
       infoPtr->iSelected--;
@@ -1445 +1446 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_DeleteAllItems (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1452 +1453 @@
   COMCTL32_Free (infoPtr->items);
   infoPtr->uNumItem=0;
-  
+
   return TRUE;
 }
@@ -1471 +1472 @@
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  
+
 //  TRACE (tab,"%x %lx\n",wParam, lParam);
-  
+
   infoPtr->hFont = (HFONT)wParam;
-  
+
   TAB_SetItemBounds(hwnd);
 
@@ -1525 +1526 @@
     cx=LOWORD (lParam);
     cy=HIWORD (lParam);
-    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE)
         uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
 
@@ -1548 +1549 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1559 +1560 @@
 
   SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
-   
+
   infoPtr->uNumItem        = 0;
   infoPtr->hFont           = 0;
   infoPtr->items           = 0;
   infoPtr->hcurArrow       = LoadCursorA (0, IDC_ARROWA);
-  infoPtr->iSelected       = 0;  
-  infoPtr->uFocus          = 0;  
+  infoPtr->iSelected       = 0;
+  infoPtr->uFocus          = 0;
   infoPtr->hwndToolTip     = 0;
   infoPtr->DoRedraw        = TRUE;
@@ -1571 +1572 @@
   infoPtr->hwndUpDown      = 0;
   infoPtr->leftmostVisible = 0;
-  
-//  TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd); 
+
+//  TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd);
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_TOOLTIPS) {
     /* Create tooltip control */
     infoPtr->hwndToolTip =
       CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                       CW_USEDEFAULT, CW_USEDEFAULT,
-                       CW_USEDEFAULT, CW_USEDEFAULT,
-                       hwnd, 0, 0, 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 (GetParent (hwnd), WM_NOTIFY,
-                    (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
-    }
-  }  
-    
+                    (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
+    }
+  }
+
   /*
    * We need to get text information so we need a DC and we need to select
    * a font.
    */
-  hdc = GetDC(hwnd); 
+  hdc = GetDC(hwnd);
   hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT));
 
@@ -1608 +1609 @@
 
   /*
-   * Make sure there is enough space for the letters + growing the 
-   * selected item + extra space for the selected item.   
-   */
-  infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +  
+   * Make sure there is enough space for the letters + growing the
+   * selected item + extra space for the selected item.
+   */
+  infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +
                        SELECTED_TAB_OFFSET;
 
@@ -1634 +1635 @@
     for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) {
       if (infoPtr->items[iItem].pszText)
-        COMCTL32_Free (infoPtr->items[iItem].pszText);
+        COMCTL32_Free (infoPtr->items[iItem].pszText);
     }
     COMCTL32_Free (infoPtr->items);
   }
-  
-  if (infoPtr->hwndToolTip) 
+
+  if (infoPtr->hwndToolTip)
     DestroyWindow (infoPtr->hwndToolTip);
- 
+
   if (infoPtr->hwndUpDown)
     DestroyWindow(infoPtr->hwndUpDown);
@@ -1656 +1657 @@
     case TCM_GETIMAGELIST:
       return TAB_GetImageList (hwnd, wParam, lParam);
-      
+
     case TCM_SETIMAGELIST:
       return TAB_SetImageList (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMCOUNT:
       return TAB_GetItemCount (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMA:
       return TAB_GetItemA (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMW:
 //      FIXME (tab, "Unimplemented msg TCM_GETITEMW\n");
       return 0;
-      
+
     case TCM_SETITEMA:
       return TAB_SetItemA (hwnd, wParam, lParam);
-      
+
     case TCM_SETITEMW:
 //      FIXME (tab, "Unimplemented msg TCM_SETITEMW\n");
       return 0;
-      
+
     case TCM_DELETEITEM:
       return TAB_DeleteItem (hwnd, wParam, lParam);
-      
+
     case TCM_DELETEALLITEMS:
      return TAB_DeleteAllItems (hwnd, wParam, lParam);
-     
+
     case TCM_GETITEMRECT:
      return TAB_GetItemRect (hwnd, wParam, lParam);
-      
+
     case TCM_GETCURSEL:
       return TAB_GetCurSel (hwnd);
-      
+
     case TCM_HITTEST:
       return TAB_HitTest (hwnd, wParam, lParam);
-      
+
     case TCM_SETCURSEL:
       return TAB_SetCurSel (hwnd, wParam);
-      
+
     case TCM_INSERTITEMA:
       return TAB_InsertItem (hwnd, wParam, lParam);
-      
+
     case TCM_INSERTITEMW:
 //      FIXME (tab, "Unimplemented msg TCM_INSERTITEM32W\n");
       return 0;
-      
+
     case TCM_SETITEMEXTRA:
 //      FIXME (tab, "Unimplemented msg TCM_SETITEMEXTRA\n");
       return 0;
-      
+
     case TCM_ADJUSTRECT:
       return TAB_AdjustRect (hwnd, (BOOL)wParam, (LPRECT)lParam);
-      
+
     case TCM_SETITEMSIZE:
       return TAB_SetItemSize (hwnd, wParam, lParam);
-      
+
     case TCM_REMOVEIMAGE:
 //      FIXME (tab, "Unimplemented msg TCM_REMOVEIMAGE\n");
       return 0;
-      
+
     case TCM_SETPADDING:
 //      FIXME (tab, "Unimplemented msg TCM_SETPADDING\n");
       return 0;
-      
+
     case TCM_GETROWCOUNT:
 //      FIXME (tab, "Unimplemented msg TCM_GETROWCOUNT\n");
@@ -1735 +1736 @@
 //      FIXME (tab, "Unimplemented msg TCM_HIGHLIGHTITEM\n");
       return 0;
-      
+
     case TCM_GETTOOLTIPS:
       return TAB_GetToolTips (hwnd, wParam, lParam);
-      
+
     case TCM_SETTOOLTIPS:
       return TAB_SetToolTips (hwnd, wParam, lParam);
-      
+
     case TCM_GETCURFOCUS:
       return TAB_GetCurFocus (hwnd);
-      
+
     case TCM_SETCURFOCUS:
       return TAB_SetCurFocus (hwnd, wParam);
-      
+
     case TCM_SETMINTTABWIDTH:
 //      FIXME (tab, "Unimplemented msg TCM_SETMINTTABWIDTH\n");
       return 0;
-      
+
     case TCM_DESELECTALL:
 //      FIXME (tab, "Unimplemented msg TCM_DESELECTALL\n");
       return 0;
-      
+
     case TCM_GETEXTENDEDSTYLE:
 //      FIXME (tab, "Unimplemented msg TCM_GETEXTENDEDSTYLE\n");
@@ -1766 +1767 @@
     case WM_GETFONT:
       return TAB_GetFont (hwnd, wParam, lParam);
-      
+
     case WM_SETFONT:
       return TAB_SetFont (hwnd, wParam, lParam);
-      
+
     case WM_CREATE:
       return TAB_Create (hwnd, wParam, lParam);
-      
+
     case WM_NCDESTROY:
       return TAB_Destroy (hwnd, wParam, lParam);
-      
+
     case WM_GETDLGCODE:
       return DLGC_WANTARROWS | DLGC_WANTCHARS;
-      
+
     case WM_LBUTTONDOWN:
       return TAB_LButtonDown (hwnd, wParam, lParam);
-      
+
     case WM_LBUTTONUP:
       return TAB_LButtonUp (hwnd, wParam, lParam);
-      
+
     case WM_RBUTTONDOWN:
       return TAB_RButtonDown (hwnd, wParam, lParam);
-      
+
     case WM_MOUSEMOVE:
       return TAB_MouseMove (hwnd, wParam, lParam);
-      
+
     case WM_ERASEBKGND:
       return TAB_EraseBackground (hwnd, (HDC)wParam);
@@ -1799 +1800 @@
     case WM_SIZE:
       return TAB_Size (hwnd, wParam, lParam);
-      
+
     case WM_SETREDRAW:
       return TAB_SetRedraw (hwnd, wParam);
@@ -1805 +1806 @@
     case WM_HSCROLL:
       return TAB_OnHScroll(hwnd, (int)LOWORD(wParam), (int)HIWORD(wParam), (HWND)lParam);
-      
+
     case WM_KILLFOCUS:
     case WM_SETFOCUS:
@@ -1815 +1816 @@
     default:
 //      if (uMsg >= WM_USER)
-//      ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
-//           uMsg, wParam, lParam);
+//      ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
+//           uMsg, wParam, lParam);
       return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
@@ -1839 +1840 @@
   wndClass.hbrBackground = (HBRUSH)NULL;
   wndClass.lpszClassName = WC_TABCONTROLA;
-  
+
   RegisterClassA (&wndClass);
 }

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.6 1999-06-24 16:37:45 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.7 1999-06-28 15:46:27 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -29 +29 @@
  */
 
+/* CB: Odin32/WINE bugs
+  - IMAGELIST_Draw draws a line too much at the bottom of the bitmap
+*/
+
 #include <string.h>
 
@@ -1514 +1518 @@
             lstrcpynA (lpTbInfo->pszText,
                          (LPSTR)infoPtr->strings[btnPtr->iString],
-                         lpTbInfo->cchText);
+                         MIN(lpTbInfo->cchText,lstrlenA((LPSTR)infoPtr->strings[btnPtr->iString])));
     }
 
@@ -2057 +2061 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0)) return FALSE;
+    if ((LOWORD(lParam) <= 0) || (HIWORD(lParam) <= 0)) return FALSE;
 
     infoPtr->nBitmapWidth = (INT)LOWORD(lParam);
@@ -2474 +2478 @@
 
             nmttc.hdr.hwndFrom = hwnd;
-            nmttc.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+            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);
+            SendMessageA(infoPtr->hwndNotify,WM_NOTIFY,(WPARAM)nmttc.hdr.idFrom,(LPARAM)&nmttc);
         }
     }
@@ -2691 +2694 @@
     INT   nHit;
     HDC   hdc;
+    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
     if (infoPtr->hwndToolTip)
@@ -2711 +2715 @@
           oldBtnPtr->bHot = FALSE;
 
-          InvalidateRect (hwnd, &oldBtnPtr->rect, TRUE);
+          if (dwStyle & TBSTYLE_FLAT) InvalidateRect(hwnd,&oldBtnPtr->rect,TRUE);
         }
       }
@@ -2723 +2727 @@
           btnPtr->bHot = TRUE;
 
-          hdc = GetDC (hwnd);
-          TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-          ReleaseDC (hwnd, hdc);
+          if (dwStyle & TBSTYLE_FLAT)
+          {
+            hdc = GetDC (hwnd);
+            TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+            ReleaseDC (hwnd, hdc);
+          }
 
           infoPtr->nHotItem = nHit;
@@ -2864 +2871 @@
 
     TOOLBAR_CalcToolbar(hwnd);
-    hdc = wParam==0 ? BeginPaint(hwnd,&ps) : (HDC)wParam;
+    hdc = wParam == 0 ? BeginPaint(hwnd,&ps) : (HDC)wParam;
     TOOLBAR_Refresh(hwnd,hdc);
     if (!wParam) EndPaint (hwnd, &ps);

trunk/src/comctl32/tooltips.c

@@ -1 @@
-/* $Id: tooltips.c,v 1.7 1999-06-26 14:20:31 cbratschi Exp $ */
+/* $Id: tooltips.c,v 1.8 1999-06-28 15:46:27 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -29 +29 @@
 #include "comctl32.h"
 
-
 #define ID_TIMERSHOW   1    /* show delay timer */
 #define ID_TIMERPOP    2    /* auto pop timer */
@@ -41 +40 @@
 
 #define TOOLTIPS_GetInfoPtr(hWindow) ((TOOLTIPS_INFO *)GetWindowLongA (hWindow, 0))
-
 
 LRESULT CALLBACK
@@ -119 +117 @@
         } else if (ttnmdi.szText[0])
         {
-          lstrcpynAtoW (infoPtr->szTipText,ttnmdi.szText,80);
+          lstrcpynAtoW(infoPtr->szTipText,ttnmdi.szText,MIN(INFOTIPSIZE-1,lstrlenA(ttnmdi.szText)));
           if (ttnmdi.uFlags & TTF_DI_SETITEM)
           {
@@ -130 +128 @@
         {
           /* no text available */
-          infoPtr->szTipText[0] = L'\0';
+          infoPtr->szTipText[0] = '\0';
         } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA)
         {
-          lstrcpynAtoW(infoPtr->szTipText,ttnmdi.lpszText,INFOTIPSIZE);
+          lstrcpynAtoW(infoPtr->szTipText,ttnmdi.lpszText,MIN(INFOTIPSIZE-1,lstrlenA(ttnmdi.lpszText)));
           if (ttnmdi.uFlags & TTF_DI_SETITEM)
           {
@@ -149 +147 @@
       {
         /* the item is a usual (unicode) text */
-      lstrcpynW (infoPtr->szTipText,toolPtr->lpszText,INFOTIPSIZE);
+        lstrcpynW(infoPtr->szTipText,toolPtr->lpszText,MIN(INFOTIPSIZE-1,lstrlenW(toolPtr->lpszText)));
       }
     }
@@ -155 +153 @@
     {
       /* no text available */
-      infoPtr->szTipText[0] = L'\0';
+      infoPtr->szTipText[0] = '\0';
     }
 
@@ -206 +204 @@
 
 //    TRACE (tooltips, "Show tooltip pre %d!\n", infoPtr->nTool);
-
     TOOLTIPS_GetTipText(hwnd,infoPtr,infoPtr->nCurrentTool);
 
-    if (infoPtr->szTipText[0] == L'\0')
+    if (infoPtr->szTipText[0] == '\0')
     {
         infoPtr->nCurrentTool = -1;
@@ -316 +313 @@
     TOOLTIPS_GetTipText(hwnd,infoPtr,infoPtr->nTrackTool);
 
-    if (infoPtr->szTipText[0] == L'\0')
+    if (infoPtr->szTipText[0] == '\0')
     {
       infoPtr->nTrackTool = -1;
@@ -558 +555 @@
 TOOLTIPS_Activate (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
+    TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd);
 
     infoPtr->bActive = (BOOL)wParam;
@@ -572 +569 @@
 
 
-static LRESULT
-TOOLTIPS_AddToolA(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-    TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd);
-    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
-    TTTOOL_INFO *toolPtr;
-
-    if (lpToolInfo == NULL) return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) return FALSE;
-
-//    TRACE (tooltips, "add tool (%x) %x %d%s!\n",
-//         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;
-    } else
-    {
-      TTTOOL_INFO *oldTools = infoPtr->tools;
-
-      //CB: check if already exists!
-
-      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];
-    }
-
-    infoPtr->uNumTools++;
-
-    /* copy tool data */
-    toolPtr->uFlags = lpToolInfo->uFlags;
-    toolPtr->hwnd   = lpToolInfo->hwnd;
-    toolPtr->uId    = lpToolInfo->uId;
-    toolPtr->rect   = lpToolInfo->rect;
-    toolPtr->hinst  = lpToolInfo->hinst;
-
-    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0))
-    {
-//    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);
-      }
-    } else toolPtr->lpszText = NULL;
-
-    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
-        toolPtr->lParam = lpToolInfo->lParam;
-
-    /* install subclassing hook */
+static VOID TOOLTIPS_Subclass(HWND hwnd,TTTOOL_INFO *toolPtr)
+{
     if (toolPtr->uFlags & TTF_SUBCLASS)
     {
@@ -669 +606 @@
 //      TRACE (tooltips, "subclassing installed!\n");
     }
-
-    return TRUE;
-}
-
-
-static LRESULT
-TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
-    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
+}
+
+static VOID TOOLTIPS_Desubclass(TTTOOL_INFO *toolPtr)
+{
+    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");
+      }
+    }
+}
+
+static LRESULT
+TOOLTIPS_AddToolA(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+    TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd);
+    LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
     TTTOOL_INFO *toolPtr;
 
-    if (lpToolInfo == NULL)
-        return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
-        return FALSE;
+    if (lpToolInfo == NULL) return FALSE;
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) return FALSE;
 
 //    TRACE (tooltips, "add tool (%x) %x %d%s!\n",
@@ -690 +657 @@
 //         (lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
 
-    if (infoPtr->uNumTools == 0) {
-        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);
+    if (infoPtr->uNumTools == 0)
+    {
+      infoPtr->tools = COMCTL32_Alloc(sizeof(TTTOOL_INFO));
+      toolPtr = infoPtr->tools;
+    } else
+    {
+      TTTOOL_INFO *oldTools = infoPtr->tools;
+      INT x;
+
+      toolPtr = NULL;
+
+      //check if toolinfo already exists
+      for (x = 0;x < infoPtr->uNumTools;x++)
+      {
+        if (lpToolInfo->hwnd == infoPtr->tools[x].hwnd && lpToolInfo->uId == infoPtr->tools[x].uId)
+        {
+          //return toolPtr
+          toolPtr = &infoPtr->tools[x];
+          //free allocated memory
+          TOOLTIPS_Desubclass(toolPtr);
+          if ((toolPtr->hinst) && (toolPtr->lpszText))
+          {
+            if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(toolPtr->lpszText);
+          }
+
+          break;
+        }
+      }
+
+      if (toolPtr == NULL)
+      {
+        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];
+      }
+    }
+
+    infoPtr->uNumTools++;
+
+    /* copy tool data */
+    toolPtr->uFlags = lpToolInfo->uFlags;
+    toolPtr->hwnd   = lpToolInfo->hwnd;
+    toolPtr->uId    = lpToolInfo->uId;
+    toolPtr->rect   = lpToolInfo->rect;
+    toolPtr->hinst  = lpToolInfo->hinst;
+
+    if ((lpToolInfo->hinst) && (HIWORD((INT)lpToolInfo->lpszText) == 0))
+    {
+//    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);
+      }
+    } else toolPtr->lpszText = NULL;
+
+    if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
+        toolPtr->lParam = lpToolInfo->lParam;
+
+    /* install subclassing hook */
+    TOOLTIPS_Subclass(hwnd,toolPtr);
+
+    return TRUE;
+}
+
+
+static LRESULT
+TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
+    LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
+    TTTOOL_INFO *toolPtr;
+
+    if (lpToolInfo == NULL)
+        return FALSE;
+    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+        return FALSE;
+
+//    TRACE (tooltips, "add tool (%x) %x %d%s!\n",
+//         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;
+    } else
+    {
+      TTTOOL_INFO *oldTools = infoPtr->tools;
+      INT x;
+
+      toolPtr = NULL;
+
+      //check if toolinfo already exists
+      for (x = 0;x < infoPtr->uNumTools;x++)
+      {
+        if (lpToolInfo->hwnd == infoPtr->tools[x].hwnd && lpToolInfo->uId == infoPtr->tools[x].uId)
+        {
+          //return toolPtr
+          toolPtr = &infoPtr->tools[x];
+          //free allocated memory
+          TOOLTIPS_Desubclass(toolPtr);
+          if ((toolPtr->hinst) && (toolPtr->lpszText))
+          {
+            if (toolPtr->lpszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(toolPtr->lpszText);
+          }
+
+          break;
+        }
+      }
+
+      if (toolPtr == NULL)
+      {
+        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];
+      }
     }
 
@@ -735 +818 @@
 
     /* 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");
-    }
+    TOOLTIPS_Subclass(hwnd,toolPtr);
 
     return TRUE;
@@ -804 +852 @@
 
     /* 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");
-        }
-    }
+    TOOLTIPS_Desubclass(toolPtr);
 
     /* delete tool from tool list */
@@ -890 +909 @@
 
     /* 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");
-        }
-    }
+    TOOLTIPS_Desubclass(toolPtr);
 
     /* delete tool from tool list */
@@ -1443 +1433 @@
 //          TRACE (tooltips, "WM_MOUSEMOVE (%04x %ld %ld)\n",
 //                 hwnd, pt.x, pt.y);
-infoPtr->bActive = TRUE;//CB: somewhere reset, find it!!!
+
             if (infoPtr->bActive && (infoPtr->nTool != infoPtr->nOldTool))
             {
@@ -1855 +1845 @@
 
     /* initialize info structure */
+    infoPtr->szTipText[0] = '\0';
     infoPtr->bActive = TRUE;
     infoPtr->bTrackActive = FALSE;
     infoPtr->clrBk   = GetSysColor(COLOR_INFOBK);
     infoPtr->clrText = GetSysColor(COLOR_INFOTEXT);
+    infoPtr->xTrackPos = 0;
+    infoPtr->yTrackPos = 0;
 
     nclm.cbSize = sizeof(NONCLIENTMETRICSA);
@@ -1910 +1903 @@
 
         /* 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);
-          }
-        }
+        TOOLTIPS_Desubclass(toolPtr);
+
       }
       COMCTL32_Free (infoPtr->tools);
@@ -2079 +2058 @@
     if(wParam < length)
     {
-        lstrcpynWtoA((LPSTR)lParam, infoPtr->szTipText,(UINT)wParam);
+        lstrcpynWtoA((LPSTR)lParam,infoPtr->szTipText,MIN((UINT)wParam,lstrlenW(infoPtr->szTipText)));
         return wParam;
     }
-    lstrcpyWtoA((LPSTR)lParam, infoPtr->szTipText);
+    lstrcpyWtoA((LPSTR)lParam,infoPtr->szTipText);
     return length;
 
@@ -2093 +2072 @@
 
 //    TRACE (tooltips, "timer %d (%x) expired!\n", wParam, hwnd);
-
     switch (wParam)
     {
       case ID_TIMERSHOW:
-          KillTimer (hwnd,ID_TIMERSHOW);
+          KillTimer(hwnd,ID_TIMERSHOW);
           if (TOOLTIPS_CheckTool(hwnd,TRUE) == infoPtr->nTool)
               TOOLTIPS_Show(hwnd,infoPtr);
@@ -2116 +2094 @@
           break;
     }
+
     return 0;
 }

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.8 1999-06-26 14:20:32 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.9 1999-06-28 15:46:28 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -1384 +1384 @@
   j = hi;
   x = list[(lo+hi)/2];
-  while (i <= j)
+  do
   {
     while (list[i] < x) i++;
@@ -1396 +1396 @@
       j--;
     }
-  }
+  } while (i <= j);
   if (lo < j) TRACKBAR_QuickSort(list,lo,j);
   if (i < hi) TRACKBAR_QuickSort(list,i,hi);

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.5 1999-06-23 19:45:02 achimha Exp $ */
+/* $Id: treeview.c,v 1.6 1999-06-28 15:46:28 cbratschi Exp $ */
 /* Treeview control
  *
@@ -894 +894 @@
   if (tvItem->mask & TVIF_TEXT) {
                 if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) {
-        len=lstrlenA (tvItem->pszText);
-        if (len>wineItem->cchTextMax)
-                        wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
+        len = lstrlenA (tvItem->pszText);
+        if (len > wineItem->cchTextMax)
+                        wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, len+1);
         lstrcpynA (wineItem->pszText, tvItem->pszText,len);
                 } else {
@@ -903 +903 @@
                                 wineItem->cchTextMax=0;
                         }
-                wineItem->pszText=LPSTR_TEXTCALLBACKA;
+                wineItem->pszText = LPSTR_TEXTCALLBACKA;
                 }
    }
@@ -1166 +1166 @@
         }
         else if (wineItem->pszText) {
-            lstrcpynA (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
+            lstrcpynA (tvItem->pszText, wineItem->pszText, MIN(tvItem->cchTextMax,lstrlenA(wineItem->pszText)));
         }
    }