Changeset 10098 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

Wine resync

Location:

trunk/src/comctl32

Files:

• comctl32.def (modified) (5 diffs)
• comctl32dbg.def (modified) (5 diffs)
• initcomctl32.cpp (modified) (1 diff)
• makefile (modified) (1 diff)
• monthcal.c (modified) (107 diffs)
• nativefont.c (modified) (2 diffs)
• pager.c (modified) (9 diffs)
• progress.c (modified) (3 diffs)
• propsheet.c (modified) (24 diffs)
• rebar.c (modified) (1 diff)
• smoothscroll.c (modified) (3 diffs)
• tab.c (modified) (40 diffs)
• toolbar.c (modified) (61 diffs)
• tooltips.c (modified) (1 diff)
• trackbar.c (added)
• trackbar.cpp (deleted)
• trackbar.h (deleted)
• treeview.c (added)
• treeview.cpp (deleted)
• treeview.h (deleted)

trunk/src/comctl32/comctl32.def

@@ -1 @@
-; $Id: comctl32.def,v 1.28 2003-04-09 11:58:39 sandervl Exp $
+; $Id: comctl32.def,v 1.29 2003-05-15 14:26:27 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -103 +103 @@
 
   CreateMRUListA      = _CreateMRUListA@4          @151
-; ordinals????
   FreeMRUList         = _FreeMRUList@4             @152
   AddMRUStringA       = _AddMRUStringA@8           @153
@@ -160 +159 @@
   StrCmpNIW           = _COMCTL32_StrCmpNIW@12     @361
   StrStrW             = _COMCTL32_StrStrW@8        @362
-;StrStrIW @363
+  StrStrIW            = _COMCTL32_StrStrIW@8       @363
   StrSpnW             = _COMCTL32_StrSpnW@8        @364
   StrToIntW           = _COMCTL32_StrToIntW@4      @365
@@ -191 +190 @@
   CreateMRUListLazyW  = _CreateMRUListLazyW@16     @404
 
-                        _COMCTL32_410@16           @410 NONAME
-                        _COMCTL32_411@12           @411 NONAME
-                        _COMCTL32_412@12           @412 NONAME
-                        _COMCTL32_413@16           @413 NONAME
+; These are only available in comctrl 6
+  DefSubclassProc      = _DefSubclassProc@16       @410
+  GetWindowSubclass    = _GetWindowSubclass@16     @411
+  RemoveWindowSubclass = _RemoveWindowSubclass@12  @412
+  SetWindowSubclass    = _SetWindowSubclass@16     @413
                         _COMCTL32_415@20           @415 NONAME
 
@@ -201 +201 @@
 
 
-; These are only available in comctrl 6
-  DefSubclassProc      = _DefSubclassProc@16        @500
-  GetWindowSubclass    = _GetWindowSubclass@16      @501
-  RemoveWindowSubclass = _RemoveWindowSubclass@12   @502
-  SetWindowSubclass    = _SetWindowSubclass@16      @503
-

trunk/src/comctl32/comctl32dbg.def

@@ -1 @@
-; $Id: comctl32dbg.def,v 1.4 2003-04-09 11:58:40 sandervl Exp $
+; $Id: comctl32dbg.def,v 1.5 2003-05-15 14:26:27 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -103 +103 @@
 
   CreateMRUListA      = _DbgCreateMRUListA@4          @151
-; ordinals????
   FreeMRUList         = _DbgFreeMRUList@4             @152
   AddMRUStringA       = _DbgAddMRUStringA@8           @153
@@ -157 +156 @@
   StrCmpNIW           = _DbgCOMCTL32_StrCmpNIW@12     @361
   StrStrW             = _DbgCOMCTL32_StrStrW@8        @362
-;StrStrIW @363
+  StrStrIW            = _DbgCOMCTL32_StrStrIW@8       @363
   StrSpnW             = _DbgCOMCTL32_StrSpnW@8        @364
   StrToIntW           = _DbgCOMCTL32_StrToIntW@4      @365
@@ -188 +187 @@
   CreateMRUListLazyW  = _DbgCreateMRUListLazyW@16     @404
 
-                        _COMCTL32_410@16           @410 NONAME
-                        _COMCTL32_411@12           @411 NONAME
-                        _COMCTL32_412@12           @412 NONAME
-                        _COMCTL32_413@16           @413 NONAME
+; These are only available in comctrl 6
+  DefSubclassProc      = _DefSubclassProc@16       @410
+  GetWindowSubclass    = _GetWindowSubclass@16     @411
+  RemoveWindowSubclass = _RemoveWindowSubclass@12  @412
+  SetWindowSubclass    = _SetWindowSubclass@16     @413
                         _COMCTL32_415@20           @415 NONAME
 
@@ -197 +197 @@
                         _COMCTL32_419@16           @419 NONAME
 
-; These are only available in comctrl 6
-  DefSubclassProc      = _DefSubclassProc@16        @500
-  GetWindowSubclass    = _GetWindowSubclass@16      @501
-  RemoveWindowSubclass = _RemoveWindowSubclass@12   @502
-  SetWindowSubclass    = _SetWindowSubclass@16      @503

trunk/src/comctl32/initcomctl32.cpp

@@ -1 @@
-/* $Id: initcomctl32.cpp,v 1.5 2003-05-15 14:25:13 sandervl Exp $ */
+/* $Id: initcomctl32.cpp,v 1.6 2003-05-15 14:26:27 sandervl Exp $ */
 /*
  * COMCTL32 DLL entry point

trunk/src/comctl32/makefile

@@ -1 @@
-# $Id: makefile,v 1.39 2003-05-15 14:25:14 sandervl Exp $
+# $Id: makefile,v 1.40 2003-05-15 14:26:27 sandervl Exp $
 
 #

trunk/src/comctl32/monthcal.c

@@ -8 +8 @@
  * Copyright 2000 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  * TODO:
  *   - Notifications.
@@ -13 +27 @@
  *
  *  FIXME: handle resources better (doesn't work now); also take care
-           of internationalization. 
+           of internationalization.
  *  FIXME: keyboard handling.
  */
-
-#ifdef __WIN32OS2__
-#include <odin.h>
-#include <string.h>
-#define inline
-#endif
 
 #include <math.h>
@@ -35 +43 @@
 #include "commctrl.h"
 #include "comctl32.h"
-#include "debugtools.h"
-
-#ifdef __WIN32OS2__
-#include "ccbase.h"
-#endif
-
-DEFAULT_DEBUG_CHANNEL(monthcal);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(monthcal);
 
 #define MC_SEL_LBUTUP       1   /* Left button released */
@@ -51 +55 @@
                                                                                 /* to the next month */
 #define MC_NEXTMONTHTIMER   1                   /* Timer ID's */
