Changeset 10098 for trunk/src/comctl32/toolbar.c

Timestamp:

May 15, 2003, 4:26:27 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

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

trunk/src/comctl32/toolbar.c

@@ -30 +30 @@
  *
  * TODO:
- *   - A little bug in TOOLBAR_DrawMasked()
  *   - Button wrapping (under construction).
  *   - Messages.
@@ -97 +96 @@
 typedef struct
 {
+    HIMAGELIST himl;
+    INT id;
+} IMLENTRY, *PIMLENTRY;
+
+typedef struct
+{
     DWORD      dwStructSize;   /* size of TBBUTTON struct */
     INT      nHeight;        /* height of the toolbar */
@@ -125 +130 @@
     HFONT    hFont;           /* text font */
     HIMAGELIST himlInt;         /* image list created internally */
-    HIMAGELIST himlDef;         /* default image list */
-    HIMAGELIST himlHot;         /* hot image list */
-    HIMAGELIST himlDis;         /* disabled image list */
+    PIMLENTRY *himlDef;       /* default image list array */
+    INT       cimlDef;        /* default image list array count */
+    PIMLENTRY *himlHot;       /* hot image list array */
+    INT       cimlHot;        /* hot image list array count */
+    PIMLENTRY *himlDis;       /* disabled image list array */
+    INT       cimlDis;        /* disabled image list array count */
     HWND     hwndToolTip;     /* handle to tool tip control */
     HWND     hwndNotify;      /* handle to the window that gets notifications */
@@ -164 +172 @@
     BOOL     bVirtual;
     BOOL     bRemovable;
-    CHAR     text[64];
+    WCHAR    text[64];
 } CUSTOMBUTTON, *PCUSTOMBUTTON;
 
@@ -183 +191 @@
                         TBSTYLE_EX_HIDECLIPPEDBUTTONS)
 
+#define GETIBITMAP(infoPtr, i) (infoPtr->iVersion >= 5 ? LOWORD(i) : i)
+#define GETHIMLID(infoPtr, i) (infoPtr->iVersion >= 5 ? HIWORD(i) : 0)
+#define GETDEFIMAGELIST(infoPtr, id) TOOLBAR_GetImageList(infoPtr->himlDef, infoPtr->cimlDef, id)
+#define GETHOTIMAGELIST(infoPtr, id) TOOLBAR_GetImageList(infoPtr->himlHot, infoPtr->cimlHot, id)
+#define GETDISIMAGELIST(infoPtr, id) TOOLBAR_GetImageList(infoPtr->himlDis, infoPtr->cimlDis, id)
+
+static BOOL TOOLBAR_GetButtonInfo(TOOLBAR_INFO *infoPtr, NMTOOLBARW *nmtb);
+static BOOL TOOLBAR_IsButtonRemovable(TOOLBAR_INFO *infoPtr, int iItem, PCUSTOMBUTTON btnInfo);
+static HIMAGELIST TOOLBAR_GetImageList(PIMLENTRY *pies, INT cies, INT id);
+static PIMLENTRY TOOLBAR_GetImageListEntry(PIMLENTRY *pies, INT cies, INT id);
+static VOID TOOLBAR_DeleteImageList(PIMLENTRY **pies, INT *cies);
+static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id);
+
 static LRESULT
 TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam);
@@ -206 +227 @@
     if (TRACE_ON(toolbar)){
         TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08x\n",
-              btn_num, bP->idCommand,
-              bP->iBitmap, bP->fsState, bP->fsStyle, bP->dwData, bP->iString);
+              btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), 
+              bP->fsState, bP->fsStyle, bP->dwData, bP->iString);
         TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP)));
         if (internal)
-            TRACE("button %d id %d, hot=%s, row=%d, rect=(%d,%d)-(%d,%d)\n",
+            TRACE("button %d id %d, hot=%s, row=%d, rect=(%ld,%ld)-(%ld,%ld)\n",
                   btn_num, bP->idCommand,
                   (bP->bHot) ? "TRUE":"FALSE", bP->nRow,
@@ -309 +330 @@
               ret, nmgd.dwMask, infoPtr->nNumBitmaps);
     }
+
+    if (ret != I_IMAGENONE)
+        ret = GETIBITMAP(infoPtr, ret);
+
     return ret;
 }
