Changeset 10538 for trunk/src

Timestamp:

Mar 17, 2004, 5:59:41 PM (21 years ago)

Author:

sandervl

Message:

put back old version

File:

• trunk/src/comctl32/toolbar.c (modified) (179 diffs)

trunk/src/comctl32/toolbar.c

@@ -19 +19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * NOTES
- *
  *  Differences between MSDN and actual native control operation:
  *   1. MSDN says: "TBSTYLE_LIST: Creates a flat toolbar with button text
@@ -30 +28 @@
  *      *not* imply TBSTYLE_FLAT as documented.  (GA 8/2001)
  *
- * This code was audited for completeness against the documented features
- * of Comctl32.dll version 6.0 on Mar. 14, 2004, by Robert Shearman.
- * 
- * Unless otherwise noted, we believe this code to be complete, as per
- * the specification mentioned above.
- * If you discover missing features or bugs please note them below.
- * 
+ *
  * TODO:
  *   - Button wrapping (under construction).
- *   - Messages:
- *     - TB_GETINSERTMARK
- *     - TB_GETINSERTMARKCOLOR
- *     - TB_GETMETRICS
- *     - TB_GETOBJECT
- *     - TB_INSERTMARKHITTEST
- *     - TB_MOVEBUTTON
- *     - TB_SETINSERTMARK
- *     - TB_SETMETRICS
- *   - Notifications:
- *     - NM_CHAR
- *     - NM_KEYDOWN
- *     - NM_LDOWN
- *     - NM_RCLICK
- *     - NM_RDBLCLICK
- *     - TBN_DELETINGBUTTON
- *     - TBN_DRAGOUT
- *     - TBN_GETOBJECT
- *     - TBN_RESTORE
- *     - TBN_SAVE
- *     - TBN_TOOLBARCHANGE
+ *   - Messages.
+ *   - Notifications (under construction).
  *   - Fix TB_SETROWS.
+ *   - Tooltip support (almost complete).
+ *   - Unicode suppport (under construction).
  *   - Fix TOOLBAR_SetButtonInfo32A/W.
- *   - iListGap custom draw support.
+ *   - TBSTYLE_AUTOSIZE for toolbar and buttons.
+ *   - I_IMAGECALLBACK support.
+ *   - iString of -1 is undocumented
  *   - Customization dialog:
+ *      - Add flat look.
  *      - Minor buglet in 'available buttons' list:
- *        Buttons are not listed in MS-like order. MS seems to use a single
+ *        Buttons are not listed in M$-like order. M$ seems to use a single
  *        internal list to store the button information of both listboxes.
  *      - Drag list support.
+ *      - Help and Reset button support.
  *
  * Testing:
@@ -80 +59 @@
  */
 
-#include <stdarg.h>
 #include <string.h>
 
+#include "winbase.h"
 #include "windef.h"
-#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/unicode.h"
-#include "winnls.h"
 #include "commctrl.h"
 #include "imagelist.h"
@@ -128 +105 @@
     INT      nHeight;        /* height of the toolbar */
     INT      nWidth;         /* width of the toolbar */
-    RECT     client_rect;
     INT      nButtonHeight;
     INT      nButtonWidth;
@@ -151 +127 @@
     DWORD    dwItemCDFlag;    /* TBCDRF_ flags from last ITEMPREPAINT    */
     SIZE     szPadding;       /* padding values around button */
-    INT      iListGap;        /* default gap between text and image for toolbar with list style */
     HFONT    hDefaultFont;
     HFONT    hFont;           /* text font */
@@ -178 +153 @@
     RECT     rcBound;         /* bounding rectangle */
     INT      iVersion;
-    LPWSTR   pszTooltipText;    /* temporary store for a string > 80 characters
-                                 * for TTN_GETDISPINFOW notification */
+
     TBUTTON_INFO *buttons;      /* pointer to button array */
     LPWSTR       *strings;      /* pointer to string array */
@@ -201 +175 @@
 } CUSTOMBUTTON, *PCUSTOMBUTTON;
 
-typedef enum
-{
-    IMAGE_LIST_DEFAULT,
-    IMAGE_LIST_HOT,
-    IMAGE_LIST_DISABLED
-} IMAGE_LIST_TYPE;
 
 #define SEPARATOR_WIDTH    8
@@ -212 +180 @@
 #define BOTTOM_BORDER      2
 #define DDARROW_WIDTH      11
-#define ARROW_HEIGHT       3
-
-/* gap between border of button and text/image */
-#define OFFSET_X 1
-#define OFFSET_Y 1
-/* how wide to treat the bitmap if it isn't present */
-#define LIST_IMAGE_ABSENT_WIDTH 2
 
 #define TOOLBAR_GetInfoPtr(hwnd) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
 #define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE)
 #define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE)
-
-#ifdef __WIN32OS2__
-static inline const char *wine_dbgstr_rect( const RECT *rect )
-{
-    return "rect (null)";
-}
-#endif
-
-static inline int TOOLBAR_GetListTextOffset(TOOLBAR_INFO *infoPtr, INT iListGap)
-{
-    return GetSystemMetrics(SM_CXEDGE) + iListGap - infoPtr->szPadding.cx/2;
-}
 
 /* Used to find undocumented extended styles */
@@ -406 +355 @@
 
 /***********************************************************************
-*               TOOLBAR_GetImageListForDrawing
+*               TOOLBAR_DrawImageList
 *
 * This function validates the bitmap index (including I_IMAGECALLBACK
-* functionality) and returns the corresponding image list.
-*/
-static HIMAGELIST
-TOOLBAR_GetImageListForDrawing (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, IMAGE_LIST_TYPE imagelist, INT * index)
-{
-    HIMAGELIST himl;
-
-    if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
-        if (btnPtr->iBitmap == I_IMAGENONE) return NULL;
-        ERR("index %d,%d is not valid, max %d\n",
-            HIWORD(btnPtr->iBitmap), LOWORD(btnPtr->iBitmap), infoPtr->nNumBitmaps);
-        return NULL;
-    }
-
-    if ((*index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) {
-        if ((*index == I_IMAGECALLBACK) ||
-            (*index == I_IMAGENONE)) return NULL;
-        ERR("TBN_GETDISPINFO returned invalid index %d\n",
-            *index);
-        return NULL;
-    }
-
-    switch(imagelist)
-    {
-    case IMAGE_LIST_DEFAULT:
-        himl = GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr, btnPtr->iBitmap));
-        break;
-    case IMAGE_LIST_HOT:
-        himl = GETHOTIMAGELIST(infoPtr, GETHIMLID(infoPtr, btnPtr->iBitmap));
-        break;
-    case IMAGE_LIST_DISABLED:
-        himl = GETDISIMAGELIST(infoPtr, GETHIMLID(infoPtr, btnPtr->iBitmap));
-        break;
-    default:
-        himl = NULL;
-        FIXME("Shouldn't reach here\n");
-    }
-
-    if (!himl)
-       TRACE("no image list\n");
-
-    return himl;
-}
-
-
-/***********************************************************************
-*               TOOLBAR_TestImageExist
-*
-* This function is similar to TOOLBAR_GetImageListForDrawing, except it does not
-* return the image list. The I_IMAGECALLBACK functionality is implemented.
+* functionality). It then draws the image via the ImageList_Draw
+* function. It returns TRUE if the image was drawn, FALSE otherwise.
 */
 static BOOL
-TOOLBAR_TestImageExist (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HIMAGELIST himl)
+TOOLBAR_DrawImageList (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HIMAGELIST himl,
+                        HDC hdc, UINT left, UINT top, UINT draw_flags)
 {
     INT index;
@@ -481 +383 @@
         return FALSE;
     }
+    TRACE("drawing index=%d, himl=%p, left=%d, top=%d, flags=%08x\n",
+          index, himl, left, top, draw_flags);
+
+    ImageList_Draw (himl, index, hdc, left, top, draw_flags);
+    return TRUE;
+}
+
+
+/***********************************************************************
+*               TOOLBAR_TestImageExist
+*
+* This function is similar to TOOLBAR_DrawImageList, except it does not
+* draw the image. The I_IMAGECALLBACK functionality is implemented.
+*/
+static BOOL
+TOOLBAR_TestImageExist (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HIMAGELIST himl)
+{
+    INT index;
+
+    if (!himl) return FALSE;
+
+    if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+        if (btnPtr->iBitmap == I_IMAGENONE) return FALSE;
+        ERR("index %d is not valid, max %d\n",
+            btnPtr->iBitmap, infoPtr->nNumBitmaps);
+        return FALSE;
+    }
+
+    if ((index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) {
+        if ((index == I_IMAGECALLBACK) ||
+            (index == I_IMAGENONE)) return FALSE;
+        ERR("TBN_GETDISPINFO returned invalid index %d\n",
+            index);
+        return FALSE;
+    }
     return TRUE;
 }
@@ -516 +453 @@
 *               TOOLBAR_DrawDDFlatSeparator
 *
-* This function draws the separator that was flagged as BTNS_DROPDOWN.
+* This function draws the separator that was flaged as TBSTYLE_DROPDOWN.
 * In this case, the separator is a pixel high line of COLOR_BTNSHADOW,
 * followed by a pixel high line of COLOR_BTNHIGHLIGHT. These separators
@@ -558 +495 @@
 
 static void