-#define MC_PREVMONTHTIMER   2                   
+#define MC_PREVMONTHTIMER   2
 
 typedef struct
 {
-#ifdef __WIN32OS2__
-    COMCTL32_HEADER header;
-#endif
     COLORREF    bk;
     COLORREF    txt;
@@ -91 +92 @@
     SYSTEMTIME  minDate;
     SYSTEMTIME  maxDate;
-                
+
     RECT rcClient;      /* rect for whole client area */
     RECT rcDraw;        /* rect for drawable portion of client area */
     RECT title;         /* rect for the header above the calendar */
     RECT titlebtnnext;  /* the `next month' button in the header */
-    RECT titlebtnprev;  /* the `prev month' button in the header */     
+    RECT titlebtnprev;  /* the `prev month' button in the header */
     RECT titlemonth;    /* the `month name' txt in the header */
     RECT titleyear;     /* the `year number' txt in the header */
@@ -121 +122 @@
 {
 const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
-  /*Wrap around, this eases handleing*/
+  /*Wrap around, this eases handling*/
   if(month == 0)
     month = 12;
@@ -141 +142 @@
 
 /* make sure that time is valid */
-static int MONTHCAL_ValidateTime(SYSTEMTIME time) 
+static int MONTHCAL_ValidateTime(SYSTEMTIME time)
 {
   if(time.wMonth > 12) return FALSE;
@@ -156 +157 @@
 
 
-void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) 
+void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to)
 {
   to->wYear = from->wYear;
@@ -169 +170 @@
 
 
-/* Note:Depending on DST, this may be offset by a day. 
+/* Note:Depending on DST, this may be offset by a day.
    Need to find out if we're on a DST place & adjust the clock accordingly.
    Above function assumes we have a valid data.
@@ -182 +183 @@
   year-=(month < 3);
 
-  return((year + year/4 - year/100 + year/400 + 
+  return((year + year/4 - year/100 + year/400 +
          DayOfWeekTable[month-1] + day - 1 ) % 7);
 }
@@ -189 +190 @@
    and day in the calendar. day== 0 mean the last day of tha last month
 */
-static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y, 
-                                   int *daypos,int *weekpos) 
+static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y,
+                                   int *daypos,int *weekpos)
 {
   int retval, firstDay;
@@ -202 +203 @@
   *daypos = (x - infoPtr->days.left ) / infoPtr->width_increment;
   *weekpos = (y - infoPtr->days.top ) / infoPtr->height_increment;
-    
+
   firstDay = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->currentMonth, infoPtr->currentYear)+6 - infoPtr->firstDay)%7;
   retval = *daypos + (7 * *weekpos) - firstDay;
@@ -211 +212 @@
 /* sets x and y to be the position of the day */
 /* x == day, y == week where(0,0) == firstDay, 1st week */
-static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month, 
+static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month,
                                  int *x, int *y)
 {
@@ -227 +228 @@
     if(prevMonth==0)
        prevMonth = 12;
-   
+
     *x = (MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear) - firstDay) % 7;
     *y = 0;
@@ -240 +241 @@
 
 /* x: column(day), y: row(week) */
-static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) 
+static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y)
 {
   r->left = infoPtr->days.left + x * infoPtr->width_increment;
@@ -252 +253 @@
 /* day is the day value of the month(1 == 1st), month is the month */
 /* value(january == 1, december == 12) */
-static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr, 
+static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr,
                                             int day, int month, RECT *r)
 {
@@ -278 +279 @@
   x = day_rect.left;
   y = day_rect.top;
-        
+
   points[0].x = x;
   points[0].y = y - 1;
@@ -287 +288 @@
   points[3].x = x + infoPtr->width_increment;
   points[3].y = y + 0.5 * infoPtr->height_increment;
-        
+
   points[4].x = x + infoPtr->width_increment;
   points[4].y = y + 0.9 * infoPtr->height_increment;
@@ -295 +296 @@
   points[6].y = y + 0.9 * infoPtr->height_increment; /* bring the bottom up just
                                 a hair to fit inside the day rectangle */
-        
+
   points[7].x = x + 0.2 * infoPtr->width_increment;
   points[7].y = y + 0.8 * infoPtr->height_increment;
@@ -309 +310 @@
   points[12].x = x + 0.4 * infoPtr->width_increment;
   points[12].y = y + 0.2 * infoPtr->height_increment;
-  
+
   PolyBezier(hdc, points, 13);
   DeleteObject(hRedPen);
@@ -329 +330 @@
   sprintf(buf, "%d", day);
 
-/* No need to check styles: when selection is not valid, it is set to zero. 
+/* No need to check styles: when selection is not valid, it is set to zero.
  * 1<day<31, so evertyhing's OK.
  */
@@ -341 +342 @@
 
     TRACE("%d %d %d\n",day, infoPtr->minSel.wDay, infoPtr->maxSel.wDay);
-    TRACE("%d %d %d %d\n", r.left, r.top, r.right, r.bottom);
+    TRACE("%ld %ld %ld %ld\n", r.left, r.top, r.right, r.bottom);
     oldCol = SetTextColor(hdc, infoPtr->monthbk);
     oldBk = SetBkColor(hdc, infoPtr->trailingtxt);
@@ -390 +391 @@
 
 /* CHECKME: For `todays date', do we need to check the locale?*/
-static void MONTHCAL_Refresh(HWND hwnd, HDC hdc, PAINTSTRUCT* ps) 
+static void MONTHCAL_Refresh(HWND hwnd, HDC hdc, PAINTSTRUCT* ps)
 {
   MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
@@ -425 +426 @@
   hbr = CreateSolidBrush (infoPtr->bk);
   FillRect(hdc, rcClient, hbr);
-  DeleteObject(hbr);       
+  DeleteObject(hbr);
 
   /* draw header */
@@ -434 +435 @@
     DeleteObject(hbr);
   }
-        
+
   /* if the previous button is pressed draw it depressed */
   if(IntersectRect(&rcTemp, &(ps->rcPaint), prev))
-  {  
+  {
     if((infoPtr->status & MC_PREVPRESSED))
         DrawFrameControl(hdc, prev, DFC_SCROLL,
@@ -447 +448 @@
   }
 
-  /* if next button is depressed draw it depressed */   
+  /* if next button is depressed draw it depressed */
   if(IntersectRect(&rcTemp, &(ps->rcPaint), next))
   {
@@ -466 +467 @@
   titlemonth->left   = title->left;
   titlemonth->right  = title->right;
- 
+
   GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+infoPtr->currentMonth -1,
                   buf1,sizeof(buf1));
   sprintf(buf, "%s %ld", buf1, infoPtr->currentYear);
- 
+
   if(IntersectRect(&rcTemp, &(ps->rcPaint), titlemonth))
   {
-    DrawTextA(hdc, buf, strlen(buf), titlemonth, 
+    DrawTextA(hdc, buf, strlen(buf), titlemonth,
                         DT_CENTER | DT_VCENTER | DT_SINGLELINE);
   }
@@ -481 +482 @@
 /* titlemonth left/right contained rect for whole titletxt('June  1999')
   * MCM_HitTestInfo wants month & year rects, so prepare these now.
-  *(no, we can't draw them separately; the whole text is centered) 
+  *(no, we can't draw them separately; the whole text is centered)
   */
   GetTextExtentPoint32A(hdc, buf, strlen(buf), &size);
@@ -489 +490 @@
   titlemonth->right = titlemonth->left + size.cx;
   titleyear->left = titlemonth->right;
- 
+
   /* draw month area */
   rcTemp.top=infoPtr->wdays.top;
@@ -501 +502 @@
     DeleteObject(hbr);
   }
-        
+
 /* draw line under day abbreviatons */
 
   MoveToEx(hdc, infoPtr->days.left + 3, title->bottom + textHeight + 1, NULL);
-     
+
   LineTo(hdc, rcDraw->right - 3, title->bottom + textHeight + 1);
-  
+
   prevMonth = infoPtr->currentMonth - 1;
   if(prevMonth == 0) /* if currentMonth is january(1) prevMonth is */
@@ -537 +538 @@
 
 /* draw day numbers; first, the previous month */
-  
+
   firstDay = MONTHCAL_CalculateDayOfWeek(1, infoPtr->currentMonth, infoPtr->currentYear);
-  
-  day = MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear)  + 
+
+  day = MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear)  +
     (infoPtr->firstDay + 7  - firstDay)%7 + 1;
   if (day > MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear))
@@ -553 +554 @@
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
     {
-      MONTHCAL_DrawDay(hdc, infoPtr, day, prevMonth, i, 0, 
+      MONTHCAL_DrawDay(hdc, infoPtr, day, prevMonth, i, 0,
           infoPtr->monthdayState[m] & mask);
     }
@@ -577 +578 @@
     {
 
-      MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth, i, 0, 
+      MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth, i, 0,
         infoPtr->monthdayState[m] & mask);
 
@@ -595 +596 @@
   j = 1; /* move to the 2nd week of the current month */
   i = 0; /* move back to sunday */
-  while(day <= MONTHCAL_MonthLength(infoPtr->currentMonth, infoPtr->currentYear)) {     
+  while(day <= MONTHCAL_MonthLength(infoPtr->currentMonth, infoPtr->currentYear)) {
     MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j);
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
@@ -604 +605 @@
       if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
           (day==infoPtr->todaysDate.wDay) &&
-          (infoPtr->currentYear == infoPtr->todaysDate.wYear)) 
-        if(!(dwStyle & MCS_NOTODAYCIRCLE))  
+          (infoPtr->currentYear == infoPtr->todaysDate.wYear))
+        if(!(dwStyle & MCS_NOTODAYCIRCLE))
           MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
     }