@@ -316 +341 @@
 TOOLBAR_IsValidBitmapIndex(TOOLBAR_INFO *infoPtr, INT index)
 {
-    if (((index>=0) && (index <= infoPtr->nNumBitmaps)) ||
-        (index == I_IMAGECALLBACK))
+    HIMAGELIST himl;
+    INT id = GETHIMLID(infoPtr, index);
+    INT iBitmap = GETIBITMAP(infoPtr, index);
+
+    if (((himl = GETDEFIMAGELIST(infoPtr, id)) &&
+        iBitmap >= 0 && iBitmap < ImageList_GetImageCount(himl)) ||
+        (index == I_IMAGECALLBACK))
       return TRUE;
     else
@@ -444 +474 @@
     InflateRect (&myrect, -2, 0);
 
-    TRACE("rect=(%d,%d)-(%d,%d)\n",
+    TRACE("rect=(%ld,%ld)-(%ld,%ld)\n",
           myrect.left, myrect.top, myrect.right, myrect.bottom);
 
@@ -500 +530 @@
     /* draw text */
     if (lpText) {
-        TRACE("string rect=(%d,%d)-(%d,%d)\n",
+        TRACE("string rect=(%ld,%ld)-(%ld,%ld)\n",
               rcText->left, rcText->top, rcText->right, rcText->bottom);
 
@@ -543 +573 @@
                     HDC hdc, INT x, INT y)
 {
-    /* FIXME: this function is a hack since it uses image list
-              internals directly */
-
-    HIMAGELIST himl = infoPtr->himlDef;
+    HIMAGELIST himl = GETDEFIMAGELIST(infoPtr, 0);
+    INT cx, cy;
     HBITMAP hbmMask;
-    HDC hdcImageList;
     HDC hdcMask;
 
@@ -554 +581 @@
         return;
 
+    ImageList_GetIconSize(himl, &cx, &cy);
+
     /* create new dc's */
-    hdcImageList = CreateCompatibleDC (0);
     hdcMask = CreateCompatibleDC (0);
 
     /* create new bitmap */
-    hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL);
+    hbmMask = CreateBitmap (cx, cy, 1, 1, NULL);
     SelectObject (hdcMask, hbmMask);
 
     /* copy the mask bitmap */
-    SelectObject (hdcImageList, himl->hbmMask);
-    SetBkColor (hdcImageList, RGB(255, 255, 255));
-    SetTextColor (hdcImageList, RGB(0, 0, 0));
-    BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
-              hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
+    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, himl->cx, himl->cy,
-              hdcMask, 0, 0, 0xB8074A);
+    BitBlt (hdc, x+1, y+1, cx, cy, hdcMask, 0, 0, 0xB8074A);
 
     SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
-    BitBlt (hdc, x, y, himl->cx, himl->cy,
-              hdcMask, 0, 0, 0xB8074A);
+    BitBlt (hdc, x, y, cx, cy, hdcMask, 0, 0, 0xB8074A);
 
     DeleteObject (hbmMask);
     DeleteDC (hdcMask);
-    DeleteDC (hdcImageList);
 }
 
@@ -613 +634 @@
     DWORD ntfret;
     INT offset;
+    HIMAGELIST himlDef;
 
     if (btnPtr->fsState & TBSTATE_HIDDEN)
@@ -646 +668 @@
         rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
 
-    TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n",
+    TRACE("iBitmap: %d, start=(%ld,%ld) w=%d, h=%d\n",
           btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
           infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
@@ -657 +679 @@
         InflateRect (&rcText, -3, -3);
 
-        if (infoPtr->himlDef &&
+        if (GETDEFIMAGELIST(infoPtr, 0) &&
             TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
                 /* The following test looked like this before
@@ -756 +778 @@
     }
 
+    /* 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))
         {
@@ -773 +799 @@
         }
 
-        if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDis,
+        if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDis,
                                    hdc, rcBitmap.left, rcBitmap.top,
                                    ILD_NORMAL))
@@ -804 +830 @@
             TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
 
-        TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
                                hdc, rcBitmap.left+offset, rcBitmap.top+offset,
                                ILD_NORMAL);
@@ -827 +853 @@
         TOOLBAR_DrawPattern (hdc, &rc);
 
-        TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
                                hdc, rcBitmap.left+1, rcBitmap.top+1,
                                ILD_NORMAL);
@@ -888 +914 @@
 
         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,
-                                        infoPtr->himlHot,
+                                        himlHot,
                                         hdc, rcBitmap.left,
                                         rcBitmap.top, ILD_NORMAL))
-                TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+                TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
                                        hdc, rcBitmap.left, rcBitmap.top,
                                        ILD_NORMAL);
         }
         else
-            TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+            TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
                                    hdc, rcBitmap.left, rcBitmap.top,
                                    ILD_NORMAL);
@@ -916 +944 @@
         }
 
-        TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, himlDef,
                                hdc, rcBitmap.left, rcBitmap.top,
                                ILD_NORMAL);}
@@ -953 +981 @@
     /* if imagelist belongs to the app, it can be changed
        by the app after setting it */
-    if (infoPtr->himlDef != infoPtr->himlInt)
-        infoPtr->nNumBitmaps = ImageList_GetImageCount(infoPtr->himlDef);
+    if (GETDEFIMAGELIST(infoPtr, 0) != infoPtr->himlInt)
+    {
+        infoPtr->nNumBitmaps = 0;
+        for (i = 0; i < infoPtr->cimlDef; i++)
+            infoPtr->nNumBitmaps += ImageList_GetImageCount(infoPtr->himlDef[i]->himl);
+    }
 
     TOOLBAR_DumpToolbar (infoPtr, __LINE__);
@@ -1408 +1440 @@
               cx = sz.cx + 6 + 5 + 5;
               if ((dwStyle & TBSTYLE_LIST) &&
-                  (TOOLBAR_TestImageExist (infoPtr, btnPtr, infoPtr->himlDef)))
+                  (TOOLBAR_TestImageExist (infoPtr, btnPtr, GETDEFIMAGELIST(infoPtr,0))))
                   cx += infoPtr->nBitmapWidth;
             }
@@ -1646 +1678 @@
             if (custInfo)
             {
-                char Buffer[256];
+                WCHAR Buffer[256];
                 int i = 0;
                 int index;
@@ -1658 +1690 @@
                     return FALSE;
 
+                /* Send TBN_INITCUSTOMIZE notification */
+                if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_INITCUSTOMIZE) ==
+                    TBNRF_HIDEHELP)
+                {
+                    FIXME("TBNRF_HIDEHELP not supported\n");
+                }
+
                 /* add items to 'toolbar buttons' list and check if removable */
                 for (i = 0; i < custInfo->tbInfo->nNumButtons; i++)
-                {
+                {
                     btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
-                    memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-                    btnInfo->btn.fsStyle = TBSTYLE_SEP;
-                    btnInfo->bVirtual = FALSE;
-                    LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
+                    memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
+                    btnInfo->btn.fsStyle = TBSTYLE_SEP;
+                    btnInfo->bVirtual = FALSE;
+                    LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
 
                     /* send TBN_QUERYDELETE notification */
-                    nmtb.iItem = i;
-                    btnInfo->bRemovable = TOOLBAR_SendNotify ((NMHDR *) &nmtb,
-                                                      infoPtr,
-                                                      TBN_QUERYDELETE);
+                    btnInfo->bRemovable = TOOLBAR_IsButtonRemovable(infoPtr, i, btnInfo);
 
                     index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, 0);
@@ -1683 +1719 @@
                 btnInfo->bVirtual = FALSE;
                 btnInfo->bRemovable = TRUE;
-                LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
+                LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
                 index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
                 SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
@@ -1691 +1727 @@
                 {
                     /* send TBN_GETBUTTONINFO notification */
+                    NMTOOLBARW nmtb;
                     nmtb.iItem = i;
                     nmtb.pszText = Buffer;
                     nmtb.cchText = 256;
 
-                    if (!TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_GETBUTTONINFOA))
+                    /* Clear previous button's text */
+                    ZeroMemory(nmtb.pszText, nmtb.cchText * sizeof(WCHAR));
+
+                    if (!TOOLBAR_GetButtonInfo(infoPtr, &nmtb))
                         break;
 
-                    TRACE("style: %x\n", nmtb.tbButton.fsStyle);
+                    TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%d) %s\n", 
+                        nmtb.tbButton.fsStyle, i, 
+                        nmtb.tbButton.idCommand,
+                        nmtb.tbButton.iString,
+                        nmtb.tbButton.iString >= 0 ? debugstr_w(infoPtr->strings[nmtb.tbButton.iString])
+                        : "");
 
                     /* insert button into the apropriate list */
