Changeset 9370 for trunk/src

Timestamp:

Oct 29, 2002, 1:19:36 PM (23 years ago)

Author:

sandervl

Message:

Wine resync

Location:

trunk/src/comctl32

Files:

• comboex.c (modified) (93 diffs)
• comctl32.def (modified) (2 diffs)
• comctl32.h (modified) (6 diffs)
• comctl32dbg.def (modified) (2 diffs)
• comctl32undoc.c (modified) (67 diffs)
• commctrl.c (modified) (29 diffs)
• flatsb.c (modified) (21 diffs)
• header.c (added)
• header.cpp (deleted)
• hotkey.c (added)
• hotkey.cpp (deleted)
• imagelist.c (modified) (96 diffs)
• ipaddress.c (modified) (30 diffs)
• listview.c (modified) (5 diffs)
• pager.c (modified) (75 diffs)
• progress.c (modified) (20 diffs)
• propsheet.c (modified) (63 diffs)
• rebar.c (modified) (81 diffs)
• tab.c (modified) (114 diffs)
• toolbar.c (modified) (132 diffs)
• tooltips.c (added)
• tooltips.cpp (deleted)
• trackbar.c (added)
• trackbar.cpp (deleted)
• treeview.c (added)
• treeview.cpp (deleted)
• updown.c (modified) (48 diffs)

trunk/src/comctl32/comboex.c

@@ -20 +20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * FIXME:
- *  1. Implement following extended styles:
- *           CBES_EX_PATHWORDBREAKPROC
- *           CBES_EX_NOSIZELIMIT
- *           CBES_EX_CASESENSITIVE
- *  2. Notify CBEN_DRAGBEGIN is not implemented.
- *
+ * NOTE
+ * 
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Sep. 9, 2002, by Dimitrie O. Paun.
+ * 
+ * Unless otherwise noted, we belive this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ * 
  */
 
@@ -74 +76 @@
 
 /* internal flags in the COMBOEX_INFO structure */
-#define  WCBE_ACTEDIT           0x00000001     /* Edit active i.e.
+#define  WCBE_ACTEDIT           0x00000001  /* Edit active i.e.
                                              * CBEN_BEGINEDIT issued
                                              * but CBEN_ENDEDIT{A|W}
                                              * not yet issued. */
-#define  WCBE_EDITCHG           0x00000002     /* Edit issued EN_CHANGE */
+#define  WCBE_EDITCHG           0x00000002  /* Edit issued EN_CHANGE */
 #define  WCBE_EDITHASCHANGED    (WCBE_ACTEDIT | WCBE_EDITCHG)
-#define  WCBE_EDITFOCUSED       0x00000004     /* Edit control has focus */
-
+#define  WCBE_EDITFOCUSED       0x00000004  /* Edit control has focus */
+#define  WCBE_MOUSECAPTURED     0x00000008  /* Combo has captured mouse */
+#define  WCBE_MOUSEDRAGGED      0x00000010  /* User has dragged in combo */
 
 #define ID_CB_EDIT              1001
@@ -88 +91 @@
 /*
  * Special flag set in DRAWITEMSTRUCT itemState field. It is set by
- * the ComboEx version of the Combo Window Proc so that when the 
- * WM_DRAWITEM message is then passed to ComboEx, we know that this 
+ * the ComboEx version of the Combo Window Proc so that when the
+ * WM_DRAWITEM message is then passed to ComboEx, we know that this
  * particular WM_DRAWITEM message is for listbox only items. Any messasges
  * without this flag is then for the Edit control field.
  *
- * We really cannot use the ODS_COMBOBOXEDIT flag because MSDN states that 
+ * We really cannot use the ODS_COMBOBOXEDIT flag because MSDN states that
  * only version 4.0 applications will have ODS_COMBOBOXEDIT set.
  */
@@ -121 +124 @@
 static LRESULT WINAPI
 COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+static int CALLBACK
+COMBOEX_PathWordBreakProc(LPWSTR lpch, int ichCurrent, int cch, int code);
 static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr);
+
+#ifdef __WIN32OS2__
+#undef inline
+#define inline
+
+typedef INT (* WINAPI cmp_func_t)(LPCWSTR, LPCWSTR);
+#else
+typedef INT (WINAPI *cmp_func_t)(LPCWSTR, LPCWSTR);
+#endif
 
 inline static BOOL is_textW(LPCWSTR str)
@@ -164 +178 @@
 inline static CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index)
 {
-    return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA, 
+    return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA,
                                          (WPARAM)index, 0);
 }
 
+inline static cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr)
+{
+    return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW;
+}
 
 static INT COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr)
@@ -207 +225 @@
         else if (code == CBEN_GETDISPINFOW) code = CBEN_GETDISPINFOA;
         else if (code == CBEN_DRAGBEGINW) code = CBEN_DRAGBEGINA;
-        
+
         ret = COMBOEX_Notify (infoPtr, code, (NMHDR *)hdr);
 
         if (astr && hdr->ceItem.pszText == (LPWSTR)astr)
             hdr->ceItem.pszText = wstr;
-        
+
         if (astr) COMCTL32_Free(astr);
-        
+
         return ret;
     }
@@ -228 +246 @@
     } else {
         NMCBEENDEDITA neea;
-        
+
         memcpy (&neea.hdr, &neew->hdr, sizeof(NMHDR));
         neea.fChanged = neew->fChanged;
@@ -240 +258 @@
 
 
+static void COMBOEX_NotifyDragBegin(COMBOEX_INFO *infoPtr, LPCWSTR wstr)
+{
+    /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */
+    if (infoPtr->NtfUnicode) {
+        NMCBEDRAGBEGINW ndbw;
+
+        ndbw.iItemid = -1;
+        lstrcpynW(ndbw.szText, wstr, CBEMAXSTRLEN);
+        COMBOEX_Notify (infoPtr, CBEN_DRAGBEGINW, &ndbw.hdr);
+    } else {
+        NMCBEDRAGBEGINA ndba;
+
+        ndba.iItemid = -1;
+        WideCharToMultiByte (CP_ACP, 0, wstr, -1, ndba.szText, CBEMAXSTRLEN, 0, 0);
+
+        COMBOEX_Notify (infoPtr, CBEN_DRAGBEGINA, &ndba.hdr);
+    }
+}
+
+
 static void COMBOEX_FreeText (CBE_ITEMDATA *item)
 {
@@ -254 +292 @@
     LPWSTR text, buf;
     INT len;
-    
-    if (item->pszText != LPSTR_TEXTCALLBACKW) 
+
+    if (item->pszText != LPSTR_TEXTCALLBACKW)
         return item->pszText;
-    
+
     ZeroMemory(&nmce, sizeof(nmce));
     nmce.ceItem.mask = CBEIF_TEXT;
@@ -277 +315 @@
     } else
         text = nmce.ceItem.pszText;
-    
+
     if (nmce.ceItem.mask & CBEIF_DI_SETITEM)
         item->pszText = text;
@@ -290 +328 @@
 
     mydc = GetDC (0); /* why the entire screen???? */
-    nfont = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
+    nfont = (HFONT)SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
     ofont = (HFONT) SelectObject (mydc, nfont);
     GetTextExtentPointA (mydc, "A", 1, size);
     SelectObject (mydc, ofont);
     ReleaseDC (0, mydc);
-    TRACE("selected font hwnd=%08x, height=%ld\n", nfont, size->cy);
+    TRACE("selected font hwnd=%p, height=%ld\n", nfont, size->cy);
 }
 
@@ -376 +414 @@
     }
     SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, (WPARAM)-1, (LPARAM)cy);
-    if (infoPtr->hwndCombo)
+    if (infoPtr->hwndCombo) {
         SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT,
                       (WPARAM) 0, (LPARAM) cy);
+        if ( !(infoPtr->flags & CBES_EX_NOSIZELIMIT)) {
+            RECT comboRect;
+            if (GetWindowRect(infoPtr->hwndCombo, &comboRect)) {
+                RECT ourRect;
+                if (GetWindowRect(infoPtr->hwndSelf, &ourRect)) {
+                    if (comboRect.bottom > ourRect.bottom) {
+                        POINT pt = { ourRect.left, ourRect.top };
+                        if (ScreenToClient(infoPtr->hwndSelf, &pt))
+                            MoveWindow( infoPtr->hwndSelf, pt.x, pt.y, ourRect.right - ourRect.left,
+                                        comboRect.bottom - comboRect.top, FALSE);
+                    }
+                }
+            }
+        }
+    }
 }
 
@@ -396 +449 @@
 }
 
- 
+
 static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index)
 {
@@ -424 +477 @@
 static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO *infoPtr)
 {
-    return infoPtr->hwndEdit;
-}
- 
+    return infoPtr->hwndEdit ? TRUE : FALSE;
+}
+
 
 /* ***  CBEM_xxx message support  *** */
@@ -481 +534 @@
 
     if (is_textW(tmpcit.pszText) && cit->pszText)
-        WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 
+        WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1,
                              cit->pszText, cit->cchTextMax, NULL, NULL);
     else if (cit->pszText) cit->pszText[0] = 0;
@@ -520 +573 @@
     /* get zero-filled space and chain it in */
     if(!(item = (CBE_ITEMDATA *)COMCTL32_Alloc (sizeof(*item)))) return -1;
-    
+
     /* locate position to insert new item in */
     if (index == infoPtr->nb_items) {
@@ -576 +629 @@
     if (TRACE_ON(comboex)) COMBOEX_DumpItem (item);
 
-    SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING, 
+    SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING,
                   (WPARAM)cit->iItem, (LPARAM)item);
 
@@ -602 +655 @@
         citW.pszText = wstr;
     }
-    ret = COMBOEX_InsertItemW(infoPtr, &citW);;
-    
+    ret = COMBOEX_InsertItemW(infoPtr, &citW);
+
     if (wstr) COMCTL32_Free(wstr);
-    
+
     return ret;
 }
 
 
-static DWORD 
+static DWORD
 COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style)
 {
@@ -618 +671 @@
 
     dwTemp = infoPtr->dwExtStyle;
-
-    if (style &  (CBES_EX_PATHWORDBREAKPROC |
-                  CBES_EX_NOSIZELIMIT |
-                  CBES_EX_CASESENSITIVE))
-        FIXME("Extended style not implemented %08lx\n", style);
 
     if (mask)
@@ -628 +676 @@
     else
         infoPtr->dwExtStyle = style;
+
+    /* see if we need to change the word break proc on the edit */
+    if ((infoPtr->dwExtStyle ^ dwTemp) & CBES_EX_PATHWORDBREAKPROC) {
+        SendMessageW(infoPtr->hwndEdit, EM_SETWORDBREAKPROC, 0,
+                     (infoPtr->dwExtStyle & CBES_EX_PATHWORDBREAKPROC) ?
+                         (LPARAM)COMBOEX_PathWordBreakProc : 0);
+    }
 
     /* test if the control's appearance has changed */
@@ -676 +731 @@
     if (!(item = COMBOEX_FindItem(infoPtr, index))) return FALSE;
 
-    /* add/change stuff to the internal item structure */ 
+    /* add/change stuff to the internal item structure */
     item->mask |= cit->mask;
     if (cit->mask & CBEIF_TEXT) {
@@ -726 +781 @@
         citW.pszText = wstr;
     }
-    ret = COMBOEX_SetItemW(infoPtr, &citW);;
+    ret = COMBOEX_SetItemW(infoPtr, &citW);
 
     if (wstr) COMCTL32_Free(wstr);
@@ -749 +804 @@
 
 static INT
-COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCSTR str)
-{
-    INT i, count;
-    CBE_ITEMDATA *item;
-    LPWSTR desired = NULL;
-
-    i = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-    if (i > 0) {
-        desired = (LPWSTR)COMCTL32_Alloc ((i + 1)*sizeof(WCHAR));
-        if (!desired) return CB_ERR;
-        MultiByteToWideChar (CP_ACP, 0, str, -1, desired, i);
-    }
-
-    count = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
+COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCWSTR str)
+{
+    INT i;
+    cmp_func_t cmptext = get_cmp_func(infoPtr);
+    INT count = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
 
     /* now search from after starting loc and wrapping back to start */
     for(i=start+1; i<count; i++) {
-        item = get_item_data(infoPtr, i);
-        if (lstrcmpiW(COMBOEX_GetText(infoPtr, item), desired) == 0) {
-            COMCTL32_Free (desired);
-            return i;
-        }
+        CBE_ITEMDATA *item = get_item_data(infoPtr, i);
+        if (cmptext(COMBOEX_GetText(infoPtr, item), str) == 0) return i;
     }
     for(i=0; i<=start; i++) {
-        item = get_item_data(infoPtr, i);
-        if (lstrcmpiW(COMBOEX_GetText(infoPtr, item), desired) == 0) {
-            COMCTL32_Free (desired);
-            return i;
-        }
-    }
-    COMCTL32_Free(desired);
+        CBE_ITEMDATA *item = get_item_data(infoPtr, i);
+        if (cmptext(COMBOEX_GetText(infoPtr, item), str) == 0) return i;
+    }
     return CB_ERR;
 }
@@ -857 +896 @@
     GetWindowRect (infoPtr->hwndSelf, &cbx_wrect);
     GetClientRect (infoPtr->hwndSelf, &cbx_crect);
-    /* the height of comboex as height of the combo + comboex border */ 
+    /* the height of comboex as height of the combo + comboex border */
     height = cb_wrect.bottom-cb_wrect.top
              + cbx_wrect.bottom-cbx_wrect.top
@@ -884 +923 @@
     WCHAR NIL[] = { 0 };
     COMBOEX_INFO *infoPtr;
-    DWORD dwComboStyle;
     LOGFONTW mylogfont;
     RECT wnrc1, clrc1, cmbwrc;
@@ -895 +933 @@
     /* initialize info structure */
     /* note that infoPtr is allocated zero-filled */
-    
+
     infoPtr->hwndSelf = hwnd;
     infoPtr->selected = -1;
@@ -901 +939 @@
     infoPtr->unicode = IsWindowUnicode (hwnd);
 
-    i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+    i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
     if ((i != NFR_ANSI) && (i != NFR_UNICODE)) {
         WARN("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i);
@@ -911 +949 @@
 
     /* create combo box */
-    dwComboStyle = GetWindowLongW (hwnd, GWL_STYLE) &
-                        (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
-
     GetWindowRect(hwnd, &wnrc1);
     GetClientRect(hwnd, &clrc1);
@@ -919 +954 @@
           wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
           clrc1.left, clrc1.top, clrc1.right, clrc1.bottom);
-    TRACE("combo style=%08lx, adding style=%08lx\n", dwComboStyle,
-          WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
-          CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST |
-          WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED);
 
     /* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */
@@ -934 +965 @@
                          /* following line added to match native */
                          WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
-                         CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST | 
+                         CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST |
                          /* was base and is necessary */
-                         WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
+                         WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED |
+                         GetWindowLongW (hwnd, GWL_STYLE),
                          cs->y, cs->x, cs->cx, cs->cy, hwnd,
                          (HMENU) GetWindowLongW (hwnd, GWL_ID),
-                         GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
-
-    /* 
+                         (HINSTANCE)GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
+
+    /*
      * native does the following at this point according to trace:
      *  GetWindowThreadProcessId(hwndCombo,0)
@@ -950 +982 @@
 
     /*
-     * Setup a property to hold the pointer to the COMBOBOXEX 
+     * Setup a property to hold the pointer to the COMBOBOXEX
      * data structure.
      */
     SetPropA(infoPtr->hwndCombo, COMBOEX_SUBCLASS_PROP, hwnd);
-    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndCombo, 
+    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndCombo,
                                 GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc);
-    infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
+    infoPtr->font = (HFONT)SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
 
 
@@ -967 +999 @@
                     WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
                     0, 0, 0, 0,  /* will set later */
-                    infoPtr->hwndCombo, 
+                    infoPtr->hwndCombo,
                     (HMENU) GetWindowLongW (hwnd, GWL_ID),
-                    GetWindowLongW (hwnd, GWL_HINSTANCE),
-                    NULL);
+                    (HINSTANCE)GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
 
         /* native does the following at this point according to trace:
@@ -980 +1011 @@
 
         /*
-         * Setup a property to hold the pointer to the COMBOBOXEX 
+         * Setup a property to hold the pointer to the COMBOBOXEX
          * data structure.
          */
         SetPropA(infoPtr->hwndEdit, COMBOEX_SUBCLASS_PROP, hwnd);
-        infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndEdit, 
+        infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndEdit,
                                  GWL_WNDPROC, (LONG)COMBOEX_EditWndProc);
-        infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
+        infoPtr->font = (HFONT)SendMessageW(infoPtr->hwndCombo, WM_GETFONT, 0, 0);
     }
 
@@ -994 +1025 @@
      */
     if (!infoPtr->font) {
-        SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof(mylogfont), 
+        SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof(mylogfont),
                                &mylogfont, 0);
         infoPtr->font = infoPtr->defaultFont = CreateFontIndirectW (&mylogfont);
@@ -1015 +1046 @@
           clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
           cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
-    SetWindowPos(infoPtr->hwndCombo, HWND_TOP, 
+    SetWindowPos(infoPtr->hwndCombo, HWND_TOP,
                  0, 0, wnrc1.right-wnrc1.left, wnrc1.bottom-wnrc1.top,
                  SWP_NOACTIVATE | SWP_NOREDRAW);
@@ -1022 +1053 @@
     TRACE("CB window=(%d,%d)-(%d,%d)\n",
           cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
-    SetWindowPos(hwnd, HWND_TOP, 
+    SetWindowPos(hwnd, HWND_TOP,
                  0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top,
                  SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
@@ -1029 +1060 @@
 
     /*
-     * Create an item structure to represent the data in the 
+     * Create an item structure to represent the data in the
      * EDIT control. It is allocated zero-filled.
      */
@@ -1061 +1092 @@
         ShowWindow (infoPtr->hwndEdit, SW_HIDE);
         return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
-        
+
     case CBN_CLOSEUP:
         SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
         /*
-         * from native trace of first dropdown after typing in URL in IE4 
+         * from native trace of first dropdown after typing in URL in IE4
          *  CB_GETCURSEL(Combo)
          *  GetWindowText(Edit)
@@ -1075 +1106 @@
          *  CB_SETCURSEL(COMBOEX, n)
          *  SetFocus(Combo)
-         * the rest is supposition  
+         * the rest is supposition
          */
         ShowWindow (infoPtr->hwndEdit, SW_SHOW);
@@ -1082 +1113 @@
         cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
         if (cursel == -1) {
+            cmp_func_t cmptext = get_cmp_func(infoPtr);
             /* find match from edit against those in Combobox */
             GetWindowTextW (infoPtr->hwndEdit, wintext, 520);
@@ -1088 +1120 @@
                 item = get_item_data(infoPtr, cursel);
                 if ((INT)item == CB_ERR) break;
-                if (!lstrcmpiW(COMBOEX_GetText(infoPtr, item), wintext)) break;
+                if (!cmptext(COMBOEX_GetText(infoPtr, item), wintext)) break;
             }
             if ((cursel == n) || ((INT)item == CB_ERR)) {
@@ -1155 +1187 @@
 
     case CBN_SELENDOK:
-        /* 
+        /*
          * We have to change the handle since we are the control
          * issuing the message. IE4 depends on this.
@@ -1189 +1221 @@
 
     default:
-        /* 
+        /*
          * We have to change the handle since we are the control
          * issuing the message. IE4 depends on this.
@@ -1210 +1242 @@
     INT i;
 
-    TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%x, data=%08lx\n",
+    TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n",
           dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
 
@@ -1264 +1296 @@
     if (!IsWindowEnabled(infoPtr->hwndCombo)) return 0;
 
-    TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", 
+    TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
           dis->CtlType, dis->CtlID);
-    TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", 
+    TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
           dis->itemID, dis->itemAction, dis->itemState);
-    TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
-          dis->hwndItem, dis->hDC, dis->rcItem.left, 
-          dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, 
+    TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+          dis->hwndItem, dis->hDC, dis->rcItem.left,
+          dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom,
           dis->itemData);
 
@@ -1286 +1318 @@
     if (dis->itemID == 0xffffffff) {
         if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) ||
-             ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) { 
+             ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) {
 
             TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n",
@@ -1292 +1324 @@
                   dis->rcItem.right, dis->rcItem.bottom);
         }
-        else if ((dis->CtlType == ODT_COMBOBOX) && 
+        else if ((dis->CtlType == ODT_COMBOBOX) &&
                  (dis->itemAction == ODA_DRAWENTIRE)) {
             /* draw of edit control data */
@@ -1334 +1366 @@
                 if (item->pszText)
                     GetWindowTextW(infoPtr->hwndEdit, item->pszText, len+1);
-            
-               TRACE("edit control hwndEdit=%0x, text len=%d str=%s\n",
+
+               TRACE("edit control hwndEdit=%p, text len=%d str=%s\n",
                      infoPtr->hwndEdit, len, debugstr_txt(item->pszText));
             }
@@ -1382 +1414 @@
         /* drawing combo/edit entry */
         if (IsWindowVisible(infoPtr->hwndEdit)) {
-            /* if we have an edit control, the slave the 
-             * selection state to the Edit focus state 
+            /* if we have an edit control, the slave the
+             * selection state to the Edit focus state
              */
             if (infoPtr->flags & WCBE_EDITFOCUSED) {
@@ -1391 +1423 @@
             }
         } else {
-            /* if we don't have an edit control, use 
+            /* if we don't have an edit control, use
              * the requested state.
              */
@@ -1415 +1447 @@
     len = strlenW (str);
     GetTextExtentPoint32W (dis->hDC, str, len, &txtsize);
-    
+
     if (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) {
         int overlay = item->iOverlay;
-        
+
         if (drawimage == I_IMAGECALLBACK) {
             NMCOMBOBOXEXW nmce;
@@ -1442 +1474 @@
             overlay = nmce.ceItem.iOverlay;
         }
-    
-        if (drawimage >= 0 && 
+
+        if (drawimage >= 0 &&
             !(infoPtr->dwExtStyle & (CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT))) {
             if (overlay > 0) ImageList_SetOverlayImage (infoPtr->himl, overlay, 1);
-            ImageList_Draw (infoPtr->himl, drawimage, dis->hDC, xbase, dis->rcItem.top, 
+            ImageList_Draw (infoPtr->himl, drawimage, dis->hDC, xbase, dis->rcItem.top,
                             drawstate | (overlay > 0 ? INDEXTOOVERLAYMASK(1) : 0));
         }
@@ -1473 +1505 @@
         }
     }
-    
+
     if (dis->itemAction & ODA_FOCUS) {
         rect.left = xbase + xioff - 1;
@@ -1509 +1541 @@
     }
 
-    if (infoPtr->defaultFont) 
+    if (infoPtr->defaultFont)
         DeleteObject (infoPtr->defaultFont);
 
@@ -1529 +1561 @@
     mis->itemHeight = mysize.cy + CBE_EXTRA;
 
-    TRACE("adjusted height hwnd=%08x, height=%d\n",
+    TRACE("adjusted height hwnd=%p, height=%d\n",
           infoPtr->hwndSelf, mis->itemHeight);
 
@@ -1556 +1588 @@
     if (lParam == NF_REQUERY) {
         INT i = SendMessageW(GetParent (infoPtr->hwndSelf),
-                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+                         WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
         infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
     }
@@ -1565 +1597 @@
 static LRESULT COMBOEX_Size (COMBOEX_INFO *infoPtr, INT width, INT height)
 {
-    TRACE("(width=%d, height=%d)\n", width, height); 
+    TRACE("(width=%d, height=%d)\n", width, height);
 
     MoveWindow (infoPtr->hwndCombo, 0, 0, width, height, TRUE);
@@ -1586 +1618 @@
     /* width is winpos value + border width of comboex */
     width = wp->cx
-            + (cbx_wrect.right-cbx_wrect.left) 
-            - (cbx_crect.right-cbx_crect.left); 
+            + (cbx_wrect.right-cbx_wrect.left)
+            - (cbx_crect.right-cbx_crect.left);
 
     TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n",
@@ -1618 +1650 @@
 }
 
+static inline int is_delimiter(WCHAR c)
+{
+    switch(c) {
+        case '/':
+        case '\\':
+        case '.':
+            return TRUE;
+    }
+    return FALSE;
+}
+
+static int CALLBACK
+COMBOEX_PathWordBreakProc(LPWSTR lpch, int ichCurrent, int cch, int code)
+{
+    if (code == WB_ISDELIMITER) {
+        return is_delimiter(lpch[ichCurrent]);
+    } else {
+        int dir = (code == WB_LEFT) ? -1 : 1;
+        for(; 0 <= ichCurrent && ichCurrent < cch; ichCurrent += dir)
+            if (is_delimiter(lpch[ichCurrent])) return ichCurrent;
+    }
+    return ichCurrent;
+}
 
 static LRESULT WINAPI
@@ -1631 +1686 @@
     LRESULT lret;
 
-    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n", 
+    TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
           hwnd, uMsg, wParam, lParam, infoPtr);
 
@@ -1643 +1698 @@
             if (wParam == VK_RETURN) return 0;
             /* all other characters pass into the real Edit */
-            return CallWindowProcW (infoPtr->prevEditWndProc, 
+            return CallWindowProcW (infoPtr->prevEditWndProc,
                                    hwnd, uMsg, wParam, lParam);
 
         case WM_ERASEBKGND:
             /*
-             * The following was determined by traces of the native 
+             * The following was determined by traces of the native
              */
             hDC = (HDC) wParam;
@@ -1657 +1712 @@
             ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-            return CallWindowProcW (infoPtr->prevEditWndProc, 
+            return CallWindowProcW (infoPtr->prevEditWndProc,
                                    hwnd, uMsg, wParam, lParam);
 
@@ -1672 +1727 @@
                  *   CB_GETCURSEL to Combo rets -1              x
                  *   WM_NOTIFY to COMBOEX parent (rebar)        x
-                 *     (CBEN_ENDEDIT{A|W} 
+                 *     (CBEN_ENDEDIT{A|W}
                  *      fChanged = FALSE                        x
                  *      inewSelection = -1                      x
@@ -1701 +1756 @@
                     break;
                 }
-                infoPtr->selected = oldItem;              
+                infoPtr->selected = oldItem;
                 COMBOEX_SetEditText (infoPtr, item);
-                RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
+                RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE |
                               RDW_INVALIDATE);
                 break;
@@ -1713 +1768 @@
                  *   CB_GETCURSEL to Combo  rets -1             x
                  *   CB_GETCOUNT to Combo  rets 0
-                 *   if >0 loop 
+                 *   if >0 loop
                  *       CB_GETITEMDATA to match
-                 * *** above 3 lines simulated by FindItem      x  
+                 * *** above 3 lines simulated by FindItem      x
                  *   WM_NOTIFY to COMBOEX parent (rebar)        x
                  *     (CBEN_ENDEDIT{A|W}                       x
@@ -1738 +1793 @@
 
                 if (selected != -1) {
+                    cmp_func_t cmptext = get_cmp_func(infoPtr);
                     item = COMBOEX_FindItem (infoPtr, selected);
                     TRACE("handling VK_RETURN, selected = %d, selected_text=%s\n",
@@ -1743 +1799 @@
                     TRACE("handling VK_RETURN, edittext=%s\n",
                           debugstr_w(edit_text));
-                    if (lstrcmpiW (COMBOEX_GetText(infoPtr, item), edit_text)) {
+                    if (cmptext (COMBOEX_GetText(infoPtr, item), edit_text)) {
                         /* strings not equal -- indicate edit has changed */
                         selected = -1;
@@ -1750 +1806 @@
 
                 cbeend.iNewSelection = selected;
-                cbeend.fChanged = TRUE; 
+                cbeend.fChanged = TRUE;
                 cbeend.iWhy = CBENF_RETURN;
                 if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
@@ -1756 +1812 @@
                     TRACE("Notify requested abort of change\n");
                     COMBOEX_SetEditText (infoPtr, infoPtr->edit);
-                    RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
+                    RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE |
                                   RDW_INVALIDATE);
                     return 0;
@@ -1763 +1819 @@
                 if (oldItem != -1) {
                     /* if something is selected, then deselect it */
-                    SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, 
+                    SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL,
                                   (WPARAM)-1, 0);
                 }
@@ -1787 +1843 @@
         case WM_SETFOCUS:
             /* remember the focus to set state of icon */
-            lret = CallWindowProcW (infoPtr->prevEditWndProc, 
+            lret = CallWindowProcW (infoPtr->prevEditWndProc,
                                    hwnd, uMsg, wParam, lParam);
             infoPtr->flags |= WCBE_EDITFOCUSED;
@@ -1793 +1849 @@
 
         case WM_KILLFOCUS:
-            /* 
+            /*
              * do NOTIFY CBEN_ENDEDIT with CBENF_KILLFOCUS
              */
@@ -1811 +1867 @@
 
         default:
-            return CallWindowProcW (infoPtr->prevEditWndProc, 
+            return CallWindowProcW (infoPtr->prevEditWndProc,
                                    hwnd, uMsg, wParam, lParam);
     }
@@ -1829 +1885 @@
     HWND focusedhwnd;
     RECT rect;
+    POINT pt;
     WCHAR edit_text[260];
 
-    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n", 
+    TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
           hwnd, uMsg, wParam, lParam, infoPtr);
 
@@ -1838 +1895 @@
     switch (uMsg)
     {
-
-    case CB_FINDSTRINGEXACT:
-            return COMBOEX_FindStringExact (infoPtr, (INT)wParam, (LPCSTR)lParam);
 
     case WM_DRAWITEM:
@@ -1849 +1903 @@
              */
             ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX;
-            return CallWindowProcW (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc,
                                    hwnd, uMsg, wParam, lParam);
 
     case WM_ERASEBKGND:
             /*
-             * The following was determined by traces of the native 
+             * The following was determined by traces of the native
              */
             hDC = (HDC) wParam;
@@ -1863 +1917 @@
             ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-            return CallWindowProcW (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc,
                                    hwnd, uMsg, wParam, lParam);
 
@@ -1878 +1932 @@
             nmmse.dwHitInfo = lParam;
             COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse);
-            return CallWindowProcW (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc,
                                    hwnd, uMsg, wParam, lParam);
+
+    case WM_LBUTTONDOWN:
+            GetClientRect (hwnd, &rect);
+            rect.bottom = rect.top + SendMessageW(infoPtr->hwndSelf,
+                                                  CB_GETITEMHEIGHT, -1, 0);
+            rect.left = rect.right - GetSystemMetrics(SM_CXVSCROLL);
+            POINTSTOPOINT(pt, MAKEPOINTS(lParam));
+            if (PtInRect(&rect, pt))
+                return CallWindowProcW (infoPtr->prevComboWndProc,
+                                        hwnd, uMsg, wParam, lParam);
+            infoPtr->flags |= WCBE_MOUSECAPTURED;
+            SetCapture(hwnd);
+            break;
+
+    case WM_LBUTTONUP:
+            if (!(infoPtr->flags & WCBE_MOUSECAPTURED))
+                return CallWindowProcW (infoPtr->prevComboWndProc,
+                                        hwnd, uMsg, wParam, lParam);
+            ReleaseCapture();
+            infoPtr->flags &= ~WCBE_MOUSECAPTURED;
+            if (infoPtr->flags & WCBE_MOUSEDRAGGED) {
+                infoPtr->flags &= ~WCBE_MOUSEDRAGGED;
+            } else {
+                SendMessageW(hwnd, CB_SHOWDROPDOWN, TRUE, 0);
+            }
+            break;
+
+    case WM_MOUSEMOVE:
+            if ( (infoPtr->flags & WCBE_MOUSECAPTURED) &&
+                !(infoPtr->flags & WCBE_MOUSEDRAGGED)) {
+                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+                COMBOEX_NotifyDragBegin(infoPtr, edit_text);
+                infoPtr->flags |= WCBE_MOUSEDRAGGED;
+            }
+            return CallWindowProcW (infoPtr->prevComboWndProc,
+                                    hwnd, uMsg, wParam, lParam);
 
     case WM_COMMAND:
@@ -1918 +2008 @@
                 if (focusedhwnd)
                     SendMessageW (infoPtr->hwndCombo, WM_KILLFOCUS,
-                                  (WPARAM)focusedhwnd, 0); 
+                                  (WPARAM)focusedhwnd, 0);
                 return 0;
 
             case EN_SETFOCUS: {
-                /* 
+                /*
                  * For EN_SETFOCUS this issues the same calls and messages
                  *  as the native seems to do.
@@ -1948 +2038 @@
 
             case EN_CHANGE: {
-                /* 
+                /*
                  * For EN_CHANGE this issues the same calls and messages
                  *  as the native seems to do.
@@ -1954 +2044 @@
                 WCHAR edit_text[260];
                 LPCWSTR lastwrk;
-                INT selected;
-                CBE_ITEMDATA *item;
-
-                selected = SendMessageW (infoPtr->hwndCombo,
-                                         CB_GETCURSEL, 0, 0);
+                cmp_func_t cmptext = get_cmp_func(infoPtr);
+
+                INT selected = SendMessageW (infoPtr->hwndCombo,
+                                             CB_GETCURSEL, 0, 0);
 
                 /* lstrlenA( lastworkingURL ) */
@@ -1967 +2056 @@
                 }
                 else {
-                    item = COMBOEX_FindItem (infoPtr, selected);
+                    CBE_ITEMDATA *item = COMBOEX_FindItem (infoPtr, selected);
                     lastwrk = COMBOEX_GetText(infoPtr, item);
                 }
@@ -1976 +2065 @@
                       debugstr_w(edit_text));
 
-                /* lstrcmpiW is between lastworkingURL and GetWindowText */
-                if (lstrcmpiW (lastwrk, edit_text)) {
+                /* cmptext is between lastworkingURL and GetWindowText */
+                if (cmptext (lastwrk, edit_text)) {
                     /* strings not equal -- indicate edit has changed */
                     infoPtr->flags |= WCBE_EDITCHG;
@@ -1984 +2073 @@
                                MAKEWPARAM(GetDlgCtrlID (infoPtr->hwndSelf),
                                           CBN_EDITCHANGE),
-                               infoPtr->hwndSelf);
+                               (LPARAM)infoPtr->hwndSelf);
                 return 0;
                 }
@@ -2024 +2113 @@
             }/* fall through */
     default:
-            return CallWindowProcW (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc,
                                    hwnd, uMsg, wParam, lParam);
     }
@@ -2036 +2125 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-    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 (!infoPtr) {
@@ -2052 +2141 @@
 
         case CBEM_GETCOMBOCONTROL:
-            return infoPtr->hwndCombo;
+            return (LRESULT)infoPtr->hwndCombo;
 
         case CBEM_GETEDITCONTROL:
-            return infoPtr->hwndEdit;
+            return (LRESULT)infoPtr->hwndEdit;
 
         case CBEM_GETEXTENDEDSTYLE:
@@ -2099 +2188 @@
         /*case CBEM_SETWINDOWTHEME:
             FIXME("CBEM_SETWINDOWTHEME: stub\n");*/
+
+        case WM_SETTEXT:
+        case WM_GETTEXT:
+            return SendMessageW(infoPtr->hwndEdit, uMsg, wParam, lParam);
 
 /*   Combo messages we are not sure if we need to process or just forward */
@@ -2109 +2202 @@
         case CB_RESETCONTENT:
         case CB_SELECTSTRING:
-        case WM_SETTEXT:
-        case WM_GETTEXT:
-            FIXME("(0x%x 0x%x 0x%lx): possibly missing function\n",
-                  uMsg, wParam, lParam);
 
 /*   Combo messages OK to just forward to the regular COMBO */
-        case CB_GETCOUNT:        
+        case CB_GETCOUNT:
         case CB_GETCURSEL:
         case CB_GETDROPPEDSTATE:
@@ -2125 +2214 @@
 /*   Combo messages we need to process specially */
         case CB_FINDSTRINGEXACT:
-            return COMBOEX_FindStringExact (infoPtr, (INT)wParam, (LPCSTR)lParam);
+            return COMBOEX_FindStringExact (infoPtr, (INT)wParam, (LPCWSTR)lParam);
 
         case CB_GETITEMDATA:
@@ -2175 +2264 @@
 
         default:
-            if (uMsg >= WM_USER)
+            if ((uMsg >= WM_USER) && (uMsg < WM_APP))
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam);
             return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -2195 +2284 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_COMBOBOXEXW;
- 
+
     RegisterClassW (&wndClass);
 }
@@ -2204 +2293 @@
     UnregisterClassW (WC_COMBOBOXEXW, (HINSTANCE)NULL);
 }
-

trunk/src/comctl32/comctl32.def

@@ -1 @@
-; $Id: comctl32.def,v 1.26 2002-05-08 11:24:59 sandervl Exp $
+; $Id: comctl32.def,v 1.27 2002-10-29 12:18:25 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -193 +193 @@
                         _COMCTL32_415@20           @415 NONAME
 
+                        _COMCTL32_417@32           @417 NONAME
                         _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/comctl32.h

@@ -1 +1 @@
 /******************************************************************************
- * 
+ *
  * Common definitions (resource ids and global variables)
  *
  * Copyright 1999 Thuy Nguyen
  * Copyright 1999 Eric Kohl
+ * Copyright 2002 Dimitrie O. Paun
  *
  * This library is free software; you can redistribute it and/or
@@ -24 +25 @@
 #define __WINE_COMCTL32_H
 
-#ifdef __WIN32OS2__
-#include <heapstring.h>
-#endif
+#include "commctrl.h"
 
 extern HMODULE COMCTL32_hModule;
@@ -85 +84 @@
 #define IDM_GOTODAY                    4164
 
-/* Treeview Checboxes */
+/* Treeview Checkboxes */
 
 #define IDT_CHECK        401
@@ -94 +93 @@
 #define IDC_DIVIDEROPEN                 107
 
-#ifdef __WIN32OS2__
-/* Header filter bitmap */
-#define IDB_HEADER_FILTER   140
-
-#define IDC_COMCTL32_DRAGHLINE     106
-#define IDC_COMCTL32_SPLITHLINE    107
-
-#endif
 
 /* DragList icon */
 #define IDI_DRAGARROW                   150
 
-typedef struct 
+
+/* HOTKEY internal strings */
+#define HKY_NONE                        2048
+
+typedef struct
 {
     COLORREF clrBtnHighlight;       /* COLOR_BTNHIGHLIGHT                  */
@@ -134 +129 @@
 BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc);
 
-#define COMCTL32_VERSION_MINOR 0 
+#define COMCTL32_VERSION_MINOR 0
 #define WINE_FILEVERSION 5, COMCTL32_VERSION_MINOR, 0, 0
 #define WINE_FILEVERSIONSTR "5.00"
 
+/* Notification support */
+
+#ifndef RC_INVOKED
+
 #ifdef __WIN32OS2__
+#include <heapstring.h>
+
+#ifndef __cplusplus
+#undef inline
+#define inline
+#endif
+#endif
+
+inline static LRESULT send_notify(HWND hwnd, UINT code, NMHDR *hdr)
+{
+    hdr->hwndFrom = hwnd;
+    hdr->idFrom = GetWindowLongW (hwnd, GWL_ID);
+    hdr->code = code;
+
+    return SendMessageW (GetParent(hwnd), WM_NOTIFY, hdr->idFrom, (LPARAM)hdr);
+}
+
+
+inline static LRESULT hwnd_notify(HWND hwnd, UINT code)
+{
+    NMHDR hdr;
+
+    return send_notify(hwnd, code, &hdr);
+}
+
+inline static BOOL hwnd_notify_char(HWND hwnd, UINT ch, DWORD prev, DWORD next)
+{
+    NMCHAR nmch;
+
+    nmch.ch = ch;
+    nmch.dwItemPrev = prev;
+    nmch.dwItemNext = next;
+    return (BOOL)send_notify(hwnd, NM_CHAR, &nmch.hdr);
+}
+
+inline static BOOL hwnd_notify_keydown(HWND hwnd, UINT nVKey, UINT uFlags)
+{
+    NMKEY nmk;
+
+    nmk.nVKey = nVKey;
+    nmk.uFlags = uFlags;
+    return (BOOL)send_notify(hwnd, NM_KEYDOWN, &nmk.hdr);
+}
+
+inline static DWORD hwnd_notify_mouse(HWND hwnd, UINT code, DWORD spec, DWORD data, POINT *pt, LPARAM dwHitInfo)
+{
+    NMMOUSE nmm;
+
+    nmm.dwItemSpec = spec;
+    nmm.dwItemData = data;
+    nmm.pt.x = pt->x;
+    nmm.pt.y = pt->y;
+    nmm.dwHitInfo = dwHitInfo;
+    return send_notify(hwnd, code, &nmm.hdr);
+}
+
+#define DEFINE_CHAR_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static BOOL notify_char(CTRLINFO *infoPtr, UINT ch, DWORD prev, DWORD next) \
+        { return hwnd_notify_char(infoPtr->hwndSelf, ch, prev, next); }
+
+#define DEFINE_CLICK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_click(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_CLICK); }
+
+#define DEFINE_DBLCLK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_dblclk(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_DBLCLK); }
+
+#define DEFINE_HOVER_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static BOOL notify_hover(CTRLINFO *infoPtr) \
+        { return hwnd_notify(infoPtr->hwndSelf, NM_HOVER); }
+
+#define DEFINE_KEYDOWN_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static BOOL notify_keydown(CTRLINFO *infoPtr, UINT nVKey, UINT uFlags) \
+        { return hwnd_notify_keydown(infoPtr->hwndSelf, nVKey, uFlags); }
+
+#define DEFINE_KILLFOCUS_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_killfocus(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_KILLFOCUS); }
+
+#define DEFINE_NCHITTEST_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static DWORD notify_nchittest(CTRLINFO *infoPtr, DWORD spec, DWORD data, POINT *pt, LPARAM dwHitInfo) \
+        { return hwnd_notify_mouse(infoPtr->hwndSelf, NM_NCHITTEST, spec, data, pt, dwHitInfo); }
+
+#define DEFINE_OUTOFMEMORY_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_outofmemory(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_OUTOFMEMORY); }
+
+#define DEFINE_RCLICK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static BOOL notify_rclick(CTRLINFO *infoPtr) \
+        { return hwnd_notify(infoPtr->hwndSelf, NM_RCLICK); }
+
+#define DEFINE_RDBLCLK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_rdblclk(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_RDBLCLK); }
+
+#define DEFINE_RELEASEDCAPTURE_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_releasedcapture(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_RELEASEDCAPTURE); }
+
+#define DEFINE_RETURN_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_return(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_RETURN); }
+
+#define DEFINE_SETCURSOR_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static BOOL notify_setcursor(CTRLINFO *infoPtr, DWORD spec, DWORD data, POINT *pt, LPARAM dwHitInfo) \
+        { return hwnd_notify_mouse(infoPtr->hwndSelf, NM_SETCURSOR, spec, data, pt, dwHitInfo); }
+
+#define DEFINE_SETFOCUS_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_setfocus(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_SETFOCUS); }
+
+#define DEFINE_TOOLTIPSCREATED_NOTIFICATION(CTRLINFO, hwndSelf) \
+    inline static void notify_tooltipscreated(CTRLINFO *infoPtr) \
+        { hwnd_notify(infoPtr->hwndSelf, NM_TOOLTIPSCREATED); }
+
+#define DEFINE_COMMON_NOTIFICATIONS(CTRLINFO, hwndSelf) \
+    DEFINE_CHAR_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_CLICK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_DBLCLK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_HOVER_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_KEYDOWN_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_KILLFOCUS_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_NCHITTEST_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_OUTOFMEMORY_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_RCLICK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_RDBLCLK_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_RELEASEDCAPTURE_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_RETURN_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_SETCURSOR_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_SETFOCUS_NOTIFICATION(CTRLINFO, hwndSelf) \
+    DEFINE_TOOLTIPSCREATED_NOTIFICATION(CTRLINFO, hwndSelf) \
+    struct __forward_dummy_struc_dec_to_catch_missing_semicolon
+
+#endif //#ifndef RC_INVOKED
+
+/* Our internal stack structure of the window procedures to subclass */
+typedef struct
+{
+   struct {
+      SUBCLASSPROC subproc;
+      UINT_PTR id;
+      DWORD_PTR ref;
+   } SubclassProcs[31];
+   int stackpos;
+   int stacknum;
+   int stacknew;
+   WNDPROC origproc;
+} SUBCLASS_INFO, *LPSUBCLASS_INFO;
+
+#ifdef __WIN32OS2__
+
+/* Header filter bitmap */
+#define IDB_HEADER_FILTER   140
+
+#define IDC_COMCTL32_DRAGHLINE     106
+#define IDC_COMCTL32_SPLITHLINE    107
+
 #define swprintf   wsprintfW
+
 #ifdef __cplusplus
 extern "C" {
@@ -189 +347 @@
 }
 #endif
+
 #endif
 

trunk/src/comctl32/comctl32dbg.def

@@ -1 @@
-; $Id: comctl32dbg.def,v 1.2 2002-05-08 11:24:59 sandervl Exp $
+; $Id: comctl32dbg.def,v 1.3 2002-10-29 12:18:25 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -190 +190 @@
                         _COMCTL32_415@20           @415 NONAME
 
+                        _COMCTL32_417@32           @417 NONAME
                         _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/comctl32undoc.c

@@ -74 +74 @@
 typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM);
 #endif
-
-INT __cdecl _wtoi(LPWSTR string);
 
 /**************************************************************************
@@ -283 +281 @@
         }
         nResult = (pfnCompare)(*pWork1, *pWork2, lParam);
-        TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n", 
+        TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n",
               nResult, nIndex, nCount);
 
@@ -532 +530 @@
 
     /* open the sub key */
-    if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 
+    if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey,
                               0, KEY_WRITE, &newkey))) {
         /* not present - what to do ??? */
@@ -552 +550 @@
     if (mp->wineFlags & WMRUF_CHANGED) {
         mp->wineFlags &= ~WMRUF_CHANGED;
-        err = RegSetValueExA(newkey, "MRUList", 0, REG_SZ, 
+        err = RegSetValueExA(newkey, "MRUList", 0, REG_SZ,
                              mp->realMRU, strlen(mp->realMRU) + 1);
         if (err) {
@@ -565 +563 @@
             witem->itemFlag &= ~WMRUIF_CHANGED;
             realname[0] = 'a' + i;
-            err = RegSetValueExW(newkey, realname, 0, 
-                                 (mp->extview.dwFlags & MRUF_BINARY_LIST) ? 
+            err = RegSetValueExW(newkey, realname, 0,
+                                 (mp->extview.dwFlags & MRUF_BINARY_LIST) ?
                                  REG_BINARY : REG_SZ,
                                  &witem->datastart, witem->size);
@@ -611 +609 @@
 /**************************************************************************
  *                  FindMRUData [COMCTL32.169]
- * 
+ *
  * Searches binary list for item that matches lpData of length cbData.
  * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
@@ -646 +644 @@
     for(i=0; i<mp->cursize; i++) {
         if (mp->extview.dwFlags & MRUF_BINARY_LIST) {
-            if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart, 
+            if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart,
                                          cbData))
                 break;
@@ -679 +677 @@
         *lpRegNum = 'a' + i;
 
-    TRACE("(%08x, %p, %ld, %p) returning %d\n",
+    TRACE("(%p, %p, %ld, %p) returning %d\n",
            hList, lpData, cbData, lpRegNum, ret);
 
@@ -688 +686 @@
 /**************************************************************************
  *              AddMRUData [COMCTL32.167]
- * 
+ *
  * Add item to MRU binary list.  If item already exists in list then it is
  * simply moved up to the top of the list and not added again.  If list is
@@ -728 +726 @@
 
     /* Allocate space for new item and move in the data */
-    mp->array[replace] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(cbData + 
+    mp->array[replace] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(cbData +
                                                                sizeof(WINEMRUITEM));
     witem->itemFlag |= WMRUIF_CHANGED;
@@ -740 +738 @@
     }
     mp->realMRU[0] = replace + 'a';
-    TRACE("(%08x, %p, %ld) adding data, /%c/ now most current\n", 
+    TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n",
           hList, lpData, cbData, replace+'a');
     ret = replace;
@@ -754 +752 @@
 /**************************************************************************
  *              AddMRUStringW [COMCTL32.401]
- * 
+ *
  * Add item to MRU string list.  If item already exists in list them it is
  * simply moved up to the top of the list and not added again.  If list is
@@ -770 +768 @@
 AddMRUStringW(HANDLE hList, LPCWSTR lpszString)
 {
-    FIXME("(%08x, %s) empty stub!\n", hList, debugstr_w(lpszString));
+    FIXME("(%p, %s) empty stub!\n", hList, debugstr_w(lpszString));
 
     return 0;
@@ -781 +779 @@
 AddMRUStringA(HANDLE hList, LPCSTR lpszString)
 {
-    FIXME("(%08x, %s) empty stub!\n", hList, debugstr_a(lpszString));
+    FIXME("(%p, %s) empty stub!\n", hList, debugstr_a(lpszString));
 
     return 0;
@@ -801 +799 @@
 DelMRUString(HANDLE hList, INT nItemPos)
 {
-    FIXME("(%08x, %d): stub\n", hList, nItemPos);
+    FIXME("(%p, %d): stub\n", hList, nItemPos);
     return TRUE;
 }
@@ -817 +815 @@
 /**************************************************************************
  *                  FindMRUStringA [COMCTL32.155]
- * 
+ *
  * Searches string list for item that matches lpszString.
  * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
@@ -868 +866 @@
 
     /* open the sub key */
-    if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 
+    if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey,
                                 0,
                                 emptyW,
-                                REG_OPTION_NON_VOLATILE, 
+                                REG_OPTION_NON_VOLATILE,
                                 KEY_READ | KEY_WRITE,
                                 0,
@@ -887 +885 @@
     if (newkey) {
         datasize = mp->extview.nMaxItems + 1;
-        if((err=RegQueryValueExA( newkey, "MRUList", 0, &type, mp->realMRU, 
+        if((err=RegQueryValueExA( newkey, "MRUList", 0, &type, mp->realMRU,
                                   &datasize))) {
             /* not present - set size to 1 (will become 0 later) */
@@ -907 +905 @@
                 ERR("Key %s not found 1\n", debugstr_w(realname));
             }
-            mp->array[i] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(datasize + 
+            mp->array[i] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(datasize +
                                                                  sizeof(WINEMRUITEM));
             witem->size = datasize;
-            if(RegQueryValueExW( newkey, realname, 0, &type, 
+            if(RegQueryValueExW( newkey, realname, 0, &type,
                                  &witem->datastart, &datasize)) {
                 /* not present - what to do ??? */
@@ -949 +947 @@
     mp->isUnicode = TRUE;
 
-    return CreateMRUListLazy_common(mp);   
+    return CreateMRUListLazy_common(mp);
 }
 
@@ -1018 +1016 @@
  *    of list returns -1.
  *    If lpBuffer == NULL or nItemPos is -ve return value is no. of items in
- *    the list. 
+ *    the list.
  */
 INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer,
@@ -1033 +1031 @@
     TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired);
     witem = mp->array[desired];
-    datasize = min( witem->size, nBufferSize ); 
+    datasize = min( witem->size, nBufferSize );
     memcpy( lpBuffer, &witem->datastart, datasize);
-    TRACE("(%08x, %d, %p, %ld): returning len=%d\n", 
+    TRACE("(%p, %d, %p, %ld): returning len=%d\n",
           hList, nItemPos, lpBuffer, nBufferSize, datasize);
     return datasize;
@@ -1042 +1040 @@
 /**************************************************************************
  *                EnumMRUListA [COMCTL32.154]
- * 
+ *
  */
 INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer,
@@ -1059 +1057 @@
     witem = mp->array[desired];
     if(mp->extview.dwFlags & MRUF_BINARY_LIST) {
-        datasize = min( witem->size, nBufferSize ); 
+        datasize = min( witem->size, nBufferSize );
         memcpy( lpBuffer, &witem->datastart, datasize);
     } else {
@@ -1068 +1066 @@
                             lpBuffer, datasize, NULL, NULL);
     }
-    TRACE("(%08x, %d, %p, %ld): returning len=%d\n", 
+    TRACE("(%p, %d, %p, %ld): returning len=%d\n",
           hList, nItemPos, lpBuffer, nBufferSize, datasize);
     return datasize;
 }
-  
+
 
 /**************************************************************************
@@ -1128 +1126 @@
 {
     TRACE("(%p %p)\n", lppDest, lpSrc);
- 
+
     if (lpSrc) {
         LPSTR ptr = COMCTL32_ReAlloc (*lppDest, strlen (lpSrc) + 1);
@@ -1201 +1199 @@
 {
     TRACE("(%p %p)\n", lppDest, lpSrc);
- 
+
     if (lpSrc) {
         INT len = strlenW (lpSrc) + 1;
@@ -1373 +1371 @@
 
 /**************************************************************************
- * DSA_GetItem [COMCTL32.322] 
+ * DSA_GetItem [COMCTL32.322]
  *
  * PARAMS
@@ -1391 +1389 @@
 
     TRACE("(%p %d %p)\n", hdsa, nIndex, pDest);
-    
+
     if (!hdsa)
         return FALSE;
@@ -1405 +1403 @@
 
 /**************************************************************************
- * DSA_GetItemPtr [COMCTL32.323] 
+ * DSA_GetItemPtr [COMCTL32.323]
  *
  * Retrieves a pointer to the specified item.
@@ -1431 +1429 @@
 
     pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
-    
+
     TRACE("-- ret=%p\n", pSrc);
 
@@ -1439 +1437 @@
 
 /**************************************************************************
- * DSA_SetItem [COMCTL32.325] 
+ * DSA_SetItem [COMCTL32.325]
  *
  * Sets the contents of an item in the array.
@@ -1458 +1456 @@
     INT  nSize, nNewItems;
     LPVOID pDest, lpTemp;
-    
+
     TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
 
     if ((!hdsa) || nIndex < 0)
         return FALSE;
-      
+
     if (hdsa->nItemCount <= nIndex) {
         /* within the old array */
@@ -1483 +1481 @@
             hdsa->nItemCount = nIndex + 1;
             hdsa->pData = lpTemp;
-        }    
+        }
     }
 
@@ -1497 +1495 @@
 
 /**************************************************************************
- * DSA_InsertItem [COMCTL32.324] 
+ * DSA_InsertItem [COMCTL32.324]
  *
  * PARAMS
@@ -1514 +1512 @@
     INT   nNewItems, nSize;
     LPVOID  lpTemp, lpDest;
-    
+
     TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
 
@@ -1534 +1532 @@
 
         hdsa->nMaxCount = nNewItems;
-        hdsa->pData = lpTemp;         
+        hdsa->pData = lpTemp;
     }
 
@@ -1559 +1557 @@
 
 /**************************************************************************
- * DSA_DeleteItem [COMCTL32.326] 
+ * DSA_DeleteItem [COMCTL32.326]
  *
  * PARAMS
@@ -1575 +1573 @@
     LPVOID lpDest,lpSrc;
     INT  nSize;
-    
+
     TRACE("(%p %d)\n", hdsa, nIndex);
 
@@ -1592 +1590 @@
         memmove (lpDest, lpSrc, nSize);
     }
-    
+
     hdsa->nItemCount--;
-    
+
     /* free memory ? */
     if ((hdsa->nMaxCount - hdsa->nItemCount) >= hdsa->nGrow) {
@@ -1629 +1627 @@
     TRACE("(%p)\n", hdsa);
 
-    if (!hdsa) 
+    if (!hdsa)
         return FALSE;
     if (hdsa->pData && (!COMCTL32_Free (hdsa->pData)))
@@ -1855 +1853 @@
     INT i;
 
-    if (!hdpa->ptrs)
+    if (!hdpa || !hdpa->ptrs)
         return -1;
 
@@ -1885 +1883 @@
 DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p)
 {
-    INT   nNewItems, nSize, nIndex = 0;
-    LPVOID  *lpTemp, *lpDest;
-
     TRACE("(%p %d %p)\n", hdpa, i, p);
 
-    if ((!hdpa) || (i < 0))
-        return -1;
-
-    if (!hdpa->ptrs) {
-        hdpa->ptrs =
-            (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                                2 * hdpa->nGrow * sizeof(LPVOID));
-        if (!hdpa->ptrs)
-            return -1;
-        hdpa->nMaxCount = hdpa->nGrow * 2;
-        nIndex = 0;
-    }
-    else {
-        if (hdpa->nItemCount >= hdpa->nMaxCount) {
-            TRACE("-- resizing\n");
-            nNewItems = hdpa->nMaxCount + hdpa->nGrow;
-            nSize = nNewItems * sizeof(LPVOID);
-
-            lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                                           hdpa->ptrs, nSize);
-            if (!lpTemp)
-                return -1;
-            hdpa->nMaxCount = nNewItems;
-            hdpa->ptrs = lpTemp;
-        }
-
-        if (i >= hdpa->nItemCount) {
-            nIndex = hdpa->nItemCount;
-            TRACE("-- appending at %d\n", nIndex);
-        }
-        else {
-            TRACE("-- inserting at %d\n", i);
-            lpTemp = hdpa->ptrs + i;
-            lpDest = lpTemp + 1;
-            nSize  = (hdpa->nItemCount - i) * sizeof(LPVOID);
-            TRACE("-- move dest=%p src=%p size=%x\n",
-                   lpDest, lpTemp, nSize);
-            memmove (lpDest, lpTemp, nSize);
-            nIndex = i;
-        }
-    }
-
-    /* insert item */
-    hdpa->nItemCount++;
-    hdpa->ptrs[nIndex] = p;
-
-    return nIndex;
-}
-
+    if (!hdpa || i < 0) return -1;
+
+    if (i >= 0x7fff)
+        i = hdpa->nItemCount;
+
+    if (i >= hdpa->nItemCount)
+        return DPA_SetPtr(hdpa, i, p) ? i : -1;
+
+    /* create empty spot at the end */
+    if (!DPA_SetPtr(hdpa, hdpa->nItemCount, 0)) return -1;
+    memmove (hdpa->ptrs + i + 1, hdpa->ptrs + i, (hdpa->nItemCount - i - 1) * sizeof(LPVOID));
+    hdpa->ptrs[i] = p;
+    return i;
+}
 
 /**************************************************************************
@@ -1959 +1919 @@
 {
     LPVOID *lpTemp;
-    
+
     TRACE("(%p %d %p)\n", hdpa, i, p);
 
-    if ((!hdpa) || i < 0)
+    if (!hdpa || i < 0 || i > 0x7fff)
         return FALSE;
-      
+
     if (hdpa->nItemCount <= i) {
         /* within the old array */
-        if (hdpa->nMaxCount > i) {
-            /* within the allocated space, set a new boundary */
-            hdpa->nItemCount = i+1;
-        }
-        else {
+        if (hdpa->nMaxCount <= i) {
             /* resize the block of memory */
             INT nNewItems =
@@ -1977 +1933 @@
             INT nSize = nNewItems * sizeof(LPVOID);
 
-            lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                                           hdpa->ptrs, nSize);
+            if (hdpa->ptrs)
+                lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize);
+            else
+                lpTemp = (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, nSize);
+            
             if (!lpTemp)
                 return FALSE;
 
-            hdpa->nItemCount = nNewItems;
-            hdpa->ptrs = lpTemp;        
-        }    
+            hdpa->nMaxCount = nNewItems;
+            hdpa->ptrs = lpTemp;
+        }
+        hdpa->nItemCount = i+1;
     }
 
@@ -2013 +1973 @@
     LPVOID *lpDest, *lpSrc, lpTemp = NULL;
     INT  nSize;
-    
+
     TRACE("(%p %d)\n", hdpa, i);
 
@@ -2030 +1990 @@
         memmove (lpDest, lpSrc, nSize);
     }
-    
+
     hdpa->nItemCount --;
-    
+
     /* free memory ?*/
     if ((hdpa->nMaxCount - hdpa->nItemCount) >= hdpa->nGrow) {
@@ -2043 +2003 @@
 
         hdpa->nMaxCount = nNewItems;
-        hdpa->ptrs = (LPVOID*)lpDest;         
+        hdpa->ptrs = (LPVOID*)lpDest;
     }
 
@@ -2068 +2028 @@
     TRACE("(%p)\n", hdpa);
 
-    if (!hdpa) 
+    if (!hdpa)
         return FALSE;
 
@@ -2107 +2067 @@
 
     TRACE("l=%i r=%i\n", l, r);
- 
+
     if (l==r)    /* one element is always sorted */
         return;
@@ -2120 +2080 @@
 
     /* join the two sides */
-    while( (l<=m) && (m<r) ) 
+    while( (l<=m) && (m<r) )
     {
         if(pfnCompare(lpPtrs[l],lpPtrs[m+1],lParam)>0)
@@ -2238 +2198 @@
 
         TRACE("linear search\n");
-        
+
         nIndex = (nStart == -1)? 0 : nStart;
         lpPtr = hdpa->ptrs;
@@ -2273 +2233 @@
     HDPA hdpa;
 
-    TRACE("(%d 0x%x)\n", nGrow, hHeap);
+    TRACE("(%d %p)\n", nGrow, hHeap);
 
     if (hHeap)
@@ -2321 +2281 @@
     UINT idFrom = 0;
 
-    TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
+    TRACE("(%p %p %d %p 0x%08lx)\n",
            lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
            lpNotify->dwParam5);
@@ -2328 +2288 @@
         return 0;
 
-    if (lpNotify->hwndFrom == -1) {
+    if (lpNotify->hwndFrom == (HWND)-1) {
         lpNmh = lpHdr;
         idFrom = lpHdr->idFrom;
@@ -2374 +2334 @@
     NOTIFYDATA notify;
 
-    TRACE("(0x%04x 0x%04x %d %p)\n",
+    TRACE("(%p %p %d %p)\n",
            hwndTo, hwndFrom, uCode, lpHdr);
 
@@ -2408 +2368 @@
     HWND hwndNotify;
 
-    TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
+    TRACE("(%p %p %d %p 0x%08lx)\n",
            hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
 
@@ -2491 +2451 @@
 COMCTL32_StrToIntW (LPWSTR lpString)
 {
-    return _wtoi(lpString);
+    return atoiW(lpString);
 }
 
@@ -2503 +2463 @@
  *     hdpa     [I] handle to the dynamic pointer array
  *     enumProc [I]
- *     lParam   [I] 
+ *     lParam   [I]
  *
  * RETURNS
@@ -2684 +2644 @@
         if (dbcs && lpStart[1] != HIBYTE(wMatch)) continue;
         lpGotIt = lpStart;
-    }    
+    }
     return (LPSTR)lpGotIt;
 }
@@ -2738 +2698 @@
     if( strchrW(lpSet, *(WORD*)lpLoop))
       return (INT)(lpLoop-lpStr);
-  
+
   return (INT)(lpLoop-lpStr);
 }
@@ -2751 +2711 @@
 BOOL WINAPI COMCTL32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
 
-   FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+   FIXME("(%p, %lx, %lx, %lx): stub!\n", hw, b, c, d);
 
    return TRUE;
@@ -2765 +2725 @@
 BOOL WINAPI COMCTL32_411( HWND hw, DWORD b, DWORD c) {
 
-   FIXME("(%x, %lx, %lx): stub!\n", hw, b, c);
+   FIXME("(%p, %lx, %lx): stub!\n", hw, b, c);
 
    return TRUE;
@@ -2779 +2739 @@
 BOOL WINAPI COMCTL32_412( HWND hwnd, DWORD b, DWORD c)
 {
-    FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c);
+    FIXME("(%p, %lx, %lx): stub!\n", hwnd, b, c);
 
     if (IsWindow (hwnd) == FALSE)
@@ -2800 +2760 @@
 BOOL WINAPI COMCTL32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
 
-   FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+   FIXME("(%p, %lx, %lx, %lx): stub!\n", hw, b, c, d);
 
    return TRUE;
@@ -2816 +2776 @@
 {
 
-   FIXME("(%x, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
+   FIXME("(%p, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
 
    return TRUE;
@@ -2822 +2782 @@
 
 /**************************************************************************
+ * @ [COMCTL32.417]
+ *
+ */
+BOOL WINAPI COMCTL32_417(HDC hdc, INT x, INT y, UINT flags, const RECT *lprect,
+                         LPCWSTR str, UINT count, const INT *lpDx)
+{
+    return ExtTextOutW(hdc, x, y, flags, lprect, str, count, lpDx);
+}
+
+/**************************************************************************
  * @ [COMCTL32.419]
  *

trunk/src/comctl32/commctrl.c

@@ -1 @@
-/*              
+/*
  * Common controls functions
  *
@@ -18 +18 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTES
+ * 
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Oct. 21, 2002, by Christian Neumair.
+ *
+ * Unless otherwise noted, we belive this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ *
+ * TODO
+ *   -- implement GetMUILanguage + InitMUILanguage
+ *   -- LibMain => DLLMain ("DLLMain takes over the functionality of both the
+ *                           LibMain and the WEP function.", MSDN)
+ *   -- finish NOTES for MenuHelp, GetEffectiveClientRect and GetStatusTextW
+ *   -- FIXMEs + BUGS (search for them)
+ *
+ * Control Classes
+ *   -- ICC_ANIMATE_CLASS
+ *   -- ICC_BAR_CLASSES
+ *   -- ICC_COOL_CLASSES
+ *   -- ICC_DATE_CLASSES
+ *   -- ICC_HOTKEY_CLASS
+ *   -- ICC_INTERNET_CLASSES
+ *   -- ICC_LINK_CLASS (not yet implemented)
+ *   -- ICC_LISTVIEW_CLASSES
+ *   -- ICC_NATIVEFNTCTL_CLASS
+ *   -- ICC_PAGESCROLLER_CLASS
+ *   -- ICC_PROGRESS_CLASS
+ *   -- ICC_STANDARD_CLASSES (not yet implemented)
+ *   -- ICC_TAB_CLASSES
+ *   -- ICC_TREEVIEW_CLASSES
+ *   -- ICC_UPDOWN_CLASS
+ *   -- ICC_USEREX_CLASSES
+ *   -- ICC_WIN95_CLASSES
  */
 
@@ -108 +143 @@
 COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
@@ -116 +151 @@
             /* create private heap */
             COMCTL32_hHeap = HeapCreate (0, 0x10000, 0);
-            TRACE("Heap created: 0x%x\n", COMCTL32_hHeap);
+            TRACE("Heap created: %p\n", COMCTL32_hHeap);
 
             /* add global subclassing atom (used by 'tooltip' and 'updown') */
@@ -181 +216 @@
             /* destroy private heap */
             HeapDestroy (COMCTL32_hHeap);
-            TRACE("Heap destroyed: 0x%x\n", COMCTL32_hHeap);
+            TRACE("Heap destroyed: %p\n", COMCTL32_hHeap);
             COMCTL32_hHeap = (HANDLE)NULL;
             break;
@@ -219 +254 @@
 VOID WINAPI
 MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
-          HINSTANCE hInst, HWND hwndStatus, LPUINT lpwIDs)
+          HINSTANCE hInst, HWND hwndStatus, UINT* lpwIDs)
 {
     UINT uMenuID = 0;
@@ -275 +310 @@
 
 /***********************************************************************
- * ShowHideMenuCtl [COMCTL32.3] 
+ * ShowHideMenuCtl [COMCTL32.3]
  *
  * Shows or hides controls and updates the corresponding menu item.
@@ -309 +344 @@
     LPINT lpMenuId;
 
-    TRACE("%x, %x, %p\n", hwnd, uFlags, lpInfo);
+    TRACE("%p, %x, %p\n", hwnd, uFlags, lpInfo);
 
     if (lpInfo == NULL)
@@ -322 +357 @@
         lpMenuId += 2;
 
-    if (GetMenuState (lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
+    if (GetMenuState ((HMENU)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
         /* uncheck menu item */
-        CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
+        CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
 
         /* hide control */
@@ -333 +368 @@
     else {
         /* check menu item */
-        CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
+        CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
 
         /* show control */
@@ -361 +396 @@
  *
  *     lpInfo
- *     (will be written...)
+ *     (will be written ...)
  */
 
@@ -395 +430 @@
 
 /***********************************************************************
- * DrawStatusTextW [COMCTL32.28]
+ * DrawStatusTextW [COMCTL32.@]
  *
  * Draws text with borders, like in a status bar.
@@ -439 +474 @@
         r.left += 3;
         if (style & SBT_RTLREADING)
-            FIXME("Usupported RTL style!");
+            FIXME("Unsupported RTL style!\n");
         DrawTextW (hdc, text, -1, &r, align|DT_VCENTER|DT_SINGLELINE);
         SetBkMode(hdc, oldbkmode);
@@ -447 +482 @@
 
 /***********************************************************************
- * DrawStatusText  [COMCTL32.27]
+ * DrawStatusText  [COMCTL32.@]
  * DrawStatusTextA [COMCTL32.5]
  *
@@ -479 +514 @@
 
 /***********************************************************************
- * CreateStatusWindow  [COMCTL32.21]
+ * CreateStatusWindow  [COMCTL32.@]
  * CreateStatusWindowA [COMCTL32.6]
  *
@@ -498 +533 @@
 CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
 {
-    return CreateWindowA(STATUSCLASSNAMEA, text, style, 
+    return CreateWindowA(STATUSCLASSNAMEA, text, style,
                            CW_USEDEFAULT, CW_USEDEFAULT,
-                           CW_USEDEFAULT, CW_USEDEFAULT, 
-                           parent, wid, 0, 0);
-}
-
-
-/***********************************************************************
- * CreateStatusWindowW [COMCTL32.22] Creates a status bar control
+                           CW_USEDEFAULT, CW_USEDEFAULT,
+                           parent, (HMENU)wid, 0, 0);
+}
+
+
+/***********************************************************************
+ * CreateStatusWindowW [COMCTL32.@] Creates a status bar control
  *
  * PARAMS
@@ -525 +560 @@
                            CW_USEDEFAULT, CW_USEDEFAULT,
                            CW_USEDEFAULT, CW_USEDEFAULT,
-                           parent, wid, 0, 0);
+                           parent, (HMENU)wid, 0, 0);
 }
 
@@ -558 +593 @@
     HWND hUD =
         CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
-                         parent, id, inst, 0);
+                         parent, (HMENU)id, inst, 0);
     if (hUD) {
-        SendMessageA (hUD, UDM_SETBUDDY, buddy, 0);
+        SendMessageA (hUD, UDM_SETBUDDY, (WPARAM)buddy, 0);
         SendMessageA (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal));
-        SendMessageA (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));     
+        SendMessageA (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));
     }
 
@@ -593 +628 @@
 
 /***********************************************************************
- * InitCommonControlsEx [COMCTL32.84]
+ * InitCommonControlsEx [COMCTL32.@]
  *
  * Registers the common controls.
@@ -607 +642 @@
  *     Only the additional common controls are registered by this function.
  *     The Win95 controls are registered at the DLL's initialization.
+ *
+ * FIXME
+ *     implement the following control classes:
+ *       ICC_LINK_CLASS
+ *       ICC_STANDARD_CLASSES
  */
 
@@ -676 +716 @@
 
 /***********************************************************************
- * CreateToolbarEx [COMCTL32.23] Creates a tool bar window
+ * CreateToolbarEx [COMCTL32.@] Creates a tool bar window
  *
  * PARAMS
@@ -897 +937 @@
 
 /***********************************************************************
- * DllGetVersion [COMCTL32.25]
+ * DllGetVersion [COMCTL32.@]
  *
  * Retrieves version information of the 'COMCTL32.DLL'
@@ -933 +973 @@
 
 /***********************************************************************
- *              DllInstall (COMCTL32.26)
+ *              DllInstall (COMCTL32.@)
  */
 HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
-  FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", 
+  FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE",
         debugstr_w(cmdline));
 
@@ -944 +984 @@
 
 /***********************************************************************
- * _TrackMouseEvent [COMCTL32.91]
+ * _TrackMouseEvent [COMCTL32.@]
  *
  * Requests notification of mouse events
@@ -974 +1014 @@
 
 /*************************************************************************
- * GetMUILanguage [COMCTL32.39]
- *
- * FIXME: What's this supposed to do?  Apparently some i18n thing.
+ * GetMUILanguage [COMCTL32.@]
+ *
+ * FIXME: "Returns the language currently in use by the common controls
+ * for a particular process." (MSDN)
  *
  */
@@ -986 +1027 @@
 
 /*************************************************************************
- * InitMUILanguage [COMCTL32.85]
- *
- * FIXME: What's this supposed to do?  Apparently some i18n thing.
+ * InitMUILanguage [COMCTL32.@]
+ *
+ * FIXME: "Enables an application to specify a language to be used with
+ * the common controls that is different than the system language." (MSDN)
  *
  */
@@ -995 +1037 @@
 {
    COMCTL32_uiLang = uiLang;
+}
+
+
+/***********************************************************************
+ * SetWindowSubclass [COMCTL32.@]
+ *
+ * Starts a window subclass
+ *
+ * PARAMS
+ *     hWnd [in] handle to window subclass.
+ *     pfnSubclass [in] Pointer to new window procedure.
+ *     uIDSubclass [in] Unique identifier of sublass together with pfnSubclass.
+ *     dwRef [in] Reference data to pass to window procedure.
+ *
+ * RETURNS
+ *     Success: non-zero
+ *     Failure: zero
+ *
+ * BUGS
+ *     If an application manually subclasses a window after subclassing it with
+ *     this API and then with this API again, then none of the previous 
+ *     subclasses get called or the origional window procedure.
+ */
+
+BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
+                        UINT_PTR uIDSubclass, DWORD_PTR dwRef)
+{
+   LPSUBCLASS_INFO stack;
+   int newnum, n;
+
+   TRACE ("(%p, %p, %x, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
+
+   /* Since the window procedure that we set here has two additional arguments,
+    * we can't simply set it as the new window procedure of the window. So we
+    * set our own window procedure and then calculate the other two arguments
+    * from there. */
+
+   /* See if we have been called for this window */
+   stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
+   if (!stack) {
+      /* allocate stack */
+      stack = (LPSUBCLASS_INFO)HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY,
+                                         sizeof(SUBCLASS_INFO));
+      if (!stack) {
+         ERR ("Failed to allocate our Subclassing stack");
+         return FALSE;
+      }
+      SetPropA (hWnd, COMCTL32_aSubclass, (HANDLE)stack);
+
+      /* set window procedure to our own and save the current one */
+      if (IsWindowUnicode (hWnd))
+         stack->origproc = (WNDPROC)SetWindowLongW (hWnd, GWL_WNDPROC,
+                                                   (LONG)DefSubclassProc);
+      else
+         stack->origproc = (WNDPROC)SetWindowLongA (hWnd, GWL_WNDPROC,
+                                                   (LONG)DefSubclassProc);
+   } else {
+      WNDPROC current;
+      if (IsWindowUnicode (hWnd))
+         current = (WNDPROC)GetWindowLongW (hWnd, GWL_WNDPROC);
+      else
+         current = (WNDPROC)GetWindowLongA (hWnd, GWL_WNDPROC);
+
+      if (current != DefSubclassProc) {
+         ERR ("Application has subclassed with our procedure, then manually, then with us again.  The current implementation can't handle this.\n");
+         return FALSE;
+      }
+   }
+
+   /* Check to see if we have called this function with the same uIDSubClass
+    * and pfnSubclass */
+   for (n = 0; n <= stack->stacknum + stack->stacknew - 1; n++)
+      if ((stack->SubclassProcs[n].id == uIDSubclass) && 
+         (stack->SubclassProcs[n].subproc == pfnSubclass)) {
+         stack->SubclassProcs[n].ref = dwRef;
+         return TRUE;
+      }
+
+   if ((stack->stacknum + stack->stacknew) >= 32) {
+      ERR ("We have a Subclass stack overflow, please increment size");
+      return FALSE;
+   }
+
+   /* we can't simply increment both stackpos and stacknum because there might
+    * be a window procedure running lower in the stack, we can only get them
+    * up to date once the last window procedure has run */
+   if (stack->stacknum == stack->stackpos) {
+      stack->stacknum++;
+      stack->stackpos++;
+   } else
+      stack->stacknew++;
+
+   newnum = stack->stacknew + stack->stacknum - 1;
+
+   stack->SubclassProcs[newnum].subproc = pfnSubclass;
+   stack->SubclassProcs[newnum].ref = dwRef;
+   stack->SubclassProcs[newnum].id = uIDSubclass;
+   
+   return TRUE;
+}
+
+
+/***********************************************************************
+ * GetWindowSubclass [COMCTL32.@]
+ *
+ * Gets the Reference data from a subclass.
+ *
+ * PARAMS
+ *     hWnd [in] Handle to window which were subclassing
+ *     pfnSubclass [in] Pointer to the subclass procedure
+ *     iID [in] Unique indentifier of the subclassing procedure
+ *     pdwRef [out] Pointer to the reference data
+ *
+ * RETURNS
+ *     Success: non-sero
+ *     Failure: zero
+ */
+
+BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
+                              UINT_PTR uID, DWORD_PTR *pdwRef)
+{
+   LPSUBCLASS_INFO stack;
+   int n;
+
+   TRACE ("(%p, %p, %x, %p)\n", hWnd, pfnSubclass, uID, pdwRef);
+
+   /* See if we have been called for this window */
+   stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
+   if (!stack)
+      return FALSE;
+
+   for (n = 0; n <= stack->stacknum + stack->stacknew - 1; n++)
+      if ((stack->SubclassProcs[n].id == uID) &&
+         (stack->SubclassProcs[n].subproc == pfnSubclass)) {
+         *pdwRef = stack->SubclassProcs[n].ref;
+         return TRUE;
+      }
+
+   return FALSE;
+}
+
+
+/***********************************************************************
+ * RemoveWindowSubclass [COMCTL32.@]
+ *
+ * Removes a window subclass.
+ *
+ * PARAMS
+ *     hWnd [in] Handle to the window were subclassing
+ *     pfnSubclass [in] Pointer to the subclass procedure
+ *     uID [in] Unique identifier of this subclass
+ *
+ * RETURNS
+ *     Success: non-zero
+ *     Failure: zero
+ */
+
+BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR uID)
+{
+   LPSUBCLASS_INFO stack;
+   int n;
+
+   TRACE ("(%p, %p, %x)\n", hWnd, pfnSubclass, uID);
+
+   /* Find the Subclass to remove */
+   stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
+   if (!stack)
+      return FALSE;
+
+   if ((stack->stacknum == stack->stackpos == 1) && !stack->stacknew) {
+      TRACE("Last Subclass removed, cleaning up\n");
+      /* clean up our heap and reset the origional window procedure */
+      if (IsWindowUnicode (hWnd))
+         SetWindowLongW (hWnd, GWL_WNDPROC, (LONG)stack->origproc);
+      else
+         SetWindowLongA (hWnd, GWL_WNDPROC, (LONG)stack->origproc);
+      HeapFree (GetProcessHeap (), 0, stack);
+      RemovePropA( hWnd, COMCTL32_aSubclass );
+      return TRUE;
+   }
+ 
+   for (n = stack->stacknum + stack->stacknew - 1; n >= 0; n--)
+      if ((stack->SubclassProcs[n].id == uID) &&
+         (stack->SubclassProcs[n].subproc == pfnSubclass)) {
+         if (n != (stack->stacknum + stack->stacknew))
+            /* Fill the hole in the stack */
+            memmove (&stack->SubclassProcs[n], &stack->SubclassProcs[n + 1],
+                    sizeof(stack->SubclassProcs[0]) * (stack->stacknew + stack->stacknum - n));
+         stack->SubclassProcs[n].subproc = NULL;
+         stack->SubclassProcs[n].ref = 0;
+         stack->SubclassProcs[n].id = 0;
+
+         /* If we are currently running a window procedure we have to manipulate
+          * the stack position pointers so that we don't corrupt the stack */
+         if ((n < stack->stackpos) || (stack->stackpos == stack->stacknum)) {
+            stack->stacknum--;
+            stack->stackpos--;
+         } else if (n >= stack->stackpos)
+            stack->stacknew--;
+         return TRUE;
+      }
+
+   return FALSE;
+}
+
+
+/***********************************************************************
+ * DefSubclassProc [COMCTL32.@]
+ *
+ * Calls the next window procedure (ie. the one before this subclass)
+ *
+ * PARAMS
+ *     hWnd [in] The window that we're subclassing
+ *     uMsg [in] Message
+ *     wParam [in] WPARAM
+ *     lParam [in] LPARAM
+ *
+ * RETURNS
+ *     Success: non-zero
+ *     Failure: zero
+ */
+
+LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+   LPSUBCLASS_INFO stack;
+   int stackpos;
+   LRESULT ret;
+
+   /* retrieve our little stack from the Properties */
+   stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
+   if (!stack) {
+      ERR ("Our sub classing stack got erased for %p!! Nothing we can do\n", hWnd);
+      return 0;
+   }
+
+   /* If we are at pos 0 then we have to call the origional window procedure */
+   if (stack->stackpos == 0) {
+      if (IsWindowUnicode (hWnd))
+         return CallWindowProcW (stack->origproc, hWnd, uMsg, wParam, lParam);
+      else
+         return CallWindowProcA (stack->origproc, hWnd, uMsg, wParam, lParam);
+   }
+
+   stackpos = --stack->stackpos;
+   /* call the Subclass procedure from the stack */
+   ret = stack->SubclassProcs[stackpos].subproc (hWnd, uMsg, wParam, lParam,
+         stack->SubclassProcs[stackpos].id, stack->SubclassProcs[stackpos].ref);
+   stack->stackpos++;
+
+   if ((stack->stackpos == stack->stacknum) && stack->stacknew) {
+      stack->stacknum += stack->stacknew;
+      stack->stackpos += stack->stacknew;
+      stack->stacknew = 0;
+   }
+
+   /* If we removed the last entry in our stack while a window procedure was
+    * running then we have to clean up */
+   if (stack->stackpos == stack->stacknum == 0) {
+      TRACE("Last Subclass removed, cleaning up\n");
+      /* clean up our heap and reset the origional window procedure */
+      if (IsWindowUnicode (hWnd))
+         SetWindowLongW (hWnd, GWL_WNDPROC, (LONG)stack->origproc);
+      else
+         SetWindowLongA (hWnd, GWL_WNDPROC, (LONG)stack->origproc);
+      HeapFree (GetProcessHeap (), 0, stack);
+      RemovePropA( hWnd, COMCTL32_aSubclass );
+      return TRUE;
+   }
+
+   return ret;
 }
 
@@ -1011 +1323 @@
  *     Failure: NULL
  */
+
 HWND
 COMCTL32_CreateToolTip(HWND hwndOwner)
@@ -1053 +1366 @@
  *     none
  */
+
 VOID
 COMCTL32_RefreshSysColors(void)

trunk/src/comctl32/flatsb.c

@@ -47 +47 @@
 
 /***********************************************************************
- *              InitializeFlatSB (COMCTL32.86)
+ *              InitializeFlatSB (COMCTL32.@)
  *
  *      returns nonzero if successful, zero otherwise
@@ -54 +54 @@
 BOOL WINAPI InitializeFlatSB(HWND hwnd)
 {
-    TRACE("[%04x]\n", hwnd);
+    TRACE("[%p]\n", hwnd);
     FIXME("stub\n");
     return FALSE;
@@ -60 +60 @@
 
 /***********************************************************************
- *              UninitializeFlatSB (COMCTL32.90)
+ *              UninitializeFlatSB (COMCTL32.@)
  *
  *      returns:
@@ -70 +70 @@
 HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
 {
-    TRACE("[%04x]\n", hwnd);
+    TRACE("[%p]\n", hwnd);
     FIXME("stub\n");
     return S_FALSE;
@@ -76 +76 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollProp (COMCTL32.32)
+ *              FlatSB_GetScrollProp (COMCTL32.@)
  *
  *      Returns nonzero if successful, or zero otherwise. If index is WSB_PROP_HSTYLE,
  *      the return is nonzero if InitializeFlatSB has been called for this window, or
- *      zero otherwise. 
- *
- */
-BOOL WINAPI 
+ *      zero otherwise.
+ *
+ */
+BOOL WINAPI
 FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
 {
-    TRACE("[%04x] propIndex=%d\n", hwnd, propIndex);
+    TRACE("[%p] propIndex=%d\n", hwnd, propIndex);
     FIXME("stub\n");
     return FALSE;
@@ -92 +92 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollProp (COMCTL32.36)
- */
-BOOL WINAPI 
+ *              FlatSB_SetScrollProp (COMCTL32.@)
+ */
+BOOL WINAPI
 FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
 {
-    TRACE("[%04x] index=%u newValue=%d flag=%d\n", hwnd, index, newValue, flag);
+    TRACE("[%p] index=%u newValue=%d flag=%d\n", hwnd, index, newValue, flag);
     FIXME("stub\n");
     return FALSE;
@@ -110 +110 @@
  *
  *      So, if we just call the standard functions until we implement
- *      the flat scroll bar functions, flat scroll bars will show up and 
+ *      the flat scroll bar functions, flat scroll bars will show up and
  *      behave properly, as though they had simply not been setup to
  *      have flat properties.
@@ -119 +119 @@
 
 /***********************************************************************
- *              FlatSB_EnableScrollBar (COMCTL32.29)
- */
-BOOL WINAPI 
+ *              FlatSB_EnableScrollBar (COMCTL32.@)
+ */
+BOOL WINAPI
 FlatSB_EnableScrollBar(HWND hwnd, int nBar, UINT flags)
 {
@@ -128 +128 @@
 
 /***********************************************************************
- *              FlatSB_ShowScrollBar (COMCTL32.38)
- */
-BOOL WINAPI 
+ *              FlatSB_ShowScrollBar (COMCTL32.@)
+ */
+BOOL WINAPI
 FlatSB_ShowScrollBar(HWND hwnd, int nBar, BOOL fShow)
 {
@@ -137 +137 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollRange (COMCTL32.33)
- */
-BOOL WINAPI 
+ *              FlatSB_GetScrollRange (COMCTL32.@)
+ */
+BOOL WINAPI
 FlatSB_GetScrollRange(HWND hwnd, int nBar, LPINT min, LPINT max)
 {
@@ -146 +146 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollInfo (COMCTL32.30)
- */
-BOOL WINAPI 
+ *              FlatSB_GetScrollInfo (COMCTL32.@)
+ */
+BOOL WINAPI
 FlatSB_GetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info)
 {
@@ -155 +155 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollPos (COMCTL32.31)
- */
-INT WINAPI 
+ *              FlatSB_GetScrollPos (COMCTL32.@)
+ */
+INT WINAPI
 FlatSB_GetScrollPos(HWND hwnd, int nBar)
 {
@@ -164 +164 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollPos (COMCTL32.35)
- */
-INT WINAPI 
+ *              FlatSB_SetScrollPos (COMCTL32.@)
+ */
+INT WINAPI
 FlatSB_SetScrollPos(HWND hwnd, int nBar, INT pos, BOOL bRedraw)
 {
@@ -173 +173 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollInfo (COMCTL32.34)
- */
-INT WINAPI 
+ *              FlatSB_SetScrollInfo (COMCTL32.@)
+ */
+INT WINAPI
 FlatSB_SetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info, BOOL bRedraw)
 {
@@ -182 +182 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollRange (COMCTL32.37)
- */
-INT WINAPI 
+ *              FlatSB_SetScrollRange (COMCTL32.@)
+ */
+INT WINAPI
 FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)
 {
@@ -194 +194 @@
 FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("[%04x] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
+    TRACE("[%p] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
     return 0;
 }
@@ -202 +202 @@
 FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("[%04x] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
+    TRACE("[%p] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
     return 0;
 }
@@ -212 +212 @@
     if (!FlatSB_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
         return DefWindowProcA( hwnd, uMsg, wParam, lParam );
-    
+
     switch (uMsg)
     {
@@ -222 +222 @@
 
         default:
-            if (uMsg >= WM_USER)
+            if ((uMsg >= WM_USER) && (uMsg < WM_APP))
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",
                     uMsg, wParam, lParam);
@@ -244 +244 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = FLATSB_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -254 +254 @@
     UnregisterClassA (FLATSB_CLASSA, (HINSTANCE)NULL);
 }
-

trunk/src/comctl32/imagelist.c

@@ -3 +3 @@
  *
  *  Copyright 1998 Eric Kohl
- *            2000 Jason Mawdsley.
- *            2001 Michael Stefaniuc
- *            2001 Charles Loep for CodeWeavers
+ *  Copyright 2000 Jason Mawdsley
+ *  Copyright 2001 Michael Stefaniuc
+ *  Copyright 2001 Charles Loep for CodeWeavers
+ *  Copyright 2002 Dimitrie O. Paun
  *
  * This library is free software; you can redistribute it and/or
@@ -21 +22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ * NOTE
+ * 
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Sep. 12, 2002, by Dimitrie O. Paun.
+ * 
+ * Unless otherwise noted, we belive this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ * 
  *  TODO:
- *    - Fix ImageList_DrawIndirect (xBitmap, yBitmap, rgbFg, rgbBk, dwRop).
- *    - Fix ImageList_GetIcon.
- *    - Fix ImageList_SetFilter (undocumented).
- *      BTW does anybody know anything about this function???
- *        - It removes 12 Bytes from the stack (3 Parameters).
- *        - First parameter SHOULD be a HIMAGELIST.
- *        - Second parameter COULD be an index?????
- *        - Third parameter.... ?????????????????????
- *
- *  Comments:
- *    - ImageList_Draw, ImageList_DrawEx and ImageList_GetIcon use
- *      ImageList_DrawIndirect. Since ImageList_DrawIndirect is still
- *      partially implemented, the functions mentioned above will be 
- *      limited in functionality too.
- *
+ *    - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE
+ *    - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE, ILS_ALPHA
+ *
+ *  FIXME:
  *    - Hotspot handling still not correct. The Hotspot passed to BeginDrag
  *      is the offset of the image position relative to the actual mouse pointer
@@ -81 +80 @@
 
 /*************************************************************************
- * IMAGELIST_InternalExpandBitmaps [Internal] 
+ * IMAGELIST_InternalExpandBitmaps [Internal]
  *
  * Expands the bitmaps of an image list by the given number of images.
@@ -95 +94 @@
  *     This function can NOT be used to reduce the number of images.
  */
-static VOID
+static void
 IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy)
 {
@@ -128 +127 @@
 
     if (himl->hbmMask) {
-        hbmNewBitmap = 
+        hbmNewBitmap =
             CreateBitmap (nNewWidth, cy, 1, 1, NULL);
 
@@ -150 +149 @@
 
 /*************************************************************************
- * IMAGELIST_InternalDraw [Internal] 
- *
- * Draws the image in the ImageList (without the mask)
- *
- * PARAMS
- *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
- *     cx            [I] the width of the image to display
- *     cy............[I] the height of the image to display
- *
- * RETURNS
- *     nothing
- *
- * NOTES
- *     This function is used by ImageList_DrawIndirect, when it is 
- *     required to draw only the Image (without the mask) to the screen.
- *
- *     Blending and Overlays styles are accomplished by another function
- */
-static VOID
-IMAGELIST_InternalDraw(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
-{
-    HDC hImageDC;
-    HBITMAP hOldBitmap;
-
-    hImageDC = CreateCompatibleDC(0);
-    hOldBitmap = SelectObject(hImageDC, pimldp->himl->hbmImage);
-    BitBlt(pimldp->hdcDst, 
-        pimldp->x, pimldp->y, cx, cy,
-        hImageDC, 
-        pimldp->himl->cx * pimldp->i, 0, 
-        SRCCOPY);
-
-    SelectObject(hImageDC, hOldBitmap);
-    DeleteDC(hImageDC);
-}
-
-
-/*************************************************************************
- * IMAGELIST_InternalDrawMask [Internal] 
- *
- * Draws the image in the ImageList with the mask
- *
- * PARAMS
- *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
- *     cx            [I] the width of the image to display
- *     cy............[I] the height of the image to display
- *
- * RETURNS
- *     nothing
- *
- * NOTES
- *     This function is used by ImageList_DrawIndirect, when it is 
- *     required to draw the Image with the mask to the screen.
- *
- *     Blending and Overlays styles are accomplished by another function.
- */
-static VOID
-IMAGELIST_InternalDrawMask(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
-{
-    BOOL bUseCustomBackground, bBlendFlag;
-    HBRUSH hBrush, hOldBrush;
-    HDC     hMaskDC, hImageDC;
-    HBITMAP hOldBitmapImage, hOldBitmapMask;
-    HIMAGELIST himlLocal = pimldp->himl;
-    COLORREF oldBkColor, oldFgColor;
-    UINT fStyle = pimldp->fStyle & (~ILD_OVERLAYMASK);
-
-    /* 
-     * We need a dc and bitmap to draw on that is 
-     * not on the screen.
-     */
-    HDC hOffScreenDC = 0;
-    HBITMAP hOffScreenBmp = 0;
-
-    bUseCustomBackground = (himlLocal->clrBk != CLR_NONE);
-    bBlendFlag = (fStyle & ILD_BLEND50 ) || (fStyle & ILD_BLEND25);
-
-    hImageDC = CreateCompatibleDC(0);
-    hMaskDC = CreateCompatibleDC(0);
-
-    /* Create a compatible DC. */
-    hOffScreenDC = CreateCompatibleDC( pimldp->hdcDst );
-
-    if ( hOffScreenDC ) 
-    {
-        hOffScreenBmp = CreateCompatibleBitmap( pimldp->hdcDst, cx, cy );
-
-        if ( hOffScreenBmp ) 
-            SelectObject( hOffScreenDC, hOffScreenBmp  );
-        else
-            goto cleanup;
-    }
-    else
-        goto cleanup;
-
-    hOldBitmapImage = SelectObject(hImageDC, himlLocal->hbmImage);
-    hOldBitmapMask = SelectObject(hMaskDC, himlLocal->hbmMask);
-    
-    /* 
-     * Get a copy of the image for the masking operations. 
-     * We will use the copy, and this dc for all the various
-     * blitting, and then do one final blit to the screen dc.
-     * This should clean up most of the flickering.
-     */
-    BitBlt( hOffScreenDC, 0, 0, cx, cy, pimldp->hdcDst, pimldp->x, 
-            pimldp->y, SRCCOPY);
-
-    /* 
-     * Draw the Background for the appropriate Styles
-     */
-    if( bUseCustomBackground && (fStyle == ILD_NORMAL || fStyle & ILD_IMAGE 
-         || bBlendFlag) )
-    {
-        
-        hBrush = CreateSolidBrush (himlLocal->clrBk);
-        hOldBrush = SelectObject (pimldp->hdcDst, hBrush);
-        
-        PatBlt( hOffScreenDC, pimldp->x, pimldp->y, cx, cy, PATCOPY );
-
-        DeleteObject (SelectObject (pimldp->hdcDst, hOldBrush));
-    }
-
-    /* 
-     * Draw Image Transparently over the current background
-     */
-    if(fStyle == ILD_NORMAL || (fStyle & ILD_TRANSPARENT) || 
-       ((fStyle & ILD_IMAGE) && bUseCustomBackground) || bBlendFlag) 
-    {   /* 
-         * To obtain a transparent look, background color should be set
-         * to white and foreground color to black when blting the 
-         * monochrome mask. 
-         */
-        
-        oldBkColor = SetBkColor( hOffScreenDC, RGB( 0xff, 0xff, 0xff ) ); 
-        oldFgColor = SetTextColor( hOffScreenDC, RGB( 0, 0, 0 ) );
-
-        BitBlt( hOffScreenDC, 0, 0, cx, cy,hMaskDC, himlLocal->cx * pimldp->i,
-                0, SRCAND );
-
-        BitBlt( hOffScreenDC, 0, 0, cx, cy, hImageDC,himlLocal->cx * pimldp->i,
-                0, SRCPAINT );
-    
-    }
-    
-    /*
-     * Draw the image when no Background is specified
-     */
-    else if((fStyle & ILD_IMAGE) && !bUseCustomBackground)
-    {
-        BitBlt( hOffScreenDC, 0, 0, cx, cy, hImageDC, 
-                himlLocal->cx * pimldp->i, 0, SRCCOPY);
-    }
-    /* 
-     * Draw the mask with or without a background
-     */
-    else if(fStyle & ILD_MASK)
-    {
-        BitBlt( hOffScreenDC, 0, 0, cx, cy, hMaskDC, himlLocal->cx * pimldp->i,
-                0, bUseCustomBackground ? SRCCOPY : SRCAND);
-    }
-    
-    /*
-     * Blit the bitmap to the screen now.
-     */
-    BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-            hOffScreenDC, 0, 0, SRCCOPY);
-
-    
-    SelectObject(hImageDC, hOldBitmapImage);
-    SelectObject(hMaskDC, hOldBitmapMask);
-    
-cleanup:
-    
-    DeleteDC(hImageDC);
-    DeleteDC(hMaskDC);
-    
-    DeleteDC( hOffScreenDC );
-    DeleteObject( hOffScreenBmp );
-    
-    return;
-}
-
-/*************************************************************************
- * IMAGELIST_InternalDrawBlend [Internal] 
- *
- * Draws the Blend over the current image 
- *
- * PARAMS
- *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
- *     cx            [I] the width of the image to display
- *     cy............[I] the height of the image to display
- *
- * RETURNS
- *     nothing
- *
- * NOTES
- *     This functions is used by ImageList_DrawIndirect, when it is 
- *     required to add the blend to the current image.  
- *     
- */
-static VOID
-IMAGELIST_InternalDrawBlend(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
-{
-
-    HDC         hBlendMaskDC,hMaskDC;
-    HBRUSH      hBlendColorBrush, hBlendBrush, hOldBrush;
-    HBITMAP     hBlendMaskBitmap, hOldBitmap;
-    COLORREF    clrBlend, OldTextColor, OldBkColor;
-    HIMAGELIST  himlLocal = pimldp->himl;
-
-    clrBlend = GetSysColor (COLOR_HIGHLIGHT);
-    if (!(pimldp->rgbFg == CLR_DEFAULT))
-    {
-        clrBlend = pimldp->rgbFg;
-    }
-    /* Create the blend Mask
-    */
-    hBlendMaskDC = CreateCompatibleDC(0);
-    hBlendBrush = pimldp->fStyle & ILD_BLEND50 ?
-        himlLocal->hbrBlend50 : himlLocal->hbrBlend25;
-
-    hBlendMaskBitmap = CreateBitmap(cx, cy, 1, 1, NULL);
-    hOldBitmap = SelectObject(hBlendMaskDC, hBlendMaskBitmap);
-
-    hOldBrush = (HBRUSH) SelectObject(hBlendMaskDC, hBlendBrush);
-    PatBlt(hBlendMaskDC, 0, 0, cx, cy, PATCOPY);
-    SelectObject(hBlendMaskDC, hOldBrush);
-
-    /* Modify the blend mask if an Image Mask exist
-    */
-    if(pimldp->himl->hbmMask != 0)
-    {
-        HBITMAP hOldMaskBitmap;
-        hMaskDC = CreateCompatibleDC(0);
-        hOldMaskBitmap = (HBITMAP) SelectObject(hMaskDC, himlLocal->hbmMask);
-
-        BitBlt(hBlendMaskDC,
-            0,0, cx, cy, 
-            hMaskDC,
-            himlLocal->cx * pimldp->i,0,
-            0x220326); /* NOTSRCAND */
-
-        BitBlt(hBlendMaskDC,
-            0,0, cx, cy, 
-            hBlendMaskDC,
-            0,0, 
-            NOTSRCCOPY);
-
-        SelectObject(hMaskDC, hOldMaskBitmap);
-        DeleteDC(hMaskDC);
-
-    }
-    /* Apply blend to the current image given the BlendMask
-    */
-    OldTextColor = SetTextColor(pimldp->hdcDst, 0);
-    OldBkColor = SetBkColor(pimldp->hdcDst, RGB(255,255,255));
-    hBlendColorBrush = CreateSolidBrush(clrBlend);
-    hOldBrush = (HBRUSH) SelectObject (pimldp->hdcDst, hBlendColorBrush);
-
-    BitBlt (pimldp->hdcDst, 
-        pimldp->x, pimldp->y, cx, cy, 
-        hBlendMaskDC, 
-        0, 0, 
-        0xB8074A); /* PSDPxax */
-
-    SelectObject(pimldp->hdcDst, hOldBrush);
-    SetTextColor(pimldp->hdcDst, OldTextColor);
-    SetBkColor(pimldp->hdcDst, OldBkColor);
-    SelectObject(hBlendMaskDC, hOldBitmap);
-    DeleteDC(hBlendMaskDC);
-    DeleteObject(hBlendMaskBitmap);
-    DeleteObject(hBlendColorBrush);
-}
-
-/*************************************************************************
- * IMAGELIST_InternalDrawOverlay [Internal] 
- *
- * Draws the overlay image 
- *
- * PARAMS
- *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
- *     cx            [I] the width of the image to display
- *     cy............[I] the height of the image to display
- *
- * RETURNS
- *     nothing
- *
- * NOTES
- *     This functions is used by ImageList_DrawIndirect, when it is 
- *     required to draw the overlay
- *
- *     
- */
-static VOID 
-IMAGELIST_InternalDrawOverlay(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
-{
-    INT     nOvlIdx;
-    HDC     hImageDC;
-    HBITMAP hOldBitmap;
-
-    nOvlIdx = (pimldp->fStyle & ILD_OVERLAYMASK) >> 8;
-    if ((nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE))
-    {
-        nOvlIdx = pimldp->himl->nOvlIdx[nOvlIdx - 1];
-        if ((nOvlIdx >= 0) && (nOvlIdx <= pimldp->himl->cCurImage))
-        {
-            hImageDC = CreateCompatibleDC(0);
-            if (pimldp->himl->hbmMask)
-            {
-                hOldBitmap = (HBITMAP) SelectObject (hImageDC, 
-                    pimldp->himl->hbmMask);
-
-                BitBlt (pimldp->hdcDst, 
-                    pimldp->x, pimldp->y, cx, cy,
-                    hImageDC, pimldp->himl->cx * nOvlIdx, 0,
-                    SRCAND);
-
-                SelectObject(hImageDC, hOldBitmap);
-            }
-            hOldBitmap = (HBITMAP) SelectObject (hImageDC, 
-                pimldp->himl->hbmImage);
-
-            BitBlt (pimldp->hdcDst, 
-                pimldp->x, pimldp->y, cx, cy, 
-                hImageDC,
-                pimldp->himl->cx * nOvlIdx, 0,
-                SRCPAINT);
-
-            SelectObject(hImageDC, hOldBitmap);
-            DeleteDC(hImageDC);
-        }
-    }
-}
-
-
-/*************************************************************************
- * ImageList_Add [COMCTL32.40]
+ * ImageList_Add [COMCTL32.@]
  *
  * Add an image or images to an image list.
@@ -509 +172 @@
     HBITMAP hOldBitmapImage, hOldBitmap;
 
-    TRACE("himl=%p hbmimage=%x hbmmask=%x\n", himl, hbmImage, hbmMask);
+    TRACE("himl=%p hbmimage=%p hbmmask=%p\n", himl, hbmImage, hbmMask);
     if (!himl || !hbmImage)
         return -1;
@@ -533 +196 @@
     if(himl->hbmMask)
     {
-        HDC hdcMask, hdcTemp, hOldBitmapMask, hOldBitmapTemp;
+        HDC hdcMask, hdcTemp;
+        HBITMAP hOldBitmapMask, hOldBitmapTemp;
 
         hdcMask   = CreateCompatibleDC (0);
         hdcTemp   = CreateCompatibleDC(0);
-        hOldBitmapMask = (HBITMAP) SelectObject(hdcMask, himl->hbmMask);
-        hOldBitmapTemp = (HBITMAP) SelectObject(hdcTemp, hbmMask);
-
-        BitBlt (hdcMask, 
+        hOldBitmapMask = SelectObject(hdcMask, himl->hbmMask);
+        hOldBitmapTemp = SelectObject(hdcTemp, hbmMask);
+
+        BitBlt (hdcMask,
             nStartX, 0, bmp.bmWidth, bmp.bmHeight,
-            hdcTemp, 
-            0, 0, 
+            hdcTemp,
+            0, 0,
             SRCCOPY);
 
@@ -551 +215 @@
         /* Remove the background from the image
         */
-        BitBlt (hdcImage, 
+        BitBlt (hdcImage,
             nStartX, 0, bmp.bmWidth, bmp.bmHeight,
-            hdcMask, 
-            nStartX, 0, 
+            hdcMask,
+            nStartX, 0,
             0x220326); /* NOTSRCAND */
 
@@ -574 +238 @@
 
 /*************************************************************************
- * ImageList_AddIcon [COMCTL32.41]
+ * ImageList_AddIcon [COMCTL32.@]
  *
  * Adds an icon to an image list.
@@ -595 +259 @@
 
 /*************************************************************************
- * ImageList_AddMasked [COMCTL32.42] 
+ * ImageList_AddMasked [COMCTL32.@]
  *
  * Adds an image or images to an image list and creates a mask from the
@@ -620 +284 @@
     COLORREF bkColor;
 
-    TRACE("himl=%p hbitmap=%x clrmask=%lx\n", himl, hBitmap, clrMask);
+    TRACE("himl=%p hbitmap=%p clrmask=%lx\n", himl, hBitmap, clrMask);
     if (himl == NULL)
         return -1;
@@ -660 +324 @@
         GetPixel (hdcBitmap, 0, 0);
     SetBkColor (hdcBitmap, bkColor);
-    BitBlt (hdcMask, 
+    BitBlt (hdcMask,
         nMaskXOffset, 0, bmp.bmWidth, bmp.bmHeight,
-        hdcBitmap, 0, 0, 
+        hdcBitmap, 0, 0,
         SRCCOPY);
 
@@ -677 +341 @@
         This is here in case some apps rely on this bug
     */
-    BitBlt(hdcBitmap, 
+    BitBlt(hdcBitmap,
         0, 0, bmp.bmWidth, bmp.bmHeight,
-        hdcMask, 
-        nMaskXOffset, 0, 
+        hdcMask,
+        nMaskXOffset, 0,
         0x220326); /* NOTSRCAND */
     /* Copy result to the imagelist
     */
-    BitBlt (hdcImage, 
+    BitBlt (hdcImage,
         nIndex * himl->cx, 0, bmp.bmWidth, bmp.bmHeight,
-        hdcBitmap, 
-        0, 0, 
+        hdcBitmap,
+        0, 0,
         SRCCOPY);
     /* Clean up
@@ -707 +371 @@
 
 /*************************************************************************
- * ImageList_BeginDrag [COMCTL32.43] 
+ * ImageList_BeginDrag [COMCTL32.@]
  *
  * Creates a temporary image list that contains one image. It will be used
@@ -744 +408 @@
     InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1);
     if (InternalDrag.himl == NULL) {
-        ERR("Error creating drag image list!\n");
+        WARN("Error creating drag image list!\n");
         return FALSE;
     }
@@ -775 +439 @@
 
 /*************************************************************************
- * ImageList_Copy [COMCTL32.44] 
- *
- *  Copies an image of the source image list to an image of the 
+ * ImageList_Copy [COMCTL32.@]
+ *
+ *  Copies an image of the source image list to an image of the
  *  destination image list. Images can be copied or swapped.
  *
@@ -801 +465 @@
                 INT iSrc, INT uFlags)
 {
-    HDC hdcSrc, hdcDst;    
+    HDC hdcSrc, hdcDst;
 
     TRACE("iDst=%d  iSrc=%d\n", iDst, iSrc);
@@ -903 +567 @@
 
 /*************************************************************************
- * ImageList_Create [COMCTL32.45]  Creates a new image list.
+ * ImageList_Create [COMCTL32.@]  Creates a new image list.
  *
  * PARAMS
@@ -925 +589 @@
     INT      nCount;
     HBITMAP  hbmTemp;
-    static WORD aBitBlend25[] = 
+    static WORD aBitBlend25[] =
         {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00};
 
@@ -968 +632 @@
     else
         himl->hbmImage = 0;
-    
-    if ( (himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) {
-        himl->hbmMask = CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
+
+    if ( (himl->flags & ILC_MASK)) {
+        int images = himl->cMaxImage;
+        if (images <= 0)
+            images = 1;
+
+        himl->hbmMask = CreateBitmap (himl->cx * images, himl->cy,
                                         1, 1, NULL);
         if (himl->hbmMask == 0) {
@@ -997 +665 @@
 
 /*************************************************************************
- * ImageList_Destroy [COMCTL32.46] 
+ * ImageList_Destroy [COMCTL32.@]
  *
  * Destroys an image list.
@@ -1011 +679 @@
 BOOL WINAPI
 ImageList_Destroy (HIMAGELIST himl)
-{ 
+{
     if (!himl)
         return FALSE;
@@ -1026 +694 @@
     if (himl->hbrBlend50)
         DeleteObject (himl->hbrBlend50);
-        
+
     COMCTL32_Free (himl);
 
@@ -1034 +702 @@
 
 /*************************************************************************
- * ImageList_DragEnter [COMCTL32.47] 
+ * ImageList_DragEnter [COMCTL32.@]
  *
  * Locks window update and displays the drag image at the given position.
@@ -1055 +723 @@
 ImageList_DragEnter (HWND hwndLock, INT x, INT y)
 {
-    TRACE("(hwnd=%#x x=%d y=%d)\n", hwndLock, x, y);
+    TRACE("(hwnd=%p x=%d y=%d)\n", hwndLock, x, y);
 
     if (InternalDrag.himl == NULL)
@@ -1078 +746 @@
 
 /*************************************************************************
- * ImageList_DragLeave [COMCTL32.48] 
+ * ImageList_DragLeave [COMCTL32.@]
  *
  * Unlocks window update and hides the drag image.
@@ -1111 +779 @@
 
 /*************************************************************************
- * ImageList_DragMove [COMCTL32.49] 
+ * ImageList_InternalDragDraw [Internal]
+ *
+ * Draws the drag image.
+ *
+ * PARAMS
+ *     hdc [I] device context to draw into.
+ *     x   [I] X position of the drag image.
+ *     y   [I] Y position of the drag image.
+ *
+ * RETURNS
+ *     Success: TRUE
+ *     Failure: FALSE
+ *
+ * NOTES
+ *     The position of the drag image is relative to the window, not
+ *     the client area.
+ *
+ */
+
+static inline void
+ImageList_InternalDragDraw (HDC hdc, INT x, INT y)
+{
+    IMAGELISTDRAWPARAMS imldp;
+
+    ZeroMemory (&imldp, sizeof(imldp));
+    imldp.cbSize  = sizeof(imldp);
+    imldp.himl    = InternalDrag.himl;
+    imldp.i       = 0;
+    imldp.hdcDst  = hdc,
+    imldp.x       = x;
+    imldp.y       = y;
+    imldp.rgbBk   = CLR_DEFAULT;
+    imldp.rgbFg   = CLR_DEFAULT;
+    imldp.fStyle  = ILD_NORMAL;
+    imldp.fState  = ILS_ALPHA;
+    imldp.Frame   = 128;
+
+    /* FIXME: instead of using the alpha blending, we should
+     * create a 50% mask, and draw it semitransparantly that way */
+    ImageList_DrawIndirect (&imldp);
+}
+
+/*************************************************************************
+ * ImageList_DragMove [COMCTL32.@]
  *
  * Moves the drag image.
@@ -1150 +861 @@
         INT origRegX, origRegY;
         INT sizeRegX, sizeRegY;
-        
+
 
         /* calculate the update region */
@@ -1182 +893 @@
                hdcOffScreen, origNewX - origRegX, origNewY - origRegY, SRCCOPY);
         /* draw the image */
-        /* FIXME: image should be drawn semitransparent */
-        ImageList_Draw(InternalDrag.himl, 0, hdcOffScreen, origNewX - origRegX,
-                       origNewY - origRegY, ILD_NORMAL);
+        ImageList_InternalDragDraw(hdcOffScreen, origNewX - origRegX, 
+                                   origNewY - origRegY);
         /* draw the update region to the screen */
         BitBlt(hdcDrag, origRegX, origRegY, sizeRegX, sizeRegY,
@@ -1204 +914 @@
 
 /*************************************************************************
- * ImageList_DragShowNolock [COMCTL32.50] 
+ * ImageList_DragShowNolock [COMCTL32.@]
  *
  * Shows or hides the drag image.
@@ -1249 +959 @@
     }
     SelectObject(hdcBg, InternalDrag.hbmBg);
-    
+
     if (bShow) {
         /* save the background */
@@ -1255 +965 @@
                hdcDrag, x, y, SRCCOPY);
         /* show the image */
-        /* FIXME: this should be drawn semitransparent */
-        ImageList_Draw(InternalDrag.himl, 0, hdcDrag, x, y, ILD_NORMAL);
-    } else { 
+        ImageList_InternalDragDraw(hdcDrag, x, y);
+    } else {
         /* hide the image */
         BitBlt(hdcDrag, x, y, InternalDrag.himl->cx, InternalDrag.himl->cy,
@@ -1272 +981 @@
 
 /*************************************************************************
- * ImageList_Draw [COMCTL32.51] Draws an image.
+ * ImageList_Draw [COMCTL32.@] Draws an image.
  *
  * PARAMS
@@ -1286 +995 @@
  *     Failure: FALSE
  *
- * NOTES
- *     Calls ImageList_DrawIndirect.
- *
  * SEE
- *     ImageList_DrawIndirect.
+ *     ImageList_DrawEx.
  */
 
 BOOL WINAPI
-ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc,
-                INT x, INT y, UINT fStyle)
-{
-    IMAGELISTDRAWPARAMS imldp;
-
-    imldp.cbSize  = sizeof(IMAGELISTDRAWPARAMS);
-    imldp.himl    = himl;
-    imldp.i       = i;
-    imldp.hdcDst  = hdc,
-    imldp.x       = x;
-    imldp.y       = y;
-    imldp.cx      = 0;
-    imldp.cy      = 0;
-    imldp.xBitmap = 0;
-    imldp.yBitmap = 0;
-    imldp.rgbBk   = CLR_DEFAULT;
-    imldp.rgbFg   = CLR_DEFAULT;
-    imldp.fStyle  = fStyle;
-    imldp.dwRop   = 0;
-
-    return ImageList_DrawIndirect (&imldp);
-}
-
-
-/*************************************************************************
- * ImageList_DrawEx [COMCTL32.52]
+ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, UINT fStyle)
+{
+    return ImageList_DrawEx (himl, i, hdc, x, y, 0, 0, 
+                             CLR_DEFAULT, CLR_DEFAULT, fStyle);
+}
+
+
+/*************************************************************************
+ * ImageList_DrawEx [COMCTL32.@]
  *
  * Draws an image and allows to use extended drawing features.
@@ -1329 +1018 @@
  *     x      [I] X position
  *     y      [I] Y position
- *     xOffs  [I] X offset
- *     yOffs  [I] Y offset
+ *     dx     [I] X offset
+ *     dy     [I] Y offset
  *     rgbBk  [I] background color
  *     rgbFg  [I] foreground color
@@ -1353 +1042 @@
     IMAGELISTDRAWPARAMS imldp;
 
-    imldp.cbSize  = sizeof(IMAGELISTDRAWPARAMS);
+    ZeroMemory (&imldp, sizeof(imldp));
+    imldp.cbSize  = sizeof(imldp);
     imldp.himl    = himl;
     imldp.i       = i;
@@ -1361 +1051 @@
     imldp.cx      = dx;
     imldp.cy      = dy;
-    imldp.xBitmap = 0;
-    imldp.yBitmap = 0;
     imldp.rgbBk   = rgbBk;
     imldp.rgbFg   = rgbFg;
     imldp.fStyle  = fStyle;
-    imldp.dwRop   = 0;
 
     return ImageList_DrawIndirect (&imldp);
@@ -1373 +1060 @@
 
 /*************************************************************************
- * ImageList_DrawIndirect [COMCTL32.53] 
+ * ImageList_DrawIndirect [COMCTL32.@]
  *
  * Draws an image using ...
@@ -1388 +1075 @@
 ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 {
-    INT      cx, cy;    
-    /* 
-        Do some Error Checking
-    */
-    if (pimldp == NULL)
-        return FALSE;
-    if (pimldp->cbSize < sizeof(IMAGELISTDRAWPARAMS))
-        return FALSE;
-    if (pimldp->himl == NULL)
-        return FALSE;
-    if ((pimldp->i < 0) || (pimldp->i >= pimldp->himl->cCurImage)) {
-        ERR("%d not within range (max %d)\n",pimldp->i,pimldp->himl->cCurImage-1);
-        return FALSE;
-    }
+    INT cx, cy, nOvlIdx;
+    DWORD fState, dwRop;
+    UINT fStyle;
+    COLORREF clrBk, oldImageBk, oldImageFg;
+    HDC hImageDC, hImageListDC, hMaskListDC;
+    HBITMAP hImageBmp, hOldImageBmp, hOldImageListBmp, hOldMaskListBmp, hBlendMaskBmp;
+    BOOL bIsTransparent, bBlend, bResult = FALSE;
+    const HIMAGELIST himl = pimldp->himl;
+    const INT lx = himl->cx * pimldp->i + pimldp->xBitmap;
+    const INT ly = pimldp->yBitmap;
+   
+    if (!pimldp || !himl) return FALSE;
+    if ((pimldp->i < 0) || (pimldp->i >= himl->cCurImage)) return FALSE;
+   
+    fState = pimldp->cbSize < sizeof(IMAGELISTDRAWPARAMS) ? ILS_NORMAL : pimldp->fState;
+    fStyle = pimldp->fStyle & ~ILD_OVERLAYMASK;
+    cx = (pimldp->cx == 0) ? himl->cx : pimldp->cx;
+    cy = (pimldp->cy == 0) ? himl->cy : pimldp->cy;
+    clrBk = (pimldp->rgbBk == CLR_DEFAULT) ? himl->clrBk : pimldp->rgbBk;
+    bIsTransparent = (fStyle & ILD_TRANSPARENT) || clrBk == CLR_NONE;
+    bBlend = fStyle & (ILD_BLEND25 | ILD_BLEND50);
+
+    TRACE("hbmMask(%p) iImage(%d) x(%d) y(%d) cx(%d) cy(%d)\n",
+          himl->hbmMask, pimldp->i, pimldp->x, pimldp->y, cx, cy);
+
+    /* we will use these DCs to access the images and masks in the ImageList */
+    hImageListDC = CreateCompatibleDC(0);
+    hMaskListDC = himl->hbmMask ? CreateCompatibleDC(0) : 0;
+
+    /* these will accumulate the image and mask for the image we're drawing */
+    hImageDC = CreateCompatibleDC( pimldp->hdcDst );
+    hImageBmp = CreateCompatibleBitmap( pimldp->hdcDst, cx, cy );
+    hBlendMaskBmp = bBlend ? CreateBitmap(cx, cy, 1, 1, NULL) : 0;
+
+    /* Create a compatible DC. */
+    if (!hImageListDC || !hImageDC || !hImageBmp ||
+        (bBlend && !hBlendMaskBmp) || (himl->hbmMask && !hMaskListDC))
+        goto cleanup;
+    
+    hOldImageListBmp = SelectObject(hImageListDC, himl->hbmImage);
+    hOldImageBmp = SelectObject(hImageDC, hImageBmp);
+    hOldMaskListBmp = hMaskListDC ? SelectObject(hMaskListDC, himl->hbmMask) : 0;
+  
     /*
-        Get the Height and Width to display
-    */
-    cx = (pimldp->cx == 0) ? pimldp->himl->cx : pimldp->cx;
-    cy = (pimldp->cy == 0) ? pimldp->himl->cy : pimldp->cy;
+     * To obtain a transparent look, background color should be set
+     * to white and foreground color to black when blting the
+     * monochrome mask.
+     */
+    oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) );
+    oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) );
+
     /*
-        Draw the image
-    */
-    if(pimldp->himl->hbmMask != 0)
-    {
-        IMAGELIST_InternalDrawMask(pimldp, cx, cy);
-    }
-    else
-    {
-        IMAGELIST_InternalDraw(pimldp, cx, cy);
-    }
-    /* 
-        Apply the blend if needed to the Image
-    */
-    if((pimldp->fStyle & ILD_BLEND50)
-        || (pimldp->fStyle & ILD_BLEND25))
-    {
-        IMAGELIST_InternalDrawBlend(pimldp, cx, cy);
-    }
-    /*
-        Apply the Overlay if needed
-    */
-    if (pimldp->fStyle & ILD_OVERLAYMASK)
-    {
-        IMAGELIST_InternalDrawOverlay(pimldp, cx, cy);
-    }
-
-    return TRUE;
-}
-
-
-/*************************************************************************
- * ImageList_Duplicate [COMCTL32.54] Duplicates an image list.
+     * Draw the initial image
+     */
+    if(fStyle & ILD_MASK) {
+        if (himl->hbmMask) {
+            BitBlt(hImageDC, 0, 0, cx, cy, hMaskListDC, lx, ly, SRCCOPY);
+        } else {
+            HBRUSH hOldBrush = SelectObject (hImageDC, GetStockObject(BLACK_BRUSH));
+            PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY);
+            SelectObject(hImageDC, hOldBrush);
+        }
+    } else if (himl->hbmMask && !bIsTransparent) {
+        /* blend the image with the needed solid background */
+        HBRUSH hOldBrush = SelectObject (hImageDC, CreateSolidBrush (clrBk));
+        PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY );
+        BitBlt( hImageDC, 0, 0, cx, cy, hMaskListDC, lx, ly, SRCAND );
+        BitBlt( hImageDC, 0, 0, cx, cy, hImageListDC, lx, ly, SRCPAINT );
+        DeleteObject (SelectObject (hImageDC, hOldBrush));
+    } else {
+        /* start off with the image, if we have a mask, we'll use it later */
+        BitBlt( hImageDC, 0, 0, cx, cy, hImageListDC, lx, ly, SRCCOPY);
+    }
+  
+    /* Time for blending, if required */
+    if (bBlend) {
+        HBRUSH hBlendBrush, hOldBrush;
+        COLORREF clrBlend = pimldp->rgbFg;
+        HDC hBlendMaskDC = hImageListDC;
+        HBITMAP hOldBitmap;
+
+        /* Create the blend Mask */
+        hOldBitmap = SelectObject(hBlendMaskDC, hBlendMaskBmp);
+        hBlendBrush = fStyle & ILD_BLEND50 ? himl->hbrBlend50 : himl->hbrBlend25;
+        hOldBrush = (HBRUSH) SelectObject(hBlendMaskDC, hBlendBrush);
+        PatBlt(hBlendMaskDC, 0, 0, cx, cy, PATCOPY);
+        SelectObject(hBlendMaskDC, hOldBrush);
+
+        /* Modify the blend mask if an Image Mask exist */
+        if(himl->hbmMask) {
+            BitBlt(hBlendMaskDC, 0, 0, cx, cy, hMaskListDC, lx, ly, 0x220326); /* NOTSRCAND */
+            BitBlt(hBlendMaskDC, 0, 0, cx, cy, hBlendMaskDC, 0, 0, NOTSRCCOPY);
+        }
+        
+        /* now apply blend to the current image given the BlendMask */
+        if (clrBlend == CLR_DEFAULT) clrBlend = GetSysColor (COLOR_HIGHLIGHT);
+        else if (clrBlend == CLR_NONE) clrBlend = GetTextColor (pimldp->hdcDst);
+        hOldBrush = (HBRUSH) SelectObject (hImageDC, CreateSolidBrush(clrBlend));
+        BitBlt (hImageDC, 0, 0, cx, cy, hBlendMaskDC, 0, 0, 0xB8074A); /* PSDPxax */
+        DeleteObject(SelectObject(hImageDC, hOldBrush));
+        SelectObject(hBlendMaskDC, hOldBitmap);
+    }
+    
+    /* Now do the overlay image, if any */ 
+    nOvlIdx = (pimldp->fStyle & ILD_OVERLAYMASK) >> 8;
+    if ( (nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE)) {
+        nOvlIdx = himl->nOvlIdx[nOvlIdx - 1];
+        if ((nOvlIdx >= 0) && (nOvlIdx < himl->cCurImage)) {
+            const INT ox = himl->cx * nOvlIdx + pimldp->xBitmap;
+            if (himl->hbmMask && !(fStyle & ILD_IMAGE))
+                BitBlt (hImageDC, 0, 0, cx, cy, hMaskListDC, ox, ly, SRCAND);
+            BitBlt (hImageDC, 0, 0, cx, cy, hImageListDC, ox, ly, SRCPAINT);
+        }
+    }
+
+    if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n");
+    if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n");
+    if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n");
+    if (fState & ILS_ALPHA) FIXME("ILS_SHADOW: unimplemented!\n");
+
+    if (fStyle & ILD_PRESERVEALPHA) FIXME("ILD_PRESERVEALPHA: unimplemented!\n");
+    if (fStyle & ILD_SCALE) FIXME("ILD_SCALE: unimplemented!\n");
+    if (fStyle & ILD_DPISCALE) FIXME("ILD_DPISCALE: unimplemented!\n");
+    
+    /* now copy the image to the screen */
+    dwRop = SRCCOPY;
+    if (himl->hbmMask && bIsTransparent && !(fStyle & ILD_MASK)) {
+        COLORREF oldDstFg = SetTextColor(pimldp->hdcDst, RGB( 0, 0, 0 ) );
+        COLORREF oldDstBk = SetBkColor(pimldp->hdcDst, RGB( 0xff, 0xff, 0xff ));
+        BitBlt (pimldp->hdcDst, pimldp->x,  pimldp->y, cx, cy, hMaskListDC, lx, ly, SRCAND);
+        SetBkColor(pimldp->hdcDst, oldDstBk);
+        SetTextColor(pimldp->hdcDst, oldDstFg);
+        dwRop = SRCPAINT;
+    }
+    if (fStyle & ILD_ROP) dwRop = pimldp->dwRop;
+    BitBlt (pimldp->hdcDst, pimldp->x,  pimldp->y, cx, cy, hImageDC, 0, 0, dwRop);
+
+    bResult = TRUE;
+    
+    /* cleanup the mess */
+    SetBkColor(hImageDC, oldImageBk);
+    SetTextColor(hImageDC, oldImageFg);
+    SelectObject(hImageDC, hOldImageBmp);
+    SelectObject(hImageListDC, hOldImageListBmp);
+    if (hMaskListDC) SelectObject(hMaskListDC, hOldMaskListBmp);
+cleanup:
+    DeleteObject(hBlendMaskBmp);
+    DeleteObject(hImageBmp);
+    DeleteObject(hImageDC);
+    DeleteObject(hImageListDC);
+    DeleteObject(hMaskListDC);
+
+    return bResult;
+}
+
+
+/*************************************************************************
+ * ImageList_Duplicate [COMCTL32.@] Duplicates an image list.
  *
  * PARAMS
@@ -1491 +1284 @@
 
 /*************************************************************************
- * ImageList_EndDrag [COMCTL32.55] Finishes a drag operation.
+ * ImageList_EndDrag [COMCTL32.@] Finishes a drag operation.
  *
  * Finishes a drag operation.
@@ -1524 +1317 @@
 
 /*************************************************************************
- * ImageList_GetBkColor [COMCTL32.56]
+ * ImageList_GetBkColor [COMCTL32.@]
  *
  * Returns the background color of an image list.
@@ -1539 +1332 @@
 ImageList_GetBkColor (HIMAGELIST himl)
 {
-    if (himl == NULL)
-        return CLR_NONE;
-
-    return himl->clrBk;
-}
-
-
-/*************************************************************************
- * ImageList_GetDragImage [COMCTL32.57]
+    return himl ? himl->clrBk : CLR_NONE;
+}
+
+
+/*************************************************************************
+ * ImageList_GetDragImage [COMCTL32.@]
  *
  * Returns the handle to the internal drag image list.
@@ -1580 +1370 @@
 
 /*************************************************************************
- * ImageList_GetFlags [COMCTL32.58]
+ * ImageList_GetFlags [COMCTL32.@]
  *
  * BUGS
@@ -1595 +1385 @@
 
 /*************************************************************************
- * ImageList_GetIcon [COMCTL32.59] 
+ * ImageList_GetIcon [COMCTL32.@]
  *
  * Creates an icon from a masked image of an image list.
@@ -1613 +1403 @@
 {
     ICONINFO ii;
-    HICON  hIcon;
-    HBITMAP hOldSrcBitmap,hOldDstBitmap;
-    HDC    hdcSrc, hdcDst;
-
-    if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage)) {
-        FIXME("(%p,%d,%x), params out of range!\n",himl,i,fStyle);
-        return 0;
-   }
-
-    hdcSrc = CreateCompatibleDC(0);
+    HICON hIcon;
+    HBITMAP hOldDstBitmap;
+    HDC hdcDst;
+
+    if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage)) return 0;
+
     hdcDst = CreateCompatibleDC(0);
 
     ii.fIcon = TRUE;
+
+    /* draw mask*/
     ii.hbmMask  = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
-
-    /* draw mask*/
     hOldDstBitmap = (HBITMAP)SelectObject (hdcDst, ii.hbmMask);
-    if (himl->hbmMask) {
-        SelectObject (hdcSrc, himl->hbmMask);
-        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-                  hdcSrc, i * himl->cx, 0, SRCCOPY);
-    }
-    else
-        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
+    ImageList_Draw(himl, i, hdcDst, 0, 0, ILD_MASK);
 
     /* draw image*/
-    hOldSrcBitmap = (HBITMAP)SelectObject (hdcSrc, himl->hbmImage);
-    ii.hbmColor = CreateCompatibleBitmap (hdcSrc, himl->cx, himl->cy);
+    SelectObject (hdcDst, himl->hbmImage);
+    ii.hbmColor = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
     SelectObject (hdcDst, ii.hbmColor);
-    BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-              hdcSrc, i * himl->cx, 0, SRCCOPY);
+    ImageList_Draw(himl, i, hdcDst, 0, 0, fStyle);
 
     /*
      * CreateIconIndirect requires us to deselect the bitmaps from
-     * the DCs before calling 
+     * the DCs before calling
      */
-    SelectObject(hdcSrc, hOldSrcBitmap);
     SelectObject(hdcDst, hOldDstBitmap);
 
-    hIcon = CreateIconIndirect (&ii);    
-
-    DeleteDC (hdcSrc);
-    DeleteDC (hdcDst);
+    hIcon = CreateIconIndirect (&ii);
+
     DeleteObject (ii.hbmMask);
     DeleteObject (ii.hbmColor);
+    DeleteDC (hdcDst);
 
     return hIcon;
@@ -1664 +1441 @@
 
 /*************************************************************************
- * ImageList_GetIconSize [COMCTL32.60]
+ * ImageList_GetIconSize [COMCTL32.@]
  *
  * Retrieves the size of an image in an image list.
@@ -1699 +1476 @@
 
 /*************************************************************************
- * ImageList_GetImageCount [COMCTL32.61]
+ * ImageList_GetImageCount [COMCTL32.@]
  *
  * Returns the number of images in an image list.
@@ -1722 +1499 @@
 
 /*************************************************************************
- * ImageList_GetImageInfo [COMCTL32.62]
+ * ImageList_GetImageInfo [COMCTL32.@]
  *
  * Returns information about an image in an image list.
@@ -1746 +1523 @@
     pImageInfo->hbmImage = himl->hbmImage;
     pImageInfo->hbmMask  = himl->hbmMask;
-    
+
     pImageInfo->rcImage.top    = 0;
     pImageInfo->rcImage.bottom = himl->cy;
     pImageInfo->rcImage.left   = i * himl->cx;
     pImageInfo->rcImage.right  = (i+1) * himl->cx;
-    
+
     return TRUE;
 }
@@ -1757 +1534 @@
 
 /*************************************************************************
- * ImageList_GetImageRect [COMCTL32.63] 
+ * ImageList_GetImageRect [COMCTL32.@]
  *
  * Retrieves the rectangle of the specified image in an image list.
@@ -1792 +1569 @@
 
 /*************************************************************************
- * ImageList_LoadImage  [COMCTL32.64]
- * ImageList_LoadImageA [COMCTL32.65]
+ * ImageList_LoadImage  [COMCTL32.@]
+ * ImageList_LoadImageA [COMCTL32.@]
  *
  * Creates an image list from a bitmap, icon or cursor.
@@ -1856 +1633 @@
         GetIconInfo (handle, &ii);
         GetObjectA (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
-        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
+        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
@@ -1864 +1641 @@
 
     DeleteObject (handle);
-    
+
     return himl;
 }
@@ -1870 +1647 @@
 
 /*************************************************************************
- * ImageList_LoadImageW [COMCTL32.66]
+ * ImageList_LoadImageW [COMCTL32.@]
  *
  * Creates an image list from a bitmap, icon or cursor.
@@ -1933 +1710 @@
         GetIconInfo (handle, &ii);
         GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
-        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
+        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
@@ -1941 +1718 @@
 
     DeleteObject (handle);
-    
+
     return himl;
 }
@@ -1947 +1724 @@
 
 /*************************************************************************
- * ImageList_Merge [COMCTL32.67] 
+ * ImageList_Merge [COMCTL32.@]
  *
  * Creates a new image list that contains a merged image from the specified
@@ -2031 +1808 @@
         nX1 = i1 * himl1->cx;
         nX2 = i2 * himl2->cx;
-        
+
         /* copy image */
         SelectObject (hdcSrcImage, himl1->hbmImage);
         SelectObject (hdcDstImage, himlDst->hbmImage);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
                   hdcSrcImage, 0, 0, BLACKNESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
         SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
                   hdcSrcImage, nX2, 0, SRCAND);
 
         SelectObject (hdcSrcImage, himl2->hbmImage);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
                   hdcSrcImage, nX2, 0, SRCPAINT);
 
@@ -2051 +1828 @@
         SelectObject (hdcSrcImage, himl1->hbmMask);
         SelectObject (hdcDstImage, himlDst->hbmMask);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
                   hdcSrcImage, 0, 0, WHITENESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
         SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
                   hdcSrcImage, nX2, 0, SRCAND);
 
@@ -2064 +1841 @@
         himlDst->cCurImage = 1;
     }
-   
+
     return himlDst;
 }
@@ -2179 +1956 @@
 
 /*************************************************************************
- * ImageList_Read [COMCTL32.68]
+ * ImageList_Read [COMCTL32.@]
  *
  * Reads an image list from a stream.
@@ -2194 +1971 @@
  *
  * for the color image part:
- *      BITMAPFILEHEADER        bmfh; 
+ *      BITMAPFILEHEADER        bmfh;
  *      BITMAPINFOHEADER        bmih;
  * only if it has a palette:
- *      RGBQUAD         rgbs[nr_of_paletted_colors]; 
+ *      RGBQUAD         rgbs[nr_of_paletted_colors];
  *
  *      BYTE                    colorbits[imagesize];
@@ -2205 +1982 @@
  *      BITMAPINFOHEADER        bmih_mask;
  * only if it has a palette (it usually does not):
- *      RGBQUAD         rgbs[nr_of_paletted_colors]; 
+ *      RGBQUAD         rgbs[nr_of_paletted_colors];
  *
  *      BYTE                    maskbits[imagesize];
@@ -2275 +2052 @@
 
 /*************************************************************************
- * ImageList_Remove [COMCTL32.69] Removes an image from an image list
+ * ImageList_Remove [COMCTL32.@] Removes an image from an image list
  *
  * PARAMS
@@ -2293 +2070 @@
     INT     cxNew, nCount;
 
+    TRACE("(himl=%p i=%d)\n", himl, i);
+
     if (himl == NULL) {
         ERR("Invalid image list handle!\n");
         return FALSE;
     }
-    
+
     if ((i < -1) || (i >= himl->cCurImage)) {
         ERR("index out of range! %d\n", i);
@@ -2303 +2082 @@
     }
 
-    if (himl->cCurImage == 0) {
-        ERR("image list is already empty!\n");
-        return FALSE;
-    }
-
     if (i == -1) {
         /* remove all */
-        TRACE("remove all!\n");
+        if (himl->cCurImage == 0) {
+            /* remove all on empty ImageList is allowed */
+            TRACE("remove all on empty ImageList!\n");
+            return TRUE;
+        }
 
         himl->cMaxImage = himl->cInitial + himl->cGrow;
@@ -2340 +2118 @@
         TRACE(" - Max. number of images: %d / %d (Old/New)\n",
                  himl->cMaxImage, himl->cCurImage + himl->cGrow - 1);
-        
+
         hbmNewImage =
             CreateBitmap (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
@@ -2355 +2133 @@
         if (i > 0) {
             TRACE("Pre image copy: Copy %d images\n", i);
-       
+
             SelectObject (hdcSrc, himl->hbmImage);
             SelectObject (hdcDst, hbmNewImage);
@@ -2406 +2184 @@
 
 /*************************************************************************
- * ImageList_Replace [COMCTL32.70] 
+ * ImageList_Replace [COMCTL32.@]
  *
  * Replaces an image in an image list with a new image.
@@ -2428 +2206 @@
     BITMAP bmp;
 
+    TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask);
+
     if (himl == NULL) {
         ERR("Invalid image list handle!\n");
         return FALSE;
     }
-    
+
     if ((i >= himl->cMaxImage) || (i < 0)) {
         ERR("Invalid image index!\n");
@@ -2462 +2242 @@
         */
         SelectObject (hdcImageList, himl->hbmImage);
-        StretchBlt (hdcImageList, 
+        StretchBlt (hdcImageList,
             i*himl->cx, 0, himl->cx, himl->cy,
-            hdcImage, 
-            0, 0, bmp.bmWidth, bmp.bmHeight, 
+            hdcImage,
+            0, 0, bmp.bmWidth, bmp.bmHeight,
             0x220326); /* NOTSRCAND */
     }
@@ -2477 +2257 @@
 
 /*************************************************************************
- * ImageList_ReplaceIcon [COMCTL32.75]
+ * ImageList_ReplaceIcon [COMCTL32.@]
  *
  * Replaces an image in an image list using an icon.
@@ -2501 +2281 @@
     BITMAP  bmp;
 
-    TRACE("(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
+    TRACE("(0x%lx 0x%x %p)\n", (DWORD)himl, i, hIcon);
 
     if (himl == NULL)
@@ -2509 +2289 @@
 
     hBestFitIcon = CopyImage(
-        hIcon, IMAGE_ICON, 
-        himl->cx, himl->cy, 
+        hIcon, IMAGE_ICON,
+        himl->cx, himl->cy,
         LR_COPYFROMRESOURCE);
 
@@ -2531 +2311 @@
 
     hdcImageList = CreateCompatibleDC (0);
-    TRACE("hdcImageList=0x%x!\n", hdcImageList);
+    TRACE("hdcImageList=%p!\n", hdcImageList);
     if (hdcImageList == 0)
         ERR("invalid hdcImageList!\n");
 
     hdcImage = CreateCompatibleDC (0);
-    TRACE("hdcImage=0x%x!\n", hdcImage);
+    TRACE("hdcImage=%p!\n", hdcImage);
     if (hdcImage == 0)
         ERR("invalid hdcImage!\n");
@@ -2573 +2353 @@
 
 /*************************************************************************
- * ImageList_SetBkColor [COMCTL32.76] 
+ * ImageList_SetBkColor [COMCTL32.@]
  *
  * Sets the background color of an image list.
@@ -2601 +2381 @@
 
 /*************************************************************************
- * ImageList_SetDragCursorImage [COMCTL32.77]
+ * ImageList_SetDragCursorImage [COMCTL32.@]
  *
  * Combines the specified image with the current drag image
@@ -2683 +2463 @@
 
 /*************************************************************************
- * ImageList_SetFilter [COMCTL32.78] 
+ * ImageList_SetFilter [COMCTL32.@]
  *
  * Sets a filter (or does something completely different)!!???
- *
- * PARAMS
- *     himl     [I] handle to image list
- *     i        [I] ???
+ * It removes 12 Bytes from the stack (3 Parameters).
+ *
+ * PARAMS
+ *     himl     [I] SHOULD be a handle to image list
+ *     i        [I] COULD be an index?
  *     dwFilter [I] ???
  *
@@ -2704 +2485 @@
 ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
 {
-    FIXME("(%p 0x%x 0x%lx):empty stub!\n",
-           himl, i, dwFilter);
+    FIXME("(%p 0x%x 0x%lx):empty stub!\n", himl, i, dwFilter);
 
     return FALSE;
@@ -2712 +2492 @@
 
 /*************************************************************************
- * ImageList_SetFlags [COMCTL32.79]
+ * ImageList_SetFlags [COMCTL32.@]
  *
  * BUGS
@@ -2727 +2507 @@
 
 /*************************************************************************
- * ImageList_SetIconSize [COMCTL32.80]
+ * ImageList_SetIconSize [COMCTL32.@]
  *
  * Sets the image size of the bitmap and deletes all images.
@@ -2776 +2556 @@
 
 /*************************************************************************
- * ImageList_SetImageCount [COMCTL32.81]
+ * ImageList_SetImageCount [COMCTL32.@]
  *
  * Resizes an image list to the specified number of images.
@@ -2795 +2575 @@
     HBITMAP hbmNewBitmap;
     INT     nNewCount, nCopyCount;
+
+    TRACE("%p %d\n",himl,iImageCount);
 
     if (!himl)
@@ -2801 +2583 @@
         return FALSE;
     if (himl->cMaxImage > iImageCount)
+    {
+        himl->cCurImage = iImageCount;
         return TRUE;
+    }
 
     nNewCount = iImageCount + himl->cGrow;
@@ -2823 +2608 @@
         SetBkColor (hdcBitmap, RGB(255, 255, 255));
         SetTextColor (hdcBitmap, RGB(0, 0, 0));
-        PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
+        PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
                   (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 #endif
@@ -2848 +2633 @@
             SetBkColor (hdcBitmap, RGB(255, 255, 255));
             SetTextColor (hdcBitmap, RGB(0, 0, 0));
-            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
+            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
                       (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 #endif
@@ -2863 +2648 @@
     /* Update max image count and current image count */
     himl->cMaxImage = nNewCount;
-    if (himl->cCurImage > nCopyCount)
-        himl->cCurImage = nCopyCount;
+    himl->cCurImage = iImageCount;
 
     return TRUE;
@@ -2871 +2655 @@
 
 /*************************************************************************
- * ImageList_SetOverlayImage [COMCTL32.82]
+ * ImageList_SetOverlayImage [COMCTL32.@]
  *
  * Assigns an overlay mask index to an existing image in an image list.
@@ -2900 +2684 @@
 
 
-/* helper for ImageList_Write - write bitmap to pstm 
+/* helper for ImageList_Write - write bitmap to pstm
  * currently everything is written as 24 bit RGB, except masks
  */
-static BOOL 
+static BOOL
 _write_bitmap(HBITMAP hBitmap, LPSTREAM pstm, int cx, int cy)
 {
@@ -2918 +2702 @@
     xdc = GetDC(0);
     GetObjectA(hBitmap, sizeof(BITMAP), (LPVOID)&bm);
-    
+
     /* XXX is this always correct? */
     icount = bm.bmWidth / cx;
@@ -2960 +2744 @@
 
     lpBitsOrg = (LPBYTE)LocalAlloc(LMEM_ZEROINIT, nsizeImage);
-    if(!GetDIBits(xdc, hBitmap, 0, bm.bmHeight, lpBitsOrg, 
+    if(!GetDIBits(xdc, hBitmap, 0, bm.bmHeight, lpBitsOrg,
                   (BITMAPINFO *)bmih, DIB_RGB_COLORS))
         goto failed;
@@ -2967 +2751 @@
         int obpl = (((bm.bmWidth*bitCount+31) & ~31)>>3);
         int nbpl = (((nwidth*bitCount+31) & ~31)>>3);
-                
+
         for(i = 0; i < nheight; i++) {
             int ooff = ((nheight-1-i)%cy) * obpl + ((i/cy) * nbpl);
@@ -2974 +2758 @@
         }
     }
-    
+
     bmih->biWidth  = nwidth;
     bmih->biHeight = nheight;
@@ -2999 +2783 @@
 
 /*************************************************************************
- * ImageList_Write [COMCTL32.83]
+ * ImageList_Write [COMCTL32.@]
  *
  * Writes an image list to a stream.
@@ -3052 +2836 @@
     return TRUE;
 }
-

trunk/src/comctl32/ipaddress.c

@@ -22 +22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ * NOTE
+ * 
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Sep. 9, 2002, by Dimitrie O. Paun.
+ * 
+ * Unless otherwise noted, we belive this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ * 
  */
 
@@ -29 +38 @@
 #include <string.h>
 
-#include "ntddk.h"
 #include "winbase.h"
 #include "commctrl.h"
+#include "wine/unicode.h"
 #include "wine/debug.h"
-#ifdef __WIN32OS2__
-#include "comctl32.h"
-#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(ipaddress);
@@ -68 +74 @@
 {
     HWND hwnd = infoPtr->Self;
-    
+
     TRACE("(command=%x)\n", command);
-    
+
     return SendMessageW (GetParent (hwnd), WM_COMMAND,
              MAKEWPARAM (GetWindowLongW (hwnd, GWL_ID), command), (LPARAM)hwnd);
@@ -80 +86 @@
 
     TRACE("(field=%x, value=%d)\n", field, value);
-    
+
     nmip.hdr.hwndFrom = infoPtr->Self;
     nmip.hdr.idFrom   = GetWindowLongW (infoPtr->Self, GWL_ID);
@@ -92 +98 @@
 
     TRACE("<-- %d\n", nmip.iValue);
-    
+
     return nmip.iValue;
 }
@@ -100 +106 @@
 {
     int i;
-    
-    TRACE("(hwnd=%x)\n", hwnd);
-    
-    for (i = 0; i < 4; i++) 
+
+    TRACE("(hwnd=%p)\n", hwnd);
+
+    for (i = 0; i < 4; i++)
         if (infoPtr->Part[i].EditHwnd == hwnd) return i;
-    
-    ERR("We subclassed the wrong window! (hwnd=%x)\n", hwnd);
+
+    ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd);
     return -1;
 }
@@ -118 +124 @@
 
     TRACE("\n");
-    
+
     GetClientRect (infoPtr->Self, &rect);
     DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
@@ -126 +132 @@
         pt.x = rcPart.right;
         ScreenToClient(infoPtr->Self, &pt);
-        rect.left = pt.x;       
+        rect.left = pt.x;
         GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart);
         pt.x = rcPart.left;
@@ -146 +152 @@
 
     TRACE("\n");
-    
+
     SetWindowLongW (hwnd, GWL_STYLE,
                     GetWindowLongW(hwnd, GWL_STYLE) & ~WS_BORDER);
-    
+
     infoPtr = (IPADDRESS_INFO *)COMCTL32_Alloc (sizeof(IPADDRESS_INFO));
     if (!infoPtr) return -1;
@@ -162 +168 @@
 
     infoPtr->Self = hwnd;
-  
+
     for (i = 0; i < 4; i++) {
         IPPART_INFO* part = &infoPtr->Part[i];
-        
+
         part->LowerLimit = 0;
         part->UpperLimit = 255;
@@ -172 +178 @@
         part->EditHwnd =
                 CreateWindowW (EDIT, NULL, WS_CHILD | WS_VISIBLE | ES_CENTER,
-                               edit.left, edit.top, edit.right - edit.left, 
-                               edit.bottom - edit.top, hwnd, (HMENU) 1, 
-                               GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
+                               edit.left, edit.top, edit.right - edit.left,
+                               edit.bottom - edit.top, hwnd, (HMENU) 1,
+                               (HINSTANCE)GetWindowLongW(hwnd, GWL_HINSTANCE), NULL);
         SetPropA(part->EditHwnd, IP_SUBCLASS_PROP, hwnd);
         part->OrigProc = (WNDPROC)
-                SetWindowLongW (part->EditHwnd, GWL_WNDPROC, 
+                SetWindowLongW (part->EditHwnd, GWL_WNDPROC,
                                 (LONG)IPADDRESS_SubclassProc);
     }
@@ -190 +196 @@
 
     TRACE("\n");
-    
+
     for (i = 0; i < 4; i++) {
         IPPART_INFO* part = &infoPtr->Part[i];
@@ -207 +213 @@
 
     TRACE("\n");
-    
+
     if (hdc) return IPADDRESS_Draw (infoPtr, hdc);
-  
+
     hdc = BeginPaint (infoPtr->Self, &ps);
     IPADDRESS_Draw (infoPtr, hdc);
@@ -240 +246 @@
     for (i = 0; i < 4; i++) {
         ip_addr *= 256;
-        if (GetWindowTextW (infoPtr->Part[i].EditHwnd, field, 4)) 
-            ip_addr += wcstol(field, 0, 10);
+        if (GetWindowTextW (infoPtr->Part[i].EditHwnd, field, 4))
+            ip_addr += atolW(field);
         else
             invalid++;
@@ -271 +277 @@
     TRACE("\n");
 
-    for (i = 0; i < 4; i++) 
+    for (i = 0; i < 4; i++)
         SetWindowTextW (infoPtr->Part[i].EditHwnd, nil);
 }
@@ -287 +293 @@
         int value = ip_address & 0xff;
         if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) {
-            swprintf (buf, fmt, value);
+            wsprintfW (buf, fmt, value);
             SetWindowTextW (part->EditHwnd, buf);
             IPADDRESS_Notify (infoPtr, EN_CHANGE);
@@ -301 +307 @@
 {
     TRACE("(index=%d)\n", index);
- 
+
     if (index > 3) {
         for (index = 0; index < 4; index++)
@@ -307 +313 @@
     }
     if (index < 9 || index > 3) index = 0;
-        
+
     SetFocus (infoPtr->Part[index].EditHwnd);
 }
@@ -321 +327 @@
 
     if (currentfield < 0 || currentfield > 3) return FALSE;
-  
+
     if (!GetWindowTextW (part->EditHwnd, field, 4)) return FALSE;
-    
-    curValue = wcstol(field, 0, 10);
+
+    curValue = atoiW(field);
     TRACE("  curValue=%d\n", curValue);
-    
+
     newValue = IPADDRESS_IPNotify(infoPtr, currentfield, curValue);
     TRACE("  newValue=%d\n", newValue);
@@ -332 +338 @@
     if (newValue < part->LowerLimit) newValue = part->LowerLimit;
     if (newValue > part->UpperLimit) newValue = part->UpperLimit;
-    
+
     if (newValue == curValue) return FALSE;
-    
-    swprintf (field, fmt, newValue);
+
+    wsprintfW (field, fmt, newValue);
     TRACE("  field='%s'\n", debugstr_w(field));
     return SetWindowTextW (part->EditHwnd, field);
@@ -347 +353 @@
     if(cur >= -1 && cur < 4) {
         IPADDRESS_ConstrainField(infoPtr, cur);
-        
+
         if(cur < 3) {
             IPPART_INFO *next = &infoPtr->Part[cur + 1];
@@ -361 +367 @@
             return TRUE;
         }
-                 
+
     }
     return FALSE;
@@ -376 +382 @@
  * alpha characters: completely ignored
  *
- * digits: accepted when field text length < 2 ignored otherwise. 
- *         when 3 numbers have been entered into the field the value 
- *         of the field is checked, if the field value exceeds the 
- *         maximum value and is changed the field remains the current 
- *         field, otherwise focus moves to the field to the right 
- *
- * tab: change focus from the current ipaddress control to the next 
- *      control in the tab order 
- *
- * right arrow: move to the field on the right to the left most 
- *              position in that field if no text is selected, 
- *              we are in the right most position in the field, 
- *              we are not in the right most field 
- *
- * left arrow: move to the field on the left to the right most 
- *             position in that field if no text is selected, 
- *             we are in the left most position in the current field 
- *             and we are not in the left most field 
- *
- * backspace: delete the character to the left of the cursor position, 
- *            if none are present move to the field on the left if 
- *            we are not in the left most field and delete the right 
- *            most digit in that field while keeping the cursor 
- *            on the right side of the field 
+ * digits: accepted when field text length < 2 ignored otherwise.
+ *         when 3 numbers have been entered into the field the value
+ *         of the field is checked, if the field value exceeds the
+ *         maximum value and is changed the field remains the current
+ *         field, otherwise focus moves to the field to the right
+ *
+ * tab: change focus from the current ipaddress control to the next
+ *      control in the tab order
+ *
+ * right arrow: move to the field on the right to the left most
+ *              position in that field if no text is selected,
+ *              we are in the right most position in the field,
+ *              we are not in the right most field
+ *
+ * left arrow: move to the field on the left to the right most
+ *             position in that field if no text is selected,
+ *             we are in the left most position in the current field
+ *             and we are not in the left most field
+ *
+ * backspace: delete the character to the left of the cursor position,
+ *            if none are present move to the field on the left if
+ *            we are not in the left most field and delete the right
+ *            most digit in that field while keeping the cursor
+ *            on the right side of the field
  */
 LRESULT CALLBACK
@@ -410 +416 @@
     IPPART_INFO *part;
 
-    TRACE("(hwnd=0x%x msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+    TRACE("(hwnd=%p msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
 
     if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0;
@@ -418 +424 @@
         len = GetWindowTextLengthW (hwnd);
         SendMessageW(hwnd, EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel);
-    }   
+    }
     switch (uMsg) {
-        case WM_CHAR: 
+        case WM_CHAR:
             if(isdigit(c)) {
                 if(len == 2 && startsel==endsel && endsel==len) {
                     /* process the digit press before we check the field */
                     int return_val = CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam);
-          
+
                     /* if the field value was changed stay at the current field */
                     if(!IPADDRESS_ConstrainField(infoPtr, index))
@@ -433 +439 @@
                 } else if (len == 3 && startsel==endsel && endsel==len)
                     IPADDRESS_GotoNextField (infoPtr, index, POS_SELALL);
-                else if (len < 3) break; 
+                else if (len < 3) break;
             } else if(c == '.' || c == ' ') {
                 if(len && startsel==endsel && startsel != 0) {
-                    IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL); 
+                    IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL);
                 }
             } else if (c == VK_BACK) break;
             return 0;
-        
+
         case WM_KEYDOWN:
             switch(c) {
@@ -459 +465 @@
                         IPPART_INFO *prev = &infoPtr->Part[index-1];
                         WCHAR val[10];
-                        
+
                         if(GetWindowTextW(prev->EditHwnd, val, 5)) {
                             val[lstrlenW(val) - 1] = 0;
                             SetWindowTextW(prev->EditHwnd, val);
                         }
-                                
+
                         IPADDRESS_GotoNextField(infoPtr, index - 2, POS_RIGHT);
                         return 0;
                     }
                     break;
-            }               
+            }
             break;
         case WM_KILLFOCUS:
@@ -488 +494 @@
 {
     IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
-  
-    TRACE("(hwnd=0x%x msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
-  
+
+    TRACE("(hwnd=%p msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+
     if (!infoPtr && (uMsg != WM_CREATE))
         return DefWindowProcW (hwnd, uMsg, wParam, lParam);
-  
+
     switch (uMsg)
     {
@@ -537 +543 @@
 
         default:
-            if (uMsg >= WM_USER)
+            if ((uMsg >= WM_USER) && (uMsg < WM_APP))
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
             return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -557 +563 @@
     wndClass.hbrBackground = GetStockObject(WHITE_BRUSH);
     wndClass.lpszClassName = WC_IPADDRESSW;
- 
+
     RegisterClassW (&wndClass);
 }

trunk/src/comctl32/listview.c

@@ -76 +76 @@
 #include <heapstring.h>
 #include "ccbase.h"
-#include "header.h"
 
 typedef struct
@@ -10108 +10107 @@
   RECT rect;
 
-  if (HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)nSubItem,(LPARAM)&rect))
+  if (Header_GetItemRect(infoPtr->hwndHeader,(WPARAM)nSubItem,(LPARAM)&rect))
   {
     lpptPosition->x = rect.left+REPORT_MARGINX;
@@ -10148 +10147 @@
 
   nSubItem = lprc->top;
-  if ((nSubItem < 0) || (nSubItem >= HEADER_GetItemCount(infoPtr->hwndHeader))) return FALSE;
+  if ((nSubItem < 0) || (nSubItem >= Header_GetItemCount(infoPtr->hwndHeader))) return FALSE;
   if (!LISTVIEW_GetSubItemPosition(hwnd, infoPtr,nItem,nSubItem,&ptItem)) return FALSE;
 
@@ -10347 +10346 @@
   if (checkSubItems && (uView == LVS_REPORT))
   {
-    INT nColumnCount = HEADER_GetItemCount(infoPtr->hwndHeader);
+    INT nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
     INT xDiff = -infoPtr->lefttop.x*infoPtr->scrollStep.x;
 
@@ -10356 +10355 @@
       RECT rcColumn;
 
-      HEADER_GetItemRect(infoPtr->hwndHeader,(WPARAM)x,(LPARAM)&rcColumn);
+      Header_GetItemRect(infoPtr->hwndHeader,(WPARAM)x,(LPARAM)&rcColumn);
       rcItem.left = xDiff+REPORT_MARGINX+rcColumn.left;
       rcItem.right = xDiff+rcColumn.right-REPORT_MARGINX;

trunk/src/comctl32/pager.c

@@ -45 +45 @@
     INT    nPos;       /* scroll position */
     INT    nWidth;     /* from child wnd's response to PGN_CALCSIZE */
-    INT    nHeight;    /* from child wnd's response to PGN_CALCSIZE */ 
+    INT    nHeight;    /* from child wnd's response to PGN_CALCSIZE */
     BOOL   bForward;   /* forward WM_MOUSEMOVE msgs to the contained wnd */
+    BOOL   bCapture;   /* we have captured the mouse  */
     INT    TLbtnState; /* state of top or left btn */
     INT    BRbtnState; /* state of bottom or right btn */
@@ -63 +64 @@
 #define REPEAT_DELAY     50
 
-/* the horizontal arrows are: 
+/* the horizontal arrows are:
  *
  * 01234    01234
@@ -72 +73 @@
  * 5 **      **
  * 6  *      *
- * 7  
+ * 7
  *
  */
@@ -79 +80 @@
 {
     INT x, y, w, h;
-    HPEN hOldPen;
-    
+    HPEN hPen, hOldPen;
+
     w = r.right - r.left + 1;
     h = r.bottom - r.top + 1;
@@ -86 +87 @@
         return;  /* refuse to draw partial arrow */
 
-    hOldPen = SelectObject ( hdc, GetSysColorPen (colorRef));
+    if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return;
+    hOldPen = SelectObject ( hdc, hPen );
     if (left)
     {
@@ -111 +113 @@
 
     SelectObject( hdc, hOldPen );
-}
-
-/* the vertical arrows are: 
+    DeleteObject( hPen );
+}
+
+/* the vertical arrows are:
  *
  * 01234567    01234567
- * 1******        **  
+ * 1******        **
  * 2 ****        ****
  * 3  **        ******
@@ -126 +129 @@
 {
     INT x, y, w, h;
-    HPEN hOldPen;
-    
+    HPEN hPen, hOldPen;
+
     w = r.right - r.left + 1;
     h = r.bottom - r.top + 1;
@@ -133 +136 @@
         return;  /* refuse to draw partial arrow */
 
-    hOldPen = SelectObject ( hdc, GetSysColorPen (colorRef));
+    if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return;
+    hOldPen = SelectObject ( hdc, hPen );
     if (up)
     {
@@ -158 +162 @@
 
     SelectObject( hdc, hOldPen );
+    DeleteObject( hPen );
 }
 
@@ -171 +176 @@
 
     if ((rc.right - rc.left <= 0) || (rc.bottom - rc.top <= 0))
-        return;  
+        return;
 
     hBrush = CreateSolidBrush(clrBk);
@@ -178 +183 @@
     FillRect(hdc, &rc, hBrush);
 
-    if (btnState == PGF_HOT) 
+    if (btnState == PGF_HOT)
     {
        DrawEdge( hdc, &rc, BDR_RAISEDINNER, BF_RECT);
@@ -186 +191 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_NORMAL) 
+    else if (btnState == PGF_NORMAL)
     {
        DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT);
@@ -194 +199 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_DEPRESSED) 
+    else if (btnState == PGF_DEPRESSED)
     {
        DrawEdge( hdc, &rc, BDR_SUNKENOUTER, BF_RECT);
@@ -202 +207 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_GRAYED) 
+    else if (btnState == PGF_GRAYED)
     {
        DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT);
@@ -223 +228 @@
 }
 
+static void PAGER_CaptureandTrack(PAGER_INFO *infoPtr, HWND hwnd)
+{
+    TRACKMOUSEEVENT trackinfo;
+
+    TRACE("[%p] SetCapture\n", hwnd);
+    SetCapture(hwnd);
+    infoPtr->bCapture = TRUE;
+
+    trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
+    trackinfo.dwFlags = TME_QUERY;
+    trackinfo.hwndTrack = hwnd;
+    trackinfo.dwHoverTime = HOVER_DEFAULT;
+
+    /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */
+    _TrackMouseEvent(&trackinfo);
+
+    /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */
+    if(!(trackinfo.dwFlags & TME_LEAVE)) {
+        trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
+
+        /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
+        /* and can properly deactivate the hot button */
+        _TrackMouseEvent(&trackinfo);
+    }
+}
+
+
 /* << PAGER_GetDropTarget >> */
 
@@ -229 +261 @@
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
-    TRACE("[%04x]\n", hwnd);
+    TRACE("[%p]\n", hwnd);
 
     infoPtr->bForward = (BOOL)wParam;
@@ -239 +271 @@
 PAGER_GetButtonState (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     LRESULT btnState = PGF_INVISIBLE;
     INT btn = (INT)lParam;
-    TRACE("[%04x]\n", hwnd);
+    TRACE("[%p]\n", hwnd);
 
     if (btn == PGB_TOPORLEFT)
@@ -256 +288 @@
 PAGER_GetPos(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
-    TRACE("[%04x] returns %d\n", hwnd, infoPtr->nPos);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    TRACE("[%p] returns %d\n", hwnd, infoPtr->nPos);
     return (LRESULT)infoPtr->nPos;
 }
@@ -264 +296 @@
 PAGER_GetButtonSize(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
-    TRACE("[%04x] returns %d\n", hwnd, infoPtr->nButtonSize);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    TRACE("[%p] returns %d\n", hwnd, infoPtr->nButtonSize);
     return (LRESULT)infoPtr->nButtonSize;
 }
@@ -272 +304 @@
 PAGER_GetBorder(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
-    TRACE("[%04x] returns %d\n", hwnd, infoPtr->nBorder);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    TRACE("[%p] returns %d\n", hwnd, infoPtr->nBorder);
     return (LRESULT)infoPtr->nBorder;
 }
@@ -280 +312 @@
 PAGER_GetBkColor(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
-    TRACE("[%04x] returns %06lx\n", hwnd, infoPtr->clrBk);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    TRACE("[%p] returns %06lx\n", hwnd, infoPtr->clrBk);
     return (LRESULT)infoPtr->clrBk;
 }
 
-static void 
-PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth) 
+static void
+PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth)
 {
     NMPGCALCSIZE nmpgcs;
@@ -301 +333 @@
     *size = getWidth ? nmpgcs.iWidth : nmpgcs.iHeight;
 
-    TRACE("[%04x] PGN_CALCSIZE returns %s=%d\n", hwnd,
+    TRACE("[%p] PGN_CALCSIZE returns %s=%d\n", hwnd,
                   getWidth ? "width" : "height", *size);
 }
@@ -325 +357 @@
                 infoPtr->nWidth = wndSize;
 
-            TRACE("[%04x] SWP %dx%d at (%d,%d)\n", hwnd,
+            TRACE("[%p] SWP %dx%d at (%d,%d)\n", hwnd,
                          infoPtr->nWidth, infoPtr->nHeight,
                          -nPos, 0);
@@ -339 +371 @@
                 infoPtr->nHeight = wndSize;
 
-            TRACE("[%04x] SWP %dx%d at (%d,%d)\n", hwnd, 
+            TRACE("[%p] SWP %dx%d at (%d,%d)\n", hwnd,
                          infoPtr->nWidth, infoPtr->nHeight,
                          0, -nPos);
@@ -381 +413 @@
     }
 
-    TRACE("[%04x] returns %d\n", hwnd, scrollRange);
+    TRACE("[%p] returns %d\n", hwnd, scrollRange);
     return scrollRange;
 }
 
-static void 
+static void
 PAGER_GrayAndRestoreBtns(PAGER_INFO* infoPtr, INT scrollRange,
                          BOOL* needsResize, BOOL* needsRepaint)
@@ -422 +454 @@
 
 
-static void 
+static void
 PAGER_NormalizeBtns(PAGER_INFO* infoPtr, BOOL* needsRepaint)
 {
@@ -438 +470 @@
 }
 
-static void 
+static void
 PAGER_HideGrayBtns(PAGER_INFO* infoPtr, BOOL* needsResize)
 {
@@ -470 +502 @@
 
     if (resizeClient) /* initiate NCCalcSize to resize client wnd */ {
-        SetWindowPos(hwnd, 0,0,0,0,0, 
+        SetWindowPos(hwnd, 0,0,0,0,0,
                      SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
                      SWP_NOZORDER | SWP_NOACTIVATE);
@@ -476 +508 @@
 
     if (repaintBtns)
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
-}
-
-static LRESULT  
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
+}
+
+static LRESULT
 PAGER_SetPos(HWND hwnd, INT newPos, BOOL fromBtnPress)
 {
@@ -493 +525 @@
         infoPtr->nPos = newPos;
 
-    TRACE("[%04x] pos=%d\n", hwnd, infoPtr->nPos);
+    TRACE("[%p] pos=%d, oldpos=%d\n", hwnd, infoPtr->nPos, oldPos);
 
     if (infoPtr->nPos != oldPos)
@@ -537 +569 @@
 }
 
-static INT 
+static INT
 PAGER_SetFixedWidth(HWND hwnd, PAGER_INFO* infoPtr)
 {
@@ -562 +594 @@
     h = wndRect.bottom - wndRect.top + infoPtr->nButtonSize;
 
-    TRACE("[%04x] infoPtr->nWidth set to %d\n",
+    TRACE("[%p] infoPtr->nWidth set to %d\n",
                hwnd, infoPtr->nWidth);
 
@@ -568 +600 @@
 }
 
-static INT 
+static INT
 PAGER_SetFixedHeight(HWND hwnd, PAGER_INFO* infoPtr)
 {
@@ -593 +625 @@
     w = wndRect.right - wndRect.left + infoPtr->nButtonSize;
 
-    TRACE("[%04x] infoPtr->nHeight set to %d\n",
+    TRACE("[%p] infoPtr->nHeight set to %d\n",
                hwnd, infoPtr->nHeight);
 
@@ -616 +648 @@
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
 
-    TRACE("[%04x]\n", hwnd);
+    TRACE("[%p]\n", hwnd);
 
     if (infoPtr->hwndChild)
@@ -627 +659 @@
             PAGER_SetPos(hwnd, 0, FALSE);
         }
-        else 
+        else
         {
             PAGER_UpdateBtns(hwnd, infoPtr, scrollRange, TRUE);
@@ -645 +677 @@
 
     infoPtr->clrBk = (COLORREF)lParam;
-    TRACE("[%04x] %06lx\n", hwnd, infoPtr->clrBk);
+    TRACE("[%p] %06lx\n", hwnd, infoPtr->clrBk);
 
     /* the native control seems to do things this way */
-    SetWindowPos(hwnd, 0,0,0,0,0, 
+    SetWindowPos(hwnd, 0,0,0,0,0,
                  SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
                  SWP_NOZORDER | SWP_NOACTIVATE);
@@ -665 +697 @@
 
     infoPtr->nBorder = (INT)lParam;
-    TRACE("[%04x] %d\n", hwnd, infoPtr->nBorder);
+    TRACE("[%p] %d\n", hwnd, infoPtr->nBorder);
 
     PAGER_RecalcSize(hwnd);
@@ -680 +712 @@
 
     infoPtr->nButtonSize = (INT)lParam;
-    TRACE("[%04x] %d\n", hwnd, infoPtr->nButtonSize);
+    TRACE("[%p] %d\n", hwnd, infoPtr->nButtonSize);
 
     PAGER_RecalcSize(hwnd);
@@ -698 +730 @@
     if (infoPtr->hwndChild)
     {
-        TRACE("[%04x] hwndChild=%04x\n", hwnd, infoPtr->hwndChild);
+        TRACE("[%p] hwndChild=%p\n", hwnd, infoPtr->hwndChild);
 
         if (PAGER_IsHorizontal(hwnd)) {
             hw = PAGER_SetFixedHeight(hwnd, infoPtr);
             /* adjust non-scrollable dimension to fit the child */
-            SetWindowPos(hwnd, 0, 0,0, hw, infoPtr->nHeight, 
+            SetWindowPos(hwnd, 0, 0,0, hw, infoPtr->nHeight,
                          SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER |
                          SWP_NOSIZE | SWP_NOACTIVATE);
@@ -710 +742 @@
             hw = PAGER_SetFixedWidth(hwnd, infoPtr);
             /* adjust non-scrollable dimension to fit the child */
-            SetWindowPos(hwnd, 0, 0,0, infoPtr->nWidth, hw, 
+            SetWindowPos(hwnd, 0, 0,0, infoPtr->nWidth, hw,
                          SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER |
                          SWP_NOSIZE | SWP_NOACTIVATE);
@@ -741 +773 @@
         nmpgScroll.hdr.code = PGN_SCROLL;
 
-        GetWindowRect(hwnd, &rcWnd);  
-        GetClientRect(hwnd, &nmpgScroll.rcParent);  
+        GetWindowRect(hwnd, &rcWnd);
+        GetClientRect(hwnd, &nmpgScroll.rcParent);
         nmpgScroll.iXpos = nmpgScroll.iYpos = 0;
         nmpgScroll.iDir = dir;
@@ -757 +789 @@
         }
         nmpgScroll.iScroll -= 2*infoPtr->nButtonSize;
-  
-        SendMessageA (hwnd, WM_NOTIFY,
+
+        SendMessageA (GetParent(hwnd), WM_NOTIFY,
                     (WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll);
-  
-        TRACE("[%04x] PGN_SCROLL returns iScroll=%d\n", hwnd, nmpgScroll.iScroll);
+
+        TRACE("[%p] PGN_SCROLL returns iScroll=%d\n", hwnd, nmpgScroll.iScroll);
 
         if (nmpgScroll.iScroll > 0)
@@ -783 +815 @@
 
     /* initiate NCCalcSize to resize client wnd and get size */
-    SetWindowPos(hwnd, 0, 0,0,0,0, 
+    SetWindowPos(hwnd, 0, 0,0,0,0,
                  SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
                  SWP_NOZORDER | SWP_NOACTIVATE);
 
-    SetWindowPos(infoPtr->hwndChild, 0, 
-                 0,0,infoPtr->nWidth,infoPtr->nHeight, 
+    SetWindowPos(infoPtr->hwndChild, 0,
+                 0,0,infoPtr->nWidth,infoPtr->nHeight,
                  0);
 
@@ -814 +846 @@
     infoPtr->nHeight = 0;
     infoPtr->bForward = FALSE;
+    infoPtr->bCapture = FALSE;
     infoPtr->TLbtnState = PGF_INVISIBLE;
     infoPtr->BRbtnState = PGF_INVISIBLE;
     infoPtr->direction = -1;
 
-    if (dwStyle & PGS_AUTOSCROLL)
-        FIXME("[%04x] Autoscroll style is not implemented yet.\n", hwnd);
     if (dwStyle & PGS_DRAGNDROP)
-        FIXME("[%04x] Drag and Drop style is not implemented yet.\n", hwnd);
+        FIXME("[%p] Drag and Drop style is not implemented yet.\n", hwnd);
     /*
          * If neither horizontal nor vertical style specified, default to vertical.
@@ -852 +883 @@
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     LPRECT lpRect = (LPRECT)lParam;
-    RECT rcChildw, rcmyw, wnrc, lbrc, rbrc;
+    RECT rcChildw, rcmyw, wnrc, ltrc, rbrc;
     POINT cursor;
     BOOL resizeClient = FALSE;
@@ -860 +891 @@
     /*
      * lParam points to a RECT struct.  On entry, the struct
-     * contains the proposed wnd rectangle for the window. 
+     * contains the proposed wnd rectangle for the window.
      * On exit, the struct should contain the screen
      * coordinates of the corresponding window's client area.
      */
-        
+
     DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
 
@@ -882 +913 @@
         scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left);
 
-        TRACE("nPos=%d, scrollrange=%d, nWidth=%d, myw=(%d,%d)-(%d,%d)\n",
-              infoPtr->nPos, scrollRange, infoPtr->nWidth,
-              rcmyw.left, rcmyw.top, rcmyw.right, rcmyw.bottom);
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n",
+              infoPtr->nPos, scrollRange, infoPtr->nHeight,
+              rcmyw.left, rcmyw.top,
+              rcmyw.right, rcmyw.bottom,
+              cursor.x, cursor.y);
         PAGER_GrayAndRestoreBtns(infoPtr, scrollRange, &resizeClient, &repaintBtns);
         PAGER_HideGrayBtns(infoPtr, &resizeClient);
@@ -890 +923 @@
         if (PtInRect (&rcmyw, cursor)) {
             GetWindowRect (hwnd, &wnrc);
-            lbrc = wnrc;
-            lbrc.right = lbrc.left + infoPtr->nButtonSize;
+            ltrc = wnrc;
+            ltrc.right = ltrc.left + infoPtr->nButtonSize;
             rbrc = wnrc;
             rbrc.left = rbrc.right - infoPtr->nButtonSize;
-            TRACE("horz lb rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
-                  lbrc.left, lbrc.top, lbrc.right, lbrc.bottom,
+            TRACE("horz lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+                  ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
                   rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
-            if (PtInRect (&lbrc, cursor) && infoPtr->TLbtnState)
+            if (PtInRect (&ltrc, cursor) && infoPtr->TLbtnState)
                 RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
             if (PtInRect (&rbrc, cursor) && infoPtr->BRbtnState)
@@ -909 +942 @@
     else
     {
-        /* native does: (from trace of IE4 opening "Favorites" frame) 
+        /* native does: (from trace of IE4 opening "Favorites" frame)
          *        DefWindowProc
          *        WM_NOITFY  PGN_CALCSIZE w/ dwFlag=2
@@ -929 +962 @@
         scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top);
 
-        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d)\n",
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n",
               infoPtr->nPos, scrollRange, infoPtr->nHeight,
               rcmyw.left, rcmyw.top,
-              rcmyw.right, rcmyw.bottom);
+              rcmyw.right, rcmyw.bottom,
+              cursor.x, cursor.y);
         PAGER_GrayAndRestoreBtns(infoPtr, scrollRange, &resizeClient, &repaintBtns);
         PAGER_HideGrayBtns(infoPtr, &resizeClient);
@@ -949 +983 @@
 
             GetWindowRect (hwnd, &wnrc);
-            lbrc = wnrc;
-            lbrc.right = lbrc.left + infoPtr->nButtonSize;
+            ltrc = wnrc;
+            ltrc.right = ltrc.left + infoPtr->nButtonSize;
             rbrc = wnrc;
             rbrc.left = rbrc.right - infoPtr->nButtonSize;
-            TRACE("vert lb rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
-                  lbrc.left, lbrc.top, lbrc.right, lbrc.bottom,
+            TRACE("vert lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+                  ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
                   rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
-            if (PtInRect (&lbrc, cursor) && infoPtr->TLbtnState)
+            if (PtInRect (&ltrc, cursor) && infoPtr->TLbtnState)
                 RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
             if (PtInRect (&rbrc, cursor) && infoPtr->BRbtnState)
@@ -970 +1004 @@
     }
 
-    TRACE("[%04x] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n", 
+    TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
           hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
           lpRect->left, lpRect->top,
@@ -1013 +1047 @@
                      bHorizontal, TRUE, infoPtr->TLbtnState);
     PAGER_DrawButton(hdc, infoPtr->clrBk, rcBottomRight,
-                     bHorizontal, FALSE, infoPtr->BRbtnState); 
+                     bHorizontal, FALSE, infoPtr->BRbtnState);
 
     ReleaseDC( hwnd, hdc );
@@ -1019 +1053 @@
 }
 
-static INT 
+static INT
 PAGER_HitTest (HWND hwnd, LPPOINT pt)
 {
@@ -1030 +1064 @@
     if (PtInRect(&clientRect, *pt))
     {
-       /* TRACE("HTCLIENT\n"); */
+        TRACE("HTCLIENT\n");
         return HTCLIENT;
     }
@@ -1040 +1074 @@
             if (pt->x < clientRect.left)
             {
-                /* TRACE("HTLEFT\n"); */
+                TRACE("HTLEFT\n");
                 return HTLEFT;
             }
@@ -1048 +1082 @@
             if (pt->y < clientRect.top)
             {
-                /* TRACE("HTTOP\n"); */
+                TRACE("HTTOP\n");
                 return HTTOP;
             }
@@ -1060 +1094 @@
             if (pt->x > clientRect.right)
             {
-                /* TRACE("HTRIGHT\n"); */
+                TRACE("HTRIGHT\n");
                 return HTRIGHT;
             }
@@ -1068 +1102 @@
             if (pt->y > clientRect.bottom)
             {
-               /* TRACE("HTBOTTOM\n"); */
+                TRACE("HTBOTTOM\n");
                 return HTBOTTOM;
             }
@@ -1074 +1108 @@
     }
 
-    /* TRACE("HTNOWHERE\n"); */
+    TRACE("HTNOWHERE\n");
     return HTNOWHERE;
 }
@@ -1081 +1115 @@
 PAGER_NCHitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    POINT pt = { SLOWORD(lParam), SHIWORD(lParam) };
+    POINT pt;
+
+    pt.x = SLOWORD(lParam);
+    pt.y = SHIWORD(lParam);
+
     ScreenToClient (hwnd, &pt);
     return PAGER_HitTest(hwnd, &pt);
@@ -1110 +1148 @@
     if (notCaptured)
     {
-        TRACKMOUSEEVENT trackinfo;
-
-        TRACE("[%04x] SetCapture\n", hwnd);
-        SetCapture(hwnd);
-
-        trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
-        trackinfo.dwFlags = TME_QUERY;
-        trackinfo.hwndTrack = hwnd;
-        trackinfo.dwHoverTime = HOVER_DEFAULT;
-
-        /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */
-        _TrackMouseEvent(&trackinfo);
-
-        /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */
-        if(!(trackinfo.dwFlags & TME_LEAVE)) {
-            trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
- 
-           /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
-           /* and can properly deactivate the hot button */
-           _TrackMouseEvent(&trackinfo);
-        }
-
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
+        PAGER_CaptureandTrack(infoPtr, hwnd);
+
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
     }
 
@@ -1146 +1164 @@
     KillTimer (hwnd, TIMERID2);
 
-    TRACE("[%04x] ReleaseCapture\n", hwnd);
+    TRACE("[%p] ReleaseCapture\n", hwnd);
     ReleaseCapture();
+    infoPtr->bCapture = FALSE;
 
     /* Notify parent of released mouse capture */
@@ -1167 +1186 @@
 
 static LRESULT
+PAGER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    POINT clpt, pt;
+    RECT wnrect, TLbtnrect, BRbtnrect, *btnrect = NULL;
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+    BOOL topLeft = FALSE;
+    INT btnstate = 0;
+    INT hit;
+    HDC hdc;
+
+    pt.x = SLOWORD(lParam);
+    pt.y = SHIWORD(lParam);
+
+    TRACE("[%p] to (%ld,%ld)\n", hwnd, pt.x, pt.y);
+    ClientToScreen(hwnd, &pt);
+    GetWindowRect(hwnd, &wnrect);
+    if (PtInRect(&wnrect, pt)) {
+        TLbtnrect = wnrect;
+        BRbtnrect = wnrect;
+        if (dwStyle & PGS_HORZ) {
+            TLbtnrect.right = TLbtnrect.left + infoPtr->nButtonSize;
+            BRbtnrect.left = BRbtnrect.right - infoPtr->nButtonSize;
+        }
+        else {
+            TLbtnrect.bottom = TLbtnrect.top + infoPtr->nButtonSize;
+            BRbtnrect.top = BRbtnrect.bottom - infoPtr->nButtonSize;
+        }
+
+        clpt = pt;
+        MapWindowPoints(0, hwnd, &clpt, 1);
+        hit = PAGER_HitTest(hwnd, &clpt);
+        if (hit == HTLEFT || hit == HTTOP) {
+            topLeft = TRUE;
+            btnrect = &TLbtnrect;
+            infoPtr->TLbtnState = PGF_DEPRESSED;
+            btnstate = infoPtr->TLbtnState;
+        }
+        else if (hit == HTRIGHT || hit == HTBOTTOM) {
+            topLeft = FALSE;
+            btnrect = &BRbtnrect;
+            infoPtr->BRbtnState = PGF_DEPRESSED;
+            btnstate = infoPtr->BRbtnState;
+        }
+
+        /* 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",
+                  hwnd, btnrect->left, btnrect->top,
+                  btnrect->right, btnrect->bottom,
+                  (infoPtr->bCapture) ? "TRUE" : "FALSE",
+                  dwStyle);
+            if (!infoPtr->bCapture)
+                PAGER_CaptureandTrack(infoPtr, hwnd);
+            if (dwStyle & PGS_AUTOSCROLL)
+                SetTimer(hwnd, TIMERID1, 0x3e, 0);
+            MapWindowPoints(0, hwnd, (LPPOINT)btnrect, 2);
+            hdc = GetWindowDC(hwnd);
+            /* OffsetRect(wnrect, 0 | 1, 0 | 1) */
+            PAGER_DrawButton(hdc, infoPtr->clrBk, *btnrect,
+                             PAGER_IsHorizontal(hwnd), topLeft, btnstate);
+            ReleaseDC(hwnd, hdc);
+            return DefWindowProcA (hwnd, WM_MOUSEMOVE, wParam, lParam);
+        }
+    }
+
+    /* If we think we are captured, then do release */
+    if (infoPtr->bCapture) {
+        infoPtr->bCapture = FALSE;
+
+        if (GetCapture() == hwnd) {
+            ReleaseCapture();
+            /* Notify parent of released mouse capture */
+            {
+                NMHDR nmhdr;
+                ZeroMemory (&nmhdr, sizeof (NMHDR));
+                nmhdr.hwndFrom = hwnd;
+                nmhdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+                nmhdr.code = NM_RELEASEDCAPTURE;
+                SendMessageA (GetParent(hwnd), WM_NOTIFY,
+                              (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+            }
+        }
+        if (IsWindow(hwnd))
+            KillTimer(hwnd, TIMERID1);
+    }
+    return DefWindowProcA (hwnd, WM_MOUSEMOVE, wParam, lParam);
+}
+
+static LRESULT
 PAGER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     BOOL repaintBtns = FALSE;
-    POINT pt = { SLOWORD(lParam), SHIWORD(lParam) };
+    POINT pt;
     INT hit;
 
-    TRACE("[%04x]\n", hwnd);
-        
+    pt.x = SLOWORD(lParam);
+    pt.y = SHIWORD(lParam);
+
+    TRACE("[%p] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
+
     hit = PAGER_HitTest(hwnd, &pt);
 
@@ -1183 +1295 @@
         repaintBtns = infoPtr->TLbtnState != PGF_DEPRESSED;
         infoPtr->TLbtnState = PGF_DEPRESSED;
-        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
+        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
     }
     else if (hit == HTRIGHT || hit == HTBOTTOM)
@@ -1189 +1301 @@
         repaintBtns = infoPtr->BRbtnState != PGF_DEPRESSED;
         infoPtr->BRbtnState = PGF_DEPRESSED;
-        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
+        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
     }
 
     if (repaintBtns)
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
 
     switch(hit)
     {
     case HTLEFT:
-        TRACE("[%04x] PGF_SCROLLLEFT\n", hwnd);
+        TRACE("[%p] PGF_SCROLLLEFT\n", hwnd);
         PAGER_Scroll(hwnd, PGF_SCROLLLEFT);
         break;
     case HTTOP:
-        TRACE("[%04x] PGF_SCROLLUP\n", hwnd);
+        TRACE("[%p] PGF_SCROLLUP\n", hwnd);
         PAGER_Scroll(hwnd, PGF_SCROLLUP);
         break;
     case HTRIGHT:
-        TRACE("[%04x] PGF_SCROLLRIGHT\n", hwnd);
+        TRACE("[%p] PGF_SCROLLRIGHT\n", hwnd);
         PAGER_Scroll(hwnd, PGF_SCROLLRIGHT);
         break;
     case HTBOTTOM:
-        TRACE("[%04x] PGF_SCROLLDOWN\n", hwnd);
+        TRACE("[%p] PGF_SCROLLDOWN\n", hwnd);
         PAGER_Scroll(hwnd, PGF_SCROLLDOWN);
         break;
@@ -1224 +1336 @@
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
-    TRACE("[%04x]\n", hwnd);
+    TRACE("[%p]\n", hwnd);
 
     KillTimer (hwnd, TIMERID1);
@@ -1232 +1344 @@
     PAGER_UpdateBtns(hwnd, infoPtr, -1, FALSE);
 
+    return 0;
+}
+
+static LRESULT
+PAGER_NCLButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    POINT pt;
+
+    pt.x = SLOWORD(lParam);
+    pt.y = SHIWORD(lParam);
+
+    TRACE("[%p] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
+    MapWindowPoints(0, hwnd, &pt, 1);
+    lParam = MAKELONG(pt.x, pt.y);
+    return PAGER_LButtonDown (hwnd, wParam, lParam);
+}
+
+static LRESULT
+PAGER_Timer (HWND hwnd, WPARAM wParam)
+{
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+    INT dir;
+
+    /* if initial timer, kill it and start the repeat timer */
+    if (wParam == TIMERID1) {
+        if (PAGER_IsHorizontal(hwnd)) {
+            dir = (infoPtr->TLbtnState & PGF_DEPRESSED) ?
+                PGF_SCROLLLEFT : PGF_SCROLLRIGHT;
+        }
+        else {
+            dir = (infoPtr->TLbtnState & PGF_DEPRESSED) ?
+                PGF_SCROLLUP : PGF_SCROLLDOWN;
+        }
+        TRACE("[%p] TIMERID1: style=%08lx, dir=%d\n", hwnd, dwStyle, dir);
+        KillTimer(hwnd, TIMERID1);
+        SetTimer(hwnd, TIMERID1, REPEAT_DELAY, 0);
+        if (dwStyle & PGS_AUTOSCROLL) {
+            PAGER_Scroll(hwnd, dir);
+            SetWindowPos(hwnd, 0,0,0,0,0,
+                         SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
+                         SWP_NOZORDER | SWP_NOACTIVATE);
+        }
+        return 0;
+
+    }
+
+    TRACE("[%p] TIMERID2: dir=%d\n", hwnd, infoPtr->direction);
+    KillTimer(hwnd, TIMERID2);
+    if (infoPtr->direction > 0) {
+        PAGER_Scroll(hwnd, infoPtr->direction);
+        SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);
+    }
     return 0;
 }
@@ -1288 +1453 @@
 
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
-    TRACE("[%04x] %dx%d\n", hwnd, LOWORD(lParam), HIWORD(lParam));
+    TRACE("[%p] %dx%d\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
 
     if (PAGER_IsHorizontal(hwnd))
-        infoPtr->nHeight = HIWORD(lParam);
+        infoPtr->nHeight = SHIWORD(lParam);
     else
-        infoPtr->nWidth = LOWORD(lParam);
+        infoPtr->nWidth = SLOWORD(lParam);
 
     return PAGER_RecalcSize(hwnd);
@@ -1334 +1499 @@
         case PGM_RECALCSIZE:
             return PAGER_RecalcSize(hwnd);
-    
+
         case PGM_SETBKCOLOR:
             return PAGER_SetBkColor (hwnd, wParam, lParam);
@@ -1382 +1547 @@
             if (infoPtr->bForward && infoPtr->hwndChild)
                 PostMessageA(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam);
-            return TRUE;                        
+            return PAGER_MouseMove (hwnd, wParam, lParam);
 
         case WM_MOUSELEAVE:
-            return PAGER_MouseLeave (hwnd, wParam, lParam);     
+            return PAGER_MouseLeave (hwnd, wParam, lParam);
+
+        case WM_NCLBUTTONDOWN:
+            return PAGER_NCLButtonDown (hwnd, wParam, lParam);
 
         case WM_LBUTTONDOWN:
             return PAGER_LButtonDown (hwnd, wParam, lParam);
 
+        case WM_NCLBUTTONUP:
         case WM_LBUTTONUP:
             return PAGER_LButtonUp (hwnd, wParam, lParam);
@@ -1397 +1566 @@
 /*
         case WM_PAINT:
-            return PAGER_Paint (hwnd, wParam); 
+            return PAGER_Paint (hwnd, wParam);
 */
         case WM_TIMER:
-            /* if initial timer, kill it and start the repeat timer */
-            if (wParam == TIMERID1)
-            {
-                KillTimer(hwnd, TIMERID1);
-                SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);
-            }
-
-            KillTimer(hwnd, TIMERID2);
-            if (infoPtr->direction > 0)
-            {
-                PAGER_Scroll(hwnd, infoPtr->direction);
-                SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);          
-            }
-            break;
+            return PAGER_Timer (hwnd, wParam);
 
         case WM_NOTIFY:
@@ -1440 +1596 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = WC_PAGESCROLLERA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -1450 +1606 @@
     UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
 }
-

trunk/src/comctl32/progress.c

@@ -1 @@
-/*              
+/*
  * Progress control
  *
@@ -18 +18 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * NOTE
+ * 
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Sep. 9, 2002, by Dimitrie O. Paun.
+ * 
+ * Unless otherwise noted, we belive this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ * 
+ * TODO
+ *   --support PBS_MARQUE
+ *
  */
 
@@ -43 +56 @@
 #define LED_GAP    2
 
-#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(       \
-   "Unknown parameter(s) for message " #msg            \
-   "(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam); 
-
-/***********************************************************************
- * PROGRESS_EraseBackground
- */
-static void PROGRESS_EraseBackground(PROGRESS_INFO *infoPtr, WPARAM wParam)
-{
+/***********************************************************************
+ * PROGRESS_Invalidate
+ *
+ * Invalide the range between old and new pos.
+ */
+static void PROGRESS_Invalidate( PROGRESS_INFO *infoPtr, INT old, INT new )
+{
+    LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE);
     RECT rect;
-    HBRUSH hbrBk;
-    HDC hdc = wParam ? (HDC)wParam : GetDC(infoPtr->Self);
-
-    /* get the required background brush */
-    if(infoPtr->ColorBk == CLR_DEFAULT)
-        hbrBk = GetSysColorBrush(COLOR_3DFACE);
+    int oldPos, newPos, ledWidth;
+
+    GetClientRect (infoPtr->Self, &rect);
+    InflateRect(&rect, -1, -1);
+
+    if (style & PBS_VERTICAL)
+    {
+        oldPos = rect.bottom - MulDiv (old - infoPtr->MinVal, rect.bottom - rect.top,
+                                       infoPtr->MaxVal - infoPtr->MinVal);
+        newPos = rect.bottom - MulDiv (new - infoPtr->MinVal, rect.bottom - rect.top,
+                                       infoPtr->MaxVal - infoPtr->MinVal);
+        ledWidth = MulDiv (rect.right - rect.left, 2, 3);
+        rect.top = min( oldPos, newPos );
+        rect.bottom = max( oldPos, newPos );
+        if (!(style & PBS_SMOOTH)) rect.top -= ledWidth;
+        InvalidateRect( infoPtr->Self, &rect, oldPos < newPos );
+    }
     else
-        hbrBk = CreateSolidBrush(infoPtr->ColorBk);
-
-    /* get client rectangle */
-    GetClientRect(infoPtr->Self, &rect);
-
-    /* draw the background */
-    FillRect(hdc, &rect, hbrBk);
-
-    /* delete background brush */
-    if(infoPtr->ColorBk != CLR_DEFAULT)
-        DeleteObject (hbrBk);
-
-    if(!wParam) ReleaseDC(infoPtr->Self, hdc);
-}
+    {
+        oldPos = rect.left + MulDiv (old - infoPtr->MinVal, rect.right - rect.left,
+                                     infoPtr->MaxVal - infoPtr->MinVal);
+        newPos = rect.left + MulDiv (new - infoPtr->MinVal, rect.right - rect.left,
+                                     infoPtr->MaxVal - infoPtr->MinVal);
+        ledWidth = MulDiv (rect.bottom - rect.top, 2, 3);
+        rect.left = min( oldPos, newPos );
+        rect.right = max( oldPos, newPos );
+        if (!(style & PBS_SMOOTH)) rect.right += ledWidth;
+        InvalidateRect( infoPtr->Self, &rect, oldPos > newPos );
+    }
+}
+
 
 /***********************************************************************
@@ -81 +103 @@
 static LRESULT PROGRESS_Draw (PROGRESS_INFO *infoPtr, HDC hdc)
 {
-    HBRUSH hbrBar;
+    HBRUSH hbrBar, hbrBk;
     int rightBar, rightMost, ledWidth;
     RECT rect;
     DWORD dwStyle;
 
-    TRACE("(infoPtr=%p, hdc=%x)\n", infoPtr, hdc);
+    TRACE("(infoPtr=%p, hdc=%p)\n", infoPtr, hdc);
 
     /* get the required bar brush */
@@ -94 +116 @@
         hbrBar = CreateSolidBrush (infoPtr->ColorBar);
 
+    if (infoPtr->ColorBk == CLR_DEFAULT)
+        hbrBk = GetSysColorBrush(COLOR_3DFACE);
+    else
+        hbrBk = CreateSolidBrush(infoPtr->ColorBk);
+
     /* get client rectangle */
     GetClientRect (infoPtr->Self, &rect);
-
+    FrameRect( hdc, &rect, hbrBk );
     InflateRect(&rect, -1, -1);
 
@@ -104 +131 @@
     /* compute extent of progress bar */
     if (dwStyle & PBS_VERTICAL) {
-        rightBar  = rect.bottom - 
+        rightBar  = rect.bottom -
                     MulDiv (infoPtr->CurVal - infoPtr->MinVal,
                             rect.bottom - rect.top,
@@ -111 +138 @@
         rightMost = rect.top;
     } else {
-        rightBar = rect.left + 
+        rightBar = rect.left +
                    MulDiv (infoPtr->CurVal - infoPtr->MinVal,
                            rect.right - rect.left,
@@ -120 +147 @@
 
     /* now draw the bar */
-    if (dwStyle & PBS_SMOOTH) {
-        if (dwStyle & PBS_VERTICAL) 
-            rect.top = rightBar;
-        else 
-            rect.right = rightBar;
-        FillRect(hdc, &rect, hbrBar);
+    if (dwStyle & PBS_SMOOTH)
+    {
+        if (dwStyle & PBS_VERTICAL)
+        {
+            INT old_top = rect.top;
+            rect.top = rightBar;
+            FillRect(hdc, &rect, hbrBar);
+            rect.bottom = rect.top;
+            rect.top = old_top;
+            FillRect(hdc, &rect, hbrBk);
+        }
+        else
+        {
+            INT old_right = rect.right;
+            rect.right = rightBar;
+            FillRect(hdc, &rect, hbrBar);
+            rect.left = rect.right;
+            rect.right = old_right;
+            FillRect(hdc, &rect, hbrBk);
+        }
     } else {
         if (dwStyle & PBS_VERTICAL) {
-            while(rect.bottom > rightBar) { 
+            while(rect.bottom > rightBar) {
                 rect.top = rect.bottom - ledWidth;
                 if (rect.top < rightMost)
                     rect.top = rightMost;
                 FillRect(hdc, &rect, hbrBar);
-                rect.bottom = rect.top - LED_GAP;
+                rect.bottom = rect.top;
+                rect.top -= LED_GAP;
+                if (rect.top <= rightBar) break;
+                FillRect(hdc, &rect, hbrBk);
+                rect.bottom = rect.top;
             }
+            rect.top = rightMost;
+            FillRect(hdc, &rect, hbrBk);
         } else {
-            while(rect.left < rightBar) { 
+            while(rect.left < rightBar) {
                 rect.right = rect.left + ledWidth;
                 if (rect.right > rightMost)
                     rect.right = rightMost;
                 FillRect(hdc, &rect, hbrBar);
-                rect.left  = rect.right + LED_GAP;
+                rect.left = rect.right;
+                rect.right += LED_GAP;
+                if (rect.right >= rightBar) break;
+                FillRect(hdc, &rect, hbrBk);
+                rect.left = rect.right;
             }
+            rect.right = rightMost;
+            FillRect(hdc, &rect, hbrBk);
         }
     }
 
     /* delete bar brush */
-    if (infoPtr->ColorBar != CLR_DEFAULT)
-        DeleteObject (hbrBar);
+    if (infoPtr->ColorBar != CLR_DEFAULT) DeleteObject (hbrBar);
+    if (infoPtr->ColorBk != CLR_DEFAULT) DeleteObject (hbrBk);
 
     return 0;
@@ -201 +254 @@
     /* if nothing changes, simply return */
     if(infoPtr->MinVal == low && infoPtr->MaxVal == high) return res;
-    
+
     infoPtr->MinVal = low;
     infoPtr->MaxVal = high;
@@ -211 +264 @@
  *           ProgressWindowProc
  */
-static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, 
+static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
                                   WPARAM wParam, LPARAM lParam)
 {
     PROGRESS_INFO *infoPtr;
 
-    TRACE("hwnd=%x msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam);
+    TRACE("hwnd=%p msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam);
 
     infoPtr = (PROGRESS_INFO *)GetWindowLongW(hwnd, 0);
 
     if (!infoPtr && message != WM_CREATE)
-        return DefWindowProcW( hwnd, message, wParam, lParam ); 
+        return DefWindowProcW( hwnd, message, wParam, lParam );
 
     switch(message) {
@@ -229 +282 @@
         dwExStyle &= ~(WS_EX_CLIENTEDGE | WS_EX_WINDOWEDGE);
         dwExStyle |= WS_EX_STATICEDGE;
-        SetWindowLongW (hwnd, GWL_EXSTYLE, dwExStyle | WS_EX_STATICEDGE);
+        SetWindowLongW (hwnd, GWL_EXSTYLE, dwExStyle);
         /* Force recalculation of a non-client area */
         SetWindowPos(hwnd, 0, 0, 0, 0, 0,
@@ -241 +294 @@
         /* initialize the info struct */
         infoPtr->Self = hwnd;
-        infoPtr->MinVal = 0; 
+        infoPtr->MinVal = 0;
         infoPtr->MaxVal = 100;
-        infoPtr->CurVal = 0; 
+        infoPtr->CurVal = 0;
         infoPtr->Step = 10;
         infoPtr->ColorBar = CLR_DEFAULT;
         infoPtr->ColorBk = CLR_DEFAULT;
         infoPtr->Font = 0;
-        TRACE("Progress Ctrl creation, hwnd=%04x\n", hwnd);
+        TRACE("Progress Ctrl creation, hwnd=%p\n", hwnd);
         return 0;
     }
-    
+
     case WM_DESTROY:
-        TRACE("Progress Ctrl destruction, hwnd=%04x\n", hwnd);
+        TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd);
         COMCTL32_Free (infoPtr);
         SetWindowLongW(hwnd, 0, 0);
         return 0;
 
-    case WM_ERASEBKGND:
-        PROGRESS_EraseBackground(infoPtr, wParam);
-        return TRUE;
-        
     case WM_GETFONT:
         return (LRESULT)infoPtr->Font;
 
     case WM_SETFONT:
-        return PROGRESS_SetFont (infoPtr, (HFONT)wParam, (BOOL)lParam);
+        return (LRESULT)PROGRESS_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam);
 
     case WM_PAINT:
         return PROGRESS_Paint (infoPtr, (HDC)wParam);
-    
+
     case PBM_DELTAPOS:
     {
         INT oldVal;
-        if(lParam) UNKNOWN_PARAM(PBM_DELTAPOS, wParam, lParam);
         oldVal = infoPtr->CurVal;
         if(wParam != 0) {
-            BOOL bErase;
             infoPtr->CurVal += (INT)wParam;
             PROGRESS_CoercePos (infoPtr);
             TRACE("PBM_DELTAPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal);
-            bErase = (oldVal > infoPtr->CurVal);
-            InvalidateRect(hwnd, NULL, bErase);
+            PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal );
         }
         return oldVal;
@@ -290 +336 @@
     {
         INT oldVal;
-        if (lParam) UNKNOWN_PARAM(PBM_SETPOS, wParam, lParam);
         oldVal = infoPtr->CurVal;
         if(oldVal != wParam) {
-            BOOL bErase;
             infoPtr->CurVal = (INT)wParam;
             PROGRESS_CoercePos(infoPtr);
             TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal);
-            bErase = (oldVal > infoPtr->CurVal);
-            InvalidateRect(hwnd, NULL, bErase);
+            PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal );
         }
         return oldVal;
     }
-      
+
     case PBM_SETRANGE:
-        if (wParam) UNKNOWN_PARAM(PBM_SETRANGE, wParam, lParam);
         return PROGRESS_SetRange (infoPtr, (int)LOWORD(lParam), (int)HIWORD(lParam));
 
@@ -310 +352 @@
     {
         INT oldStep;
-        if (lParam) UNKNOWN_PARAM(PBM_SETSTEP, wParam, lParam);
         oldStep = infoPtr->Step;
         infoPtr->Step = (INT)wParam;
@@ -319 +360 @@
     {
         INT oldVal;
-        if (wParam || lParam) UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
-        oldVal = infoPtr->CurVal;   
+        oldVal = infoPtr->CurVal;
         infoPtr->CurVal += infoPtr->Step;
         if(infoPtr->CurVal > infoPtr->MaxVal)
@@ -326 +366 @@
         if(oldVal != infoPtr->CurVal)
         {
-            BOOL bErase;
             TRACE("PBM_STEPIT: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal);
-            bErase = (oldVal > infoPtr->CurVal);
-            InvalidateRect(hwnd, NULL, bErase);
+            PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal );
         }
         return oldVal;
@@ -336 +374 @@
     case PBM_SETRANGE32:
         return PROGRESS_SetRange (infoPtr, (int)wParam, (int)lParam);
-    
+
     case PBM_GETRANGE:
         if (lParam) {
@@ -345 +383 @@
 
     case PBM_GETPOS:
-        if (wParam || lParam) UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
         return infoPtr->CurVal;
 
     case PBM_SETBARCOLOR:
-        if (wParam) UNKNOWN_PARAM(PBM_SETBARCOLOR, wParam, lParam);
         infoPtr->ColorBar = (COLORREF)lParam;
         InvalidateRect(hwnd, NULL, TRUE);
@@ -355 +391 @@
 
     case PBM_SETBKCOLOR:
-        if (wParam) UNKNOWN_PARAM(PBM_SETBKCOLOR, wParam, lParam);
         infoPtr->ColorBk = (COLORREF)lParam;
         InvalidateRect(hwnd, NULL, TRUE);
         return 0;
 
-    default: 
-        if (message >= WM_USER) 
+    default:
+        if ((message >= WM_USER) && (message < WM_APP))
             ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam );
-        return DefWindowProcW( hwnd, message, wParam, lParam ); 
-    } 
+        return DefWindowProcW( hwnd, message, wParam, lParam );
+    }
 }
 
@@ -398 +433 @@
     UnregisterClassW (PROGRESS_CLASSW, (HINSTANCE)NULL);
 }
-

trunk/src/comctl32/propsheet.c

@@ -25 +25 @@
 
 #include <string.h>
+
 #include "winbase.h"
 #include "commctrl.h"
@@ -30 +31 @@
 #include "winnls.h"
 #include "comctl32.h"
+#include "heap.h"
+
 #include "wine/debug.h"
-#include "heap.h"
-
+#include "wine/unicode.h"
 
 /******************************************************************************
  * Data structures
  */
+#include "pshpack2.h"
+
 typedef struct
 {
@@ -45 +49 @@
   DWORD style;
 } MyDLGTEMPLATEEX;
+
+typedef struct
+{
+  DWORD helpid;
+  DWORD exStyle;
+  DWORD style;
+  short x;
+  short y;
+  short cy;
+  DWORD id;
+} MyDLGITEMTEMPLATEEX;
+#include "poppack.h"
 
 typedef struct tagPropPageInfo
@@ -89 +105 @@
  */
 
-const WCHAR PropSheetInfoStr[] = 
+const WCHAR PropSheetInfoStr[] =
     {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 };
 
@@ -139 +155 @@
                                 int skipdir,
                                 HPROPSHEETPAGE hpage);
+static void PROPSHEET_SetCurSelId(HWND hwndDlg, int id);
 static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg,
                                        WPARAM wParam, LPARAM lParam);
@@ -210 +227 @@
 
 /******************************************************************************
+ *            PROPSHEET_GetPageRect
+ *
+ * Retrieve rect from tab control and map into the dialog for SetWindowPos
+ */
+static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, RECT *rc)
+{
+    HWND hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
+
+    GetClientRect(hwndTabCtrl, rc);
+    SendMessageW(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)rc);
+    MapWindowPoints(hwndTabCtrl, hwndDlg, (LPPOINT)rc, 2);
+}
+
+/******************************************************************************
  *            PROPSHEET_FindPageByResId
  *
@@ -262 +293 @@
 
   memcpy(&psInfo->ppshheader,lppsh,dwSize);
-  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%04x\nhInstance\t%08x\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
+  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
         lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance,
         debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
@@ -313 +344 @@
 
   memcpy(&psInfo->ppshheader,lppsh,dwSize);
-  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%04x\nhInstance\t%08x\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
+  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
       lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
 
@@ -443 +474 @@
       p += lstrlenW( (LPCWSTR)p ) + 1;
       break;
-  } 
+  }
 
   /* class */
@@ -492 +523 @@
    * Build the image list for icons
    */
-  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID)) 
+  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID))
   {
     HICON hIcon;
@@ -499 +530 @@
 
     if (dwFlags & PSP_USEICONID)
-      hIcon = LoadImageW(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON, 
+      hIcon = LoadImageW(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON,
                          icon_cx, icon_cy, LR_DEFAULTCOLOR);
     else
@@ -569 +600 @@
                                        psInfo->ppshheader.hwndParent,
                                        (DLGPROC) PROPSHEET_DialogProc,
-                                       (LPARAM)psInfo);
+                                       (LPARAM)psInfo) ? TRUE : FALSE;
 
   COMCTL32_Free(temp);
@@ -578 +609 @@
 /******************************************************************************
  *            PROPSHEET_SizeMismatch
- * 
+ *
  *     Verify that the tab control and the "largest" property sheet page dlg. template
  *     match in size.
@@ -702 +733 @@
       psInfo->height = MulDiv((rc.bottom - rc.top),8,units.top);
   }
-  
+
   if ((rc.right - rc.left) < (tabRect.right - tabRect.left))
   {
@@ -716 +747 @@
   rc.right -= rc.left;
   rc.bottom -= rc.top;
+  TRACE("setting tab %08lx, rc (0,0)-(%d,%d)\n",
+        (DWORD)hwndTabCtrl, rc.right, rc.bottom);
   SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -730 +763 @@
    * Resize the property sheet.
    */
+  TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+        (DWORD)hwndDlg, rc.right, rc.bottom);
   SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -779 +814 @@
       psInfo->height = MulDiv((rc.bottom - rc.top), 8, units.top);
   }
-  
+
   if ((rc.right - rc.left) < (tabRect.right - tabRect.left))
   {
@@ -787 +822 @@
 
   TRACE("Biggest page %d %d %d %d\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);
 
   /* Make room */
@@ -795 +832 @@
    * Resize the property sheet.
    */
+  TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+        (DWORD)hwndDlg, rc.right, rc.bottom);
   SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -829 +868 @@
   /*
    * Get the size of the property sheet.
-   */ 
+   */
   GetClientRect(hwndParent, &rcSheet);
 
-  /* 
+  /*
    * All buttons will be at this y coordinate.
    */
@@ -868 +907 @@
     else
       x = rcSheet.right - (padding.x + buttonWidth);
-  
+
     SetWindowPos(hwndButton, 0, x, y, 0, 0,
                  SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -885 +924 @@
   {
     x = rcSheet.right - (padding.x + buttonWidth);
-  
+
     SetWindowPos(hwndButton, 0, x, y, 0, 0,
                  SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -1064 +1103 @@
     }
   }
-  
+
   hwndControl = GetDlgItem(hwndDlg, idButton);
   GetWindowRect(hwndControl, &rc);
@@ -1136 +1175 @@
 
   return TRUE;
+}
+/*
+ * Get the size of an in-memory Template
+ *
+ *( Based on the code of PROPSHEET_CollectPageInfo)
+ */
+
+static UINT GetTemplateSize(DLGTEMPLATE* pTemplate)
+
+{
+  const WORD*  p = (const WORD *)pTemplate;
+  BOOL  istemplateex = (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF);
+  WORD nrofitems;
+
+  if (istemplateex)
+  {
+    /* DIALOGEX template */
+
+    p++;       /* dlgVer    */
+    p++;       /* signature */
+    p += 2;    /* help ID   */
+    p += 2;    /* ext style */
+    p += 2;    /* style     */
+  }
+  else
+  {
+    /* DIALOG template */
+
+    p += 2;    /* style     */
+    p += 2;    /* ext style */
+  }
+
+  nrofitems =   (WORD)*p; p++;    /* nb items */
+  p++;    /*   x      */
+  p++;    /*   y      */
+  p++;    /*   width  */
+  p++;    /*   height */
+
+  /* menu */
+  switch ((WORD)*p)
+  {
+    case 0x0000:
+      p++;
+      break;
+    case 0xffff:
+      p += 2;
+      break;
+    default:
+      TRACE("menu %s\n",debugstr_w((LPCWSTR)p));
+      p += lstrlenW( (LPCWSTR)p ) + 1;
+      break;
+  }
+
+  /* class */
+  switch ((WORD)*p)
+  {
+    case 0x0000:
+      p++;
+      break;
+    case 0xffff:
+      p += 2;
+      break;
+    default:
+      TRACE("class %s\n",debugstr_w((LPCWSTR)p));
+      p += lstrlenW( (LPCWSTR)p ) + 1;
+      break;
+  }
+
+  /*title */
+  TRACE("title %s\n",debugstr_w((LPCWSTR)p));
+  p += lstrlenW((LPCWSTR)p) + 1;
+
+  /* font, if DS_FONT set */
+  if ((DS_SETFONT & ((istemplateex)?  ((MyDLGTEMPLATEEX*)pTemplate)->style :
+                     pTemplate->style)))
+    {
+      p+=(istemplateex)?3:1;
+      TRACE("font %s\n",debugstr_w((LPCWSTR)p));
+      p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name*/
+    }
+
+  TRACE("%d items\n",nrofitems);
+  while (nrofitems > 0)
+    {
+      p = (WORD*)(((DWORD)p + 3) & ~3); /* DWORD align */
+      
+      p += (istemplateex ? sizeof(MyDLGITEMTEMPLATEEX) : sizeof(DLGITEMTEMPLATE))/sizeof(WORD);
+      
+      switch ((WORD)*p)
+        {
+        case 0x0000:
+          p++;
+          break;
+        case 0xffff:
+          TRACE("class ordinal 0x%08lx\n",*(DWORD*)p);
+          p += 2;
+          break;
+        default:
+          TRACE("class %s\n",debugstr_w((LPCWSTR)p));
+          p += lstrlenW( (LPCWSTR)p ) + 1;
+          break;
+        }
+      switch ((WORD)*p)
+        {
+        case 0x0000:
+          p++;
+          break;
+        case 0xffff:
+          TRACE("text ordinal 0x%08lx\n",*(DWORD*)p);
+          p += 2;
+          break;
+        default:
+          TRACE("text %s\n",debugstr_w((LPCWSTR)p));
+          p += lstrlenW( (LPCWSTR)p ) + 1;
+          break;
+        }
+      p += *p + 1;    /* Skip extra data */
+      --nrofitems;
+    }
+  
+  TRACE("%p %p size 0x%08x\n",p, (WORD*)pTemplate,sizeof(WORD)*(p - (WORD*)pTemplate));
+  return (p - (WORD*)pTemplate)*sizeof(WORD);
+  
 }
 
@@ -1165 +1327 @@
 
   if (ppshpage->dwFlags & PSP_DLGINDIRECT)
-    pTemplate = (DLGTEMPLATE*)ppshpage->u.pResource;
+    {
+      pTemplate = (DLGTEMPLATE*)ppshpage->u.pResource;
+      resSize = GetTemplateSize(pTemplate);
+    }
   else
   {
@@ -1187 +1352 @@
      * Make a copy of the dialog template to make it writable
      */
-    temp = COMCTL32_Alloc(resSize);
-    if (!temp)
-      return FALSE;
-
-    memcpy(temp, pTemplate, resSize);
-    pTemplate = temp;
-  }
+  }
+  temp = COMCTL32_Alloc(resSize);
+  if (!temp)
+    return FALSE;
+  
+  memcpy(temp, pTemplate, resSize);
+  pTemplate = temp;
 
   if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
@@ -1234 +1399 @@
   ppInfo[index].hwndPage = hwndPage;
 
-  rc.left = psInfo->x;
-  rc.top = psInfo->y;
-  rc.right = psInfo->width;
-  rc.bottom = psInfo->height;
-
-  MapDialogRect(hwndParent, &rc);
-
-  pageWidth = rc.right - rc.left;
-  pageHeight = rc.bottom - rc.top;
-
-  if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)
-    padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo);
-  else
-  {
-    /*
-     * Ask the Tab control to fit this page in.
-     */
-
-    HWND hwndTabCtrl = GetDlgItem(hwndParent, IDC_TABCONTROL);
-    SendMessageW(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)&rc);
-    padding = PROPSHEET_GetPaddingInfo(hwndParent);
-  }
-
-  SetWindowPos(hwndPage, HWND_TOP,
-               rc.left + padding.x/2,
-               rc.top + padding.y/2,
-               pageWidth, pageHeight, 0);
+  if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) {
+      /* FIXME: This code may no longer be correct.
+       *        It was not for the non-wizard path.  (GLA 6/02)
+       */
+      rc.left = psInfo->x;
+      rc.top = psInfo->y;
+      rc.right = psInfo->width;
+      rc.bottom = psInfo->height;
+
+      MapDialogRect(hwndParent, &rc);
+
+      pageWidth = rc.right - rc.left;
+      pageHeight = rc.bottom - rc.top;
+
+      padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo);
+      TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) 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);
+      SetWindowPos(hwndPage, HWND_TOP,
+                   rc.left + padding.x/2,
+                   rc.top + padding.y/2,
+                   pageWidth, pageHeight, 0);
+  }
+  else {
+      /*
+       * Ask the Tab control to reduce the client rectangle to that
+       * it has available.
+       */
+      PROPSHEET_GetPageRect(psInfo, hwndParent, &rc);
+      pageWidth = rc.right - rc.left;
+      pageHeight = rc.bottom - rc.top;
+      TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d\n",
+            (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
+            pageWidth, pageHeight);
+      SetWindowPos(hwndPage, HWND_TOP,
+                   rc.left, rc.top,
+                   pageWidth, pageHeight, 0);
+  }
 
   return TRUE;
@@ -1326 +1502 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1365 +1541 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1404 +1580 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1441 +1617 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
 
   /*
@@ -1458 +1634 @@
   psn.hdr.code = PSN_APPLY;
   psn.lParam   = lParam;
- 
+
   for (i = 0; i < psInfo->nPages; i++)
   {
@@ -1505 +1681 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
     return;
@@ -1511 +1687 @@
   psn.hdr.code = PSN_RESET;
   psn.lParam   = lParam;
- 
+
   for (i = 0; i < psInfo->nPages; i++)
   {
@@ -1548 +1724 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
@@ -1650 +1826 @@
 
 /*************************************************************************
- * BOOL PROPSHEET_CanSetCurSel [Internal] 
+ * BOOL PROPSHEET_CanSetCurSel [Internal]
  *
  * Test whether the current page can be changed by sending a PSN_KILLACTIVE
@@ -1710 +1886 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
   HWND hwndHelp  = GetDlgItem(hwndDlg, IDHELP);
+  HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
 
   TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage);
@@ -1725 +1902 @@
     int result;
     PSHNOTIFY psn;
+
+    if (hwndTabControl)
+        SendMessageW(hwndTabControl, TCM_SETCURSEL, index, 0);
 
     psn.hdr.code     = PSN_SETACTIVE;
@@ -1772 +1952 @@
 
 /******************************************************************************
+ *            PROPSHEET_SetCurSelId
+ *
+ * Selects the page, specified by resource id.
+ */
+static void PROPSHEET_SetCurSelId(HWND hwndDlg, int id)
+{
+      int idx;
+      PropSheetInfo* psInfo =
+          (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
+
+      idx = PROPSHEET_FindPageByResId(psInfo, id);
+      if (idx < psInfo->nPages )
+      {
+          if (PROPSHEET_CanSetCurSel(hwndDlg) != FALSE)
+              PROPSHEET_SetCurSel(hwndDlg, idx, 1, 0);
+      }
+}
+
+/******************************************************************************
  *            PROPSHEET_SetTitleA
  */
@@ -1779 +1978 @@
   {
      WCHAR szTitle[256];
-     MultiByteToWideChar(CP_ACP, 0, lpszText, -1, 
+     MultiByteToWideChar(CP_ACP, 0, lpszText, -1,
                              szTitle, sizeof szTitle);
      PROPSHEET_SetTitleW(hwndDlg, dwStyle, szTitle);
@@ -1799 +1998 @@
   TRACE("'%s' (style %08lx)\n", debugstr_w(lpszText), dwStyle);
   if (HIWORD(lpszText) == 0) {
-    if (!LoadStringW(psInfo->ppshheader.hInstance, 
+    if (!LoadStringW(psInfo->ppshheader.hInstance,
                      LOWORD(lpszText), szTitle, sizeof(szTitle)-sizeof(WCHAR)))
       return;
@@ -1930 +2129 @@
   item.pszText = (LPWSTR) psInfo->proppage[psInfo->nPages].pszText;
   item.cchTextMax = MAX_TABTEXT_LENGTH;
+
+  if (psInfo->hImageList)
+  {
+    SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList);
+  }
+
+  if ( psInfo->proppage[psInfo->nPages].hasIcon )
+  {
+    item.mask |= TCIF_IMAGE;
+    item.iImage = psInfo->nPages;
+  }
 
   SendMessageW(hwndTabControl, TCM_INSERTITEMW, psInfo->nPages + 1,
@@ -2021 +2231 @@
      DestroyPropertySheetPage(psInfo->proppage[index].hpage);
   }
- 
+
   /* Remove the tab */
   SendMessageW(hwndTabControl, TCM_DELETEITEM, index, 0);
@@ -2028 +2238 @@
   psInfo->proppage = COMCTL32_Alloc(sizeof(PropPageInfo) * psInfo->nPages);
 
-  if (index > 0)  
+  if (index > 0)
     memcpy(&psInfo->proppage[0], &oldPages[0], index * sizeof(PropPageInfo));
 
@@ -2156 +2366 @@
 
 /******************************************************************************
- *            PropertySheet    (COMCTL32.87)
- *            PropertySheetA   (COMCTL32.88)
+ *            PropertySheet    (COMCTL32.@)
+ *            PropertySheetA   (COMCTL32.@)
  */
 INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
@@ -2201 +2411 @@
 
 /******************************************************************************
- *            PropertySheetW   (COMCTL32.89)
+ *            PropertySheetW   (COMCTL32.@)
  */
 INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
@@ -2245 +2455 @@
 
 /******************************************************************************
- *            CreatePropertySheetPage    (COMCTL32.18)
- *            CreatePropertySheetPageA   (COMCTL32.19)
+ *            CreatePropertySheetPage    (COMCTL32.@)
+ *            CreatePropertySheetPageA   (COMCTL32.@)
  */
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
@@ -2257 +2467 @@
   if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u.pszTemplate ) )
   {
-      PROPSHEET_AtoW(&ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate); 
+      PROPSHEET_AtoW(&ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate);
   }
   if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) )
   {
-      PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); 
+      PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon);
   }
 
   if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle ))
   {
-      PROPSHEET_AtoW(&ppsp->pszTitle, lpPropSheetPage->pszTitle); 
+      PROPSHEET_AtoW(&ppsp->pszTitle, lpPropSheetPage->pszTitle);
   }
   else if ( !(ppsp->dwFlags & PSP_USETITLE) )
@@ -2275 +2485 @@
 
 /******************************************************************************
- *            CreatePropertySheetPageW   (COMCTL32.20)
+ *            CreatePropertySheetPageW   (COMCTL32.@)
  */
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
@@ -2310 +2520 @@
 
 /******************************************************************************
- *            DestroyPropertySheetPage   (COMCTL32.24)
+ *            DestroyPropertySheetPage   (COMCTL32.@)
  */
 BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
@@ -2456 +2666 @@
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", 
+  TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
         hwnd, uMsg, wParam, lParam);
 
@@ -2472 +2682 @@
 
       /*
-       * psInfo->hwnd is not being used by WINE code - it exists 
-       * for compatibility with "real" Windoze. The same about 
+       * psInfo->hwnd is not being used by WINE code - it exists
+       * for compatibility with "real" Windoze. The same about
        * SetWindowLong - WINE is only using the PropSheetInfoStr
        * property.
@@ -2499 +2709 @@
           hIcon = psInfo->ppshheader.u.hIcon;
 
-        SendMessageW(hwnd, WM_SETICON, 0, hIcon);
+        SendMessageW(hwnd, WM_SETICON, 0, (LPARAM)hIcon);
       }
-      
+
       if (psInfo->ppshheader.dwFlags & PSH_USEHICON)
-        SendMessageW(hwnd, WM_SETICON, 0, psInfo->ppshheader.u.hIcon);
+        SendMessageW(hwnd, WM_SETICON, 0, (LPARAM)psInfo->ppshheader.u.hIcon);
 
       psInfo->strPropertiesFor = strCaption;
@@ -2528 +2738 @@
       }
 
-      if (psInfo->useCallback) 
-             (*(psInfo->ppshheader.pfnCallback))(hwnd, 
-                                              PSCB_INITIALIZED, (LPARAM)0); 
+      if (psInfo->useCallback)
+             (*(psInfo->ppshheader.pfnCallback))(hwnd,
+                                              PSCB_INITIALIZED, (LPARAM)0);
 
       idx = psInfo->active_page;
       ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage;
       psInfo->active_page = -1;
- 
+
       PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage);
 
@@ -2548 +2758 @@
          WCHAR szText[256];
 
-         if (LoadStringW(psInfo->ppshheader.hInstance, 
+         if (LoadStringW(psInfo->ppshheader.hInstance,
                  (UINT)psInfo->ppshheader.pszCaption, szText, 255))
             PROPSHEET_SetTitleW(hwnd, psInfo->ppshheader.dwFlags, szText);
@@ -2601 +2811 @@
         hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-      SetWindowLongW(hwnd, DWL_MSGRESULT, hwndPage);
+      SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndPage);
 
       return TRUE;
@@ -2618 +2828 @@
       HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
 
-      SetWindowLongW(hwnd, DWL_MSGRESULT, hwndTabCtrl);
+      SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndTabCtrl);
 
       return TRUE;
@@ -2650 +2860 @@
       if (LoadStringW(COMCTL32_hModule, IDS_CLOSE, buf, sizeof(buf)))
          SetWindowTextW(hwndOK, buf);
- 
+
       return FALSE;
     }
@@ -2665 +2875 @@
     case PSM_REBOOTSYSTEM:
     {
-      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, 
+      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd,
                                                         PropSheetInfoStr);
 
@@ -2675 +2885 @@
       PROPSHEET_SetTitleA(hwnd, (DWORD) wParam, (LPCSTR) lParam);
       return TRUE;
-   
+
     case PSM_SETTITLEW:
       PROPSHEET_SetTitleW(hwnd, (DWORD) wParam, (LPCWSTR) lParam);
@@ -2731 +2941 @@
 
     case PSM_SETFINISHTEXTA:
-      PROPSHEET_SetFinishTextA(hwnd, (LPCSTR) lParam);        
+      PROPSHEET_SetFinishTextA(hwnd, (LPCSTR) lParam);
       return TRUE;
 
@@ -2739 +2949 @@
 
     case PSM_SETCURSELID:
-        FIXME("Unimplemented msg PSM_SETCURSELID\n");
-        return FALSE;
+        PROPSHEET_SetCurSelId(hwnd, (int)lParam);
+        return TRUE;
 
     case PSM_SETFINISHTEXTW:
-        PROPSHEET_SetFinishTextW(hwnd, (LPCWSTR) lParam);        
+        PROPSHEET_SetFinishTextW(hwnd, (LPCWSTR) lParam);
         return FALSE;
 
@@ -2749 +2959 @@
       return FALSE;
   }
-  
+
   return FALSE;
 }
-

trunk/src/comctl32/rebar.c

@@ -47 +47 @@
  *   - vertical placement
  *   - ComboBox and ComboBoxEx placement
- *   - center image 
+ *   - center image
  *   - Layout code.
  *   - Display code.
@@ -56 +56 @@
  *  rev 2,3,4
  *   - Implement initial version of row grouping, row separators,
- *     text and background colors. Support additional messages. 
+ *     text and background colors. Support additional messages.
  *     Support RBBS_BREAK. Implement ERASEBKGND and improve painting.
  *  rev 5
  *   - implement support for dragging Gripper left or right in a row. Supports
- *     WM_LBUTTONDOWN, WM_LBUTTONUP, and WM_MOUSEMOVE. Also support 
+ *     WM_LBUTTONDOWN, WM_LBUTTONUP, and WM_MOUSEMOVE. Also support
  *     RBS_BANDBORDERS.
  *  rev 6
@@ -69 +69 @@
  * rev 7
  *   - Fix algorithm for _Layout and _AdjustBand.
- *   - Fix or implement RBN_ENDDRAG, RB_MOVEBAND, WM_SETREDRAW, 
+ *   - Fix or implement RBN_ENDDRAG, RB_MOVEBAND, WM_SETREDRAW,
  *     WM_STYLECHANGED, RB_MINIMIZEBAND, RBBS_VARIABLEHEIGHT, RBS_VARHEIGHT,
  *     RBBS_HIDDEN, WM_NOTIFYFORMAT, NM_NCHITTEST, WM_SETREDRAW, RBS_AUTOSIZE,
@@ -88 +88 @@
  *     so that repainting is correct.
  *  8. Implement RB_MAXIMIZEBAND for the "ideal=TRUE" case.
- *  9. Implement item custom draw notifications partially. Only done for 
+ *  9. Implement item custom draw notifications partially. Only done for
  *     ITEMPREPAINT and ITEMPOSTPAINT. (Used by IE4 for "Favorites" frame
  *     to draw the word "Favorites").
@@ -97 +97 @@
  * 12. Fix CCS_VERT errors in _ForceResize, _NCCalcSize, and _NCPaint.
  * 13. Support some special cases of CCS_TOP (and therefore CCS_LEFT),
- *     CCS_BOTTOM (and therefore CCS_RIGHT) and CCS_NOPARENTALIGN. Not 
+ *     CCS_BOTTOM (and therefore CCS_RIGHT) and CCS_NOPARENTALIGN. Not
  *     at all sure whether this is all cases.
  * 14. Handle returned value for the RBN_CHILDSIZE notify.
@@ -122 +122 @@
  *            RBBS_USECHEVRON, CCS_NORESIZE,
  *            CCS_NOMOVEX, CCS_NOMOVEY
- *  3. Following are only partially handled: 
+ *  3. Following are only partially handled:
  *            RBS_AUTOSIZE, RBBS_VARIABLEHEIGHT
  *  5. Native uses (on each draw!!) SM_CYBORDER (or SM_CXBORDER for CCS_VERT)
- *     to set the size of the separator width (the value SEP_WIDTH_SIZE 
+ *     to set the size of the separator width (the value SEP_WIDTH_SIZE
  *     in here). Should be fixed!!
  *  6. The following messages are not implemented:
@@ -237 +237 @@
     BOOL     NtfUnicode;  /* TRUE if parent wants notify in W format */
     BOOL     DoRedraw;    /* TRUE to acutally draw bands */
-    UINT     fStatus;     /* Status flags (see below)  */ 
+    UINT     fStatus;     /* Status flags (see below)  */
     HCURSOR  hcurArrow;   /* handle to the arrow cursor */
     HCURSOR  hcurHorz;    /* handle to the EW cursor */
@@ -317 +317 @@
 
 /*  The following defines adjust the right or left end of a rectangle */
-#define READJ(b,i) {if(infoPtr->dwStyle & CCS_VERT) b->rcBand.bottom+=(i); \
-                    else b->rcBand.right += (i);}
-#define LEADJ(b,i) {if(infoPtr->dwStyle & CCS_VERT) b->rcBand.top+=(i); \
-                    else b->rcBand.left += (i);}
+#define READJ(b,i) do { if(infoPtr->dwStyle & CCS_VERT) b->rcBand.bottom+=(i); \
+                    else b->rcBand.right += (i); } while(0)
+#define LEADJ(b,i) do { if(infoPtr->dwStyle & CCS_VERT) b->rcBand.top+=(i); \
+                    else b->rcBand.left += (i); } while(0)
 
 
@@ -400 +400 @@
 {
     if( !TRACE_ON(rebar) ) return;
-    TRACE("band info: ID=%u, size=%u, child=%04x, clrF=0x%06lx, clrB=0x%06lx\n",
-          pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack); 
+    TRACE("band info: ID=%u, size=%u, child=%p, clrF=0x%06lx, clrB=0x%06lx\n",
+          pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack);
     TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask));
     if (pB->fMask & RBBIM_STYLE)
@@ -419 +419 @@
     if (pB->fMask & RBBIM_CHILDSIZE)
         TRACE("band info: xMin=%u, yMin=%u, yChild=%u, yMax=%u, yIntgl=%u\n",
-              pB->cxMinChild, 
+              pB->cxMinChild,
               pB->cyMinChild, pB->cyChild, pB->cyMaxChild, pB->cyIntegral);
 }
@@ -431 +431 @@
     if(! TRACE_ON(rebar) ) return;
 
-    TRACE("hwnd=%04x: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n", 
+    TRACE("hwnd=%p: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n",
           iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows,
           iP->calcSize.cx, iP->calcSize.cy);
-    TRACE("hwnd=%04x: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, ihitBand=%d\n",
+    TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, ihitBand=%d\n",
           iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y,
           iP->dragNow.x, iP->dragNow.y,
           iP->ihitBand);
-    TRACE("hwnd=%04x: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n",
+    TRACE("hwnd=%p: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n",
           iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE",
           (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE");
     for (i = 0; i < iP->uNumBands; i++) {
         pB = &iP->bands[i];
-        TRACE("band # %u: ID=%u, child=%04x, row=%u, clrF=0x%06lx, clrB=0x%06lx\n",
+        TRACE("band # %u: ID=%u, child=%p, row=%u, clrF=0x%06lx, clrB=0x%06lx\n",
               i, pB->wID, pB->hwndChild, pB->iRow, pB->clrFore, pB->clrBack);
         TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask));
         if (pB->fMask & RBBIM_STYLE)
-            TRACE("band # %u: style=0x%08x (%s)\n", 
+            TRACE("band # %u: style=0x%08x (%s)\n",
                   i, pB->fStyle, REBAR_FmtStyle(pB->fStyle));
-        TRACE("band # %u: uMinH=%u xHeader=%u", 
+        TRACE("band # %u: uMinH=%u xHeader=%u",
               i, pB->uMinHeight, pB->cxHeader);
         if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_LPARAM )) {
@@ -507 +507 @@
     nmhdr->code = code;
 
-    TRACE("window %04x, code=%08x, %s\n", parent, code,
+    TRACE("window %p, code=%08x, %s\n", parent, code,
           (infoPtr->NtfUnicode) ? "via Unicode" : "via ANSI");
 
@@ -605 +605 @@
         if (oldBkMode != TRANSPARENT)
             SetBkMode (hdc, oldBkMode);
-        if (lpBand->clrFore != CLR_NONE) 
+        if (lpBand->clrFore != CLR_NONE)
             SetTextColor (hdc, oldcolor);
         SelectObject (hdc, hOldFont);
@@ -636 +636 @@
         lpBand = &infoPtr->bands[i];
 
-        if (HIDDENBAND(lpBand)) continue; 
+        if (HIDDENBAND(lpBand)) continue;
 
         /* now draw the band */
-        TRACE("[%04x] drawing band %i, flags=%08x\n", 
+        TRACE("[%p] drawing band %i, flags=%08x\n",
               infoPtr->hwndSelf, i, lpBand->fDraw);
         REBAR_DrawBand (hdc, infoPtr, lpBand);
@@ -650 +650 @@
 REBAR_FixVert (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend,
                    INT mcy)
-     /* Function:                                                    */ 
+     /* Function:                                                    */
      /*   Cycle through bands in row and fix height of each band.    */
      /*   Also determine whether each band has changed.              */
@@ -719 +719 @@
     /*         or band's ->ccx reached.                       */
     /*  If any band modified, add any space left to last band */
-    /*  adjusted.                                             */ 
+    /*  adjusted.                                             */
     /*                                                        */
     /* ****************************************************** */
@@ -772 +772 @@
     if ((x >= maxx) || (last_adjusted != -1)) {
         if (x > maxx) {
-            ERR("Phase 1 failed, x=%d, maxx=%d, start=%u, end=%u\n", 
+            ERR("Phase 1 failed, x=%d, maxx=%d, start=%u, end=%u\n",
                 x, maxx,  rowstart, rowend);
         }
@@ -842 +842 @@
     if (x >= maxx) {
         if (x > maxx) {
-            ERR("Phase 2 failed, x=%d, maxx=%d, start=%u, end=%u\n", 
+            ERR("Phase 2 failed, x=%d, maxx=%d, start=%u, end=%u\n",
                 x, maxx,  rowstart, rowend);
         }
@@ -910 +910 @@
               /* if no gripper but either image or text, then leave space */
               xoff = REBAR_ALWAYS_SPACE;
-          SetRect (&lpBand->rcCapImage, 
+          SetRect (&lpBand->rcCapImage,
                    lpBand->rcBand.left+xoff, lpBand->rcBand.top,
                    lpBand->rcBand.left+xoff, lpBand->rcBand.bottom);
@@ -925 +925 @@
                    lpBand->rcCapImage.right+REBAR_POST_IMAGE, lpBand->rcBand.top+1,
                    lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.bottom-1);
-          /* update band height 
+          /* update band height
           if (lpBand->uMinHeight < infoPtr->imageSize.cy + 2) {
               lpBand->uMinHeight = infoPtr->imageSize.cy + 2;
@@ -940 +940 @@
       if (lpBand->fStatus & HAS_TEXT) {
           lpBand->fDraw |= DRAW_TEXT;
-          lpBand->rcCapText.right = max(lpBand->rcCapText.left, 
+          lpBand->rcCapText.right = max(lpBand->rcCapText.left,
                                         lpBand->rcCapText.right-REBAR_POST_TEXT);
       }
@@ -959 +959 @@
 
       /* flag if notify required and invalidate rectangle */
-      if (notify && 
+      if (notify &&
           ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) ||
            (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
@@ -971 +971 @@
       if (lpBand->fDraw & NTF_INVALIDATE) {
           TRACE("invalidating (%d,%d)-(%d,%d)\n",
-                lpBand->rcBand.left, 
+                lpBand->rcBand.left,
                 lpBand->rcBand.top,
-                lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0), 
+                lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0),
                 lpBand->rcBand.bottom + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0));
           lpBand->fDraw &= ~NTF_INVALIDATE;
@@ -1047 +1047 @@
                 xoff = REBAR_ALWAYS_SPACE;
             /* initialize Caption image rectangle  */
-            SetRect (&lpBand->rcCapImage, 
+            SetRect (&lpBand->rcCapImage,
                      lpBand->rcBand.left, lpBand->rcBand.top+xoff,
                      lpBand->rcBand.right, lpBand->rcBand.top+xoff);
@@ -1060 +1060 @@
 
             /* set initial caption text rectangle */
-            SetRect (&lpBand->rcCapText, 
+            SetRect (&lpBand->rcCapText,
                      lpBand->rcBand.left, lpBand->rcCapImage.bottom+REBAR_POST_IMAGE,
                      lpBand->rcBand.right, lpBand->rcBand.top+lpBand->cxHeader);
@@ -1071 +1071 @@
         else {
             /* set initial caption text rectangle */
-            SetRect (&lpBand->rcCapText, 
+            SetRect (&lpBand->rcCapText,
                      lpBand->rcBand.left, lpBand->rcCapImage.bottom,
                      lpBand->rcBand.right, lpBand->rcBand.top+lpBand->cxHeader);
@@ -1098 +1098 @@
 
         /* flag if notify required and invalidate rectangle */
-        if (notify && 
+        if (notify &&
             ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) ||
              (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
@@ -1110 +1110 @@
         if (lpBand->fDraw & NTF_INVALIDATE) {
             TRACE("invalidating (%d,%d)-(%d,%d)\n",
-                  lpBand->rcBand.left, 
+                  lpBand->rcBand.left,
                   lpBand->rcBand.top,
-                  lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0), 
+                  lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0),
                   lpBand->rcBand.bottom + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0));
             lpBand->fDraw &= ~NTF_INVALIDATE;
@@ -1225 +1225 @@
     }
 
-    TRACE("hwnd %08x, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
+    TRACE("hwnd %p, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
         infoPtr->hwndSelf, infoPtr->dwStyle,
         x, y, width, height);
@@ -1251 +1251 @@
         if (HIDDENBAND(lpBand)) continue;
         if (lpBand->hwndChild) {
-            TRACE("hwndChild = %x\n", lpBand->hwndChild);
+            TRACE("hwndChild = %p\n", lpBand->hwndChild);
 
             /* Always geterate the RBN_CHILDSIZE even it child
@@ -1259 +1259 @@
             rbcz.rcChild = lpBand->rcChild;
             rbcz.rcBand = lpBand->rcBand;
-            if (infoPtr->dwStyle & CCS_VERT) 
+            if (infoPtr->dwStyle & CCS_VERT)
                 rbcz.rcBand.top += lpBand->cxHeader;
             else
@@ -1297 +1297 @@
 
                 /* center combo box inside child area */
-                TRACE("moving child (Combo(Ex)) %04x to (%d,%d) for (%d,%d)\n",
+                TRACE("moving child (Combo(Ex)) %p to (%d,%d) for (%d,%d)\n",
                       lpBand->hwndChild,
                       lpBand->rcChild.left, yPos,
@@ -1312 +1312 @@
             }
             else {
-                TRACE("moving child (Other) %04x to (%d,%d) for (%d,%d)\n",
+                TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n",
                       lpBand->hwndChild,
                       lpBand->rcChild.left, lpBand->rcChild.top,
@@ -1401 +1401 @@
 
     /* save height of original control */
-    if (infoPtr->dwStyle & CCS_VERT) 
+    if (infoPtr->dwStyle & CCS_VERT)
         origheight = infoPtr->calcSize.cx;
     else
@@ -1440 +1440 @@
 
         /* separator from previous band */
-        cxsep = (cntonrow == 0) ? 0 : SEP_WIDTH;  
+        cxsep = (cntonrow == 0) ? 0 : SEP_WIDTH;
 
         /* Header: includes gripper, text, image */
-        cx = lpBand->cxHeader;   
+        cx = lpBand->cxHeader;
         if (lpBand->fStyle & RBBS_FIXEDSIZE) cx = lpBand->lcx;
 
@@ -1485 +1485 @@
         }
 
-        if (mcy < lpBand->lcy + REBARSPACE(lpBand)) 
+        if (mcy < lpBand->lcy + REBARSPACE(lpBand))
             mcy = lpBand->lcy + REBARSPACE(lpBand);
 
@@ -1514 +1514 @@
             bottomy = (lpRect) ? min(clientcy, y+cxsep+cx) : y+cxsep+cx;
             lpBand->rcBand.left   = x;
-            lpBand->rcBand.right  = x + min(mcy, 
+            lpBand->rcBand.right  = x + min(mcy,
                                             lpBand->lcy+REBARSPACE(lpBand));
             lpBand->rcBand.top    = min(bottomy, y + cxsep);
@@ -1528 +1528 @@
             lpBand->rcBand.right  = rightx;
             lpBand->rcBand.top    = y;
-            lpBand->rcBand.bottom = y + min(mcy, 
+            lpBand->rcBand.bottom = y + min(mcy,
                                             lpBand->lcy+REBARSPACE(lpBand));
             lpBand->uMinHeight = lpBand->lcy;
@@ -1616 +1616 @@
 
 /* FIXME:  problem # 2 */
-        if (((infoPtr->dwStyle & CCS_VERT) ? 
+        if (((infoPtr->dwStyle & CCS_VERT) ?
 #if PROBLEM2
              (x < adjcx) : (y < adjcy)
@@ -1698 +1698 @@
                         }
                     }
-                    if ((infoPtr->dwStyle & CCS_VERT) ? (x >= adjcx) : (y >= adjcy)) 
+                    if ((infoPtr->dwStyle & CCS_VERT) ? (x >= adjcx) : (y >= adjcy))
                         break; /* all done */
                 }
@@ -1762 +1762 @@
             if(HIDDENBAND(lpBand)) continue;
             if (lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
-            if (((INT)lpBand->cyMaxChild < 1) || 
+            if (((INT)lpBand->cyMaxChild < 1) ||
                 ((INT)lpBand->cyIntegral < 1)) {
                 if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
@@ -1770 +1770 @@
             }
             /* j is now the maximum height/width in the client area */
-            j = ((diff / lpBand->cyIntegral) * lpBand->cyIntegral) + 
+            j = ((diff / lpBand->cyIntegral) * lpBand->cyIntegral) +
                 ircBw(lpBand);
-            if (j > lpBand->cyMaxChild + REBARSPACE(lpBand)) 
+            if (j > lpBand->cyMaxChild + REBARSPACE(lpBand))
                 j = lpBand->cyMaxChild + REBARSPACE(lpBand);
             diff -= (j - ircBw(lpBand));
@@ -1828 +1828 @@
             mcy = 0;
 
-            TRACE("P3 processing row %d, starting band %d, ending band %d\n", 
+            TRACE("P3 processing row %d, starting band %d, ending band %d\n",
                   i, p->istartband, p->iendband);
 
@@ -1840 +1840 @@
 
             REBAR_AdjustBands (infoPtr, p->istartband, p->iendband,
-                               (infoPtr->dwStyle & CCS_VERT) ? 
+                               (infoPtr->dwStyle & CCS_VERT) ?
                                clientcy : clientcx, mcy);
         }
@@ -1850 +1850 @@
         }
         else {
-            REBAR_CalcHorzBand (infoPtr, 0, infoPtr->uNumBands, 
+            REBAR_CalcHorzBand (infoPtr, 0, infoPtr->uNumBands,
                                 notify);
         }
@@ -1876 +1876 @@
         TRACE("horz, notify=%d, y=%d, origheight=%d\n",
               notify, y, origheight);
-        if (notify && (y != origheight)) infoPtr->fStatus |= NTF_HGHTCHG; 
+        if (notify && (y != origheight)) infoPtr->fStatus |= NTF_HGHTCHG;
     }
 
@@ -1943 +1943 @@
     /* calculate gripper rectangle */
     if (  (!(lpBand->fStyle & RBBS_NOGRIPPER)) &&
-          ( (lpBand->fStyle & RBBS_GRIPPERALWAYS) || 
+          ( (lpBand->fStyle & RBBS_GRIPPERALWAYS) ||
             ( !(lpBand->fStyle & RBBS_FIXEDSIZE) && (nonfixed > 1)))
        ) {
@@ -2061 +2061 @@
         }
         else {
-            TRACE("child: 0x%x  prev parent: 0x%x\n",
+            TRACE("child: %p  prev parent: %p\n",
                    lpBand->hwndChild, lpBand->hwndPrevParent);
             lpBand->hwndChild = 0;
@@ -2186 +2186 @@
         rect = lpBand->rcBand;
         TRACE("%s background color=0x%06lx, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n",
-              (lpBand->clrBack == CLR_NONE) ? "none" : 
+              (lpBand->clrBack == CLR_NONE) ? "none" :
                 ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""),
               GetBkColor(hdc),
@@ -2393 +2393 @@
             if (i < ihitBand)
                 LHeaderSum += (band->lcx + SEP_WIDTH);
-            else 
+            else
                 RHeaderSum += (band->lcx + SEP_WIDTH);
 
@@ -2426 +2426 @@
     REBAR_DumpBand (infoPtr);
 
-    if (movement < 0) {  
+    if (movement < 0) {
 
         /* ***  Drag left/up *** */
@@ -2441 +2441 @@
             if (HIDDENBAND(band)) continue;
             if (i == ihitBand) {
-                LEADJ(band, movement)
+                LEADJ(band, movement);
             }
-            else 
+            else
                 movement = REBAR_Shrink (infoPtr, band, movement, i);
             band->ccx = rcBw(band);
@@ -2464 +2464 @@
             if (first) {
                 first = FALSE;
-                READJ(band, movement)
+                READJ(band, movement);
             }
-            else 
+            else
                 movement = REBAR_Shrink (infoPtr, band, movement, i);
             band->ccx = rcBw(band);
@@ -2478 +2478 @@
     }
     else {
-        REBAR_CalcHorzBand (infoPtr, imindBand, imaxdBand+1, 
+        REBAR_CalcHorzBand (infoPtr, imindBand, imaxdBand+1,
                             FALSE);
     }
@@ -2486 +2486 @@
     REBAR_DumpBand (infoPtr);
 
-    SetRect (&newrect, 
+    SetRect (&newrect,
              mindBand->rcBand.left,
              mindBand->rcBand.top,
@@ -2653 +2653 @@
               lprbbi->lpText[lprbbi->cch-1] = 0;
       }
-      else 
+      else
         *lprbbi->lpText = 0;
     }
@@ -2735 +2735 @@
       if (lpBand->lpText && (lpBand->fMask & RBBIM_TEXT))
         lstrcpynW (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
-      else 
+      else
         *lprbbi->lpText = 0;
     }
@@ -2916 +2916 @@
 REBAR_GetToolTips (REBAR_INFO *infoPtr)
 {
-    return infoPtr->hwndToolTip;
+    return (LRESULT)infoPtr->hwndToolTip;
 }
 
@@ -2923 +2923 @@
 REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr)
 {
-    TRACE("%s hwnd=0x%x\n", 
+    TRACE("%s hwnd=%p\n",
           infoPtr->bUnicode ? "TRUE" : "FALSE", infoPtr->hwndSelf);
 
@@ -2941 +2941 @@
 REBAR_HitTest (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam; 
+    LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam;
 
     if (!lprbht)
@@ -3250 +3250 @@
         startBand = uBand;
         endBand = iprevBand;
-        SetRect (&newrect, 
+        SetRect (&newrect,
                  lpBand->rcBand.left,
                  lpBand->rcBand.top,
@@ -3276 +3276 @@
         startBand = iprevBand;
         endBand = uBand;
-        SetRect (&newrect, 
+        SetRect (&newrect,
                  band->rcBand.left,
                  band->rcBand.top,
@@ -3291 +3291 @@
     }
     else {
-        REBAR_CalcHorzBand (infoPtr, startBand, endBand+1, 
+        REBAR_CalcHorzBand (infoPtr, startBand, endBand+1,
                             FALSE);
     }
@@ -3554 +3554 @@
     BOOL bTemp = infoPtr->bUnicode;
 
-    TRACE("to %s hwnd=0x%04x, was %s\n", 
+    TRACE("to %s hwnd=%p, was %s\n",
           ((BOOL)wParam) ? "TRUE" : "FALSE", infoPtr->hwndSelf,
           (bTemp) ? "TRUE" : "FALSE");
 
     infoPtr->bUnicode = (BOOL)wParam;
- 
+
    return bTemp;
 }
@@ -3879 +3879 @@
     /* issue WM_NOTIFYFORMAT to get unicode status of parent */
     i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
-                     WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+                     WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
     if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
         ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
@@ -3893 +3893 @@
     /* get font handle for Caption Font */
     ncm.cbSize = sizeof(NONCLIENTMETRICSA);
-    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 
+    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS,
                           ncm.cbSize, &ncm, 0);
     /* if the font is bold, set to normal */
@@ -3953 +3953 @@
     clpt = pt;
     ScreenToClient (infoPtr->hwndSelf, &clpt);
-    REBAR_InternalHitTest (infoPtr, &clpt, &scrap, 
+    REBAR_InternalHitTest (infoPtr, &clpt, &scrap,
                            (INT *)&nmmouse.dwItemSpec);
     nmmouse.dwItemData = 0;
@@ -3960 +3960 @@
     if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) {
         TRACE("notify changed return value from %ld to %d\n",
-              ret, i); 
+              ret, i);
         ret = (LRESULT) i;
     }
@@ -4002 +4002 @@
     if (lParam == NF_REQUERY) {
         i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
-                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+                         WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
         if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
             ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
@@ -4102 +4102 @@
       *
       * Documentation:
-      *  According to testing V4.71 of COMCTL32 returns the 
+      *  According to testing V4.71 of COMCTL32 returns the
       *  *previous* status of the redraw flag (either 0 or -1)
       *  instead of the MSDN documented value of 0 if handled
@@ -4110 +4110 @@
     BOOL oldredraw = infoPtr->DoRedraw;
 
-    TRACE("set to %s, fStatus=%08x\n", 
+    TRACE("set to %s, fStatus=%08x\n",
           (wParam) ? "TRUE" : "FALSE", infoPtr->fStatus);
     infoPtr->DoRedraw = (BOOL) wParam;
@@ -4153 +4153 @@
               rcWin.left, rcWin.top, rcWin.right, rcWin.bottom);
 
-        if ((lParam == 0) && (rcWin.right-rcWin.left == 0) && 
+        if ((lParam == 0) && (rcWin.right-rcWin.left == 0) &&
             (rcWin.bottom-rcWin.top == 0)) {
             /* native control seems to do this */
             GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient);
-            TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n", 
+            TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n",
                   rcClient.right, rcClient.bottom);
         }
@@ -4171 +4171 @@
             /* do the actual WM_SIZE request */
             GetClientRect (infoPtr->hwndSelf, &rcClient);
-            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", 
+            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
                   infoPtr->calcSize.cx, infoPtr->calcSize.cy,
                   LOWORD(lParam), HIWORD(lParam),
@@ -4191 +4191 @@
             /* native seems to use the current client rect for the size      */
             infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
-            TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n", 
+            TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n",
                   rcClient.right, rcClient.bottom);
         }
         else {
-            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", 
+            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
                   infoPtr->calcSize.cx, infoPtr->calcSize.cy,
                   LOWORD(lParam), HIWORD(lParam),
@@ -4209 +4209 @@
         autosize.rcActual = autosize.rcTarget;  /* ??? */
         REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE);
-        TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n", 
+        TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n",
               autosize.rcTarget.right, autosize.rcTarget.bottom, lParam);
     }
@@ -4247 +4247 @@
     infoPtr->origin.x = lpwp->x;
     infoPtr->origin.y = lpwp->y;
-    ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED, 
+    ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED,
                          wParam, lParam);
     GetWindowRect(infoPtr->hwndSelf, &rc);
-    TRACE("hwnd %08x new pos (%d,%d)-(%d,%d)\n",
+    TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n",
           infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom);
     return ret;
@@ -4261 +4261 @@
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
 
-    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", 
+    TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
           hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
     if (!infoPtr && (uMsg != WM_NCCREATE))
@@ -4463 +4463 @@
 /*      case WM_SYSCOLORCHANGE: supported according to ControlSpy */
 /*      "Applications that have brushes using the existing system colors
-         should delete those brushes and recreate them using the new 
+         should delete those brushes and recreate them using the new
          system colors."  per MSDN                                */
 
@@ -4473 +4473 @@
 
         default:
-            if (uMsg >= WM_USER)
+            if ((uMsg >= WM_USER) && (uMsg < WM_APP))
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",
                      uMsg, wParam, lParam);
@@ -4498 +4498 @@
 #endif
     wndClass.lpszClassName = REBARCLASSNAMEA;
- 
+
     RegisterClassA (&wndClass);
 
@@ -4512 +4512 @@
     UnregisterClassA (REBARCLASSNAMEA, (HINSTANCE)NULL);
 }
-

trunk/src/comctl32/tab.c

@@ -46 +46 @@
   LPARAM lParam;
   RECT   rect;    /* bounding rectangle of the item relative to the
-                   * leftmost item (the leftmost item, 0, would have a 
-                   * "left" member of 0 in this rectangle) 
-                   *  
+                   * leftmost item (the leftmost item, 0, would have a
+                   * "left" member of 0 in this rectangle)
+                   *
                    * additionally the top member hold the row number
                    * and bottom is unused and should be 0 */
@@ -70 +70 @@
   TAB_ITEM*  items;           /* pointer to an array of TAB_ITEM's */
   BOOL       DoRedraw;        /* flag for redrawing when tab contents is changed*/
-  BOOL       needsScrolling;  /* TRUE if the size of the tabs is greater than 
+  BOOL       needsScrolling;  /* TRUE if the size of the tabs is greater than
                                * the size of the control */
   BOOL       fSizeSet;        /* was the size of the tabs explicitly set? */
@@ -81 +81 @@
  */
 #define SELECTED_TAB_OFFSET     2
-#define HORIZONTAL_ITEM_PADDING 5
+#define HORIZONTAL_ITEM_PADDING 6
 #define VERTICAL_ITEM_PADDING   3
 #define ROUND_CORNER_SIZE       2
@@ -88 +88 @@
 #define CONTROL_BORDER_SIZEX    2
 #define CONTROL_BORDER_SIZEY    2
-#define BUTTON_SPACINGX         4 
+#define BUTTON_SPACINGX         4
 #define BUTTON_SPACINGY         4
 #define FLAT_BTN_SPACINGX       8
@@ -140 +140 @@
 }
 
+static void
+TAB_DumpItemExternalA(TCITEMA *pti, UINT iItem)
+{
+    if (TRACE_ON(tab)) {
+        TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n",
+              iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax);
+        TRACE("external tab %d,   iImage=%d, lParam=0x%08lx, pszTextA=%s\n",
+              iItem, pti->iImage, pti->lParam, debugstr_a(pti->pszText));
+    }
+}
+
+
+static void
+TAB_DumpItemExternalW(TCITEMW *pti, UINT iItem)
+{
+    if (TRACE_ON(tab)) {
+        TRACE("external tab %d, mask=0x%08x, dwState=0x%08lx, dwStateMask=0x%08lx, cchTextMax=0x%08x\n",
+              iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax);
+        TRACE("external tab %d,   iImage=%d, lParam=0x%08lx, pszTextW=%s\n",
+              iItem, pti->iImage, pti->lParam, debugstr_w(pti->pszText));
+    }
+}
+
+static void
+TAB_DumpItemInternal(TAB_INFO *infoPtr, UINT iItem)
+{
+    if (TRACE_ON(tab)) {
+        TAB_ITEM *ti;
+
+        ti = &infoPtr->items[iItem];
+        TRACE("tab %d, mask=0x%08x, dwState=0x%08lx, pszText=%s, iImage=%d\n",
+              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",
+              iItem, ti->lParam, ti->rect.left, ti->rect.top);
+    }
+}
+
 static LRESULT
 TAB_GetCurSel (HWND hwnd)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- 
+
     return infoPtr->iSelected;
 }
@@ -152 +190 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- 
+
     return infoPtr->uFocus;
 }
@@ -162 +200 @@
 
     if (infoPtr == NULL) return 0;
-    return infoPtr->hwndToolTip;
+    return (LRESULT)infoPtr->hwndToolTip;
 }
 
@@ -171 +209 @@
   INT iItem = (INT)wParam;
   INT prevItem;
- 
+
   prevItem = -1;
   if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) {
@@ -187 +225 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   INT iItem=(INT) wParam;
- 
+
   if ((iItem < 0) || (iItem >= infoPtr->uNumItem)) return 0;
 
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) {
     FIXME("Should set input focus\n");
-  } else { 
+  } else {
     int oldFocus = infoPtr->uFocus;
     if (infoPtr->iSelected != iItem || infoPtr->uFocus == -1 ) {
@@ -239 +277 @@
   RECT tmpItemRect,clientRect;
   LONG        lStyle  = GetWindowLongA(hwnd, GWL_STYLE);
-  
+
   /* Perform a sanity check and a trivial visibility check. */
   if ( (infoPtr->uNumItem <= 0) ||
@@ -252 +290 @@
   if (itemRect == NULL)
     itemRect = &tmpItemRect;
-  
+
   /* Retrieve the unmodified item rect. */
   *itemRect = infoPtr->items[itemIndex].rect;
@@ -287 +325 @@
   else if(!(lStyle & TCS_VERTICAL) && !(lStyle & TCS_BOTTOM)) /* not TCS_BOTTOM and not TCS_VERTICAL */
   {
-    itemRect->bottom = clientRect.top + 
+    itemRect->bottom = clientRect.top +
                       infoPtr->tabHeight +
                       itemRect->top * (infoPtr->tabHeight - 2) +
                       ((lStyle & TCS_BUTTONS) ? itemRect->top * BUTTON_SPACINGY : 0);
-    itemRect->top = clientRect.top + 
+    itemRect->top = clientRect.top +
                    SELECTED_TAB_OFFSET +
                    itemRect->top * (infoPtr->tabHeight - 2) +
@@ -298 +336 @@
 
   /*
-   * "scroll" it to make sure the item at the very left of the 
+   * "scroll" it to make sure the item at the very left of the
    * tab control is the leftmost visible tab.
    */
@@ -318 +356 @@
   {
     OffsetRect(itemRect,
-             -infoPtr->items[infoPtr->leftmostVisible].rect.left, 
+             -infoPtr->items[infoPtr->leftmostVisible].rect.left,
              0);
 
@@ -329 +367 @@
              0);
   }
+  TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n",
+        itemIndex, infoPtr->tabHeight,
+        itemRect->left, itemRect->top, itemRect->right, itemRect->bottom);
 
   /* Now, calculate the position of the item as if it were selected. */
@@ -343 +384 @@
     /* If it also a bit higher. */
     if ((lStyle & TCS_BOTTOM) && !(lStyle & TCS_VERTICAL))
-    {      
+    {
       selectedRect->top -= 2; /* the border is thicker on the bottom */
       selectedRect->bottom += SELECTED_TAB_OFFSET;
@@ -369 +410 @@
 static BOOL TAB_GetItemRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam, 
+  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam,
                                  (LPRECT)lParam, (LPRECT)NULL);
 }
@@ -379 +420 @@
  */
 static LRESULT TAB_KeyUp(
-  HWND   hwnd, 
+  HWND   hwnd,
   WPARAM keyCode)
 {
@@ -394 +435 @@
       break;
   }
-  
+
   /*
    * If we changed to a valid item, change the selection
@@ -423 +464 @@
  */
 static LRESULT TAB_FocusChanging(
-  HWND   hwnd, 
-  UINT   uMsg, 
-  WPARAM wParam, 
+  HWND   hwnd,
+  UINT   uMsg,
+  WPARAM wParam,
   LPARAM lParam)
 {
@@ -440 +481 @@
                                       NULL,
                                       &selectedRect);
-  
+
   /*
    * If the rectangle is not completely invisible, invalidate that
@@ -447 +488 @@
   if (isVisible)
   {
+      TRACE("invalidate (%d,%d)-(%d,%d)\n",
+            selectedRect.left,selectedRect.top,
+            selectedRect.right,selectedRect.bottom);
     InvalidateRect(hwnd, &selectedRect, TRUE);
   }
@@ -456 +500 @@
 }
 
-static HWND TAB_InternalHitTest (
+static INT TAB_InternalHitTest (
   HWND      hwnd,
-  TAB_INFO* infoPtr, 
-  POINT     pt, 
+  TAB_INFO* infoPtr,
+  POINT     pt,
   UINT*     flags)
 
 {
   RECT rect;
-  int iCount; 
-  
+  INT iCount;
+
   for (iCount = 0; iCount < infoPtr->uNumItem; iCount++)
   {
@@ -486 +530 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   LPTCHITTESTINFO lptest = (LPTCHITTESTINFO) lParam;
-  
+
   return TAB_InternalHitTest (hwnd, infoPtr, lptest->pt, &lptest->flags);
 }
@@ -537 +581 @@
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
                     WM_LBUTTONDOWN, wParam, lParam);
-  
+
   pt.x = (INT)LOWORD(lParam);
   pt.y = (INT)HIWORD(lParam);
-  
+
   newItem = TAB_InternalHitTest (hwnd, infoPtr, pt, &dummy);
-  
+
   TRACE("On Tab, item %d\n", newItem);
 
@@ -626 +670 @@
     ** overlaps.  Note also that the case where the cursor stayed within our
     ** window but has moved off the hot-tracked tab will be handled by the
-    ** WM_MOUSEMOVE event. 
+    ** WM_MOUSEMOVE event.
     */
     if (!GetCursorPos(&pt) || WindowFromPoint(pt) != hwnd)
@@ -771 +815 @@
  */
 static LRESULT TAB_AdjustRect(
-  HWND   hwnd, 
-  WPARAM fLarger, 
+  HWND   hwnd,
+  WPARAM fLarger,
   LPRECT prc)
 {
@@ -852 +896 @@
  */
 static LRESULT TAB_OnHScroll(
-  HWND    hwnd, 
+  HWND    hwnd,
   int     nScrollCode,
   int     nPos,
@@ -878 +922 @@
  * TAB_SetupScrolling
  *
- * This method will check the current scrolling state and make sure the 
+ * This method will check the current scrolling state and make sure the
  * scrolling control is displayed (or not).
  */
@@ -943 +987 @@
                                           controlPos.bottom - controlPos.top,
                                           hwnd,
-                                          (HMENU)NULL, 
-                                          (HINSTANCE)NULL, 
-                                          NULL);        
+                                          (HMENU)NULL,
+                                          (HINSTANCE)NULL,
+                                          NULL);
     }
     else
     {
-      SetWindowPos(infoPtr->hwndUpDown, 
+      SetWindowPos(infoPtr->hwndUpDown,
                    (HWND)NULL,
                    controlPos.left, controlPos.top,
                    controlPos.right - controlPos.left,
                    controlPos.bottom - controlPos.top,
-                   SWP_SHOWWINDOW | SWP_NOZORDER);                 
+                   SWP_SHOWWINDOW | SWP_NOZORDER);
     }
 
@@ -1017 +1061 @@
    * a font.
    */
-  hdc = GetDC(hwnd); 
-    
+  hdc = GetDC(hwnd);
+
   hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
   hOldFont = SelectObject (hdc, hFont);
@@ -1029 +1073 @@
 
   /* if TCS_VERTICAL then swap the height and width so this code places the
-     tabs along the top of the rectangle and we can just rotate them after 
+     tabs along the top of the rectangle and we can just rotate them after
      rather than duplicate all of the below code */
   if(lStyle & TCS_VERTICAL)
@@ -1061 +1105 @@
 
     /*
-     * Make sure there is enough space for the letters + icon + growing the 
-     * selected item + extra space for the selected item.   
+     * Make sure there is enough space for the letters + icon + growing the
+     * selected item + extra space for the selected item.
      */
-    infoPtr->tabHeight = item_height + 2 * VERTICAL_ITEM_PADDING +
-        SELECTED_TAB_OFFSET;
-
-  }
+    infoPtr->tabHeight = item_height + SELECTED_TAB_OFFSET +
+                         ((lStyle & TCS_BUTTONS) ? 2 : 1) *
+                          VERTICAL_ITEM_PADDING;
+
+    TRACE("tabH=%d, tmH=%ld, iconh=%d\n",
+          infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
+  }
+
+  TRACE("client right=%d\n", clientRect.right);
 
   for (curItem = 0; curItem < infoPtr->uNumItem; curItem++)
@@ -1102 +1151 @@
 
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
-                                           size.cx + icon_width + 
+                                           size.cx + icon_width +
                                            num * HORIZONTAL_ITEM_PADDING;
+      TRACE("for <%s>, l,r=%d,%d, num=%d\n",
+          debugstr_w(infoPtr->items[curItem].pszText),
+          infoPtr->items[curItem].rect.left,
+          infoPtr->items[curItem].rect.right,
+          num);
     }
 
@@ -1123 +1177 @@
         infoPtr->items[curItem].rect.left = 0;
         curItemRowCount++;
+        TRACE("wrapping <%s>, l,r=%d,%d\n",
+            debugstr_w(infoPtr->items[curItem].pszText),
+            infoPtr->items[curItem].rect.left,
+            infoPtr->items[curItem].rect.right);
     }
 
@@ -1129 +1187 @@
 
     TRACE("TextSize: %li\n", size.cx);
-    TRACE("Rect: T %i, L %i, B %i, R %i\n", 
+    TRACE("Rect: T %i, L %i, B %i, R %i\n",
           infoPtr->items[curItem].rect.top,
           infoPtr->items[curItem].rect.left,
           infoPtr->items[curItem].rect.bottom,
-          infoPtr->items[curItem].rect.right);  
+          infoPtr->items[curItem].rect.right);
 
     /*
@@ -1159 +1217 @@
     /* Don't need scrolling, then update infoPtr->leftmostVisible */
     if(!infoPtr->needsScrolling)
-      infoPtr->leftmostVisible = 0; 
+      infoPtr->leftmostVisible = 0;
 
     TAB_SetupScrolling(hwnd, infoPtr, &clientRect);
@@ -1186 +1244 @@
            iItm++,iCount++)
       {
+          /* normalize the current rect */
+
+          /* shift the item to the left side of the clientRect */
+          infoPtr->items[iItm].rect.right -=
+            infoPtr->items[iItm].rect.left;
+          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",
+              infoPtr->items[iItm].rect.right,
+              curItemLeftPos, clientRect.right,
+              iCount, iRow, infoPtr->uNumRows, remTab, tabPerRow);
+
           /* if we have reached the maximum number of tabs on this row */
           /* move to the next row, reset our current item left position and */
           /* the count of items on this row */
-          if (iCount >= ((iRow<remTab)?tabPerRow + 1:tabPerRow))
-          {
-              iRow++;
-              curItemLeftPos = 0;
-              iCount = 0;
-          }
-
-          /* normalize the current rect */
-
-          /* shift the item to the left side of the clientRect */
-          infoPtr->items[iItm].rect.right -= 
-            infoPtr->items[iItm].rect.left;
-          infoPtr->items[iItm].rect.left = 0;
+
+          /* ************  FIXME FIXME FIXME  *************** */
+          /*                                                  */
+          /* FIXME:                                           */
+          /* if vertical,                                     */
+          /*   if item n and n+1 are in the same row,         */
+          /*      then the display has n+1 lower (toward the  */
+          /*      bottom) than n. We do it just the           */
+          /*      opposite!!!                                 */
+          /*                                                  */
+          /* ************  FIXME FIXME FIXME  *************** */
+
+          if (lStyle & TCS_VERTICAL) {
+              /* Vert: Add the remaining tabs in the *last* remainder rows */
+              if (iCount >= ((iRow>=(INT)infoPtr->uNumRows - remTab)?tabPerRow + 1:tabPerRow)) {
+                  iRow++;
+                  curItemLeftPos = 0;
+                  iCount = 0;
+              }
+          } else {
+              /* Horz: Add the remaining tabs in the *first* remainder rows */
+              if (iCount >= ((iRow<remTab)?tabPerRow + 1:tabPerRow)) {
+                  iRow++;
+                  curItemLeftPos = 0;
+                  iCount = 0;
+              }
+          }
 
           /* shift the item to the right to place it as the next item in this row */
@@ -1215 +1299 @@
           else
             curItemLeftPos = infoPtr->items[iItm].rect.right;
+
+          TRACE("arranging <%s>, l,r=%d,%d, row=%d\n",
+              debugstr_w(infoPtr->items[iItm].pszText),
+              infoPtr->items[iItm].rect.left,
+              infoPtr->items[iItm].rect.right,
+              infoPtr->items[iItm].rect.top);
       }
-          
+
       /*
        * Justify the rows
@@ -1223 +1313 @@
          while(iIndexStart < infoPtr->uNumItem)
         {
-        /* 
+        /*
          * find the indexs of the row
          */
         /* find the first item on the next row */
         for (iIndexEnd=iIndexStart;
-             (iIndexEnd < infoPtr->uNumItem) && 
+             (iIndexEnd < infoPtr->uNumItem) &&
                (infoPtr->items[iIndexEnd].rect.top ==
                 infoPtr->items[iIndexStart].rect.top) ;
@@ -1234 +1324 @@
         /* intentionally blank */;
 
-        /* 
+        /*
          * we need to justify these tabs so they fill the whole given
          * client area
@@ -1252 +1342 @@
            widthDiff = widthDiff / iCount;
            /* add widthDiff/iCount, or extra space/items on row, to each item on this row */
-           for (iIndex=iIndexStart,iCount=0; iIndex < iIndexEnd; 
+           for (iIndex=iIndexStart,iCount=0; iIndex < iIndexEnd;
                 iIndex++,iCount++)
            {
               infoPtr->items[iIndex].rect.left += iCount * widthDiff;
               infoPtr->items[iIndex].rect.right += (iCount + 1) * widthDiff;
+
+              TRACE("adjusting 1 <%s>, l,r=%d,%d\n",
+                  debugstr_w(infoPtr->items[iIndex].pszText),
+                  infoPtr->items[iIndex].rect.left,
+                  infoPtr->items[iIndex].rect.right);
+
            }
            infoPtr->items[iIndex - 1].rect.right += remainder;
@@ -1264 +1360 @@
           infoPtr->items[iIndexStart].rect.left = clientRect.left;
           infoPtr->items[iIndexStart].rect.right = clientRect.right - 4;
+
+          TRACE("adjusting 2 <%s>, l,r=%d,%d\n",
+              debugstr_w(infoPtr->items[iIndexStart].pszText),
+              infoPtr->items[iIndexStart].rect.left,
+              infoPtr->items[iIndexStart].rect.right);
+
         }
 
@@ -1303 +1405 @@
  * This method is used to draw the interior (text and icon) of a single tab
  * into the tab control.
- */         
+ */
 static void
 TAB_DrawItemInterior
@@ -1318 +1420 @@
   RECT localRect;
 
-  HPEN   htextPen   = GetSysColorPen (COLOR_BTNTEXT);
+  HPEN   htextPen;
   HPEN   holdPen;
   INT    oldBkMode;
@@ -1369 +1471 @@
    * Text pen
    */
+  htextPen = CreatePen( PS_SOLID, 1, GetSysColor(COLOR_BTNTEXT) );
   holdPen = SelectObject(hdc, htextPen);
 
   oldBkMode = SetBkMode(hdc, TRANSPARENT);
-  SetTextColor(hdc, GetSysColor((iItem == infoPtr->iHotTracked) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT));
+  SetTextColor(hdc, (iItem == infoPtr->iHotTracked) ?
+                     comctl32_color.clrHighlight : comctl32_color.clrBtnText);
 
   /*
@@ -1396 +1500 @@
     id = GetWindowLongA( hwnd, GWL_ID );
 
-    /* 
+    /*
      * put together the DRAWITEMSTRUCT
      */
-    dis.CtlType    = ODT_TAB;   
-    dis.CtlID      = id;                
-    dis.itemID     = iItem;             
-    dis.itemAction = ODA_DRAWENTIRE;    
+    dis.CtlType    = ODT_TAB;
+    dis.CtlID      = id;
+    dis.itemID     = iItem;
+    dis.itemAction = ODA_DRAWENTIRE;
     if ( iItem == infoPtr->iSelected )
-      dis.itemState = ODS_SELECTED;     
-    else                                
-      dis.itemState = 0;                
+      dis.itemState = ODS_SELECTED;
+    else
+      dis.itemState = 0;
     dis.hwndItem = hwnd;                /* */
-    dis.hDC      = hdc;         
+    dis.hDC      = hdc;
     dis.rcItem   = *drawRect;           /* */
     dis.itemData = infoPtr->items[iItem].lParam;
@@ -1441 +1545 @@
     rcTemp = *drawRect;
 
+    rcText.left = rcText.top = rcText.right = rcText.bottom = 0;
+
     /*
      * Setup for text output
      */
     oldBkMode = SetBkMode(hdc, TRANSPARENT);
-    SetTextColor(hdc, GetSysColor((iItem == infoPtr->iHotTracked) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT));
+    SetTextColor(hdc, (iItem == infoPtr->iHotTracked) ?
+                 comctl32_color.clrHighlight : comctl32_color.clrBtnText);
 
     /* get the rectangle that the text fits in */
@@ -1461 +1568 @@
 
       if(lStyle & TCS_VERTICAL)
-        center_offset = ((drawRect->bottom - drawRect->top) - (cy + VERTICAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2;
+        center_offset = ((drawRect->bottom - drawRect->top) - (cy + HORIZONTAL_ITEM_PADDING + (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",
+          debugstr_w(infoPtr->items[iItem].pszText), center_offset,
+          drawRect->left, drawRect->top, drawRect->right, drawRect->bottom,
+          (rcText.right-rcText.left));
+
       if((lStyle & TCS_VERTICAL) && (lStyle & TCS_BOTTOM))
       {
-        /* rcImage.left = drawRect->left; */ /* explicit from above rcImage = *drawRect */
         rcImage.top = drawRect->top + center_offset;
         rcImage.left = drawRect->right - cx; /* if tab is TCS_VERTICAL and TCS_BOTTOM, the text is drawn from the */
                                              /* 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 + VERTICAL_ITEM_PADDING);
+        drawRect->top = rcImage.top + (cx + HORIZONTAL_ITEM_PADDING);
       }
       else if(lStyle & TCS_VERTICAL)
       {
-        /* rcImage.left = drawRect->left; */ /* explicit from above rcImage = *drawRect */
         rcImage.top = drawRect->bottom - cy - center_offset;
-
-        drawRect->bottom = rcImage.top - VERTICAL_ITEM_PADDING;
+        rcImage.left--;
+        drawRect->bottom = rcImage.top - HORIZONTAL_ITEM_PADDING;
       }
       else /* normal style, whether TCS_BOTTOM or not */
       {
-        rcImage.left = drawRect->left + center_offset;
-        /* rcImage.top = drawRect->top; */ /* explicit from above rcImage = *drawRect */
-
+        rcImage.left = drawRect->left + center_offset + 3;
         drawRect->left = rcImage.left + cx + HORIZONTAL_ITEM_PADDING;
+        rcImage.top -= (lStyle & TCS_BOTTOM) ? 2 : 1;
       }
 
+      TRACE("drawing image=%d, left=%d, top=%d\n",
+            infoPtr->items[iItem].iImage, rcImage.left, rcImage.top-1);
       ImageList_Draw
         (
@@ -1495 +1606 @@
         hdc,
         rcImage.left,
-        rcImage.top + 1,
+        rcImage.top,
         ILD_NORMAL
         );
@@ -1544 +1655 @@
     if(lStyle & TCS_VERTICAL)
     {
-      if (!GetObjectA((infoPtr->hFont) ? 
+      if (!GetObjectA((infoPtr->hFont) ?
                 infoPtr->hFont : GetStockObject(SYSTEM_FONT),
                 sizeof(LOGFONTA),&logfont))
@@ -1551 +1662 @@
 
         lstrcpyA(logfont.lfFaceName, "Arial");
-        logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY), 
+        logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY),
                                     72);
         logfont.lfWeight = FW_NORMAL;
@@ -1604 +1715 @@
   SetBkMode(hdc, oldBkMode);
   SelectObject(hdc, holdPen);
+  DeleteObject( htextPen );
 }
 
@@ -1610 +1722 @@
  *
  * This method is used to draw a single tab into the tab control.
- */         
+ */
 static void TAB_DrawItem(
-  HWND hwnd, 
-  HDC  hdc, 
+  HWND hwnd,
+  HDC  hdc,
   INT  iItem)
 {
@@ -1621 +1733 @@
   RECT      selectedRect;
   BOOL      isVisible;
-  RECT      r;
+  RECT      r, fillRect, r1;
+  INT       clRight = 0;
+  INT       clBottom = 0;
+  COLORREF  bkgnd, corner;
 
   /*
@@ -1634 +1749 @@
   if (isVisible)
   {
-    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));    
-    HPEN   hwPen     = GetSysColorPen (COLOR_3DHILIGHT);
-    HPEN hbPen  = GetSysColorPen (COLOR_3DDKSHADOW);
-    HPEN hShade = GetSysColorPen (COLOR_BTNSHADOW);
-
-    HPEN   holdPen;
-    BOOL   deleteBrush = TRUE;
+    /* If you need to see what the control is doing,
+     * then override these variables. They will change what
+     * fill colors are used for filling the tabs, and the
+     * corners when drawing the edge.
+     */
+    bkgnd = comctl32_color.clrBtnFace;
+    corner = comctl32_color.clrBtnFace;
 
     if (lStyle & TCS_BUTTONS)
     {
+      HBRUSH hbr       = CreateSolidBrush (bkgnd);
+      BOOL   deleteBrush = TRUE;
+
       /* Get item rectangle */
       r = itemRect;
 
-      holdPen = SelectObject (hdc, hwPen);
-
       /* Separators between flat buttons */
-      /* FIXME: test and correct this if necessary for TCS_FLATBUTTONS style */
-      if (lStyle & TCS_FLATBUTTONS) 
+      if (lStyle & TCS_FLATBUTTONS)
       {
-        int x = r.right + FLAT_BTN_SPACINGX - 2;
-
-        /* highlight */
-        MoveToEx (hdc, x, r.bottom - 1, NULL);
-        LineTo   (hdc, x, r.top - 1);
-        x--;
-
-        /* shadow */
-        SelectObject(hdc, hbPen);
-        MoveToEx (hdc, x, r.bottom - 1, NULL);
-        LineTo   (hdc, x, r.top - 1);
-
-        /* shade */
-        SelectObject (hdc, hShade );
-        MoveToEx (hdc, x - 1, r.bottom - 1, NULL);
-        LineTo   (hdc, x - 1, r.top - 1);
+        r1 = r;
+        r1.right += (FLAT_BTN_SPACINGX -2);
+        DrawEdge(hdc, &r1, EDGE_ETCHED, BF_RIGHT);
       }
 
@@ -1676 +1778 @@
         if (!((lStyle & TCS_OWNERDRAWFIXED) && infoPtr->fSizeSet))
         {
-              COLORREF bk = GetSysColor(COLOR_3DHILIGHT);
               DeleteObject(hbr);
               hbr = GetSysColorBrush(COLOR_SCROLLBAR);
 
-              SetTextColor(hdc, GetSysColor(COLOR_3DFACE));
-              SetBkColor(hdc, bk);
+              SetTextColor(hdc, comctl32_color.clr3dFace);
+              SetBkColor(hdc, comctl32_color.clr3dHilight);
 
               /* if COLOR_WINDOW happens to be the same as COLOR_3DHILIGHT
@@ -1687 +1788 @@
                * look different from the window background.
                */
-               if (bk == GetSysColor(COLOR_WINDOW))
+               if (comctl32_color.clr3dHilight == comctl32_color.clrWindow)
                   hbr = COMCTL32_hPattern55AABrush;
 
@@ -1693 +1794 @@
         }
 
-        /* Erase the background */
+        /* Clear interior */
         FillRect(hdc, &r, hbr);
 
-        /*
-         * Draw the tab now.
-         * The rectangles calculated exclude the right and bottom
-         * borders of the rectangle. To simplify the following code, those
-         * borders are shaved-off beforehand.
-         */
-        r.right--;
-        r.bottom--;
-
-        /* highlight */
-        SelectObject(hdc, hwPen);
-        MoveToEx (hdc, r.left, r.bottom, NULL);
-        LineTo   (hdc, r.right, r.bottom);
-        LineTo   (hdc, r.right, r.top + 1);
-        
-        /* shadow */
-        SelectObject(hdc, hbPen);
-        LineTo  (hdc, r.left + 1, r.top + 1);
-        LineTo  (hdc, r.left + 1, r.bottom);
-
-        /* shade */
-        SelectObject (hdc, hShade );
-        MoveToEx (hdc, r.right, r.top, NULL);
-        LineTo   (hdc, r.left, r.top);
-        LineTo   (hdc, r.left, r.bottom);
+        DrawEdge(hdc, &r, EDGE_SUNKEN, BF_SOFT|BF_RECT);
+      }
+      else  /* ! selected */
+      {
+        if (!(lStyle & TCS_FLATBUTTONS))
+        {
+          /* Clear interior */
+          FillRect(hdc, &r, hbr);
+
+          DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_RECT);
+        }
+      }
+
+      /* Cleanup */
+      if (deleteBrush) DeleteObject(hbr);
+    }
+    else /* !TCS_BUTTONS */
+    {
+      /* We draw a rectangle of different sizes depending on the selection
+       * state. */
+      if (iItem == infoPtr->iSelected) {
+        RECT rect;
+        GetClientRect (hwnd, &rect);
+        clRight = rect.right;
+        clBottom = rect.bottom;
+        r = selectedRect;
       }
       else
-      {
-        /* Erase the background */
-        FillRect(hdc, &r, hbr);
-
-        if (!(lStyle & TCS_FLATBUTTONS))
-        {
-          /* highlight */
-          MoveToEx (hdc, r.left, r.bottom, NULL);
-          LineTo   (hdc, r.left, r.top);
-          LineTo   (hdc, r.right, r.top);
-         
-          /* shadow */
-          SelectObject(hdc, hbPen);
-          LineTo  (hdc, r.right, r.bottom);
-          LineTo  (hdc, r.left, r.bottom);
-
-          /* shade */
-          SelectObject (hdc, hShade );
-          MoveToEx (hdc, r.right - 1, r.top, NULL);
-          LineTo   (hdc, r.right - 1, r.bottom - 1);
-          LineTo   (hdc, r.left + 1, r.bottom - 1);
-        }
-      }
-    }
-    else /* !TCS_BUTTONS */
-    {
-      /* Background color */
-      DeleteObject(hbr);
-      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));    
-
-      /* We draw a rectangle of different sizes depending on the selection
-       * state. */
-      if (iItem == infoPtr->iSelected)
-        r = selectedRect;
-      else
         r = itemRect;
 
       /*
-       * Erase the background.
-       * This is necessary when drawing the selected item since it is larger 
-       * than the others, it might overlap with stuff already drawn by the 
+       * Erase the background. (Delay it but setup rectangle.)
+       * This is necessary when drawing the selected item since it is larger
+       * than the others, it might overlap with stuff already drawn by the
        * other tabs
-       */     
-      FillRect(hdc, &r, hbr);
-
-      /*
-       * Draw the tab now.
-       * The rectangles calculated exclude the right and bottom
-       * borders of the rectangle. To simplify the following code, those
-       * borders are shaved-off beforehand.
        */
-      r.right--;
-      r.bottom--;
-      
-      holdPen = SelectObject (hdc, hwPen);
+      fillRect = r;
+
       if(lStyle & TCS_VERTICAL)
       {
+        /* These are for adjusting the drawing of a Selected tab      */
+        /* The initial values are for the normal case of non-Selected */
+        int ZZ = 1;   /* Do not strech if selected */
+        if (iItem == infoPtr->iSelected) {
+            ZZ = 0;
+
+            /* if leftmost draw the line longer */
+            if(selectedRect.top == 0)
+                fillRect.top += 2;
+            /* if rightmost draw the line longer */
+            if(selectedRect.bottom == clBottom)
+                fillRect.bottom -= 2;
+        }
+
         if (lStyle & TCS_BOTTOM)
         {
-          /* highlight */
-          MoveToEx (hdc, r.left, r.top, NULL);
-          LineTo   (hdc, r.right - ROUND_CORNER_SIZE, r.top);
-          LineTo   (hdc, r.right, r.top + ROUND_CORNER_SIZE);
-
-          /* shadow */
-          SelectObject(hdc, hbPen);
-          LineTo  (hdc, r.right, r.bottom - ROUND_CORNER_SIZE);
-          LineTo  (hdc, r.right - ROUND_CORNER_SIZE, r.bottom);
-          LineTo  (hdc, r.left - 1, r.bottom);
-
-          /* shade */
-          SelectObject (hdc, hShade );
-          MoveToEx (hdc, r.right - 1, r.top, NULL);
-          LineTo   (hdc, r.right - 1, r.bottom - 1);
-          LineTo   (hdc, r.left - 1,    r.bottom - 1);
+          /* Adjust both rectangles to match native */
+          r.left += (1-ZZ);
+
+          TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+                iItem,
+                fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
+                r.left,r.top,r.right,r.bottom);
+
+          /* Clear interior */
+          SetBkColor(hdc, bkgnd);
+          ExtTextOutA(hdc, 0, 0, 2, &fillRect, NULL, 0, 0);
+
+          /* Draw rectangular edge around tab */
+          DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_RIGHT|BF_TOP|BF_BOTTOM);
+
+          /* Now erase the top corner and draw diagonal edge */
+          SetBkColor(hdc, corner);
+          r1.left = r.right - ROUND_CORNER_SIZE - 1;
+          r1.top = r.top;
+          r1.right = r.right;
+          r1.bottom = r1.top + ROUND_CORNER_SIZE;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.right--;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDTOPLEFT);
+
+          /* Now erase the bottom corner and draw diagonal edge */
+          r1.left = r.right - ROUND_CORNER_SIZE - 1;
+          r1.bottom = r.bottom;
+          r1.right = r.right;
+          r1.top = r1.bottom - ROUND_CORNER_SIZE;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.right--;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDBOTTOMLEFT);
+
+          if ((iItem == infoPtr->iSelected) && (selectedRect.top == 0)) {
+              r1 = r;
+              r1.right = r1.left;
+              r1.left--;
+              DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_TOP);
+          }
+
         }
         else
         {
-          /* highlight */
-          MoveToEx (hdc, r.right, r.top, NULL);
-          LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.top);
-          LineTo   (hdc, r.left, r.top + ROUND_CORNER_SIZE);
-          LineTo   (hdc, r.left, r.bottom - ROUND_CORNER_SIZE);
-
-          /* shadow */
-          SelectObject(hdc, hbPen);
-          LineTo (hdc, r.left + ROUND_CORNER_SIZE,  r.bottom);
-          LineTo (hdc, r.right + 1, r.bottom);
-
-          /* shade */
-          SelectObject (hdc, hShade );
-          MoveToEx (hdc, r.left + ROUND_CORNER_SIZE - 1, r.bottom - 1, NULL);
-          LineTo   (hdc, r.right + 1, r.bottom - 1);
+          /* Adjust both rectangles to match native */
+          fillRect.right += (1-ZZ);
+
+          TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+                iItem,
+                fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
+                r.left,r.top,r.right,r.bottom);
+
+          /* Clear interior */
+          SetBkColor(hdc, bkgnd);
+          ExtTextOutA(hdc, 0, 0, 2, &fillRect, NULL, 0, 0);
+
+          /* Draw rectangular edge around tab */
+          DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_LEFT|BF_TOP|BF_BOTTOM);
+
+          /* Now erase the top corner and draw diagonal edge */
+          SetBkColor(hdc, corner);
+          r1.left = r.left;
+          r1.top = r.top;
+          r1.right = r1.left + ROUND_CORNER_SIZE + 1;
+          r1.bottom = r1.top + ROUND_CORNER_SIZE;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.left++;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDTOPRIGHT);
+
+          /* Now erase the bottom corner and draw diagonal edge */
+          r1.left = r.left;
+          r1.bottom = r.bottom;
+          r1.right = r1.left + ROUND_CORNER_SIZE + 1;
+          r1.top = r1.bottom - ROUND_CORNER_SIZE;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.left++;
+          DrawEdge(hdc, &r1, EDGE_SUNKEN, BF_DIAGONAL_ENDTOPLEFT);
         }
       }
-      else
+      else  /* ! TCS_VERTICAL */
       {
+        /* These are for adjusting the drawing of a Selected tab      */
+        /* The initial values are for the normal case of non-Selected */
+        int ZZ = 1;   /* Do not strech if selected */
+        if (iItem == infoPtr->iSelected) {
+            ZZ = 0;
+
+            /* if leftmost draw the line longer */
+            if(selectedRect.left == 0)
+                fillRect.left += 2;
+            /* if rightmost draw the line longer */
+            if(selectedRect.right == clRight)
+                fillRect.right -= 2;
+        }
+
         if (lStyle & TCS_BOTTOM)
         {
-          /* highlight */
-          MoveToEx (hdc, r.left, r.top, NULL);
-          LineTo   (hdc, r.left, r.bottom - ROUND_CORNER_SIZE);
-          LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.bottom);
-
-          /* shadow */
-          SelectObject(hdc, hbPen);
-          LineTo  (hdc, r.right - ROUND_CORNER_SIZE, r.bottom);
-          LineTo  (hdc, r.right, r.bottom - ROUND_CORNER_SIZE);
-          LineTo  (hdc, r.right, r.top - 1);
-
-          /* shade */
-          SelectObject (hdc, hShade );
-          MoveToEx   (hdc, r.left, r.bottom - 1, NULL);
-          LineTo   (hdc, r.right - ROUND_CORNER_SIZE - 1, r.bottom - 1);
-          LineTo   (hdc, r.right - 1, r.bottom - ROUND_CORNER_SIZE - 1);
-          LineTo  (hdc, r.right - 1, r.top - 1);
+
+          /* Adjust both rectangles to match native */
+          fillRect.top--;
+          fillRect.bottom--;
+          r.bottom--;
+          r.top -= ZZ;
+
+          TRACE("<bottom> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+                iItem,
+                fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
+                r.left,r.top,r.right,r.bottom);
+
+          /* Clear interior */
+          SetBkColor(hdc, bkgnd);
+          ExtTextOutA(hdc, 0, 0, 2, &fillRect, NULL, 0, 0);
+
+          /* Draw rectangular edge around tab */
+          DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_LEFT|BF_BOTTOM|BF_RIGHT);
+
+          /* Now erase the righthand corner and draw diagonal edge */
+          SetBkColor(hdc, corner);
+          r1.left = r.right - ROUND_CORNER_SIZE;
+          r1.bottom = r.bottom;
+          r1.right = r.right;
+          r1.top = r1.bottom - ROUND_CORNER_SIZE - 1;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.bottom--;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDBOTTOMLEFT);
+
+          /* Now erase the lefthand corner and draw diagonal edge */
+          r1.left = r.left;
+          r1.bottom = r.bottom;
+          r1.right = r1.left + ROUND_CORNER_SIZE;
+          r1.top = r1.bottom - ROUND_CORNER_SIZE - 1;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.bottom--;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDTOPLEFT);
+
+          if ((iItem == infoPtr->iSelected) && (selectedRect.left == 0)) {
+              r1 = r;
+              r1.bottom = r1.top;
+              r1.top--;
+              DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_LEFT);
+          }
+
         }
         else
         {
-          /* highlight */
-          if(infoPtr->items[iItem].rect.left == 0) /* if leftmost draw the line longer */
-            MoveToEx (hdc, r.left, r.bottom, NULL);
-          else
-            MoveToEx (hdc, r.left, r.bottom - 1, NULL);
-
-          LineTo   (hdc, r.left, r.top + ROUND_CORNER_SIZE);
-          LineTo   (hdc, r.left + ROUND_CORNER_SIZE, r.top);
-          LineTo   (hdc, r.right - ROUND_CORNER_SIZE, r.top);
-
-          /* shadow */
-          SelectObject(hdc, hbPen);
-          LineTo (hdc, r.right,  r.top + ROUND_CORNER_SIZE);
-          LineTo (hdc, r.right,  r.bottom + 1);
-
-
-          /* shade */
-          SelectObject (hdc, hShade );
-          MoveToEx (hdc, r.right - 1, r.top + ROUND_CORNER_SIZE, NULL);
-          LineTo   (hdc, r.right - 1, r.bottom + 1);
+
+          /* Adjust both rectangles to match native */
+          fillRect.bottom += (1-ZZ);
+
+          TRACE("<top> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+                iItem,
+                fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
+                r.left,r.top,r.right,r.bottom);
+
+          /* Clear interior */
+          SetBkColor(hdc, bkgnd);
+          ExtTextOutA(hdc, 0, 0, 2, &fillRect, NULL, 0, 0);
+
+          /* Draw rectangular edge around tab */
+          DrawEdge(hdc, &r, EDGE_RAISED, BF_SOFT|BF_LEFT|BF_TOP|BF_RIGHT);
+
+          /* Now erase the righthand corner and draw diagonal edge */
+          SetBkColor(hdc, corner);
+          r1.left = r.right - ROUND_CORNER_SIZE;
+          r1.top = r.top;
+          r1.right = r.right;
+          r1.bottom = r1.top + ROUND_CORNER_SIZE + 1;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.top++;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDBOTTOMRIGHT);
+
+          /* Now erase the lefthand corner and draw diagonal edge */
+          r1.left = r.left;
+          r1.top = r.top;
+          r1.right = r1.left + ROUND_CORNER_SIZE;
+          r1.bottom = r1.top + ROUND_CORNER_SIZE + 1;
+          ExtTextOutA(hdc, 0, 0, 2, &r1, NULL, 0, 0);
+          r1.top++;
+          DrawEdge(hdc, &r1, EDGE_RAISED, BF_SOFT|BF_DIAGONAL_ENDTOPRIGHT);
+
         }
       }
     }
-  
+
+    TAB_DumpItemInternal(infoPtr, iItem);
+
     /* This modifies r to be the text rectangle. */
     {
@@ -1883 +2056 @@
       DrawFocusRect(hdc, &r);
     }
-
-    /* Cleanup */
-    SelectObject(hdc, holdPen);
-    if (deleteBrush) DeleteObject(hbr);
   }
 }
@@ -1895 +2064 @@
  * This method is used to draw the raised border around the tab control
  * "content" area.
- */         
+ */
 static void TAB_DrawBorder (HWND hwnd, HDC hdc)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  HPEN htmPen;
-  HPEN hwPen  = GetSysColorPen (COLOR_3DHILIGHT);
-  HPEN hbPen  = GetSysColorPen (COLOR_3DDKSHADOW);
-  HPEN hShade = GetSysColorPen (COLOR_BTNSHADOW);
   RECT rect;
   DWORD lStyle = GetWindowLongA(hwnd, GWL_STYLE);
@@ -1916 +2081 @@
     if ((lStyle & TCS_BOTTOM) && !(lStyle & TCS_VERTICAL))
     {
-      rect.bottom -= (infoPtr->tabHeight - 2) * infoPtr->uNumRows + 2;
+      rect.bottom -= (infoPtr->tabHeight - 2) * infoPtr->uNumRows + 3;
     }
     else if((lStyle & TCS_BOTTOM) && (lStyle & TCS_VERTICAL))
@@ -1928 +2093 @@
     else /* not TCS_VERTICAL and not TCS_BOTTOM */
     {
-      rect.top += (infoPtr->tabHeight - 2) * infoPtr->uNumRows + 1;
-    }
-  }
-
-  /*
-   * Shave-off the right and bottom margins (exluded in the
-   * rect)
-   */
-  rect.right--;
-  rect.bottom--;
-
-  /* highlight */
-  htmPen = SelectObject (hdc, hwPen);
-
-  MoveToEx (hdc, rect.left, rect.bottom, NULL);
-  LineTo (hdc, rect.left, rect.top);
-  LineTo (hdc, rect.right, rect.top);
-
-  /* Dark Shadow */
-  SelectObject (hdc, hbPen);
-  LineTo (hdc, rect.right, rect.bottom );
-  LineTo (hdc, rect.left, rect.bottom);
-
-  /* shade */
-  SelectObject (hdc, hShade );
-  MoveToEx (hdc, rect.right - 1, rect.top, NULL);
-  LineTo   (hdc, rect.right - 1, rect.bottom - 1);
-  LineTo   (hdc, rect.left,    rect.bottom - 1);
-
-  SelectObject(hdc, htmPen);
+      rect.top += (infoPtr->tabHeight - 2) * infoPtr->uNumRows + 2;
+    }
+  }
+
+  TRACE("border=(%d,%d)-(%d,%d)\n",
+        rect.left, rect.top, rect.right, rect.bottom);
+
+  DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT);
 }
 
@@ -1964 +2107 @@
  *
  * This method repaints the tab control..
- */             
+ */
 static void TAB_Refresh (HWND hwnd, HDC hdc)
 {
@@ -1978 +2121 @@
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS)
   {
-    for (i = 0; i < infoPtr->uNumItem; i++) 
+    for (i = 0; i < infoPtr->uNumItem; i++)
       TAB_DrawItem (hwnd, hdc, i);
   }
@@ -1984 +2127 @@
   {
     /* Draw all the non selected item first */
-    for (i = 0; i < infoPtr->uNumItem; i++) 
+    for (i = 0; i < infoPtr->uNumItem; i++)
     {
       if (i != infoPtr->iSelected)
@@ -2018 +2161 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  
+
   infoPtr->DoRedraw=(BOOL) wParam;
   return 0;
@@ -2024 +2167 @@
 
 static LRESULT TAB_EraseBackground(
-  HWND hwnd, 
+  HWND hwnd,
   HDC  givenDC)
 {
@@ -2030 +2173 @@
   RECT clientRect;
 
-  HBRUSH brush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+  HBRUSH brush = CreateSolidBrush(comctl32_color.clrBtnFace);
 
   hdc = givenDC ? givenDC : GetDC(hwnd);
@@ -2184 +2327 @@
                    infoPtr->tabHeight -
                    lastRow * (infoPtr->tabHeight - 2) -
-                   ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) - 2;
+                   ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) - 3;
   }
   else if((lStyle & TCS_BOTTOM) && (lStyle & TCS_VERTICAL))
@@ -2196 +2339 @@
     clientRect.right = clientRect.left + infoPtr->tabHeight +
                        lastRow * (infoPtr->tabHeight - 2) -
-                      ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 1;
+                      ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2;
 
   }
@@ -2203 +2346 @@
     clientRect.bottom = clientRect.top + infoPtr->tabHeight +
                       lastRow * (infoPtr->tabHeight - 2) +
-                      ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 1;
-  }
-
+                      ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2;
+  }
+
+  TRACE("invalidate (%d,%d)-(%d,%d)\n",
+        clientRect.left,clientRect.top,
+        clientRect.right,clientRect.bottom);
   InvalidateRect(hwnd, &clientRect, TRUE);
 }
@@ -2214 +2360 @@
   HDC hdc;
   PAINTSTRUCT ps;
-    
+
   hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
+
+  TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n",
+        ps.fErase,
+        ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom);
+
+  if (ps.fErase)
+      TAB_EraseBackground (hwnd, hdc);
+
   TAB_Refresh (hwnd, hdc);
-    
+
   if(!wParam)
     EndPaint (hwnd, &ps);
@@ -2226 +2380 @@
 static LRESULT
 TAB_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{    
+{
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   TCITEMA *pti;
   INT iItem;
   RECT rect;
-  
+
   GetClientRect (hwnd, &rect);
-  TRACE("Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
-        rect.top, rect.left, rect.bottom, rect.right);  
-  
+  TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
+        rect.top, rect.left, rect.bottom, rect.right);
+
   pti = (TCITEMA *)lParam;
   iItem = (INT)wParam;
-  
+
   if (iItem < 0) return -1;
   if (iItem > infoPtr->uNumItem)
     iItem = infoPtr->uNumItem;
-  
+
+  TAB_DumpItemExternalA(pti, iItem);
+
+
   if (infoPtr->uNumItem == 0) {
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM));
@@ -2250 +2407 @@
   else {
     TAB_ITEM *oldItems = infoPtr->items;
-    
+
     infoPtr->uNumItem++;
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM) * infoPtr->uNumItem);
-    
+
     /* pre insert copy */
     if (iItem > 0) {
@@ -2259 +2416 @@
               iItem * sizeof(TAB_ITEM));
     }
-    
+
     /* post insert copy */
     if (iItem < infoPtr->uNumItem - 1) {
       memcpy (&infoPtr->items[iItem+1], &oldItems[iItem],
               (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
-      
+
     }
 
@@ -2272 +2429 @@
     COMCTL32_Free (oldItems);
   }
-  
+
   infoPtr->items[iItem].mask = pti->mask;
   if (pti->mask & TCIF_TEXT)
@@ -2279 +2436 @@
   if (pti->mask & TCIF_IMAGE)
     infoPtr->items[iItem].iImage = pti->iImage;
-  
+
   if (pti->mask & TCIF_PARAM)
     infoPtr->items[iItem].lParam = pti->lParam;
-  
+
   TAB_SetItemBounds(hwnd);
-  TAB_InvalidateTabArea(hwnd, infoPtr);
-  
-  TRACE("[%04x]: added item %d %s\n",
+  if (infoPtr->uNumItem > 1)
+    TAB_InvalidateTabArea(hwnd, infoPtr);
+  else
+    InvalidateRect(hwnd, NULL, TRUE);
+
+  TRACE("[%p]: added item %d %s\n",
         hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
@@ -2302 +2462 @@
 
   GetClientRect (hwnd, &rect);
-  TRACE("Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
+  TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
         rect.top, rect.left, rect.bottom, rect.right);
 
@@ -2311 +2471 @@
   if (iItem > infoPtr->uNumItem)
     iItem = infoPtr->uNumItem;
+
+  TAB_DumpItemExternalW(pti, iItem);
 
   if (infoPtr->uNumItem == 0) {
@@ -2335 +2497 @@
 
   }
-  
+
     if (iItem <= infoPtr->iSelected)
       infoPtr->iSelected++;
@@ -2348 +2510 @@
   if (pti->mask & TCIF_IMAGE)
     infoPtr->items[iItem].iImage = pti->iImage;
-  
+
   if (pti->mask & TCIF_PARAM)
     infoPtr->items[iItem].lParam = pti->lParam;
-  
+
   TAB_SetItemBounds(hwnd);
-  TAB_InvalidateTabArea(hwnd, infoPtr);
-  
-  TRACE("[%04x]: added item %d %s\n",
+  if (infoPtr->uNumItem > 1)
+    TAB_InvalidateTabArea(hwnd, infoPtr);
+  else
+    InvalidateRect(hwnd, NULL, TRUE);
+
+  TRACE("[%p]: added item %d %s\n",
         hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
@@ -2362 +2527 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_SetItemSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2369 +2534 @@
   LONG lResult = 0;
 
+  TRACE("\n");
   if ((lStyle & TCS_FIXEDWIDTH) || (lStyle & TCS_OWNERDRAWFIXED))
   {
@@ -2374 +2540 @@
     infoPtr->tabWidth = (INT)LOWORD(lParam);
     infoPtr->tabHeight = (INT)HIWORD(lParam);
+    TRACE("was h=%d,w=%d, now h=%d,w=%d\n",
+          HIWORD(lResult), LOWORD(lResult),
+          infoPtr->tabHeight, infoPtr->tabWidth);
   }
   infoPtr->fSizeSet = TRUE;
@@ -2380 +2549 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  TCITEMA *tabItem; 
+  TCITEMA *tabItem;
   TAB_ITEM *wineItem;
   INT    iItem;
@@ -2394 +2563 @@
   if ((iItem<0) || (iItem>=infoPtr->uNumItem)) return FALSE;
 
+  TAB_DumpItemExternalA(tabItem, iItem);
+
   wineItem = &infoPtr->items[iItem];
 
@@ -2402 +2573 @@
     wineItem->lParam = tabItem->lParam;
 
-  if (tabItem->mask & TCIF_RTLREADING) 
+  if (tabItem->mask & TCIF_RTLREADING)
     FIXME("TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE) 
+  if (tabItem->mask & TCIF_STATE)
     wineItem->dwState = tabItem->dwState;
 
@@ -2433 +2604 @@
   if ((iItem<0) || (iItem>=infoPtr->uNumItem)) return FALSE;
 
+  TAB_DumpItemExternalW(tabItem, iItem);
+
   wineItem = &infoPtr->items[iItem];
 
@@ -2458 +2631 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_GetItemCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2467 +2640 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2483 +2656 @@
   wineItem = &infoPtr->items[iItem];
 
-  if (tabItem->mask & TCIF_IMAGE) 
+  if (tabItem->mask & TCIF_IMAGE)
     tabItem->iImage = wineItem->iImage;
 
-  if (tabItem->mask & TCIF_PARAM) 
+  if (tabItem->mask & TCIF_PARAM)
     tabItem->lParam = wineItem->lParam;
 
-  if (tabItem->mask & TCIF_RTLREADING) 
+  if (tabItem->mask & TCIF_RTLREADING)
     FIXME("TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE) 
+  if (tabItem->mask & TCIF_STATE)
     tabItem->dwState = wineItem->dwState;
 
-  if (tabItem->mask & TCIF_TEXT) 
+  if (tabItem->mask & TCIF_TEXT)
    Str_GetPtrWtoA (wineItem->pszText, tabItem->pszText, tabItem->cchTextMax);
 
+  TAB_DumpItemExternalA(tabItem, iItem);
+
   return TRUE;
 }
 
 
-static LRESULT 
+static LRESULT
 TAB_GetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2533 +2708 @@
    Str_GetPtrW (wineItem->pszText, tabItem->pszText, tabItem->cchTextMax);
 
+  TAB_DumpItemExternalW(tabItem, iItem);
+
   return TRUE;
 }
 
 
-static LRESULT 
+static LRESULT
 TAB_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2547 +2724 @@
   {
     TAB_ITEM *oldItems = infoPtr->items;
-    
+
     infoPtr->uNumItem--;
     infoPtr->items = COMCTL32_Alloc(sizeof (TAB_ITEM) * infoPtr->uNumItem);
-    
-    if (iItem > 0) 
+
+    if (iItem > 0)
       memcpy(&infoPtr->items[0], &oldItems[0], iItem * sizeof(TAB_ITEM));
-    
-    if (iItem < infoPtr->uNumItem) 
+
+    if (iItem < infoPtr->uNumItem)
       memcpy(&infoPtr->items[iItem], &oldItems[iItem + 1],
               (infoPtr->uNumItem - iItem) * sizeof(TAB_ITEM));
-    
+
     COMCTL32_Free(oldItems);
 
@@ -2563 +2740 @@
     if ((iItem == infoPtr->iSelected) && (iItem > 0))
       infoPtr->iSelected--;
-      
+
     if (iItem < infoPtr->iSelected)
       infoPtr->iSelected--;
@@ -2580 +2757 @@
 }
 
-static LRESULT 
+static LRESULT
 TAB_DeleteAllItems (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2591 +2768 @@
     KillTimer(hwnd, TAB_HOTTRACK_TIMER);
   infoPtr->iHotTracked = -1;
- 
+
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd,infoPtr);
@@ -2612 +2789 @@
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  
+
   TRACE("%x %lx\n",wParam, lParam);
-  
+
   infoPtr->hFont = (HFONT)wParam;
-  
+
   TAB_SetItemBounds(hwnd);
 
@@ -2683 +2860 @@
     cx=LOWORD (lParam);
     cy=HIWORD (lParam);
-    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE) 
+    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE)
         uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
 
@@ -2702 +2879 @@
 
 
-static LRESULT 
+static LRESULT
 TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2714 +2891 @@
 
   SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
-   
+
   infoPtr->uNumItem        = 0;
   infoPtr->uNumRows        = 0;
@@ -2722 +2899 @@
   infoPtr->iSelected       = -1;
   infoPtr->iHotTracked     = -1;
-  infoPtr->uFocus          = -1;  
+  infoPtr->uFocus          = -1;
   infoPtr->hwndToolTip     = 0;
   infoPtr->DoRedraw        = TRUE;
@@ -2730 +2907 @@
   infoPtr->fSizeSet        = FALSE;
   infoPtr->bUnicode        = IsWindowUnicode (hwnd);
-  
-  TRACE("Created tab control, hwnd [%04x]\n", hwnd); 
-
-  /* The tab control always has the WS_CLIPSIBLINGS style. Even 
-     if you don't specify it in CreateWindow. This is necessary in 
+
+  TRACE("Created tab control, hwnd [%p]\n", hwnd);
+
+  /* The tab control always has the WS_CLIPSIBLINGS style. Even
+     if you don't specify it in CreateWindow. This is necessary in
      order for paint to work correctly. This follows windows behaviour. */
   dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
@@ -2746 +2923 @@
                        CW_USEDEFAULT, CW_USEDEFAULT,
                        hwnd, 0, 0, 0);
-    
+
     /* Send NM_TOOLTIPSCREATED notification */
     if (infoPtr->hwndToolTip) {
       NMTOOLTIPSCREATED nmttc;
-      
+
       nmttc.hdr.hwndFrom = hwnd;
       nmttc.hdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
       nmttc.hdr.code = NM_TOOLTIPSCREATED;
       nmttc.hwndToolTips = infoPtr->hwndToolTip;
-      
+
       SendMessageA (GetParent (hwnd), WM_NOTIFY,
                     (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
     }
-  }  
-    
+  }
+
   /*
    * We need to get text information so we need a DC and we need to select
    * a font.
    */
-  hdc = GetDC(hwnd); 
+  hdc = GetDC(hwnd);
   hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT));
 
@@ -2772 +2949 @@
 
   /*
-   * Make sure there is enough space for the letters + growing the 
-   * selected item + extra space for the selected item.   
+   * Make sure there is enough space for the letters + growing the
+   * selected item + extra space for the selected item.
    */
-  infoPtr->tabHeight = fontMetrics.tmHeight + 2 * VERTICAL_ITEM_PADDING +
-                       SELECTED_TAB_OFFSET;
+  infoPtr->tabHeight = fontMetrics.tmHeight + SELECTED_TAB_OFFSET +
+                       ((dwStyle & TCS_BUTTONS) ? 2 : 1) *
+                        VERTICAL_ITEM_PADDING;
 
   /* Initialize the width of a tab. */
   infoPtr->tabWidth = DEFAULT_TAB_WIDTH;
+
+  TRACE("tabH=%d, tabW=%d\n", infoPtr->tabHeight, infoPtr->tabWidth);
 
   SelectObject (hdc, hOldFont);
@@ -2803 +2983 @@
     COMCTL32_Free (infoPtr->items);
   }
-  
-  if (infoPtr->hwndToolTip) 
+
+  if (infoPtr->hwndToolTip)
     DestroyWindow (infoPtr->hwndToolTip);
- 
+
   if (infoPtr->hwndUpDown)
     DestroyWindow(infoPtr->hwndUpDown);
@@ -2822 +3002 @@
 {
 
-    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 (!TAB_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
       return DefWindowProcA (hwnd, uMsg, wParam, lParam);
@@ -2830 +3010 @@
     case TCM_GETIMAGELIST:
       return TAB_GetImageList (hwnd, wParam, lParam);
-      
+
     case TCM_SETIMAGELIST:
       return TAB_SetImageList (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMCOUNT:
       return TAB_GetItemCount (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMA:
       return TAB_GetItemA (hwnd, wParam, lParam);
-      
+
     case TCM_GETITEMW:
       return TAB_GetItemW (hwnd, wParam, lParam);
-      
+
     case TCM_SETITEMA:
       return TAB_SetItemA (hwnd, wParam, lParam);
-      
+
     case TCM_SETITEMW:
       return TAB_SetItemW (hwnd, wParam, lParam);
-      
+
     case TCM_DELETEITEM:
       return TAB_DeleteItem (hwnd, wParam, lParam);
-      
+
     case TCM_DELETEALLITEMS:
      return TAB_DeleteAllItems (hwnd, wParam, lParam);
-     
+
     case TCM_GETITEMRECT:
      return TAB_GetItemRect (hwnd, wParam, lParam);
-      
+
     case TCM_GETCURSEL:
       return TAB_GetCurSel (hwnd);
-      
+
     case TCM_HITTEST:
       return TAB_HitTest (hwnd, wParam, lParam);
-      
+
     case TCM_SETCURSEL:
       return TAB_SetCurSel (hwnd, wParam);
-      
+
     case TCM_INSERTITEMA:
       return TAB_InsertItemA (hwnd, wParam, lParam);
-      
+
     case TCM_INSERTITEMW:
       return TAB_InsertItemW (hwnd, wParam, lParam);
-      
+
     case TCM_SETITEMEXTRA:
       FIXME("Unimplemented msg TCM_SETITEMEXTRA\n");
       return 0;
-      
+
     case TCM_ADJUSTRECT:
       return TAB_AdjustRect (hwnd, (BOOL)wParam, (LPRECT)lParam);
-      
+
     case TCM_SETITEMSIZE:
       return TAB_SetItemSize (hwnd, wParam, lParam);
-      
+
     case TCM_REMOVEIMAGE:
       FIXME("Unimplemented msg TCM_REMOVEIMAGE\n");
       return 0;
-      
+
     case TCM_SETPADDING:
       FIXME("Unimplemented msg TCM_SETPADDING\n");
       return 0;
-      
+
     case TCM_GETROWCOUNT:
       return TAB_GetRowCount(hwnd);
@@ -2903 +3083 @@
       FIXME("Unimplemented msg TCM_HIGHLIGHTITEM\n");
       return 0;
-      
+
     case TCM_GETTOOLTIPS:
       return TAB_GetToolTips (hwnd, wParam, lParam);
-      
+
     case TCM_SETTOOLTIPS:
       return TAB_SetToolTips (hwnd, wParam, lParam);
-      
+
     case TCM_GETCURFOCUS:
       return TAB_GetCurFocus (hwnd);
-      
+
     case TCM_SETCURFOCUS:
       return TAB_SetCurFocus (hwnd, wParam);
-      
+
     case TCM_SETMINTABWIDTH:
       FIXME("Unimplemented msg TCM_SETMINTABWIDTH\n");
       return 0;
-      
+
     case TCM_DESELECTALL:
       FIXME("Unimplemented msg TCM_DESELECTALL\n");
       return 0;
-      
+
     case TCM_GETEXTENDEDSTYLE:
       FIXME("Unimplemented msg TCM_GETEXTENDEDSTYLE\n");
@@ -2934 +3114 @@
     case WM_GETFONT:
       return TAB_GetFont (hwnd, wParam, lParam);
-      
+
     case WM_SETFONT:
       return TAB_SetFont (hwnd, wParam, lParam);
-      
+
     case WM_CREATE:
       return TAB_Create (hwnd, wParam, lParam);
-      
+
     case WM_NCDESTROY:
       return TAB_Destroy (hwnd, wParam, lParam);
-      
+
     case WM_GETDLGCODE:
       return DLGC_WANTARROWS | DLGC_WANTCHARS;
-      
+
     case WM_LBUTTONDOWN:
       return TAB_LButtonDown (hwnd, wParam, lParam);
-      
+
     case WM_LBUTTONUP:
       return TAB_LButtonUp (hwnd, wParam, lParam);
-     
+
     case WM_NOTIFY:
       return SendMessageA(GetParent(hwnd), WM_NOTIFY, wParam, lParam);
- 
+
     case WM_RBUTTONDOWN:
       return TAB_RButtonDown (hwnd, wParam, lParam);
-      
+
     case WM_MOUSEMOVE:
       return TAB_MouseMove (hwnd, wParam, lParam);
-      
+
     case WM_ERASEBKGND:
       return TAB_EraseBackground (hwnd, (HDC)wParam);
@@ -2970 +3150 @@
     case WM_SIZE:
       return TAB_Size (hwnd, wParam, lParam);
-      
+
     case WM_SETREDRAW:
       return TAB_SetRedraw (hwnd, wParam);
@@ -2981 +3161 @@
       InvalidateRect(hwnd, NULL, TRUE);
       return 0;
-      
+
+    case WM_SYSCOLORCHANGE:
+      COMCTL32_RefreshSysColors();
+      return 0;
+
     case WM_KILLFOCUS:
     case WM_SETFOCUS:
@@ -2992 +3176 @@
 
     default:
-      if (uMsg >= WM_USER)
+      if ((uMsg >= WM_USER) && (uMsg < WM_APP))
         WARN("unknown msg %04x wp=%08x lp=%08lx\n",
              uMsg, wParam, lParam);
@@ -3015 +3199 @@
   wndClass.hbrBackground = (HBRUSH)NULL;
   wndClass.lpszClassName = WC_TABCONTROLA;
-  
+
   RegisterClassA (&wndClass);
 }

trunk/src/comctl32/toolbar.c

@@ -86 +86 @@
     INT nRow;
     RECT rect;
-} TBUTTON_INFO; 
+} TBUTTON_INFO;
 
 typedef struct
@@ -171 +171 @@
 #define TOP_BORDER         2
 #define BOTTOM_BORDER      2
-#define DDARROW_WIDTH      11 
+#define DDARROW_WIDTH      11
 
 #define TOOLBAR_GetInfoPtr(hwnd) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
@@ -197 +197 @@
     else if ((btnPtr->iString >= 0) && (btnPtr->iString < infoPtr->nNumStrings))
         lpText = infoPtr->strings[btnPtr->iString];
-    
+
     return lpText;
 }
@@ -213 +213 @@
                   btn_num, bP->idCommand,
                   (bP->bHot) ? "TRUE":"FALSE", bP->nRow,
-                  bP->rect.left, bP->rect.top, 
+                  bP->rect.left, bP->rect.top,
                   bP->rect.right, bP->rect.bottom);
     }
@@ -227 +227 @@
 
         dwStyle = GetWindowLongA (iP->hwndSelf, GWL_STYLE);
-        TRACE("toolbar %08x at line %d, exStyle=%08lx, buttons=%d, bitmaps=%d, strings=%d, style=%08lx\n",
+        TRACE("toolbar %p at line %d, exStyle=%08lx, buttons=%d, bitmaps=%d, strings=%d, style=%08lx\n",
               iP->hwndSelf, line,
               iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps,
               iP->nNumStrings, dwStyle);
-        TRACE("toolbar %08x at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n",
+        TRACE("toolbar %p at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n",
               iP->hwndSelf, line,
               iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis,
@@ -253 +253 @@
 {
     if (dwStyle & TBSTYLE_ALTDRAG)
-        FIXME("[%04x] TBSTYLE_ALTDRAG not implemented\n", hwnd);
+        FIXME("[%p] TBSTYLE_ALTDRAG not implemented\n", hwnd);
     if (dwStyle & TBSTYLE_REGISTERDROP)
-        FIXME("[%04x] TBSTYLE_REGISTERDROP not implemented\n", hwnd);
+        FIXME("[%p] TBSTYLE_REGISTERDROP not implemented\n", hwnd);
 }
 
@@ -264 +264 @@
         if(!IsWindow(infoPtr->hwndSelf))
             return 0;   /* we have just been destroyed */
-        
+
     nmhdr->idFrom = GetDlgCtrlID (infoPtr->hwndSelf);
     nmhdr->hwndFrom = infoPtr->hwndSelf;
     nmhdr->code = code;
 
-    TRACE("to window %04x, code=%08x, %s\n", infoPtr->hwndNotify, code,
+    TRACE("to window %p, code=%08x, %s\n", infoPtr->hwndNotify, code,
           (infoPtr->bNtfUnicode) ? "via Unicode" : "via ANSI");
 
     if (infoPtr->bNtfUnicode)
-        return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, 
+        return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY,
                              (WPARAM) nmhdr->idFrom, (LPARAM)nmhdr);
     else
-        return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, 
+        return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
                              (WPARAM) nmhdr->idFrom, (LPARAM)nmhdr);
 }
@@ -287 +287 @@
 * is issued to retrieve the index.
 */
-static INT 
+static INT
 TOOLBAR_GetBitmapIndex(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr)
 {
@@ -306 +306 @@
         }
         ret = nmgd.iImage;
-        TRACE("TBN_GETDISPINFOA returned bitmap id %d, mask=%08lx, nNumBitmaps=%d\n", 
+        TRACE("TBN_GETDISPINFOA returned bitmap id %d, mask=%08lx, nNumBitmaps=%d\n",
               ret, nmgd.dwMask, infoPtr->nNumBitmaps);
     }
@@ -313 +313 @@
 
 
-static BOOL 
+static BOOL
 TOOLBAR_IsValidBitmapIndex(TOOLBAR_INFO *infoPtr, INT index)
 {
@@ -329 +329 @@
 * This function validates the bitmap index (including I_IMAGECALLBACK
 * functionality). It then draws the image via the ImageList_Draw
-* function. It returns TRUE if the image was drawn, FALSE otherwise. 
+* function. It returns TRUE if the image was drawn, FALSE otherwise.
 */
 static BOOL
@@ -341 +341 @@
     if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
         if (btnPtr->iBitmap == I_IMAGENONE) return FALSE;
-        ERR("index %d is not valid, max %d\n", 
+        ERR("index %d is not valid, max %d\n",
             btnPtr->iBitmap, infoPtr->nNumBitmaps);
         return FALSE;
@@ -376 +376 @@
     if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
         if (btnPtr->iBitmap == I_IMAGENONE) return FALSE;
-        ERR("index %d is not valid, max %d\n", 
+        ERR("index %d is not valid, max %d\n",
             btnPtr->iBitmap, infoPtr->nNumBitmaps);
         return FALSE;
@@ -403 +403 @@
     myrect.bottom = lpRect->bottom - 2;
 
-    newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? 
+    newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ?
                 comctl32_color.clrBtnShadow : infoPtr->clrBtnShadow;
     oldcolor = SetBkColor (hdc, newcolor);
@@ -411 +411 @@
     myrect.right = myrect.left + 1;
 
-    newcolor = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ? 
+    newcolor = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ?
                 comctl32_color.clrBtnHighlight : infoPtr->clrBtnHighlight;
     SetBkColor (hdc, newcolor);
@@ -447 +447 @@
           myrect.left, myrect.top, myrect.right, myrect.bottom);
 
-    newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? 
+    newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ?
                 comctl32_color.clrBtnShadow : infoPtr->clrBtnShadow;
     oldcolor = SetBkColor (hdc, newcolor);
@@ -455 +455 @@
     myrect.bottom = myrect.top + 1;
 
-    newcolor = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ? 
+    newcolor = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ?
                 comctl32_color.clrBtnHighlight : infoPtr->clrBtnHighlight;
     SetBkColor (hdc, newcolor);
@@ -468 +468 @@
 {
     INT x, y;
-    SelectObject ( hdc, GetSysColorPen (colorRef));
+    HPEN hPen, hOldPen;
+
+    if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return;
+    hOldPen = SelectObject ( hdc, hPen );
     x = left + 2;
     y = top + 8;
@@ -477 +480 @@
     MoveToEx (hdc, x, y, NULL);
     LineTo (hdc, x+1, y++);
+    SelectObject( hdc, hOldPen );
+    DeleteObject( hPen );
 }
 
@@ -627 +632 @@
         else
             rc.right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
-        rcArrow.left = rc.right; 
+        rcArrow.left = rc.right;
     }
 
@@ -641 +646 @@
         rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
 
-    TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n", 
+    TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n",
           btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
           infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
@@ -652 +657 @@
         InflateRect (&rcText, -3, -3);
 
-        if (infoPtr->himlDef && 
+        if (infoPtr->himlDef &&
             TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
                 /* The following test looked like this before
@@ -660 +665 @@
                  *    ((btnPtr->fsStyle & TBSTYLE_AUTOSIZE) == 0) &&
                  *       (btnPtr->iBitmap != I_IMAGENONE))
-                 */ 
+                 */
                 if (dwStyle & TBSTYLE_LIST) {
                     /* LIST style w/ ICON offset is by matching native. */
@@ -707 +712 @@
     tbcd.hpenLines = 0;
 
-    /* Issue Item Prepaint notify */ 
+    /* Issue Item Prepaint notify */
     infoPtr->dwItemCustDraw = 0;
     infoPtr->dwItemCDFlag = 0;
@@ -721 +726 @@
         infoPtr->dwItemCustDraw = ntfret & 0xffff;
         infoPtr->dwItemCDFlag = ntfret & 0xffff0000;
-        if (infoPtr->dwItemCustDraw & CDRF_SKIPDEFAULT) 
+        if (infoPtr->dwItemCustDraw & CDRF_SKIPDEFAULT)
             return;
         /* save the only part of the rect that the user can change */
@@ -761 +766 @@
                       BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
         }
-        
+
         if (hasDropDownArrow)
         {
@@ -769 +774 @@
 
         if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDis,
-                                   hdc, rcBitmap.left, rcBitmap.top, 
+                                   hdc, rcBitmap.left, rcBitmap.top,
                                    ILD_NORMAL))
             TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
@@ -800 +805 @@
 
         TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
-                               hdc, rcBitmap.left+offset, rcBitmap.top+offset, 
+                               hdc, rcBitmap.left+offset, rcBitmap.top+offset,
                                ILD_NORMAL);
 
@@ -821 +826 @@
 
         TOOLBAR_DrawPattern (hdc, &rc);
-        
+
         TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
-                               hdc, rcBitmap.left+1, rcBitmap.top+1, 
+                               hdc, rcBitmap.left+1, rcBitmap.top+1,
                                ILD_NORMAL);
 
@@ -830 +835 @@
     }
 
-    /* indeterminate */ 
+    /* indeterminate */
     if (btnPtr->fsState & TBSTATE_INDETERMINATE) {
         if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
@@ -884 +889 @@
         if (btnPtr->bHot) {
             /* if hot, attempt to draw with himlHot, if fails, use himlDef */
-            if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, 
+            if (!TOOLBAR_DrawImageList (infoPtr, btnPtr,
                                         infoPtr->himlHot,
-                                        hdc, rcBitmap.left, 
+                                        hdc, rcBitmap.left,
                                         rcBitmap.top, ILD_NORMAL))
                 TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
@@ -914 +919 @@
                                hdc, rcBitmap.left, rcBitmap.top,
                                ILD_NORMAL);}
-    
+
 
     TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
@@ -998 +1003 @@
 */
 static void
-TOOLBAR_MeasureString(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, 
+TOOLBAR_MeasureString(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
                       HDC hdc, LPSIZE lpSize)
 {
@@ -1006 +1011 @@
     lpSize->cy = 0;
 
-    if (!(btnPtr->fsState & TBSTATE_HIDDEN) ) 
+    if (!(btnPtr->fsState & TBSTATE_HIDDEN) )
     {
         LPWSTR lpText = TOOLBAR_GetText(infoPtr, btnPtr);
@@ -1076 +1081 @@
 *               TOOLBAR_WrapToolbar
 *
-* This function walks through the buttons and seperators in the 
-* toolbar, and sets the TBSTATE_WRAP flag only on those items where 
-* wrapping should occur based on the width of the toolbar window.  
-* It does *not* calculate button placement itself.  That task 
-* takes place in TOOLBAR_CalcToolbar. If the program wants to manage 
-* the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE 
+* This function walks through the buttons and seperators in the
+* toolbar, and sets the TBSTATE_WRAP flag only on those items where
+* wrapping should occur based on the width of the toolbar window.
+* It does *not* calculate button placement itself.  That task
+* takes place in TOOLBAR_CalcToolbar. If the program wants to manage
+* the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
 *
-* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow 
-* vertical toolbar lists. 
-*/ 
+* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow
+* vertical toolbar lists.
+*/
 
 static void
@@ -1097 +1102 @@
     BOOL bWrap, bButtonWrap;
 
-    /*  When the toolbar window style is not TBSTYLE_WRAPABLE,  */ 
+    /*  When the toolbar window style is not TBSTYLE_WRAPABLE,  */
     /*  no layout is necessary. Applications may use this style */
     /*  to perform their own layout on the toolbar.             */
-    if( !(dwStyle & TBSTYLE_WRAPABLE) && 
+    if( !(dwStyle & TBSTYLE_WRAPABLE) &&
         !(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) )  return;
 
@@ -1122 +1127 @@
         bWrap = FALSE;
         btnPtr[i].fsState &= ~TBSTATE_WRAP;
-        
+
         if (btnPtr[i].fsState & TBSTATE_HIDDEN)
             continue;
@@ -1134 +1139 @@
         if ((btnPtr[i].fsStyle & TBSTYLE_SEP) &&
             !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN))
-            cx = (btnPtr[i].iBitmap > 0) ?  
+            cx = (btnPtr[i].iBitmap > 0) ?
                         btnPtr[i].iBitmap : SEPARATOR_WIDTH;
         else
             cx = infoPtr->nButtonWidth;
 
-        /* Two or more adjacent separators form a separator group.   */ 
+        /* Two or more adjacent separators form a separator group.   */
         /* The first separator in a group should be wrapped to the   */
         /* next row if the previous wrapping is on a button.         */
         if( bButtonWrap &&
-                (btnPtr[i].fsStyle & TBSTYLE_SEP) && 
+                (btnPtr[i].fsStyle & TBSTYLE_SEP) &&
                 (i + 1 < infoPtr->nNumButtons ) &&
-                (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) ) 
+                (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) )
         {
             TRACE("wrap point 1 btn %d style %02x\n", i, btnPtr[i].fsStyle);
@@ -1158 +1163 @@
         /* Test added to also wrap after a button that starts a row but     */
         /* is bigger than the area.  - GA  8/01                             */
-        if (( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 
+        if (( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2
            > infoPtr->nWidth ) ||
             ((x == infoPtr->nIndent) && (cx > infoPtr->nWidth)))
@@ -1164 +1169 @@
             BOOL bFound = FALSE;
 
-            /*  If the current button is a separator and not hidden,  */ 
+            /*  If the current button is a separator and not hidden,  */
             /*  go to the next until it reaches a non separator.      */
             /*  Wrap the last separator if it is before a button.     */
             while( ( ((btnPtr[i].fsStyle & TBSTYLE_SEP) &&
-                      !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN)) || 
+                      !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN)) ||
                      (btnPtr[i].fsState & TBSTATE_HIDDEN) ) &&
                         i < infoPtr->nNumButtons )
@@ -1175 +1180 @@
                 bFound = TRUE;
             }
-    
+
             if( bFound && i < infoPtr->nNumButtons )
             {
                 i--;
-                TRACE("wrap point 2 btn %d style %02x, x=%d, cx=%d\n", 
+                TRACE("wrap point 2 btn %d style %02x, x=%d, cx=%d\n",
                       i, btnPtr[i].fsStyle, x, cx);
                 btnPtr[i].fsState |= TBSTATE_WRAP;
@@ -1189 +1194 @@
                 break;
 
-            /*  If the current button is not a separator, find the last  */ 
+            /*  If the current button is not a separator, find the last  */
             /*  separator and wrap it.                                   */
             for ( j = i - 1; j >= 0  &&  !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
@@ -1196 +1201 @@
                         !(btnPtr[j].fsState & TBSTATE_HIDDEN))
                 {
-                    bFound = TRUE; 
-                    i = j; 
-                    TRACE("wrap point 3 btn %d style %02x, x=%d, cx=%d\n", 
+                    bFound = TRUE;
+                    i = j;
+                    TRACE("wrap point 3 btn %d style %02x, x=%d, cx=%d\n",
                           i, btnPtr[i].fsStyle, x, cx);
                     x = infoPtr->nIndent;
                     btnPtr[j].fsState |= TBSTATE_WRAP;
-                    bButtonWrap = FALSE; 
+                    bButtonWrap = FALSE;
                     break;
                 }
@@ -1211 +1216 @@
             if (!bFound)
             {
-                for ( j = i - 1; 
+                for ( j = i - 1;
                         j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
                 {
-                    if (btnPtr[j].fsState & TBSTATE_HIDDEN) 
+                    if (btnPtr[j].fsState & TBSTATE_HIDDEN)
                         continue;
 
-                    bFound = TRUE; 
-                    i = j; 
-                    TRACE("wrap point 4 btn %d style %02x, x=%d, cx=%d\n", 
+                    bFound = TRUE;
+                    i = j;
+                    TRACE("wrap point 4 btn %d style %02x, x=%d, cx=%d\n",
                           i, btnPtr[i].fsStyle, x, cx);
                     x = infoPtr->nIndent;
@@ -1229 +1234 @@
 
             /* If all above failed, wrap the current button. */
-            if (!bFound)  
+            if (!bFound)
             {
                 TRACE("wrap point 5 btn %d style %02x, x=%d, cx=%d\n",
@@ -1240 +1245 @@
                 else
                     bButtonWrap = TRUE;
-            }               
+            }
         }
         else {
-            TRACE("wrap point 6 btn %d style %02x, x=%d, cx=%d\n", 
+            TRACE("wrap point 6 btn %d style %02x, x=%d, cx=%d\n",
                   i, btnPtr[i].fsStyle, x, cx);
             x += cx;
@@ -1254 +1259 @@
 *               TOOLBAR_CalcToolbar
 *
-* This function calculates button and separator placement. It first 
-* calculates the button sizes, gets the toolbar window width and then 
-* calls TOOLBAR_WrapToolbar to determine which buttons we need to wrap 
+* This function calculates button and separator placement. It first
+* calculates the button sizes, gets the toolbar window width and then
+* calls TOOLBAR_WrapToolbar to determine which buttons we need to wrap
 * on. It assigns a new location to each item and sends this location to
-* the tooltip window if appropriate. Finally, it updates the rcBound 
-* rect and calculates the new required toolbar window height. 
-*/  
+* the tooltip window if appropriate. Finally, it updates the rcBound
+* rect and calculates the new required toolbar window height.
+*/
 
 static void
@@ -1297 +1302 @@
         {
             if (usesBitmaps)
-                infoPtr->nButtonHeight = sizeString.cy + 
+                infoPtr->nButtonHeight = sizeString.cy +
                     2 + /* this is the space to separate text from bitmap */
                   infoPtr->nBitmapHeight + 6;
-            else 
+            else
                 infoPtr->nButtonHeight = sizeString.cy + 6;
         }
@@ -1323 +1328 @@
 
    /*
-    * We will set the height below, and we set the width on entry 
-    * so we do not reset them here.. 
+    * We will set the height below, and we set the width on entry
+    * so we do not reset them here..
     */
 #if 0
@@ -1385 +1390 @@
         else
         {
-            if (btnPtr->fsStyle & TBSTYLE_AUTOSIZE) 
+            if (btnPtr->fsStyle & TBSTYLE_AUTOSIZE)
             {
               SIZE sz;
@@ -1402 +1407 @@
               /* toolbars with native control (v4.71).  -  GA 8/01    */
               cx = sz.cx + 6 + 5 + 5;
-              if ((dwStyle & TBSTYLE_LIST) && 
+              if ((dwStyle & TBSTYLE_LIST) &&
                   (TOOLBAR_TestImageExist (infoPtr, btnPtr, infoPtr->himlDef)))
                   cx += infoPtr->nBitmapWidth;
@@ -1410 +1415 @@
 
             if (hasDropDownArrows && (btnPtr->fsStyle & TBSTYLE_DROPDOWN))
-              cx += DDARROW_WIDTH; 
+              cx += DDARROW_WIDTH;
         }
         if (btnPtr->fsState & TBSTATE_WRAP )
@@ -1425 +1430 @@
 
         /* Set the toolTip only for non-hidden, non-separator button */
-        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP )) 
+        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP ))
         {
             TTTOOLINFOA ti;
@@ -1450 +1455 @@
             if ( !(btnPtr->fsStyle & TBSTYLE_SEP) )
                 y += cy;
-            else 
-            {   
+            else
+            {
                 /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
                 /* it is the actual width of the separator. This is used for */
@@ -1457 +1462 @@
                 if ( !(btnPtr->fsStyle & TBSTYLE_DROPDOWN))
                     y += cy + ( (btnPtr->iBitmap > 0 ) ?
-                                btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; 
+                                btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3;
                 else
                     y += cy;
-             
+
                 /* nSepRows is used to calculate the extra height follwoing  */
                 /* the last row.                                             */
@@ -1491 +1496 @@
     /* nSepRows * (infoPtr->nBitmapHeight + 1) is the space following   */
     /* the last row.                                                    */
-    infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight + 
+    infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight +
                         nSepRows * (SEPARATOR_WIDTH * 2 / 3) +
-                        nSepRows * (infoPtr->nBitmapHeight + 1) + 
-                        BOTTOM_BORDER; 
+                        nSepRows * (infoPtr->nBitmapHeight + 1) +
+                        BOTTOM_BORDER;
 #endif
 
@@ -1509 +1514 @@
     TBUTTON_INFO *btnPtr;
     INT i;
-    
+
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
@@ -1589 +1594 @@
     nRunIndex = nIndex + 1;
     while (nRunIndex < infoPtr->nNumButtons) {
-        btnPtr = &infoPtr->buttons[nRunIndex];  
+        btnPtr = &infoPtr->buttons[nRunIndex];
         if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
             if (btnPtr->fsState & TBSTATE_CHECKED)
@@ -1644 +1649 @@
                 int i = 0;
                 int index;
-                
+
                 infoPtr = custInfo->tbInfo;
 
@@ -1664 +1669 @@
                     /* send TBN_QUERYDELETE notification */
                     nmtb.iItem = i;
-                    btnInfo->bRemovable = TOOLBAR_SendNotify ((NMHDR *) &nmtb, 
-                                                      infoPtr, 
+                    btnInfo->bRemovable = TOOLBAR_SendNotify ((NMHDR *) &nmtb,
+                                                      infoPtr,
                                                       TBN_QUERYDELETE);
 
@@ -1693 +1698 @@
                         break;
 
-                    TRACE("style: %x\n", nmtb.tbButton.fsStyle);                
+                    TRACE("style: %x\n", nmtb.tbButton.fsStyle);
 
                     /* insert button into the apropriate list */
@@ -1769 +1774 @@
                         /* send TBN_QUERYINSERT notification */
                         nmtb.iItem = index;
-                        TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, 
+                        TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
                                         TBN_QUERYINSERT);
 
@@ -1987 +1992 @@
                 RECT rcButton;
                 RECT rcText;
-                HPEN hOldPen;
+                HPEN hPen, hOldPen;
                 HBRUSH hOldBrush;
                 COLORREF oldText = 0;
@@ -2006 +2011 @@
                 else
                    oldText = SetTextColor (lpdis->hDC, (lpdis->itemState & ODS_FOCUS)?comctl32_color.clrHighlightText:comctl32_color.clrWindowText);
-                hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                hPen = CreatePen( PS_SOLID, 1,
+                     GetSysColor( (lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                hOldPen = SelectObject (lpdis->hDC, hPen );
                 hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
 
@@ -2039 +2046 @@
                 SetBkColor (lpdis->hDC, oldBk);
                 SetTextColor (lpdis->hDC, oldText);
-
+                DeleteObject( hPen );
                 return TRUE;
             }
@@ -2076 +2083 @@
     HBITMAP hbmLoad;
 
-    TRACE("hwnd=%x wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
+    TRACE("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
     if (!lpAddBmp)
         return -1;
@@ -2094 +2101 @@
 
         /* Windows resize all the buttons to the size of a newly added standard image */
-        if (lpAddBmp->nID & 1) 
+        if (lpAddBmp->nID & 1)
         {
             /* large icons */
-            /* FIXME: on windows the size of the images is 25x24 but the size of the bitmap 
-             * in rsrc is only 24x24. Fix the bitmap (how?) and then fix this 
+            /* FIXME: on windows the size of the images is 25x24 but the size of the bitmap
+             * in rsrc is only 24x24. Fix the bitmap (how?) and then fix this
              */
             SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
@@ -2104 +2111 @@
             SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
                           MAKELPARAM((WORD)31, (WORD)30));
-        }       
-        else 
+        }
+        else
         {
             /* small icons */
@@ -2113 +2120 @@
                           MAKELPARAM((WORD)22, (WORD)22));
         }
-        
+
         TOOLBAR_CalcToolbar (hwnd);
     }
@@ -2121 +2128 @@
         if (nButtons <= 0)
             return -1;
-        
+
         TRACE ("adding %d bitmaps!\n", nButtons);
     }
-    
+
     if (!(infoPtr->himlDef)) {
         /* create new default image list */
@@ -2140 +2147 @@
     if (lpAddBmp->hInst == (HINSTANCE)0)
     {
-        nIndex = 
+        nIndex =
             ImageList_AddMasked (infoPtr->himlDef, (HBITMAP)lpAddBmp->nID,
                                  CLR_DEFAULT);
@@ -2470 +2477 @@
         {
             PWSTR p = szString + 1;
-                
-            nIndex = infoPtr->nNumStrings;
-            while (*p != L'|') {
-
-            if (infoPtr->nNumStrings == 0) {
-                infoPtr->strings =
-                    COMCTL32_Alloc (sizeof(LPWSTR));
-            }
-            else {
-                LPWSTR *oldStrings = infoPtr->strings;
-                infoPtr->strings =
-                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-                memcpy (&infoPtr->strings[0], &oldStrings[0],
-                        sizeof(LPWSTR) * infoPtr->nNumStrings);
-                COMCTL32_Free (oldStrings);
-            }
-
-            len = COMCTL32_StrChrW (p, L'|') - p;
-            TRACE("len=%d %s\n", len, debugstr_w(p));
-            infoPtr->strings[infoPtr->nNumStrings] =
-                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-            lstrcpynW (infoPtr->strings[infoPtr->nNumStrings], p, len+1);
-            infoPtr->nNumStrings++;
-
-                p += (len+1);
-            }
+
+            nIndex = infoPtr->nNumStrings;
+            while (*p != L'|' && *p != L'\0') {
+                PWSTR np;
+
+                if (infoPtr->nNumStrings == 0) {
+                    infoPtr->strings = COMCTL32_Alloc (sizeof(LPWSTR));
+                }
+                else
+                {
+                    LPWSTR *oldStrings = infoPtr->strings;
+                    infoPtr->strings = COMCTL32_Alloc(sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                    memcpy(&infoPtr->strings[0], &oldStrings[0],
+                           sizeof(LPWSTR) * infoPtr->nNumStrings);
+                    COMCTL32_Free(oldStrings);
+                }
+
+                np=COMCTL32_StrChrW (p, L'|');
+                if (np!=NULL) {
+                    len = np - p;
+                    np++;
+                } else {
+                    len = strlenW(p);
+                    np = p + len;
+                }
+                TRACE("len=%d %s\n", len, debugstr_w(p));
+                infoPtr->strings[infoPtr->nNumStrings] =
+                    COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+                lstrcpynW (infoPtr->strings[infoPtr->nNumStrings], p, len+1);
+                infoPtr->nNumStrings++;
+
+                p = np;
+            }
         }
         else
@@ -2635 +2649 @@
 
     if (infoPtr == NULL) {
-        ERR("(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
+        ERR("(%p, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
         ERR("infoPtr == NULL!\n");
         return 0;
@@ -2692 +2706 @@
     else {
         if (btnPtr->fsStyle & TBSTYLE_GROUP) {
-            nOldIndex = 
+            nOldIndex =
                 TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nIndex);
             if (nOldIndex == nIndex)
@@ -2752 +2766 @@
         return FALSE;
 
-    ret = DialogBoxIndirectParamA (GetWindowLongA (hwnd, GWL_HINSTANCE),
+    ret = DialogBoxIndirectParamA ((HINSTANCE)GetWindowLongA(hwnd, GWL_HINSTANCE),
                                    (LPDLGTEMPLATEA)template,
                                    hwnd,
@@ -2775 +2789 @@
         return FALSE;
 
-    if ((infoPtr->hwndToolTip) && 
+    if ((infoPtr->hwndToolTip) &&
         !(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
         TTTOOLINFOA ti;
@@ -2970 +2984 @@
         return -1;
 
-    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, 
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam,
                                      lpTbInfo->dwMask & 0x80000000);
     if (nIndex == -1)
@@ -2976 +2990 @@
 
     btnPtr = &infoPtr->buttons[nIndex];
+
+    if(!btnPtr)
+        return -1;
 
     if (lpTbInfo->dwMask & TBIF_COMMAND)
@@ -3128 +3145 @@
     if (btnPtr->fsState & TBSTATE_HIDDEN)
         return FALSE;
-    
+
     lpRect->left   = btnPtr->rect.left;
     lpRect->right  = btnPtr->rect.right;
@@ -3189 +3206 @@
     if (lpRect == NULL)
         return FALSE;
-    
+
     lpRect->left   = btnPtr->rect.left;
     lpRect->right  = btnPtr->rect.right;
@@ -3258 +3275 @@
     if (infoPtr == NULL)
         return 0;
-    return infoPtr->hwndToolTip;
+    return (LRESULT)infoPtr->hwndToolTip;
 }
 
@@ -3267 +3284 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    TRACE("%s hwnd=0x%x stub!\n", 
+    TRACE("%s hwnd=%p stub!\n",
            infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
 
@@ -3465 +3482 @@
        return FALSE;
 
-    /* If the string passed is not an index, assume address of string 
+    /* If the string passed is not an index, assume address of string
        and do our own AddString */
     if ((HIWORD(lpTbb->iString) != 0) && (lpTbb->iString != -1)) {
@@ -3663 +3680 @@
     int i = 0, nOldButtons = 0, pos = 0;
 
-    TRACE("hInstOld %x nIDOld %x hInstNew %x nIDNew %x nButtons %x\n",
+    TRACE("hInstOld %p nIDOld %x hInstNew %p nIDNew %x nButtons %x\n",
           lpReplace->hInstOld, lpReplace->nIDOld, lpReplace->hInstNew, lpReplace->nIDNew,
           lpReplace->nButtons);
 
-    if (lpReplace->hInstOld == -1)
+    if (lpReplace->hInstOld == HINST_COMMCTRL)
     {
         FIXME("changing standard bitmaps not implemented\n");
@@ -3682 +3699 @@
     }
 
-    TRACE("To be replaced hInstOld %x nIDOld %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+    TRACE("To be replaced hInstOld %p nIDOld %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
     for (i = 0; i < infoPtr->nNumBitmapInfos; i++) {
         TBITMAP_INFO *tbi = &infoPtr->bitmaps[i];
-        TRACE("tbimapinfo %d hInstOld %x nIDOld %x\n", i, tbi->hInst, tbi->nID);
+        TRACE("tbimapinfo %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID);
         if (tbi->hInst == lpReplace->hInstOld && tbi->nID == lpReplace->nIDOld)
         {
-            TRACE("Found: nButtons %d hInst %x nID %x\n", tbi->nButtons, tbi->hInst, tbi->nID);
+            TRACE("Found: nButtons %d hInst %p nID %x\n", tbi->nButtons, tbi->hInst, tbi->nID);
             nOldButtons = tbi->nButtons;
             tbi->nButtons = lpReplace->nButtons;
             tbi->hInst = lpReplace->hInstNew;
             tbi->nID = lpReplace->nIDNew;
-            TRACE("tbimapinfo changed %d hInstOld %x nIDOld %x\n", i, tbi->hInst, tbi->nID);
+            TRACE("tbimapinfo changed %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID);
             break;
         }
@@ -3701 +3718 @@
     if (nOldButtons == 0)
     {
-        WARN("No hinst/bitmap found! hInst %x nID %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+        WARN("No hinst/bitmap found! hInst %p nID %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
         return FALSE;
     }
@@ -3833 +3850 @@
     if (lptbbi->cbSize < sizeof(TBBUTTONINFOA))
         return FALSE;
-    
+
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam,
                                      lptbbi->dwMask & 0x80000000);
@@ -3857 +3874 @@
             /* iString is index, zero it to make Str_SetPtr succeed */
             btnPtr->iString=0;
-      
+
          Str_SetPtrAtoW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText);
     }
@@ -3919 +3936 @@
 
     /* The documentation claims you can only change the button size before
-     * any button has been added. But this is wrong. 
-     * WINZIP32.EXE (ver 8) calls this on one of its buttons after adding 
+     * any button has been added. But this is wrong.
+     * WINZIP32.EXE (ver 8) calls this on one of its buttons after adding
      * it to the toolbar, and it checks that the return value is nonzero - mjm
      * Further testing shows that we must actually perform the change too.
@@ -3927 +3944 @@
      * The documentation also does not mention that if 0 is supplied for
      * either size, the system changes it to the default of 24 wide and
-     * 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02 
+     * 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02
      */
     infoPtr->nButtonWidth = (cx) ? cx : 24;
@@ -3950 +3967 @@
         TRACE("matches current width, min=%d, max=%d, no recalc\n",
               infoPtr->cxMin, infoPtr->cxMax);
-        return TRUE; 
+        return TRUE;
     }
 
@@ -3959 +3976 @@
     /* if both values are 0 then we are done */
     if (lParam == 0) {
-        TRACE("setting both min and max to 0, norecalc\n"); 
+        TRACE("setting both min and max to 0, norecalc\n");
         return TRUE;
     }
@@ -3966 +3983 @@
        recalc the bounding rectangle (does DrawText w/ DT_CALCRECT
        which doesn't actually draw - GA). */
-    TRACE("number of buttons %d, cx=%d, cy=%d, recalcing\n", 
+    TRACE("number of buttons %d, cx=%d, cy=%d, recalcing\n",
         infoPtr->nNumButtons, infoPtr->cxMin, infoPtr->cxMax);
 
@@ -4015 +4032 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp; 
+    return (LRESULT)himlTemp;
 }
 
@@ -4054 +4071 @@
               (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL));
 
-    return (LRESULT)dwTemp; 
+    return (LRESULT)dwTemp;
 }
 
@@ -4074 +4091 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp; 
+    return (LRESULT)himlTemp;
 }
 
@@ -4133 +4150 @@
     ImageList_GetIconSize(infoPtr->himlDef, &infoPtr->nBitmapWidth,
                           &infoPtr->nBitmapHeight);
-    TRACE("hwnd %08x, new himl=%08x, count=%d, bitmap w=%d, h=%d\n",
+    TRACE("hwnd %p, new himl=%08x, count=%d, bitmap w=%d, h=%d\n",
           hwnd, (INT)infoPtr->himlDef, infoPtr->nNumBitmaps,
           infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
@@ -4140 +4157 @@
     InvalidateRect(hwnd, NULL, TRUE);
 
-    return (LRESULT)himlTemp; 
+    return (LRESULT)himlTemp;
 }
 
@@ -4223 +4240 @@
     infoPtr->hwndNotify = (HWND)wParam;
 
-    return hwndOldNotify;
+    return (LRESULT)hwndOldNotify;
 }
 
@@ -4342 +4359 @@
     BOOL bTemp;
 
-    TRACE("%s hwnd=0x%04x stub!\n", 
+    TRACE("%s hwnd=%p stub!\n",
            ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
 
@@ -4357 +4374 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    lParam->clrBtnHighlight = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ? 
-                               comctl32_color.clrBtnHighlight : 
+    lParam->clrBtnHighlight = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ?
+                               comctl32_color.clrBtnHighlight :
                                infoPtr->clrBtnHighlight;
-    lParam->clrBtnShadow = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? 
+    lParam->clrBtnShadow = (infoPtr->clrBtnShadow == CLR_DEFAULT) ?
                            comctl32_color.clrBtnShadow : infoPtr->clrBtnShadow;
     return 1;
@@ -4420 +4437 @@
                 infoPtr->buttons[nOldHotItem].idCommand : 0;
         if ( !(nmhotitem.dwFlags & HICF_LEAVING) )
-            nmhotitem.idNew = (infoPtr->nHotItem >= 0) ? 
+            nmhotitem.idNew = (infoPtr->nHotItem >= 0) ?
                 infoPtr->buttons[infoPtr->nHotItem].idCommand : 0;
         no_hi = TOOLBAR_SendNotify((NMHDR*)&nmhotitem, infoPtr, TBN_HOTITEMCHANGE);
@@ -4629 +4646 @@
 
         /* FIXME: in general the return flags *can* be or'ed together */
-        switch (infoPtr->dwBaseCustDraw) 
+        switch (infoPtr->dwBaseCustDraw)
             {
             case CDRF_DODEFAULT:
@@ -4636 +4653 @@
                 return TRUE;
             default:
-                FIXME("[%04x] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+                FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
                       hwnd, ntfret);
             }
     }
 
-    /* If the toolbar is "transparent" then pass the WM_ERASEBKGND up 
+    /* If the toolbar is "transparent" then pass the WM_ERASEBKGND up
      * to my parent for processing.
      */
@@ -4660 +4677 @@
         ret = DefWindowProcA (hwnd, WM_ERASEBKGND, wParam, lParam);
 
-    if ((dwStyle & TBSTYLE_CUSTOMERASE) && 
-        (infoPtr->dwBaseCustDraw & CDRF_NOTIFYPOSTERASE)) { 
+    if ((dwStyle & TBSTYLE_CUSTOMERASE) &&
+        (infoPtr->dwBaseCustDraw & CDRF_NOTIFYPOSTERASE)) {
         ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
         tbcd.nmcd.dwDrawStage = CDDS_POSTERASE;
@@ -4667 +4684 @@
         ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
         infoPtr->dwBaseCustDraw = ntfret & 0xffff;
-        switch (infoPtr->dwBaseCustDraw) 
+        switch (infoPtr->dwBaseCustDraw)
             {
             case CDRF_DODEFAULT:
@@ -4674 +4691 @@
                 return TRUE;
             default:
-                FIXME("[%04x] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+                FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
                       hwnd, ntfret);
             }
@@ -4687 +4704 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    return infoPtr->hFont;
+    return (LRESULT)infoPtr->hFont;
 }
 
@@ -4743 +4760 @@
         RECT arrowRect;
         btnPtr = &infoPtr->buttons[nHit];
-        if (!(btnPtr->fsState & TBSTATE_ENABLED))
-            return 0;
-
         infoPtr->nOldHit = nHit;
 
@@ -4752 +4766 @@
 
         /* for EX_DRAWDDARROWS style,  click must be in the drop-down arrow rect */
-        if ((btnPtr->fsStyle & TBSTYLE_DROPDOWN) &&
+        if ((btnPtr->fsState & TBSTATE_ENABLED) && (btnPtr->fsStyle & TBSTYLE_DROPDOWN) &&
              ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) ||
               (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle))))
@@ -4783 +4797 @@
         btnPtr->bHot = FALSE;
 
-        InvalidateRect(hwnd, &btnPtr->rect,
-                       TOOLBAR_HasText(infoPtr, btnPtr));
+        if (btnPtr->fsState & TBSTATE_ENABLED)
+            InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr));
         UpdateWindow(hwnd);
         SetCapture (hwnd);
@@ -4840 +4854 @@
                     if (nOldIndex == nHit)
                         bSendMessage = FALSE;
-                    if ((nOldIndex != nHit) && 
+                    if ((nOldIndex != nHit) &&
                         (nOldIndex != -1))
                         infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
@@ -4862 +4876 @@
          * now we can ReleaseCapture, which triggers CAPTURECHANGED msg,
          * that resets bCaptured and btn TBSTATE_PRESSED flags,
-         * and obliterates nButtonDown and nOldHit (see TOOLBAR_CaptureChanged) 
+         * and obliterates nButtonDown and nOldHit (see TOOLBAR_CaptureChanged)
          */
         if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0))
             ReleaseCapture ();
+        infoPtr->nButtonDown = -1;
 
         /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */
@@ -4871 +4886 @@
                         NM_RELEASEDCAPTURE);
 
-        /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the 
+        /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the
          * TBN_BEGINDRAG
          */
@@ -4886 +4901 @@
                         TBN_ENDDRAG);
 
-        SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
-          MAKEWPARAM(infoPtr->buttons[nHit].idCommand, 0), (LPARAM)hwnd);
-
-        /* !!! Undocumented - toolbar at 4.71 level and above sends
-         * either NMRCLICK or NM_CLICK with the NMMOUSE structure.
-         * Only NM_RCLICK is documented.
-         */
-        nmmouse.dwItemSpec = btnPtr->idCommand;
-        nmmouse.dwItemData = btnPtr->dwData;
-        TOOLBAR_SendNotify ((NMHDR *) &nmmouse, infoPtr,
-                        NM_CLICK);
+        if (btnPtr->fsState & TBSTATE_ENABLED)
+        {
+            SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
+              MAKEWPARAM(infoPtr->buttons[nHit].idCommand, 0), (LPARAM)hwnd);
+
+            /* !!! Undocumented - toolbar at 4.71 level and above sends
+            * either NMRCLICK or NM_CLICK with the NMMOUSE structure.
+            * Only NM_RCLICK is documented.
+            */
+            nmmouse.dwItemSpec = btnPtr->idCommand;
+            nmmouse.dwItemData = btnPtr->dwData;
+            TOOLBAR_SendNotify ((NMHDR *) &nmmouse, infoPtr, NM_CLICK);
+        }
     return 0;
 }
@@ -4913 +4930 @@
         btnPtr->fsState &= ~TBSTATE_PRESSED;
 
-        infoPtr->nButtonDown = -1;
         infoPtr->nOldHit = -1;
 
-        InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
-            btnPtr));
+        if (btnPtr->fsState & TBSTATE_ENABLED)
+            InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
+              btnPtr));
     }
     return 0;
@@ -4986 +5003 @@
     if(!(trackinfo.dwFlags & TME_LEAVE)) {
         trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
- 
+
         /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
         /* and can properly deactivate the hot toolbar button */
@@ -5005 +5022 @@
         /* Remove the effect of an old hot button if the button was enabled and was
            drawn with the hot button effect */
-        if(infoPtr->nOldHit >= 0 && infoPtr->nOldHit == infoPtr->nHotItem && 
+        if(infoPtr->nOldHit >= 0 && infoPtr->nOldHit == infoPtr->nHotItem &&
                 (infoPtr->buttons[infoPtr->nOldHit].fsState & TBSTATE_ENABLED))
         {
@@ -5019 +5036 @@
             infoPtr->nHotItem = nHit;
 
-            /* only enabled buttons show hot effect */            
+            /* only enabled buttons show hot effect */
             if(infoPtr->buttons[nHit].fsState & TBSTATE_ENABLED)
             {
@@ -5110 +5127 @@
      *    hdc = GetDC(toolbar)
      *    GetSystemMetrics(0x48)
-     *    fnt2=CreateFontA(0xe, 0, 0, 0, 0x190, 0, 0, 0, 0, 2, 
+     *    fnt2=CreateFontA(0xe, 0, 0, 0, 0x190, 0, 0, 0, 0, 2,
      *                     0, 0, 0, 0, "MARLETT")
      *    oldfnt = SelectObject(hdc, fnt2)
@@ -5199 +5216 @@
         if (lppgc->dwFlag == PGF_CALCWIDTH) {
             lppgc->iWidth = infoPtr->rcBound.right - infoPtr->rcBound.left;
-            TRACE("processed PGN_CALCSIZE, returning horz size = %d\n", 
+            TRACE("processed PGN_CALCSIZE, returning horz size = %d\n",
                   lppgc->iWidth);
         }
         else {
             lppgc->iHeight = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
-            TRACE("processed PGN_CALCSIZE, returning vert size = %d\n", 
+            TRACE("processed PGN_CALCSIZE, returning vert size = %d\n",
                   lppgc->iHeight);
         }
+        return 0;
+    }
+
+    if (lpnmh->code == PGN_SCROLL) {
+        LPNMPGSCROLL lppgs = (LPNMPGSCROLL)lParam;
+
+        lppgs->iScroll = (lppgs->iDir & (PGF_SCROLLLEFT | PGF_SCROLLRIGHT)) ?
+                          infoPtr->nButtonWidth : infoPtr->nButtonHeight;
+        TRACE("processed PGN_SCROLL, returning scroll=%d, dir=%d\n",
+              lppgs->iScroll, lppgs->iDir);
         return 0;
     }
@@ -5215 +5242 @@
     if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
         if (infoPtr->bNtfUnicode)
-            return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, 
+            return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY,
                                  wParam, lParam);
         else
-            return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, 
+            return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
                                  wParam, lParam);
 
@@ -5259 +5286 @@
     if (lParam == NF_REQUERY) {
         i = SendMessageA(GetParent(infoPtr->hwndSelf),
-                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+                         WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
         if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
             ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
@@ -5280 +5307 @@
 
     /* fill ps.rcPaint with a default rect */
-    memcpy(&(ps.rcPaint), &(infoPtr->rcBound), sizeof(infoPtr->rcBound)); 
+    memcpy(&(ps.rcPaint), &(infoPtr->rcBound), sizeof(infoPtr->rcBound));
 
     hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam;
@@ -5303 +5330 @@
       *
       * Documentation:
-      *  According to testing V4.71 of COMCTL32 returns the 
+      *  According to testing V4.71 of COMCTL32 returns the
       *  *previous* status of the redraw flag (either 0 or 1)
       *  instead of the MSDN documented value of 0 if handled.
@@ -5314 +5341 @@
     BOOL oldredraw = infoPtr->bDoRedraw;
 
-    TRACE("set to %s\n", 
+    TRACE("set to %s\n",
           (wParam) ? "TRUE" : "FALSE");
     infoPtr->bDoRedraw = (BOOL) wParam;
@@ -5368 +5395 @@
              * Calc Toolbar will not adjust it, only the height
              */
-            infoPtr->nWidth = parent_rect.right - parent_rect.left; 
+            infoPtr->nWidth = parent_rect.right - parent_rect.left;
             cy = infoPtr->nHeight;
             cx = infoPtr->nWidth;
@@ -5424 +5451 @@
         }
         infoPtr->bTransparent = (lpStyle->styleNew & TBSTYLE_TRANSPARENT);
-        infoPtr->bBtnTranspnt = (lpStyle->styleNew & 
+        infoPtr->bBtnTranspnt = (lpStyle->styleNew &
                                  (TBSTYLE_FLAT | TBSTYLE_LIST));
         TOOLBAR_CheckStyle (hwnd, lpStyle->styleNew);
@@ -5450 +5477 @@
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", 
+    TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
           hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
 
@@ -5758 +5785 @@
 
         case WM_MOUSELEAVE:
-            return TOOLBAR_MouseLeave (hwnd, wParam, lParam);   
+            return TOOLBAR_MouseLeave (hwnd, wParam, lParam);
 
         case WM_CAPTURECHANGED:
-            return TOOLBAR_CaptureChanged(hwnd);        
+            return TOOLBAR_CaptureChanged(hwnd);
 
         case WM_NCACTIVATE:
@@ -5816 +5843 @@
 
         default:
-            if (uMsg >= WM_USER)
+            if ((uMsg >= WM_USER) && (uMsg < WM_APP))
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",
                      uMsg, wParam, lParam);
@@ -5838 +5865 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = TOOLBARCLASSNAMEA;
- 
+
     RegisterClassA (&wndClass);
 }

trunk/src/comctl32/updown.c

@@ -1 @@
-/*              
+/*
  * Updown control
  *
@@ -18 +18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ * NOTE
+ * 
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Sep. 9, 2002, by Dimitrie O. Paun.
+ * 
+ * Unless otherwise noted, we believe this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ * 
  */
 
@@ -30 +39 @@
 #include "commctrl.h"
 #include "winnls.h"
-#include "ntddk.h"
+#include "wine/unicode.h"
 #include "wine/debug.h"
-#ifdef __WIN32OS2__
-#include "comctl32.h"
-#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(updown);
@@ -87 +93 @@
 #define BUDDY_SUPERCLASS_WNDPROC "buddySupperClassWndProc"
 
-#define UNKNOWN_PARAM(msg, wParam, lParam) WARN(\
-        "Unknown parameter(s) for message " #msg \
-        "(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam);
-
 #define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO *)GetWindowLongA (hwnd,0))
 #define COUNT_OF(a) (sizeof(a)/sizeof(a[0]))
@@ -155 +157 @@
  */
 static BOOL UPDOWN_HasBuddyBorder(UPDOWN_INFO* infoPtr)
-{  
+{
     DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE);
 
@@ -185 +187 @@
         else
             rect->right -= DEFAULT_BUDDYBORDER;
-    
+
         InflateRect(rect, 0, -DEFAULT_BUDDYBORDER);
     }
@@ -194 +196 @@
         else rect->left += DEFAULT_BUDDYSPACER;
     }
-    
+
     /*
      * We're calculating the midpoint to figure-out where the
@@ -203 +205 @@
         int len = rect->right - rect->left + 1; /* compute the width */
         if (arrow & FLAG_INCR)
-            rect->left = rect->left + len/2; 
+            rect->left = rect->left + len/2;
         if (arrow & FLAG_DECR)
             rect->right =  rect->left + len/2 - 1;
@@ -271 +273 @@
         if (!GetWindowTextW(infoPtr->Buddy, txt, COUNT_OF(txt))) return FALSE;
 
-        sep = UPDOWN_GetThousandSep(); 
+        sep = UPDOWN_GetThousandSep();
 
         /* now get rid of the separators */
@@ -279 +281 @@
 
         /* try to convert the number and validate it */
-        newVal = wcstol(txt, &src, infoPtr->Base);
+        newVal = strtolW(txt, &src, infoPtr->Base);
         if(*src || !UPDOWN_InBounds (infoPtr, newVal)) return FALSE;
     }
-  
+
     TRACE("new value(%d) from buddy (old=%d)\n", newVal, infoPtr->CurVal);
     infoPtr->CurVal = newVal;
@@ -310 +312 @@
         return SendMessageW(infoPtr->Buddy, LB_SETCURSEL, infoPtr->CurVal, 0) != LB_ERR;
     }
-   
+
     /* Regular window, so set caption to the number */
     if (infoPtr->Base == 16) fmt[1] = 'X';
-    len = swprintf(txt, fmt, infoPtr->CurVal);
+    len = wsprintfW(txt, fmt, infoPtr->CurVal);
 
 
@@ -321 +323 @@
         WCHAR sep = UPDOWN_GetThousandSep();
         int start = len % 3;
-        
+
         memcpy(tmp, txt, sizeof(txt));
         if (start == 0) start = 3;
@@ -332 +334 @@
         *dst = 0;
     }
-    
+
     return SetWindowTextW(infoPtr->Buddy, txt);
-} 
+}
 
 /***********************************************************************
@@ -350 +352 @@
     if (UPDOWN_HasBuddyBorder(infoPtr)) {
         GetClientRect(infoPtr->Self, &rect);
-        DrawEdge(hdc, &rect, EDGE_SUNKEN, 
-                 BF_BOTTOM | BF_TOP | 
+        DrawEdge(hdc, &rect, EDGE_SUNKEN,
+                 BF_BOTTOM | BF_TOP |
                  (dwStyle & UDS_ALIGNLEFT ? BF_LEFT : BF_RIGHT));
     }
-  
+
     /* Draw the incr button */
     UPDOWN_GetArrowRect (infoPtr, &rect, FLAG_INCR);
     pressed = (infoPtr->Flags & FLAG_PRESSED) && (infoPtr->Flags & FLAG_INCR);
     hot = (infoPtr->Flags & FLAG_INCR) && (infoPtr->Flags & FLAG_MOUSEIN);
-    DrawFrameControl(hdc, &rect, DFC_SCROLL, 
+    DrawFrameControl(hdc, &rect, DFC_SCROLL,
         (dwStyle & UDS_HORZ ? DFCS_SCROLLRIGHT : DFCS_SCROLLUP) |
         ((dwStyle & UDS_HOTTRACK) && hot ? DFCS_HOT : 0) |
@@ -369 +371 @@
     pressed = (infoPtr->Flags & FLAG_PRESSED) && (infoPtr->Flags & FLAG_DECR);
     hot = (infoPtr->Flags & FLAG_DECR) && (infoPtr->Flags & FLAG_MOUSEIN);
-    DrawFrameControl(hdc, &rect, DFC_SCROLL, 
+    DrawFrameControl(hdc, &rect, DFC_SCROLL,
         (dwStyle & UDS_HORZ ? DFCS_SCROLLLEFT : DFCS_SCROLLDOWN) |
         ((dwStyle & UDS_HOTTRACK) && hot ? DFCS_HOT : 0) |
@@ -402 +404 @@
 {
     int arrow;
-    
+
     if (key == VK_UP) arrow = FLAG_INCR;
     else if (key == VK_DOWN) arrow = FLAG_DECR;
     else return 1;
-    
+
     UPDOWN_GetBuddyInt (infoPtr);
     infoPtr->Flags &= ~FLAG_ARROW;
@@ -417 +419 @@
 
 /***********************************************************************
- * UPDOWN_Buddy_SubclassProc used to handle messages sent to the buddy 
+ * UPDOWN_Buddy_SubclassProc used to handle messages sent to the buddy
  *                           control.
  */
-static LRESULT CALLBACK 
+static LRESULT CALLBACK
 UPDOWN_Buddy_SubclassProc(HWND  hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WNDPROC superClassWndProc = (WNDPROC)GetPropA(hwnd, BUDDY_SUPERCLASS_WNDPROC);
-    TRACE("hwnd=%04x, wndProc=%d, uMsg=%04x, wParam=%d, lParam=%d\n", 
+    TRACE("hwnd=%p, wndProc=%d, uMsg=%04x, wParam=%d, lParam=%d\n",
           hwnd, (INT)superClassWndProc, uMsg, wParam, (UINT)lParam);
 
     if (uMsg == WM_KEYDOWN) {
         HWND upDownHwnd = GetPropA(hwnd, BUDDY_UPDOWN_HWND);
-      
+
         UPDOWN_KeyPressed(UPDOWN_GetInfoPtr(upDownHwnd), (int)wParam);
     }
@@ -440 +442 @@
  * Tests if 'bud' is a valid window handle. If not, returns FALSE.
  * Else, sets it as a new Buddy.
- * Then, it should subclass the buddy 
+ * Then, it should subclass the buddy
  * If window has the UDS_ARROWKEYS, it subcalsses the buddy window to
  * process the UP/DOWN arrow keys.
@@ -451 +453 @@
     RECT  budRect;  /* new coord for the buddy */
     int   x, width;  /* new x position and width for the up-down */
-    WNDPROC baseWndProc, currWndProc;
+    WNDPROC baseWndProc;
     CHAR buddyClass[40];
-          
+
     /* Is it a valid bud? */
     if(!IsWindow(bud)) return FALSE;
 
-    TRACE("(hwnd=%04x, bud=%04x)\n", infoPtr->Self, bud);
-    
+    TRACE("(hwnd=%p, bud=%p)\n", infoPtr->Self, bud);
+
     /* there is already a body assigned */
     if (infoPtr->Buddy)  RemovePropA(infoPtr->Buddy, BUDDY_UPDOWN_HWND);
 
     /* Store buddy window handle */
-    infoPtr->Buddy = bud;   
-
-    /* keep upDown ctrl hwnd in a buddy property */            
-    SetPropA( bud, BUDDY_UPDOWN_HWND, infoPtr->Self); 
+    infoPtr->Buddy = bud;
+
+    /* keep upDown ctrl hwnd in a buddy property */
+    SetPropA( bud, BUDDY_UPDOWN_HWND, infoPtr->Self);
 
     /* Store buddy window class type */
@@ -478 +480 @@
 
     if(dwStyle & UDS_ARROWKEYS){
-        /* Note that I don't clear the BUDDY_SUPERCLASS_WNDPROC property 
-           when we reset the upDown ctrl buddy to another buddy because it is not 
+        /* Note that I don't clear the BUDDY_SUPERCLASS_WNDPROC property
+           when we reset the upDown ctrl buddy to another buddy because it is not
            good to break the window proc chain. */
-        currWndProc = (WNDPROC) GetWindowLongW(bud, GWL_WNDPROC);
-        if (currWndProc != UPDOWN_Buddy_SubclassProc) {
-            baseWndProc = (WNDPROC)SetWindowLongW(bud, GWL_WNDPROC, (LPARAM)UPDOWN_Buddy_SubclassProc); 
+        if (!GetPropA(bud, BUDDY_SUPERCLASS_WNDPROC)) {
+            baseWndProc = (WNDPROC)SetWindowLongW(bud, GWL_WNDPROC, (LPARAM)UPDOWN_Buddy_SubclassProc);
             SetPropA(bud, BUDDY_SUPERCLASS_WNDPROC, (HANDLE)baseWndProc);
         }
@@ -505 +506 @@
     /* first adjust the buddy to accomodate the up/down */
     SetWindowPos(infoPtr->Buddy, 0, budRect.left, budRect.top,
-                 budRect.right  - budRect.left, budRect.bottom - budRect.top, 
+                 budRect.right  - budRect.left, budRect.bottom - budRect.top,
                  SWP_NOACTIVATE|SWP_NOZORDER);
 
@@ -515 +516 @@
     /*
      * If the updown has a buddy border, it has to overlap with the buddy
-     * to look as if it is integrated with the buddy control. 
+     * to look as if it is integrated with the buddy control.
      * We nudge the control or change it size to overlap.
      */
@@ -525 +526 @@
     }
 
-    SetWindowPos(infoPtr->Self, infoPtr->Buddy, x, 
-                 budRect.top - DEFAULT_ADDTOP, width, 
+    SetWindowPos(infoPtr->Self, infoPtr->Buddy, x,
+                 budRect.top - DEFAULT_ADDTOP, width,
                  budRect.bottom - budRect.top + DEFAULT_ADDTOP + DEFAULT_ADDBOT,
                  SWP_NOACTIVATE);
 
     return TRUE;
-}         
+}
 
 /***********************************************************************
  *           UPDOWN_DoAction
  *
- * This function increments/decrements the CurVal by the 
+ * This function increments/decrements the CurVal by the
  * 'delta' amount according to the 'action' flag which can be a
  * combination of FLAG_INCR and FLAG_DECR
@@ -559 +560 @@
     ni.hdr.hwndFrom = infoPtr->Self;
     ni.hdr.idFrom   = GetWindowLongW (infoPtr->Self, GWL_ID);
-    ni.hdr.code = UDN_DELTAPOS; 
+    ni.hdr.code = UDN_DELTAPOS;
     if (!SendMessageW(GetParent (infoPtr->Self), WM_NOTIFY,
                    (WPARAM)ni.hdr.idFrom, (LPARAM)&ni)) {
@@ -570 +571 @@
         }
     }
-  
+
     /* Also, notify it. This message is sent in any case. */
-    SendMessageW( GetParent(infoPtr->Self), 
-                  dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL, 
-                  MAKELONG(SB_THUMBPOSITION, infoPtr->CurVal), infoPtr->Self);
+    SendMessageW( GetParent(infoPtr->Self),
+                  dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL,
+                  MAKELONG(SB_THUMBPOSITION, infoPtr->CurVal),
+                  (LPARAM)infoPtr->Self);
 }
 
@@ -597 +599 @@
  * Deletes any timers, releases the mouse and does  redraw if necessary.
  * If the control is not in "capture" mode, it does nothing.
- * If the control was not in cancel mode, it returns FALSE. 
+ * If the control was not in cancel mode, it returns FALSE.
  * If the control was in cancel mode, it returns TRUE.
  */
@@ -603 +605 @@
 {
     if (!(infoPtr->Flags & FLAG_PRESSED)) return FALSE;
-    
+
     KillTimer (infoPtr->Self, TIMER_AUTOREPEAT);
     KillTimer (infoPtr->Self, TIMER_ACCEL);
     KillTimer (infoPtr->Self, TIMER_AUTOPRESS);
-  
+
     if (GetCapture() == infoPtr->Self) {
         NMHDR hdr;
@@ -616 +618 @@
         ReleaseCapture();
     }
-    
+
     infoPtr->Flags &= ~FLAG_PRESSED;
     InvalidateRect (infoPtr->Self, NULL, FALSE);
-  
+
     return TRUE;
 }
@@ -628 +630 @@
  * Handle a mouse event for the updown.
  * 'pt' is the location of the mouse event in client or
- * windows coordinates. 
- */
-static void UPDOWN_HandleMouseEvent (UPDOWN_INFO *infoPtr, UINT msg, POINT pt)
+ * windows coordinates.
+ */
+static void UPDOWN_HandleMouseEvent (UPDOWN_INFO *infoPtr, UINT msg, POINTS pts)
 {
     DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE);
+    POINT pt = { pts.x, pts.y };
     RECT rect;
     int temp, arrow;
@@ -650 +653 @@
                 /* Update the CurVal if necessary */
                 if (dwStyle & UDS_SETBUDDYINT) UPDOWN_GetBuddyInt (infoPtr);
-        
+
                 /* Set up the correct flags */
-                infoPtr->Flags |= FLAG_PRESSED; 
-      
+                infoPtr->Flags |= FLAG_PRESSED;
+
                 /* repaint the control */
                 InvalidateRect (infoPtr->Self, NULL, FALSE);
@@ -682 +685 @@
                 if(infoPtr->AccelIndex != -1) infoPtr->AccelIndex = 0;
             }
-            
+
             /* If state changed, redraw the control */
             if(temp != infoPtr->Flags)
@@ -703 +706 @@
     DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
     int temp;
-    
+
     if (!infoPtr && (message != WM_CREATE))
-        return DefWindowProcW (hwnd, message, wParam, lParam); 
+        return DefWindowProcW (hwnd, message, wParam, lParam);
 
     switch(message)
@@ -719 +722 @@
             infoPtr->AccelVect = 0;
             infoPtr->AccelIndex = -1;
-            infoPtr->CurVal = 0; 
-            infoPtr->MinVal = 0; 
+            infoPtr->CurVal = 0;
+            infoPtr->MinVal = 0;
             infoPtr->MaxVal = 9999;
             infoPtr->Base  = 10; /* Default to base 10  */
@@ -729 +732 @@
             if (dwStyle & UDS_AUTOBUDDY)
                 UPDOWN_SetBuddy (infoPtr, GetWindow (hwnd, GW_HWNDPREV));
-        
-            TRACE("UpDown Ctrl creation, hwnd=%04x\n", hwnd);
-            break;
-    
+
+            TRACE("UpDown Ctrl creation, hwnd=%p\n", hwnd);
+            break;
+
         case WM_DESTROY:
             if(infoPtr->AccelVect) COMCTL32_Free (infoPtr->AccelVect);
@@ -740 +743 @@
             COMCTL32_Free (infoPtr);
             SetWindowLongW (hwnd, 0, 0);
-            TRACE("UpDown Ctrl destruction, hwnd=%04x\n", hwnd);
-            break;
-        
+            TRACE("UpDown Ctrl destruction, hwnd=%p\n", hwnd);
+            break;
+
         case WM_ENABLE:
             if (dwStyle & WS_DISABLED) UPDOWN_CancelMode (infoPtr);
@@ -774 +777 @@
                 temp = infoPtr->AccelIndex == -1 ? 1 : infoPtr->AccelVect[infoPtr->AccelIndex].nInc;
                 UPDOWN_DoAction(infoPtr, temp, infoPtr->Flags & FLAG_ARROW);
-        
+
                 if(infoPtr->AccelIndex != -1 && infoPtr->AccelIndex < infoPtr->AccelCount-1) {
                     KillTimer(hwnd, TIMER_ACCEL);
@@ -780 +783 @@
                     temp = infoPtr->AccelVect[infoPtr->AccelIndex].nSec * 1000 + 1;
                     /* make sure we have at least 1ms intervals */
-                    SetTimer(hwnd, TIMER_ACCEL, temp, 0);           
+                    SetTimer(hwnd, TIMER_ACCEL, temp, 0);
                 }
             }
@@ -790 +793 @@
         case WM_LBUTTONUP:
             if (GetCapture() != infoPtr->Self) break;
-            
+
             if ( (infoPtr->Flags & FLAG_MOUSEIN) &&
                  (infoPtr->Flags & FLAG_ARROW) ) {
-                    
-                SendMessageW( GetParent(hwnd), 
+
+                SendMessageW( GetParent(hwnd),
                               dwStyle & UDS_HORZ ? WM_HSCROLL : WM_VSCROLL,
-                              MAKELONG(SB_ENDSCROLL, infoPtr->CurVal), hwnd);
+                              MAKELONG(SB_ENDSCROLL, infoPtr->CurVal),
+                              (LPARAM)hwnd);
                 if (UPDOWN_IsBuddyEdit(infoPtr))
                     SendMessageW(infoPtr->Buddy, EM_SETSEL, 0, MAKELONG(0, -1));
@@ -802 +806 @@
             UPDOWN_CancelMode(infoPtr);
             break;
-      
+
         case WM_LBUTTONDOWN:
         case WM_MOUSEMOVE:
-            if(UPDOWN_IsEnabled(infoPtr)){
-                POINT pt;
-                pt.x = SLOWORD(lParam);
-                pt.y = SHIWORD(lParam);
-                UPDOWN_HandleMouseEvent (infoPtr, message, pt );
-            }
+            if(UPDOWN_IsEnabled(infoPtr))
+                UPDOWN_HandleMouseEvent (infoPtr, message, MAKEPOINTS(lParam));
             break;
 
         case WM_KEYDOWN:
-            if((dwStyle & UDS_ARROWKEYS) && UPDOWN_IsEnabled(infoPtr)) {
+            if((dwStyle & UDS_ARROWKEYS) && UPDOWN_IsEnabled(infoPtr))
                 return UPDOWN_KeyPressed(infoPtr, (int)wParam);
-            }
-            break;
-      
+            break;
+
         case WM_PAINT:
             return UPDOWN_Paint (infoPtr, (HDC)wParam);
-    
+
         case UDM_GETACCEL:
             if (wParam==0 && lParam==0) return infoPtr->AccelCount;
@@ -829 +828 @@
                 return temp;
             }
-            UNKNOWN_PARAM(UDM_GETACCEL, wParam, lParam);
             return 0;
 
         case UDM_SETACCEL:
-            TRACE("UpDown Ctrl new accel info, hwnd=%04x\n", hwnd);
+            TRACE("UpDown Ctrl new accel info, hwnd=%p\n", hwnd);
             if(infoPtr->AccelVect) {
                 COMCTL32_Free (infoPtr->AccelVect);
@@ -846 +844 @@
 
         case UDM_GETBASE:
-            if (wParam || lParam) UNKNOWN_PARAM(UDM_GETBASE, wParam, lParam);
             return infoPtr->Base;
 
         case UDM_SETBASE:
-            TRACE("UpDown Ctrl new base(%d), hwnd=%04x\n", wParam, hwnd);
-            if ( !(wParam==10 || wParam==16) || lParam)
-                UNKNOWN_PARAM(UDM_SETBASE, wParam, lParam);
+            TRACE("UpDown Ctrl new base(%d), hwnd=%p\n", wParam, hwnd);
             if (wParam==10 || wParam==16) {
                 temp = infoPtr->Base;
@@ -861 +856 @@
 
         case UDM_GETBUDDY:
-            if (wParam || lParam) UNKNOWN_PARAM(UDM_GETBUDDY, wParam, lParam);
-            return infoPtr->Buddy;
+            return (LRESULT)infoPtr->Buddy;
 
         case UDM_SETBUDDY:
-            if (lParam) UNKNOWN_PARAM(UDM_SETBUDDY, wParam, lParam);
-            temp = infoPtr->Buddy;
-            UPDOWN_SetBuddy (infoPtr, wParam);
+            temp = (int)infoPtr->Buddy;
+            UPDOWN_SetBuddy (infoPtr, (HWND)wParam);
             return temp;
 
         case UDM_GETPOS:
-            if (wParam || lParam) UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
             temp = UPDOWN_GetBuddyInt (infoPtr);
             return MAKELONG(infoPtr->CurVal, temp ? 0 : 1);
 
         case UDM_SETPOS:
-            if (wParam || HIWORD(lParam)) UNKNOWN_PARAM(UDM_GETPOS, wParam, lParam);
             temp = SLOWORD(lParam);
-            TRACE("UpDown Ctrl new value(%d), hwnd=%04x\n", temp, hwnd);
+            TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd);
             if(!UPDOWN_InBounds(infoPtr, temp)) {
                 if(temp < infoPtr->MinVal) temp = infoPtr->MinVal;
@@ -887 +878 @@
             if(dwStyle & UDS_SETBUDDYINT) UPDOWN_SetBuddyInt (infoPtr);
             return wParam;            /* return prev value */
-      
+
         case UDM_GETRANGE:
-            if (wParam || lParam) UNKNOWN_PARAM(UDM_GETRANGE, wParam, lParam);
             return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal);
 
         case UDM_SETRANGE:
-            if (wParam) UNKNOWN_PARAM(UDM_SETRANGE, wParam, lParam); 
                                                /* we must have:     */
             infoPtr->MaxVal = SLOWORD(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
             infoPtr->MinVal = SHIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
                                                /* |Max-Min| <= UD_MAXVAL        */
-            TRACE("UpDown Ctrl new range(%d to %d), hwnd=%04x\n", 
+            TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n",
                   infoPtr->MinVal, infoPtr->MaxVal, hwnd);
-            break;                             
+            break;
 
         case UDM_GETRANGE32:
@@ -912 +901 @@
             if (infoPtr->MaxVal <= infoPtr->MinVal)
                 infoPtr->MaxVal = infoPtr->MinVal + 1;
-            TRACE("UpDown Ctrl new range(%d to %d), hwnd=%04x\n", 
+            TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n",
                   infoPtr->MinVal, infoPtr->MaxVal, hwnd);
             break;
@@ -931 +920 @@
 
         case UDM_GETUNICODEFORMAT:
-            if (wParam || lParam) UNKNOWN_PARAM(UDM_GETUNICODEFORMAT, wParam, lParam);
             /* we lie a bit here, we're always using Unicode internally */
             return infoPtr->UnicodeFormat;
 
         case UDM_SETUNICODEFORMAT:
-            if (lParam) UNKNOWN_PARAM(UDM_SETUNICODEFORMAT, wParam, lParam);
             /* do we really need to honour this flag? */
             temp = infoPtr->UnicodeFormat;
             infoPtr->UnicodeFormat = (BOOL)wParam;
             return temp;
-            
-        default: 
-            if (message >= WM_USER) 
+
+        default:
+            if ((message >= WM_USER) && (message < WM_APP))
                 ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam);
-            return DefWindowProcW (hwnd, message, wParam, lParam); 
-    } 
+            return DefWindowProcW (hwnd, message, wParam, lParam);
+    }
 
     return 0;
@@ -956 +943 @@
  * Registers the updown window class.
  */
-
-VOID
-UPDOWN_Register(void)
+void UPDOWN_Register(void)
 {
     WNDCLASSW wndClass;
@@ -970 +955 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = UPDOWN_CLASSW;
- 
+
     RegisterClassW( &wndClass );
 }
@@ -980 +965 @@
  * Unregisters the updown window class.
  */
-
-VOID
-UPDOWN_Unregister (void)
+void UPDOWN_Unregister (void)
 {
     UnregisterClassW (UPDOWN_CLASSW, (HINSTANCE)NULL);
 }
-