@@ -627 +628 @@
     MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j);
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
-    {   
+    {
       MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth + 1, i, j,
                 infoPtr->monthdayState[m] & mask);
@@ -634 +635 @@
     mask<<=1;
     day++;
-    i++;        
+    i++;
     if(i==7) { /* past saturday, go to next week's sunday */
       i = 0;
@@ -650 +651 @@
     if(!(dwStyle & MCS_NOTODAYCIRCLE))  {
       /*day is the number of days from nextmonth we put on the calendar */
-      MONTHCAL_CircleDay(hdc, infoPtr, 
-                         day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), 
+      MONTHCAL_CircleDay(hdc, infoPtr,
+                         day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear),
                          infoPtr->currentMonth);
       offset+=textWidth;
@@ -674 +675 @@
   }
 
-/*eventually draw week numbers*/   
+/*eventually draw week numbers*/
   if(dwStyle & MCS_WEEKNUMBERS)  {
     /* display weeknumbers*/
@@ -682 +683 @@
        LOCALE_IFIRSTWEEKOFYEAR == 0 (e.g US?):
        The week containing Jan 1 is the first week of year
-       LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany): 
+       LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany):
        First week of year must contain 4 days of the new year
        LOCALE_IFIRSTWEEKOFYEAR == 1  (what contries?)
@@ -704 +705 @@
         /* calculate all those exceptions for january */
         weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
-        if ((infoPtr->firstDay +7 - weeknum1)%7 > mindays) 
+        if ((infoPtr->firstDay +7 - weeknum1)%7 > mindays)
             weeknum =1;
         else
           {
             weeknum = 0;
-            for(i=0; i<11; i++) 
+            for(i=0; i<11; i++)
               weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear-1);
             weeknum +=startofprescal+ 7;
@@ -721 +722 @@
       {
         weeknum = 0;
-        for(i=0; i<prevMonth-1; i++) 
+        for(i=0; i<prevMonth-1; i++)
           weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear);
         weeknum +=startofprescal+ 7;
@@ -749 +750 @@
       days->bottom+=infoPtr->height_increment;
     }
-                        
+
     MoveToEx(hdc, infoPtr->weeknums.right, infoPtr->weeknums.top + 3 , NULL);
     LineTo(hdc,   infoPtr->weeknums.right, infoPtr->weeknums.bottom );
-                
+
   }
   /* currentFont was font at entering Refresh */
 
   SetBkColor(hdc, oldBkColor);
-  SelectObject(hdc, currentFont);     
+  SelectObject(hdc, currentFont);
   SetTextColor(hdc, oldTextColor);
 }
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetMinReqRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -768 +769 @@
   LPRECT lpRect = (LPRECT) lParam;
   TRACE("%x %lx\n", wParam, lParam);
-        
+
   /* validate parameters */
 