@@ -1705 +1750 @@
                     {
                         btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
-                        memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
                         btnInfo->bVirtual = FALSE;
                         btnInfo->bRemovable = TRUE;
-                        if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
-                            strcpy (btnInfo->text, nmtb.pszText);
 
                         index = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, 0);
-                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, 
+                                LB_SETITEMDATA, index, (LPARAM)btnInfo);
                     }
                     else
                     {
-                        btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
-                        memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
-                        if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
-                            strcpy (btnInfo->text, nmtb.pszText);
-
-                        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+                        btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, 
+                            IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
+                    }
+
+                    memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
+                    if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
+                    {
+                        if (lstrlenW(nmtb.pszText))
+                            lstrcpyW(btnInfo->text, nmtb.pszText);
+                        else if (nmtb.tbButton.iString >= 0 && 
+                            nmtb.tbButton.iString < infoPtr->nNumStrings)
+                        {
+                            lstrcpyW(btnInfo->text, 
+                                infoPtr->strings[nmtb.tbButton.iString]);
+                        }
                     }
                 }
@@ -1734 +1786 @@
                 btnInfo->bVirtual = TRUE;
                 btnInfo->bRemovable = FALSE;
-                LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
+                LoadStringW (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
                 index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
                 SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
@@ -1882 +1934 @@
 
                         index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
+
+                        if (LB_ERR == index)
+                                break;
+
                         TRACE("Remove: index %d\n", index);
 
+                        btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, 
+                                LB_GETITEMDATA, index, 0);
+
                         /* send TBN_QUERYDELETE notification */
