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

Timestamp:

Sep 5, 2001, 2:05:03 PM (24 years ago)

Author:

bird

Message:

Added $Id:$ keyword.

File:

• trunk/src/comctl32/comboex.c (modified) (75 diffs)

trunk/src/comctl32/comboex.c

@@ +1 @@
+/* $Id: comboex.c,v 1.12 2001-09-05 12:04:56 bird Exp $ */
 /*
  * TODO   <-------------
@@ -4 +5 @@
  *     result in a FIXME:
  *           CBES_EX_NOEDITIMAGEINDENT
- *           CBES_EX_PATHWORDBREAKPROC
- *           CBES_EX_NOSIZELIMIT
- *           CBES_EX_CASESENSITIVE
+ *       CBES_EX_PATHWORDBREAKPROC
+ *       CBES_EX_NOSIZELIMIT
+ *       CBES_EX_CASESENSITIVE
  *  2. None of the following callback items are implemented. Therefor
  *     no CBEN_GETDISPINFO notifies are issued. Use in either CBEM_INSERTITEM
@@ -37 +38 @@
  *      generate message sequence similar to native DLL.
  *   2. Handle case where CBEM_SETITEM is called to display data in EDIT
- *      Control. 
+ *      Control.
  *   3. Add override for WNDPROC for the EDIT control (reqed for VK_RETURN).
  *   4. Dump input data for things using COMBOBOXEXITEM{A|W}.
@@ -55 +56 @@
  *   3. Lock image selected status to focus state of edit control if
  *      edit control exists. Mimics native actions.
- *   4. Implemented WM_SETFOCUS in EditWndProc to track status of 
+ *   4. Implemented WM_SETFOCUS in EditWndProc to track status of
  *      focus for 3 above.
  *   5. The LBN_SELCHANGE is just for documentation purposes.
@@ -70 +71 @@
  *
  *  mod 6
- *   1. Add support for WM_NOTIFYFORMAT (both incoming and outgoing) and do 
+ *   1. Add support for WM_NOTIFYFORMAT (both incoming and outgoing) and do
  *      WM_NOTIFY correctly based on results.
  *   2. Fix memory leaks of text strings in COMBOEX_WM_DELETEITEM.
  *   3. Add routines to handle special cases of NMCBEENDEDIT and NMCOMBOXEX
- *      so translation to ANSI is done correctly. 
+ *      so translation to ANSI is done correctly.
  *   4. Fix some issues with COMBOEX_DrawItem.
  *
@@ -150 +151 @@
 /*
  * 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.
  */
@@ -189 +190 @@
     if (TRACE_ON(comboex)){
       TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n",
-            item, item->mask, item->pszText, item->cchTextMax,
-            item->iImage);
+        item, item->mask, item->pszText, item->cchTextMax,
+        item->iImage);
       TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
-            item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
+        item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
       if ((item->mask & CBEIF_TEXT) && item->pszText)
-          TRACE("item %p - pszText=%s\n",
-                item, debugstr_w((const WCHAR *)item->pszText));
+      TRACE("item %p - pszText=%s\n",
+        item, debugstr_w((const WCHAR *)item->pszText));
     }
 }
@@ -205 +206 @@
     if (TRACE_ON(comboex)){
       TRACE("input - mask=%08x, iItem=%d, pszText=%p, cchTM=%d, iImage=%d\n",
-            input->mask, input->iItem, input->pszText, input->cchTextMax,
-            input->iImage);
+        input->mask, input->iItem, input->pszText, input->cchTextMax,
+        input->iImage);
       if ((input->mask & CBEIF_TEXT) && input->pszText) {
-          if (true_for_w)
-              TRACE("input - pszText=<%s>\n", 
-                    debugstr_w((const WCHAR *)input->pszText));
-          else 
-              TRACE("input - pszText=<%s>\n", 
-                    debugstr_a((const char *)input->pszText));
+      if (true_for_w)
+          TRACE("input - pszText=<%s>\n",
+            debugstr_w((const WCHAR *)input->pszText));
+      else
+          TRACE("input - pszText=<%s>\n",
+            debugstr_a((const char *)input->pszText));
       }
       TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
-            input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
+        input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
     }
 }
@@ -226 +227 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-    if (infoPtr->hwndCombo)    
-        return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
+    if (infoPtr->hwndCombo)
+    return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
 
     return 0;
@@ -241 +242 @@
     hdr->code = code;
     if (infoPtr->NtfUnicode)
-        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)hdr);
+    return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                 (LPARAM)hdr);
     else
-        return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)hdr);
+    return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                 (LPARAM)hdr);
 }
 
@@ -259 +260 @@
     hdr->hdr.code = code;
     if (infoPtr->NtfUnicode)
-        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)hdr);
+    return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                 (LPARAM)hdr);
     else {
-        LPWSTR str, ostr = NULL;
-        INT ret, len = 0;
-
-        if (hdr->ceItem.mask & CBEIF_TEXT) {
-            ostr = hdr->ceItem.pszText;
-            str = ostr;
-            if (!str) str = (LPWSTR)L"";
-            len = WideCharToMultiByte (CP_ACP, 0, str, -1, 0, 0, NULL, NULL);
-            if (len > 0) {
-                hdr->ceItem.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(CHAR));
-                WideCharToMultiByte (CP_ACP, 0, str, -1, (LPSTR)hdr->ceItem.pszText,
-                                     len, NULL, NULL);
-            }
-        }
-
-        ret = SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                            (LPARAM)hdr);
-        if (hdr->ceItem.mask & CBEIF_TEXT) {
-            if (len > 0)
-                COMCTL32_Free (hdr->ceItem.pszText);
-            hdr->ceItem.pszText = ostr;
-        }
-        return ret;
+    LPWSTR str, ostr = NULL;
+    INT ret, len = 0;
+
+    if (hdr->ceItem.mask & CBEIF_TEXT) {
+        ostr = hdr->ceItem.pszText;
+        str = ostr;
+        if (!str) str = (LPWSTR)L"";
+        len = WideCharToMultiByte (CP_ACP, 0, str, -1, 0, 0, NULL, NULL);
+        if (len > 0) {
+        hdr->ceItem.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(CHAR));
+        WideCharToMultiByte (CP_ACP, 0, str, -1, (LPSTR)hdr->ceItem.pszText,
+                     len, NULL, NULL);
+        }
+    }
+
+    ret = SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                (LPARAM)hdr);
+    if (hdr->ceItem.mask & CBEIF_TEXT) {
+        if (len > 0)
+        COMCTL32_Free (hdr->ceItem.pszText);
+        hdr->ceItem.pszText = ostr;
+    }
+    return ret;
     }
 }
@@ -299 +300 @@
     hdr->hdr.code = (infoPtr->NtfUnicode) ? CBEN_ENDEDITW : CBEN_ENDEDITA;
     if (infoPtr->NtfUnicode)
-        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)hdr);
+    return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                 (LPARAM)hdr);
     else {
-        NMCBEENDEDITA ansi;
-
-        memcpy (&ansi.hdr, &hdr->hdr, sizeof(NMHDR));
-        ansi.fChanged = hdr->fChanged;
-        ansi.iNewSelection = hdr->iNewSelection;
-        WideCharToMultiByte (CP_ACP, 0, itemText, -1,
-                             (LPSTR)&ansi.szText, CBEMAXSTRLEN, NULL, NULL);
-        ansi.iWhy = hdr->iWhy;
-        return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)&ansi);
+    NMCBEENDEDITA ansi;
+
+    memcpy (&ansi.hdr, &hdr->hdr, sizeof(NMHDR));
+    ansi.fChanged = hdr->fChanged;
+    ansi.iNewSelection = hdr->iNewSelection;
+    WideCharToMultiByte (CP_ACP, 0, itemText, -1,
+                 (LPSTR)&ansi.szText, CBEMAXSTRLEN, NULL, NULL);
+    ansi.iWhy = hdr->iWhy;
+    return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                 (LPARAM)&ansi);
     }
 }
@@ -340 +341 @@
     }
     if (cit->mask & CBEIF_IMAGE)
-        cit->iImage         = item->iImage;
+    cit->iImage         = item->iImage;
     if (cit->mask & CBEIF_SELECTEDIMAGE)
-        cit->iSelectedImage = item->iSelectedImage;
+    cit->iSelectedImage = item->iSelectedImage;
     if (cit->mask & CBEIF_OVERLAY)
-        cit->iOverlay       = item->iOverlay;
+    cit->iOverlay       = item->iOverlay;
     if (cit->mask & CBEIF_INDENT)
-        cit->iIndent        = item->iIndent;
+    cit->iIndent        = item->iIndent;
     if (cit->mask & CBEIF_LPARAM)
-        cit->lParam         = item->lParam;
+    cit->lParam         = item->lParam;
 
 }
@@ -364 +365 @@
     iinfo.rcImage.left = iinfo.rcImage.right = 0;
     if (infoPtr->himl) {
-        ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
-        xoff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
+    ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
+    xoff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
     }
     GetClientRect (infoPtr->hwndCombo, &rect);
@@ -380 +381 @@
 
     TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n",
-          rect.left, rect.top, rect.right, rect.bottom,
-          x, y, x + w, y + h);
+      rect.left, rect.top, rect.right, rect.bottom,
+      x, y, x + w, y + h);
     SetWindowPos(infoPtr->hwndEdit, HWND_TOP,
-                 x, y,
-                 w, h,
-                 SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER);
+         x, y,
+         w, h,
+         SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER);
 }
 
@@ -399 +400 @@
     cy = mysize.cy + CBE_EXTRA;
     if (infoPtr->himl) {
-        ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
-        cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy);
-        TRACE("upgraded height due to image:  height=%d\n", cy);
+    ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
+    cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy);
+    TRACE("upgraded height due to image:  height=%d\n", cy);
     }
     SendMessageW (hwnd, CB_SETITEMHEIGHT, (WPARAM) -1, (LPARAM) cy);
     if (infoPtr->hwndCombo)
         SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT,
-                      (WPARAM) 0, (LPARAM) cy);
+              (WPARAM) 0, (LPARAM) cy);
 }
 
@@ -419 +420 @@
     /*      EM_SETSEL32 (0,-1)      */
     if (item->mask & CBEIF_TEXT) {
-        SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)item->pszText);
-        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
-        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
-    }
-}
-
- 
+    SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)item->pszText);
+    SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
+    SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
+    }
+}
+
+
 static CBE_ITEMDATA *
 COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index)
@@ -433 +434 @@
 
     if ((index > infoPtr->nb_items) || (index < -1))
-        return 0;
+    return 0;
     if (index == -1)
-        return infoPtr->edit;
+    return infoPtr->edit;
     item = infoPtr->items;
     i = infoPtr->nb_items - 1;
@@ -441 +442 @@
     /* find the item in the list */
     while (item && (i > index)) {
-        item = (CBE_ITEMDATA *)item->next;
-        i--;
+    item = (CBE_ITEMDATA *)item->next;
+    i--;
     }
     if (!item || (i != index)) {
-        FIXME("COMBOBOXEX item structures broken. Please report!\n");
-        return 0;
+    FIXME("COMBOBOXEX item structures broken. Please report!\n");
+    return 0;
     }
     return item;
@@ -456 +457 @@
 {
     if (item->pszText == LPSTR_TEXTCALLBACKW)
-        FIXME("Callback not implemented yet for pszText\n");
+    FIXME("Callback not implemented yet for pszText\n");
     if (item->iImage == I_IMAGECALLBACK)
-        FIXME("Callback not implemented yet for iImage\n");
+    FIXME("Callback not implemented yet for iImage\n");
     if (item->iSelectedImage == I_IMAGECALLBACK)
-        FIXME("Callback not implemented yet for iSelectedImage\n");
+    FIXME("Callback not implemented yet for iSelectedImage\n");
     if (item->iOverlay == I_IMAGECALLBACK)
-        FIXME("Callback not implemented yet for iOverlay\n");
+    FIXME("Callback not implemented yet for iOverlay\n");
     if (item->iIndent == I_INDENTCALLBACK)
-        FIXME("Callback not implemented yet for iIndent\n");
+    FIXME("Callback not implemented yet for iIndent\n");
 }
 
@@ -482 +483 @@
     /* if item number requested does not exist then return failure */
     if ((index > infoPtr->nb_items) || (index < 0)) {
-        ERR("attempt to delete item that does not exist\n");
-        return CB_ERR;
+    ERR("attempt to delete item that does not exist\n");
+    return CB_ERR;
     }
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        ERR("attempt to delete item that was not found!\n");
-        return CB_ERR;
+    ERR("attempt to delete item that was not found!\n");
+    return CB_ERR;
     }
 
@@ -515 +516 @@
 
     if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-        return 0;
+    return 0;
 
     TRACE("-- 0x%x\n", infoPtr->hwndEdit);