-TOOLBAR_DrawArrow (HDC hdc, INT left, INT top, COLORREF clr)
+TOOLBAR_DrawArrow (HDC hdc, INT left, INT top, INT colorRef)
 {
     INT x, y;
     HPEN hPen, hOldPen;
 
-    if (!(hPen = CreatePen( PS_SOLID, 1, clr))) return;
+    if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return;
     hOldPen = SelectObject ( hdc, hPen );
     x = left + 2;
-    y = top;
+    y = top + 8;
     MoveToEx (hdc, x, y, NULL);
     LineTo (hdc, x+5, y++); x++;
@@ -584 +521 @@
  */
 static void
-TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, RECT *rcText, LPWSTR lpText,
-                    NMTBCUSTOMDRAW *tbcd)
-{
-    HDC hdc = tbcd->nmcd.hdc;
+TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
+                    HDC hdc, INT nState, DWORD dwStyle,
+                    RECT *rcText, LPWSTR lpText, NMTBCUSTOMDRAW *tbcd)
+{
     HFONT  hOldFont = 0;
     COLORREF clrOld = 0;
-    COLORREF clrOldBk = 0;
-    int oldBkMode = 0;
-    UINT state = tbcd->nmcd.uItemState;
 
     /* draw text */
     if (lpText) {
-        TRACE("string=%s rect=(%ld,%ld)-(%ld,%ld)\n", debugstr_w(lpText),
+        TRACE("string rect=(%ld,%ld)-(%ld,%ld)\n",
               rcText->left, rcText->top, rcText->right, rcText->bottom);
 
         hOldFont = SelectObject (hdc, infoPtr->hFont);
-        if ((state & CDIS_HOT) && (infoPtr->dwItemCDFlag & TBCDRF_HILITEHOTTRACK )) {
-            clrOld = SetTextColor (hdc, tbcd->clrTextHighlight);
-        }
-        else if (state & CDIS_DISABLED) {
+        if (!(nState & TBSTATE_ENABLED)) {
             clrOld = SetTextColor (hdc, tbcd->clrBtnHighlight);
             OffsetRect (rcText, 1, 1);
@@ -610 +541 @@
             OffsetRect (rcText, -1, -1);
         }
-        else if (state & CDIS_INDETERMINATE) {
+        else if (nState & TBSTATE_INDETERMINATE) {
             clrOld = SetTextColor (hdc, comctl32_color.clr3dShadow);
         }
-        else if ((state & CDIS_MARKED) && !(infoPtr->dwItemCDFlag & TBCDRF_NOMARK)) {
+        else if (btnPtr->bHot && (infoPtr->dwItemCDFlag & TBCDRF_HILITEHOTTRACK )) {
             clrOld = SetTextColor (hdc, tbcd->clrTextHighlight);
-            clrOldBk = SetBkColor (hdc, tbcd->clrMark);
-            oldBkMode = SetBkMode (hdc, OPAQUE); /* FIXME: should this be in the NMTBCUSTOMDRAW structure? */
         }
         else {
@@ -624 +553 @@
         DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags);
         SetTextColor (hdc, clrOld);
-        if ((state & CDIS_MARKED) && !(infoPtr->dwItemCDFlag & TBCDRF_NOMARK))
-        {
-            SetBkColor (hdc, clrOldBk);
-            SetBkMode (hdc, oldBkMode);
-        }
         SelectObject (hdc, hOldFont);
     }
@@ -635 +559 @@
 
 static void
-TOOLBAR_DrawPattern (LPRECT lpRect, NMTBCUSTOMDRAW *tbcd)
-{
-    HDC hdc = tbcd->nmcd.hdc;
-    HBRUSH hbr = SelectObject (hdc, tbcd->hbrMonoDither);
-    COLORREF clrTextOld;
-    COLORREF clrBkOld;
+TOOLBAR_DrawPattern (HDC hdc, LPRECT lpRect)
+{
+    HBRUSH hbr = SelectObject (hdc, COMCTL32_hPattern55AABrush);
     INT cx = lpRect->right - lpRect->left;
     INT cy = lpRect->bottom - lpRect->top;
-    clrTextOld = SetTextColor(hdc, tbcd->clrBtnHighlight);
-    clrBkOld = SetBkColor(hdc, tbcd->clrBtnFace);
-    PatBlt (hdc, lpRect->left, lpRect->top, cx, cy, PATCOPY);
-    SetBkColor(hdc, clrBkOld);
-    SetTextColor(hdc, clrTextOld);
+    PatBlt (hdc, lpRect->left, lpRect->top, cx, cy, 0x00FA0089);
     SelectObject (hdc, hbr);
 }
 
 
-static void TOOLBAR_DrawMasked(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-                               HDC hdc, INT x, INT y)
+static void
+TOOLBAR_DrawMasked (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
+                    HDC hdc, INT x, INT y)
 {
     HIMAGELIST himl = GETDEFIMAGELIST(infoPtr, 0);
-
-    if (himl)
-    {
-        INT cx, cy;
-        HBITMAP hbmMask, hbmImage;
-        HDC hdcMask, hdcImage;
-
-        ImageList_GetIconSize(himl, &cx, &cy);
-
-        /* Create src image */
-        hdcImage = CreateCompatibleDC(hdc);
-        hbmImage = CreateBitmap(cx, cy, GetDeviceCaps(hdc,PLANES),
-                                GetDeviceCaps(hdc,BITSPIXEL), NULL);
-        SelectObject(hdcImage, hbmImage);
-        ImageList_DrawEx(himl, btnPtr->iBitmap, hdcImage, 0, 0, cx, cy,
-                         RGB(0xff, 0xff, 0xff), RGB(0,0,0), ILD_NORMAL);
-
-        /* Create Mask */
-        hdcMask = CreateCompatibleDC(0);
-        hbmMask = CreateBitmap(cx, cy, 1, 1, NULL);
-        SelectObject(hdcMask, hbmMask);
-
-        /* Remove the background and all white pixels */
-        SetBkColor(hdcImage, ImageList_GetBkColor(himl));
-        BitBlt(hdcMask, 0, 0, cx, cy, hdcImage, 0, 0, SRCCOPY);
-        SetBkColor(hdcImage, RGB(0xff, 0xff, 0xff));
-        BitBlt(hdcMask, 0, 0, cx, cy, hdcImage, 0, 0, NOTSRCERASE);
-
-        /* draw the new mask 'etched' to hdc */
-        SetBkColor(hdc, RGB(255, 255, 255));
-        SelectObject(hdc, GetSysColorBrush(COLOR_3DHILIGHT));
-        BitBlt(hdc, x + 1, y + 1, cx, cy, hdcMask, 0, 0, 0xE20746);
-        SelectObject(hdc, GetSysColorBrush(COLOR_3DSHADOW));
-        BitBlt(hdc, x, y, cx, cy, hdcMask, 0, 0, 0xE20746);
-
-        /* Cleanup */
-        DeleteObject(hbmImage);
-        DeleteDC(hdcImage);
-        DeleteObject (hbmMask);
-        DeleteDC(hdcMask);
-    }
+    INT cx, cy;
+    HBITMAP hbmMask;
+    HDC hdcMask;
+
+    if (!himl)
+        return;
+
+    ImageList_GetIconSize(himl, &cx, &cy);
+
+    /* create new dc's */
+    hdcMask = CreateCompatibleDC (0);
+
+    /* create new bitmap */
+    hbmMask = CreateBitmap (cx, cy, 1, 1, NULL);
+    SelectObject (hdcMask, hbmMask);
+
+    /* copy the mask bitmap */
+    ImageList_DrawEx(himl, btnPtr->iBitmap, hdcMask, 0, 0, 0, 0, RGB(255, 255, 255), RGB(0, 0, 0), ILD_MASK);
+
+    /* draw the new mask */
+    SelectObject (hdc, GetSysColorBrush (COLOR_3DHILIGHT));
+    BitBlt (hdc, x+1, y+1, cx, cy, hdcMask, 0, 0, 0xB8074A);
+
+    SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
+    BitBlt (hdc, x, y, cx, cy, hdcMask, 0, 0, 0xB8074A);
+
+    DeleteObject (hbmMask);
+    DeleteDC (hdcMask);
 }
 
@@ -716 +621 @@
 }
 
-/* draws the image on a toolbar button */
-static void
-TOOLBAR_DrawImage(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, INT left, INT top, const NMTBCUSTOMDRAW *tbcd)
-{
-    HIMAGELIST himl = NULL;
-    BOOL draw_masked = FALSE;
-    INT index;
-    INT offset = 0;
-    UINT draw_flags = ILD_NORMAL;
-
-    if (tbcd->nmcd.uItemState & (CDIS_DISABLED | CDIS_INDETERMINATE))
-    {
-        himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DISABLED, &index);
-        if (!himl)
-           draw_masked = TRUE;
-    }
-    else if ((tbcd->nmcd.uItemState & CDIS_HOT) && (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & TBSTYLE_FLAT))
-    {
-        /* if hot, attempt to draw with hot image list, if fails, 
-           use default image list */
-        himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_HOT, &index);
-        if (!himl)
-            himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DEFAULT, &index);
-        }
-    else
-        himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DEFAULT, &index);
-
-    if (!(infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) && 
-        (tbcd->nmcd.uItemState & (CDIS_SELECTED | CDIS_CHECKED)))
-        offset = 1;
-
-    if (!(infoPtr->dwItemCDFlag & TBCDRF_NOMARK) &&
-        (tbcd->nmcd.uItemState & CDIS_MARKED))
-        draw_flags |= ILD_BLEND50;
-
-    TRACE("drawing index=%d, himl=%p, left=%d, top=%d, offset=%d\n",
-      index, himl, left, top, offset);
-
-    if (draw_masked)
-        TOOLBAR_DrawMasked (infoPtr, btnPtr, tbcd->nmcd.hdc, left + offset, top + offset);
-    else if (himl)
-        ImageList_Draw (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags);
-}
-
-/* draws a blank frame for a toolbar button */
-static void
-TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, BOOL flat, const NMTBCUSTOMDRAW *tbcd)
-{
-    HDC hdc = tbcd->nmcd.hdc;
-    RECT rc = tbcd->nmcd.rc;
-    /* if the state is disabled or indeterminate then the button
-     * cannot have an interactive look like pressed or hot */
-    BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) ||
-                                 (tbcd->nmcd.uItemState & CDIS_INDETERMINATE);
-    BOOL pressed_look = !non_interactive_state &&
-                        ((tbcd->nmcd.uItemState & CDIS_SELECTED) || 
-                         (tbcd->nmcd.uItemState & CDIS_CHECKED));
-
-    /* app don't want us to draw any edges */
-    if (infoPtr->dwItemCDFlag & TBCDRF_NOEDGES)
-        return;
-
-    if (flat)
-    {
-        if (pressed_look)
-            DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT);
-        else if ((tbcd->nmcd.uItemState & CDIS_HOT) && !non_interactive_state)
-            DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT);
-    }
-    else
-    {
-        if (pressed_look)
-            DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE);
-        else
-            DrawEdge (hdc, &rc, EDGE_RAISED,
-              BF_SOFT | BF_RECT | BF_MIDDLE);
-    }
-}
-
-static void
-TOOLBAR_DrawSepDDArrow(const TOOLBAR_INFO *infoPtr, BOOL flat, const NMTBCUSTOMDRAW *tbcd, RECT *rcArrow)
-{
-    HDC hdc = tbcd->nmcd.hdc;
-    int offset = 0;
-
-    if (flat)
-    {
-        if ((tbcd->nmcd.uItemState & CDIS_SELECTED) || (tbcd->nmcd.uItemState & CDIS_CHECKED))
-            DrawEdge (hdc, rcArrow, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
-        else if ( (tbcd->nmcd.uItemState & CDIS_HOT) &&
-                 !(tbcd->nmcd.uItemState & CDIS_DISABLED) &&
-                 !(tbcd->nmcd.uItemState & CDIS_INDETERMINATE))
-            DrawEdge (hdc, rcArrow, BDR_RAISEDINNER, BF_RECT);
-    }
-    else
-    {
-        if ((tbcd->nmcd.uItemState & CDIS_SELECTED) || (tbcd->nmcd.uItemState & CDIS_CHECKED))
-            DrawEdge (hdc, rcArrow, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
-        else
-            DrawEdge (hdc, rcArrow, EDGE_RAISED,
-              BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-    }
-
-    if (tbcd->nmcd.uItemState & (CDIS_SELECTED | CDIS_CHECKED))
-        offset = (infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) ? 0 : 1;
-
-    if (tbcd->nmcd.uItemState & (CDIS_DISABLED | CDIS_INDETERMINATE))
-    {
-        TOOLBAR_DrawArrow(hdc, rcArrow->left+1, rcArrow->top+1 + (rcArrow->bottom - rcArrow->top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnHighlight);
-        TOOLBAR_DrawArrow(hdc, rcArrow->left, rcArrow->top + (rcArrow->bottom - rcArrow->top - ARROW_HEIGHT) / 2, comctl32_color.clr3dShadow);
-    }
-    else
-        TOOLBAR_DrawArrow(hdc, rcArrow->left + offset, rcArrow->top + offset + (rcArrow->bottom - rcArrow->top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnText);
-}
-
-/* draws a complete toolbar button */
+
 static void
 TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc)
@@ -837 +627 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
-    BOOL hasDropDownArrow = (TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) &&
-                            (btnPtr->fsStyle & BTNS_DROPDOWN)) ||
-                            (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN);
-    BOOL drawSepDropDownArrow = hasDropDownArrow && 
-                                (~btnPtr->fsStyle & BTNS_WHOLEDROPDOWN);
-    RECT rc, rcArrow, rcBitmap, rcText;
+    BOOL hasDropDownArrow = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) &&
+                            (btnPtr->fsStyle & TBSTYLE_DROPDOWN);
+    RECT rc, rcArrow, rcBitmap, rcText, rcFill;
     LPWSTR lpText = NULL;
     NMTBCUSTOMDRAW tbcd;
     DWORD ntfret;
     INT offset;
+    HIMAGELIST himlDef;
+
+    if (btnPtr->fsState & TBSTATE_HIDDEN)
+        return;
 
     rc = btnPtr->rect;
+    CopyRect (&rcFill, &rc);
     CopyRect (&rcArrow, &rc);
     CopyRect(&rcBitmap, &rc);
+    CopyRect(&rcText, &rc);
 
     /* get a pointer to the text */
@@ -857 +650 @@
     if (hasDropDownArrow)
     {
-        int right;
-
-        if (dwStyle & TBSTYLE_FLAT)
-            right = max(rc.left, rc.right - DDARROW_WIDTH);
-        else
-            right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
-
-        if (drawSepDropDownArrow)
-           rc.right = right;
-
-        rcArrow.left = right;
-    }
-
-    /* copy text rect after adjusting for drop-down arrow
-     * so that text is centred in the rectangle not containing
-     * the arrow */
-    CopyRect(&rcText, &rc);
+        if (dwStyle & TBSTYLE_FLAT)
+            rc.right = max(rc.left, rc.right - DDARROW_WIDTH);
+        else
+            rc.right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
+        rcArrow.left = rc.right;
+    }
 
     /* Center the bitmap horizontally and vertically */
     if (dwStyle & TBSTYLE_LIST)
-        rcBitmap.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
+        rcBitmap.left += 3;
     else
-        rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
+        rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
 
     if(lpText)
-        rcBitmap.top+= GetSystemMetrics(SM_CYEDGE) + OFFSET_Y;
+        rcBitmap.top+=2; /* this looks to be the correct value from vmware comparison - cmm */
     else
         rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
 
     TRACE("iBitmap: %d, start=(%ld,%ld) w=%d, h=%d\n",
-      btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
-      infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+          btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
+          infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
     TRACE ("iString: %x\n", btnPtr->iString);
     TRACE ("Stringtext: %s\n", debugstr_w(lpText));
@@ -894 +676 @@
     /* draw text */
     if (lpText) {
-        rcText.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
-        rcText.right -= GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
-        if (GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr,btnPtr->iBitmap)) &&
-                TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        {
-            if (dwStyle & TBSTYLE_LIST)
-                rcText.left += infoPtr->nBitmapWidth + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap);
-            else
-                rcText.top += GetSystemMetrics(SM_CYEDGE) + OFFSET_Y + infoPtr->nBitmapHeight + infoPtr->szPadding.cy/2;
-        }
-        else
-            if (dwStyle & TBSTYLE_LIST)
-                rcText.left += LIST_IMAGE_ABSENT_WIDTH + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap);
-
-        if (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
-            OffsetRect (&rcText, 1, 1);
-    }
-
-    /* Initialize fields in all cases, because we use these later
-     * NOTE: applications can and do alter these to customize their
-     * toolbars */
+
+        InflateRect (&rcText, -3, -3);
+
+        if (GETDEFIMAGELIST(infoPtr, 0) &&
+            TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+                /* The following test looked like this before
+                 * I changed it. IE4 "Links" toolbar would not
+                 * draw correctly with the original code.  - GA 8/01
+                 *   ((dwStyle & TBSTYLE_LIST) &&
+                 *    ((btnPtr->fsStyle & TBSTYLE_AUTOSIZE) == 0) &&
+                 *       (btnPtr->iBitmap != I_IMAGENONE))
+                 */
+                if (dwStyle & TBSTYLE_LIST) {
+                    /* LIST style w/ ICON offset is by matching native. */
+                    /* Matches IE4 "Links" bar.   - GA 8/01             */
+                    rcText.left += (infoPtr->nBitmapWidth + 2);
+                }
+                else {
+                    rcText.top += infoPtr->nBitmapHeight + 1;
+                }
+        }
+        else {
+                if (dwStyle & TBSTYLE_LIST) {
+                    /* LIST style w/o ICON offset is by matching native. */
+                    /* Matches IE4 "menu" bar.   - GA  8/01              */
+                    rcText.left += 4;
+                }
+        }
+
+        if (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
+            OffsetRect (&rcText, 1, 1);
+    }
+
+    /* Initialize fields in all cases, because we use these later */
     ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
     tbcd.clrText = comctl32_color.clrBtnText;
@@ -924 +719 @@
     tbcd.nStringBkMode = (infoPtr->bBtnTranspnt) ? TRANSPARENT : OPAQUE;
     tbcd.nHLStringBkMode = (infoPtr->bBtnTranspnt) ? TRANSPARENT : OPAQUE;
-    /* MSDN says that this is the text rectangle.
-     * But (why always a but) tracing of v5.7 of native shows
-     * that this is really a *relative* rectangle based on the
-     * the nmcd.rc. Also the left and top are always 0 ignoring
-     * any bitmap that might be present. */
+    /* MSDN says that this is the text rectangle.              */
+    /* But (why always a but) tracing of v5.7 of native shows  */
+    /* that this is really a *relative* rectangle based on the */
+    /* the nmcd.rc. Also the left and top are always 0 ignoring*/
+    /* any bitmap that might be present.                       */
     tbcd.rcText.left = 0;
     tbcd.rcText.top = 0;
     tbcd.rcText.right = rcText.right - rc.left;
     tbcd.rcText.bottom = rcText.bottom - rc.top;
-    tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr);
-    tbcd.nmcd.hdc = hdc;
-    tbcd.nmcd.rc = rc;
-    tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush;
-
-    /* FIXME: what are these used for? */
+
+    /* FIXME: what should these be set to ????? */
+    tbcd.hbrMonoDither = 0;
     tbcd.hbrLines = 0;
     tbcd.hpenLines = 0;
@@ -948 +740 @@
     {
         tbcd.nmcd.dwDrawStage = CDDS_ITEMPREPAINT;
+        tbcd.nmcd.hdc = hdc;
+        tbcd.nmcd.rc = rc;
         tbcd.nmcd.dwItemSpec = btnPtr->idCommand;
+        tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr);
         tbcd.nmcd.lItemlParam = btnPtr->dwData;
         ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
-        /* reset these fields so the user can't alter the behaviour like native */
-        tbcd.nmcd.hdc = hdc;
-        tbcd.nmcd.rc = rc;
-
         infoPtr->dwItemCustDraw = ntfret & 0xffff;
         infoPtr->dwItemCDFlag = ntfret & 0xffff0000;
@@ -964 +755 @@
     }
 