-                        nmtb.iItem = index;
-                        if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
-                                            TBN_QUERYDELETE))
+                        if (TOOLBAR_IsButtonRemovable(infoPtr, index, btnInfo))
                         {
                             btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
@@ -1990 +2047 @@
             {
                 LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
+        DWORD dwStyle = GetWindowLongA (infoPtr->hwndSelf, GWL_STYLE);
                 RECT rcButton;
                 RECT rcText;
@@ -2032 +2090 @@
 
                 /* draw button */
+                if (!(dwStyle & TBSTYLE_FLAT))
                 DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
 
                 /* draw image and text */
-                if ((btnInfo->btn.fsStyle & TBSTYLE_SEP) == 0)
-                    ImageList_Draw (custInfo->tbInfo->himlDef, btnInfo->btn.iBitmap, lpdis->hDC,
-                                    rcButton.left+3, rcButton.top+3, ILD_NORMAL);
-                DrawTextA (lpdis->hDC,  btnInfo->text, -1, &rcText,
+                if ((btnInfo->btn.fsStyle & TBSTYLE_SEP) == 0) {
+                        HIMAGELIST himl = GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr, 
+                                btnInfo->btn.iBitmap));
+                    ImageList_Draw (himl, GETIBITMAP(infoPtr, btnInfo->btn.iBitmap), 
+                                lpdis->hDC, rcButton.left+3, rcButton.top+3, ILD_NORMAL);
+                }
+                DrawTextW (lpdis->hDC,  btnInfo->text, -1, &rcText,
                                DT_LEFT | DT_VCENTER | DT_SINGLELINE);
 
@@ -2082 +2144 @@
     INT nIndex = 0, nButtons, nCount;
     HBITMAP hbmLoad;
+    HIMAGELIST himlDef;
 
     TRACE("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
@@ -2132 +2195 @@
     }
 
-    if (!(infoPtr->himlDef)) {
+    if (!infoPtr->cimlDef) {
         /* create new default image list */
         TRACE ("creating default image list!\n");
 
-        infoPtr->himlDef =
-            ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-                              ILC_COLOR | ILC_MASK, nButtons, 2);
-        infoPtr->himlInt = infoPtr->himlDef;
-    }
-
-    nCount = ImageList_GetImageCount(infoPtr->himlDef);
+    himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, 
+                ILC_COLOR | ILC_MASK, nButtons, 2);
+        TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0);
+    infoPtr->himlInt = himlDef;
+    }
+    else {
+        himlDef = GETDEFIMAGELIST(infoPtr, 0);
+    }
+
+    if (!himlDef) {
+        WARN("No default image list available\n");
+        return -1;
+    }
+
+    nCount = ImageList_GetImageCount(himlDef);
 
     /* Add bitmaps to the default image list */