@@ -560 +561 @@
     /* if item number requested does not exist then return failure */
     if ((index > infoPtr->nb_items) || (index < -1)) {
-        ERR("attempt to get item that does not exist\n");
-        return 0;
+    ERR("attempt to get item that does not exist\n");
+    return 0;
     }
 
     /* if the item is the edit control and there is no edit control, skip */
-    if ((index == -1) && 
+    if ((index == -1) &&
         ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN))
-            return 0;
+        return 0;
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        ERR("attempt to get item that was not found!\n");
-        return 0;
+    ERR("attempt to get item that was not found!\n");
+    return 0;
     }
 
@@ -594 +595 @@
 
     len = WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 0, 0, NULL, NULL);
-    if (len > 0) 
-        WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 
-                             cit->pszText, cit->cchTextMax, NULL, NULL);
+    if (len > 0)
+    WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1,
+                 cit->pszText, cit->cchTextMax, NULL, NULL);
 
     cit->iImage = tmpcit.iImage;
@@ -613 +614 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-    TRACE("%s hwnd=0x%x\n", 
-           infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
+    TRACE("%s hwnd=0x%x\n",
+       infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
 
     return infoPtr->bUnicode;
@@ -626 +627 @@
 
     if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-        return FALSE;
-    if ((infoPtr->flags & (WCBE_ACTEDIT | WCBE_EDITCHG)) == 
-        (WCBE_ACTEDIT | WCBE_EDITCHG))
-        return TRUE;
+    return FALSE;
+    if ((infoPtr->flags & (WCBE_ACTEDIT | WCBE_EDITCHG)) ==
+    (WCBE_ACTEDIT | WCBE_EDITCHG))
+    return TRUE;
     return FALSE;
 }
@@ -661 +662 @@
         /* fast path for iItem = -1 */
         item->next = infoPtr->items;
-        infoPtr->items = item;
+    infoPtr->items = item;
     }
     else {
         INT i = infoPtr->nb_items-1;
-        CBE_ITEMDATA *moving = infoPtr->items;
-
-        while ((i > index) && moving) {
-            moving = (CBE_ITEMDATA *)moving->next;
-            i--;
-        }
-        if (!moving) {
-            FIXME("COMBOBOXEX item structures broken. Please report!\n");
-            COMCTL32_Free(item);
-            return -1;
-        }
-        item->next = moving->next;
-        moving->next = item;
+    CBE_ITEMDATA *moving = infoPtr->items;
+
+    while ((i > index) && moving) {
+        moving = (CBE_ITEMDATA *)moving->next;
+        i--;
+    }
+    if (!moving) {
+        FIXME("COMBOBOXEX item structures broken. Please report!\n");
+        COMCTL32_Free(item);
+        return -1;
+    }
+    item->next = moving->next;
+    moving->next = item;
     }
 
@@ -684 +685 @@
     if (item->mask & CBEIF_TEXT) {
         LPWSTR str;
-        INT len;
+    INT len;
 
         str = cit->pszText;
         if (!str) str = (LPWSTR) L"";
-        len = strlenW (str);
-        if (len > 0) {
-            item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            strcpyW (item->pszText, str);
-        }
-        else
-            item->pszText = NULL;
+    len = strlenW (str);
+    if (len > 0) {
+        item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        strcpyW (item->pszText, str);
+    }
+    else
+        item->pszText = NULL;
         item->cchTextMax   = cit->cchTextMax;
     }
@@ -713 +714 @@
     COMBOEX_DumpItem (item);
 
-    SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING, 
-                  (WPARAM)cit->iItem, (LPARAM)item);
+    SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING,
+          (WPARAM)cit->iItem, (LPARAM)item);
 
     COMBOEX_CopyItem (infoPtr, item, &nmcit.ceItem);
@@ -727 +728 @@
 COMBOEX_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    COMBOBOXEXITEMA     *cit = (COMBOBOXEXITEMA *) lParam;
-    COMBOBOXEXITEMW     citW;
-    LRESULT             ret;
+    COMBOBOXEXITEMA *cit = (COMBOBOXEXITEMA *) lParam;
+    COMBOBOXEXITEMW citW;
+    LRESULT     ret;
 
     memcpy(&citW,cit,sizeof(COMBOBOXEXITEMA));
     if (cit->mask & CBEIF_TEXT) {
         LPSTR str;
-        INT len;
+    INT len;
 
         str = cit->pszText;
         if (!str) str="";
-        len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-        if (len > 0) {
-            citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
-        }
+    len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
+    if (len > 0) {
+        citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
+    }
     }
     ret = COMBOEX_InsertItemW(hwnd,wParam,(LPARAM)&citW);;
 
     if (cit->mask & CBEIF_TEXT)
-        COMCTL32_Free(citW.pszText);
+    COMCTL32_Free(citW.pszText);
     return ret;
 }
@@ -763 +764 @@
 
     if (lParam & (CBES_EX_NOEDITIMAGEINDENT |
-                  CBES_EX_PATHWORDBREAKPROC |
-                  CBES_EX_NOSIZELIMIT |
-                  CBES_EX_CASESENSITIVE))
-        FIXME("Extended style not implemented %08lx\n", lParam);
+          CBES_EX_PATHWORDBREAKPROC |
+          CBES_EX_NOSIZELIMIT |
+          CBES_EX_CASESENSITIVE))
+    FIXME("Extended style not implemented %08lx\n", lParam);
 
     if ((DWORD)wParam) {
-        infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
+    infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
     }
     else
-        infoPtr->dwExtStyle = (DWORD)lParam;
+    infoPtr->dwExtStyle = (DWORD)lParam;
 
     /*
@@ -778 +779 @@
      */
     if ((infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE) ^
-        (dwTemp & CBES_EX_NOEDITIMAGE)) {
-        /* if state of EX_NOEDITIMAGE changes, invalidate all */
-        TRACE("EX_NOEDITIMAGE state changed to %ld\n",
-            infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
-        InvalidateRect (hwnd, NULL, TRUE);
-        COMBOEX_AdjustEditPos (infoPtr);
-        if (infoPtr->hwndEdit)
-            InvalidateRect (infoPtr->hwndEdit, NULL, TRUE);
+    (dwTemp & CBES_EX_NOEDITIMAGE)) {
+    /* if state of EX_NOEDITIMAGE changes, invalidate all */
+    TRACE("EX_NOEDITIMAGE state changed to %ld\n",
+        infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
+    InvalidateRect (hwnd, NULL, TRUE);
+    COMBOEX_AdjustEditPos (infoPtr);
+    if (infoPtr->hwndEdit)
+        InvalidateRect (infoPtr->hwndEdit, NULL, TRUE);
     }
 
@@ -826 +827 @@
     /* if item number requested does not exist then return failure */
     if ((index > infoPtr->nb_items) || (index < -1)) {
-        ERR("attempt to set item that does not exist yet!\n");
-        return 0;
+    ERR("attempt to set item that does not exist yet!\n");
+    return 0;
     }
 
     /* if the item is the edit control and there is no edit control, skip */
-    if ((index == -1) && 
+    if ((index == -1) &&
         ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN))
-            return 0;
+        return 0;
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        ERR("attempt to set item that was not found!\n");
-        return 0;
-    }
-
-    /* add/change stuff to the internal item structure */ 
+    ERR("attempt to set item that was not found!\n");
+    return 0;
+    }
+
+    /* add/change stuff to the internal item structure */
     item->mask |= cit->mask;
     if (cit->mask & CBEIF_TEXT) {
         LPWSTR str;
-        INT len;
-        WCHAR emptystr[1] = {0};
+    INT len;
+    WCHAR emptystr[1] = {0};
 
         str = cit->pszText;
         if (!str) str=emptystr;
-        len = strlenW(str);
-        if (len > 0) {
-            item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            strcpyW(item->pszText,str);
-        }
+    len = strlenW(str);
+    if (len > 0) {
+        item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        strcpyW(item->pszText,str);
+    }
         item->cchTextMax   = cit->cchTextMax;
     }
@@ -873 +874 @@
     /* if original request was to update edit control, do some fast foot work */
     if (cit->iItem == -1) {
-        COMBOEX_SetEditText (infoPtr, item);
-        RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE);
+    COMBOEX_SetEditText (infoPtr, item);
+    RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE);
     }
     return TRUE;
@@ -882 +883 @@
 COMBOEX_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    COMBOBOXEXITEMA     *cit = (COMBOBOXEXITEMA *) lParam;
-    COMBOBOXEXITEMW     citW;
-    LRESULT             ret;
+    COMBOBOXEXITEMA *cit = (COMBOBOXEXITEMA *) lParam;
+    COMBOBOXEXITEMW citW;
+    LRESULT     ret;
 
     memcpy(&citW,cit,sizeof(COMBOBOXEXITEMA));
     if (cit->mask & CBEIF_TEXT) {
         LPSTR str;
-        INT len;
+    INT len;
 
         str = cit->pszText;
         if (!str) str="";
-        len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-        if (len > 0) {
-            citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
-        }
+    len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
+    if (len > 0) {
+        citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
+    }
     }
     ret = COMBOEX_SetItemW(hwnd,wParam,(LPARAM)&citW);;
 
     if (cit->mask & CBEIF_TEXT)
-        COMCTL32_Free(citW.pszText);
+    COMCTL32_Free(citW.pszText);
     return ret;
 }
@@ -913 +914 @@
     BOOL bTemp = infoPtr->bUnicode;
 
-    TRACE("to %s hwnd=0x%04x, was %s\n", 
-          ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd,
-          (bTemp) ? "TRUE" : "FALSE");
+    TRACE("to %s hwnd=0x%04x, was %s\n",
+      ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd,
+      (bTemp) ? "TRUE" : "FALSE");
 
     infoPtr->bUnicode = (BOOL)wParam;
@@ -937 +938 @@
     i = MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, NULL, 0);
     if (i > 0) {
-        desired = (LPWSTR)COMCTL32_Alloc ((i + 1)*sizeof(WCHAR));
-        MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, desired, i);
+    desired = (LPWSTR)COMCTL32_Alloc ((i + 1)*sizeof(WCHAR));
+    MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, desired, i);
     }
 
@@ -945 +946 @@
     /* now search from after starting loc and wrapping back to start */
     for(i=start+1; i<count; i++) {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                          CB_GETITEMDATA, (WPARAM)i, 0);
-        TRACE("desired=%s, item=%s\n", 
-              debugstr_w(desired), debugstr_w(item->pszText));
-        if (lstrcmpiW(item->pszText, desired) == 0) {
-            COMCTL32_Free (desired);
-            return i;
-        }
+    item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
+              CB_GETITEMDATA, (WPARAM)i, 0);
+    TRACE("desired=%s, item=%s\n",
+          debugstr_w(desired), debugstr_w(item->pszText));
+    if (lstrcmpiW(item->pszText, desired) == 0) {
+        COMCTL32_Free (desired);
+        return i;
+    }
     }
     for(i=0; i<=start; i++) {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                          CB_GETITEMDATA, (WPARAM)i, 0);
-        TRACE("desired=%s, item=%s\n", 
-              debugstr_w(desired), debugstr_w(item->pszText));
-        if (lstrcmpiW(item->pszText, desired) == 0) {
-            COMCTL32_Free (desired);
-            return i;
-        }
+    item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
+              CB_GETITEMDATA, (WPARAM)i, 0);
+    TRACE("desired=%s, item=%s\n",
+          debugstr_w(desired), debugstr_w(item->pszText));
+    if (lstrcmpiW(item->pszText, desired) == 0) {
+        COMCTL32_Free (desired);
+        return i;
+    }
     }
     COMCTL32_Free(desired);
@@ -977 +978 @@
     LRESULT lret = 0;
 
-    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
-                                             wParam, lParam);
+    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA,
+                         wParam, lParam);
     if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
-        item2 = COMBOEX_FindItem (infoPtr, index);
-        if (item2 != item1) {
-            ERR("data structures damaged!\n");
-            return CB_ERR;
-        }
-        if (item1->mask & CBEIF_LPARAM)
-            lret = (LRESULT) item1->lParam;
-        TRACE("returning 0x%08lx\n", lret);
-        return lret;
+    item2 = COMBOEX_FindItem (infoPtr, index);
+    if (item2 != item1) {
+        ERR("data structures damaged!\n");
+        return CB_ERR;
+    }
+    if (item1->mask & CBEIF_LPARAM)
+        lret = (LRESULT) item1->lParam;
+    TRACE("returning 0x%08lx\n", lret);
+    return lret;
     }
     lret = (LRESULT)item1;