+    if (!infoPtr->bBtnTranspnt)
+        FillRect( hdc, &rcFill, GetSysColorBrush(COLOR_BTNFACE));
+
     /* separator */
-    if (btnPtr->fsStyle & BTNS_SEP) {
+    if (btnPtr->fsStyle & TBSTYLE_SEP) {
         /* with the FLAT style, iBitmap is the width and has already */
         /* been taken into consideration in calculating the width    */
@@ -972 +766 @@
         /* when drawing the vertical bar...      */
         if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) {
-            if (btnPtr->fsStyle & BTNS_DROPDOWN)
+            if (btnPtr->fsStyle & TBSTYLE_DROPDOWN)
                 TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr, infoPtr);
             else
                 TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr);
         }
-        else if (btnPtr->fsStyle != BTNS_SEP) {
+        else if (btnPtr->fsStyle != TBSTYLE_SEP) {
             FIXME("Draw some kind of separator: fsStyle=%x\n",
                   btnPtr->fsStyle);
@@ -984 +778 @@
     }
 
-    if (!(tbcd.nmcd.uItemState & CDIS_HOT) && 
-        ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE)))
-        TOOLBAR_DrawPattern (&rc, &tbcd);
-
-    if ((dwStyle & TBSTYLE_FLAT) && (tbcd.nmcd.uItemState & CDIS_HOT))
+    /* Determine index of image list */
+    himlDef = GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr, btnPtr->iBitmap));
+
+    /* disabled */
+    if (!(btnPtr->fsState & TBSTATE_ENABLED)) {
+        HIMAGELIST himlDis = GETDISIMAGELIST(infoPtr, GETHIMLID(infoPtr, btnPtr->iBitmap));
+        if (!(dwStyle & TBSTYLE_FLAT) && !(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+        {
+            DrawEdge (hdc, &rc, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+            if (hasDropDownArrow)
+            DrawEdge (hdc, &rcArrow, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+        }
+
+        if (hasDropDownArrow)
+        {
+            TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top+1, COLOR_3DHIGHLIGHT);
+            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_3DSHADOW);
+        }
+
+        if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDis,
+                                   hdc, rcBitmap.left, rcBitmap.top,
+                                   ILD_NORMAL))
+            TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
+    }
+
+    /* pressed TBSTYLE_BUTTON */
+    if (btnPtr->fsState & TBSTATE_PRESSED) {
+        offset = (infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) ? 0 : 1;
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+        {
+            if (dwStyle & TBSTYLE_FLAT)
+            {
+                DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+                if (hasDropDownArrow)
+                    DrawEdge (hdc, &rcArrow, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+            }
+            else
+            {
+                DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+                if (hasDropDownArrow)
+                    DrawEdge (hdc, &rcArrow, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+            }
+        }
+
+        if (hasDropDownArrow)
+            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
+
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
+                               hdc, rcBitmap.left+offset, rcBitmap.top+offset,
+                               ILD_NORMAL);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
+    }
+
+    /* checked TBSTYLE_CHECK */
+    if ((btnPtr->fsStyle & TBSTYLE_CHECK) &&
+        (btnPtr->fsState & TBSTATE_CHECKED)) {
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+        {
+            if (dwStyle & TBSTYLE_FLAT)
+                DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
+                          BF_RECT | BF_ADJUST);
+            else
+                DrawEdge (hdc, &rc, EDGE_SUNKEN,
+                          BF_RECT | BF_MIDDLE | BF_ADJUST);
+        }
+
+        TOOLBAR_DrawPattern (hdc, &rc);
+
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
+                               hdc, rcBitmap.left+1, rcBitmap.top+1,
+                               ILD_NORMAL);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
+    }
+
+    /* indeterminate */
+    if (btnPtr->fsState & TBSTATE_INDETERMINATE) {
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+            DrawEdge (hdc, &rc, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        TOOLBAR_DrawPattern (hdc, &rc);
+        TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
+    }
+
+    /* normal state */
+    if (dwStyle & TBSTYLE_FLAT)
     {
-        if ( infoPtr->dwItemCDFlag & TBCDRF_HILITEHOTTRACK )
-        {
-            COLORREF oldclr;
-
-            oldclr = SetBkColor(hdc, tbcd.clrHighlightHotTrack);
-            ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rc, NULL, 0, 0);
+        if (btnPtr->bHot)
+        {
+            if ( infoPtr->dwItemCDFlag & TBCDRF_HILITEHOTTRACK )
+            {
+                COLORREF oldclr;
+
+                oldclr = SetBkColor(hdc, tbcd.clrHighlightHotTrack);
+                ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rc, NULL, 0, 0);
+                if (hasDropDownArrow)
+                    ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rcArrow, NULL, 0, 0);
+                SetBkColor(hdc, oldclr);
+            }
+            else
+            {
+                if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+                {
+                    DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT);
+                    if (hasDropDownArrow)
+                        DrawEdge (hdc, &rcArrow, BDR_RAISEDINNER, BF_RECT);
+                }
+            }
+        }
+#if 1
+        else /* The following code needs to be removed after
+              * "hot item" support has been implemented for the
+              * case where it is being de-selected.
+              */
+        {
+            FrameRect(hdc, &rc, GetSysColorBrush(COLOR_BTNFACE));
             if (hasDropDownArrow)
-                ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rcArrow, NULL, 0, 0);
-            SetBkColor(hdc, oldclr);
-        }
-    }
-
-    TOOLBAR_DrawFrame(infoPtr, dwStyle & TBSTYLE_FLAT, &tbcd);
-
-    if (drawSepDropDownArrow)
-        TOOLBAR_DrawSepDDArrow(infoPtr, dwStyle & TBSTYLE_FLAT, &tbcd, &rcArrow);
-
-    if (!(infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || (btnPtr->fsStyle & BTNS_SHOWTEXT))
-        TOOLBAR_DrawString (infoPtr, &rcText, lpText, &tbcd);
-
-    TOOLBAR_DrawImage(infoPtr, btnPtr, rcBitmap.left, rcBitmap.top, &tbcd);
-
-    if (hasDropDownArrow && !drawSepDropDownArrow)
+            FrameRect(hdc, &rcArrow, GetSysColorBrush(COLOR_BTNFACE));
+        }
+#endif
+
+        if (hasDropDownArrow)
+            TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top, COLOR_WINDOWFRAME);
+
+        if (btnPtr->bHot) {
+            HIMAGELIST himlHot = GETHOTIMAGELIST(infoPtr, 
+                GETHIMLID(infoPtr, btnPtr->iBitmap));
+            /* if hot, attempt to draw with himlHot, if fails, use himlDef */
+            if (!TOOLBAR_DrawImageList (infoPtr, btnPtr,
+                                        himlHot,
+                                        hdc, rcBitmap.left,
+                                        rcBitmap.top, ILD_NORMAL))
+                TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
+                                       hdc, rcBitmap.left, rcBitmap.top,
+                                       ILD_NORMAL);
+        }
+        else
+            TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
+                                   hdc, rcBitmap.left, rcBitmap.top,
+                                   ILD_NORMAL);
+    }
+    else
     {
-        if (tbcd.nmcd.uItemState & (CDIS_DISABLED | CDIS_INDETERMINATE))
-        {
-            TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top+1 + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnHighlight);
-            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, comctl32_color.clr3dShadow);
-        }
-        else if (tbcd.nmcd.uItemState & (CDIS_SELECTED | CDIS_CHECKED))
-        {
-            offset = (infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) ? 0 : 1;
-            TOOLBAR_DrawArrow(hdc, rcArrow.left + offset, rcArrow.top + offset + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnText);
-        }
-        else
-            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, comctl32_color.clrBtnText);
-    }
-
-FINALNOTIFY:
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+            DrawEdge (hdc, &rc, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        if (hasDropDownArrow)
+        {
+            if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+                DrawEdge (hdc, &rcArrow, EDGE_RAISED,
+                          BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
+        }
+
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
+                               hdc, rcBitmap.left, rcBitmap.top,
+                               ILD_NORMAL);}
+
+
+    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+
+ FINALNOTIFY:
     if (infoPtr->dwItemCustDraw & CDRF_NOTIFYPOSTPAINT)
     {
@@ -1052 +975 @@
     TBUTTON_INFO *btnPtr;
     INT i, oldBKmode = 0;
-    RECT rcTemp, rcClient;
+    RECT rcTemp;
     NMTBCUSTOMDRAW tbcd;
     DWORD ntfret;
-
-    /* the app has told us not to redraw the toolbar */
-    if (!infoPtr->bDoRedraw)
-        return;
 
     /* if imagelist belongs to the app, it can be changed
@@ -1082 +1001 @@
         oldBKmode = SetBkMode (hdc, TRANSPARENT);
 
-    GetClientRect(hwnd, &rcClient);
-
     /* redraw necessary buttons */
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
     {
-        BOOL bDraw;
-        if (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS)
-        {
-            IntersectRect(&rcTemp, &rcClient, &btnPtr->rect);
-            bDraw = EqualRect(&rcTemp, &btnPtr->rect);
-        }
-        else
-            bDraw = TRUE;
-        bDraw &= IntersectRect(&rcTemp, &(ps->rcPaint), &(btnPtr->rect));
-        bDraw = (btnPtr->fsState & TBSTATE_HIDDEN) ? FALSE : bDraw;
-        if (bDraw)
+        if(IntersectRect(&rcTemp, &(ps->rcPaint), &(btnPtr->rect)))
             TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
     }
@@ -1125 +1032 @@
 * indicates where the underline goes, except for the string "&&" which
 * is reduced to a single "&". GetTextExtentPoint does not process these
-* only DrawText does. Note that the BTNS_NOPREFIX is handled here.
+* only DrawText does. Note that the TBSTYLE_NOPREFIX is handled here.
 */
 static void
@@ -1136 +1043 @@
     lpSize->cy = 0;
 
-    if (infoPtr->nMaxTextRows > 0 &&
-        !(btnPtr->fsState & TBSTATE_HIDDEN) &&
-        (!(infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) ||
-        (btnPtr->fsStyle & BTNS_SHOWTEXT)) )
+    if (!(btnPtr->fsState & TBSTATE_HIDDEN) )
     {
         LPWSTR lpText = TOOLBAR_GetText(infoPtr, btnPtr);
@@ -1154 +1058 @@
             /* Use DrawText to get true size as drawn (less pesky "&") */
             DrawTextW (hdc, lpText, -1, &myrect, DT_VCENTER | DT_SINGLELINE |
-                   DT_CALCRECT | ((btnPtr->fsStyle & BTNS_NOPREFIX) ?
+                   DT_CALCRECT | ((btnPtr->fsStyle & TBSTYLE_NOPREFIX) ?
                                   DT_NOPREFIX : 0));
 
@@ -1184 +1088 @@
     lpSize->cx = 0;
     lpSize->cy = 0;
-
-    if(infoPtr->nMaxTextRows == 0)
-        return;
 
     hdc = GetDC (hwnd);
@@ -1212 +1113 @@
 *               TOOLBAR_WrapToolbar
 *
-* This function walks through the buttons and separators in the
+* This function walks through the buttons and seperators in the
 * toolbar, and sets the TBSTATE_WRAP flag only on those items where
 * wrapping should occur based on the width of the toolbar window.
@@ -1266 +1167 @@
         /* custom controls in toolbars.                              */
         /*                                                           */
-        /* BTNS_DROPDOWN separators are treated as buttons for    */
+        /* TBSTYLE_DROPDOWN separators are treated as buttons for    */
         /* width.  - GA 8/01                                         */
-        if ((btnPtr[i].fsStyle & BTNS_SEP) &&
-            !(btnPtr[i].fsStyle & BTNS_DROPDOWN))
+        if ((btnPtr[i].fsStyle & TBSTYLE_SEP) &&
+            !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN))
             cx = (btnPtr[i].iBitmap > 0) ?
                         btnPtr[i].iBitmap : SEPARATOR_WIDTH;
@@ -1279 +1180 @@
         /* next row if the previous wrapping is on a button.         */
         if( bButtonWrap &&
-                (btnPtr[i].fsStyle & BTNS_SEP) &&
+                (btnPtr[i].fsStyle & TBSTYLE_SEP) &&
                 (i + 1 < infoPtr->nNumButtons ) &&
-                (btnPtr[i + 1].fsStyle & BTNS_SEP) )
+                (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) )
         {
             TRACE("wrap point 1 btn %d style %02x\n", i, btnPtr[i].fsStyle);
@@ -1303 +1204 @@
             /*  go to the next until it reaches a non separator.      */
             /*  Wrap the last separator if it is before a button.     */
-            while( ( ((btnPtr[i].fsStyle & BTNS_SEP) &&
-                      !(btnPtr[i].fsStyle & BTNS_DROPDOWN)) ||
+            while( ( ((btnPtr[i].fsStyle & TBSTYLE_SEP) &&
+                      !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN)) ||
                      (btnPtr[i].fsState & TBSTATE_HIDDEN) ) &&
                         i < infoPtr->nNumButtons )
@@ -1329 +1230 @@
             for ( j = i - 1; j >= 0  &&  !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
             {
-                if ((btnPtr[j].fsStyle & BTNS_SEP) &&
+                if ((btnPtr[j].fsStyle & TBSTYLE_SEP) &&
                         !(btnPtr[j].fsState & TBSTATE_HIDDEN))
                 {
@@ -1372 +1273 @@
                 bFound = TRUE;
                 x = infoPtr->nIndent;
-                if (btnPtr[i].fsStyle & BTNS_SEP )
+                if (btnPtr[i].fsStyle & TBSTYLE_SEP )
                     bButtonWrap = FALSE;
                 else
@@ -1413 +1314 @@
     TOOLBAR_CalcStrings (hwnd, &sizeString);
 
-    TOOLBAR_DumpToolbar (infoPtr, __LINE__);
-
     for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
     {
@@ -1425 +1324 @@
                                      0, sizeString.cy) + infoPtr->szPadding.cy;
         infoPtr->nButtonWidth = ((usesBitmaps) ? infoPtr->nBitmapWidth :
-                                 LIST_IMAGE_ABSENT_WIDTH) + sizeString.cx + infoPtr->szPadding.cx;
-        if (sizeString.cx > 0)
-            infoPtr->nButtonWidth += TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap) + infoPtr->szPadding.cx/2;
+                                 0) + sizeString.cx + 6;
         TRACE("LIST style, But w=%d h=%d, useBitmaps=%d, Bit w=%d h=%d\n",
               infoPtr->nButtonWidth, infoPtr->nButtonHeight, usesBitmaps,
               infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+        TOOLBAR_DumpToolbar (infoPtr, __LINE__);
     }
     else {
@@ -1437 +1335 @@
             if (usesBitmaps)
                 infoPtr->nButtonHeight = sizeString.cy +
-                    infoPtr->szPadding.cy/2 + /* this is the space to separate text from bitmap */
-                  infoPtr->nBitmapHeight + infoPtr->szPadding.cy;
+                    2 + /* this is the space to separate text from bitmap */
+                  infoPtr->nBitmapHeight + 6;
             else
-                infoPtr->nButtonHeight = sizeString.cy + infoPtr->szPadding.cy;
+                infoPtr->nButtonHeight = sizeString.cy + 6;
         }
-        else
-            infoPtr->nButtonHeight = infoPtr->nBitmapHeight + infoPtr->szPadding.cy;
+        else if (infoPtr->nButtonHeight < infoPtr->nBitmapHeight + 6)
+            infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
 
         if (sizeString.cx > infoPtr->nBitmapWidth)
-            infoPtr->nButtonWidth = sizeString.cx + infoPtr->szPadding.cx;
-        else
-            infoPtr->nButtonWidth = infoPtr->nBitmapWidth + infoPtr->szPadding.cx;
+            infoPtr->nButtonWidth = sizeString.cx + 6;
+        else if (infoPtr->nButtonWidth < infoPtr->nBitmapWidth + 6)
+            infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
     }
 
@@ -1461 +1359 @@
     y  = 0;
 
+   /*
+    * We will set the height below, and we set the width on entry
+    * so we do not reset them here..
+    */
+#if 0
+    GetClientRect( hwnd, &rc );
+    /* get initial values for toolbar */
+    infoPtr->nWidth  = rc.right - rc.left;
+    infoPtr->nHeight = rc.bottom - rc.top;
+#endif
+
     /* from above, minimum is a button, and possible text */
     cx = infoPtr->nButtonWidth;
@@ -1478 +1387 @@
 
     btnPtr = infoPtr->buttons;
+
+    /* do not base height/width on parent, if the parent is a */
+    /* rebar control it could have multiple rows of toolbars  */
+/*    GetClientRect( GetParent(hwnd), &rc ); */
+/*    cx = rc.right - rc.left; */
+/*    cy = rc.bottom - rc.top; */
 
     TRACE("cy=%d\n", cy);
@@ -1495 +1410 @@
         /* it is the actual width of the separator. This is used for */
         /* custom controls in toolbars.                              */
-        if (btnPtr->fsStyle & BTNS_SEP) {
-            if (btnPtr->fsStyle & BTNS_DROPDOWN) {
+        if (btnPtr->fsStyle & TBSTYLE_SEP) {
+            if (btnPtr->fsStyle & TBSTYLE_DROPDOWN) {
                 cy = (btnPtr->iBitmap > 0) ?
                      btnPtr->iBitmap : SEPARATOR_WIDTH;
@@ -1507 +1422 @@
         else
         {
-            if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || 
-                (btnPtr->fsStyle & BTNS_AUTOSIZE))
+            if (btnPtr->fsStyle & TBSTYLE_AUTOSIZE)
             {
               SIZE sz;
@@ -1522 +1436 @@
               ReleaseDC (hwnd, hdc);
 
-              /* add space on for button frame, etc */
-              cx = sz.cx + infoPtr->szPadding.cx;
-              
-              /* add list padding */
-              if ((dwStyle & TBSTYLE_LIST) && sz.cx > 0)
-                  cx += TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap) + infoPtr->szPadding.cx/2;
-
-              if (TOOLBAR_TestImageExist (infoPtr, btnPtr, GETDEFIMAGELIST(infoPtr,0)))
-              {
-                if (dwStyle & TBSTYLE_LIST)
-                  cx += infoPtr->nBitmapWidth;
-                else if (cx < (infoPtr->nBitmapWidth+infoPtr->szPadding.cx))
-                  cx = infoPtr->nBitmapWidth+infoPtr->szPadding.cx;
-              }
-              else if (dwStyle & TBSTYLE_LIST)
-                  cx += LIST_IMAGE_ABSENT_WIDTH;
+              /* Fudge amount measured against IE4 "menu" and "Links" */
+              /* toolbars with native control (v4.71).  -  GA 8/01    */
+              cx = sz.cx + 6 + 5 + 5;
+              if ((dwStyle & TBSTYLE_LIST) &&
+                  (TOOLBAR_TestImageExist (infoPtr, btnPtr, GETDEFIMAGELIST(infoPtr,0))))
+                  cx += infoPtr->nBitmapWidth;
             }
             else
               cx = infoPtr->nButtonWidth;
 
-            if ((hasDropDownArrows && (btnPtr->fsStyle & BTNS_DROPDOWN)) || (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN))
+            if (hasDropDownArrows && (btnPtr->fsStyle & TBSTYLE_DROPDOWN))
               cx += DDARROW_WIDTH;
         }
@@ -1558 +1462 @@
 
         /* Set the toolTip only for non-hidden, non-separator button */
-        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & BTNS_SEP ))
+        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP ))
         {
             TTTOOLINFOA ti;
@@ -1581 +1485 @@
         if( bWrap )
         {
-            if ( !(btnPtr->fsStyle & BTNS_SEP) )
+            if ( !(btnPtr->fsStyle & TBSTYLE_SEP) )
                 y += cy;
             else
@@ -1588 +1492 @@
                 /* it is the actual width of the separator. This is used for */
                 /* custom controls in toolbars.                              */
-                if ( !(btnPtr->fsStyle & BTNS_DROPDOWN))
+                if ( !(btnPtr->fsStyle & TBSTYLE_DROPDOWN))
                     y += cy + ( (btnPtr->iBitmap > 0 ) ?
                                 btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3;
@@ -1648 +1552 @@
             continue;
 
-        if (btnPtr->fsStyle & BTNS_SEP) {
+        if (btnPtr->fsStyle & TBSTYLE_SEP) {
             if (PtInRect (&btnPtr->rect, *lpPt)) {
                 TRACE(" ON SEPARATOR %d!\n", i);
@@ -1701 +1605 @@
     /* check index button */
     btnPtr = &infoPtr->buttons[nIndex];
-    if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) {
+    if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
         if (btnPtr->fsState & TBSTATE_CHECKED)
             return nIndex;
@@ -1710 +1614 @@
     while (nRunIndex >= 0) {
         btnPtr = &infoPtr->buttons[nRunIndex];
-        if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) {
+        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
             if (btnPtr->fsState & TBSTATE_CHECKED)
                 return nRunIndex;
@@ -1723 +1627 @@
     while (nRunIndex < infoPtr->nNumButtons) {
         btnPtr = &infoPtr->buttons[nRunIndex];
-        if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) {
+        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
             if (btnPtr->fsState & TBSTATE_CHECKED)
                 return nRunIndex;
@@ -1786 +1690 @@
                     return FALSE;
 
-                /* UNDOCUMENTED: dialog hwnd immediately follows NMHDR */
-                nmtb.iItem = (int)hwnd;
                 /* Send TBN_INITCUSTOMIZE notification */
                 if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_INITCUSTOMIZE) ==
-                    TBNRF_HIDEHELP)
+                    TBNRF_HIDEHELP)
                 {
-                    TRACE("TBNRF_HIDEHELP requested\n");
-                    ShowWindow(GetDlgItem(hwnd, IDC_HELP_BTN), SW_HIDE);
+                    FIXME("TBNRF_HIDEHELP not supported\n");
                 }
 
@@ -1799 +1700 @@
                 for (i = 0; i < custInfo->tbInfo->nNumButtons; i++)
                 {
-                    btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
+                    btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
                     memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-                    btnInfo->btn.fsStyle = BTNS_SEP;
+                    btnInfo->btn.fsStyle = TBSTYLE_SEP;
                     btnInfo->bVirtual = FALSE;
                     LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
@@ -1813 +1714 @@
 
                 /* insert separator button into 'available buttons' list */
-                btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
+                btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
                 memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-                btnInfo->btn.fsStyle = BTNS_SEP;
+                btnInfo->btn.fsStyle = TBSTYLE_SEP;
                 btnInfo->bVirtual = FALSE;
                 btnInfo->bRemovable = TRUE;
@@ -1848 +1749 @@
                     if (index == -1)
                     {
-                        btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
+                        btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
                         btnInfo->bVirtual = FALSE;
                         btnInfo->bRemovable = TRUE;
@@ -1863 +1764 @@
 
                     memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
-                    if (!(nmtb.tbButton.fsStyle & BTNS_SEP))
+                    if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
                     {
                         if (lstrlenW(nmtb.pszText))
@@ -1880 +1781 @@
 
                 /* append 'virtual' separator button to the 'toolbar buttons' list */
-                btnInfo = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON));
+                btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
                 memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-                btnInfo->btn.fsStyle = BTNS_SEP;
+                btnInfo->btn.fsStyle = TBSTYLE_SEP;
                 btnInfo->bVirtual = TRUE;
                 btnInfo->bRemovable = FALSE;
@@ -2052 +1953 @@
 
                             /* insert into 'available button' list */
-                            if (!(btnInfo->btn.fsStyle & BTNS_SEP))
+                            if (!(btnInfo->btn.fsStyle & TBSTYLE_SEP))
                             {
                                 index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, 0);
@@ -2058 +1959 @@
                             }
                             else
-                                Free (btnInfo);
+                                COMCTL32_Free (btnInfo);
                         }
                     }
                     break;
-                case IDC_HELP_BTN:
-                        TOOLBAR_SendNotify(&nmtb.hdr, infoPtr, TBN_CUSTHELP);
-                        break;
-                case IDC_RESET_BTN:
-                        TOOLBAR_SendNotify(&nmtb.hdr, infoPtr, TBN_RESET);
-                        break;
 
                 case IDOK: /* Add button */
@@ -2099 +1994 @@
 
                                 /* duplicate 'separator' button */
-                                btnNew = (PCUSTOMBUTTON)Alloc (sizeof(CUSTOMBUTTON));
+                                btnNew = (PCUSTOMBUTTON)COMCTL32_Alloc (sizeof(CUSTOMBUTTON));
                                 memcpy (btnNew, btnInfo, sizeof(CUSTOMBUTTON));
                                 btnInfo = btnNew;
@@ -2130 +2025 @@
                 {
                     btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, i, 0);
-                    Free(btnInfo);
+                    COMCTL32_Free(btnInfo);
                     SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, 0, 0);
                 }
@@ -2141 +2036 @@
                 {
                     btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, i, 0);
-                    Free(btnInfo);
+                    COMCTL32_Free(btnInfo);
                     SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, i, 0);
                 }
@@ -2199 +2094 @@
 
                 /* draw image and text */
-                if ((btnInfo->btn.fsStyle & BTNS_SEP) == 0) {
+                if ((btnInfo->btn.fsStyle & TBSTYLE_SEP) == 0) {
                         HIMAGELIST himl = GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr, 
                                 btnInfo->btn.iBitmap));
@@ -2304 +2199 @@
         TRACE ("creating default image list!\n");
 
-        himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-                                    ILC_COLORDDB | ILC_MASK, nButtons, 2);
+    himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, 
+                ILC_COLOR | ILC_MASK, nButtons, 2);
         TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0);