-    if (lpAddBmp->hInst == (HINSTANCE)0)
+    if (lpAddBmp->hInst == NULL)
     {
-        nIndex =
-            ImageList_AddMasked (infoPtr->himlDef, (HBITMAP)lpAddBmp->nID,
-                                 CLR_DEFAULT);
+       BITMAP  bmp;
+       HBITMAP hOldBitmapBitmap, hOldBitmapLoad;
+       HDC     hdcImage, hdcBitmap;
+
+       /* copy the bitmap before adding it so that the user's bitmap
+        * doesn't get modified.
+        */
+       GetObjectA ((HBITMAP)lpAddBmp->nID, sizeof(BITMAP), (LPVOID)&bmp);
+
+       hdcImage  = CreateCompatibleDC(0);
+       hdcBitmap = CreateCompatibleDC(0);
+
+       /* create new bitmap */
+       hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL);
+       hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)lpAddBmp->nID);
+       hOldBitmapLoad = SelectObject(hdcImage, hbmLoad);
+
+       /* Copy the user's image */
+       BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight,
+               hdcBitmap, 0, 0, SRCCOPY);
+
+       SelectObject (hdcImage, hOldBitmapLoad);
+       SelectObject (hdcBitmap, hOldBitmapBitmap);
+       DeleteDC (hdcImage);
+       DeleteDC (hdcBitmap);
+
+       nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
+       DeleteObject (hbmLoad);
     }
     else if (lpAddBmp->hInst == HINST_COMMCTRL)
@@ -2159 +2255 @@
                 hbmLoad = LoadBitmapA (COMCTL32_hModule,
                                        MAKEINTRESOURCEA(IDB_STD_SMALL));
-                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                nIndex = ImageList_AddMasked (himlDef,
                                               hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
@@ -2167 +2263 @@
                 hbmLoad = LoadBitmapA (COMCTL32_hModule,
                                        MAKEINTRESOURCEA(IDB_STD_LARGE));
-                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                nIndex = ImageList_AddMasked (himlDef,
                                               hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
@@ -2175 +2271 @@
                 hbmLoad = LoadBitmapA (COMCTL32_hModule,
                                        MAKEINTRESOURCEA(IDB_VIEW_SMALL));
-                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                nIndex = ImageList_AddMasked (himlDef,
                                               hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
@@ -2183 +2279 @@
                 hbmLoad = LoadBitmapA (COMCTL32_hModule,
                                        MAKEINTRESOURCEA(IDB_VIEW_LARGE));
-                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                nIndex = ImageList_AddMasked (himlDef,
                                               hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
@@ -2191 +2287 @@
                 hbmLoad = LoadBitmapA (COMCTL32_hModule,
                                        MAKEINTRESOURCEA(IDB_HIST_SMALL));
-                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                nIndex = ImageList_AddMasked (himlDef,
                                               hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
@@ -2199 +2295 @@
                 hbmLoad = LoadBitmapA (COMCTL32_hModule,
                                        MAKEINTRESOURCEA(IDB_HIST_LARGE));
-                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                nIndex = ImageList_AddMasked (himlDef,
                                               hbmLoad, CLR_DEFAULT);
                 DeleteObject (hbmLoad);
@@ -2205 +2301 @@
 
             default:
-        nIndex = ImageList_GetImageCount (infoPtr->himlDef);
+        nIndex = ImageList_GetImageCount (himlDef);
                 ERR ("invalid imagelist!\n");
                 break;
@@ -2213 +2309 @@
     {
         hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-        nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
+        nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
         DeleteObject (hbmLoad);
     }
@@ -2239 +2335 @@
     if (nIndex != -1)
     {
-       INT imagecount = ImageList_GetImageCount(infoPtr->himlDef);
+       INT imagecount = ImageList_GetImageCount(himlDef);
 
        if (infoPtr->nNumBitmaps + nButtons != imagecount)
@@ -2921 +3017 @@
     lpTbb->fsState   = btnPtr->fsState;
     lpTbb->fsStyle   = btnPtr->fsStyle;
+    lpTbb->bReserved[0] = 0;
+    lpTbb->bReserved[1] = 0;
     lpTbb->dwData    = btnPtr->dwData;
     lpTbb->iString   = btnPtr->iString;
@@ -3075 +3173 @@
 TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
-    return (LRESULT)infoPtr->himlDis;
+    return (LRESULT)GETDISIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), 0);
 }
 
@@ -3093 +3189 @@
 TOOLBAR_GetHotImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
-    return (LRESULT)infoPtr->himlHot;
+    return (LRESULT)GETHOTIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), 0);
 }
 