@@ -1005 +1006 @@
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        /* FIXME: need to clear selection */
-        return CB_ERR;
+    /* FIXME: need to clear selection */
+    return CB_ERR;
     }
 
     TRACE("selecting item %d text=%s\n", index, (item->pszText) ?
-          debugstr_w(item->pszText) : "<null>");
+      debugstr_w(item->pszText) : "<null>");
     infoPtr->selected = index;
 
@@ -1026 +1027 @@
     CBE_ITEMDATA *item1, *item2;
 
-    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
-                                             wParam, lParam);
+    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA,
+                         wParam, lParam);
     if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
-        item2 = COMBOEX_FindItem (infoPtr, index);
-        if (item2 != item1) {
-            ERR("data structures damaged!\n");
-            return CB_ERR;
-        }
-        item1->mask |= CBEIF_LPARAM;
-        item1->lParam = lParam;
-        TRACE("setting lparam to 0x%08lx\n", lParam);
-        return 0;
+    item2 = COMBOEX_FindItem (infoPtr, index);
+    if (item2 != item1) {
+        ERR("data structures damaged!\n");
+        return CB_ERR;
+    }
+    item1->mask |= CBEIF_LPARAM;
+    item1->lParam = lParam;
+    TRACE("setting lparam to 0x%08lx\n", lParam);
+    return 0;
     }
     TRACE("non-valid result from combo 0x%08lx\n", (DWORD)item1);
@@ -1054 +1055 @@
     /* First, lets forward the message to the normal combo control
        just like Windows.     */
-    if (infoPtr->hwndCombo)    
+    if (infoPtr->hwndCombo)
        SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, wParam, lParam);
 
@@ -1060 +1061 @@
     GetWindowRect (hwnd, &cbx_wrect);
     GetClientRect (hwnd, &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
              - (cbx_crect.bottom-cbx_crect.top);
     TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n",
-          cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
-          cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
+      cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
+      cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
     TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n",
-          cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
-          cbx_wrect.right-cbx_wrect.left, height);
+      cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
+      cbx_wrect.right-cbx_wrect.left, height);
     SetWindowPos (hwnd, HWND_TOP, 0, 0,
-                  cbx_wrect.right-cbx_wrect.left,
-                  height,
-                  SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
+          cbx_wrect.right-cbx_wrect.left,
+          height,
+          SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
 
     return ret;
@@ -1101 +1102 @@
 #endif
     if (infoPtr == NULL) {
-        ERR("could not allocate info memory!\n");
-        return 0;
+    ERR("could not allocate info memory!\n");
+    return 0;
     }
 
@@ -1115 +1116 @@
 
     i = SendMessageA(GetParent (hwnd),
-                     WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+             WM_NOTIFYFORMAT, hwnd, NF_QUERY);
     if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-            i);
-        i = NFR_ANSI;
+    ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+        i);
+    i = NFR_ANSI;
     }
     infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
@@ -1127 +1128 @@
     /* create combo box */
     dwComboStyle = GetWindowLongA (hwnd, GWL_STYLE) &
-                        (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
+            (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
     GetWindowRect(hwnd, &wnrc1);
     GetClientRect(hwnd, &clrc1);
     TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n",
-          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
-          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom);
+      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);
+      WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED);
 
     /* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */
@@ -1147 +1148 @@
 
     infoPtr->hwndCombo = CreateWindowA ("ComboBox", "",
-                         /* following line added to match native */
+             /* following line added to match native */
                          WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
-                         CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST | 
-                         /* was base and is necessary */
-                         WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
-                         cs->y, cs->x, cs->cx, cs->cy, hwnd,
-                         (HMENU) GetWindowLongA (hwnd, GWL_ID),
-                         GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
-
-    /* 
+                         CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST |
+             /* was base and is necessary */
+             WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
+             cs->y, cs->x, cs->cx, cs->cy, hwnd,
+             (HMENU) GetWindowLongA (hwnd, GWL_ID),
+             GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+
+    /*
      * native does the following at this point according to trace:
      *  GetWindowThreadProcessId(hwndCombo,0)
@@ -1165 +1166 @@
 
     /*
-     * Setup a property to hold the pointer to the COMBOBOXEX 
+     * Setup a property to hold the pointer to the COMBOBOXEX
      * data structure.
      */
     test = GetPropA(infoPtr->hwndCombo, (LPCSTR)(LONG)ComboExInfo);
     if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
-        SetPropA(infoPtr->hwndCombo, "CC32SubclassInfo", (LONG)infoPtr);
-    }
-    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndCombo, 
-                                GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc);
+    SetPropA(infoPtr->hwndCombo, "CC32SubclassInfo", (LONG)infoPtr);
+    }
+    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndCombo,
+                            GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc);
     infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
 
@@ -1182 +1183 @@
      */
     if ((cs->style & CBS_DROPDOWNLIST) == CBS_DROPDOWN) {
-        infoPtr->hwndEdit = CreateWindowExA (0, "EDIT", "",
-                    WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
-                    0, 0, 0, 0,  /* will set later */
-                    infoPtr->hwndCombo, 
-                    (HMENU) GetWindowLongA (hwnd, GWL_ID),
-                    GetWindowLongA (hwnd, GWL_HINSTANCE),
-                    NULL);
-
-        /* native does the following at this point according to trace:
-         *  GetWindowThreadProcessId(hwndEdit,0)
-         *  GetCurrentThreadId()
-         *  GetWindowThreadProcessId(hwndEdit, &???)
-         *  GetCurrentProcessId()
-         */
-
-        /*
-         * Setup a property to hold the pointer to the COMBOBOXEX 
-         * data structure.
-         */
-        test = GetPropA(infoPtr->hwndEdit, (LPCSTR)(LONG)ComboExInfo);
-        if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
-            SetPropA(infoPtr->hwndEdit, "CC32SubclassInfo", (LONG)infoPtr);
-        }
-        infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndEdit, 
-                                 GWL_WNDPROC, (LONG)COMBOEX_EditWndProc);
-        infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
+    infoPtr->hwndEdit = CreateWindowExA (0, "EDIT", "",
+            WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
+            0, 0, 0, 0,  /* will set later */
+            infoPtr->hwndCombo,
+            (HMENU) GetWindowLongA (hwnd, GWL_ID),
+            GetWindowLongA (hwnd, GWL_HINSTANCE),
+            NULL);
+
+    /* native does the following at this point according to trace:
+     *  GetWindowThreadProcessId(hwndEdit,0)
+     *  GetCurrentThreadId()
+     *  GetWindowThreadProcessId(hwndEdit, &???)
+     *  GetCurrentProcessId()
+     */
+
+    /*
+     * Setup a property to hold the pointer to the COMBOBOXEX
+     * data structure.
+     */
+    test = GetPropA(infoPtr->hwndEdit, (LPCSTR)(LONG)ComboExInfo);
+    if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
+        SetPropA(infoPtr->hwndEdit, "CC32SubclassInfo", (LONG)infoPtr);
+    }
+    infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndEdit,
+                 GWL_WNDPROC, (LONG)COMBOEX_EditWndProc);
+    infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
     }
     else {
-        infoPtr->hwndEdit = 0;
-        infoPtr->font = 0;
+    infoPtr->hwndEdit = 0;
+    infoPtr->font = 0;
     }
 
@@ -1219 +1220 @@
      */
     if (!infoPtr->font) {
-        SystemParametersInfoA (SPI_GETICONTITLELOGFONT, sizeof(mylogfont), 
-                               &mylogfont, 0);
-        infoPtr->font = CreateFontIndirectA (&mylogfont);
+    SystemParametersInfoA (SPI_GETICONTITLELOGFONT, sizeof(mylogfont),
+                   &mylogfont, 0);
+    infoPtr->font = CreateFontIndirectA (&mylogfont);
     }
     SendMessageW (infoPtr->hwndCombo, WM_SETFONT, (WPARAM)infoPtr->font, 0);
     if (infoPtr->hwndEdit) {
-        SendMessageW (infoPtr->hwndEdit, WM_SETFONT, (WPARAM)infoPtr->font, 0);
-        SendMessageW (infoPtr->hwndEdit, EM_SETMARGINS, (WPARAM)EC_USEFONTINFO, 0);
+    SendMessageW (infoPtr->hwndEdit, WM_SETFONT, (WPARAM)infoPtr->font, 0);
+    SendMessageW (infoPtr->hwndEdit, EM_SETMARGINS, (WPARAM)EC_USEFONTINFO, 0);
     }
 
@@ -1237 +1238 @@
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
     TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n",
-          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
-          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
-          cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
-    SetWindowPos(infoPtr->hwndCombo, HWND_TOP, 
-                 0, 0, wnrc1.right-wnrc1.left, wnrc1.bottom-wnrc1.top,
-                 SWP_NOACTIVATE | SWP_NOREDRAW);
+      wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
+      clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
+      cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
+    SetWindowPos(infoPtr->hwndCombo, HWND_TOP,
+         0, 0, wnrc1.right-wnrc1.left, wnrc1.bottom-wnrc1.top,
+         SWP_NOACTIVATE | SWP_NOREDRAW);
 
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
     TRACE("CB window=(%d,%d)-(%d,%d)\n",
-          cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
-    SetWindowPos(hwnd, HWND_TOP, 
-                 0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top,
-                 SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
+      cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
+    SetWindowPos(hwnd, HWND_TOP,
+         0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top,
+         SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
 
     COMBOEX_AdjustEditPos (infoPtr);
 
     /*
-     * Create an item structure to represent the data in the 
+     * Create an item structure to represent the data in the
      * EDIT control.
      */
@@ -1284 +1285 @@
     {
     case CBN_DROPDOWN:
-        SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
-        /*
-         * from native trace of first dropdown after typing in URL in IE4 
-         *  CB_GETCURSEL(Combo)
-         *  GetWindowText(Edit)
-         *  CB_GETCURSEL(Combo)
-         *  CB_GETCOUNT(Combo)
-         *  CB_GETITEMDATA(Combo, n)
-         *  WM_NOTIFY(parent, CBEN_ENDEDITA|W)
-         *  CB_GETCURSEL(Combo)
-         *  CB_SETCURSEL(COMBOEX, n)
-         *  SetFocus(Combo)
-         * the rest is supposition  
-         */
-        cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
-        if (cursel == -1) {
-            /* find match from edit against those in Combobox */
-            GetWindowTextW (infoPtr->hwndEdit, wintext, 520);
-            n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
-            for (cursel = 0; cursel < n; cursel++){
-                item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                                                     CB_GETITEMDATA, 
-                                                     cursel, 0);
-                if ((INT)item == CB_ERR) break;
-                if (lstrcmpiW(item->pszText, wintext) == 0) break;
-            }
-            if ((cursel == n) || ((INT)item == CB_ERR)) {
-                TRACE("failed to find match??? item=%p cursel=%d\n",
-                      item, cursel);
-                if (infoPtr->hwndEdit)
-                    SetFocus(infoPtr->hwndEdit);
-                return 0;
-            }
-        }
-        else {
-            item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                                                 CB_GETITEMDATA, 
-                                                 cursel, 0);
-            if ((INT)item == CB_ERR) {
-                TRACE("failed to find match??? item=%p cursel=%d\n",
-                      item, cursel);
-                if (infoPtr->hwndEdit)
-                    SetFocus(infoPtr->hwndEdit);
-                return 0;
-            }
-        }
-
-        /* Save flags for testing and reset them */
-        oldflags = infoPtr->flags;
-        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-
-        if (oldflags & WCBE_ACTEDIT) {
-            cbeend.fChanged = (oldflags & WCBE_EDITCHG);
-            cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                                                 CB_GETCURSEL, 0, 0);
-            cbeend.iWhy = CBENF_DROPDOWN;
-
-            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, item->pszText)) {
-                /* abort the change */
-                TRACE("Notify requested abort of change\n");
-                return 0;
-            }
-        }
-
-        /* if selection has changed the set the new current selection */
-        cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
-        if ((oldflags & WCBE_EDITCHG) || (cursel != infoPtr->selected)) {
-            infoPtr->selected = cursel;
-            SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
-            SetFocus(infoPtr->hwndCombo);
-        }
-        return 0;
+    SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
+                 (LPARAM)hwnd);
+    /*
+     * from native trace of first dropdown after typing in URL in IE4
+     *  CB_GETCURSEL(Combo)
+     *  GetWindowText(Edit)
+     *  CB_GETCURSEL(Combo)
+     *  CB_GETCOUNT(Combo)
+     *  CB_GETITEMDATA(Combo, n)
+     *  WM_NOTIFY(parent, CBEN_ENDEDITA|W)
+     *  CB_GETCURSEL(Combo)
+     *  CB_SETCURSEL(COMBOEX, n)
+     *  SetFocus(Combo)
+     * the rest is supposition
+     */
+    cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+    if (cursel == -1) {
+        /* find match from edit against those in Combobox */
+        GetWindowTextW (infoPtr->hwndEdit, wintext, 520);
+        n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
+        for (cursel = 0; cursel < n; cursel++){
+        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
+                             CB_GETITEMDATA,
+                             cursel, 0);
+        if ((INT)item == CB_ERR) break;
+        if (lstrcmpiW(item->pszText, wintext) == 0) break;
+        }
+        if ((cursel == n) || ((INT)item == CB_ERR)) {
+        TRACE("failed to find match??? item=%p cursel=%d\n",
+              item, cursel);
+        if (infoPtr->hwndEdit)
+            SetFocus(infoPtr->hwndEdit);
+        return 0;
+        }
+    }
+    else {
+        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
+                         CB_GETITEMDATA,
+                         cursel, 0);
+        if ((INT)item == CB_ERR) {
+        TRACE("failed to find match??? item=%p cursel=%d\n",
+              item, cursel);
+        if (infoPtr->hwndEdit)
+            SetFocus(infoPtr->hwndEdit);
+        return 0;
+        }
+    }
+
+    /* Save flags for testing and reset them */
+    oldflags = infoPtr->flags;
+    infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+
+    if (oldflags & WCBE_ACTEDIT) {
+        cbeend.fChanged = (oldflags & WCBE_EDITCHG);
+        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                         CB_GETCURSEL, 0, 0);
+        cbeend.iWhy = CBENF_DROPDOWN;
+
+        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, item->pszText)) {
+        /* abort the change */
+        TRACE("Notify requested abort of change\n");
+        return 0;
+        }
+    }
+
+    /* if selection has changed the set the new current selection */
+    cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+    if ((oldflags & WCBE_EDITCHG) || (cursel != infoPtr->selected)) {
+        infoPtr->selected = cursel;
+        SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
+        SetFocus(infoPtr->hwndCombo);
+    }
+    return 0;
 
     case CBN_SELCHANGE:
-        /*
-         * CB_GETCURSEL(Combo)
-         * CB_GETITEMDATA(Combo)   < simulated by COMBOEX_FindItem
-         * lstrlenA
-         * WM_SETTEXT(Edit)
-         * WM_GETTEXTLENGTH(Edit)
-         * WM_GETTEXT(Edit)
-         * EM_SETSEL(Edit, 0,0)
-         * WM_GETTEXTLENGTH(Edit)
-         * WM_GETTEXT(Edit)
-         * EM_SETSEL(Edit, 0,len)
-         * return WM_COMMAND to parent
-         */
-        oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
-        if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
-            ERR("item %d not found. Problem!\n", oldItem);
-            break;
-        }
-        infoPtr->selected = oldItem;
-        COMBOEX_SetEditText (infoPtr, item);
-        return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+    /*
+     * CB_GETCURSEL(Combo)
+     * CB_GETITEMDATA(Combo)   < simulated by COMBOEX_FindItem
+     * lstrlenA
+     * WM_SETTEXT(Edit)
+     * WM_GETTEXTLENGTH(Edit)
+     * WM_GETTEXT(Edit)
+     * EM_SETSEL(Edit, 0,0)
+     * WM_GETTEXTLENGTH(Edit)
+     * WM_GETTEXT(Edit)
+     * EM_SETSEL(Edit, 0,len)
+     * return WM_COMMAND to parent
+     */
+    oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+    if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
+        ERR("item %d not found. Problem!\n", oldItem);
+        break;
+    }
+    infoPtr->selected = oldItem;
+    COMBOEX_SetEditText (infoPtr, item);
+    return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
+                 (LPARAM)hwnd);
 
     case CBN_SELENDOK:
-        /* 
-         * We have to change the handle since we are the control
-         * issuing the message. IE4 depends on this.
-         */
-        return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+    /*
+     * We have to change the handle since we are the control
+     * issuing the message. IE4 depends on this.
+     */
+    return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
+                 (LPARAM)hwnd);
 
     case CBN_KILLFOCUS:
-        /*
-         * from native trace:
-         *
-         *  pass to parent
-         *  WM_GETTEXT(Edit, 104)
-         *  CB_GETCURSEL(Combo) rets -1
-         *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
-         *  CB_GETCURSEL(Combo)
-         *  InvalidateRect(Combo, 0, 0)
-         *  return 0
-         */
-        SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
-        if (infoPtr->flags & WCBE_ACTEDIT) {
-            GetWindowTextW (infoPtr->hwndEdit, wintext, 260);
-            cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
-            cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                                                 CB_GETCURSEL, 0, 0);
-            cbeend.iWhy = CBENF_KILLFOCUS;
-
-            infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, wintext)) {
-                /* abort the change */
-                TRACE("Notify requested abort of change\n");
-                return 0;
-            }
-        }
-        /* possible CB_GETCURSEL */
-        InvalidateRect (infoPtr->hwndCombo, 0, 0);
-        return 0;
+    /*
+     * from native trace:
+     *
+     *  pass to parent
+     *  WM_GETTEXT(Edit, 104)
+     *  CB_GETCURSEL(Combo) rets -1
+     *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
+     *  CB_GETCURSEL(Combo)
+     *  InvalidateRect(Combo, 0, 0)
+     *  return 0
+     */
+    SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
+                 (LPARAM)hwnd);
+    if (infoPtr->flags & WCBE_ACTEDIT) {
+        GetWindowTextW (infoPtr->hwndEdit, wintext, 260);
+        cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
+        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                         CB_GETCURSEL, 0, 0);
+        cbeend.iWhy = CBENF_KILLFOCUS;
+
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, wintext)) {
+        /* abort the change */
+        TRACE("Notify requested abort of change\n");
+        return 0;
+        }
+    }
+    /* possible CB_GETCURSEL */
+    InvalidateRect (infoPtr->hwndCombo, 0, 0);
+    return 0;
 
     case CBN_CLOSEUP:
     default:
-        /* 
-         * We have to change the handle since we are the control
-         * issuing the message. IE4 depends on this.
-         * We also need to set the focus back to the Edit control
-         * after passing the command to the parent of the ComboEx.
-         */
-        lret = SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
-        if (infoPtr->hwndEdit)
-            SetFocus(infoPtr->hwndEdit);
-        return lret;
+    /*
+     * We have to change the handle since we are the control
+     * issuing the message. IE4 depends on this.
+     * We also need to set the focus back to the Edit control
+     * after passing the command to the parent of the ComboEx.
+     */
+    lret = SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
+                 (LPARAM)hwnd);
+    if (infoPtr->hwndEdit)
+        SetFocus(infoPtr->hwndEdit);
+    return lret;
     }
     return 0;
@@ -1450 +1451 @@
 
     TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%x, data=%08lx\n",
-          dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
+      dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
 
     if ((dis->itemID >= infoPtr->nb_items) || (dis->itemID < 0)) return FALSE;
@@ -1458 +1459 @@
 
     if (i == dis->itemID) {
-        infoPtr->items = infoPtr->items->next;
+    infoPtr->items = infoPtr->items->next;
     }
     else {
-        item = olditem;
-        i--;
-
-        /* find the prior item in the list */
-        while (item->next && (i > dis->itemID)) {
-            item = (CBE_ITEMDATA *)item->next;
-            i--;
-        }
-        if (!item->next || (i != dis->itemID)) {
-            FIXME("COMBOBOXEX item structures broken. Please report!\n");
-            return FALSE;
-        }
-        olditem = item->next;
-        item->next = (CBE_ITEMDATA *)((CBE_ITEMDATA *)item->next)->next;
+    item = olditem;
+    i--;
+
+    /* find the prior item in the list */
+    while (item->next && (i > dis->itemID)) {
+        item = (CBE_ITEMDATA *)item->next;
+        i--;
+    }
+    if (!item->next || (i != dis->itemID)) {
+        FIXME("COMBOBOXEX item structures broken. Please report!\n");
+        return FALSE;
+    }
+    olditem = item->next;
+    item->next = (CBE_ITEMDATA *)((CBE_ITEMDATA *)item->next)->next;
     }
     infoPtr->nb_items--;
@@ -1482 +1483 @@
 
     if (olditem->pszText)
-        COMCTL32_Free(olditem->pszText);
+    COMCTL32_Free(olditem->pszText);
     COMCTL32_Free(olditem);
 
@@ -1510 +1511 @@
     /* dump the DRAWITEMSTRUCT if tracing "comboex" but not "message" */
     if (!TRACE_ON(message)) {
-        TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", 
-              dis->CtlType, dis->CtlID);
-        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, 
-              dis->itemData);
+    TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
+          dis->CtlType, dis->CtlID);
+    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,
+          dis->itemData);
     }
 
@@ -1532 +1533 @@
     /*      though the list box or combo box has the focus.             */
     if (dis->itemID == 0xffffffff) {
-        if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) ||
-             ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) { 
-
-            TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n",
-                  dis->rcItem.left, dis->rcItem.top,
-                  dis->rcItem.right, dis->rcItem.bottom);
-        }
-        else if ((dis->CtlType == ODT_COMBOBOX) && 
-                 (dis->itemAction == ODA_DRAWENTIRE)) {
-            /* draw of edit control data */
-
-            /* testing */
-            {
-                RECT exrc, cbrc, edrc;
-                GetWindowRect (hwnd, &exrc);
-                GetWindowRect (infoPtr->hwndCombo, &cbrc);
-                edrc.left=edrc.top=edrc.right=edrc.bottom=-1;
-                if (infoPtr->hwndEdit)
-                    GetWindowRect (infoPtr->hwndEdit, &edrc);
-                TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n",
-                      exrc.left, exrc.top, exrc.right, exrc.bottom,
-                      cbrc.left, cbrc.top, cbrc.right, cbrc.bottom,
-                      edrc.left, edrc.top, edrc.right, edrc.bottom);
-            }
-        }
-        else {
-            ERR("NOT drawing item  -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n",
-                dis->rcItem.left, dis->rcItem.top,
-                dis->rcItem.right, dis->rcItem.bottom,
-                dis->itemAction, dis->itemState);
-            return 0;
-        }
+    if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) ||
+         ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) {
+
+        TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n",
+          dis->rcItem.left, dis->rcItem.top,
+          dis->rcItem.right, dis->rcItem.bottom);
+    }
+    else if ((dis->CtlType == ODT_COMBOBOX) &&
+         (dis->itemAction == ODA_DRAWENTIRE)) {
+        /* draw of edit control data */
+
+        /* testing */
+        {
+        RECT exrc, cbrc, edrc;
+        GetWindowRect (hwnd, &exrc);
+        GetWindowRect (infoPtr->hwndCombo, &cbrc);
+        edrc.left=edrc.top=edrc.right=edrc.bottom=-1;
+        if (infoPtr->hwndEdit)
+            GetWindowRect (infoPtr->hwndEdit, &edrc);
+        TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n",
+              exrc.left, exrc.top, exrc.right, exrc.bottom,
+              cbrc.left, cbrc.top, cbrc.right, cbrc.bottom,
+              edrc.left, edrc.top, edrc.right, edrc.bottom);
+        }
+    }
+    else {
+        ERR("NOT drawing item  -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n",
+        dis->rcItem.left, dis->rcItem.top,
+        dis->rcItem.right, dis->rcItem.bottom,
+        dis->itemAction, dis->itemState);
+        return 0;
+    }
     }
 
     /* If draw item is -1 (edit control) setup the item pointer */
     if (dis->itemID == 0xffffffff) {
-        CHAR str[260];
-        INT wlen, alen;
-
-        item = infoPtr->edit;
-
-        if (infoPtr->hwndEdit) {
-
-            /* free previous text of edit item */
-            if (item->pszText) {
-                COMCTL32_Free(item->pszText);
-                item->pszText = 0;
-                item->mask &= ~CBEIF_TEXT;
-            }
-            alen = SendMessageA (infoPtr->hwndEdit, WM_GETTEXT, 260, (LPARAM)&str);
-            TRACE("edit control hwndEdit=%0x, text len=%d str=<%s>\n",
-                  infoPtr->hwndEdit, alen, str);
-            if (alen > 0) {
-                item->mask |= CBEIF_TEXT;
-                wlen = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-                if (wlen > 0) {
-                    item->pszText = (LPWSTR)COMCTL32_Alloc ((wlen + 1)*sizeof(WCHAR));
-                    MultiByteToWideChar (CP_ACP, 0, str, -1, item->pszText, wlen);
-                }
-            }
-        }
+    CHAR str[260];
+    INT wlen, alen;
+
+    item = infoPtr->edit;
+
+    if (infoPtr->hwndEdit) {
+
+        /* free previous text of edit item */
+        if (item->pszText) {
+        COMCTL32_Free(item->pszText);
+        item->pszText = 0;
+        item->mask &= ~CBEIF_TEXT;
+        }
+        alen = SendMessageA (infoPtr->hwndEdit, WM_GETTEXT, 260, (LPARAM)&str);
+        TRACE("edit control hwndEdit=%0x, text len=%d str=<%s>\n",
+          infoPtr->hwndEdit, alen, str);
+        if (alen > 0) {
+        item->mask |= CBEIF_TEXT;
+        wlen = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
+        if (wlen > 0) {
+            item->pszText = (LPWSTR)COMCTL32_Alloc ((wlen + 1)*sizeof(WCHAR));
+            MultiByteToWideChar (CP_ACP, 0, str, -1, item->pszText, wlen);
+        }
+        }
+    }
     }
 
     /* if the item pointer is not set, then get the data and locate it */
     if (!item) {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-                             CB_GETITEMDATA, (WPARAM)dis->itemID, 0);