-        infoPtr->himlInt = himlDef;
+    infoPtr->himlInt = himlDef;
     }
     else {
@@ -2349 +2244 @@
        DeleteDC (hdcBitmap);
 
-       nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
+       nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
        DeleteObject (hbmLoad);
     }
@@ -2361 +2256 @@
                                        MAKEINTRESOURCEA(IDB_STD_SMALL));
                 nIndex = ImageList_AddMasked (himlDef,
-                                              hbmLoad, comctl32_color.clrBtnFace);
+                                              hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
                 break;
@@ -2369 +2264 @@
                                        MAKEINTRESOURCEA(IDB_STD_LARGE));
                 nIndex = ImageList_AddMasked (himlDef,
-                                              hbmLoad, comctl32_color.clrBtnFace);
+                                              hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
                 break;
@@ -2377 +2272 @@
                                        MAKEINTRESOURCEA(IDB_VIEW_SMALL));
                 nIndex = ImageList_AddMasked (himlDef,
-                                              hbmLoad, comctl32_color.clrBtnFace);
+                                              hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
                 break;
@@ -2385 +2280 @@
                                        MAKEINTRESOURCEA(IDB_VIEW_LARGE));
                 nIndex = ImageList_AddMasked (himlDef,
-                                              hbmLoad, comctl32_color.clrBtnFace);
+                                              hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
                 break;
@@ -2393 +2288 @@
                                        MAKEINTRESOURCEA(IDB_HIST_SMALL));
                 nIndex = ImageList_AddMasked (himlDef,
-                                              hbmLoad, comctl32_color.clrBtnFace);
+                                              hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
                 break;
@@ -2401 +2296 @@
                                        MAKEINTRESOURCEA(IDB_HIST_LARGE));
                 nIndex = ImageList_AddMasked (himlDef,
-                                              hbmLoad, comctl32_color.clrBtnFace);
+                                              hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
                 break;
@@ -2414 +2309 @@
     {
         hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-        nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
+        nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
         DeleteObject (hbmLoad);
     }
@@ -2422 +2317 @@
     if (infoPtr->nNumBitmapInfos == 0)
     {
-        infoPtr->bitmaps = Alloc(sizeof(TBITMAP_INFO));
+        infoPtr->bitmaps = COMCTL32_Alloc(sizeof(TBITMAP_INFO));
     }
     else
     {
         TBITMAP_INFO *oldBitmaps = infoPtr->bitmaps;
-        infoPtr->bitmaps = Alloc((infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO));
+        infoPtr->bitmaps = COMCTL32_Alloc((infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO));
         memcpy(&infoPtr->bitmaps[0], &oldBitmaps[0], infoPtr->nNumBitmapInfos);
     }
@@ -2454 +2349 @@
     }
 
-    InvalidateRect(hwnd, NULL, TRUE);
+    InvalidateRect(hwnd, NULL, FALSE);
 
     return nIndex;
@@ -2475 +2370 @@
     if (infoPtr->nNumButtons == 0) {
         infoPtr->buttons =
-            Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
     }
     else {
         TBUTTON_INFO *oldButtons = infoPtr->buttons;
         infoPtr->buttons =
-            Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
         memcpy (&infoPtr->buttons[0], &oldButtons[0],
                 nOldButtons * sizeof(TBUTTON_INFO));
-        Free (oldButtons);
+        COMCTL32_Free (oldButtons);
     }
 
@@ -2496 +2391 @@
         btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
         btnPtr->dwData    = lpTbb[nCount].dwData;