@@ -781 +782 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetColor(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -807 +808 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_SetColor(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -847 +848 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetMonthDelta(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -853 +854 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-  
+
   if(infoPtr->delta)
     return infoPtr->delta;
@@ -861 +862 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_SetMonthDelta(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -868 +869 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-        
+
   infoPtr->delta = (int)wParam;
   return prev;
@@ -874 +875 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetFirstDayOfWeek(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
-        
+
   return infoPtr->firstDay;
 }
@@ -887 +888 @@
 /* FIXME: this needs to be implemented properly in MONTHCAL_Refresh() */
 /* FIXME: we need more error checking here */
-static LRESULT 
+static LRESULT
 MONTHCAL_SetFirstDayOfWeek(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -916 +917 @@
 /* FIXME: fill this in */
 static LRESULT
-MONTHCAL_GetMonthRange(HWND hwnd, WPARAM wParam, LPARAM lParam) 
+MONTHCAL_GetMonthRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
@@ -937 +938 @@
 
 /* FIXME: are validated times taken from current date/time or simply
- * copied? 
+ * copied?
  * FIXME:    check whether MCM_GETMONTHRANGE shows correct result after
  *            adjusting range with MCM_SETRANGE
@@ -950 +951 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-  
+
   if(wParam & GDTR_MAX) {
     if(MONTHCAL_ValidateTime(lprgSysTimeArray[1])){
@@ -973 +974 @@
   infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth;
 
-  if(infoPtr->monthRange!=prev) { 
-        COMCTL32_ReAlloc(infoPtr->monthdayState, 
-                infoPtr->monthRange * sizeof(MONTHDAYSTATE));
+  if(infoPtr->monthRange!=prev) {
+        infoPtr->monthdayState = COMCTL32_ReAlloc(infoPtr->monthdayState,
+                                                  infoPtr->monthRange * sizeof(MONTHDAYSTATE));
   }
 
@@ -983 +984 @@
 
 /* CHECKME: At the moment, we copy ranges anyway,regardless of
- * infoPtr->rangeValid; a invalid range is simply filled with zeros in 
+ * infoPtr->rangeValid; a invalid range is simply filled with zeros in
  * SetRange.  Is this the right behavior?
 */
@@ -1015 +1016 @@
   if(iMonths!=infoPtr->monthRange) return 0;
 
-  for(i=0; i<iMonths; i++) 
+  for(i=0; i<iMonths; i++)
     infoPtr->monthdayState[i] = dayStates[i];
   return 1;
 }
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetCurSel(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1036 +1037 @@
 /* FIXME: if the specified date is not visible, make it visible */
 /* FIXME: redraw? */
-static LRESULT 
+static LRESULT
 MONTHCAL_SetCurSel(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1057 +1058 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetMaxSelCount(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1067 +1068 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_SetMaxSelCount(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1081 +1082 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetSelRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1100 +1101 @@
     return TRUE;
   }
- 
+
   return FALSE;
 }
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_SetSelRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1124 +1125 @@
     return TRUE;
   }
- 
+
   return FALSE;
 }
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_GetToday(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1145 +1146 @@
 
 
-static LRESULT 
+static LRESULT
 MONTHCAL_SetToday(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1170 +1171 @@
   DWORD retval;
   int day,wday,wnum;
-  
-  
+
+
   x = lpht->pt.x;
   y = lpht->pt.y;
   retval = MCHT_NOWHERE;
-  
-
-  /* Comment in for debugging... 
-  TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, 
+
+
+  /* Comment in for debugging...
+  TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y,
         infoPtr->wdays.left, infoPtr->wdays.right,
         infoPtr->wdays.top, infoPtr->wdays.bottom,
@@ -1190 +1191 @@
 
   /* are we in the header? */
-  
+
   if(PtInRect(&infoPtr->title, lpht->pt)) {
     if(PtInRect(&infoPtr->titlebtnprev, lpht->pt)) {
@@ -1208 +1209 @@
       goto done;
     }
-    
+
     retval = MCHT_TITLE;
     goto done;
   }
-  
+
   day = MONTHCAL_CalcDayFromPos(infoPtr,x,y,&wday,&wnum);
   if(PtInRect(&infoPtr->wdays, lpht->pt)) {
@@ -1218 +1219 @@
     lpht->st.wYear  = infoPtr->currentYear;
     lpht->st.wMonth = (day < 1)? infoPtr->currentMonth -1 : infoPtr->currentMonth;
-    lpht->st.wDay   = (day < 1)? 
+    lpht->st.wDay   = (day < 1)?
       MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day : day;
     goto done;
   }
-  if(PtInRect(&infoPtr->weeknums, lpht->pt)) {  
-    retval = MCHT_CALENDARWEEKNUM; 
+  if(PtInRect(&infoPtr->weeknums, lpht->pt)) {
+    retval = MCHT_CALENDARWEEKNUM;
     lpht->st.wYear  = infoPtr->currentYear;
-    lpht->st.wMonth = (day < 1) ? infoPtr->currentMonth -1 : 
-      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ? 
+    lpht->st.wMonth = (day < 1) ? infoPtr->currentMonth -1 :
+      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ?
       infoPtr->currentMonth +1 :infoPtr->currentMonth;
-    lpht->st.wDay   = (day < 1 ) ? 
-      MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day : 
-      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ? 
+    lpht->st.wDay   = (day < 1 ) ?
+      MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day :
+      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ?
       day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) : day;
-    goto done;                              
-  }
-  if(PtInRect(&infoPtr->days, lpht->pt)) 
+    goto done;
+  }
+  if(PtInRect(&infoPtr->days, lpht->pt))
     {
       lpht->st.wYear  = infoPtr->currentYear;
-      if ( day < 1) 
+      if ( day < 1)
         {
           retval = MCHT_CALENDARDATEPREV;
@@ -1267 +1268 @@
     }
   if(PtInRect(&infoPtr->todayrect, lpht->pt)) {
-    retval = MCHT_TODAYLINK; 
+    retval = MCHT_TODAYLINK;
     goto done;
   }
-  
-  
+
+
   /* Hit nothing special? What's left must be background :-) */
-  
-  retval = MCHT_CALENDARBK;       
- done: 
+
+  retval = MCHT_CALENDARBK;
+ done:
   lpht->uHit = retval;
   return retval;
@@ -1331 +1332 @@
     nmds.nmhdr.code     = MCN_GETDAYSTATE;
     nmds.cDayState      = infoPtr->monthRange;
-    nmds.prgDayState    = COMCTL32_Alloc 
+    nmds.prgDayState    = COMCTL32_Alloc
                         (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
@@ -1348 +1349 @@
   POINT menupoint;
   char buf[32];
-  
+
   hMenu = CreatePopupMenu();
   if (!LoadStringA(COMCTL32_hModule,IDM_GOTODAY,buf,sizeof(buf)))
@@ -1365 +1366 @@
       infoPtr->currentYear=infoPtr->todaysDate.wYear;
       InvalidateRect(hwnd, NULL, FALSE);
-    }   
+    }
   return 0;
 }
@@ -1381 +1382 @@
   POINT menupoint;
   TRACE("%x %lx\n", wParam, lParam);
-        
+
   if (infoPtr->hWndYearUpDown)
     {
@@ -1399 +1400 @@
       InvalidateRect(hwnd, NULL, FALSE);
     }
-  
+
   ht.pt.x = (INT)LOWORD(lParam);
   ht.pt.y = (INT)HIWORD(lParam);
@@ -1414 +1415 @@
     return TRUE;
   }
-  if(hit == MCHT_TITLEBTNPREV){ 
+  if(hit == MCHT_TITLEBTNPREV){
     MONTHCAL_GoToPrevMonth(hwnd, infoPtr);
     infoPtr->status = MC_PREVPRESSED;
@@ -1424 +1425 @@
   if(hit == MCHT_TITLEMONTH) {
     hMenu = CreatePopupMenu();
-    
+
     for (i=0; i<12;i++)
       {
@@ -1451 +1452 @@
                          infoPtr->textHeight,
                          hwnd,
-                         (HMENU)NULL, 
-                         (HINSTANCE)NULL, 
+                         NULL,
+                         NULL,
                          NULL);
     infoPtr->hWndYearUpDown=CreateWindowExA(0,
@@ -1462 +1463 @@
                          infoPtr->textHeight,
                          hwnd,
-                         (HMENU)NULL, 
-                         (HINSTANCE)NULL, 
+                         NULL,
+                         NULL,
                          NULL);
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETRANGE, (WPARAM) 0, MAKELONG (9999, 1753));
@@ -1469 +1470 @@
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETPOS,   (WPARAM) 0,(LPARAM)infoPtr->currentYear );
     return TRUE;
-         
+
   }
   if(hit == MCHT_TODAYLINK) {
@@ -1487 +1488 @@
     MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
     MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
-        
+
     SendMessageA(GetParent(hwnd), WM_NOTIFY,
            (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc);
@@ -1493 +1494 @@
     MONTHCAL_CopyTime(&ht.st, &selArray[0]);
     MONTHCAL_CopyTime(&ht.st, &selArray[1]);
-    MONTHCAL_SetSelRange(hwnd,0,(LPARAM) &selArray); 
+    MONTHCAL_SetSelRange(hwnd,0,(LPARAM) &selArray);
 
     /* redraw both old and new days if the selected day changed */
@@ -1546 +1547 @@
     return TRUE;
   }
-  if(hit == MCHT_CALENDARDATEPREV){ 
+  if(hit == MCHT_CALENDARDATEPREV){
     MONTHCAL_GoToPrevMonth(hwnd, infoPtr);
     InvalidateRect(hwnd, NULL, FALSE);
@@ -1554 +1555 @@
   nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
   nmhdr.code     = NM_RELEASEDCAPTURE;
-  TRACE("Sent notification from %x to %x\n", hwnd, GetParent(hwnd));
+  TRACE("Sent notification from %p to %p\n", hwnd, GetParent(hwnd));
 
   SendMessageA(GetParent(hwnd), WM_NOTIFY,
@@ -1564 +1565 @@
   MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
   MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
-        
+
   SendMessageA(GetParent(hwnd), WM_NOTIFY,
            (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
-  
+
   /* redraw if necessary */
   if(redraw)
     InvalidateRect(hwnd, NULL, FALSE);
-        
+
   return 0;
 }
@@ -1586 +1587 @@
 
   switch(wParam) {
-  case MC_NEXTMONTHTIMER: 
+  case MC_NEXTMONTHTIMER:
     redraw = TRUE;
     MONTHCAL_GoToNextMonth(hwnd, infoPtr);
@@ -1618 +1619 @@
   ht.pt.x = LOWORD(lParam);
   ht.pt.y = HIWORD(lParam);
-        
+
   hit = MONTHCAL_HitTest(hwnd, (LPARAM)&ht);
-  
+
   /* not on the calendar date numbers? bail out */
   TRACE("hit:%x\n",hit);
@@ -1638 +1639 @@
     if(infoPtr->firstSelDay==selArray[0].wDay) i=1;
     TRACE("oldRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
-    if(infoPtr->firstSelDay==selArray[1].wDay) {  
+    if(infoPtr->firstSelDay==selArray[1].wDay) {
       /* 1st time we get here: selArray[0]=selArray[1])  */
       /* if we're still at the first selected date, return */
@@ -1644 +1645 @@
       if(selday<infoPtr->firstSelDay) i = 0;
     }
-                        
+
     if(abs(infoPtr->firstSelDay - selday) >= infoPtr->maxSelCount) {
       if(selday>infoPtr->firstSelDay)
@@ -1651 +1652 @@
         selday = infoPtr->firstSelDay - infoPtr->maxSelCount;
     }
-                
+
     if(selArray[i].wDay!=selday) {
       TRACE("newRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
-                        
+
       selArray[i].wDay = selday;
 
@@ -1712 +1713 @@
 {
   TRACE("\n");
-  
+
   InvalidateRect(hwnd, NULL, FALSE);
 
@@ -1769 +1770 @@
 
   /* recalculate the height and width increments and offsets */
-  /* FIXME: We use up all available width. This will inhibit having multiple 
-     calendars in a row, like win doesn 
+  /* FIXME: We use up all available width. This will inhibit having multiple
+     calendars in a row, like win doesn
   */
   if(dwStyle & MCS_WEEKNUMBERS)
@@ -1776 +1777 @@
   else
     xdiv=7.0;
-  infoPtr->width_increment = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) / xdiv; 
-  infoPtr->height_increment = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) / 10.0; 
+  infoPtr->width_increment = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) / xdiv;
+  infoPtr->height_increment = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) / 10.0;
   infoPtr->left_offset = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) - (infoPtr->width_increment * xdiv);
   infoPtr->top_offset = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) - (infoPtr->height_increment * 10.0);
@@ -1790 +1791 @@
     rcDraw->bottom = rcDraw->top + 9 * infoPtr->textHeight + 5;
     }*/
-   
+
   /* calculate title area */
   title->top    = rcClient->top;
@@ -1805 +1806 @@
   next->right  = title->right - 6;
   next->left   = next->right - (title->bottom - title->top);
-  
+
   /* titlemonth->left and right change based upon the current month */
   /* and are recalculated in refresh as the current month may change */
@@ -1811 +1812 @@
   titlemonth->top    = titleyear->top    = title->top    + (infoPtr->height_increment)/2;
   titlemonth->bottom = titleyear->bottom = title->bottom - (infoPtr->height_increment)/2;
-  
+
   /* setup the dimensions of the rectangle we draw the names of the */
   /* days of the week in */
   weeknumrect->left =infoPtr->left_offset;
-  if(dwStyle & MCS_WEEKNUMBERS)  
+  if(dwStyle & MCS_WEEKNUMBERS)
     weeknumrect->right=prev->right;
   else
@@ -1823 +1824 @@
   wdays->top    = title->bottom ;
   wdays->bottom = wdays->top + infoPtr->height_increment;
-  
+
   days->top    = weeknumrect->top = wdays->bottom ;
   days->bottom = weeknumrect->bottom = days->top     + 6 * infoPtr->height_increment;
-  
+
   todayrect->left   = rcClient->left;
   todayrect->right  = rcClient->right;
@@ -1832 +1833 @@
   todayrect->bottom = days->bottom + infoPtr->height_increment;
 
-  /* uncomment for excessive debugging 
+  /* uncomment for excessive debugging
   TRACE("dx=%d dy=%d rcC[%d %d %d %d] t[%d %d %d %d] wd[%d %d %d %d] w[%d %d %d %d] t[%d %d %d %d]\n",
         infoPtr->width_increment,infoPtr->height_increment,
@@ -1841 +1842 @@
         todayrect->left,todayrect->right,todayrect->top,todayrect->bottom);
   */
-  
+
   /* restore the originally selected font */
-  SelectObject(hdc, currentFont);     
+  SelectObject(hdc, currentFont);
 
   ReleaseDC(hwnd, hdc);
@@ -1850 +1851 @@
 static LRESULT MONTHCAL_Size(HWND hwnd, int Width, int Height)
 {
-  TRACE("(hwnd=%x, width=%d, height=%d)\n", hwnd, Width, Height);
+  TRACE("(hwnd=%p, width=%d, height=%d)\n", hwnd, Width, Height);
 
   MONTHCAL_UpdateSize(hwnd);
@@ -1868 +1869 @@
 
   /* allocate memory for info structure */
-#ifdef __WIN32OS2__
-  infoPtr =(MONTHCAL_INFO*)initControl(hwnd,sizeof(MONTHCAL_INFO));
-#else
   infoPtr =(MONTHCAL_INFO*)COMCTL32_Alloc(sizeof(MONTHCAL_INFO));
-#endif
   SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
 
@@ -1900 +1897 @@
   infoPtr->maxSelCount  = 7;
   infoPtr->monthRange = 3;
-  infoPtr->monthdayState = COMCTL32_Alloc 
+  infoPtr->monthdayState = COMCTL32_Alloc
                          (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
   infoPtr->titlebk     = GetSysColor(COLOR_ACTIVECAPTION);
@@ -1923 +1920 @@
 
   /* free month calendar info data */
+  if(infoPtr->monthdayState)
+      COMCTL32_Free(infoPtr->monthdayState);
   COMCTL32_Free(infoPtr);
   SetWindowLongA(hwnd, 0, 0);
@@ -1932 +1931 @@
 MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+  TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
   if (!MONTHCAL_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
     return DefWindowProcA(hwnd, uMsg, wParam, lParam);
@@ -2037 +2036 @@
 
   default:
-    if(uMsg >= WM_USER)
+    if ((uMsg >= WM_USER) && (uMsg < WM_APP))
       ERR( "unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
-#ifdef __WIN32OS2__
-    return defComCtl32ProcA(hwnd, uMsg, wParam, lParam);
-#else
     return DefWindowProcA(hwnd, uMsg, wParam, lParam);
-#endif
   }
   return 0;
@@ -2062 +2057 @@
   wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
   wndClass.lpszClassName = MONTHCAL_CLASSA;
- 
+
   RegisterClassA(&wndClass);
 }
@@ -2070 +2065 @@
 MONTHCAL_Unregister(void)
 {
-    UnregisterClassA(MONTHCAL_CLASSA, (HINSTANCE)NULL);
-}
+    UnregisterClassA(MONTHCAL_CLASSA, NULL);
+}

trunk/src/comctl32/nativefont.c

@@ -124 +124 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_NATIVEFONTCTLA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -132 +132 @@
 NATIVEFONT_Unregister (void)
 {
-    UnregisterClassA (WC_NATIVEFONTCTLA, (HINSTANCE)NULL);
+    UnregisterClassA (WC_NATIVEFONTCTLA, NULL);
 }
-

trunk/src/comctl32/pager.c

@@ -837 +837 @@
 
     /* set default settings */
-    infoPtr->hwndChild = (HWND)NULL;
+    infoPtr->hwndChild = NULL;
     infoPtr->bNoResize = dwStyle & CCS_NORESIZE;
     infoPtr->clrBk = GetSysColor(COLOR_BTNFACE);
@@ -898 +898 @@
     DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
 
-    TRACE("orig rect=(%d,%d)-(%d,%d)\n",
+    TRACE("orig rect=(%ld,%ld)-(%ld,%ld)\n",
           lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
 
@@ -913 +913 @@
         scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left);
 
-        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n",
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n",
               infoPtr->nPos, scrollRange, infoPtr->nHeight,
               rcmyw.left, rcmyw.top,
@@ -927 +927 @@
             rbrc = wnrc;
             rbrc.left = rbrc.right - infoPtr->nButtonSize;
-            TRACE("horz lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+            TRACE("horz lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n",
                   ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
                   rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
@@ -962 +962 @@
         scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top);
 
-        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n",
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n",
               infoPtr->nPos, scrollRange, infoPtr->nHeight,
               rcmyw.left, rcmyw.top,
@@ -987 +987 @@
             rbrc = wnrc;
             rbrc.left = rbrc.right - infoPtr->nButtonSize;
-            TRACE("vert lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+            TRACE("vert lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n",
                   ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
                   rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
@@ -999 +999 @@
         if (infoPtr->BRbtnState && (lpRect->bottom - infoPtr->nButtonSize > lpRect->top))
             lpRect->bottom -= infoPtr->nButtonSize;
-        /* ???? */
-        if ((lpRect->bottom < 0) || (lpRect->bottom > infoPtr->nHeight))
-            lpRect->bottom = infoPtr->nHeight;
-    }
-
-    TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
+    }
+
+    TRACE("[%p] client rect set to %ldx%ld at (%ld,%ld) BtnState[%d,%d]\n",
           hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
           lpRect->left, lpRect->top,
@@ -1233 +1230 @@
         /* If in one of the buttons the capture and draw buttons */
         if (btnrect) {
-            TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n",
+            TRACE("[%p] draw btn (%ld,%ld)-(%ld,%ld), Capture %s, style %08lx\n",
                   hwnd, btnrect->left, btnrect->top,
                   btnrect->right, btnrect->bottom,
@@ -1604 +1601 @@
 PAGER_Unregister (void)
 {
-    UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
-}
+    UnregisterClassA (WC_PAGESCROLLERA, NULL);
+}

trunk/src/comctl32/progress.c

@@ -258 +258 @@
     infoPtr->MaxVal = high;
     PROGRESS_CoercePos(infoPtr);
+    InvalidateRect(infoPtr->Self, NULL, TRUE);
     return res;
 }
@@ -335 +336 @@
     case PBM_SETPOS:
     {
-        INT oldVal;
+        UINT oldVal;
         oldVal = infoPtr->CurVal;
         if(oldVal != wParam) {
@@ -431 +432 @@
 VOID PROGRESS_Unregister (void)
 {
-    UnregisterClassW (PROGRESS_CLASSW, (HINSTANCE)NULL);
-}
+    UnregisterClassW (PROGRESS_CLASSW, NULL);
+}

trunk/src/comctl32/propsheet.c

@@ -26 +26 @@
 #include <string.h>
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 #include "winbase.h"
 #include "commctrl.h"
@@ -31 +33 @@
 #include "winnls.h"
 #include "comctl32.h"
-#include "heap.h"
 
 #include "wine/debug.h"
@@ -113 +114 @@
 #define MAX_BUTTONTEXT_LENGTH 64
 
-#define PSH_WIZARD97_OLD   0x00002000
-#define PSH_WIZARD97_NEW   0x01000000
 #define INTRNL_ANY_WIZARD (PSH_WIZARD | PSH_WIZARD97_OLD | PSH_WIZARD97_NEW | PSH_WIZARD_LITE)
 
@@ -120 +119 @@
  * Prototypes
  */
-static BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo);
+static int PROPSHEET_CreateDialog(PropSheetInfo* psInfo);
 static BOOL PROPSHEET_SizeMismatch(HWND hwndDlg, PropSheetInfo* psInfo);
 static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo);
@@ -290 +289 @@
   psInfo->hasHelp = dwFlags & PSH_HASHELP;
   psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW);
-  psInfo->useCallback = dwFlags & PSH_USECALLBACK;
+  psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback);
   psInfo->isModeless = dwFlags & PSH_MODELESS;
 
@@ -341 +340 @@
   psInfo->hasHelp = dwFlags & PSH_HASHELP;
   psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW);
-  psInfo->useCallback = dwFlags & PSH_USECALLBACK;
+  psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback);
   psInfo->isModeless = dwFlags & PSH_MODELESS;
 
@@ -554 +553 @@
  * Creates the actual property sheet.
  */
-BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
+int PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
 {
   LRESULT ret;
@@ -570 +569 @@
                             MAKEINTRESOURCEW(resID),
                             RT_DIALOGW)))
-    return FALSE;
+    return -1;
 
   if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
-    return FALSE;
+    return -1;
 
   /*
@@ -583 +582 @@
 
   if (!temp)
-    return FALSE;
+    return -1;
 
   memcpy(temp, template, resSize);
@@ -597 +596 @@
                                     (LPARAM)psInfo);
   else
-      ret = CreateDialogIndirectParamW(psInfo->ppshheader.hInstance,
-                                       (LPDLGTEMPLATEW) temp,
-                                       psInfo->ppshheader.hwndParent,
-                                       PROPSHEET_DialogProc,
-                                       (LPARAM)psInfo) ? TRUE : FALSE;
+  {
+      ret = (int)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance,
+                                            (LPDLGTEMPLATEW) temp,
+                                            psInfo->ppshheader.hwndParent,
+                                            PROPSHEET_DialogProc,
+                                            (LPARAM)psInfo);
+      if ( !ret ) ret = -1;
+  }
 
   COMCTL32_Free(temp);
@@ -623 +625 @@
    */
   GetClientRect(hwndTabCtrl, &rcOrigTab);
-  TRACE("orig tab %d %d %d %d\n", rcOrigTab.left, rcOrigTab.top,
+  TRACE("orig tab %ld %ld %ld %ld\n", rcOrigTab.left, rcOrigTab.top,
         rcOrigTab.right, rcOrigTab.bottom);
 
@@ -635 +637 @@
 
   MapDialogRect(hwndDlg, &rcPage);
-  TRACE("biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
+  TRACE("biggest page %ld %ld %ld %ld\n", rcPage.left, rcPage.top,
         rcPage.right, rcPage.bottom);
 
@@ -677 +679 @@
 
   MapDialogRect(hwndDlg, &rcPage);
-  TRACE("biggest page %d %d %d %d\n", rcPage.left, rcPage.top,
+  TRACE("biggest page %ld %ld %ld %ld\n", rcPage.left, rcPage.top,
         rcPage.right, rcPage.bottom);
 
@@ -748 +750 @@
   rc.right -= rc.left;
   rc.bottom -= rc.top;
-  TRACE("setting tab %08lx, rc (0,0)-(%d,%d)\n",
+  TRACE("setting tab %08lx, rc (0,0)-(%ld,%ld)\n",
         (DWORD)hwndTabCtrl, rc.right, rc.bottom);
   SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom,
@@ -755 +757 @@
   GetClientRect(hwndTabCtrl, &rc);
 
-  TRACE("tab client rc %d %d %d %d\n",
+  TRACE("tab client rc %ld %ld %ld %ld\n",
         rc.left, rc.top, rc.right, rc.bottom);
 
@@ -764 +766 @@
    * Resize the property sheet.
    */
-  TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+  TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n",
         (DWORD)hwndDlg, rc.right, rc.bottom);
   SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
@@ -822 +824 @@
   }
 
-  TRACE("Biggest page %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom);
+  TRACE("Biggest page %ld %ld %ld %ld\n", rc.left, rc.top, rc.right, rc.bottom);
   TRACE("   constants padx=%d, pady=%d, butH=%d, lH=%d\n",
         padding.x, padding.y, buttonHeight, lineHeight);
@@ -833 +835 @@
    * Resize the property sheet.
    */
-  TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+  TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n",
         (DWORD)hwndDlg, rc.right, rc.bottom);
   SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
@@ -1425 +1427 @@
 
       padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo);
-      TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d, padx=%d, pady=%d\n",
+      TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d, padx=%d, pady=%d\n",
             (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
             pageWidth, pageHeight, padding.x, padding.y);
@@ -1441 +1443 @@
       pageWidth = rc.right - rc.left;
       pageHeight = rc.bottom - rc.top;
-      TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d\n",
+      TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d\n",
             (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
             pageWidth, pageHeight);
@@ -1617 +1619 @@
   HWND hwndPage;
   PSHNOTIFY psn;
-  LRESULT msgResult;
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg,
                                                     PropSheetInfoStr);
@@ -1651 +1652 @@
     if (hwndPage)
     {
-       msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
-       if (msgResult == PSNRET_INVALID_NOCHANGEPAGE)
-          return FALSE;
+       switch (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
+       {
+       case PSNRET_INVALID:
+           PROPSHEET_ShowPage(hwndDlg, i, psInfo);
+           /* fall through */
+       case PSNRET_INVALID_NOCHANGEPAGE:
+           return FALSE;
+       }
     }
   }
@@ -2385 +2391 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR,
                                                        sizeof(PropSheetInfo));
-  int i, n;
+  UINT i, n;
   BYTE* pByte;
 
@@ -2429 +2435 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR,
                                                        sizeof(PropSheetInfo));
-  int i, n;
+  UINT i, n;
   BYTE* pByte;
 

trunk/src/comctl32/rebar.c

@@ -1228 +1228 @@
         infoPtr->hwndSelf, infoPtr->dwStyle,
         x, y, width, height);
