Changeset 10535 for trunk/src/comctl32/rebar.c

Timestamp:

Mar 17, 2004, 5:38:52 PM (22 years ago)

Author:

sandervl

Message:

Wine merge + status & rebar fixes

File:

• trunk/src/comctl32/rebar.c (modified) (116 diffs)

trunk/src/comctl32/rebar.c

@@ -120 +120 @@
  *    Still to do:
  *  2. Following still not handled: RBBS_FIXEDBMP,
- *            RBBS_USECHEVRON, CCS_NORESIZE,
+ *            CCS_NORESIZE,
  *            CCS_NOMOVEX, CCS_NOMOVEY
  *  3. Following are only partially handled:
@@ -137 +137 @@
  *  7. The following notifications are not implemented:
  *        NM_CUSTOMDRAW, NM_RELEASEDCAPTURE
- *        RB_CHEVRONPUSHED, RBN_MINMAX
+ *        RBN_MINMAX
  */
 
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "wine/unicode.h"
+#include "winuser.h"
+#include "winnls.h"
 #include "commctrl.h"
-/* #include "spy.h" */
+#include "comctl32.h"
 #include "wine/debug.h"
 
@@ -191 +195 @@
     RECT    rcCapText;      /* calculated caption text rectangle */
     RECT    rcChild;        /* calculated child rectangle */
+    RECT    rcChevron;      /* calculated chevron rectangle */
 
     LPWSTR    lpText;
@@ -207 +212 @@
 #define DRAW_RIGHTSEP   0x00000010
 #define DRAW_BOTTOMSEP  0x00000020
+#define DRAW_CHEVRONHOT 0x00000040
+#define DRAW_CHEVRONPUSHED 0x00000080
+#define DRAW_LAST_IN_ROW   0x00000100
+#define DRAW_FIRST_IN_ROW  0x00000200
 #define NTF_INVALIDATE  0x01000000
-
-typedef struct
-{
-    INT      istartband;  /* index of first band in row */
-    INT      iendband;    /* index of last band in row */
-} REBAR_ROW;
-
 
 typedef struct
@@ -245 +247 @@
     POINTS   dragStart;   /* x,y of button down */
     POINTS   dragNow;     /* x,y of this MouseMove */
-    INT      ihitBand;    /* band number of band whose gripper was grabbed */
+    INT      iOldBand;    /* last band that had the mouse cursor over it */
     INT      ihitoffset;  /* offset of hotspot from gripper.left */
     POINT    origin;      /* left/upper corner of client */
-
-    REBAR_ROW  *rows;       /* pointer to row indexes              */
+    INT      ichevronhotBand; /* last band that had a hot chevron */
+    INT      iGrabbedBand;/* band number of band whose gripper was grabbed */
+
     REBAR_BAND *bands;      /* pointer to the array of rebar bands */
 } REBAR_INFO;
@@ -290 +293 @@
 #define GRIPPER_WIDTH  3
 
+/* Width of the chevron button if present */
+#define CHEVRON_WIDTH  10
+
 /* Height of divider for Rebar if not disabled (CCS_NODIVIDER)     */
 /* either top or bottom                                            */
@@ -299 +305 @@
 /* ----   End of REBAR layout constants.                      ---- */
 
+#define RB_GETBANDINFO_OLD (WM_USER+5) /* obsoleted after IE3, but we have to support it anyway */
 
 /*  The following 6 defines return the proper rcBand element       */
@@ -331 +338 @@
 static UINT mindragy = 0;
 
-static char *band_stylename[] = {
+static const char *band_stylename[] = {
     "RBBS_BREAK",              /* 0001 */
     "RBBS_FIXEDSIZE",          /* 0002 */
@@ -343 +350 @@
     NULL };
 
-static char *band_maskname[] = {
+static const char *band_maskname[] = {
     "RBBIM_STYLE",         /*    0x00000001 */
     "RBBIM_COLORS",        /*    0x00000002 */
@@ -408 +415 @@
         TRACE("band info:");
         if (pB->fMask & RBBIM_SIZE)
-            DPRINTF(" cx=%u", pB->cx);
+            TRACE(" cx=%u", pB->cx);
         if (pB->fMask & RBBIM_IDEALSIZE)
-            DPRINTF(" xIdeal=%u", pB->cxIdeal);
+            TRACE(" xIdeal=%u", pB->cxIdeal);
         if (pB->fMask & RBBIM_HEADERSIZE)
-            DPRINTF(" xHeader=%u", pB->cxHeader);
+            TRACE(" xHeader=%u", pB->cxHeader);
         if (pB->fMask & RBBIM_LPARAM)
-            DPRINTF(" lParam=0x%08lx", pB->lParam);
-        DPRINTF("\n");
+            TRACE(" lParam=0x%08lx", pB->lParam);
+        TRACE("\n");
     }
     if (pB->fMask & RBBIM_CHILDSIZE)
@@ -434 +441 @@
           iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows,
           iP->calcSize.cx, iP->calcSize.cy);
-    TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, ihitBand=%d\n",
+    TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, iGrabbedBand=%d\n",
           iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y,
           iP->dragNow.x, iP->dragNow.y,
-          iP->ihitBand);
+          iP->iGrabbedBand);
     TRACE("hwnd=%p: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n",
           iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE",
@@ -453 +460 @@
         if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_LPARAM )) {
             if (pB->fMask & RBBIM_SIZE)
-                DPRINTF(" cx=%u", pB->cx);
+                TRACE(" cx=%u", pB->cx);
             if (pB->fMask & RBBIM_IDEALSIZE)
-                DPRINTF(" xIdeal=%u", pB->cxIdeal);
+                TRACE(" xIdeal=%u", pB->cxIdeal);
             if (pB->fMask & RBBIM_LPARAM)
-                DPRINTF(" lParam=0x%08lx", pB->lParam);
-        }
-        DPRINTF("\n");
+                TRACE(" lParam=0x%08lx", pB->lParam);
+        }
+        TRACE("\n");
         if (RBBIM_CHILDSIZE)
             TRACE("band # %u: xMin=%u, yMin=%u, yChild=%u, yMax=%u, yIntgl=%u\n",
@@ -468 +475 @@
         TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%ld,%ld\n",
               i, pB->lcx, pB->ccx, pB->hcx, pB->lcy, pB->ccy, pB->hcy, pB->offChild.cx, pB->offChild.cy);
-        TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%d,%d)-(%d,%d), Grip=(%d,%d)-(%d,%d)\n",
+        TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%ld,%ld)-(%ld,%ld), Grip=(%ld,%ld)-(%ld,%ld)\n",
               i, pB->fStatus, pB->fDraw,
               pB->rcBand.left, pB->rcBand.top, pB->rcBand.right, pB->rcBand.bottom,
               pB->rcGripper.left, pB->rcGripper.top, pB->rcGripper.right, pB->rcGripper.bottom);
-        TRACE("band # %u: Img=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d), Child=(%d,%d)-(%d,%d)\n",
+        TRACE("band # %u: Img=(%ld,%ld)-(%ld,%ld), Txt=(%ld,%ld)-(%ld,%ld), Child=(%ld,%ld)-(%ld,%ld)\n",
               i,
               pB->rcCapImage.left, pB->rcCapImage.top, pB->rcCapImage.right, pB->rcCapImage.bottom,
@@ -481 +488 @@
 }
 
+static void
+REBAR_DrawChevron (HDC hdc, INT left, INT top, INT colorRef)
+{
+    INT x, y;
+    HPEN hPen, hOldPen;
+
+    if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return;
+    hOldPen = SelectObject ( hdc, hPen );
+    x = left + 2;
+    y = top;
+    MoveToEx (hdc, x, y, NULL);
+    LineTo (hdc, x+5, y++); x++;
+    MoveToEx (hdc, x, y, NULL);
+    LineTo (hdc, x+3, y++); x++;
+    MoveToEx (hdc, x, y, NULL);
+    LineTo (hdc, x+1, y++);
+    SelectObject( hdc, hOldPen );
+    DeleteObject( hPen );
+}
 
 static HWND
@@ -610 +636 @@
     }
 