-        if (item == (CBE_ITEMDATA *)CB_ERR)
-            {
-                FIXME("invalid item for id %d \n",dis->itemID);
-                return 0;
-            }
+    item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
+                 CB_GETITEMDATA, (WPARAM)dis->itemID, 0);
+    if (item == (CBE_ITEMDATA *)CB_ERR)
+        {
+        FIXME("invalid item for id %d \n",dis->itemID);
+        return 0;
+        }
     }
 
@@ -1612 +1613 @@
         xbase += (item->iIndent * CBE_INDENT);
     if (item->mask & CBEIF_IMAGE) {
-        ImageList_GetImageInfo(infoPtr->himl, item->iImage, &iinfo);
-        xioff = (iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP);
+    ImageList_GetImageInfo(infoPtr->himl, item->iImage, &iinfo);
+    xioff = (iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP);
     }
 
@@ -1619 +1620 @@
     case ODA_FOCUS:
         if (dis->itemState & ODS_SELECTED /*1*/) {
-            if ((item->mask & CBEIF_TEXT) && item->pszText) {
-                RECT rect2;
-
-                len = strlenW (item->pszText);
-                GetTextExtentPointW (dis->hDC, item->pszText, len, &txtsize);
-                rect.left = xbase + xioff - 1;
-                rect.right = rect.left + txtsize.cx + 2;
-                rect.top = dis->rcItem.top;
-                rect.bottom = dis->rcItem.bottom;
-                GetClipBox (dis->hDC, &rect2);
-                TRACE("drawing item %d focus, rect=(%d,%d)-(%d,%d)\n",
-                      dis->itemID, rect.left, rect.top,
-                      rect.right, rect.bottom);
-                TRACE("                      clip=(%d,%d)-(%d,%d)\n",
-                      rect2.left, rect2.top,
-                      rect2.right, rect2.bottom);
-
-                DrawFocusRect(dis->hDC, &rect);
-            }
-            else {
-                FIXME("ODA_FOCUS and ODS_SELECTED but no text\n");
-            }
-        }
-        else {
-            FIXME("ODA_FOCUS but not ODS_SELECTED\n");
-        }
+        if ((item->mask & CBEIF_TEXT) && item->pszText) {
+        RECT rect2;
+
+            len = strlenW (item->pszText);
+        GetTextExtentPointW (dis->hDC, item->pszText, len, &txtsize);
+        rect.left = xbase + xioff - 1;
+        rect.right = rect.left + txtsize.cx + 2;
+        rect.top = dis->rcItem.top;
+        rect.bottom = dis->rcItem.bottom;
+        GetClipBox (dis->hDC, &rect2);
+        TRACE("drawing item %d focus, rect=(%d,%d)-(%d,%d)\n",
+              dis->itemID, rect.left, rect.top,
+              rect.right, rect.bottom);
+        TRACE("                      clip=(%d,%d)-(%d,%d)\n",
+              rect2.left, rect2.top,
+              rect2.right, rect2.bottom);
+
+        DrawFocusRect(dis->hDC, &rect);
+        }
+        else {
+        FIXME("ODA_FOCUS and ODS_SELECTED but no text\n");
+        }
+    }
+    else {
+        FIXME("ODA_FOCUS but not ODS_SELECTED\n");
+    }
         break;
     case ODA_SELECT:
     case ODA_DRAWENTIRE:
         drawimage = -1;
-        drawstate = ILD_NORMAL;
-        if (!(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE)) {
-            if (item->mask & CBEIF_IMAGE) 
-                drawimage = item->iImage;
-            if (dis->itemState & ODS_COMBOEXLBOX) {
-                /* drawing listbox entry */
-                if (dis->itemState & ODS_SELECTED) {
-                    if (item->mask & CBEIF_SELECTEDIMAGE)
-                        drawimage = item->iSelectedImage;
-                    drawstate = ILD_SELECTED;
-                }
-            }
-            else {
-                /* drawing combo/edit entry */
-                if (infoPtr->hwndEdit) {
-                    /* if we have an edit control, the slave the 
-                     * selection state to the Edit focus state 
-                     */
-                    if (infoPtr->flags & WCBE_EDITFOCUSED) {
-                        if (item->mask & CBEIF_SELECTEDIMAGE)
-                            drawimage = item->iSelectedImage;
-                        drawstate = ILD_SELECTED;
-                    }
-                }
-                else {
-                    /* if we don't have an edit control, use 
-                     * the requested state.
-                     */
-                    if (dis->itemState & ODS_SELECTED) {
-                        if (item->mask & CBEIF_SELECTEDIMAGE)
-                            drawimage = item->iSelectedImage;
-                        drawstate = ILD_SELECTED;
-                    }
-                }
-            }
-        }
-        if (drawimage != -1) {
-            TRACE("drawing image state=%d\n", dis->itemState & ODS_SELECTED);
-            ImageList_Draw (infoPtr->himl, drawimage, dis->hDC, 
-                            xbase, dis->rcItem.top, drawstate);
-        }
-
-        /* setup pointer to text to be drawn */
-        if ((item->mask & CBEIF_TEXT) && item->pszText)
-            str = item->pszText;
-        else
-            str = (LPWSTR) L"";
-
-        /* now draw the text */
-        len = lstrlenW (str);
-        GetTextExtentPointW (dis->hDC, str, len, &txtsize);
-        nbkc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
-                            COLOR_HIGHLIGHT : COLOR_WINDOW);
-        SetBkColor (dis->hDC, nbkc);
-        ntxc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
-                            COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT);
-        SetTextColor (dis->hDC, ntxc);
-        x = xbase + xioff;
-        y = dis->rcItem.top +
-            (dis->rcItem.bottom - dis->rcItem.top - txtsize.cy) / 2;
-        rect.left = x;
-        rect.right = x + txtsize.cx;
-        rect.top = dis->rcItem.top + 1;
-        rect.bottom = dis->rcItem.bottom - 1;
-        TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
-              dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
-        ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
-                     &rect, str, len, 0);
-        if (dis->itemState & ODS_FOCUS) {
-            rect.top -= 1;
-            rect.bottom += 1;
-            rect.left -= 1;
-            rect.right += 1;
-            TRACE("drawing item %d focus after text, rect=(%d,%d)-(%d,%d)\n",
-                  dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
-            DrawFocusRect (dis->hDC, &rect);
-        }
-        break;
+    drawstate = ILD_NORMAL;
+    if (!(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE)) {
+        if (item->mask & CBEIF_IMAGE)
+        drawimage = item->iImage;
+        if (dis->itemState & ODS_COMBOEXLBOX) {
+        /* drawing listbox entry */
+        if (dis->itemState & ODS_SELECTED) {
+            if (item->mask & CBEIF_SELECTEDIMAGE)
+            drawimage = item->iSelectedImage;
+            drawstate = ILD_SELECTED;
+        }
+        }
+        else {
+        /* drawing combo/edit entry */
+        if (infoPtr->hwndEdit) {
+            /* if we have an edit control, the slave the
+                     * selection state to the Edit focus state
+             */
+            if (infoPtr->flags & WCBE_EDITFOCUSED) {
+            if (item->mask & CBEIF_SELECTEDIMAGE)
+                drawimage = item->iSelectedImage;
+            drawstate = ILD_SELECTED;
+            }
+        }
+        else {
+            /* if we don't have an edit control, use
+             * the requested state.
+             */
+            if (dis->itemState & ODS_SELECTED) {
+            if (item->mask & CBEIF_SELECTEDIMAGE)
+                drawimage = item->iSelectedImage;
+            drawstate = ILD_SELECTED;
+            }
+        }
+        }
+    }
+    if (drawimage != -1) {
+        TRACE("drawing image state=%d\n", dis->itemState & ODS_SELECTED);
+        ImageList_Draw (infoPtr->himl, drawimage, dis->hDC,
+                xbase, dis->rcItem.top, drawstate);
+    }
+
+    /* setup pointer to text to be drawn */
+    if ((item->mask & CBEIF_TEXT) && item->pszText)
+        str = item->pszText;
+    else
+        str = (LPWSTR) L"";
+
+    /* now draw the text */
+    len = lstrlenW (str);
+    GetTextExtentPointW (dis->hDC, str, len, &txtsize);
+    nbkc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
+                COLOR_HIGHLIGHT : COLOR_WINDOW);
+    SetBkColor (dis->hDC, nbkc);
+    ntxc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
+                COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT);
+    SetTextColor (dis->hDC, ntxc);
+    x = xbase + xioff;
+    y = dis->rcItem.top +
+        (dis->rcItem.bottom - dis->rcItem.top - txtsize.cy) / 2;
+    rect.left = x;
+    rect.right = x + txtsize.cx;
+    rect.top = dis->rcItem.top + 1;
+    rect.bottom = dis->rcItem.bottom - 1;
+    TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
+          dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
+    ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
+             &rect, str, len, 0);
+    if (dis->itemState & ODS_FOCUS) {
+        rect.top -= 1;
+        rect.bottom += 1;
+        rect.left -= 1;
+        rect.right += 1;
+        TRACE("drawing item %d focus after text, rect=(%d,%d)-(%d,%d)\n",
+          dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
+        DrawFocusRect (dis->hDC, &rect);
+    }
+    break;
     default:
-        FIXME("unknown action hwnd=%08x, wparam=%08x, lparam=%08lx, action=%d\n", 
-              hwnd, wParam, lParam, dis->itemAction);
+        FIXME("unknown action hwnd=%08x, wparam=%08x, lparam=%08lx, action=%d\n",
+          hwnd, wParam, lParam, dis->itemAction);
     }
 
@@ -1742 +1743 @@
 
     if (infoPtr->hwndCombo)
-        DestroyWindow (infoPtr->hwndCombo);
+    DestroyWindow (infoPtr->hwndCombo);
 
     if (infoPtr->edit) {
-        COMCTL32_Free (infoPtr->edit);
-        infoPtr->edit = 0;
+    COMCTL32_Free (infoPtr->edit);
+    infoPtr->edit = 0;
     }
 
@@ -1752 +1753 @@
         CBE_ITEMDATA *this, *next;
 
-        this = infoPtr->items;
-        while (this) {
-            next = (CBE_ITEMDATA *)this->next;
-            if ((this->mask & CBEIF_TEXT) && this->pszText)
-                COMCTL32_Free (this->pszText);
-            COMCTL32_Free (this);
-            this = next;
-        }
+    this = infoPtr->items;
+    while (this) {
+        next = (CBE_ITEMDATA *)this->next;
+        if ((this->mask & CBEIF_TEXT) && this->pszText)
+            COMCTL32_Free (this->pszText);
+        COMCTL32_Free (this);
+        this = next;
+    }
     }
 
@@ -1785 +1786 @@
 
     TRACE("adjusted height hwnd=%08x, height=%d\n",
-          hwnd, mis->itemHeight);
+      hwnd, mis->itemHeight);
 
     return 0;
@@ -1800 +1801 @@
     newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL);
     if (newstyle != oldstyle) {
-        TRACE("req style %08lx, reseting style %08lx\n",
-              oldstyle, newstyle);
-        SetWindowLongA (hwnd, GWL_STYLE, newstyle);
+    TRACE("req style %08lx, reseting style %08lx\n",
+          oldstyle, newstyle);
+    SetWindowLongA (hwnd, GWL_STYLE, newstyle);
     }
     return 1;
@@ -1815 +1816 @@
 
     if (lParam == NF_REQUERY) {
-        i = SendMessageA(GetParent (hwnd),
-                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
-        if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-            ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-                i);
-            i = NFR_ANSI;
-        }
-        infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
-        return (LRESULT)i;
+    i = SendMessageA(GetParent (hwnd),
+             WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+    if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
+        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+        i);
+        i = NFR_ANSI;
+    }
+    infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
+    return (LRESULT)i;
     }
     return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);
@@ -1837 +1838 @@
     GetWindowRect (hwnd, &rect);
     TRACE("my rect (%d,%d)-(%d,%d)\n",
-          rect.left, rect.top, rect.right, rect.bottom);
+      rect.left, rect.top, rect.right, rect.bottom);
 
     MoveWindow (infoPtr->hwndCombo, 0, 0, rect.right -rect.left,
-                  rect.bottom - rect.top, TRUE);
+          rect.bottom - rect.top, TRUE);
 
     COMBOEX_AdjustEditPos (infoPtr);