@@ -3115 +3209 @@
 
 static LRESULT
-TOOLBAR_GetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
-    return (LRESULT)infoPtr->himlDef;
+TOOLBAR_GetDefImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    return (LRESULT) GETDEFIMAGELIST(TOOLBAR_GetInfoPtr(hwnd), 0);
 }
 
@@ -3168 +3260 @@
     lpSize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
 
-    TRACE("maximum size %d x %d\n",
+    TRACE("maximum size %ld x %ld\n",
            infoPtr->rcBound.right - infoPtr->rcBound.left,
            infoPtr->rcBound.bottom - infoPtr->rcBound.top);
@@ -3680 +3772 @@
     HBITMAP hBitmap;
     int i = 0, nOldButtons = 0, pos = 0;
+    HIMAGELIST himlDef = 0;
 
     TRACE("hInstOld %p nIDOld %x hInstNew %p nIDNew %x nButtons %x\n",
@@ -3725 +3818 @@
     infoPtr->nNumBitmaps = infoPtr->nNumBitmaps - nOldButtons + lpReplace->nButtons;
 
-    /* ImageList_Replace(infoPtr->himlDef, pos, hBitmap, NULL); */
-
-
+    /* ImageList_Replace(GETDEFIMAGELIST(), pos, hBitmap, NULL); */
+
+
+    himlDef = GETDEFIMAGELIST(infoPtr, 0);
     for (i = pos + nOldButtons - 1; i >= pos; i--) {
-        ImageList_Remove(infoPtr->himlDef, i);
-    }
-
-    ImageList_AddMasked(infoPtr->himlDef, hBitmap, CLR_DEFAULT);
+        ImageList_Remove(himlDef, i);
+    }
+
+    {
+       BITMAP  bmp;
+       HBITMAP hOldBitmapBitmap, hOldBitmapLoad, hbmLoad;
+       HDC     hdcImage, hdcBitmap;
+
+       /* copy the bitmap before adding it so that the user's bitmap
+        * doesn't get modified.
+        */
+       GetObjectA (hBitmap, sizeof(BITMAP), (LPVOID)&bmp);
+
+       hdcImage  = CreateCompatibleDC(0);
+       hdcBitmap = CreateCompatibleDC(0);
+
+       /* create new bitmap */
+       hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL);
+       hOldBitmapBitmap = SelectObject(hdcBitmap, hBitmap);
+       hOldBitmapLoad = SelectObject(hdcImage, hbmLoad);
+
+       /* Copy the user's image */
+       BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight,
+               hdcBitmap, 0, 0, SRCCOPY);
+
+       SelectObject (hdcImage, hOldBitmapLoad);
+       SelectObject (hdcBitmap, hOldBitmapBitmap);
+       DeleteDC (hdcImage);
+       DeleteDC (hdcBitmap);
+
+       ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
+       DeleteObject (hbmLoad);
+    }
 
     InvalidateRect(hwnd, NULL, FALSE);
@@ -3816 +3939 @@
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    HIMAGELIST himlDef = GETDEFIMAGELIST(infoPtr, 0);
 
     if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
@@ -3829 +3953 @@
     infoPtr->nBitmapHeight = (INT)HIWORD(lParam);
 
+
     /* uses image list internals directly */