-    SetWindowPos (infoPtr->hwndSelf, 0, x, y, width, height,
-                    SWP_NOZORDER);
+
+//testestest
+#ifdef __WIN32OS2__
+//NOTE: this one is causing problems!!!!
+#endif
+//    SetWindowPos (infoPtr->hwndSelf, 0, x, y, width, height,
+//                  SWP_NOZORDER);
+//testestest
 }
 

trunk/src/comctl32/smoothscroll.c

@@ -3 +3 @@
  *
  * Copyright 2000 Marcus Meissner <marcus@jet.franken.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * TODO
@@ -12 +26 @@
 #include "winerror.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
-DEFAULT_DEBUG_CHANNEL(commctrl);
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 static DWORD    smoothscroll = 2;
@@ -98 +112 @@
    }
 
-   FIXME("(hwnd=%x,flags=%lx,x2=%lx): should smooth scroll here.\n",
+   FIXME("(hwnd=%p,flags=%lx,x2=%lx): should smooth scroll here.\n",
            smooth->hwnd,flags,smooth->x2
    );

trunk/src/comctl32/tab.c

@@ -59 +59 @@
   INT        tabHeight;       /* height of the tab row */
   INT        tabWidth;        /* width of tabs */
+  USHORT     uHItemPadding;   /* amount of horizontal padding, in pixels */
+  USHORT     uVItemPadding;   /* amount of vertical padding, in pixels */
   HFONT      hFont;           /* handle to the current font */
   HCURSOR    hcurArrow;       /* handle to the current cursor */
@@ -81 +83 @@
  */
 #define SELECTED_TAB_OFFSET     2
-#define HORIZONTAL_ITEM_PADDING 6
-#define VERTICAL_ITEM_PADDING   3
 #define ROUND_CORNER_SIZE       2
 #define DISPLAY_AREA_PADDINGX   2
@@ -173 +173 @@
               iItem, ti->mask, ti->dwState, debugstr_w(ti->pszText),
               ti->iImage);