-        if(HIWORD(lpTbb[nCount].iString) && lpTbb[nCount].iString != -1)
-            Str_SetPtrAtoW ((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[nCount].iString );
-        else
-            btnPtr->iString   = lpTbb[nCount].iString;
+        btnPtr->iString   = lpTbb[nCount].iString;
         btnPtr->bHot      = FALSE;
 
-        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & BTNS_SEP)) {
+        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
             TTTOOLINFOA ti;
 
@@ -2521 +2413 @@
     TOOLBAR_DumpToolbar (infoPtr, __LINE__);
 
-    InvalidateRect(hwnd, NULL, TRUE);
+    InvalidateRect(hwnd, NULL, FALSE);
 
     return TRUE;
@@ -2542 +2434 @@
     if (infoPtr->nNumButtons == 0) {
         infoPtr->buttons =
-            Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
     }
     else {
         TBUTTON_INFO *oldButtons = infoPtr->buttons;
         infoPtr->buttons =
-            Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
         memcpy (&infoPtr->buttons[0], &oldButtons[0],
                 nOldButtons * sizeof(TBUTTON_INFO));
-        Free (oldButtons);
+        COMCTL32_Free (oldButtons);
     }
 
@@ -2563 +2455 @@
         btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
         btnPtr->dwData    = lpTbb[nCount].dwData;
-        if(HIWORD(lpTbb[nCount].iString) && lpTbb[nCount].iString != -1)
-            Str_SetPtrW ((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[nCount].iString );
-        else
-            btnPtr->iString   = lpTbb[nCount].iString;
+        btnPtr->iString   = lpTbb[nCount].iString;
         btnPtr->bHot      = FALSE;
 
-        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & BTNS_SEP)) {
+        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
             TTTOOLINFOW ti;
 
@@ -2589 +2478 @@
     TOOLBAR_DumpToolbar (infoPtr, __LINE__);
 
-    InvalidateRect(hwnd, NULL, TRUE);
+    InvalidateRect(hwnd, NULL, FALSE);
 
     return TRUE;
@@ -2613 +2502 @@
         if (infoPtr->nNumStrings == 0) {
             infoPtr->strings =
-                Alloc (sizeof(LPWSTR));
+                COMCTL32_Alloc (sizeof(LPWSTR));
         }
         else {
             LPWSTR *oldStrings = infoPtr->strings;
             infoPtr->strings =
-                Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
             memcpy (&infoPtr->strings[0], &oldStrings[0],
                     sizeof(LPWSTR) * infoPtr->nNumStrings);
-            Free (oldStrings);
-        }
-
-        /*Alloc zeros out the allocated memory*/
+            COMCTL32_Free (oldStrings);
+        }
+
+        /*COMCTL32_Alloc zeros out the allocated memory*/
         Str_SetPtrAtoW (&infoPtr->strings[infoPtr->nNumStrings], szString );
         infoPtr->nNumStrings++;
@@ -2643 +2532 @@
             if (infoPtr->nNumStrings == 0) {
                 infoPtr->strings =
-                    Alloc (sizeof(LPWSTR));
+                    COMCTL32_Alloc (sizeof(LPWSTR));
             }
             else {
                 LPWSTR *oldStrings = infoPtr->strings;
                 infoPtr->strings =
-                    Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
                 memcpy (&infoPtr->strings[0], &oldStrings[0],
                         sizeof(LPWSTR) * infoPtr->nNumStrings);
-                Free (oldStrings);
+                COMCTL32_Free (oldStrings);
             }
 
@@ -2691 +2580 @@
 
                 if (infoPtr->nNumStrings == 0) {
-                    infoPtr->strings = Alloc (sizeof(LPWSTR));
+                    infoPtr->strings = COMCTL32_Alloc (sizeof(LPWSTR));
                 }
                 else
                 {
                     LPWSTR *oldStrings = infoPtr->strings;
-                    infoPtr->strings = Alloc(sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                    infoPtr->strings = COMCTL32_Alloc(sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
                     memcpy(&infoPtr->strings[0], &oldStrings[0],
                            sizeof(LPWSTR) * infoPtr->nNumStrings);
-                    Free(oldStrings);
+                    COMCTL32_Free(oldStrings);
                 }
 
-                np=strchrW (p, '|');
+                np=COMCTL32_StrChrW (p, L'|');
                 if (np!=NULL) {
                     len = np - p;
@@ -2712 +2601 @@
                 TRACE("len=%d %s\n", len, debugstr_w(p));
                 infoPtr->strings[infoPtr->nNumStrings] =
-                    Alloc (sizeof(WCHAR)*(len+1));
+                    COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
                 lstrcpynW (infoPtr->strings[infoPtr->nNumStrings], p, len+1);
                 infoPtr->nNumStrings++;
@@ -2724 +2613 @@
             if (infoPtr->nNumStrings == 0) {
                 infoPtr->strings =
-                    Alloc (sizeof(LPWSTR));
+                    COMCTL32_Alloc (sizeof(LPWSTR));
             }
             else {
                 LPWSTR *oldStrings = infoPtr->strings;
                 infoPtr->strings =
-                    Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
                 memcpy (&infoPtr->strings[0], &oldStrings[0],
                         sizeof(LPWSTR) * infoPtr->nNumStrings);
-                Free (oldStrings);
+                COMCTL32_Free (oldStrings);
             }
 
@@ -2753 +2642 @@
             if (infoPtr->nNumStrings == 0) {
                 infoPtr->strings =
-                    Alloc (sizeof(LPWSTR));
+                    COMCTL32_Alloc (sizeof(LPWSTR));
             }
             else {
                 LPWSTR *oldStrings = infoPtr->strings;
                 infoPtr->strings =
-                    Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
                 memcpy (&infoPtr->strings[0], &oldStrings[0],
                         sizeof(LPWSTR) * infoPtr->nNumStrings);
-                Free (oldStrings);
+                COMCTL32_Free (oldStrings);
             }
 
@@ -2811 +2700 @@
         cx = infoPtr->nWidth;
 
-        if ((dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) {
+        if (dwStyle & CCS_NOMOVEY) {
                 GetWindowRect(hwnd, &window_rect);
                 ScreenToClient(parent, (LPPOINT)&window_rect.left);
                 y = window_rect.top;
         }
-        if ((dwStyle & CCS_BOTTOM) == CCS_BOTTOM) {
-            GetWindowRect(hwnd, &window_rect);
-            y = parent_rect.bottom - ( window_rect.bottom - window_rect.top);
-        }
     }
 
@@ -2836 +2721 @@
 
     infoPtr->bAutoSize = TRUE;
-    SetWindowPos (hwnd, HWND_TOP,  x, y, cx, cy, uPosFlags);
-    /* The following line makes sure that the infoPtr->bAutoSize is turned off
-     * after the setwindowpos calls */
+    SetWindowPos (hwnd, HWND_TOP, parent_rect.left - x, parent_rect.top - y,
+                        cx, cy, uPosFlags);
+    /* The following line makes sure that the infoPtr->bAutoSize is turned off after
+     * the setwindowpos calls */
     infoPtr->bAutoSize = FALSE;
 
@@ -2878 +2764 @@
     INT nIndex;
 
-    TRACE("button %d, iBitmap now %d\n", wParam, LOWORD(lParam));
-
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
     if (nIndex == -1)
@@ -2905 +2789 @@
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
-
-    TRACE("hwnd=%p, btn index=%d, lParam=0x%08lx\n", hwnd, nIndex, lParam);
-
     if (nIndex == -1)
         return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
+
+    if (!(btnPtr->fsStyle & TBSTYLE_CHECK))
+        return FALSE;
 
     bChecked = (btnPtr->fsState & TBSTATE_CHECKED) ? TRUE : FALSE;
@@ -2918 +2802 @@
         btnPtr->fsState &= ~TBSTATE_CHECKED;
     else {
-        if (btnPtr->fsStyle & BTNS_GROUP) {
+        if (btnPtr->fsStyle & TBSTYLE_GROUP) {
             nOldIndex =
                 TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nIndex);
@@ -2931 +2815 @@
     if( bChecked != LOWORD(lParam) )
     {
-        if (nOldIndex != -1)
-            InvalidateRect(hwnd, &infoPtr->buttons[nOldIndex].rect, TRUE);
+        if (nOldIndex != -1)
+        {
+            InvalidateRect(hwnd, &infoPtr->buttons[nOldIndex].rect,
+                TOOLBAR_HasText(infoPtr, &infoPtr->buttons[nOldIndex]));
+        }
         InvalidateRect(hwnd, &btnPtr->rect, TRUE);
     }
@@ -2970 +2857 @@
     if (!(hRes = FindResourceA (COMCTL32_hModule,
                                 MAKEINTRESOURCEA(IDD_TBCUSTOMIZE),
-                                (LPSTR)RT_DIALOGA)))
+                                RT_DIALOGA)))
         return FALSE;
 
@@ -3000 +2887 @@
 
     if ((infoPtr->hwndToolTip) &&
-        !(infoPtr->buttons[nIndex].fsStyle & BTNS_SEP)) {
+        !(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
         TTTOOLINFOA ti;
 
@@ -3013 +2900 @@
     if (infoPtr->nNumButtons == 1) {
         TRACE(" simple delete!\n");
-        Free (infoPtr->buttons);
+        COMCTL32_Free (infoPtr->buttons);
         infoPtr->buttons = NULL;
         infoPtr->nNumButtons = 0;
@@ -3022 +2909 @@
 
         infoPtr->nNumButtons--;
-        infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
+        infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
         if (nIndex > 0) {
             memcpy (&infoPtr->buttons[0], &oldButtons[0],
@@ -3033 +2920 @@
         }
 
-        Free (oldButtons);
+        COMCTL32_Free (oldButtons);
     }
 
@@ -3053 +2940 @@
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
-
-    TRACE("hwnd=%p, btn index=%d, lParam=0x%08lx\n", hwnd, wParam, lParam);
-
     if (nIndex == -1)
         return FALSE;
@@ -3072 +2956 @@
     /* redraw the button only if the state of the button changed */
     if(bState != (btnPtr->fsState & TBSTATE_ENABLED))
-        InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+    {
+        InvalidateRect(hwnd, &btnPtr->rect,
+            TOOLBAR_HasText(infoPtr, btnPtr));
+    }
 
     return TRUE;
@@ -3160 +3047 @@
 
     if (!(btnPtr = &infoPtr->buttons[nIndex])) return -1;
+
+    if (lpTbInfo->dwMask & TBIF_COMMAND)
+        lpTbInfo->idCommand = btnPtr->idCommand;
+    if (lpTbInfo->dwMask & TBIF_IMAGE)
+        lpTbInfo->iImage = btnPtr->iBitmap;
+    if (lpTbInfo->dwMask & TBIF_LPARAM)
+        lpTbInfo->lParam = btnPtr->dwData;
+    if (lpTbInfo->dwMask & TBIF_SIZE)
+        lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
+    if (lpTbInfo->dwMask & TBIF_STATE)
+        lpTbInfo->fsState = btnPtr->fsState;
+    if (lpTbInfo->dwMask & TBIF_STYLE)
+        lpTbInfo->fsStyle = btnPtr->fsStyle;
+     if (lpTbInfo->dwMask & TBIF_TEXT) {
+         LPWSTR lpText = TOOLBAR_GetText(infoPtr,btnPtr);
+         Str_GetPtrWtoA (lpText, lpTbInfo->pszText,lpTbInfo->cchText);
+         }
+    return nIndex;
+}
+
+
+static LRESULT
+TOOLBAR_GetButtonInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    LPTBBUTTONINFOW lpTbInfo = (LPTBBUTTONINFOW)lParam;
+    TBUTTON_INFO *btnPtr;
+    INT nIndex;
+
+    if (infoPtr == NULL)
+        return -1;
+    if (lpTbInfo == NULL)
+        return -1;
+    if (lpTbInfo->cbSize < sizeof(TBBUTTONINFOW))
+        return -1;
+
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam,
+                                     lpTbInfo->dwMask & 0x80000000);
+    if (nIndex == -1)
+        return -1;
+
+    btnPtr = &infoPtr->buttons[nIndex];
+
+    if(!btnPtr)
+        return -1;
 
     if (lpTbInfo->dwMask & TBIF_COMMAND)
@@ -3174 +3106 @@
         lpTbInfo->fsStyle = btnPtr->fsStyle;
     if (lpTbInfo->dwMask & TBIF_TEXT) {
-        /* TB_GETBUTTONINFO doesn't retrieve text from the string list, so we
-           can't use TOOLBAR_GetText here */
-        LPWSTR lpText;
-        if (HIWORD(btnPtr->iString) && (btnPtr->iString != -1)) {
-            lpText = (LPWSTR)btnPtr->iString;
-            Str_GetPtrWtoA (lpText, lpTbInfo->pszText,lpTbInfo->cchText);
-        } else
-            lpTbInfo->pszText[0] = '\0';
-    }
-    return nIndex;
-}
-
-
-static LRESULT
-TOOLBAR_GetButtonInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-    LPTBBUTTONINFOW lpTbInfo = (LPTBBUTTONINFOW)lParam;
-    TBUTTON_INFO *btnPtr;
-    INT nIndex;
-
-    if (infoPtr == NULL)
-        return -1;
-    if (lpTbInfo == NULL)
-        return -1;
-    if (lpTbInfo->cbSize < sizeof(TBBUTTONINFOW))
-        return -1;
-
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam,
-                                     lpTbInfo->dwMask & 0x80000000);
-    if (nIndex == -1)
-        return -1;
-
-    btnPtr = &infoPtr->buttons[nIndex];
-
-    if(!btnPtr)
-        return -1;
-
-    if (lpTbInfo->dwMask & TBIF_COMMAND)
-        lpTbInfo->idCommand = btnPtr->idCommand;
-    if (lpTbInfo->dwMask & TBIF_IMAGE)
-        lpTbInfo->iImage = btnPtr->iBitmap;
-    if (lpTbInfo->dwMask & TBIF_LPARAM)
-        lpTbInfo->lParam = btnPtr->dwData;
-    if (lpTbInfo->dwMask & TBIF_SIZE)
-        lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
-    if (lpTbInfo->dwMask & TBIF_STATE)
-        lpTbInfo->fsState = btnPtr->fsState;
-    if (lpTbInfo->dwMask & TBIF_STYLE)
-        lpTbInfo->fsStyle = btnPtr->fsStyle;
-    if (lpTbInfo->dwMask & TBIF_TEXT) {
-        /* TB_GETBUTTONINFO doesn't retrieve text from the string list, so we
-           can't use TOOLBAR_GetText here */
-        LPWSTR lpText;
-        if (HIWORD(btnPtr->iString) && (btnPtr->iString != -1)) {
-            lpText = (LPWSTR)btnPtr->iString;
-            Str_GetPtrW (lpText,lpTbInfo->pszText,lpTbInfo->cchText);
-        } else
-            lpTbInfo->pszText[0] = '\0';
+        LPWSTR lpText = TOOLBAR_GetText(infoPtr,btnPtr);
+        Str_GetPtrW (lpText,lpTbInfo->pszText,lpTbInfo->cchText);
     }
 
@@ -3298 +3173 @@
 TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
-    /* UNDOCUMENTED: wParam is actually the ID of the image list to return */
-    return (LRESULT)GETDISIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), wParam);
+    return (LRESULT)GETDISIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), 0);
 }
 