-    if (infoPtr->himlDef) {
-        infoPtr->himlDef->cx = infoPtr->nBitmapWidth;
-        infoPtr->himlDef->cy = infoPtr->nBitmapHeight;
+    if (himlDef) {
+        himlDef->cx = infoPtr->nBitmapWidth;
+        himlDef->cy = infoPtr->nBitmapHeight;
     }
 
@@ -4020 +4145 @@
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    HIMAGELIST himl = (HIMAGELIST)lParam;
     HIMAGELIST himlTemp;
-
-
-    if (wParam != 0) {
-        FIXME("no support for multiple image lists\n");
-        return 0;
-    }
-
-    himlTemp = infoPtr->himlDis;
-    infoPtr->himlDis = (HIMAGELIST)lParam;
+    INT id = 0;
+
+    if (infoPtr->iVersion >= 5)
+        id = wParam;
+
+    himlTemp = TOOLBAR_InsertImageList(&infoPtr->himlDis, 
+        &infoPtr->cimlDis, himl, id);
 
     /* FIXME: redraw ? */
@@ -4081 +4205 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
     HIMAGELIST himlTemp;
-
-    if (wParam != 0) {
-        FIXME("no support for multiple image lists\n");
-        return 0;
-    }
-
-    himlTemp = infoPtr->himlHot;
-    infoPtr->himlHot = (HIMAGELIST)lParam;
+    HIMAGELIST himl = (HIMAGELIST)lParam;
+    INT id = 0;
+
+    if (infoPtr->iVersion >= 5)
+        id = wParam;
+
+    himlTemp = TOOLBAR_InsertImageList(&infoPtr->himlHot, 
+        &infoPtr->cimlHot, himl, id);
 
     /* FIXME: redraw ? */
@@ -4138 +4262 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     HIMAGELIST himlTemp;
-
-    if (wParam != 0) {
-        FIXME("no support for multiple image lists\n");
-        return 0;
-    }
-
-    himlTemp = infoPtr->himlDef;
-    infoPtr->himlDef = (HIMAGELIST)lParam;
-
-    infoPtr->nNumBitmaps = ImageList_GetImageCount(infoPtr->himlDef);
-
-    ImageList_GetIconSize(infoPtr->himlDef, &infoPtr->nBitmapWidth,
+    HIMAGELIST himl = (HIMAGELIST)lParam;
+    INT i, id = 0;
+
+    if (infoPtr->iVersion >= 5)
+        id = wParam;
+
+    himlTemp = TOOLBAR_InsertImageList(&infoPtr->himlDef, 
+        &infoPtr->cimlDef, himl, id);
+
+    infoPtr->nNumBitmaps = 0;
+    for (i = 0; i < infoPtr->cimlDef; i++)
+        infoPtr->nNumBitmaps += ImageList_GetImageCount(infoPtr->himlDef[i]->himl);
+
+    ImageList_GetIconSize(himl, &infoPtr->nBitmapWidth,
                           &infoPtr->nBitmapHeight);
     TRACE("hwnd %p, new himl=%08x, count=%d, bitmap w=%d, h=%d\n",
@@ -4407 +4533 @@
 
     infoPtr->iVersion = iVersion;
+
+    if (infoPtr->iVersion >= 5)
+        TOOLBAR_SetUnicodeFormat(hwnd, (WPARAM)TRUE, (LPARAM)0);
 
     return iOldVersion;
@@ -4497 +4626 @@
             GetWindowRect(hwnd, &rc);
             MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2);
-            TRACE("mapped to (%d,%d)-(%d,%d)\n",
+            TRACE("mapped to (%ld,%ld)-(%ld,%ld)\n",
                 rc.left, rc.top, rc.right, rc.bottom);
             lpsize->cx = max(rc.right-rc.left,
@@ -4617 +4746 @@
     if (infoPtr->himlInt)
         ImageList_Destroy (infoPtr->himlInt);
+
+        TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef);
+        TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis);
+        TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot);
 
     /* delete default font */
@@ -5312 +5445 @@
     hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam;
 
-    TRACE("psrect=(%d,%d)-(%d,%d)\n",
+    TRACE("psrect=(%ld,%ld)-(%ld,%ld)\n",
           ps.rcPaint.left, ps.rcPaint.top,
           ps.rcPaint.right, ps.rcPaint.bottom);
@@ -5568 +5701 @@
 
         case TB_GETIMAGELIST:
-            return TOOLBAR_GetImageList (hwnd, wParam, lParam);
+            return TOOLBAR_GetDefImageList (hwnd, wParam, lParam);
 
 /*      case TB_GETINSERTMARK:                  */ /* 4.71 */
@@ -5874 +6007 @@
 TOOLBAR_Unregister (void)
 {
-    UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
-}
+    UnregisterClassA (TOOLBARCLASSNAMEA, NULL);
+}
+
+static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id)
+{
+    HIMAGELIST himlold;
+    PIMLENTRY c = NULL;
+
+    /* Check if the entry already exists */
+    c = TOOLBAR_GetImageListEntry(*pies, *cies, id);
+
+    /* If this is a new entry we must create it and insert into the array */
+    if (!c)
+    {
+        PIMLENTRY *pnies;
+
+        c = (PIMLENTRY) COMCTL32_Alloc(sizeof(IMLENTRY));
+        c->id = id;
+
+        pnies = COMCTL32_Alloc((*cies + 1) * sizeof(PIMLENTRY));
+        memcpy(pnies, *pies, ((*cies) * sizeof(PIMLENTRY)));
+        pnies[*cies] = c;
+        (*cies)++;
+
+        COMCTL32_Free(*pies);
+        *pies = pnies;
+    }
+
+    himlold = c->himl;
+    c->himl = himl;
+
+    return himlold;
+}
+
+
+static VOID TOOLBAR_DeleteImageList(PIMLENTRY **pies, INT *cies)
+{
+    int i;
+
+    for (i = 0; i < *cies; i++)
+        COMCTL32_Free((*pies)[i]);
+
+    COMCTL32_Free(*pies);
+
+    *cies = 0;
+    *pies = NULL;
+}
+
+
+static PIMLENTRY TOOLBAR_GetImageListEntry(PIMLENTRY *pies, INT cies, INT id)
+{
+    PIMLENTRY c = NULL;
+
+    if (pies != NULL)
+    {
+        int i;
+
+        for (i = 0; i < cies; i++)
+        {
+            if (pies[i]->id == id)
+            {
+                c = pies[i];
+                break;
+            }
+        }
+    }
+
+    return c;
+}
+
+
+static HIMAGELIST TOOLBAR_GetImageList(PIMLENTRY *pies, INT cies, INT id)
+{
+    HIMAGELIST himlDef = 0;
+    PIMLENTRY pie = TOOLBAR_GetImageListEntry(pies, cies, id);
+
+    if (pie)
+        himlDef = pie->himl;
+
+    return himlDef;
+}
+
+
+static BOOL TOOLBAR_GetButtonInfo(TOOLBAR_INFO *infoPtr, NMTOOLBARW *nmtb)
+{
+    if (infoPtr->bUnicode)
+        return TOOLBAR_SendNotify ((NMHDR *) nmtb, infoPtr, TBN_GETBUTTONINFOW);
+    else
+    {
+        CHAR Buffer[256];
+        NMTOOLBARA nmtba;
+        BOOL bRet = FALSE;
+
+        nmtba.iItem = nmtb->iItem;
+        nmtba.pszText = Buffer;
+        nmtba.cchText = 256;
+        ZeroMemory(nmtba.pszText, nmtba.cchText);
+
+        if (TOOLBAR_SendNotify ((NMHDR *) &nmtba, infoPtr, TBN_GETBUTTONINFOA))
+        {
+            int ccht = strlen(nmtba.pszText);
+            if (ccht)
+               MultiByteToWideChar(CP_ACP, 0, (LPCSTR)nmtba.pszText, -1, 
+                  nmtb->pszText, nmtb->cchText);
+
+            memcpy(&nmtb->tbButton, &nmtba.tbButton, sizeof(TBBUTTON));
+            bRet = TRUE;
+        }
+
+        return bRet;
+    }
+}
+
+
+static BOOL TOOLBAR_IsButtonRemovable(TOOLBAR_INFO *infoPtr,
+        int iItem, PCUSTOMBUTTON btnInfo)
+{
+    NMTOOLBARA nmtb;
+
+    nmtb.iItem = iItem;
+    memcpy(&nmtb.tbButton, &btnInfo->btn, sizeof(TBBUTTON));
+
+    return TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_QUERYDELETE);
+}