@@ -1862 +1863 @@
     /* 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",
-          wp->x, wp->y, wp->cx, wp->cy, wp->flags);
+      wp->x, wp->y, wp->cx, wp->cy, wp->flags);
     TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n",
-          cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
-          cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
+      cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
+      cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
     TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n",
-          cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
-          width, cb_wrect.bottom-cb_wrect.top);
+      cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
+      width, cb_wrect.bottom-cb_wrect.top);
 
     if (width) SetWindowPos (infoPtr->hwndCombo, HWND_TOP, 0, 0,
-                             width,
-                             cb_wrect.bottom-cb_wrect.top,
-                             SWP_NOACTIVATE);
+                 width,
+                 cb_wrect.bottom-cb_wrect.top,
+                 SWP_NOACTIVATE);
 
     GetWindowRect (infoPtr->hwndCombo, &cb_wrect);
@@ -1883 +1884 @@
     /* height is combo window height plus border width of comboex */
     height =   (cb_wrect.bottom-cb_wrect.top)
-             + (cbx_wrect.bottom-cbx_wrect.top)
+         + (cbx_wrect.bottom-cbx_wrect.top)
              - (cbx_crect.bottom-cbx_crect.top);
     if (wp->cy < height) wp->cy = height;
     if (infoPtr->hwndEdit) {
-        COMBOEX_AdjustEditPos (infoPtr);
-        InvalidateRect (infoPtr->hwndCombo, 0, TRUE);
+    COMBOEX_AdjustEditPos (infoPtr);
+    InvalidateRect (infoPtr->hwndCombo, 0, TRUE);
     }
 
@@ -1906 +1907 @@
     LRESULT lret;
 
-    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n", 
-          hwnd, uMsg, wParam, lParam, infoPtr);
+    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
+      hwnd, uMsg, wParam, lParam, infoPtr);
 
     if (!infoPtr) return 0;
@@ -1915 +1916 @@
 
     case WM_CHAR:
-            /* handle (ignore) the return character */
-            if (wParam == VK_RETURN) return 0;
-            /* all other characters pass into the real Edit */
-            return CallWindowProcA (infoPtr->prevEditWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        /* handle (ignore) the return character */
+        if (wParam == VK_RETURN) return 0;
+        /* all other characters pass into the real Edit */
+        return CallWindowProcA (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;
-            nbkc = GetSysColor (COLOR_WINDOW);
-            obkc = SetBkColor (hDC, nbkc);
+        nbkc = GetSysColor (COLOR_WINDOW);
+        obkc = SetBkColor (hDC, nbkc);
             GetClientRect (hwnd, &rect);
-            TRACE("erasing (%d,%d)-(%d,%d)\n",
-                  rect.left, rect.top, rect.right, rect.bottom);
-            ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
+        TRACE("erasing (%d,%d)-(%d,%d)\n",
+          rect.left, rect.top, rect.right, rect.bottom);
+        ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-            return CallWindowProcA (infoPtr->prevEditWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        return CallWindowProcA (infoPtr->prevEditWndProc,
+                   hwnd, uMsg, wParam, lParam);
 
     case WM_KEYDOWN: {
-            INT oldItem, selected;
-            CBE_ITEMDATA *item;
-
-            switch ((INT)wParam)
-            {
-            case VK_ESCAPE:
-                /* native version seems to do following for COMBOEX */
-                /*
-                 *   GetWindowTextA(Edit,&?, 0x104)             x
-                 *   CB_GETCURSEL to Combo rets -1              x
-                 *   WM_NOTIFY to COMBOEX parent (rebar)        x
-                 *     (CBEN_ENDEDIT{A|W} 
-                 *      fChanged = FALSE                        x
-                 *      inewSelection = -1                      x
-                 *      txt="www.hoho"                          x
-                 *      iWhy = 3                                x
-                 *   CB_GETCURSEL to Combo rets -1              x
-                 *   InvalidateRect(Combo, 0)                   x
-                 *   WM_SETTEXT to Edit                         x
-                 *   EM_SETSEL to Edit (0,0)                    x
-                 *   EM_SETSEL to Edit (0,-1)                   x
-                 *   RedrawWindow(Combo, 0, 0, 5)               x
-                 */
-                TRACE("special code for VK_ESCAPE\n");
-
-                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-
-                infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-                cbeend.fChanged = FALSE;
-                cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                                                     CB_GETCURSEL, 0, 0);
-                cbeend.iWhy = CBENF_ESCAPE;
-
-                if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-                    /* abort the change */
-                    TRACE("Notify requested abort of change\n");
-                    return 0;
-                }
-                oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
-                InvalidateRect (infoPtr->hwndCombo, 0, 0);
-                if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
-                    ERR("item %d not found. Problem!\n", oldItem);
-                    break;
-                }
-                infoPtr->selected = oldItem;              
-                COMBOEX_SetEditText (infoPtr, item);
-                RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
-                              RDW_INVALIDATE);
-                break;
-
-            case VK_RETURN:
-                /* native version seems to do following for COMBOEX */
-                /*
-                 *   GetWindowTextA(Edit,&?, 0x104)             x
-                 *   CB_GETCURSEL to Combo  rets -1             x
-                 *   CB_GETCOUNT to Combo  rets 0
-                 *   if >0 loop 
-                 *       CB_GETITEMDATA to match
-                 * *** above 3 lines simulated by FindItem      x  
-                 *   WM_NOTIFY to COMBOEX parent (rebar)        x
-                 *     (CBEN_ENDEDIT{A|W}                       x
-                 *        fChanged = TRUE (-1)                  x
-                 *        iNewSelection = -1 or selected        x
-                 *        txt=                                  x
-                 *        iWhy = 2 (CBENF_RETURN)               x
-                 *   CB_GETCURSEL to Combo  rets -1             x
-                 *   if -1 send CB_SETCURSEL to Combo -1        x
-                 *   InvalidateRect(Combo, 0, 0)                x
-                 *   SetFocus(Edit)                             x
-                 *   CallWindowProc(406615a8, Edit, 0x100, 0xd, 0x1c0001)
-                 */
-
-                TRACE("special code for VK_RETURN\n");
-
-                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-
-                infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-                selected = SendMessageW (infoPtr->hwndCombo,
-                                         CB_GETCURSEL, 0, 0);
-
-                if (selected != -1) {
-                    item = COMBOEX_FindItem (infoPtr, selected);
-                    TRACE("handling VK_RETURN, selected = %d, selected_text=%s\n",
-                          selected, debugstr_w(item->pszText));
-                    TRACE("handling VK_RETURN, edittext=%s\n",
-                          debugstr_w(edit_text));
-                    if (lstrcmpiW (item->pszText, edit_text)) {
-                        /* strings not equal -- indicate edit has changed */
-                        selected = -1;
-                    }
-                }
-
-                cbeend.iNewSelection = selected;
-                cbeend.fChanged = TRUE; 
-                cbeend.iWhy = CBENF_RETURN;
-                if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-                    /* abort the change, restore previous */
-                    TRACE("Notify requested abort of change\n");
-                    COMBOEX_SetEditText (infoPtr, infoPtr->edit);
-                    RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
-                                  RDW_INVALIDATE);
-                    return 0;
-                }
-                oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
-                if (oldItem != -1) {
-                    /* if something is selected, then deselect it */
-                    SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, 
-                                  (WPARAM)-1, 0);
-                }
-                InvalidateRect (infoPtr->hwndCombo, 0, 0);
-                SetFocus(infoPtr->hwndEdit);
-                break;
-
-            default:
-                return CallWindowProcA (infoPtr->prevEditWndProc,
-                                       hwnd, uMsg, wParam, lParam);
-            }
-            return 0;
+        INT oldItem, selected;
+        CBE_ITEMDATA *item;
+
+        switch ((INT)wParam)
+        {
+        case VK_ESCAPE:
+        /* native version seems to do following for COMBOEX */
+        /*
+         *   GetWindowTextA(Edit,&?, 0x104)             x
+         *   CB_GETCURSEL to Combo rets -1              x
+         *   WM_NOTIFY to COMBOEX parent (rebar)        x
+         *     (CBEN_ENDEDIT{A|W}
+         *      fChanged = FALSE                        x
+         *      inewSelection = -1                      x
+         *      txt="www.hoho"                          x
+         *      iWhy = 3                                x
+         *   CB_GETCURSEL to Combo rets -1              x
+         *   InvalidateRect(Combo, 0)                   x
+         *   WM_SETTEXT to Edit                         x
+         *   EM_SETSEL to Edit (0,0)                    x
+         *   EM_SETSEL to Edit (0,-1)                   x
+         *   RedrawWindow(Combo, 0, 0, 5)               x
+         */
+        TRACE("special code for VK_ESCAPE\n");
+
+        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+        cbeend.fChanged = FALSE;
+        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                             CB_GETCURSEL, 0, 0);
+        cbeend.iWhy = CBENF_ESCAPE;
+
+        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
+            /* abort the change */
+            TRACE("Notify requested abort of change\n");
+            return 0;
+        }
+        oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
+        InvalidateRect (infoPtr->hwndCombo, 0, 0);
+        if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
+            ERR("item %d not found. Problem!\n", oldItem);
+            break;
+        }
+        infoPtr->selected = oldItem;
+        COMBOEX_SetEditText (infoPtr, item);
+        RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE |
+                  RDW_INVALIDATE);
+        break;
+
+        case VK_RETURN:
+        /* native version seems to do following for COMBOEX */
+        /*
+         *   GetWindowTextA(Edit,&?, 0x104)             x
+         *   CB_GETCURSEL to Combo  rets -1             x
+         *   CB_GETCOUNT to Combo  rets 0
+         *   if >0 loop
+         *       CB_GETITEMDATA to match
+         * *** above 3 lines simulated by FindItem      x
+         *   WM_NOTIFY to COMBOEX parent (rebar)        x
+         *     (CBEN_ENDEDIT{A|W}                       x
+         *        fChanged = TRUE (-1)                  x
+         *        iNewSelection = -1 or selected        x
+         *        txt=                                  x
+         *        iWhy = 2 (CBENF_RETURN)               x
+         *   CB_GETCURSEL to Combo  rets -1             x
+         *   if -1 send CB_SETCURSEL to Combo -1        x
+         *   InvalidateRect(Combo, 0, 0)                x
+         *   SetFocus(Edit)                             x
+         *   CallWindowProc(406615a8, Edit, 0x100, 0xd, 0x1c0001)
+         */
+
+        TRACE("special code for VK_RETURN\n");
+
+        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+        selected = SendMessageW (infoPtr->hwndCombo,
+                     CB_GETCURSEL, 0, 0);
+
+        if (selected != -1) {
+            item = COMBOEX_FindItem (infoPtr, selected);
+            TRACE("handling VK_RETURN, selected = %d, selected_text=%s\n",
+              selected, debugstr_w(item->pszText));
+            TRACE("handling VK_RETURN, edittext=%s\n",
+              debugstr_w(edit_text));
+            if (lstrcmpiW (item->pszText, edit_text)) {
+            /* strings not equal -- indicate edit has changed */
+            selected = -1;
             }
+        }
+
+        cbeend.iNewSelection = selected;
+        cbeend.fChanged = TRUE;
+        cbeend.iWhy = CBENF_RETURN;
+        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
+            /* abort the change, restore previous */
+            TRACE("Notify requested abort of change\n");
+            COMBOEX_SetEditText (infoPtr, infoPtr->edit);
+            RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE |
+                  RDW_INVALIDATE);
+            return 0;
+        }
+        oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
+        if (oldItem != -1) {
+            /* if something is selected, then deselect it */
+            SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL,
+                  (WPARAM)-1, 0);
+        }
+        InvalidateRect (infoPtr->hwndCombo, 0, 0);
+        SetFocus(infoPtr->hwndEdit);
+        break;
+
+        default:
+        return CallWindowProcA (infoPtr->prevEditWndProc,
+                       hwnd, uMsg, wParam, lParam);
+        }
+        return 0;
+            }
 
     case WM_SETFOCUS:
-            /* remember the focus to set state of icon */
-            lret = CallWindowProcA (infoPtr->prevEditWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
-            infoPtr->flags |= WCBE_EDITFOCUSED;
-            return lret;
+        /* remember the focus to set state of icon */
+        lret = CallWindowProcA (infoPtr->prevEditWndProc,
+                   hwnd, uMsg, wParam, lParam);
+        infoPtr->flags |= WCBE_EDITFOCUSED;
+        return lret;
 
     case WM_KILLFOCUS:
-            /* 
-             * do NOTIFY CBEN_ENDEDIT with CBENF_KILLFOCUS
-             */
-            infoPtr->flags &= ~WCBE_EDITFOCUSED;
-            if (infoPtr->flags & WCBE_ACTEDIT) {
-                infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-
-                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-                cbeend.fChanged = FALSE;
-                cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                                                     CB_GETCURSEL, 0, 0);
-                cbeend.iWhy = CBENF_KILLFOCUS;
-
-                COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text);
-            }
-            /* fall through */
+        /*
+         * do NOTIFY CBEN_ENDEDIT with CBENF_KILLFOCUS
+         */
+        infoPtr->flags &= ~WCBE_EDITFOCUSED;
+        if (infoPtr->flags & WCBE_ACTEDIT) {
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+
+        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+        cbeend.fChanged = FALSE;
+        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                             CB_GETCURSEL, 0, 0);
+        cbeend.iWhy = CBENF_KILLFOCUS;
+
+        COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text);
+        }
+        /* fall through */
 
     default:
-            return CallWindowProcA (infoPtr->prevEditWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        return CallWindowProcA (infoPtr->prevEditWndProc,
+                   hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2102 +2103 @@
     WCHAR edit_text[260];
 
-    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n", 
-          hwnd, uMsg, wParam, lParam, infoPtr);
+    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
+      hwnd, uMsg, wParam, lParam, infoPtr);
 
     if (!infoPtr) return 0;
@@ -2111 +2112 @@
 
     case CB_FINDSTRINGEXACT:
-            return COMBOEX_FindStringExact (infoPtr, wParam, lParam);
+        return COMBOEX_FindStringExact (infoPtr, wParam, lParam);
 
     case WM_DRAWITEM:
-            /*
-             * The only way this message should come is from the
-             * child Listbox issuing the message. Flag this so
-             * that ComboEx knows this is listbox.
-             */
-            ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX;
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        /*
+         * The only way this message should come is from the
+         * child Listbox issuing the message. Flag this so
+         * that ComboEx knows this is listbox.
+         */
+        ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX;
+        return CallWindowProcA (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;
-            nbkc = GetSysColor (COLOR_WINDOW);
-            obkc = SetBkColor (hDC, nbkc);
+        nbkc = GetSysColor (COLOR_WINDOW);
+        obkc = SetBkColor (hDC, nbkc);
             GetClientRect (hwnd, &rect);
-            TRACE("erasing (%d,%d)-(%d,%d)\n",
-                  rect.left, rect.top, rect.right, rect.bottom);
-            ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
+        TRACE("erasing (%d,%d)-(%d,%d)\n",
+          rect.left, rect.top, rect.right, rect.bottom);
+        ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        return CallWindowProcA (infoPtr->prevComboWndProc,
+                   hwnd, uMsg, wParam, lParam);
 
     case WM_SETCURSOR:
-            /*
-             *  WM_NOTIFY to comboex parent (rebar)
-             *   with NM_SETCURSOR with extra words of 0,0,0,0,0x02010001
-             *  CallWindowProc (previous)
-             */
-            nmmse.dwItemSpec = 0;
-            nmmse.dwItemData = 0;
-            nmmse.pt.x = 0;
-            nmmse.pt.y = 0;
-            nmmse.dwHitInfo = lParam;
-            COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse);
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        /*
+         *  WM_NOTIFY to comboex parent (rebar)
+         *   with NM_SETCURSOR with extra words of 0,0,0,0,0x02010001
+         *  CallWindowProc (previous)
+         */
+        nmmse.dwItemSpec = 0;
+        nmmse.dwItemData = 0;
+        nmmse.pt.x = 0;
+        nmmse.pt.y = 0;
+        nmmse.dwHitInfo = lParam;
+        COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse);
+        return CallWindowProcA (infoPtr->prevComboWndProc,
+                   hwnd, uMsg, wParam, lParam);
 
     case WM_COMMAND:
-            switch (HIWORD(wParam)) {
-
-            case EN_UPDATE:
-                /* traces show that COMBOEX does not issue CBN_EDITUPDATE
-                 * on the EN_UPDATE
-                 */
-                return 0;
-
-            case EN_KILLFOCUS:
-                /*
-                 * Native does:
-                 *
-                 *  GetFocus() retns AA
-                 *  GetWindowTextA(Edit)
-                 *  CB_GETCURSEL(Combo) (got -1)
-                 *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
-                 *  CB_GETCURSEL(Combo) (got -1)
-                 *  InvalidateRect(Combo, 0, 0)
-                 *  WM_KILLFOCUS(Combo, AA)
-                 *  return 0;
-                 */
-                focusedhwnd = GetFocus();
-                if (infoPtr->flags & WCBE_ACTEDIT) {
-                    GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-                    cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
-                    cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                                                         CB_GETCURSEL, 0, 0);
-                    cbeend.iWhy = CBENF_KILLFOCUS;
-
-                    infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-                    if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-                        /* abort the change */
-                        TRACE("Notify requested abort of change\n");
-                        return 0;
-                    }
-                }
-                /* possible CB_GETCURSEL */
-                InvalidateRect (infoPtr->hwndCombo, 0, 0);
-                if (focusedhwnd)
-                    SendMessageW (infoPtr->hwndCombo, WM_KILLFOCUS,
-                                  (WPARAM)focusedhwnd, 0); 
-                return 0;
-
-            case EN_SETFOCUS: {
-                /* 
-                 * For EN_SETFOCUS this issues the same calls and messages
-                 *  as the native seems to do.
-                 *
-                 * for some cases however native does the following:
-                 *   (noticed after SetFocus during LBUTTONDOWN on
-                 *    on dropdown arrow)
-                 *  WM_GETTEXTLENGTH (Edit);
-                 *  WM_GETTEXT (Edit, len+1, str);
-                 *  EM_SETSEL (Edit, 0, 0);
-                 *  WM_GETTEXTLENGTH (Edit);
-                 *  WM_GETTEXT (Edit, len+1, str);
-                 *  EM_SETSEL (Edit, 0, len);
-                 *  WM_NOTIFY (parent, CBEN_BEGINEDIT)
-                 */
-                NMHDR hdr;
-
-                SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
-                SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
-                COMBOEX_Notify (infoPtr, CBEN_BEGINEDIT, &hdr);
-                infoPtr->flags |= WCBE_ACTEDIT;
-                infoPtr->flags &= ~WCBE_EDITCHG; /* no change yet */
-                return 0;
-                }
-
-            case EN_CHANGE: {
-                /* 
-                 * For EN_CHANGE this issues the same calls and messages
-                 *  as the native seems to do.
-                 */
-                WCHAR edit_text[260];
-                WCHAR *lastwrk;
-                INT selected, cnt;
-                CBE_ITEMDATA *item;
-
-                selected = SendMessageW (infoPtr->hwndCombo,
-                                         CB_GETCURSEL, 0, 0);
-
-                /* lstrlenA( lastworkingURL ) */
-
-                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-                if (selected == -1) {
-                    lastwrk = infoPtr->edit->pszText;
-                    cnt = lstrlenW (lastwrk);
-                    if (cnt >= 259) cnt = 259;
-                }
-                else {
-                    item = COMBOEX_FindItem (infoPtr, selected);
-                    cnt = lstrlenW (item->pszText);
-                    lastwrk = item->pszText;
-                    if (cnt >= 259) cnt = 259;
-                }
-
-                TRACE("handling EN_CHANGE, selected = %d, selected_text=%s\n",
-                    selected, debugstr_w(lastwrk));
-                TRACE("handling EN_CHANGE, edittext=%s\n",
-                      debugstr_w(edit_text));
-
-                /* lstrcmpiW is between lastworkingURL and GetWindowText */
-
-                if (lstrcmpiW (lastwrk, edit_text)) {
-                    /* strings not equal -- indicate edit has changed */
-                    infoPtr->flags |= WCBE_EDITCHG;
-                }
-                SendMessageW ( GetParent(infoPtr->hwndSelf), WM_COMMAND,
-                               MAKEWPARAM(GetDlgCtrlID (infoPtr->hwndSelf),
-                                          CBN_EDITCHANGE),
-                               infoPtr->hwndSelf);
-                return 0;
-                }
-
-            case LBN_SELCHANGE:
-                /*
-                 * Therefore from traces there is no additional code here
-                 */
-
-                /*
-                 * Using native COMCTL32 gets the following:
-                 *  1 == SHDOCVW.DLL  issues call/message
-                 *  2 == COMCTL32.DLL  issues call/message
-                 *  3 == WINE  issues call/message
-                 *
-                 *
-                 * for LBN_SELCHANGE:
-                 *    1  CB_GETCURSEL(ComboEx)
-                 *    1  CB_GETDROPPEDSTATE(ComboEx)
-                 *    1  CallWindowProc( *2* for WM_COMMAND(LBN_SELCHANGE)
-                 *    2  CallWindowProc( *3* for WM_COMMAND(LBN_SELCHANGE)
-                 **   call CBRollUp( xxx, TRUE for LBN_SELCHANGE, TRUE)
-                 *    3  WM_COMMAND(ComboEx, CBN_SELENDOK)
-                 *      WM_USER+49(ComboLB, 1,0)  <=============!!!!!!!!!!!
-                 *    3  ShowWindow(ComboLB, SW_HIDE)
-                 *    3  RedrawWindow(Combo,  RDW_UPDATENOW)
-                 *    3  WM_COMMAND(ComboEX, CBN_CLOSEUP)
-                 **   end of CBRollUp
-                 *    3  WM_COMMAND(ComboEx, CBN_SELCHANGE)  (echo to parent)
-                 *    ?  LB_GETCURSEL              <==|
-                 *    ?  LB_GETTEXTLEN                |
-                 *    ?  LB_GETTEXT                   | Needs to be added to
-                 *    ?  WM_CTLCOLOREDIT(ComboEx)     | Combo processing
-                 *    ?  LB_GETITEMDATA               |
-                 *    ?  WM_DRAWITEM(ComboEx)      <==|
-                 */
-            default:
-                break;
-            }/* fall through */
+        switch (HIWORD(wParam)) {
+
+        case EN_UPDATE:
+        /* traces show that COMBOEX does not issue CBN_EDITUPDATE
+         * on the EN_UPDATE
+         */
+        return 0;
+
+        case EN_KILLFOCUS:
+        /*
+         * Native does:
+         *
+         *  GetFocus() retns AA
+         *  GetWindowTextA(Edit)
+         *  CB_GETCURSEL(Combo) (got -1)
+         *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
+         *  CB_GETCURSEL(Combo) (got -1)
+         *  InvalidateRect(Combo, 0, 0)
+         *  WM_KILLFOCUS(Combo, AA)
+         *  return 0;
+         */
+        focusedhwnd = GetFocus();
+        if (infoPtr->flags & WCBE_ACTEDIT) {
+            GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+            cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
+            cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                             CB_GETCURSEL, 0, 0);
+            cbeend.iWhy = CBENF_KILLFOCUS;
+
+            infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
+            /* abort the change */
+            TRACE("Notify requested abort of change\n");
+            return 0;
+            }
+        }
+        /* possible CB_GETCURSEL */
+        InvalidateRect (infoPtr->hwndCombo, 0, 0);
+        if (focusedhwnd)
+            SendMessageW (infoPtr->hwndCombo, WM_KILLFOCUS,
+                  (WPARAM)focusedhwnd, 0);
+        return 0;
+
+        case EN_SETFOCUS: {
+        /*
+         * For EN_SETFOCUS this issues the same calls and messages
+         *  as the native seems to do.
+         *
+         * for some cases however native does the following:
+         *   (noticed after SetFocus during LBUTTONDOWN on
+         *    on dropdown arrow)
+         *  WM_GETTEXTLENGTH (Edit);
+         *  WM_GETTEXT (Edit, len+1, str);
+         *  EM_SETSEL (Edit, 0, 0);
+         *  WM_GETTEXTLENGTH (Edit);
+         *  WM_GETTEXT (Edit, len+1, str);
+         *  EM_SETSEL (Edit, 0, len);
+         *  WM_NOTIFY (parent, CBEN_BEGINEDIT)
+         */
+        NMHDR hdr;
+
+        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
+        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
+        COMBOEX_Notify (infoPtr, CBEN_BEGINEDIT, &hdr);
+        infoPtr->flags |= WCBE_ACTEDIT;
+        infoPtr->flags &= ~WCBE_EDITCHG; /* no change yet */
+        return 0;
+            }
+
+        case EN_CHANGE: {
+        /*
+         * For EN_CHANGE this issues the same calls and messages
+         *  as the native seems to do.
+         */
+        WCHAR edit_text[260];
+        WCHAR *lastwrk;
+        INT selected, cnt;
+        CBE_ITEMDATA *item;
+
+        selected = SendMessageW (infoPtr->hwndCombo,
+                     CB_GETCURSEL, 0, 0);
+
+        /* lstrlenA( lastworkingURL ) */
+
+        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+        if (selected == -1) {
+            lastwrk = infoPtr->edit->pszText;
+            cnt = lstrlenW (lastwrk);
+            if (cnt >= 259) cnt = 259;
+        }
+        else {
+            item = COMBOEX_FindItem (infoPtr, selected);
+            cnt = lstrlenW (item->pszText);
+            lastwrk = item->pszText;
+            if (cnt >= 259) cnt = 259;
+        }
+
+        TRACE("handling EN_CHANGE, selected = %d, selected_text=%s\n",
+            selected, debugstr_w(lastwrk));
+        TRACE("handling EN_CHANGE, edittext=%s\n",
+              debugstr_w(edit_text));
+
+        /* lstrcmpiW is between lastworkingURL and GetWindowText */
+
+        if (lstrcmpiW (lastwrk, edit_text)) {
+            /* strings not equal -- indicate edit has changed */
+            infoPtr->flags |= WCBE_EDITCHG;
+        }
+        SendMessageW ( GetParent(infoPtr->hwndSelf), WM_COMMAND,
+                   MAKEWPARAM(GetDlgCtrlID (infoPtr->hwndSelf),
+                      CBN_EDITCHANGE),
+                   infoPtr->hwndSelf);
+        return 0;
+            }
+
+        case LBN_SELCHANGE:
+        /*
+         * Therefore from traces there is no additional code here
+         */
+
+        /*
+         * Using native COMCTL32 gets the following:
+         *  1 == SHDOCVW.DLL  issues call/message
+         *  2 == COMCTL32.DLL  issues call/message
+         *  3 == WINE  issues call/message
+         *
+         *
+         * for LBN_SELCHANGE:
+         *    1  CB_GETCURSEL(ComboEx)
+         *    1  CB_GETDROPPEDSTATE(ComboEx)
+         *    1  CallWindowProc( *2* for WM_COMMAND(LBN_SELCHANGE)
+         *    2  CallWindowProc( *3* for WM_COMMAND(LBN_SELCHANGE)
+         **   call CBRollUp( xxx, TRUE for LBN_SELCHANGE, TRUE)
+         *    3  WM_COMMAND(ComboEx, CBN_SELENDOK)
+         *      WM_USER+49(ComboLB, 1,0)  <=============!!!!!!!!!!!
+         *    3  ShowWindow(ComboLB, SW_HIDE)
+         *    3  RedrawWindow(Combo,  RDW_UPDATENOW)
+         *    3  WM_COMMAND(ComboEX, CBN_CLOSEUP)
+         **   end of CBRollUp
+         *    3  WM_COMMAND(ComboEx, CBN_SELCHANGE)  (echo to parent)
+         *    ?  LB_GETCURSEL              <==|
+         *    ?  LB_GETTEXTLEN                |
+         *    ?  LB_GETTEXT                   | Needs to be added to
+         *    ?  WM_CTLCOLOREDIT(ComboEx)     | Combo processing
+         *    ?  LB_GETITEMDATA               |
+         *    ?  WM_DRAWITEM(ComboEx)      <==|
+         */
+        default:
+        break;
+        }/* fall through */
     default:
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
-                                   hwnd, uMsg, wParam, lParam);
+        return CallWindowProcA (infoPtr->prevComboWndProc,
+                   hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2320 +2321 @@
 
     if (!COMBOEX_GetInfoPtr (hwnd)) {
-        if (uMsg == WM_CREATE)
-            return COMBOEX_Create (hwnd, wParam, lParam);
-        if (uMsg == WM_NCCREATE)
-            COMBOEX_NCCreate (hwnd, wParam, lParam);
+    if (uMsg == WM_CREATE)
+        return COMBOEX_Create (hwnd, wParam, lParam);
+    if (uMsg == WM_NCCREATE)
+        COMBOEX_NCCreate (hwnd, wParam, lParam);
         return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
@@ -2330 +2331 @@
     {
         case CBEM_DELETEITEM:  /* maps to CB_DELETESTRING */
-            return COMBOEX_DeleteItem (hwnd, wParam, lParam);
-
-        case CBEM_GETCOMBOCONTROL:
-            return COMBOEX_GetComboControl (hwnd, wParam, lParam);
-
-        case CBEM_GETEDITCONTROL:
-            return COMBOEX_GetEditControl (hwnd, wParam, lParam);
-
-        case CBEM_GETEXTENDEDSTYLE:
-            return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
-
-        case CBEM_GETIMAGELIST:
-            return COMBOEX_GetImageList (hwnd, wParam, lParam);
-
-        case CBEM_GETITEMA:
-            return COMBOEX_GetItemA (hwnd, wParam, lParam);
-
-        case CBEM_GETITEMW:
-            return COMBOEX_GetItemW (hwnd, wParam, lParam);
-
-        case CBEM_GETUNICODEFORMAT:
-            return COMBOEX_GetUnicodeFormat (hwnd, wParam, lParam);
-
-        case CBEM_HASEDITCHANGED:
-            return COMBOEX_HasEditChanged (hwnd, wParam, lParam);
-
-        case CBEM_INSERTITEMA:
-            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
-
-        case CBEM_INSERTITEMW:
-            return COMBOEX_InsertItemW (hwnd, wParam, lParam);
-
-        case CBEM_SETEXSTYLE:   /* FIXME: obsoleted, should be the same as: */
-        case CBEM_SETEXTENDEDSTYLE:
-            return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
-
-        case CBEM_SETIMAGELIST:
-            return COMBOEX_SetImageList (hwnd, wParam, lParam);
-
-        case CBEM_SETITEMA:
-            return COMBOEX_SetItemA (hwnd, wParam, lParam);
-
-        case CBEM_SETITEMW:
-            return COMBOEX_SetItemW (hwnd, wParam, lParam);
-
-        case CBEM_SETUNICODEFORMAT:
-            return COMBOEX_SetUnicodeFormat (hwnd, wParam, lParam);
+        return COMBOEX_DeleteItem (hwnd, wParam, lParam);
+
+    case CBEM_GETCOMBOCONTROL:
+        return COMBOEX_GetComboControl (hwnd, wParam, lParam);
+
+    case CBEM_GETEDITCONTROL:
+        return COMBOEX_GetEditControl (hwnd, wParam, lParam);
+
+    case CBEM_GETEXTENDEDSTYLE:
+        return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
+
+    case CBEM_GETIMAGELIST:
+        return COMBOEX_GetImageList (hwnd, wParam, lParam);
+
+    case CBEM_GETITEMA:
+        return COMBOEX_GetItemA (hwnd, wParam, lParam);
+
+    case CBEM_GETITEMW:
+        return COMBOEX_GetItemW (hwnd, wParam, lParam);
+
+    case CBEM_GETUNICODEFORMAT:
+        return COMBOEX_GetUnicodeFormat (hwnd, wParam, lParam);
+
+    case CBEM_HASEDITCHANGED:
+        return COMBOEX_HasEditChanged (hwnd, wParam, lParam);
+
+    case CBEM_INSERTITEMA:
+        return COMBOEX_InsertItemA (hwnd, wParam, lParam);
+
+    case CBEM_INSERTITEMW:
+        return COMBOEX_InsertItemW (hwnd, wParam, lParam);
+
+    case CBEM_SETEXSTYLE:   /* FIXME: obsoleted, should be the same as: */
+    case CBEM_SETEXTENDEDSTYLE:
+        return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
+
+    case CBEM_SETIMAGELIST:
+        return COMBOEX_SetImageList (hwnd, wParam, lParam);
+
+    case CBEM_SETITEMA:
+        return COMBOEX_SetItemA (hwnd, wParam, lParam);
+
+    case CBEM_SETITEMW:
+        return COMBOEX_SetItemW (hwnd, wParam, lParam);
+
+    case CBEM_SETUNICODEFORMAT:
+        return COMBOEX_SetUnicodeFormat (hwnd, wParam, lParam);
 
 
 /*   Combo messages we are not sure if we need to process or just forward */
-        case CB_GETDROPPEDCONTROLRECT:
-        case CB_GETITEMHEIGHT:
-        case CB_GETLBTEXT:
-        case CB_GETLBTEXTLEN:
-        case CB_GETEXTENDEDUI:
-        case CB_LIMITTEXT:
-        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);
-            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
+    case CB_GETDROPPEDCONTROLRECT:
+    case CB_GETITEMHEIGHT:
+    case CB_GETLBTEXT:
+    case CB_GETLBTEXTLEN:
+    case CB_GETEXTENDEDUI:
+    case CB_LIMITTEXT:
+    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);
+        return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
 
 /*   Combo messages OK to just forward to the regular COMBO */
-        case CB_GETCOUNT:        
-        case CB_GETCURSEL:
-        case CB_GETDROPPEDSTATE:
+    case CB_GETCOUNT:
+    case CB_GETCURSEL:
+    case CB_GETDROPPEDSTATE:
         case CB_SETDROPPEDWIDTH:
         case CB_SETEXTENDEDUI:
         case CB_SHOWDROPDOWN:
-            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
+        return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
 
 /*   Combo messages we need to process specially */
         case CB_FINDSTRINGEXACT:
-            return COMBOEX_FindStringExact (COMBOEX_GetInfoPtr (hwnd), 
-                                            wParam, lParam);
-
-        case CB_GETITEMDATA:
-            return COMBOEX_GetItemData (hwnd, wParam, lParam);
-
-        case CB_SETCURSEL:
-            return COMBOEX_SetCursel (hwnd, wParam, lParam);
-
-        case CB_SETITEMDATA:
-            return COMBOEX_SetItemData (hwnd, wParam, lParam);
-
-        case CB_SETITEMHEIGHT:
-            return COMBOEX_SetItemHeight (hwnd, wParam, lParam);
+        return COMBOEX_FindStringExact (COMBOEX_GetInfoPtr (hwnd),
+                        wParam, lParam);
+
+    case CB_GETITEMDATA:
+        return COMBOEX_GetItemData (hwnd, wParam, lParam);
+
+    case CB_SETCURSEL:
+        return COMBOEX_SetCursel (hwnd, wParam, lParam);
+
+    case CB_SETITEMDATA:
+        return COMBOEX_SetItemData (hwnd, wParam, lParam);
+
+    case CB_SETITEMHEIGHT:
+        return COMBOEX_SetItemHeight (hwnd, wParam, lParam);
 
 
 
 /*   Window messages passed to parent */
-        case WM_COMMAND:
-            return COMBOEX_Command (hwnd, wParam, lParam);
-
-        case WM_NOTIFY:
-            if (infoPtr->NtfUnicode)
-                return SendMessageW (GetParent (hwnd),
-                                     uMsg, wParam, lParam);
-            else
-                return SendMessageA (GetParent (hwnd),
-                                     uMsg, wParam, lParam);
+    case WM_COMMAND:
+        return COMBOEX_Command (hwnd, wParam, lParam);
+
+    case WM_NOTIFY:
+        if (infoPtr->NtfUnicode)
+        return SendMessageW (GetParent (hwnd),
+                     uMsg, wParam, lParam);
+        else
+        return SendMessageA (GetParent (hwnd),
+                     uMsg, wParam, lParam);
 
 
 /*   Window messages we need to process */
         case WM_DELETEITEM:
-            return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
+        return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
 
         case WM_DRAWITEM:
             return COMBOEX_DrawItem (hwnd, wParam, lParam);
 
-        case WM_DESTROY:
-            return COMBOEX_Destroy (hwnd, wParam, lParam);
+    case WM_DESTROY:
+        return COMBOEX_Destroy (hwnd, wParam, lParam);
 
         case WM_MEASUREITEM:
@@ -2449 +2450 @@
 
         case WM_NOTIFYFORMAT:
-            return COMBOEX_NotifyFormat (hwnd, wParam, lParam);
-
-        case WM_SIZE:
-            return COMBOEX_Size (hwnd, wParam, lParam);
+        return COMBOEX_NotifyFormat (hwnd, wParam, lParam);
+
+    case WM_SIZE:
+        return COMBOEX_Size (hwnd, wParam, lParam);
 
         case WM_WINDOWPOSCHANGING:
-            return COMBOEX_WindowPosChanging (hwnd, wParam, lParam);
-
-        default:
-            if (uMsg >= WM_USER)
-                ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-                     uMsg, wParam, lParam);
+        return COMBOEX_WindowPosChanging (hwnd, wParam, lParam);
+
+    default:
+        if (uMsg >= WM_USER)
+        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+             uMsg, wParam, lParam);
 #ifdef __WIN32OS2__
             return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
 #else
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 #endif
     }
@@ -2484 +2485 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_COMBOBOXEXA;
- 
+
     RegisterClassA (&wndClass);