@@ -3309 +3182 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    TRACE("\n");
-
     return infoPtr->dwExStyle;
 }
@@ -3318 +3189 @@
 TOOLBAR_GetHotImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
-    /* UNDOCUMENTED: wParam is actually the ID of the image list to return */
-    return (LRESULT)GETHOTIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), wParam);
+    return (LRESULT)GETHOTIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), 0);
 }
 
@@ -3342 +3211 @@
 TOOLBAR_GetDefImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
-    /* UNDOCUMENTED: wParam is actually the ID of the image list to return */
-    return (LRESULT) GETDEFIMAGELIST(TOOLBAR_GetInfoPtr(hwnd), wParam);
+    return (LRESULT) GETDEFIMAGELIST(TOOLBAR_GetInfoPtr(hwnd), 0);
 }
 
@@ -3565 +3432 @@
     TBUTTON_INFO *btnPtr;
     INT nIndex;
-    DWORD oldState;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
@@ -3572 +3438 @@
 
     btnPtr = &infoPtr->buttons[nIndex];
-    oldState = btnPtr->fsState;
     if (LOWORD(lParam) == FALSE)
         btnPtr->fsState &= ~TBSTATE_INDETERMINATE;
@@ -3578 +3443 @@
         btnPtr->fsState |= TBSTATE_INDETERMINATE;
 
-    if(oldState != btnPtr->fsState)
-        InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+    InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr));
 
     return TRUE;
@@ -3620 +3484 @@
               debugstr_a((LPSTR)lpTbb->iString));
         len = strlen((LPSTR)lpTbb->iString) + 2;
-        ptr = Alloc(len);
+        ptr = COMCTL32_Alloc(len);
         strcpy(ptr, (LPSTR)lpTbb->iString);
         ptr[len - 1] = 0; /* ended by two '\0' */
         lpTbb->iString = TOOLBAR_AddStringA(hwnd, 0, (LPARAM)ptr);
-        Free(ptr);
+        COMCTL32_Free(ptr);
     }
 
@@ -3635 +3499 @@
     oldButtons = infoPtr->buttons;
     infoPtr->nNumButtons++;
-    infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
+    infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
     /* pre insert copy */
     if (nIndex > 0) {
@@ -3655 +3519 @@
         infoPtr->buttons[nIndex].iString   = lpTbb->iString;
 
-    if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & BTNS_SEP)) {
+    if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & TBSTYLE_SEP)) {
         TTTOOLINFOA ti;
 
@@ -3675 +3539 @@
     }
 
-    Free (oldButtons);
+    COMCTL32_Free (oldButtons);
 
     TOOLBAR_CalcToolbar (hwnd);
@@ -3720 +3584 @@
               debugstr_w((LPWSTR)lpTbb->iString));
         len = strlenW((LPWSTR)lpTbb->iString) + 2;
-        ptr = Alloc(len*sizeof(WCHAR));
+        ptr = COMCTL32_Alloc(len*sizeof(WCHAR));
         strcpyW(ptr, (LPWSTR)lpTbb->iString);
         ptr[len - 1] = 0; /* ended by two '\0' */
         lpTbb->iString = TOOLBAR_AddStringW(hwnd, 0, (LPARAM)ptr);
-        Free(ptr);
+        COMCTL32_Free(ptr);
     }
 
@@ -3735 +3599 @@
     oldButtons = infoPtr->buttons;
     infoPtr->nNumButtons++;
-    infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
+    infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
     /* pre insert copy */
     if (nIndex > 0) {
@@ -3755 +3619 @@
         infoPtr->buttons[nIndex].iString   = lpTbb->iString;
 
-    if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & BTNS_SEP)) {
+    if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & TBSTYLE_SEP)) {
         TTTOOLINFOW ti;
 
@@ -3775 +3639 @@
     }
 
-    Free (oldButtons);
+    COMCTL32_Free (oldButtons);
 
     TOOLBAR_CalcToolbar (hwnd);
@@ -3872 +3736 @@
 
 
-static LRESULT
-TOOLBAR_LoadImages (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TBADDBITMAP tbab;
-    tbab.hInst = (HINSTANCE)lParam;
-    tbab.nID = (UINT_PTR)wParam;
-
-    TRACE("hwnd = %p, hInst = %p, nID = %u\n", hwnd, tbab.hInst, tbab.nID);
-
-    return TOOLBAR_AddBitmap(hwnd, 0, (LPARAM)&tbab);
-}
-
-
-static LRESULT
-TOOLBAR_MapAccelerator (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-    WCHAR wAccel = (WCHAR)wParam;
-    UINT* pIDButton = (UINT*)lParam;
-    WCHAR wszAccel[] = {'&',wAccel,0};
-    int i;
-    
-    TRACE("hwnd = %p, wAccel = %x(%s), pIDButton = %p\n",
-        hwnd, wAccel, debugstr_wn(&wAccel,1), pIDButton);
-    
-    for (i = 0; i < infoPtr->nNumButtons; i++)
-    {
-        TBUTTON_INFO *btnPtr = infoPtr->buttons+i;
-        if (!(btnPtr->fsStyle & BTNS_NOPREFIX) &&
-            !(btnPtr->fsState & TBSTATE_HIDDEN))
-        {
-            int iLen = strlenW(wszAccel);
-            LPCWSTR lpszStr = TOOLBAR_GetText(infoPtr, btnPtr);
-            
-            if (!lpszStr)
-                continue;
-
-            while (*lpszStr)
-            {
-                if ((lpszStr[0] == '&') && (lpszStr[1] == '&'))
-                {
-                    lpszStr += 2;
-                    continue;
-                }
-                if (!strncmpiW(lpszStr, wszAccel, iLen))
-                {
-                    *pIDButton = btnPtr->idCommand;
-                    return TRUE;
-                }
-                lpszStr++;
-            }
-        }
-    }
-    return FALSE;
-}
-
-
-static LRESULT
-TOOLBAR_MarkButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-    INT nIndex;
-
-    TRACE("hwnd = %p, wParam = %d, lParam = 0x%08lx\n", hwnd, wParam, lParam);
-
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
-    if (nIndex == -1)
-        return FALSE;
-
-    if (LOWORD(lParam))
-        infoPtr->buttons[nIndex].fsState |= TBSTATE_MARKED;
-    else
-        infoPtr->buttons[nIndex].fsState &= ~TBSTATE_MARKED;
-
-    return TRUE;
-}
-
+/* << TOOLBAR_LoadImages >> */
+/* << TOOLBAR_MapAccelerator >> */
+/* << TOOLBAR_MarkButton >> */
 /* << TOOLBAR_MoveButton >> */
 
@@ -3958 +3748 @@
     TBUTTON_INFO *btnPtr;
     INT nIndex;
-    DWORD oldState;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
@@ -3965 +3754 @@
 
     btnPtr = &infoPtr->buttons[nIndex];
-    oldState = btnPtr->fsState;
     if (LOWORD(lParam) == FALSE)
         btnPtr->fsState &= ~TBSTATE_PRESSED;
@@ -3971 +3759 @@
         btnPtr->fsState |= TBSTATE_PRESSED;
 
-    if(oldState != btnPtr->fsState)
-        InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+    InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr));
 
     return TRUE;
 }
 
-/* FIXME: there might still be some confusion her between number of buttons
- * and number of bitmaps */
+
 static LRESULT
 TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -3986 +3772 @@
     HBITMAP hBitmap;
     int i = 0, nOldButtons = 0, pos = 0;
-    int nOldBitmaps, nNewBitmaps;
     HIMAGELIST himlDef = 0;
 
@@ -4030 +3815 @@
         return FALSE;
     }
-    
-    himlDef = GETDEFIMAGELIST(infoPtr, 0); /* fixme: correct? */
-    nOldBitmaps = ImageList_GetImageCount(himlDef);
+
+    infoPtr->nNumBitmaps = infoPtr->nNumBitmaps - nOldButtons + lpReplace->nButtons;
 
     /* ImageList_Replace(GETDEFIMAGELIST(), pos, hBitmap, NULL); */
 
-    for (i = pos + nOldBitmaps - 1; i >= pos; i--)
+
+    himlDef = GETDEFIMAGELIST(infoPtr, 0);
+    for (i = pos + nOldButtons - 1; i >= pos; i--) {
         ImageList_Remove(himlDef, i);
+    }
 
     {
@@ -4066 +3853 @@
        DeleteDC (hdcBitmap);
 
-       ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
-       nNewBitmaps = ImageList_GetImageCount(himlDef);
+       ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
        DeleteObject (hbmLoad);
     }
 
-    infoPtr->nNumBitmaps = infoPtr->nNumBitmaps - nOldBitmaps + nNewBitmaps;
-
-    TRACE(" pos %d  %d old bitmaps replaced by %d new ones.\n",
-            pos, nOldBitmaps, nNewBitmaps);
-
-    InvalidateRect(hwnd, NULL, TRUE);
+    InvalidateRect(hwnd, NULL, FALSE);
 
     return TRUE;
@@ -4393 +4174 @@
 }
 
-/* This function differs a bit from what MSDN says it does:
- * 1. lParam contains extended style flags to OR with current style
- *  (MSDN isn't clear on the OR bit)
- * 2. wParam appears to contain extended style flags to be reset
- *  (MSDN says that this parameter is reserved)
- */
 static LRESULT
 TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -4406 +4181 @@
 
     dwTemp = infoPtr->dwExStyle;
-    infoPtr->dwExStyle &= ~wParam;
-    infoPtr->dwExStyle |= (DWORD)lParam;
-
-    TRACE("new style 0x%08lx\n", infoPtr->dwExStyle);
+    infoPtr->dwExStyle = (DWORD)lParam;
+
+    if (infoPtr->dwExStyle & (TBSTYLE_EX_MIXEDBUTTONS |
+                              TBSTYLE_EX_HIDECLIPPEDBUTTONS)) {
+        FIXME("Extended style not implemented %s %s\n",
+              (infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) ?
+              "TBSTYLE_EX_MIXEDBUTTONS" : "",
+              (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS) ?
+              "TBSTYLE_EX_HIDECLIPPEDBUTTONS" : "");
+    }
 
     if (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)
         FIXME("Unknown Toolbar Extended Style 0x%08lx. Please report.\n",
               (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL));
-
-    TOOLBAR_CalcToolbar (hwnd);
-
-    TOOLBAR_AutoSize(hwnd);
-
-    InvalidateRect(hwnd, NULL, TRUE);
 
     return (LRESULT)dwTemp;
@@ -4435 +4210 @@
     if (infoPtr->iVersion >= 5)
         id = wParam;
-
-    TRACE("hwnd = %p, himl = %p, id = %d\n", hwnd, himl, id);
 
     himlTemp = TOOLBAR_InsertImageList(&infoPtr->himlHot, 
@@ -4465 +4238 @@
             btnPtr = &infoPtr->buttons[(INT)wParam];
             btnPtr->bHot = TRUE;
-                InvalidateRect (hwnd, &btnPtr->rect, TRUE);
+                InvalidateRect (hwnd, &btnPtr->rect,
+                    TOOLBAR_HasText(infoPtr, btnPtr));
         }
         if (nOldHotItem>=0)
@@ -4471 +4245 @@
             btnPtr = &infoPtr->buttons[nOldHotItem];
             btnPtr->bHot = FALSE;
-                InvalidateRect (hwnd, &btnPtr->rect, TRUE);
+                InvalidateRect (hwnd, &btnPtr->rect,
+                    TOOLBAR_HasText(infoPtr, btnPtr));
         }
     }
@@ -4506 +4281 @@
           infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
 
+    /* FIXME: redraw ? */
     InvalidateRect(hwnd, NULL, TRUE);
 
@@ -4559 +4335 @@
     infoPtr->nMaxTextRows = (INT)wParam;
 
-    TOOLBAR_CalcToolbar(hwnd);
     return TRUE;
 }
 
 
-/* MSDN gives slightly wrong info on padding.
- * 1. It is not only used on buttons with the BTNS_AUTOSIZE style
- * 2. It is not used to create a blank area between the edge of the button
- *    and the text or image if TBSTYLE_LIST is set. It is used to control
- *    the gap between the image and text. 
- * 3. It is not applied to both sides. If TBSTYLE_LIST is set it is used 
- *    to control the bottom and right borders [with the border being
- *    szPadding.cx - (GetSystemMetrics(SM_CXEDGE)+1)], otherwise the padding
- *    is shared evenly on both sides of the button.
- */
 static LRESULT
 TOOLBAR_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -4583 +4348 @@
     infoPtr->szPadding.cx = LOWORD((DWORD)lParam);
     infoPtr->szPadding.cy = HIWORD((DWORD)lParam);
-    TRACE("cx=%ld, cy=%ld\n",
+    FIXME("stub - nothing done with values, cx=%ld, cy=%ld\n",
           infoPtr->szPadding.cx, infoPtr->szPadding.cy);
     return (LRESULT) oldPad;
@@ -4626 +4391 @@
 
         /* repaint toolbar */
-        InvalidateRect(hwnd, NULL, TRUE);
+        InvalidateRect(hwnd, NULL, FALSE);
     }
 
@@ -4658 +4423 @@
         btnPtr->fsState = LOWORD(lParam);
         TOOLBAR_CalcToolbar (hwnd);
-        InvalidateRect(hwnd, 0, TRUE);
+        InvalidateRect(hwnd, 0, TOOLBAR_HasText(infoPtr, btnPtr));
         return TRUE;
     }
@@ -4666 +4431 @@
     {
         btnPtr->fsState = LOWORD(lParam);
-        InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+        InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
+            btnPtr));
     }
 
@@ -4676 +4442 @@
 TOOLBAR_SetStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    SetWindowLongW(hwnd, GWL_STYLE, lParam);
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    TBUTTON_INFO *btnPtr;
+    INT nIndex;
+
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
+    if (nIndex == -1)
+        return FALSE;
+
+    btnPtr = &infoPtr->buttons[nIndex];
+
+    /* process style change if current style doesn't match new style */
+    if(btnPtr->fsStyle != LOWORD(lParam))
+    {
+        btnPtr->fsStyle = LOWORD(lParam);
+        InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
+            btnPtr));
+
+        if (infoPtr->hwndToolTip) {
+            FIXME("change tool tip!\n");
+        }
+    }
 
     return TRUE;
@@ -4686 +4472 @@
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
-    TRACE("hwnd=%p, hwndTooltip=%p, lParam=0x%lx\n", hwnd, (HWND)wParam, lParam);
 
     if (infoPtr == NULL)
@@ -4737 +4521 @@
     infoPtr->clrBtnHighlight = lParam->clrBtnHighlight;
     infoPtr->clrBtnShadow = lParam->clrBtnShadow;