-        TRACE("tab %d, lParam=0x%08lx, rect.left=%d, rect.top(row)=%d\n",
+        TRACE("tab %d, lParam=0x%08lx, rect.left=%ld, rect.top(row)=%ld\n",
               iItem, ti->lParam, ti->rect.left, ti->rect.top);
     }
@@ -259 +259 @@
 }
 
+static LRESULT
+TAB_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
+    
+    if (infoPtr == NULL) return 0;
+    infoPtr->uHItemPadding=LOWORD(lParam);
+    infoPtr->uVItemPadding=HIWORD(lParam);
+    return 0;
+}
+
 /******************************************************************************
  * TAB_InternalGetItemRect
@@ -367 +378 @@
              0);
   }
-  TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n",
+  TRACE("item %d tab h=%d, rect=(%ld,%ld)-(%ld,%ld)\n",
         itemIndex, infoPtr->tabHeight,
         itemRect->left, itemRect->top, itemRect->right, itemRect->bottom);
@@ -488 +499 @@
   if (isVisible)
   {
-      TRACE("invalidate (%d,%d)-(%d,%d)\n",
+      TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n",
             selectedRect.left,selectedRect.top,
             selectedRect.right,selectedRect.bottom);
@@ -987 +998 @@
                                           controlPos.bottom - controlPos.top,
                                           hwnd,
-                                          (HMENU)NULL,
-                                          (HINSTANCE)NULL,
+                                          NULL,
+                                          NULL,
                                           NULL);
     }
@@ -994 +1005 @@
     {
       SetWindowPos(infoPtr->hwndUpDown,
-                   (HWND)NULL,
+                   NULL,
                    controlPos.left, controlPos.top,
                    controlPos.right - controlPos.left,
@@ -1100 +1111 @@
     /* Take the highest between font or icon */
     if (fontMetrics.tmHeight > icon_height)