+    if (!IsRectEmpty(&lpBand->rcChevron))
+    {
+        if (lpBand->fDraw & DRAW_CHEVRONPUSHED)
+        {
+            DrawEdge(hdc, &lpBand->rcChevron, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE);
+            REBAR_DrawChevron(hdc, lpBand->rcChevron.left+1, lpBand->rcChevron.top + 11, COLOR_WINDOWFRAME);
+        }
+        else if (lpBand->fDraw & DRAW_CHEVRONHOT)
+        {
+            DrawEdge(hdc, &lpBand->rcChevron, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
+            REBAR_DrawChevron(hdc, lpBand->rcChevron.left, lpBand->rcChevron.top + 10, COLOR_WINDOWFRAME);
+        }
+        else
+            REBAR_DrawChevron(hdc, lpBand->rcChevron.left, lpBand->rcChevron.top + 10, COLOR_WINDOWFRAME);
+    }
+
     if (lpBand->uCDret == (CDRF_NOTIFYPOSTPAINT | CDRF_NOTIFYITEMDRAW)) {
         nmcd.dwDrawStage = CDDS_ITEMPOSTPAINT;
@@ -628 +670 @@
 {
     REBAR_BAND *lpBand;
-    UINT i, oldrow;
+    UINT i;
 
     if (!infoPtr->DoRedraw) return;
 
-    oldrow = infoPtr->bands[0].iRow;
     for (i = 0; i < infoPtr->uNumBands; i++) {
         lpBand = &infoPtr->bands[i];
@@ -681 +722 @@
             (lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) {
             lpBand->fDraw |= NTF_INVALIDATE;
-            TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n",
+            TRACE("band %d row=%d: changed to (%ld,%ld)-(%ld,%ld) from (%ld,%ld)-(%ld,%ld)\n",
                   i, lpBand->iRow,
                   lpBand->rcBand.left, lpBand->rcBand.top,
@@ -689 +730 @@
         }
         else
-            TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n",
+            TRACE("band %d row=%d: unchanged (%ld,%ld)-(%ld,%ld)\n",
                   i, lpBand->iRow,
                   lpBand->rcBand.left, lpBand->rcBand.top,
@@ -765 +806 @@
         else
             lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
-        TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
+        TRACE("Phase 1 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n",
               i, lpBand->rcBand.left, lpBand->rcBand.top,
               lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
@@ -835 +876 @@
         else
             lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
-        TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
+        TRACE("Phase 2 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n",
               i, lpBand->rcBand.left, lpBand->rcBand.top,
               lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
@@ -951 +992 @@
                    lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.top+yoff,
                    lpBand->rcBand.right-xoff, lpBand->rcBand.bottom-yoff);
+          if ((lpBand->fStyle & RBBS_USECHEVRON) && (lpBand->rcChild.right - lpBand->rcChild.left < lpBand->cxIdeal))
+          {
+              lpBand->rcChild.right -= CHEVRON_WIDTH;
+              SetRect(&lpBand->rcChevron, lpBand->rcChild.right,
+                      lpBand->rcChild.top, lpBand->rcChild.right + CHEVRON_WIDTH,
+                      lpBand->rcChild.bottom);
+          }
       }
       else {
@@ -963 +1011 @@
            (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
           TRACE("Child rectangle changed for band %u\n", i);
-          TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
+          TRACE("    from (%ld,%ld)-(%ld,%ld)  to (%ld,%ld)-(%ld,%ld)\n",
                 oldChild.left, oldChild.top,
                 oldChild.right, oldChild.bottom,
@@ -970 +1018 @@
       }
       if (lpBand->fDraw & NTF_INVALIDATE) {
-          TRACE("invalidating (%d,%d)-(%d,%d)\n",
+          TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n",
                 lpBand->rcBand.left,
                 lpBand->rcBand.top,
@@ -1102 +1150 @@
              (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
             TRACE("Child rectangle changed for band %u\n", i);
-            TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
+            TRACE("    from (%ld,%ld)-(%ld,%ld)  to (%ld,%ld)-(%ld,%ld)\n",
                   oldChild.left, oldChild.top,
                   oldChild.right, oldChild.bottom,
@@ -1109 +1157 @@
         }
         if (lpBand->fDraw & NTF_INVALIDATE) {
-            TRACE("invalidating (%d,%d)-(%d,%d)\n",
+            TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n",
                   lpBand->rcBand.left,
                   lpBand->rcBand.top,
@@ -1142 +1190 @@
     GetClientRect (infoPtr->hwndSelf, &rc);
 
-    TRACE( " old [%ld x %ld], new [%ld x %ld], client [%d x %d]\n",
+    TRACE( " old [%ld x %ld], new [%ld x %ld], client [%ld x %ld]\n",
            infoPtr->oldSize.cx, infoPtr->oldSize.cy,
            infoPtr->calcSize.cx, infoPtr->calcSize.cy,
@@ -1228 +1276 @@
         infoPtr->hwndSelf, infoPtr->dwStyle,
         x, y, width, height);
-
 #ifdef __WIN32OS2__
 //NOTE: this one is causing problems!!!!
@@ -1271 +1318 @@
             if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) {
                 TRACE("Child rect changed by NOTIFY for band %u\n", i);
-                TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
+                TRACE("    from (%ld,%ld)-(%ld,%ld)  to (%ld,%ld)-(%ld,%ld)\n",
                       lpBand->rcChild.left, lpBand->rcChild.top,
                       lpBand->rcChild.right, lpBand->rcChild.bottom,
@@ -1302 +1349 @@
 
                 /* center combo box inside child area */
-                TRACE("moving child (Combo(Ex)) %p to (%d,%d) for (%d,%d)\n",
+                TRACE("moving child (Combo(Ex)) %p to (%ld,%d) for (%ld,%d)\n",
                       lpBand->hwndChild,
                       lpBand->rcChild.left, yPos,
@@ -1317 +1364 @@
             }
             else {
-                TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n",
+                TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n",
                       lpBand->hwndChild,
                       lpBand->rcChild.left, lpBand->rcChild.top,
@@ -1377 +1424 @@
 
     GetClientRect (infoPtr->hwndSelf, &rcClient);
-    TRACE("Client is (%d,%d)-(%d,%d)\n",
+    TRACE("Client is (%ld,%ld)-(%ld,%ld)\n",
           rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
 
     if (lpRect) {
         rcAdj = *lpRect;
-        TRACE("adjustment rect is (%d,%d)-(%d,%d)\n",
+        TRACE("adjustment rect is (%ld,%ld)-(%ld,%ld)\n",
               rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom);
     }
@@ -1433 +1480 @@
         lpBand->iRow = row;
 
+        SetRectEmpty(&lpBand->rcChevron);
+
         if (HIDDENBAND(lpBand)) continue;
 
@@ -1446 +1495 @@
         /* separator from previous band */
         cxsep = (cntonrow == 0) ? 0 : SEP_WIDTH;
-
-        /* Header: includes gripper, text, image */
-        cx = lpBand->cxHeader;
-        if (lpBand->fStyle & RBBS_FIXEDSIZE) cx = lpBand->lcx;
+        cx = lpBand->lcx;
 
         if (infoPtr->dwStyle & CCS_VERT)
@@ -1538 +1584 @@
             x = rightx;
         }
-        TRACE("P1 band %u, row %d, (%d,%d)-(%d,%d)\n",
+        TRACE("P1 band %u, row %d, (%ld,%ld)-(%ld,%ld)\n",
               i, row,
               lpBand->rcBand.left, lpBand->rcBand.top,
@@ -1617 +1663 @@
     /*   y/x     current height/width of all rows                    */
     if (lpRect) {
-        INT i, j, prev_rh, new_rh, adj_rh, prev_idx, current_idx;
+        INT i, prev_rh, new_rh, adj_rh, prev_idx, current_idx;
         REBAR_BAND *prev, *current, *walk;
+        UINT j;
 
 /* FIXME:  problem # 2 */
@@ -1625 +1672 @@
              (x < adjcx) : (y < adjcy)
 #else
-             (adjcx - x > 4) : (adjcy - y > 4)
+             (adjcx - x > 5) : (adjcy - y > 4)
 #endif
              ) &&
@@ -1678 +1725 @@
                         y += adj_rh;
                     }
-                    TRACE("P2 moving band %d to own row at (%d,%d)-(%d,%d)\n",
+                    TRACE("P2 moving band %d to own row at (%ld,%ld)-(%ld,%ld)\n",
                           current_idx,
                           current->rcBand.left, current->rcBand.top,
                           current->rcBand.right, current->rcBand.bottom);
-                    TRACE("P2 prev band %d at (%d,%d)-(%d,%d)\n",
+                    TRACE("P2 prev band %d at (%ld,%ld)-(%ld,%ld)\n",
                           prev_idx,
                           prev->rcBand.left, prev->rcBand.top,
@@ -1713 +1760 @@
 
 
-    /* ******* Start Phase 2a - create array of start and end  ******* */
-    /*                          indexes by row                         */
-
-    if (infoPtr->uNumRows != origrows) {
-        if (infoPtr->rows) COMCTL32_Free (infoPtr->rows);
-        infoPtr->rows = COMCTL32_Alloc (sizeof (REBAR_ROW) * infoPtr->uNumRows);
-    }
-
-    row = 0;
-    for (i = 0; i < infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-        if (HIDDENBAND(lpBand)) continue;
-
-        if (lpBand->iRow > row) {
-            row++;
-            infoPtr->rows[row-1].istartband = i;
-        }
-        if (row == 0) {
-            ERR("P2a bug!!!!!!\n");
-        }
-        infoPtr->rows[row-1].iendband = i;
-    }
-
-    for (i = 0; i < infoPtr->uNumRows; i++) {
-        REBAR_ROW *p;
-
-        p = &infoPtr->rows[i];
-        TRACE("P2a row %d, starts %d, ends %d\n",
-              i+1, p->istartband, p->iendband);
-    }
-
-    /* ******* End Phase 2a - create array of start and end    ******* */
-    /*                          indexes by row                         */
+    /* ******* Start Phase 2a - mark first and last band in each ******* */
+
+    prevBand = NULL;
+    for (i = 0; i < infoPtr->uNumBands; i++) {   
+        lpBand = &infoPtr->bands[i];     
+        if (HIDDENBAND(lpBand))
+            continue;
+        if( !prevBand ) {
+            lpBand->fDraw |= DRAW_FIRST_IN_ROW;
+            prevBand = lpBand;
+        }
+        else if( prevBand->iRow == lpBand->iRow )
+            prevBand = lpBand;
+        else {
+            prevBand->fDraw |= DRAW_LAST_IN_ROW;
+            lpBand->fDraw |= DRAW_FIRST_IN_ROW;
+            prevBand = lpBand;
+        }
+    }
+    if( prevBand )
+        prevBand->fDraw |= DRAW_LAST_IN_ROW;
+
+    /* ******* End Phase 2a - mark first and last band in each ******* */
 
 
@@ -1755 +1792 @@
     if (((infoPtr->dwStyle & CCS_VERT) ? clientcx > x : clientcy > y) &&
         infoPtr->uNumBands) {
-        INT diff, i, iband, j;
+        INT diff, i;
+        UINT j;
 
         diff = (infoPtr->dwStyle & CCS_VERT) ? clientcx - x : clientcy - y;
-        for (i = infoPtr->uNumRows; i >= 1; i--) {
-            /* if row has more than 1 band, ignore row   */
-            if (infoPtr->rows[i-1].istartband != infoPtr->rows[i-1].iendband)
-                continue;
-            /* point to only band in row  */
-            iband = infoPtr->rows[i-1].istartband;
-            lpBand = &infoPtr->bands[iband];
+
+        /* iterate backwards thru the rows */
+        for (i = infoPtr->uNumBands-1; i>=0; i--) {
+            lpBand = &infoPtr->bands[i];
             if(HIDDENBAND(lpBand)) continue;
+
+            /* if row has more than 1 band, ignore it */
+            if( !(lpBand->fDraw&DRAW_FIRST_IN_ROW) )
+                continue;
+            if( !(lpBand->fDraw&DRAW_LAST_IN_ROW) )
+                continue;
+
             if (lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
             if (((INT)lpBand->cyMaxChild < 1) ||
@@ -1771 +1813 @@
                 if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
                 ERR("P2b band %u RBBS_VARIABLEHEIGHT set but cyMax=%d, cyInt=%d\n",
-                    iband, lpBand->cyMaxChild, lpBand->cyIntegral);
+                    i, lpBand->cyMaxChild, lpBand->cyIntegral);
                 continue;
             }
@@ -1784 +1826 @@
             else
                 lpBand->rcBand.bottom = lpBand->rcBand.top + j;
-            TRACE("P2b band %d, row %d changed to (%d,%d)-(%d,%d)\n",
-                  iband, lpBand->iRow,
+            TRACE("P2b band %d, row %d changed to (%ld,%ld)-(%ld,%ld)\n",
+                  i, lpBand->iRow,
                   lpBand->rcBand.left, lpBand->rcBand.top,
                   lpBand->rcBand.right, lpBand->rcBand.bottom);
@@ -1806 +1848 @@
 
     if (infoPtr->uNumBands) {
-        REBAR_ROW *p;
+        int startband;
 
         /* If RBS_BANDBORDERS set then indicate to draw bottom separator */
@@ -1814 +1856 @@
         if (infoPtr->dwStyle & RBS_BANDBORDERS) {
 
-            for(i = 0; i < infoPtr->uNumRows; i++) {
-                p = &infoPtr->rows[i];
-                for (j = p->istartband; j <= p->iendband; j++) {
-                    lpBand = &infoPtr->bands[j];
-                    if (HIDDENBAND(lpBand)) continue;
-                    if (j != p->iendband)
-                        lpBand->fDraw |= DRAW_RIGHTSEP;
-                    if (i != infoPtr->uNumRows-1)
-                        lpBand->fDraw |= DRAW_BOTTOMSEP;
-                }
+            for (i=0; i<infoPtr->uNumBands; i++) {
+                lpBand = &infoPtr->bands[i];
+                if (HIDDENBAND(lpBand))
+                    continue;
+
+                /* not righthand bands */
+                if( !(lpBand->fDraw & DRAW_LAST_IN_ROW) )
+                    lpBand->fDraw |= DRAW_RIGHTSEP;
+
+                /* not the last row */
+                if( lpBand->iRow != infoPtr->uNumRows )
+                    lpBand->fDraw |= DRAW_BOTTOMSEP;
             }
         }
@@ -1829 +1873 @@
         /* Distribute the extra space on the horizontal and adjust  */
         /* all bands in row to same height.                         */
-        for (i=1; i<=infoPtr->uNumRows; i++) {
-            p = &infoPtr->rows[i-1];
-            mcy = 0;
-
-            TRACE("P3 processing row %d, starting band %d, ending band %d\n",
-                  i, p->istartband, p->iendband);
-
-            /* Find the largest height of the bands in the row */
-            for (j = p->istartband; j <= p->iendband; j++) {
-                lpBand = &infoPtr->bands[j];
-                if (HIDDENBAND(lpBand)) continue;
-                if (mcy < ircBw(lpBand))
-                    mcy = ircBw(lpBand);
-            }
-
-            REBAR_AdjustBands (infoPtr, p->istartband, p->iendband,
+        mcy = 0;
+        startband = -1;
+        for (i=0; i<infoPtr->uNumBands; i++) {
+
+            lpBand = &infoPtr->bands[i];
+
+            if( lpBand->fDraw & DRAW_FIRST_IN_ROW )
+            {
+                startband = i;
+                mcy = 0;
+            }
+
+            if ( (mcy < ircBw(lpBand)) && !HIDDENBAND(lpBand) )
+                mcy = ircBw(lpBand);
+
+            if( lpBand->fDraw & DRAW_LAST_IN_ROW )
+            {
+                TRACE("P3 processing row %d, starting band %d, ending band %d\n",
+                      lpBand->iRow, startband, i);
+                if( startband < 0 )
+                    ERR("Last band %d with no first, row %d\n", i, lpBand->iRow);
+
+                REBAR_AdjustBands (infoPtr, startband, i,
                                (infoPtr->dwStyle & CCS_VERT) ?
                                clientcy : clientcx, mcy);
+            }
         }
 
@@ -1900 +1952 @@
     UINT header=0;
     UINT textheight=0;
-    INT i, nonfixed;
+    UINT i, nonfixed;
     REBAR_BAND *tBand;
 
@@ -2038 +2090 @@
 }
 
-static void
+static BOOL
 REBAR_CommonSetupBand (HWND hwnd, LPREBARBANDINFOA lprbbi, REBAR_BAND *lpBand)
      /* Function:  This routine copies the supplied values from   */
      /*  user input (lprbbi) to the internal band structure.      */
-{
+     /*  It returns true if something changed and false if not.   */
+{
+    BOOL bChanged = FALSE;
+
     lpBand->fMask |= lprbbi->fMask;
 
-    if (lprbbi->fMask & RBBIM_STYLE)
+    if( (lprbbi->fMask & RBBIM_STYLE) &&
+        (lpBand->fStyle != lprbbi->fStyle ) )
+    {
         lpBand->fStyle = lprbbi->fStyle;
-
-    if (lprbbi->fMask & RBBIM_COLORS) {
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_COLORS) &&
+       ( ( lpBand->clrFore != lprbbi->clrFore ) ||
+         ( lpBand->clrBack != lprbbi->clrBack ) ) )
+    {
         lpBand->clrFore = lprbbi->clrFore;
         lpBand->clrBack = lprbbi->clrBack;
-    }
-
-    if (lprbbi->fMask & RBBIM_IMAGE)
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_IMAGE) &&
+       ( lpBand->iImage != lprbbi->iImage ) )
+    {
         lpBand->iImage = lprbbi->iImage;
-
-    if (lprbbi->fMask & RBBIM_CHILD) {
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_CHILD) &&
+       (lprbbi->hwndChild != lpBand->hwndChild ) )
+    {
         if (lprbbi->hwndChild) {
             lpBand->hwndChild = lprbbi->hwndChild;
@@ -2071 +2140 @@
             lpBand->hwndPrevParent = 0;
         }
-    }
-
-    if (lprbbi->fMask & RBBIM_CHILDSIZE) {
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_CHILDSIZE) &&
+        ( (lpBand->cxMinChild != lprbbi->cxMinChild) ||
+          (lpBand->cyMinChild != lprbbi->cyMinChild ) ||
+          ( (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) &&
+            ( (lpBand->cyChild    != lprbbi->cyChild ) ||
+              (lpBand->cyMaxChild != lprbbi->cyMaxChild ) ||
+              (lpBand->cyIntegral != lprbbi->cyIntegral ) ) ) ||
+          ( (lprbbi->cbSize < sizeof (REBARBANDINFOA)) &&
+            ( (lpBand->cyChild || 
+               lpBand->cyMaxChild || 
+               lpBand->cyIntegral ) ) ) ) )
+    {
         lpBand->cxMinChild = lprbbi->cxMinChild;
         lpBand->cyMinChild = lprbbi->cyMinChild;
@@ -2087 +2168 @@
             lpBand->cyIntegral = 0;
         }
-    }
-
-    if (lprbbi->fMask & RBBIM_SIZE)
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_SIZE) &&
+        (lpBand->cx != lprbbi->cx ) )
+    {
         lpBand->cx = lprbbi->cx;
-
-    if (lprbbi->fMask & RBBIM_BACKGROUND)
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_BACKGROUND) &&
+       ( lpBand->hbmBack != lprbbi->hbmBack ) )
+    {
         lpBand->hbmBack = lprbbi->hbmBack;
-
-    if (lprbbi->fMask & RBBIM_ID)
+        bChanged = TRUE;
+    }
+
+    if( (lprbbi->fMask & RBBIM_ID) &&
+        (lpBand->wID != lprbbi->wID ) )
+    {
         lpBand->wID = lprbbi->wID;
+        bChanged = TRUE;
+    }
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+        if( (lprbbi->fMask & RBBIM_IDEALSIZE) &&
+            ( lpBand->cxIdeal != lprbbi->cxIdeal ) )
+        {
             lpBand->cxIdeal = lprbbi->cxIdeal;
-
-        if (lprbbi->fMask & RBBIM_LPARAM)
+            bChanged = TRUE;
+        }
+
+        if( (lprbbi->fMask & RBBIM_LPARAM) &&
+            (lpBand->lParam != lprbbi->lParam ) )
+        {
             lpBand->lParam = lprbbi->lParam;
-
-        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            bChanged = TRUE;
+        }
+
+        if( (lprbbi->fMask & RBBIM_HEADERSIZE) &&
+            (lpBand->cxHeader != lprbbi->cxHeader ) )
+        {
             lpBand->cxHeader = lprbbi->cxHeader;
-    }
+            bChanged = TRUE;
+        }
+    }
+
+    return bChanged;
 }
 
@@ -2119 +2227 @@
 {
     REBAR_BAND *lpBand;
-    INT i, oldrow;
+    UINT i;
+    INT oldrow;
     HDC hdc = (HDC)wParam;
     RECT rect;
@@ -2145 +2254 @@
                     DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM);
                 }
-                TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n",
+                TRACE ("drawing band separator bottom (%ld,%ld)-(%ld,%ld)\n",
                        rcRowSep.left, rcRowSep.top,
                        rcRowSep.right, rcRowSep.bottom);
@@ -2163 +2272 @@
                 DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT);
             }
-            TRACE("drawing band separator right (%d,%d)-(%d,%d)\n",
+            TRACE("drawing band separator right (%ld,%ld)-(%ld,%ld)\n",
                   rcSep.left, rcSep.top, rcSep.right, rcSep.bottom);
         }
@@ -2190 +2299 @@
 
         rect = lpBand->rcBand;
-        TRACE("%s background color=0x%06lx, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n",
+        TRACE("%s background color=0x%06lx, band (%ld,%ld)-(%ld,%ld), clip (%ld,%ld)-(%ld,%ld)\n",
               (lpBand->clrBack == CLR_NONE) ? "none" :
                 ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""),
@@ -2206 +2315 @@
 
 static void
-REBAR_InternalHitTest (REBAR_INFO *infoPtr, LPPOINT lpPt, UINT *pFlags, INT *pBand)
+REBAR_InternalHitTest (REBAR_INFO *infoPtr, const LPPOINT lpPt, UINT *pFlags, INT *pBand)
 {
     REBAR_BAND *lpBand;
     RECT rect;
-    INT  iCount;
+    UINT  iCount;
 
     GetClientRect (infoPtr->hwndSelf, &rect);
@@ -2226 +2335 @@
         else {
             /* somewhere inside */
-            infoPtr->ihitBand = -1;
             for (iCount = 0; iCount < infoPtr->uNumBands; iCount++) {
                 lpBand = &infoPtr->bands[iCount];
@@ -2235 +2343 @@
                     if (PtInRect (&lpBand->rcGripper, *lpPt)) {
                         *pFlags = RBHT_GRABBER;
-                        infoPtr->ihitBand = iCount;
                         TRACE("ON GRABBER %d\n", iCount);
                         return;
@@ -2254 +2361 @@
                         return;
                     }
+                    else if (PtInRect (&lpBand->rcChevron, *lpPt)) {
+                        *pFlags = RBHT_CHEVRON;
+                        TRACE("ON CHEVRON %d\n", iCount);
+                        return;
+                    }
                     else {
                         *pFlags = RBHT_NOWHERE;
@@ -2277 +2389 @@
         return;
     }
-
-    TRACE("flags=0x%X\n", *pFlags);
-    return;
 }
 
@@ -2344 +2453 @@
     READJ(band, Readjust);
 
-    TRACE("band %d:  left=%d, right=%d, move=%d, rtn=%d, rcBand=(%d,%d)-(%d,%d)\n",
+    TRACE("band %d:  left=%d, right=%d, move=%d, rtn=%d, rcBand=(%ld,%ld)-(%ld,%ld)\n",
           i, Leadjust, Readjust, movement, ret,
           band->rcBand.left, band->rcBand.top,
@@ -2375 +2484 @@
             infoPtr->dragStart.y = 0;
             infoPtr->dragNow = infoPtr->dragStart;
-            infoPtr->ihitBand = -1;
+            infoPtr->iGrabbedBand = -1;
             ReleaseCapture ();
             return ;
@@ -2382 +2491 @@
     }
 
-    ihitBand = infoPtr->ihitBand;
+    ihitBand = infoPtr->iGrabbedBand;
     hitBand = &infoPtr->bands[ihitBand];
     imaxdBand = ihitBand; /* to suppress warning message */
@@ -2527 +2636 @@
         if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild)
             childhwnd = lpBand->hwndChild;
-        COMCTL32_Free (infoPtr->bands);
+        Free (infoPtr->bands);
         infoPtr->bands = NULL;
         infoPtr->uNumBands = 0;
@@ -2539 +2648 @@
 
         infoPtr->uNumBands--;
-        infoPtr->bands = COMCTL32_Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
+        infoPtr->bands = Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
         if (uBand > 0) {
             memcpy (&infoPtr->bands[0], &oldBands[0],
@@ -2550 +2659 @@
         }
 
-        COMCTL32_Free (oldBands);
+        Free (oldBands);
     }
 
@@ -2631 +2740 @@
     if (lprbbi == NULL)
         return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
+    if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
         return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
@@ -2717 +2826 @@
     if (lprbbi == NULL)
         return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
+    if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
         return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
@@ -2868 +2977 @@
     CopyRect (lprc, &lpBand->rcBand);
 
-    TRACE("band %d, (%d,%d)-(%d,%d)\n", iBand,
+    TRACE("band %d, (%ld,%ld)-(%ld,%ld)\n", iBand,
           lprc->left, lprc->top, lprc->right, lprc->bottom);
 
@@ -2888 +2997 @@
 {
     INT iRow = (INT)wParam;
-    int ret = 0;
-    int i, j = 0;
+    int j = 0, ret = 0;
+    UINT i;
     REBAR_BAND *lpBand;
 
@@ -2991 +3100 @@
     if (lprbbi == NULL)
         return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
+    if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
         return FALSE;
 
@@ -2999 +3108 @@
 
     if (infoPtr->uNumBands == 0) {
-        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
+        infoPtr->bands = (REBAR_BAND *)Alloc (sizeof (REBAR_BAND));
         uIndex = 0;
     }
@@ -3005 +3114 @@
         REBAR_BAND *oldBands = infoPtr->bands;
         infoPtr->bands =
-            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
+            (REBAR_BAND *)Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
         if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
             uIndex = infoPtr->uNumBands;
@@ -3021 +3130 @@
         }
 
-        COMCTL32_Free (oldBands);
+        Free (oldBands);
     }
 
@@ -3042 +3151 @@
         INT len = MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, NULL, 0 );
         if (len > 1) {
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc (len*sizeof(WCHAR));
+            lpBand->lpText = (LPWSTR)Alloc (len*sizeof(WCHAR));
             MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, lpBand->lpText, len );
         }
@@ -3072 +3181 @@
     if (lprbbi == NULL)
         return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
+    if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
         return FALSE;
 
@@ -3080 +3189 @@
 
     if (infoPtr->uNumBands == 0) {
-        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
+        infoPtr->bands = (REBAR_BAND *)Alloc (sizeof (REBAR_BAND));
         uIndex = 0;
     }
@@ -3086 +3195 @@
         REBAR_BAND *oldBands = infoPtr->bands;
         infoPtr->bands =
-            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
+            (REBAR_BAND *)Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
         if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
             uIndex = infoPtr->uNumBands;
@@ -3097 +3206 @@
 
         /* post copy */
-        if (uIndex < infoPtr->uNumBands - 1) {
+        if (uIndex <= infoPtr->uNumBands - 1) {
             memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
-                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
-        }
-
-        COMCTL32_Free (oldBands);
+                    (infoPtr->uNumBands - uIndex) * sizeof(REBAR_BAND));
+        }
+
+        Free (oldBands);
     }
 
@@ -3123 +3232 @@
         INT len = lstrlenW (lprbbi->lpText);
         if (len > 0) {
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            lpBand->lpText = (LPWSTR)Alloc ((len + 1)*sizeof(WCHAR));
             strcpyW (lpBand->lpText, lprbbi->lpText);
         }
@@ -3131 +3240 @@
     /* On insert of second band, revalidate band 1 to possible add gripper */
     if (infoPtr->uNumBands == 2)
-        REBAR_ValidateBand (infoPtr, &infoPtr->bands[0]);
+        REBAR_ValidateBand (infoPtr, &infoPtr->bands[uIndex ? 0 : 1]);
 
     REBAR_DumpBand (infoPtr);
@@ -3212 +3321 @@
             lpBand->cxHeader;
     if (movement < 0) {
-        ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n",
+        ERR("something is wrong, band=(%ld,%ld)-(%ld,%ld), cxheader=%d\n",
             lpBand->rcBand.left, lpBand->rcBand.top,
             lpBand->rcBand.right, lpBand->rcBand.bottom,
@@ -3333 +3442 @@
     memcpy (&holder, &oldBands[uFrom], sizeof(REBAR_BAND));
 
-    /* close up rest of bands (psuedo delete) */
+    /* close up rest of bands (pseudo delete) */
     if (uFrom < infoPtr->uNumBands - 1) {
         memcpy (&oldBands[uFrom], &oldBands[uFrom+1],
@@ -3341 +3450 @@
     /* allocate new space and copy rest of bands into it */
     infoPtr->bands =
-        (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands)*sizeof(REBAR_BAND));
+        (REBAR_BAND *)Alloc ((infoPtr->uNumBands)*sizeof(REBAR_BAND));
 
     /* pre insert copy */
@@ -3358 +3467 @@
     }
 
-    COMCTL32_Free (oldBands);
+    Free (oldBands);
 
     TRACE("moved band %d to index %d\n", uFrom, uTo);
@@ -3377 +3486 @@
 
 
+/* return TRUE if two strings are different */
+static BOOL
+REBAR_strdifW( LPCWSTR a, LPCWSTR b )
+{
+    return ( (a && !b) || (b && !a) || (a && b && lstrcmpW(a, b) ) );
+}
+
 static LRESULT
 REBAR_SetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
@@ -3382 +3498 @@
     LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam;
     REBAR_BAND *lpBand;
+    BOOL bChanged;
 
     if (lprbbi == NULL)
         return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
+    if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
         return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
@@ -3396 +3513 @@
     lpBand = &infoPtr->bands[(UINT)wParam];
 
-    REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand);
+    bChanged = REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand);
     if (lprbbi->fMask & RBBIM_TEXT) {
-        if (lpBand->lpText) {
-            COMCTL32_Free (lpBand->lpText);
-            lpBand->lpText = NULL;
-        }
-        if (lprbbi->lpText) {
-            INT len = MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, NULL, 0 );
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc (len*sizeof(WCHAR));
-            MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, lpBand->lpText, len );
-        }
+        LPWSTR wstr = NULL;
+
+        if (lprbbi->lpText)
+        {
+            INT len;
+            len = MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, NULL, 0 );
+            if (len > 1)
+                wstr = (LPWSTR)Alloc (len*sizeof(WCHAR));
+            if (wstr)
+                MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, wstr, len );
+        }
+        if (REBAR_strdifW(lpBand->lpText, wstr)) {
+            if (lpBand->lpText) {
+                Free (lpBand->lpText);
+                lpBand->lpText = NULL;
+            }
+            if (wstr) {
+                lpBand->lpText = wstr;
+                wstr = NULL;
+            }
+            bChanged = TRUE;
+        }
+        if (wstr)
+            Free (wstr);
     }
 
@@ -3413 +3545 @@
     REBAR_DumpBand (infoPtr);
 
-    if (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE)) {
+    if (bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE))) {
           REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
           InvalidateRect(infoPtr->hwndSelf, 0, 1);
@@ -3421 +3553 @@
 }
 
-
 static LRESULT
 REBAR_SetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
@@ -3427 +3558 @@
     LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam;
     REBAR_BAND *lpBand;
+    BOOL bChanged;
 
     if (lprbbi == NULL)
         return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
+    if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
         return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
@@ -3441 +3573 @@
     lpBand = &infoPtr->bands[(UINT)wParam];
 
-    REBAR_CommonSetupBand (infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand);
-    if (lprbbi->fMask & RBBIM_TEXT) {
+    bChanged = REBAR_CommonSetupBand (infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand);
+    if( (lprbbi->fMask & RBBIM_TEXT) && 
+        REBAR_strdifW( lpBand->lpText, lprbbi->lpText ) ) {
         if (lpBand->lpText) {
-            COMCTL32_Free (lpBand->lpText);
+            Free (lpBand->lpText);
             lpBand->lpText = NULL;
         }
         if (lprbbi->lpText) {
             INT len = lstrlenW (lprbbi->lpText);
-            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            strcpyW (lpBand->lpText, lprbbi->lpText);
-        }
+            if (len > 0)
+            {
+                lpBand->lpText = (LPWSTR)Alloc ((len + 1)*sizeof(WCHAR));
+                strcpyW (lpBand->lpText, lprbbi->lpText);
+            }
+        }
+        bChanged = TRUE;
     }
 
@@ -3458 +3595 @@
     REBAR_DumpBand (infoPtr);
 
-    if (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE)) {
+    if ( bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE)) ) {
       REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
       InvalidateRect(infoPtr->hwndSelf, 0, 1);
@@ -3608 +3745 @@
     }
 
+    infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
     REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
     InvalidateRect(infoPtr->hwndSelf, 0, 1);
@@ -3624 +3762 @@
        return FALSE;
 
-    TRACE("[%d %d %d %d]\n",
+    TRACE("[%ld %ld %ld %ld]\n",
           lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
 
     /*  what is going on???? */
     GetWindowRect(infoPtr->hwndSelf, &t1);
-    TRACE("window rect [%d %d %d %d]\n",
+    TRACE("window rect [%ld %ld %ld %ld]\n",
           t1.left, t1.top, t1.right, t1.bottom);
     GetClientRect(infoPtr->hwndSelf, &t1);
-    TRACE("client rect [%d %d %d %d]\n",
+    TRACE("client rect [%ld %ld %ld %ld]\n",
           t1.left, t1.top, t1.right, t1.bottom);
 
@@ -3654 +3792 @@
         GetWindowRect(infoPtr->hwndSelf, &wnrc1);
         GetClientRect(infoPtr->hwndSelf, &clrc1);
-        TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
+        TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n",
               wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
               clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
@@ -3669 +3807 @@
 {
     REBAR_BAND *lpBand;
-    INT i;
+    UINT i;
 
 
@@ -3680 +3818 @@
             /* delete text strings */
             if (lpBand->lpText) {
-                COMCTL32_Free (lpBand->lpText);
+                Free (lpBand->lpText);
                 lpBand->lpText = NULL;
             }
@@ -3688 +3826 @@
 
         /* free band array */
-        COMCTL32_Free (infoPtr->bands);
+        Free (infoPtr->bands);
         infoPtr->bands = NULL;
     }
@@ -3700 +3838 @@
 
     /* free rebar info data */
-    COMCTL32_Free (infoPtr);
+    Free (infoPtr);
     TRACE("destroyed!\n");
     return 0;
@@ -3723 +3861 @@
 }
 
+static LRESULT
+REBAR_PushChevron(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
+{
+    if (wParam >= 0 && (UINT)wParam < infoPtr->uNumBands)
+    {
+        NMREBARCHEVRON nmrbc;
+        REBAR_BAND *lpBand = &infoPtr->bands[wParam];
+
+        TRACE("Pressed chevron on band %d\n", wParam);
+
+        /* redraw chevron in pushed state */
+        lpBand->fDraw |= DRAW_CHEVRONPUSHED;
+        RedrawWindow(infoPtr->hwndSelf, &lpBand->rcChevron,0,
+          RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
+
+        /* notify app so it can display a popup menu or whatever */
+        nmrbc.uBand = wParam;
+        nmrbc.wID = lpBand->wID;
+        nmrbc.lParam = lpBand->lParam;
+        nmrbc.rc = lpBand->rcChevron;
+        nmrbc.lParamNM = lParam;
+        REBAR_Notify((NMHDR*)&nmrbc, infoPtr, RBN_CHEVRONPUSHED);
+
+        /* redraw chevron in previous state */
+        lpBand->fDraw &= ~DRAW_CHEVRONPUSHED;
+        InvalidateRect(infoPtr->hwndSelf, &lpBand->rcChevron, TRUE);
+
+        return TRUE;
+    }
+    return FALSE;
+}
 
 static LRESULT
@@ -3728 +3897 @@
 {
     REBAR_BAND *lpBand;
-
-    /* If InternalHitTest did not find a hit on the Gripper, */
-    /* then ignore the button click.                         */
-    if (infoPtr->ihitBand == -1) return 0;
-
-    SetCapture (infoPtr->hwndSelf);
-
-    /* save off the LOWORD and HIWORD of lParam as initial x,y */
-    lpBand = &infoPtr->bands[infoPtr->ihitBand];
-    infoPtr->dragStart = MAKEPOINTS(lParam);
-    infoPtr->dragNow = infoPtr->dragStart;
-    if (infoPtr->dwStyle & CCS_VERT)
-        infoPtr->ihitoffset = infoPtr->dragStart.y - (lpBand->rcBand.top+REBAR_PRE_GRIPPER);
-    else
-        infoPtr->ihitoffset = infoPtr->dragStart.x - (lpBand->rcBand.left+REBAR_PRE_GRIPPER);
-
+    UINT htFlags;
+    UINT iHitBand;
+    POINT ptMouseDown;
+    ptMouseDown.x = (INT)LOWORD(lParam);
+    ptMouseDown.y = (INT)HIWORD(lParam);
+
+    REBAR_InternalHitTest(infoPtr, &ptMouseDown, &htFlags, &iHitBand);
+    lpBand = &infoPtr->bands[iHitBand];
+
+    if (htFlags == RBHT_CHEVRON)
+    {
+        REBAR_PushChevron(infoPtr, iHitBand, 0);
+    }
+    else if (htFlags == RBHT_GRABBER || htFlags == RBHT_CAPTION)
+    {
+        TRACE("Starting drag\n");
+
+        SetCapture (infoPtr->hwndSelf);
+        infoPtr->iGrabbedBand = iHitBand;
+
+        /* save off the LOWORD and HIWORD of lParam as initial x,y */
+        infoPtr->dragStart = MAKEPOINTS(lParam);
+        infoPtr->dragNow = infoPtr->dragStart;
+        if (infoPtr->dwStyle & CCS_VERT)
+            infoPtr->ihitoffset = infoPtr->dragStart.y - (lpBand->rcBand.top+REBAR_PRE_GRIPPER);
+        else
+            infoPtr->ihitoffset = infoPtr->dragStart.x - (lpBand->rcBand.left+REBAR_PRE_GRIPPER);
+    }
     return 0;
 }
-
 
 static LRESULT
 REBAR_LButtonUp (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    NMHDR layout;
-    RECT rect;
-    INT ihitBand;
-
-    /* If InternalHitTest did not find a hit on the Gripper, */
-    /* then ignore the button click.                         */
-    if (infoPtr->ihitBand == -1) return 0;
-
-    ihitBand = infoPtr->ihitBand;
-    infoPtr->dragStart.x = 0;
-    infoPtr->dragStart.y = 0;
-    infoPtr->dragNow = infoPtr->dragStart;
-    infoPtr->ihitBand = -1;
-
-    ReleaseCapture ();
-
-    if (infoPtr->fStatus & BEGIN_DRAG_ISSUED) {
-        REBAR_Notify((NMHDR *) &layout, infoPtr, RBN_LAYOUTCHANGED);
-        REBAR_Notify_NMREBAR (infoPtr, ihitBand, RBN_ENDDRAG);
-        infoPtr->fStatus &= ~BEGIN_DRAG_ISSUED;
-    }
-
-    GetClientRect(infoPtr->hwndSelf, &rect);
-    InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
+    if (infoPtr->iGrabbedBand >= 0)
+    {
+        NMHDR layout;
+        RECT rect;
+
+        infoPtr->dragStart.x = 0;
+        infoPtr->dragStart.y = 0;
+        infoPtr->dragNow = infoPtr->dragStart;
+
+        ReleaseCapture ();
+
+        if (infoPtr->fStatus & BEGIN_DRAG_ISSUED) {
+            REBAR_Notify(&layout, infoPtr, RBN_LAYOUTCHANGED);
+            REBAR_Notify_NMREBAR (infoPtr, infoPtr->iGrabbedBand, RBN_ENDDRAG);
+            infoPtr->fStatus &= ~BEGIN_DRAG_ISSUED;
+        }
+
+        infoPtr->iGrabbedBand = -1;
+
+        GetClientRect(infoPtr->hwndSelf, &rect);
+        InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
+    }
 
     return 0;
 }
 
+static LRESULT
+REBAR_MouseLeave (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
+{
+    if (infoPtr->ichevronhotBand >= 0)
+    {
+        REBAR_BAND *lpChevronBand = &infoPtr->bands[infoPtr->ichevronhotBand];
+        if (lpChevronBand->fDraw & DRAW_CHEVRONHOT)
+        {
+            lpChevronBand->fDraw &= ~DRAW_CHEVRONHOT;
+            InvalidateRect(infoPtr->hwndSelf, &lpChevronBand->rcChevron, TRUE);
+        }
+    }
+    infoPtr->iOldBand = -1;
+    infoPtr->ichevronhotBand = -2;
+
+    return TRUE;
+}
 
 static LRESULT
 REBAR_MouseMove (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    REBAR_BAND *band1, *band2;
+    REBAR_BAND *lpChevronBand;
     POINTS ptsmove;
 
-    /* Validate entry as hit on Gripper has occurred */
-    if (GetCapture() != infoPtr->hwndSelf) return 0;
-    if (infoPtr->ihitBand == -1) return 0;
-
     ptsmove = MAKEPOINTS(lParam);
 
-    /* if mouse did not move much, exit */
-    if ((abs(ptsmove.x - infoPtr->dragNow.x) <= mindragx) &&
-        (abs(ptsmove.y - infoPtr->dragNow.y) <= mindragy)) return 0;
-
-    band1 = &infoPtr->bands[infoPtr->ihitBand-1];
-    band2 = &infoPtr->bands[infoPtr->ihitBand];
-
-    /* Test for valid drag case - must not be first band in row */
-    if (infoPtr->dwStyle & CCS_VERT) {
-        if ((ptsmove.x < band2->rcBand.left) ||
-            (ptsmove.x > band2->rcBand.right) ||
-            ((infoPtr->ihitBand > 0) && (band1->iRow != band2->iRow))) {
-            FIXME("Cannot drag to other rows yet!!\n");
-        }
-        else {
-            REBAR_HandleLRDrag (infoPtr, &ptsmove);
-        }
-    }
-    else {
-        if ((ptsmove.y < band2->rcBand.top) ||
-            (ptsmove.y > band2->rcBand.bottom) ||
-            ((infoPtr->ihitBand > 0) && (band1->iRow != band2->iRow))) {
-            FIXME("Cannot drag to other rows yet!!\n");
-        }
-        else {
-            REBAR_HandleLRDrag (infoPtr, &ptsmove);
-        }
-    }
+    /* if we are currently dragging a band */
+    if (infoPtr->iGrabbedBand >= 0)
+    {
+        REBAR_BAND *band1, *band2;
+    
+        if (GetCapture() != infoPtr->hwndSelf)
+            ERR("We are dragging but haven't got capture?!?\n");
+
+        band1 = &infoPtr->bands[infoPtr->iGrabbedBand-1];
+        band2 = &infoPtr->bands[infoPtr->iGrabbedBand];
+
+        /* if mouse did not move much, exit */
+        if ((abs(ptsmove.x - infoPtr->dragNow.x) <= mindragx) &&
+            (abs(ptsmove.y - infoPtr->dragNow.y) <= mindragy)) return 0;
+
+        /* Test for valid drag case - must not be first band in row */
+        if (infoPtr->dwStyle & CCS_VERT) {
+            if ((ptsmove.x < band2->rcBand.left) ||
+              (ptsmove.x > band2->rcBand.right) ||
+              ((infoPtr->iGrabbedBand > 0) && (band1->iRow != band2->iRow))) {
+                FIXME("Cannot drag to other rows yet!!\n");
+            }
+            else {
+                REBAR_HandleLRDrag (infoPtr, &ptsmove);
+            }
+        }
+        else {
+            if ((ptsmove.y < band2->rcBand.top) ||
+              (ptsmove.y > band2->rcBand.bottom) ||
+              ((infoPtr->iGrabbedBand > 0) && (band1->iRow != band2->iRow))) {
+                FIXME("Cannot drag to other rows yet!!\n");
+            }
+            else {
+                REBAR_HandleLRDrag (infoPtr, &ptsmove);
+            }
+        }
+    }
+    else
+    {
+        POINT ptMove;
+        INT iHitBand;
+        UINT htFlags;
+        TRACKMOUSEEVENT trackinfo;
+
+        ptMove.x = (INT)ptsmove.x;
+        ptMove.y = (INT)ptsmove.y;
+        REBAR_InternalHitTest(infoPtr, &ptMove, &htFlags, &iHitBand);
+
+        if (infoPtr->iOldBand >= 0 && infoPtr->iOldBand == infoPtr->ichevronhotBand)
+        {
+            lpChevronBand = &infoPtr->bands[infoPtr->ichevronhotBand];
+            if (lpChevronBand->fDraw & DRAW_CHEVRONHOT)
+            {
+                lpChevronBand->fDraw &= ~DRAW_CHEVRONHOT;
+                InvalidateRect(infoPtr->hwndSelf, &lpChevronBand->rcChevron, TRUE);
+            }
+            infoPtr->ichevronhotBand = -2;
+        }
+
+        if (htFlags == RBHT_CHEVRON)
+        {
+            /* fill in the TRACKMOUSEEVENT struct */
+            trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
+            trackinfo.dwFlags = TME_QUERY;
+            trackinfo.hwndTrack = infoPtr->hwndSelf;
+            trackinfo.dwHoverTime = 0;
+
+            /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */
+            _TrackMouseEvent(&trackinfo);
+
+            /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */
+            if(!(trackinfo.dwFlags & TME_LEAVE))
+            {
+                trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
+
+                /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
+                /* and can properly deactivate the hot chevron */
+                _TrackMouseEvent(&trackinfo);
+            }
+
+            lpChevronBand = &infoPtr->bands[iHitBand];
+            if (!(lpChevronBand->fDraw & DRAW_CHEVRONHOT))
+            {
+                lpChevronBand->fDraw |= DRAW_CHEVRONHOT;
+                InvalidateRect(infoPtr->hwndSelf, &lpChevronBand->rcChevron, TRUE);
+                infoPtr->ichevronhotBand = iHitBand;
+            }
+        }
+        infoPtr->iOldBand = iHitBand;
+    }
+
     return 0;
 }
@@ -3831 +4085 @@
                     -GetSystemMetrics(SM_CYEDGE));
     }
-    TRACE("new client=(%d,%d)-(%d,%d)\n",
+    TRACE("new client=(%ld,%ld)-(%ld,%ld)\n",
           ((LPRECT)lParam)->left, ((LPRECT)lParam)->top,
           ((LPRECT)lParam)->right, ((LPRECT)lParam)->bottom);
@@ -3856 +4110 @@
         GetWindowRect(hwnd, &wnrc1);
         GetClientRect(hwnd, &clrc1);
-        TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
+        TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n",
               wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
               clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
@@ -3863 +4117 @@
 
     /* allocate memory for info structure */
-    infoPtr = (REBAR_INFO *)COMCTL32_Alloc (sizeof(REBAR_INFO));
+    infoPtr = (REBAR_INFO *)Alloc (sizeof(REBAR_INFO));
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
@@ -3871 +4125 @@
     infoPtr->clrBtnText = GetSysColor (COLOR_BTNTEXT);
     infoPtr->clrBtnFace = GetSysColor (COLOR_BTNFACE);
-    infoPtr->ihitBand = -1;
+    infoPtr->iOldBand = -1;
+    infoPtr->ichevronhotBand = -2;
+    infoPtr->iGrabbedBand = -1;
     infoPtr->hwndSelf = hwnd;
     infoPtr->DoRedraw = TRUE;
-    infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA);
-    infoPtr->hcurHorz  = LoadCursorA (0, IDC_SIZEWEA);
-    infoPtr->hcurVert  = LoadCursorA (0, IDC_SIZENSA);
-    infoPtr->hcurDrag  = LoadCursorA (0, IDC_SIZEA);
+    infoPtr->hcurArrow = LoadCursorA (0, (LPSTR)IDC_ARROWA);
+    infoPtr->hcurHorz  = LoadCursorA (0, (LPSTR)IDC_SIZEWEA);
+    infoPtr->hcurVert  = LoadCursorA (0, (LPSTR)IDC_SIZENSA);
+    infoPtr->hcurDrag  = LoadCursorA (0, (LPSTR)IDC_SIZEA);
     infoPtr->bUnicode = IsWindowUnicode (hwnd);
     infoPtr->fStatus = CREATE_RUNNING;
@@ -3989 +4245 @@
         GetWindowRect (infoPtr->hwndSelf, &rcWindow);
         OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
-        TRACE("rect (%d,%d)-(%d,%d)\n",
+        TRACE("rect (%ld,%ld)-(%ld,%ld)\n",
               rcWindow.left, rcWindow.top,
               rcWindow.right, rcWindow.bottom);
@@ -4030 +4286 @@
     hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam;
 
-    TRACE("painting (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n",
+    TRACE("painting (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n",
           ps.rcPaint.left, ps.rcPaint.top,
           ps.rcPaint.right, ps.rcPaint.bottom,
@@ -4155 +4411 @@
         infoPtr->fStatus &= ~CREATE_RUNNING;
         GetWindowRect ( infoPtr->hwndSelf, &rcWin);
-        TRACE("win rect (%d,%d)-(%d,%d)\n",
+        TRACE("win rect (%ld,%ld)-(%ld,%ld)\n",
               rcWin.left, rcWin.top, rcWin.right, rcWin.bottom);
 
@@ -4162 +4418 @@
             /* native control seems to do this */
             GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient);
-            TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n",
+            TRACE("sizing rebar, message and client zero, parent client (%ld,%ld)\n",
                   rcClient.right, rcClient.bottom);
         }
@@ -4176 +4432 @@
             /* do the actual WM_SIZE request */
             GetClientRect (infoPtr->hwndSelf, &rcClient);
-            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
+            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%ld,%ld)\n",
                   infoPtr->calcSize.cx, infoPtr->calcSize.cy,
                   LOWORD(lParam), HIWORD(lParam),
@@ -4196 +4452 @@
             /* native seems to use the current client rect for the size      */
             infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
-            TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n",
+            TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n",
                   rcClient.right, rcClient.bottom);
         }
         else {
-            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
+#ifdef __WIN32OS2__
+            INT  width, x, y, height;
+            RECT parent_rect, rcWin;
+
+            if(HIWORD(lParam) != (rcClient.bottom - rcClient.top) ||
+               LOWORD(lParam) != (rcClient.right  - rcClient.left))
+            {
+                /* Need to resize width to match parent */
+                GetWindowRect ( infoPtr->hwndSelf, &rcWin);
+                height = (rcWin.bottom - rcWin.top);
+ 
+                /* width and height don't apply */
+                GetClientRect (GetParent(infoPtr->hwndSelf), &parent_rect);
+                width = parent_rect.right - parent_rect.left;
+                TRACE("Rebar: resize to match parent");
+                SetWindowPos (infoPtr->hwndSelf, 0, 0, 0, width, height, SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE);
+                return 0;;
+            }
+#endif
+            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%ld,%ld)\n",
                   infoPtr->calcSize.cx, infoPtr->calcSize.cy,
                   LOWORD(lParam), HIWORD(lParam),
@@ -4214 +4489 @@
         autosize.rcActual = autosize.rcTarget;  /* ??? */
         REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE);
-        TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n",
+        TRACE("RBN_AUTOSIZE client=(%ld,%ld), lp=%08lx\n",
               autosize.rcTarget.right, autosize.rcTarget.bottom, lParam);
     }
@@ -4255 +4530 @@
                          wParam, lParam);
     GetWindowRect(infoPtr->hwndSelf, &rc);
-    TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n",
+    TRACE("hwnd %p new pos (%ld,%ld)-(%ld,%ld)\n",
           infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom);
     return ret;
 }
 
+#ifdef __WIN32OS2__
+#ifdef DEBUG
+static void dprintfMsg(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ char *msg = NULL;
+
+  switch (uMsg)
+  {
+  case RB_DELETEBAND:
+      msg = "RB_DELETEBAND";
+      break;
+  case RB_GETBANDBORDERS:
+      msg = "RB_GETBANDBORDERS";
+      break;
+  case RB_GETBANDCOUNT:
+      msg = "RB_GETBANDCOUNT";
+      break;
+  case RB_GETBANDINFO_OLD:
+      msg = "RB_GETBANDINFO_OLD";
+      break;
+  case RB_GETBANDINFOA:
+      msg = "RB_GETBANDINFOA";
+      break;
+  case RB_GETBANDINFOW:
+      msg = "RB_GETBANDINFOW";
+      break;
+  case RB_GETBARHEIGHT:
+      msg = "RB_GETBARHEIGHT";
+      break;
+  case RB_GETBARINFO:
+      msg = "RB_GETBARINFO";
+      break;
+  case RB_GETBKCOLOR:
+      msg = "RB_GETBKCOLOR";
+      break;
+  case RB_GETPALETTE:
+      msg = "RB_GETPALETTE";
+      break;
+  case RB_GETRECT:
+      msg = "RB_GETRECT";
+      break;
+  case RB_GETROWCOUNT:
+      msg = "RB_GETROWCOUNT";
+      break;
+  case RB_GETROWHEIGHT:
+      msg = "RB_GETROWHEIGHT";
+      break;
+  case RB_GETTEXTCOLOR:
+      msg = "RB_GETTEXTCOLOR";
+      break;
+  case RB_GETTOOLTIPS:
+      msg = "RB_GETTOOLTIPS";
+      break;
+  case RB_GETUNICODEFORMAT:
+      msg = "RB_GETUNICODEFORMAT";
+      break;
+  case CCM_GETVERSION:
+      msg = "CCM_GETVERSION";
+      break;
+  case RB_HITTEST:
+      msg = "RB_HITTEST";
+      break;
+  case RB_IDTOINDEX:
+      msg = "RB_IDTOINDEX";
+      break;
+  case RB_INSERTBANDA:
+      msg = "RB_INSERTBANDA";
+      break;
+  case RB_INSERTBANDW:
+      msg = "RB_INSERTBANDW";
+      break;
+  case RB_MAXIMIZEBAND:
+      msg = "RB_MAXIMIZEBAND";
+      break;
+  case RB_MINIMIZEBAND:
+      msg = "RB_MINIMIZEBAND";
+      break;
+  case RB_MOVEBAND:
+      msg = "RB_MOVEBAND";
+      break;
+  case RB_PUSHCHEVRON:
+      msg = "RB_PUSHCHEVRON";
+      break;
+  case RB_SETBANDINFOA:
+      msg = "RB_SETBANDINFOA";
+      break;
+  case RB_SETBANDINFOW:
+      msg = "RB_SETBANDINFOW";
+      break;
+  case RB_SETBARINFO:
+      msg = "RB_SETBARINFO";
+      break;
+  case RB_SETBKCOLOR:
+      msg = "RB_SETBKCOLOR";
+      break;
+  case RB_SETPARENT:
+      msg = "RB_SETPARENT";
+      break;
+  case RB_SETTEXTCOLOR:
+      msg = "RB_SETTEXTCOLOR";
+      break;
+  case RB_SETUNICODEFORMAT:
+      msg = "RB_SETUNICODEFORMAT";
+      break;
+  case CCM_SETVERSION:
+      msg = "CCM_SETVERSION";
+      break;
+  case RB_SHOWBAND:
+      msg = "RB_SHOWBAND";
+      break;
+  case RB_SIZETORECT:
+      msg = "RB_SIZETORECT";
+      break;
+/*      case RB_BEGINDRAG: */
+/*      case RB_DRAGMOVE: */
+/*      case RB_ENDDRAG: */
+/*      case RB_GETCOLORSCHEME: */
+/*      case RB_GETDROPTARGET: */
+/*      case RB_SETCOLORSCHEME: */
+/*      case RB_SETPALETTE: */
+/*          return REBAR_GetPalette (infoPtr, wParam, lParam); */
+/*      case RB_SETTOOLTIPS: */
+
+  default:
+      return;
+  }
+  dprintf(("Rebar %x %s %x %x", hwnd, msg, wParam, lParam));
+}
+#endif
+#endif //__WIN32OS2__
 
 static LRESULT WINAPI
@@ -4266 +4671 @@
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
 
+#if defined(DEBUG) && defined(__WIN32OS2__)
+    dprintfMsg(hwnd, uMsg, wParam, lParam);
+#else
     TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
-          hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
+          hwnd, uMsg, wParam, lParam);
+#endif
     if (!infoPtr && (uMsg != WM_NCCREATE))
             return DefWindowProcA (hwnd, uMsg, wParam, lParam);
@@ -4286 +4695 @@
             return REBAR_GetBandCount (infoPtr);
 
-        case RB_GETBANDINFO:    /* obsoleted after IE3, but we have to
-                                   support it anyway. */
+        case RB_GETBANDINFO_OLD:
         case RB_GETBANDINFOA:
             return REBAR_GetBandInfoA (infoPtr, wParam, lParam);
@@ -4350 +4758 @@
         case RB_MOVEBAND:
             return REBAR_MoveBand (infoPtr, wParam, lParam);
+
+        case RB_PUSHCHEVRON:
+            return REBAR_PushChevron (infoPtr, wParam, lParam);
 
         case RB_SETBANDINFOA:
@@ -4426 +4837 @@
         case WM_MOUSEMOVE:
             return REBAR_MouseMove (infoPtr, wParam, lParam);
+
+        case WM_MOUSELEAVE:
+            return REBAR_MouseLeave (infoPtr, wParam, lParam);
 
         case WM_NCCALCSIZE:
@@ -4515 +4929 @@
 REBAR_Unregister (void)
 {
-    UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
-}
+    UnregisterClassA (REBARCLASSNAMEA, NULL);
+}