-    InvalidateRect(hwnd, NULL, TRUE);
+    InvalidateRect(hwnd, 0, 0);
     return 0;
 }
@@ -4756 +4540 @@
 }
 
-
-static LRESULT
-TOOLBAR_GetStringA (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
-    WORD iString = HIWORD(wParam);
-    WORD buffersize = LOWORD(wParam);
-    LPSTR str = (LPSTR)lParam;
-    LRESULT ret = -1;
-
-    TRACE("hwnd=%p, iString=%d, buffersize=%d, string=%p\n", hwnd, iString, buffersize, str);
-
-    if (iString < infoPtr->nNumStrings)
-    {
-        ret = WideCharToMultiByte(CP_ACP, 0, infoPtr->strings[iString], -1, str, buffersize, NULL, NULL);
-
-        TRACE("returning %s\n", debugstr_a(str));
-    }
-    else
-        ERR("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1);
-
-    return ret;
-}
-
-
-static LRESULT
-TOOLBAR_GetStringW (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
-    WORD iString = HIWORD(wParam);
-    WORD len = LOWORD(wParam)/sizeof(WCHAR) - 1;
-    LPWSTR str = (LPWSTR)lParam;
-    LRESULT ret = -1;
-
-    TRACE("hwnd=%p, iString=%d, buffersize=%d, string=%p\n", hwnd, iString, LOWORD(wParam), str);
-
-    if (iString < infoPtr->nNumStrings)
-    {
-        len = min(len, strlenW(infoPtr->strings[iString]));
-        ret = (len+1)*sizeof(WCHAR);
-        memcpy(str, infoPtr->strings[iString], ret);
-        str[len] = '\0';
-
-        TRACE("returning %s\n", debugstr_w(str));
-    }
-    else
-        ERR("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1);
-
-    return ret;
-}
-
-/* UNDOCUMENTED MESSAGE: This appears to set some kind of size. Perhaps it
- * is the maximum size of the toolbar? */
-static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    SIZE * pSize = (SIZE*)lParam;
-    FIXME("hwnd=%p, wParam=0x%08x, size.cx=%ld, size.cy=%ld stub!\n", hwnd, wParam, pSize->cx, pSize->cy);
-    return 0;
-}
 
 /*********************************************************************/
@@ -4849 +4574 @@
         btnPtr = &infoPtr->buttons[(INT)wParam];
         btnPtr->bHot = (no_hi) ? FALSE : TRUE;
-        InvalidateRect (hwnd, &btnPtr->rect, TRUE);
+        InvalidateRect (hwnd, &btnPtr->rect,
+                        TOOLBAR_HasText(infoPtr, btnPtr));
     }
     if (nOldHotItem>=0) {
         btnPtr = &infoPtr->buttons[nOldHotItem];
         btnPtr->bHot = FALSE;
-        InvalidateRect (hwnd, &btnPtr->rect, TRUE);
+        InvalidateRect (hwnd, &btnPtr->rect,
+                        TOOLBAR_HasText(infoPtr, btnPtr));
     }
     GetFocus();
@@ -4866 +4593 @@
 }
 
-/* UNDOCUMENTED MESSAGE: This sets the toolbar global iListGap parameter
- * which controls the amount of spacing between the image and the text
- * of buttons for TBSTYLE_LIST toolbars. */
-static LRESULT TOOLBAR_Unkwn460(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
-
-    TRACE("hwnd=%p iListGap=%d\n", hwnd, wParam);
-    
-    if (lParam != 0)
-        FIXME("lParam = 0x%08lx. Please report\n", lParam);
-    
-    infoPtr->iListGap = (INT)wParam;
-
-    TOOLBAR_CalcToolbar(hwnd);
-    InvalidateRect(hwnd, NULL, TRUE);
-
-    return 0;
-}
-
-/* UNDOCUMENTED MESSAGE: This returns the number of maximum number
- * of image lists associated with the various states. */
-static LRESULT TOOLBAR_Unkwn462(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
-
-    TRACE("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
-
-    return max(infoPtr->cimlDef, max(infoPtr->cimlHot, infoPtr->cimlDis));
-}
 
 static LRESULT
@@ -4926 +4623 @@
             HWND hwndParent = GetParent(hwnd);
 
+            InvalidateRect(hwnd, 0, 1);
             GetWindowRect(hwnd, &rc);
             MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2);
@@ -4951 +4649 @@
 }
 
-static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    FIXME("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
-
-    InvalidateRect(hwnd, NULL, TRUE);
-    return 1;
-}
-
 
 static LRESULT
@@ -4966 +4656 @@
     DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
     LOGFONTA logFont;
-
-    TRACE("hwnd = %p\n", hwnd);
 
     /* initialize info structure */
@@ -4976 +4664 @@
 
     infoPtr->nHeight = infoPtr->nButtonHeight + TOP_BORDER + BOTTOM_BORDER;
+    infoPtr->nRows = 1;
     infoPtr->nMaxTextRows = 1;
     infoPtr->cxMin = -1;
@@ -4987 +4676 @@
     infoPtr->nOldHit = -1;
     infoPtr->nHotItem = -2; /* It has to be initially different from nOldHit */
-    infoPtr->hwndNotify = ((LPCREATESTRUCTW)lParam)->hwndParent;
+    infoPtr->hwndNotify = GetParent (hwnd);
     infoPtr->bTransparent = (dwStyle & TBSTYLE_TRANSPARENT);
     infoPtr->bBtnTranspnt = (dwStyle & (TBSTYLE_FLAT | TBSTYLE_LIST));
@@ -4997 +4686 @@
     infoPtr->clrBtnHighlight = CLR_DEFAULT;
     infoPtr->clrBtnShadow = CLR_DEFAULT;
-    /* not sure where the +1 comes from, but this comes to the same value
-     * as native so this is probably correct */
-    infoPtr->szPadding.cx = 2*(GetSystemMetrics(SM_CXEDGE)+OFFSET_X) + 1;
-    infoPtr->szPadding.cy = 2*(GetSystemMetrics(SM_CYEDGE)+OFFSET_Y);
-    infoPtr->iListGap = infoPtr->szPadding.cx / 2;
-    GetClientRect(hwnd, &infoPtr->client_rect);
+    infoPtr->szPadding.cx = 7;
+    infoPtr->szPadding.cy = 6;
     TOOLBAR_NotifyFormat(infoPtr, (WPARAM)hwnd, (LPARAM)NF_REQUERY);
 
@@ -5044 +4729 @@
         DestroyWindow (infoPtr->hwndToolTip);
 
-    /* delete temporary buffer for tooltip text */
-    if (infoPtr->pszTooltipText)
-        HeapFree(GetProcessHeap(), 0, infoPtr->pszTooltipText);
-
     /* delete button data */
     if (infoPtr->buttons)
-        Free (infoPtr->buttons);
+        COMCTL32_Free (infoPtr->buttons);
 
     /* delete strings */
@@ -5057 +4738 @@
         for (i = 0; i < infoPtr->nNumStrings; i++)
             if (infoPtr->strings[i])
-                Free (infoPtr->strings[i]);
-
-        Free (infoPtr->strings);
+                COMCTL32_Free (infoPtr->strings[i]);
+
+        COMCTL32_Free (infoPtr->strings);
     }
 
@@ -5075 +4756 @@
 
     /* free toolbar info data */
-    Free (infoPtr);
+    COMCTL32_Free (infoPtr);
     SetWindowLongA (hwnd, 0, 0);
 
@@ -5183 +4864 @@
         btnPtr->fsState |= TBSTATE_PRESSED;
 
-        InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+        InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
+            btnPtr));
     }
     else if (GetWindowLongA (hwnd, GWL_STYLE) & CCS_ADJUSTABLE)
@@ -5218 +4900 @@
 
         /* for EX_DRAWDDARROWS style,  click must be in the drop-down arrow rect */
-        if ((btnPtr->fsState & TBSTATE_ENABLED) && 
-             ((btnPtr->fsStyle & BTNS_WHOLEDROPDOWN) ||
-              ((btnPtr->fsStyle & BTNS_DROPDOWN) &&
-               ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) ||
-               (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle))))))
+        if ((btnPtr->fsState & TBSTATE_ENABLED) && (btnPtr->fsStyle & TBSTYLE_DROPDOWN) &&
+             ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) ||
+              (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle))))
         {
             LRESULT res;
@@ -5236 +4916 @@
             nmtb.cchText = 0;
             nmtb.pszText = 0;
-            CopyRect(&nmtb.rcButton, &btnPtr->rect);
+            memset(&nmtb.rcButton, 0, sizeof(RECT));
             res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
                                   TBN_DROPDOWN);
@@ -5252 +4932 @@
 
         if (btnPtr->fsState & TBSTATE_ENABLED)
-            InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+            InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr));
         UpdateWindow(hwnd);
         SetCapture (hwnd);
@@ -5299 +4979 @@
         infoPtr->buttons[infoPtr->nHotItem].bHot = TRUE;
 
-    if (0 <= infoPtr->nButtonDown) {
         btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
         btnPtr->fsState &= ~TBSTATE_PRESSED;
 
-        if (btnPtr->fsStyle & BTNS_CHECK) {
-                if (btnPtr->fsStyle & BTNS_GROUP) {
+        if (btnPtr->fsStyle & TBSTYLE_CHECK) {
+                if (btnPtr->fsStyle & TBSTYLE_GROUP) {
                     nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr,
                         nHit);
@@ -5322 +5001 @@
         }
 
-        if (nOldIndex != -1)
-            InvalidateRect(hwnd, &infoPtr->buttons[nOldIndex].rect, TRUE);
+        if (nOldIndex != -1)
+        {
+            InvalidateRect(hwnd, &infoPtr->buttons[nOldIndex].rect,
+                TOOLBAR_HasText(infoPtr, &infoPtr->buttons[nOldIndex]));
+        }
 
         /*
@@ -5366 +5048 @@
             TOOLBAR_SendNotify ((NMHDR *) &nmmouse, infoPtr, NM_CLICK);
         }
-    }
     return 0;
 }
@@ -5386 +5067 @@
 
         if (btnPtr->fsState & TBSTATE_ENABLED)
-            InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+            InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
+              btnPtr));
     }
     return 0;
@@ -5410 +5092 @@
         rc1 = hotBtnPtr->rect;
         InflateRect (&rc1, 1, 1);
-        InvalidateRect (hwnd, &rc1, TRUE);
+        InvalidateRect (hwnd, &rc1, TOOLBAR_HasText(infoPtr,
+            hotBtnPtr));
     }
 
@@ -5471 +5154 @@
     if (infoPtr->nOldHit != nHit)
     {
-        /* Remove the effect of an old hot button if the button was
+        /* Remove the effect of an old hot button if the button was enabled and was
            drawn with the hot button effect */
-        if(infoPtr->nOldHit >= 0 && infoPtr->nOldHit == infoPtr->nHotItem)
+        if(infoPtr->nOldHit >= 0 && infoPtr->nOldHit == infoPtr->nHotItem &&
+                (infoPtr->buttons[infoPtr->nOldHit].fsState & TBSTATE_ENABLED))
         {
             oldBtnPtr = &infoPtr->buttons[infoPtr->nOldHit];
@@ -5486 +5170 @@
             infoPtr->nHotItem = nHit;
 
-            btnPtr->bHot = TRUE;
+            /* only enabled buttons show hot effect */
+            if(infoPtr->buttons[nHit].fsState & TBSTATE_ENABLED)
+            {
+                btnPtr->bHot = TRUE;
+            }
         }
 
@@ -5502 +5190 @@
         /* now invalidate the old and new buttons so they will be painted */
         if (oldBtnPtr)
-            InvalidateRect (hwnd, &oldBtnPtr->rect, TRUE);
-        if (btnPtr)
-            InvalidateRect(hwnd, &btnPtr->rect, TRUE);
+            InvalidateRect (hwnd, &oldBtnPtr->rect,
+                            TOOLBAR_HasText(infoPtr, oldBtnPtr));
+        if (btnPtr && (btnPtr->fsState & TBSTATE_ENABLED))
+            InvalidateRect(hwnd, &btnPtr->rect,
+                           TOOLBAR_HasText(infoPtr, btnPtr));
 
         if (infoPtr->bCaptured) {
@@ -5551 +5241 @@
 
     /* allocate memory for info structure */
-    infoPtr = (TOOLBAR_INFO *)Alloc (sizeof(TOOLBAR_INFO));
+    infoPtr = (TOOLBAR_INFO *)COMCTL32_Alloc (sizeof(TOOLBAR_INFO));
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
     /* paranoid!! */
     infoPtr->dwStructSize = sizeof(TBBUTTON);
-    infoPtr->nRows = 1;
 
     /* fix instance handle, if the toolbar was created by CreateToolbarEx() */
@@ -5650 +5339 @@
 
 
-/* handles requests from the tooltip control on what text to display */
-static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnmtdi)
-{
-    int index = TOOLBAR_GetButtonIndex(infoPtr, lpnmtdi->hdr.idFrom, FALSE);
-
-    TRACE("button index = %d\n", index);
-
-    if (infoPtr->pszTooltipText)
-    {
-        HeapFree(GetProcessHeap(), 0, infoPtr->pszTooltipText);
-        infoPtr->pszTooltipText = NULL;
-    }
-
-    if (index < 0)
-        return 0;
-
-    if (infoPtr->bNtfUnicode)
-    {
-        WCHAR wszBuffer[INFOTIPSIZE+1];
-        NMTBGETINFOTIPW tbgit;
-        int len; /* in chars */
-
-        wszBuffer[0] = '\0';
-        wszBuffer[INFOTIPSIZE] = '\0';
-
-        tbgit.pszText = wszBuffer;
-        tbgit.cchTextMax = INFOTIPSIZE;
-        tbgit.iItem = lpnmtdi->hdr.idFrom;
-        tbgit.lParam = infoPtr->buttons[index].dwData;
-
-        TOOLBAR_SendNotify(&tbgit.hdr, infoPtr, TBN_GETINFOTIPW);
-
-        TRACE("TBN_GETINFOTIPW - got string %s\n", debugstr_w(tbgit.pszText));
-
-        len = strlenW(tbgit.pszText);
-        if (len > sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0])-1)
-        {
-            /* need to allocate temporary buffer in infoPtr as there
-             * isn't enough space in buffer passed to us by the
-             * tooltip control */
-            infoPtr->pszTooltipText = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR));
-            if (infoPtr->pszTooltipText)
-            {
-                memcpy(infoPtr->pszTooltipText, tbgit.pszText, (len+1)*sizeof(WCHAR));
-                lpnmtdi->lpszText = infoPtr->pszTooltipText;
-                return 0;
-            }
-        }
-        else if (len > 0)
-        {
-            memcpy(lpnmtdi->lpszText, tbgit.pszText, (len+1)*sizeof(WCHAR));
-            return 0;
-        }
-    }
-    else
-    {
-        CHAR szBuffer[INFOTIPSIZE+1];
-        NMTBGETINFOTIPA tbgit;
-        int len; /* in chars */
-
-        szBuffer[0] = '\0';
-        szBuffer[INFOTIPSIZE] = '\0';
-
-        tbgit.pszText = szBuffer;
-        tbgit.cchTextMax = INFOTIPSIZE;
-        tbgit.iItem = lpnmtdi->hdr.idFrom;
-        tbgit.lParam = infoPtr->buttons[index].dwData;
-
-        TOOLBAR_SendNotify(&tbgit.hdr, infoPtr, TBN_GETINFOTIPA);
-
-        TRACE("TBN_GETINFOTIPA - got string %s\n", debugstr_a(tbgit.pszText));
-
-        len = -1 + MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, -1, NULL, 0);
-        if (len > sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0])-1)
-        {
-            /* need to allocate temporary buffer in infoPtr as there
-             * isn't enough space in buffer passed to us by the
-             * tooltip control */
-            infoPtr->pszTooltipText = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR));
-            if (infoPtr->pszTooltipText)
-            {
-                MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, len+1, infoPtr->pszTooltipText, (len+1)*sizeof(WCHAR));
-                lpnmtdi->lpszText = infoPtr->pszTooltipText;
-                return 0;
-            }
-        }
-        else if (len > 0)
-        {
-            MultiByteToWideChar(CP_ACP, 0, tbgit.pszText, len+1, lpnmtdi->lpszText, (len+1)*sizeof(WCHAR));
-            return 0;
-        }
-    }
-
-    /* if button has text, but it is not shown then automatically
-     * use that text as tooltip */
-    if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) &&
-        !(infoPtr->buttons[index].fsStyle & BTNS_SHOWTEXT))
-    {
-        LPWSTR pszText = TOOLBAR_GetText(infoPtr, &infoPtr->buttons[index]);
-        int len = pszText ? strlenW(pszText) : 0;
-
-        TRACE("using button hidden text %s\n", debugstr_w(pszText));
-
-        if (len > sizeof(lpnmtdi->szText)/sizeof(lpnmtdi->szText[0])-1)
-        {
-            /* need to allocate temporary buffer in infoPtr as there
-             * isn't enough space in buffer passed to us by the
-             * tooltip control */
-            infoPtr->pszTooltipText = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR));
-            if (infoPtr->pszTooltipText)
-            {
-                memcpy(infoPtr->pszTooltipText, pszText, (len+1)*sizeof(WCHAR));
-                lpnmtdi->lpszText = infoPtr->pszTooltipText;
-                return 0;
-            }
-        }
-        else if (len > 0)
-        {
-            memcpy(lpnmtdi->lpszText, pszText, (len+1)*sizeof(WCHAR));
-            return 0;
-        }
-    }
-
-    TRACE("Sending tooltip notification to %p\n", infoPtr->hwndNotify);
-
-    /* last resort: send notification on to app */
-    /* FIXME: find out what is really used here */
-    return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, 0, (LPARAM)lpnmtdi);
-}
-
-
 inline static LRESULT
 TOOLBAR_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -5787 +5345 @@
     LPNMHDR lpnmh = (LPNMHDR)lParam;
 