-      item_height = fontMetrics.tmHeight;
+      item_height = fontMetrics.tmHeight + 2;
     else
       item_height = icon_height;
@@ -1108 +1119 @@
      * selected item + extra space for the selected item.
      */
-#ifdef __WIN32OS2__
-    //Code below doesn't always work
-    infoPtr->tabHeight = item_height + 2 * VERTICAL_ITEM_PADDING +
-        SELECTED_TAB_OFFSET;
-#else
     infoPtr->tabHeight = item_height + SELECTED_TAB_OFFSET +
                          ((lStyle & TCS_BUTTONS) ? 2 : 1) *
-                          VERTICAL_ITEM_PADDING;
-#endif
+                          infoPtr->uVItemPadding;
+
     TRACE("tabH=%d, tmH=%ld, iconh=%d\n",
           infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
   }
 
-  TRACE("client right=%d\n", clientRect.right);
+  TRACE("client right=%ld\n", clientRect.right);
 
   for (curItem = 0; curItem < infoPtr->uNumItem; curItem++)
@@ -1132 +1138 @@
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
                                            infoPtr->tabWidth +
-                                           2 * HORIZONTAL_ITEM_PADDING;
+                                           2 * infoPtr->uHItemPadding;
     }
     else
@@ -1157 +1163 @@
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
                                            size.cx + icon_width +
