Changeset 9370 for trunk/src/comctl32/comboex.c

Timestamp:

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

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/comboex.c (modified) (93 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);
 }
-