-    switch (lpnmh->code)
-    {
-    case PGN_CALCSIZE:
-    {
-        LPNMPGCALCSIZE lppgc = (LPNMPGCALCSIZE)lParam;
-
-        if (lppgc->dwFlag == PGF_CALCWIDTH) {
-            lppgc->iWidth = infoPtr->rcBound.right - infoPtr->rcBound.left;
-            TRACE("processed PGN_CALCSIZE, returning horz size = %d\n",
-                  lppgc->iWidth);
-        }
-        else {
-            lppgc->iHeight = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
-            TRACE("processed PGN_CALCSIZE, returning vert size = %d\n",
-                  lppgc->iHeight);
-        }
-        return 0;
-    }
-
-    case PGN_SCROLL:
-    {
-        LPNMPGSCROLL lppgs = (LPNMPGSCROLL)lParam;
-
-        lppgs->iScroll = (lppgs->iDir & (PGF_SCROLLLEFT | PGF_SCROLLRIGHT)) ?
-                          infoPtr->nButtonWidth : infoPtr->nButtonHeight;
-        TRACE("processed PGN_SCROLL, returning scroll=%d, dir=%d\n",
-              lppgs->iScroll, lppgs->iDir);
-        return 0;
-    }
-
-    case TTN_GETDISPINFOW:
-        return TOOLBAR_TTGetDispInfo(infoPtr, (LPNMTTDISPINFOW)lParam);
-
-    case TTN_GETDISPINFOA:
-        FIXME("TTN_GETDISPINFOA - stub\n");
-        return 0;
-
-    default:
-        return 0;
-    }
+    if (lpnmh->code == PGN_CALCSIZE) {
+        LPNMPGCALCSIZE lppgc = (LPNMPGCALCSIZE)lParam;
+
+        if (lppgc->dwFlag == PGF_CALCWIDTH) {
+            lppgc->iWidth = infoPtr->rcBound.right - infoPtr->rcBound.left;
+            TRACE("processed PGN_CALCSIZE, returning horz size = %d\n",
+                  lppgc->iWidth);
+        }
+        else {
+            lppgc->iHeight = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
+            TRACE("processed PGN_CALCSIZE, returning vert size = %d\n",
+                  lppgc->iHeight);
+        }
+        return 0;
+    }
+
+    if (lpnmh->code == PGN_SCROLL) {
+        LPNMPGSCROLL lppgs = (LPNMPGSCROLL)lParam;
+
+        lppgs->iScroll = (lppgs->iDir & (PGF_SCROLLLEFT | PGF_SCROLLRIGHT)) ?
+                          infoPtr->nButtonWidth : infoPtr->nButtonHeight;
+        TRACE("processed PGN_SCROLL, returning scroll=%d, dir=%d\n",
+              lppgs->iScroll, lppgs->iDir);
+        return 0;
+    }
+
+
+    TRACE("passing WM_NOTIFY!\n");
+
+    if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
+        if (infoPtr->bNtfUnicode)
+            return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY,
+                                 wParam, lParam);
+        else
+            return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
+                                 wParam, lParam);
+
+#if 0
+        if (lpnmh->code == TTN_GETDISPINFOA) {
+            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
+
+            FIXME("retrieving ASCII string\n");
+
+        }
+        else if (lpnmh->code == TTN_GETDISPINFOW) {
+            LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
+
+            FIXME("retrieving UNICODE string\n");
+
+        }
+#endif
+    }
+
+    return 0;
 }
 
@@ -5846 +5418 @@
     INT i;
 
-    TRACE("wParam = 0x%x, lParam = 0x%08lx\n", wParam, lParam);
-
-    if ((lParam == NF_QUERY) && ((HWND)wParam == infoPtr->hwndToolTip))
-        return NFR_UNICODE;
-
     if (lParam == NF_REQUERY) {
-        i = SendMessageA(infoPtr->hwndNotify,
+        i = SendMessageA(GetParent(infoPtr->hwndSelf),
                          WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
         if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
@@ -5900 +5467 @@
       *  *previous* status of the redraw flag (either 0 or 1)
       *  instead of the MSDN documented value of 0 if handled.
-      *  (For laughs see the "consistency" with same function
+      *  (For laughs see the "consistancy" with same function
       *   in rebar.)
       *
@@ -5975 +5542 @@
             cx = infoPtr->nWidth;
 
-            if ((dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) {
+            if (dwStyle & CCS_NOMOVEY) {
                 GetWindowRect(hwnd, &window_rect);
                 ScreenToClient(parent, (LPPOINT)&window_rect.left);
-                y = window_rect.top;
+                y = window_rect.top;
             }
-            if ((dwStyle & CCS_BOTTOM) == CCS_BOTTOM) {
-                GetWindowRect(hwnd, &window_rect);
-                y = parent_rect.bottom -
-                    ( window_rect.bottom - window_rect.top);
-            }
         }
 
@@ -6003 +5565 @@
         }
 
-        if(infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS)
-        {
-            RECT delta_width, delta_height, client, dummy;
-            DWORD min_x, max_x, min_y, max_y;
-            TBUTTON_INFO *btnPtr;
-            INT i;
-
-            GetClientRect(hwnd, &client);
-            if(client.right > infoPtr->client_rect.right)
-            {
-                min_x = infoPtr->client_rect.right;
-                max_x = client.right;
-            }
-            else
-            {
-                max_x = infoPtr->client_rect.right;
-                min_x = client.right;
-            }
-            if(client.bottom > infoPtr->client_rect.bottom)
-            {
-                min_y = infoPtr->client_rect.bottom;
-                max_y = client.bottom;
-            }
-            else
-            {
-                max_y = infoPtr->client_rect.bottom;
-                min_y = client.bottom;
-            }
-
-            SetRect(&delta_width, min_x, 0, max_x, min_y);
-            SetRect(&delta_height, 0, min_y, max_x, max_y);
-
-            TRACE("delta_width %s delta_height %s\n", wine_dbgstr_rect(&delta_width), wine_dbgstr_rect(&delta_height));
-            btnPtr = infoPtr->buttons;
-            for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
-                if(IntersectRect(&dummy, &delta_width, &btnPtr->rect) ||
-                   IntersectRect(&dummy, &delta_height, &btnPtr->rect))
-                    InvalidateRect(hwnd, &btnPtr->rect, TRUE);
-        }
-
-        if((uPosFlags & (SWP_NOSIZE | SWP_NOMOVE)) == (SWP_NOSIZE | SWP_NOMOVE)) 
-            SetWindowPos (hwnd, 0,  x,  y, cx, cy, uPosFlags | SWP_NOZORDER);
-    }
-    GetClientRect(hwnd, &infoPtr->client_rect);
+        SetWindowPos (hwnd, 0, parent_rect.left - x, parent_rect.top - y,
+                        cx, cy, uPosFlags | SWP_NOZORDER);
+    }
     return 0;
 }
@@ -6067 +5588 @@
                                  (TBSTYLE_FLAT | TBSTYLE_LIST));
         TOOLBAR_CheckStyle (hwnd, lpStyle->styleNew);
-
-        TRACE("new style 0x%08lx\n", lpStyle->styleNew);
-    }
-
-    TOOLBAR_CalcToolbar(hwnd);
+    }
 
     TOOLBAR_AutoSize (hwnd);
 
-    InvalidateRect(hwnd, NULL, TRUE);
+    InvalidateRect(hwnd, NULL, FALSE);
 
     return 0;
@@ -6094 +5611 @@
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
     TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
           hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
@@ -6211 +5726 @@
             return TOOLBAR_GetState (hwnd, wParam, lParam);
 
-        case TB_GETSTRINGA:
-        return TOOLBAR_GetStringA (hwnd, wParam, lParam);
-
-        case TB_GETSTRINGW:
-            return TOOLBAR_GetStringW (hwnd, wParam, lParam);
-
         case TB_GETSTYLE:
             return TOOLBAR_GetStyle (hwnd, wParam, lParam);
@@ -6264 +5773 @@
             return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam);
 
-        case TB_LOADIMAGES:
-            return TOOLBAR_LoadImages (hwnd, wParam, lParam);
-
-        case TB_MAPACCELERATORA:
-        case TB_MAPACCELERATORW:
-            return TOOLBAR_MapAccelerator (hwnd, wParam, lParam);
-
-        case TB_MARKBUTTON:
-            return TOOLBAR_MarkButton (hwnd, wParam, lParam);
-
+        case TB_LOADIMAGES:                        /* 4.70 */
+            FIXME("missing standard imagelists\n");
+            return 0;
+
+/*      case TB_MAPACCELERATORA:                */ /* 4.71 */
+/*      case TB_MAPACCELERATORW:                */ /* 4.71 */
+/*      case TB_MARKBUTTON:                     */ /* 4.71 */
 /*      case TB_MOVEBUTTON:                     */ /* 4.71 */
 
@@ -6359 +5865 @@
             return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
 
-        case TB_UNKWN45D:
-            return TOOLBAR_Unkwn45D(hwnd, wParam, lParam);
-
         case TB_UNKWN45E:
             return TOOLBAR_Unkwn45E (hwnd, wParam, lParam);
 
-        case TB_UNKWN460:
-            return TOOLBAR_Unkwn460(hwnd, wParam, lParam);
-
-        case TB_UNKWN462:
-            return TOOLBAR_Unkwn462(hwnd, wParam, lParam);
-
         case TB_UNKWN463:
             return TOOLBAR_Unkwn463 (hwnd, wParam, lParam);
 
-        case TB_UNKWN464:
-            return TOOLBAR_Unkwn464(hwnd, wParam, lParam);
 
 /* Common Control Messages */
@@ -6445 +5940 @@
 
         case WM_NOTIFYFORMAT:
-            return TOOLBAR_NotifyFormatFake (hwnd, wParam, lParam);
+            TOOLBAR_NotifyFormatFake (hwnd, wParam, lParam);
 
         case WM_PAINT:
@@ -6469 +5964 @@
         case WM_MEASUREITEM:
         case WM_VKEYTOITEM:
-            return SendMessageA (infoPtr->hwndNotify, uMsg, wParam, lParam);
+            {
+                TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+                if(infoPtr != NULL)
+                    return SendMessageA (infoPtr->hwndNotify, uMsg, wParam, lParam);
+                else
+                    return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+            }
 
         /* We see this in Outlook Express 5.x and just does DefWindowProc */
@@ -6495 +5996 @@
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(TOOLBAR_INFO *);
-    wndClass.hCursor       = LoadCursorA (0, (LPSTR)IDC_ARROWA);
+    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = TOOLBARCLASSNAMEA;
@@ -6522 +6023 @@
         PIMLENTRY *pnies;
 
-        c = (PIMLENTRY) Alloc(sizeof(IMLENTRY));
+        c = (PIMLENTRY) COMCTL32_Alloc(sizeof(IMLENTRY));
         c->id = id;
 
-        pnies = Alloc((*cies + 1) * sizeof(PIMLENTRY));
+        pnies = COMCTL32_Alloc((*cies + 1) * sizeof(PIMLENTRY));
         memcpy(pnies, *pies, ((*cies) * sizeof(PIMLENTRY)));
         pnies[*cies] = c;
         (*cies)++;
 
-        Free(*pies);
+        COMCTL32_Free(*pies);
         *pies = pnies;
     }
@@ -6546 +6047 @@
 
     for (i = 0; i < *cies; i++)
-        Free((*pies)[i]);
-
-    Free(*pies);
+        COMCTL32_Free((*pies)[i]);
+
+    COMCTL32_Free(*pies);
 
     *cies = 0;