-                                           num * HORIZONTAL_ITEM_PADDING;
-      TRACE("for <%s>, l,r=%d,%d, num=%d\n",
+                                           num * infoPtr->uHItemPadding;
+      TRACE("for <%s>, l,r=%ld,%ld, num=%d\n",
           debugstr_w(infoPtr->items[curItem].pszText),
           infoPtr->items[curItem].rect.left,
@@ -1182 +1188 @@
         infoPtr->items[curItem].rect.left = 0;
         curItemRowCount++;
-        TRACE("wrapping <%s>, l,r=%d,%d\n",
+        TRACE("wrapping <%s>, l,r=%ld,%ld\n",
             debugstr_w(infoPtr->items[curItem].pszText),
             infoPtr->items[curItem].rect.left,
@@ -1192 +1198 @@
 
     TRACE("TextSize: %li\n", size.cx);
-    TRACE("Rect: T %i, L %i, B %i, R %i\n",
+    TRACE("Rect: T %li, L %li, B %li, R %li\n",
           infoPtr->items[curItem].rect.top,
           infoPtr->items[curItem].rect.left,
@@ -1256 +1262 @@
           infoPtr->items[iItm].rect.left = 0;
 
-          TRACE("r=%d, cl=%d, cl.r=%d, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
+          TRACE("r=%ld, cl=%d, cl.r=%ld, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
               infoPtr->items[iItm].rect.right,
               curItemLeftPos, clientRect.right,
@@ -1305 +1311 @@
             curItemLeftPos = infoPtr->items[iItm].rect.right;
 
-          TRACE("arranging <%s>, l,r=%d,%d, row=%d\n",
+          TRACE("arranging <%s>, l,r=%ld,%ld, row=%ld\n",
               debugstr_w(infoPtr->items[iItm].pszText),
               infoPtr->items[iItm].rect.left,
@@ -1353 +1359 @@
               infoPtr->items[iIndex].rect.right += (iCount + 1) * widthDiff;
 
-              TRACE("adjusting 1 <%s>, l,r=%d,%d\n",
+              TRACE("adjusting 1 <%s>, l,r=%ld,%ld\n",
                   debugstr_w(infoPtr->items[iIndex].pszText),
                   infoPtr->items[iIndex].rect.left,
@@ -1366 +1372 @@
           infoPtr->items[iIndexStart].rect.right = clientRect.right - 4;
 
-          TRACE("adjusting 2 <%s>, l,r=%d,%d\n",
+          TRACE("adjusting 2 <%s>, l,r=%ld,%ld\n",
               debugstr_w(infoPtr->items[iIndexStart].pszText),
               infoPtr->items[iIndexStart].rect.left,
@@ -1483 +1489 @@
                      comctl32_color.clrHighlight : comctl32_color.clrBtnText);
 
-  /*
-   * Deflate the rectangle to acount for the padding
-   */
-  if(lStyle & TCS_VERTICAL)
-    InflateRect(drawRect, -VERTICAL_ITEM_PADDING, -HORIZONTAL_ITEM_PADDING);
-  else
-    InflateRect(drawRect, -HORIZONTAL_ITEM_PADDING, -VERTICAL_ITEM_PADDING);
-
 
   /*
@@ -1512 +1510 @@
     dis.itemID     = iItem;
     dis.itemAction = ODA_DRAWENTIRE;
+    dis.itemState = 0;
     if ( iItem == infoPtr->iSelected )
-      dis.itemState = ODS_SELECTED;
-    else
-      dis.itemState = 0;
+      dis.itemState |= ODS_SELECTED;
+    if (infoPtr->uFocus == iItem) 
+      dis.itemState |= ODS_FOCUS;
     dis.hwndItem = hwnd;                /* */
     dis.hDC      = hdc;
-    dis.rcItem   = *drawRect;           /* */
+    CopyRect(&dis.rcItem,drawRect);
     dis.itemData = infoPtr->items[iItem].lParam;
 
@@ -1544 +1543 @@
     RECT rcText;
     INT center_offset;
+
+    /*
+     * Deflate the rectangle to acount for the padding
+     */
+    if(lStyle & TCS_VERTICAL)
+      InflateRect(drawRect, -infoPtr->uVItemPadding, -infoPtr->uHItemPadding);
+    else
+      InflateRect(drawRect, -infoPtr->uHItemPadding, -infoPtr->uVItemPadding);
 
     /* set rcImage to drawRect, we will use top & left in our ImageList_Draw call */
@@ -1573 +1580 @@
 
       if(lStyle & TCS_VERTICAL)
-        center_offset = ((drawRect->bottom - drawRect->top) - (cy + HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2;
+        center_offset = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2;
       else
-        center_offset = ((drawRect->right - drawRect->left) - (cx + HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2;
-
-      TRACE("for <%s>, c_o=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n",
+        center_offset = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2;
+
+      TRACE("for <%s>, c_o=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%ld\n",
           debugstr_w(infoPtr->items[iItem].pszText), center_offset,
           drawRect->left, drawRect->top, drawRect->right, drawRect->bottom,
@@ -1588 +1595 @@
                                              /* right side of the tab, but the image still uses the left as its x position */
                                              /* this keeps the image always drawn off of the same side of the tab */
-        drawRect->top = rcImage.top + (cx + HORIZONTAL_ITEM_PADDING);
+        drawRect->top = rcImage.top + (cx + infoPtr->uHItemPadding);
       }
       else if(lStyle & TCS_VERTICAL)
@@ -1594 +1601 @@
         rcImage.top = drawRect->bottom - cy - center_offset;
         rcImage.left--;
-        drawRect->bottom = rcImage.top - HORIZONTAL_ITEM_PADDING;
+        drawRect->bottom = rcImage.top - infoPtr->uHItemPadding;
       }
       else /* normal style, whether TCS_BOTTOM or not */
       {
         rcImage.left = drawRect->left + center_offset + 3;
-        drawRect->left = rcImage.left + cx + HORIZONTAL_ITEM_PADDING;
+        drawRect->left = rcImage.left + cx + infoPtr->uHItemPadding;
         rcImage.top -= (lStyle & TCS_BOTTOM) ? 2 : 1;
       }
 
-      TRACE("drawing image=%d, left=%d, top=%d\n",
+      TRACE("drawing image=%d, left=%ld, top=%ld\n",
             infoPtr->items[iItem].iImage, rcImage.left, rcImage.top-1);
       ImageList_Draw
@@ -1861 +1868 @@
           r.left += (1-ZZ);
 
-          TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -1905 +1912 @@
           fillRect.right += (1-ZZ);
 
-          TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -1962 +1969 @@
           r.top -= ZZ;
 
-          TRACE("<bottom> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<bottom> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -2007 +2014 @@
           fillRect.bottom += (1-ZZ);
 
-          TRACE("<top> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<top> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -2102 +2109 @@
   }
 
-  TRACE("border=(%d,%d)-(%d,%d)\n",
+  TRACE("border=(%ld,%ld)-(%ld,%ld)\n",
         rect.left, rect.top, rect.right, rect.bottom);
 
@@ -2319 +2326 @@
   TAB_INFO* infoPtr)
 {
-  RECT clientRect;
+  RECT clientRect, r;
   DWORD lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   INT lastRow = infoPtr->uNumRows - 1;
@@ -2353 +2360 @@
                       ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2;
   }
-
-  TRACE("invalidate (%d,%d)-(%d,%d)\n",
+  
+  /* Punch out the updown control */
+  if (infoPtr->needsScrolling && (clientRect.right > 0)) {
+    GetClientRect(infoPtr->hwndUpDown, &r);
+    clientRect.right = clientRect.right - (r.right - r.left);
+  }
+  
+  TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n",
         clientRect.left,clientRect.top,
         clientRect.right,clientRect.bottom);
+ 
   InvalidateRect(hwnd, &clientRect, TRUE);
 }
@@ -2368 +2382 @@
   hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
 
-  TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n",
+  TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n",
         ps.fErase,
         ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom);
@@ -2392 +2406 @@
 
   GetClientRect (hwnd, &rect);
-  TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
+  TRACE("Rect: %p T %li, L %li, B %li, R %li\n", hwnd,
         rect.top, rect.left, rect.bottom, rect.right);
 
@@ -2467 +2481 @@
 
   GetClientRect (hwnd, &rect);
-  TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
+  TRACE("Rect: %p T %li, L %li, B %li, R %li\n", hwnd,
         rect.top, rect.left, rect.bottom, rect.right);
 
@@ -2543 +2557 @@
   {
     lResult = MAKELONG(infoPtr->tabWidth, infoPtr->tabHeight);
-    infoPtr->tabWidth = (INT)LOWORD(lParam);
-    infoPtr->tabHeight = (INT)HIWORD(lParam);
+    /* UNDOCUMENTED: If requested Width or Height is 0 this means that program wants to use default. */    
+    if (LOWORD(lParam)) infoPtr->tabWidth = (INT)LOWORD(lParam);
+    if (HIWORD(lParam)) infoPtr->tabHeight = (INT)HIWORD(lParam);
     TRACE("was h=%d,w=%d, now h=%d,w=%d\n",
           HIWORD(lResult), LOWORD(lResult),
@@ -2899 +2914 @@
   infoPtr->uNumItem        = 0;
   infoPtr->uNumRows        = 0;
+  infoPtr->uHItemPadding   = 6;
+  infoPtr->uVItemPadding   = 3;
   infoPtr->hFont           = 0;
   infoPtr->items           = 0;
@@ -2959 +2976 @@
   infoPtr->tabHeight = fontMetrics.tmHeight + SELECTED_TAB_OFFSET +
                        ((dwStyle & TCS_BUTTONS) ? 2 : 1) *
-                        VERTICAL_ITEM_PADDING;
+                        infoPtr->uVItemPadding;
 
   /* Initialize the width of a tab. */
@@ -3073 +3090 @@
 
     case TCM_SETPADDING:
-      FIXME("Unimplemented msg TCM_SETPADDING\n");
-      return 0;
+      return TAB_SetPadding (hwnd, wParam, lParam);
 
     case TCM_GETROWCOUNT:
@@ -3202 +3218 @@
   wndClass.cbWndExtra    = sizeof(TAB_INFO *);
   wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
-  wndClass.hbrBackground = (HBRUSH)NULL;
+  wndClass.hbrBackground = NULL;
   wndClass.lpszClassName = WC_TABCONTROLA;
 
@@ -3212 +3228 @@
 TAB_Unregister (void)
 {
-    UnregisterClassA (WC_TABCONTROLA, (HINSTANCE)NULL);
-}
+    UnregisterClassA (WC_TABCONTROLA, NULL);
+}

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);
+}

trunk/src/comctl32/tooltips.c

@@ -2102 +2102 @@
         return 0;
 
-#ifdef __WIN32OS2__
     if(infoPtr->hFont) DeleteObject (infoPtr->hFont);
-#endif
 
     infoPtr->hFont = CreateFontIndirectW(&lf);