Changeset 10216 for trunk/src

Timestamp:

Aug 8, 2003, 3:30:22 PM (22 years ago)

Author:

sandervl

Message:

KOM: WM_IME_CHAR generation + processing added for DBCS input

Location:

trunk/src/user32

Files:

• combo.c (modified) (52 diffs)
• edit.c (modified) (4 diffs)
• listbox.c (modified) (2 diffs)
• oslibmsg.cpp (modified) (9 diffs)
• oslibmsg.h (modified) (3 diffs)
• oslibmsgtranslate.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (3 diffs)
• windowmsg.cpp (modified) (12 diffs)

trunk/src/user32/combo.c

@@ -49 +49 @@
  * Drawing globals
  */
-static HBITMAP  hComboBmp = 0;
-static UINT     CBitHeight, CBitWidth;
+static HBITMAP  hComboBmp = 0;
+static UINT CBitHeight, CBitWidth;
 
 /*
@@ -87 +87 @@
 static BOOL COMBO_Init()
 {
-  HDC           hDC;
+  HDC       hDC;
 
   if( hComboBmp ) return TRUE;
   if( (hDC = CreateCompatibleDC(0)) )
   {
-    BOOL        bRet = FALSE;
+    BOOL    bRet = FALSE;
     if( (hComboBmp = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_COMBO))) )
     {
@@ -131 +131 @@
        /* some braindead apps do try to use scrollbar/border flags */
 
-        lphc->dwStyle = style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL);
+    lphc->dwStyle = style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL);
         SetWindowLongA( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL) );
 
-        /*
-         * We also have to remove the client edge style to make sure
-         * we don't end-up with a non client area.
-         */
+    /*
+     * We also have to remove the client edge style to make sure
+     * we don't end-up with a non client area.
+     */
         SetWindowLongA( hwnd, GWL_EXSTYLE,
                         GetWindowLongA( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE );
 
-        if( !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) )
+    if( !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) )
               lphc->dwStyle |= CBS_HASSTRINGS;
-        if( !(GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) )
-              lphc->wState |= CBF_NOTIFY;
+    if( !(GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) )
+          lphc->wState |= CBF_NOTIFY;
 
         TRACE("[%p], style = %08x\n", lphc, lphc->dwStyle );
@@ -163 +163 @@
 
        if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox )
-           DestroyWindow( lphc->hWndLBox );
+       DestroyWindow( lphc->hWndLBox );
 
        SetWindowLongA( lphc->self, 0, 0 );
@@ -303 +303 @@
    */
   SetWindowPos( lphc->self,
-                (HWND)NULL,
-                0, 0,
-                windowRect.right  - windowRect.left,
-                newComboHeight,
-                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
+        (HWND)NULL,
+        0, 0,
+        windowRect.right  - windowRect.left,
+        newComboHeight,
+        SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
 }
 
@@ -405 +405 @@
        */
       if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
-        lprLB->right -= COMBO_EDITBUTTONSPACE();
+    lprLB->right -= COMBO_EDITBUTTONSPACE();
     }
     else
@@ -412 +412 @@
 
   TRACE("\ttext\t= (%i,%i-%i,%i)\n",
-        lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom);
+    lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom);
 
   TRACE("\tbutton\t= (%i,%i-%i,%i)\n",
-        lprButton->left, lprButton->top, lprButton->right, lprButton->bottom);
+    lprButton->left, lprButton->top, lprButton->right, lprButton->bottom);
 
   TRACE("\tlbox\t= (%i,%i-%i,%i)\n",
-        lprLB->left, lprLB->top, lprLB->right, lprLB->bottom );
+    lprLB->left, lprLB->top, lprLB->right, lprLB->bottom );
 }
 
@@ -468 +468 @@
     if (posChanging->cy != newComboHeight)
     {
-        TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n",
-              posChanging->cy, newComboHeight, lphc->droppedRect.bottom,
-              lphc->droppedRect.top);
+    TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n",
+          posChanging->cy, newComboHeight, lphc->droppedRect.bottom,
+          lphc->droppedRect.top);
       lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight;
 
@@ -524 +524 @@
       if ( CB_GETTYPE(lphc) != CBS_SIMPLE )
       {
-        lphc->droppedRect.top   = lphc->textRect.bottom + COMBO_YBORDERSIZE();
-
-        /*
-         * If it's a dropdown, the listbox is offset
-         */
-        if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
-          lphc->droppedRect.left += COMBO_EDITBUTTONSPACE();
-
-        ClientToScreen(hwnd, (LPPOINT)&lphc->droppedRect);
-        ClientToScreen(hwnd, (LPPOINT)&lphc->droppedRect.right);
+    lphc->droppedRect.top   = lphc->textRect.bottom + COMBO_YBORDERSIZE();
+
+    /*
+     * If it's a dropdown, the listbox is offset
+     */
+    if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
+      lphc->droppedRect.left += COMBO_EDITBUTTONSPACE();
+
+    ClientToScreen(hwnd, (LPPOINT)&lphc->droppedRect);
+    ClientToScreen(hwnd, (LPPOINT)&lphc->droppedRect.right);
       }
 
@@ -542 +542 @@
 
       if( lphc->dwStyle & CBS_SORT )
-        lbeStyle |= LBS_SORT;
+    lbeStyle |= LBS_SORT;
       if( lphc->dwStyle & CBS_HASSTRINGS )
-        lbeStyle |= LBS_HASSTRINGS;
+    lbeStyle |= LBS_HASSTRINGS;
       if( lphc->dwStyle & CBS_NOINTEGRALHEIGHT )
-        lbeStyle |= LBS_NOINTEGRALHEIGHT;
+    lbeStyle |= LBS_NOINTEGRALHEIGHT;
       if( lphc->dwStyle & CBS_DISABLENOSCROLL )
-        lbeStyle |= LBS_DISABLENOSCROLL;
-
-      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
+    lbeStyle |= LBS_DISABLENOSCROLL;
+
+      if( CB_GETTYPE(lphc) == CBS_SIMPLE )  /* child listbox */
       {
-        lbeStyle |= WS_VISIBLE;
-
-        /*
-         * In win 95 look n feel, the listbox in the simple combobox has
-         * the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
-         */
-        if (TWEAK_WineLook > WIN31_LOOK)
-        {
-          lbeStyle   &= ~WS_BORDER;
-          lbeExStyle |= WS_EX_CLIENTEDGE;
-        }
+    lbeStyle |= WS_VISIBLE;
+
+    /*
+     * In win 95 look n feel, the listbox in the simple combobox has
+     * the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
+     */
+    if (TWEAK_WineLook > WIN31_LOOK)
+    {
+      lbeStyle   &= ~WS_BORDER;
+      lbeExStyle |= WS_EX_CLIENTEDGE;
+    }
       }
 
       lphc->hWndLBox = CreateWindowExW(lbeExStyle,
-                                       clbName,
-                                       NULL,
-                                       lbeStyle,
-                                       lphc->droppedRect.left,
-                                       lphc->droppedRect.top,
-                                       lphc->droppedRect.right - lphc->droppedRect.left,
-                                       lphc->droppedRect.bottom - lphc->droppedRect.top,
+                       clbName,
+                       NULL,
+                       lbeStyle,
+                       lphc->droppedRect.left,
+                       lphc->droppedRect.top,
+                       lphc->droppedRect.right - lphc->droppedRect.left,
+                       lphc->droppedRect.bottom - lphc->droppedRect.top,
                                        hwnd, (HMENU)ID_CB_LISTBOX,
                                        GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
@@ -578 +578 @@
       if( lphc->hWndLBox )
       {
-          BOOL  bEdit = TRUE;
-          lbeStyle = WS_CHILD | WS_VISIBLE | ES_NOHIDESEL | ES_LEFT | ES_COMBO;
-
-          /*
-           * In Win95 look, the border fo the edit control is
-           * provided by the combobox
-           */
-          if (TWEAK_WineLook == WIN31_LOOK)
-            lbeStyle |= WS_BORDER;
-
-          if( lphc->wState & CBF_EDIT )
-          {
-              if( lphc->dwStyle & CBS_OEMCONVERT )
-                  lbeStyle |= ES_OEMCONVERT;
-              if( lphc->dwStyle & CBS_AUTOHSCROLL )
-                  lbeStyle |= ES_AUTOHSCROLL;
-              if( lphc->dwStyle & CBS_LOWERCASE )
-                  lbeStyle |= ES_LOWERCASE;
-              else if( lphc->dwStyle & CBS_UPPERCASE )
-                  lbeStyle |= ES_UPPERCASE;
+      BOOL  bEdit = TRUE;
+      lbeStyle = WS_CHILD | WS_VISIBLE | ES_NOHIDESEL | ES_LEFT | ES_COMBO;
+
+      /*
+       * In Win95 look, the border fo the edit control is
+       * provided by the combobox
+       */
+      if (TWEAK_WineLook == WIN31_LOOK)
+        lbeStyle |= WS_BORDER;
+
+      if( lphc->wState & CBF_EDIT )
+      {
+          if( lphc->dwStyle & CBS_OEMCONVERT )
+          lbeStyle |= ES_OEMCONVERT;
+          if( lphc->dwStyle & CBS_AUTOHSCROLL )
+          lbeStyle |= ES_AUTOHSCROLL;
+          if( lphc->dwStyle & CBS_LOWERCASE )
+          lbeStyle |= ES_LOWERCASE;
+          else if( lphc->dwStyle & CBS_UPPERCASE )
+          lbeStyle |= ES_UPPERCASE;
 
               if (!IsWindowEnabled(hwnd)) lbeStyle |= WS_DISABLED;
 
-              lphc->hWndEdit = CreateWindowExW(0,
-                                               editName,
-                                               NULL,
-                                               lbeStyle,
-                                               lphc->textRect.left, lphc->textRect.top,
-                                               lphc->textRect.right - lphc->textRect.left,
-                                               lphc->textRect.bottom - lphc->textRect.top,
+          lphc->hWndEdit = CreateWindowExW(0,
+                           editName,
+                           NULL,
+                           lbeStyle,
+                           lphc->textRect.left, lphc->textRect.top,
+                           lphc->textRect.right - lphc->textRect.left,
+                           lphc->textRect.bottom - lphc->textRect.top,
                                                hwnd, (HMENU)ID_CB_EDIT,
                                                GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
 
-              if( !lphc->hWndEdit )
-                bEdit = FALSE;
-          }
+          if( !lphc->hWndEdit )
+        bEdit = FALSE;
+      }
 
           if( bEdit )
-          {
-            if( CB_GETTYPE(lphc) != CBS_SIMPLE )
-            {
+      {
+        if( CB_GETTYPE(lphc) != CBS_SIMPLE )
+        {
               /* Now do the trick with parent */
-              SetParent(lphc->hWndLBox, HWND_DESKTOP);
+          SetParent(lphc->hWndLBox, HWND_DESKTOP);
               /*
                * If the combo is a dropdown, we must resize the control
-               * to fit only the text area and button. To do this,
-               * we send a dummy resize and the WM_WINDOWPOSCHANGING message
-               * will take care of setting the height for us.
+           * to fit only the text area and button. To do this,
+           * we send a dummy resize and the WM_WINDOWPOSCHANGING message
+           * will take care of setting the height for us.
                */
-              CBForceDummyResize(lphc);
-            }
-
-            TRACE("init done\n");
-            return 0;
-          }
-          ERR("edit control failure.\n");
+          CBForceDummyResize(lphc);
+        }
+
+        TRACE("init done\n");
+        return 0;
+      }
+      ERR("edit control failure.\n");
       } else ERR("listbox failure.\n");
   } else ERR("no owner for visible combo.\n");
@@ -657 +657 @@
     if (TWEAK_WineLook == WIN31_LOOK)
     {
-        UINT      x, y;
-        BOOL      bBool;
-        HDC       hMemDC;
-        HBRUSH    hPrevBrush;
-        COLORREF  oldTextColor, oldBkColor;
-
-
-        hPrevBrush = SelectObject(hdc, GetSysColorBrush(COLOR_BTNFACE));
-
-        /*
-         * Draw the button background
-         */
-        PatBlt( hdc,
-                rectButton.left,
-                rectButton.top,
-                rectButton.right-rectButton.left,
-                rectButton.bottom-rectButton.top,
-                PATCOPY );
-
-        if( (bBool = lphc->wState & CBF_BUTTONDOWN) )
-        {
-            DrawEdge( hdc, &rectButton, EDGE_SUNKEN, BF_RECT );
-        }
-        else
-        {
-            DrawEdge( hdc, &rectButton, EDGE_RAISED, BF_RECT );
-        }
-
-        /*
-         * Remove the edge of the button from the rectangle
-         * and calculate the position of the bitmap.
-         */
-        InflateRect( &rectButton, -2, -2);
-
-        x = (rectButton.left + rectButton.right - CBitWidth) >> 1;
-        y = (rectButton.top + rectButton.bottom - CBitHeight) >> 1;
-
-
-        hMemDC = CreateCompatibleDC( hdc );
-        SelectObject( hMemDC, hComboBmp );
-        oldTextColor = SetTextColor( hdc, GetSysColor(COLOR_BTNFACE) );
-        oldBkColor = SetBkColor( hdc, CB_DISABLED(lphc) ? RGB(128,128,128) :
-                                 RGB(0,0,0) );
-        BitBlt( hdc, x, y, CBitWidth, CBitHeight, hMemDC, 0, 0, SRCCOPY );
-        SetBkColor( hdc, oldBkColor );
-        SetTextColor( hdc, oldTextColor );
-        DeleteDC( hMemDC );
-        SelectObject( hdc, hPrevBrush );
+        UINT      x, y;
+    BOOL      bBool;
+    HDC       hMemDC;
+    HBRUSH    hPrevBrush;
+    COLORREF  oldTextColor, oldBkColor;
+
+
+    hPrevBrush = SelectObject(hdc, GetSysColorBrush(COLOR_BTNFACE));
+
+    /*
+     * Draw the button background
+     */
+    PatBlt( hdc,
+        rectButton.left,
+        rectButton.top,
+        rectButton.right-rectButton.left,
+        rectButton.bottom-rectButton.top,
+        PATCOPY );
+
+    if( (bBool = lphc->wState & CBF_BUTTONDOWN) )
+    {
+        DrawEdge( hdc, &rectButton, EDGE_SUNKEN, BF_RECT );
+    }
+    else
+    {
+        DrawEdge( hdc, &rectButton, EDGE_RAISED, BF_RECT );
+    }
+
+    /*
+     * Remove the edge of the button from the rectangle
+     * and calculate the position of the bitmap.
+     */
+    InflateRect( &rectButton, -2, -2);
+
+    x = (rectButton.left + rectButton.right - CBitWidth) >> 1;
+    y = (rectButton.top + rectButton.bottom - CBitHeight) >> 1;
+
+
+    hMemDC = CreateCompatibleDC( hdc );
+    SelectObject( hMemDC, hComboBmp );
+    oldTextColor = SetTextColor( hdc, GetSysColor(COLOR_BTNFACE) );
+    oldBkColor = SetBkColor( hdc, CB_DISABLED(lphc) ? RGB(128,128,128) :
+                 RGB(0,0,0) );
+    BitBlt( hdc, x, y, CBitWidth, CBitHeight, hMemDC, 0, 0, SRCCOPY );
+    SetBkColor( hdc, oldBkColor );
+    SetTextColor( hdc, oldTextColor );
+    DeleteDC( hMemDC );
+    SelectObject( hdc, hPrevBrush );
     }
     else
@@ -710 +710 @@
         UINT buttonState = DFCS_SCROLLCOMBOBOX;
 
-        if (lphc->wState & CBF_BUTTONDOWN)
-        {
-            buttonState |= DFCS_PUSHED;
-        }
-
-        if (CB_DISABLED(lphc))
-        {
-          buttonState |= DFCS_INACTIVE;
-        }
-
-        DrawFrameControl(hdc,
-                         &rectButton,
-                         DFC_SCROLL,
-                         buttonState);
+    if (lphc->wState & CBF_BUTTONDOWN)
+    {
+        buttonState |= DFCS_PUSHED;
+    }
+
+    if (CB_DISABLED(lphc))
+    {
+      buttonState |= DFCS_INACTIVE;
+    }
+
+    DrawFrameControl(hdc,
+             &rectButton,
+             DFC_SCROLL,
+             buttonState);
     }
 }
@@ -737 +737 @@
   RECT        rectEdit)
 {
-   INT  id, size = 0;
+   INT  id, size = 0;
    LPWSTR pText = NULL;
 
@@ -751 +751 @@
         size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0);
         if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) )
-        {
+    {
             /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */
-            size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)id, (LPARAM)pText);
-            pText[size] = '\0'; /* just in case */
-        } else return;
+        size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)id, (LPARAM)pText);
+        pText[size] = '\0'; /* just in case */
+    } else return;
    }
    else
        if( !CB_OWNERDRAWN(lphc) )
-           return;
+       return;
 
    if( lphc->wState & CBF_EDIT )
    {
         static const WCHAR empty_stringW[] = { 0 };
-        if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW );
-        if( lphc->wState & CBF_FOCUSED )
-            SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));
+    if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW );
+    if( lphc->wState & CBF_FOCUSED )
+        SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));
    }
    else /* paint text field ourselves */
    {
-     UINT       itemState = ODS_COMBOBOXEDIT;
-     HFONT      hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;
+     UINT   itemState = ODS_COMBOBOXEDIT;
+     HFONT  hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;
 
      /*
@@ -786 +786 @@
        /* setup state for DRAWITEM message. Owner will highlight */
        if ( (lphc->wState & CBF_FOCUSED) &&
-            !(lphc->wState & CBF_DROPPED) )
-           itemState |= ODS_SELECTED | ODS_FOCUS;
+        !(lphc->wState & CBF_DROPPED) )
+       itemState |= ODS_SELECTED | ODS_FOCUS;
 
        /*
-        * Save the current clip region.
-        * To retrieve the clip region, we need to create one "dummy"
-        * clip region.
-        */
+    * Save the current clip region.
+    * To retrieve the clip region, we need to create one "dummy"
+    * clip region.
+    */
        clipRegion = CreateRectRgnIndirect(&rectEdit);
 
        if (GetClipRgn(hdc, clipRegion)!=1)
        {
-         DeleteObject(clipRegion);
-         clipRegion=(HRGN)NULL;
+     DeleteObject(clipRegion);
+     clipRegion=(HRGN)NULL;
        }
 
        if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED;
 
-       dis.CtlType      = ODT_COMBOBOX;
-       dis.CtlID        = ctlid;
-       dis.hwndItem     = lphc->self;
-       dis.itemAction   = ODA_DRAWENTIRE;
-       dis.itemID       = id;
-       dis.itemState    = itemState;
-       dis.hDC          = hdc;
-       dis.rcItem       = rectEdit;
-       dis.itemData     = SendMessageW(lphc->hWndLBox, LB_GETITEMDATA,
-                                        (WPARAM)id, 0 );
+       dis.CtlType  = ODT_COMBOBOX;
+       dis.CtlID    = ctlid;
+       dis.hwndItem = lphc->self;
+       dis.itemAction   = ODA_DRAWENTIRE;
+       dis.itemID   = id;
+       dis.itemState    = itemState;
+       dis.hDC      = hdc;
+       dis.rcItem   = rectEdit;
+       dis.itemData = SendMessageW(lphc->hWndLBox, LB_GETITEMDATA,
+                    (WPARAM)id, 0 );
 
        /*
-        * Clip the DC and have the parent draw the item.
-        */
+    * Clip the DC and have the parent draw the item.
+    */
        IntersectClipRect(hdc,
-                         rectEdit.left,  rectEdit.top,
-                         rectEdit.right, rectEdit.bottom);
+             rectEdit.left,  rectEdit.top,
+             rectEdit.right, rectEdit.bottom);
 
        SendMessageW(lphc->owner, WM_DRAWITEM, ctlid, (LPARAM)&dis );
 
        /*
-        * Reset the clipping region.
-        */
+    * Reset the clipping region.
+    */
        SelectClipRgn(hdc, clipRegion);
      }
@@ -834 +834 @@
 
        if ( (lphc->wState & CBF_FOCUSED) &&
-            !(lphc->wState & CBF_DROPPED) ) {
-
-           /* highlight */
-           FillRect( hdc, &rectEdit, GetSysColorBrush(COLOR_HIGHLIGHT) );
-           SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) );
-           SetTextColor( hdc, GetSysColor( COLOR_HIGHLIGHTTEXT ) );
+        !(lphc->wState & CBF_DROPPED) ) {
+
+       /* highlight */
+       FillRect( hdc, &rectEdit, GetSysColorBrush(COLOR_HIGHLIGHT) );
+       SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) );
+       SetTextColor( hdc, GetSysColor( COLOR_HIGHLIGHTTEXT ) );
        }
 
        ExtTextOutW( hdc,
-                    rectEdit.left + 1,
-                    rectEdit.top + 1,
-                    ETO_OPAQUE | ETO_CLIPPED,
-                    &rectEdit,
-                    pText ? pText : empty_stringW , size, NULL );
+            rectEdit.left + 1,
+            rectEdit.top + 1,
+            ETO_OPAQUE | ETO_CLIPPED,
+            &rectEdit,
+            pText ? pText : empty_stringW , size, NULL );
 
        if(lphc->wState & CBF_FOCUSED && !(lphc->wState & CBF_DROPPED))
-         DrawFocusRect( hdc, &rectEdit );
+     DrawFocusRect( hdc, &rectEdit );
      }
 
@@ -857 +857 @@
    }
    if (pText)
-        HeapFree( GetProcessHeap(), 0, pText );
+    HeapFree( GetProcessHeap(), 0, pText );
 }
 
@@ -943 +943 @@
 {
   HBRUSH  hBkgBrush;
-  HDC     hDC;
+  HDC     hDC;
 
   if(lphc->wState & CBF_EDIT)
@@ -949 +949 @@
 
   hDC = (hParamDC) ? hParamDC
-                   : GetDC(hwnd);
+           : GetDC(hwnd);
   /*
    * Retrieve the background brush
@@ -969 +969 @@
 {
   PAINTSTRUCT ps;
-  HDC   hDC;
+  HDC   hDC;
 
   hDC = (hParamDC) ? hParamDC
-                   : BeginPaint( lphc->self, &ps);
+           : BeginPaint( lphc->self, &ps);
 
   TRACE("hdc=%04x\n", hDC);
@@ -978 +978 @@
   if( hDC && !(lphc->wState & CBF_NOREDRAW) )
   {
-      HBRUSH    hPrevBrush, hBkgBrush;
+      HBRUSH    hPrevBrush, hBkgBrush;
 
       /*
@@ -993 +993 @@
       if (TWEAK_WineLook != WIN31_LOOK)
       {
-        CBPaintBorder(lphc->self, lphc, hDC);
+    CBPaintBorder(lphc->self, lphc, hDC);
       }
 
       if( !IsRectEmpty(&lphc->buttonRect) )
       {
-        CBPaintButton(lphc, hDC, lphc->buttonRect);
+    CBPaintButton(lphc, hDC, lphc->buttonRect);
       }
 
@@ -1013 +1013 @@
       if( !(lphc->wState & CBF_EDIT) )
       {
-        /*
-         * The text area has a border only in Win 3.1 look.
-         */
-        if (TWEAK_WineLook == WIN31_LOOK)
-        {
-          HPEN hPrevPen = SelectObject( hDC, GetSysColorPen(COLOR_WINDOWFRAME) );
-
-          Rectangle( hDC,
-                     lphc->textRect.left, lphc->textRect.top,
-                     lphc->textRect.right - 1, lphc->textRect.bottom - 1);
-
-          SelectObject( hDC, hPrevPen );
-        }
-
-        CBPaintText( lphc, hDC, lphc->textRect);
+    /*
+     * The text area has a border only in Win 3.1 look.
+     */
+    if (TWEAK_WineLook == WIN31_LOOK)
+    {
+      HPEN hPrevPen = SelectObject( hDC, GetSysColorPen(COLOR_WINDOWFRAME) );
+
+      Rectangle( hDC,
+             lphc->textRect.left, lphc->textRect.top,
+             lphc->textRect.right - 1, lphc->textRect.bottom - 1);
+
+      SelectObject( hDC, hPrevPen );
+    }
+
+    CBPaintText( lphc, hDC, lphc->textRect);
       }
 
       if( hPrevBrush )
-        SelectObject( hDC, hPrevBrush );
+    SelectObject( hDC, hPrevBrush );
   }
 
@@ -1047 +1047 @@
 static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect )
 {
-   INT  length, idx;
+   INT  length, idx;
    LPWSTR pText = NULL;
 
@@ -1063 +1063 @@
        else pText[0] = '\0';
        idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING,
-                             (WPARAM)(-1), (LPARAM)pText );
+                 (WPARAM)(-1), (LPARAM)pText );
        HeapFree( GetProcessHeap(), 0, pText );
    }
@@ -1083 +1083 @@
 static void CBUpdateEdit( LPHEADCOMBO lphc , INT index )
 {
-   INT  length;
+   INT  length;
    LPWSTR pText = NULL;
    static const WCHAR empty_stringW[] = { 0 };
@@ -1094 +1094 @@
        if( length )
        {
-           if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) )
-           {
-                SendMessageW(lphc->hWndLBox, LB_GETTEXT,
-                                (WPARAM)index, (LPARAM)pText );
-           }
+       if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) )
+       {
+        SendMessageW(lphc->hWndLBox, LB_GETTEXT,
+                (WPARAM)index, (LPARAM)pText );
+       }
        }
    }
@@ -1137 +1137 @@
        /* Update edit only if item is in the list */
        if( !(lphc->wState & CBF_CAPTURE) && lphc->droppedIndex >= 0)
-         CBUpdateEdit( lphc, lphc->droppedIndex );
+     CBUpdateEdit( lphc, lphc->droppedIndex );
    }
    else
@@ -1185 +1185 @@
 
    SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
-                 lphc->droppedRect.right - lphc->droppedRect.left,
-                 nDroppedHeight,
-                 SWP_NOACTIVATE | SWP_SHOWWINDOW);
+         lphc->droppedRect.right - lphc->droppedRect.left,
+         nDroppedHeight,
+         SWP_NOACTIVATE | SWP_SHOWWINDOW);
 
 
    if( !(lphc->wState & CBF_NOREDRAW) )
      RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE |
-                           RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
+               RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
 
    EnableWindow( lphc->hWndLBox, TRUE );
@@ -1206 +1206 @@
 static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton )
 {
-   HWND hWnd = lphc->self;
+   HWND hWnd = lphc->self;
 
    TRACE("[%04x]: sel ok? [%i] dropped? [%i]\n",
-         lphc->self, (INT)ok, (INT)(lphc->wState & CBF_DROPPED));
+     lphc->self, (INT)ok, (INT)(lphc->wState & CBF_DROPPED));
 
    CB_NOTIFY( lphc, (ok) ? CBN_SELENDOK : CBN_SELENDCANCEL );
@@ -1218 +1218 @@
        if( lphc->wState & CBF_DROPPED )
        {
-           RECT rect;
-
-           lphc->wState &= ~CBF_DROPPED;
-           ShowWindow( lphc->hWndLBox, SW_HIDE );
+       RECT rect;
+
+       lphc->wState &= ~CBF_DROPPED;
+       ShowWindow( lphc->hWndLBox, SW_HIDE );
 
            if(GetCapture() == lphc->hWndLBox)
@@ -1228 +1228 @@
            }
 
-           if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
-           {
-               rect = lphc->buttonRect;
-           }
-           else
+       if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
+       {
+           rect = lphc->buttonRect;
+       }
+       else
            {
-               if( bButton )
-               {
-                 UnionRect( &rect,
-                            &lphc->buttonRect,
-                            &lphc->textRect);
-               }
-               else
-                 rect = lphc->textRect;
-
-               bButton = TRUE;
-           }
-
-           if( bButton && !(lphc->wState & CBF_NOREDRAW) )
-               RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE |
-                               RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
-           CB_NOTIFY( lphc, CBN_CLOSEUP );
+           if( bButton )
+           {
+         UnionRect( &rect,
+                &lphc->buttonRect,
+                &lphc->textRect);
+           }
+           else
+         rect = lphc->textRect;
+
+           bButton = TRUE;
+       }
+
+       if( bButton && !(lphc->wState & CBF_NOREDRAW) )
+           RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE |
+                   RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
+       CB_NOTIFY( lphc, CBN_CLOSEUP );
        }
    }
@@ -1290 +1290 @@
  *           COMBO_RollupListbox
  *
- * @@PF Odin specific function. 
+ * @@PF Odin specific function.
  */
 BOOL COMBO_RollupListbox( LPHEADCOMBO lphc)
@@ -1327 +1327 @@
 
        if( !(lphc->wState & CBF_EDIT) )
-         InvalidateRect(lphc->self, &lphc->textRect, TRUE);
+     InvalidateRect(lphc->self, &lphc->textRect, TRUE);
 
        CB_NOTIFY( lphc, CBN_SETFOCUS );
@@ -1339 +1339 @@
 static void COMBO_KillFocus( LPHEADCOMBO lphc )
 {
-   HWND hWnd = lphc->self;
+   HWND hWnd = lphc->self;
 
    if( lphc->wState & CBF_FOCUSED )
@@ -1349 +1349 @@
                SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0);
 
-           lphc->wState &= ~CBF_FOCUSED;
+       lphc->wState &= ~CBF_FOCUSED;
 
            /* redraw text */
-           if( !(lphc->wState & CBF_EDIT) )
-             InvalidateRect(lphc->self, &lphc->textRect, TRUE);
+       if( !(lphc->wState & CBF_EDIT) )
+         InvalidateRect(lphc->self, &lphc->textRect, TRUE);
 
            CB_NOTIFY( lphc, CBN_KILLFOCUS );
@@ -1371 +1371 @@
        switch( HIWORD(wParam) >> 8 )
        {
-           case (EN_SETFOCUS >> 8):
-
-                TRACE("[%04x]: edit [%04x] got focus\n",
-                             lphc->self, lphc->hWndEdit );
-
-                COMBO_SetFocus( lphc );
-                break;
-
-           case (EN_KILLFOCUS >> 8):
-
-                TRACE("[%04x]: edit [%04x] lost focus\n",
-                             lphc->self, lphc->hWndEdit );
-
-                /* NOTE: it seems that Windows' edit control sends an
-                 * undocumented message WM_USER + 0x1B instead of this
-                 * notification (only when it happens to be a part of
-                 * the combo). ?? - AK.
-                 */
-
-                COMBO_KillFocus( lphc );
-                break;
-
-
-           case (EN_CHANGE >> 8):
-               /*
-                * In some circumstances (when the selection of the combobox
-                * is changed for example) we don't wans the EN_CHANGE notification
-                * to be forwarded to the parent of the combobox. This code
-                * checks a flag that is set in these occasions and ignores the
-                * notification.
-                */
-                if (lphc->wState & CBF_NOLBSELECT)
-                {
-                  lphc->wState &= ~CBF_NOLBSELECT;
-                }
-                else
-                {
-                  CBUpdateLBox( lphc, lphc->wState & CBF_DROPPED );
-                }
-
-                if (!(lphc->wState & CBF_NOEDITNOTIFY))
-                  CB_NOTIFY( lphc, CBN_EDITCHANGE );
-                break;
-
-           case (EN_UPDATE >> 8):
-                if (!(lphc->wState & CBF_NOEDITNOTIFY))
-                  CB_NOTIFY( lphc, CBN_EDITUPDATE );
-                break;
-
-           case (EN_ERRSPACE >> 8):
-                CB_NOTIFY( lphc, CBN_ERRSPACE );
+       case (EN_SETFOCUS >> 8):
+
+        TRACE("[%04x]: edit [%04x] got focus\n",
+                 lphc->self, lphc->hWndEdit );
+
+        COMBO_SetFocus( lphc );
+            break;
+
+       case (EN_KILLFOCUS >> 8):
+
+        TRACE("[%04x]: edit [%04x] lost focus\n",
+                 lphc->self, lphc->hWndEdit );
+
+        /* NOTE: it seems that Windows' edit control sends an
+         * undocumented message WM_USER + 0x1B instead of this
+         * notification (only when it happens to be a part of
+         * the combo). ?? - AK.
+         */
+
+        COMBO_KillFocus( lphc );
+        break;
+
+
+       case (EN_CHANGE >> 8):
+           /*
+            * In some circumstances (when the selection of the combobox
+        * is changed for example) we don't wans the EN_CHANGE notification
+        * to be forwarded to the parent of the combobox. This code
+        * checks a flag that is set in these occasions and ignores the
+        * notification.
+            */
+        if (lphc->wState & CBF_NOLBSELECT)
+        {
+          lphc->wState &= ~CBF_NOLBSELECT;
+        }
+        else
+        {
+          CBUpdateLBox( lphc, lphc->wState & CBF_DROPPED );
+        }
+
+            if (!(lphc->wState & CBF_NOEDITNOTIFY))
+          CB_NOTIFY( lphc, CBN_EDITCHANGE );
+        break;
+
+       case (EN_UPDATE >> 8):
+            if (!(lphc->wState & CBF_NOEDITNOTIFY))
+          CB_NOTIFY( lphc, CBN_EDITUPDATE );
+        break;
+
+       case (EN_ERRSPACE >> 8):
+        CB_NOTIFY( lphc, CBN_ERRSPACE );
        }
    }
@@ -1428 +1428 @@
        switch( HIWORD(wParam) )
        {
-           case LBN_ERRSPACE:
-                CB_NOTIFY( lphc, CBN_ERRSPACE );
-                break;
-
-           case LBN_DBLCLK:
-                CB_NOTIFY( lphc, CBN_DBLCLK );
-                break;
-
-           case LBN_SELCHANGE:
-           case LBN_SELCANCEL:
-
-                TRACE("[%04x]: lbox selection change [%04x]\n",
-                             lphc->self, lphc->wState );
-
-                if( HIWORD(wParam) == LBN_SELCHANGE)
-                {
-                   if( lphc->wState & CBF_EDIT )
-                   {
-                       INT index = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
-                       lphc->wState |= CBF_NOLBSELECT;
-                       CBUpdateEdit( lphc, index );
-                       /* select text in edit, as Windows does */
-                       SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));
-                   }
-                   else
-                       InvalidateRect(lphc->self, &lphc->textRect, TRUE);
-                }
-
-                /* do not roll up if selection is being tracked
-                 * by arrowkeys in the dropdown listbox */
+       case LBN_ERRSPACE:
+        CB_NOTIFY( lphc, CBN_ERRSPACE );
+        break;
+
+       case LBN_DBLCLK:
+        CB_NOTIFY( lphc, CBN_DBLCLK );
+        break;
+
+       case LBN_SELCHANGE:
+       case LBN_SELCANCEL:
+
+        TRACE("[%04x]: lbox selection change [%04x]\n",
+                 lphc->self, lphc->wState );
+
+        if( HIWORD(wParam) == LBN_SELCHANGE)
+        {
+           if( lphc->wState & CBF_EDIT )
+           {
+               INT index = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
+               lphc->wState |= CBF_NOLBSELECT;
+               CBUpdateEdit( lphc, index );
+               /* select text in edit, as Windows does */
+               SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));
+           }
+           else
+               InvalidateRect(lphc->self, &lphc->textRect, TRUE);
+        }
+
+        /* do not roll up if selection is being tracked
+         * by arrowkeys in the dropdown listbox */
                 if( ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) )
                 {
                    CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE );
                 }
-                else lphc->wState &= ~CBF_NOROLLUP;
-
-                CB_NOTIFY( lphc, CBN_SELCHANGE );
-
-                /* fall through */
-
-           case LBN_SETFOCUS:
-           case LBN_KILLFOCUS:
-                /* nothing to do here since ComboLBox always resets the focus to its
-                 * combo/edit counterpart */
-                 break;
+        else lphc->wState &= ~CBF_NOROLLUP;
+
+        CB_NOTIFY( lphc, CBN_SELCHANGE );
+
+        /* fall through */
+
+       case LBN_SETFOCUS:
+       case LBN_KILLFOCUS:
+        /* nothing to do here since ComboLBox always resets the focus to its
+         * combo/edit counterpart */
+         break;
        }
    }
@@ -1546 +1546 @@
        if( idx != LB_ERR )
        {
-           INT n = 0;
+       INT n = 0;
            INT length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN,
-                                                (WPARAM)idx, 0 );
-
-            if(unicode)
-            {
-                LPWSTR lpBuffer, lpText = (LPWSTR)lParam;
-
-                /* 'length' is without the terminating character */
-                if(length >= N)
-                    lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR));
-                else
-                    lpBuffer = lpText;
-
-                if(lpBuffer)
-                {
-                    n = SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)idx, (LPARAM)lpBuffer);
-
-                    /* truncate if buffer is too short */
-                    if(length >= N)
-                    {
-                        if(N && lpText)
-                        {
-                            if(n != LB_ERR)
-                                strncpyW(lpText, lpBuffer, (N > n) ? n+1 : N-1);
-                            lpText[N - 1] = '\0';
-                        }
-                        HeapFree( GetProcessHeap(), 0, lpBuffer );
+                            (WPARAM)idx, 0 );
+
+        if(unicode)
+        {
+        LPWSTR lpBuffer, lpText = (LPWSTR)lParam;
+
+        /* 'length' is without the terminating character */
+        if(length >= N)
+            lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR));
+        else
+            lpBuffer = lpText;
+
+        if(lpBuffer)
+        {
+            n = SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)idx, (LPARAM)lpBuffer);
+
+            /* truncate if buffer is too short */
+            if(length >= N)
+            {
+            if(N && lpText)
+            {
+                if(n != LB_ERR)
+                strncpyW(lpText, lpBuffer, (N > n) ? n+1 : N-1);
+                lpText[N - 1] = '\0';
+            }
+                    HeapFree( GetProcessHeap(), 0, lpBuffer );
                    }
-               }
-           }
-           else
-           {
-                LPSTR lpBuffer, lpText = (LPSTR)lParam;
-
-                /* 'length' is without the terminating character */
-                if(length >= N)
-                    lpBuffer = HeapAlloc(GetProcessHeap(), 0, length + 1);
-                else
-                    lpBuffer = lpText;
-
-                if(lpBuffer)
-                {
-                    n = SendMessageA(lphc->hWndLBox, LB_GETTEXT, (WPARAM)idx, (LPARAM)lpBuffer);
-
-                    /* truncate if buffer is too short */
-                    if(length >= N)
-                    {
-                        if(N && lpText)
-                        {
-                            if(n != LB_ERR)
-                                strncpy(lpText, lpBuffer, (N > n) ? n+1 : N-1);
-                            lpText[N - 1] = '\0';
-                        }
-                        HeapFree( GetProcessHeap(), 0, lpBuffer );
+           }
+       }
+       else
+       {
+        LPSTR lpBuffer, lpText = (LPSTR)lParam;
+
+        /* 'length' is without the terminating character */
+        if(length >= N)
+            lpBuffer = HeapAlloc(GetProcessHeap(), 0, length + 1);
+        else
+            lpBuffer = lpText;
+
+        if(lpBuffer)
+        {
+            n = SendMessageA(lphc->hWndLBox, LB_GETTEXT, (WPARAM)idx, (LPARAM)lpBuffer);
+
+            /* truncate if buffer is too short */
+            if(length >= N)
+            {
+            if(N && lpText)
+            {
+                if(n != LB_ERR)
+                strncpy(lpText, lpBuffer, (N > n) ? n+1 : N-1);
+                lpText[N - 1] = '\0';
+            }
+                    HeapFree( GetProcessHeap(), 0, lpBuffer );
                    }
-               }
-           }
-           if (n<0)
-               n=0;
-           else
-               n++;
-           return (LRESULT)n;
+           }
+       }
+       if (n<0)
+           n=0;
+       else
+           n++;
+       return (LRESULT)n;
        }
    }
@@ -1627 +1627 @@
   BOOL        bRedraw)
 {
-   BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE);
+   BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE);
 
    /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of
@@ -1634 +1634 @@
    if( lphc->wState & CBF_EDIT )
      SetWindowPos( lphc->hWndEdit, 0,
-                   rectEdit->left, rectEdit->top,
-                   rectEdit->right - rectEdit->left,
-                   rectEdit->bottom - rectEdit->top,
+           rectEdit->left, rectEdit->top,
+           rectEdit->right - rectEdit->left,
+           rectEdit->bottom - rectEdit->top,
                        SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) );
 
    SetWindowPos( lphc->hWndLBox, 0,
-                 rectLB->left, rectLB->top,
+         rectLB->left, rectLB->top,
                  rectLB->right - rectLB->left,
-                 rectLB->bottom - rectLB->top,
-                   SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) );
+         rectLB->bottom - rectLB->top,
+           SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) );
 
    if( bDrop )
@@ -1666 +1666 @@
   {
   CBCalcPlacement(lphc->self,
-                  lphc,
-                  &lphc->textRect,
-                  &lphc->buttonRect,
-                  &lphc->droppedRect);
+          lphc,
+          &lphc->textRect,
+          &lphc->buttonRect,
+          &lphc->droppedRect);
 
   CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE );
@@ -1698 +1698 @@
   {
     CBCalcPlacement(lphc->self,
-                    lphc,
-                    &lphc->textRect,
-                    &lphc->buttonRect,
-                    &lphc->droppedRect);
+            lphc,
+            &lphc->textRect,
+            &lphc->buttonRect,
+            &lphc->droppedRect);
 
     CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE );
@@ -1717 +1717 @@
 static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height )
 {
-   LRESULT      lRet = CB_ERR;
+   LRESULT  lRet = CB_ERR;
 
    if( index == -1 ) /* set text field height */
@@ -1725 +1725 @@
            lphc->editHeight = height;
 
-         /*
-          * Redo the layout of the control.
-          */
-         if ( CB_GETTYPE(lphc) == CBS_SIMPLE)
-         {
-           CBCalcPlacement(lphc->self,
-                           lphc,
-                           &lphc->textRect,
-                           &lphc->buttonRect,
-                           &lphc->droppedRect);
-
-           CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE );
-         }
-         else
-         {
-           CBForceDummyResize(lphc);
-         }
-
-           lRet = height;
+     /*
+      * Redo the layout of the control.
+      */
+     if ( CB_GETTYPE(lphc) == CBS_SIMPLE)
+     {
+       CBCalcPlacement(lphc->self,
+               lphc,
+               &lphc->textRect,
+               &lphc->buttonRect,
+               &lphc->droppedRect);
+
+       CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE );
+     }
+     else
+     {
+       CBForceDummyResize(lphc);
+     }
+
+       lRet = height;
        }
    }
-   else if ( CB_OWNERDRAWN(lphc) )      /* set listbox item height */
-        lRet = SendMessageW(lphc->hWndLBox, LB_SETITEMHEIGHT,
-                              (WPARAM)index, (LPARAM)height );
+   else if ( CB_OWNERDRAWN(lphc) )  /* set listbox item height */
+    lRet = SendMessageW(lphc->hWndLBox, LB_SETITEMHEIGHT,
+                  (WPARAM)index, (LPARAM)height );
    return lRet;
 }
@@ -1790 +1790 @@
        if( lphc->wState & CBF_DROPPED )
        {
-           /* got a click to cancel selection */
+       /* got a click to cancel selection */
 
            lphc->wState &= ~CBF_BUTTONDOWN;
            CBRollUp( lphc, TRUE, FALSE );
-           if( !IsWindow( hWnd ) ) return;
+       if( !IsWindow( hWnd ) ) return;
 
            if( lphc->wState & CBF_CAPTURE )
@@ -1804 +1804 @@
        else
        {
-           /* drop down the listbox and start tracking */
+       /* drop down the listbox and start tracking */
 
            lphc->wState |= CBF_CAPTURE;
@@ -1826 +1826 @@
        if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
        {
-           INT index = CBUpdateLBox( lphc, TRUE );
-           /* Update edit only if item is in the list */
-           if(index >= 0)
-           {
-               lphc->wState |= CBF_NOLBSELECT;
-               CBUpdateEdit( lphc, index );
-               lphc->wState &= ~CBF_NOLBSELECT;
-           }
+       INT index = CBUpdateLBox( lphc, TRUE );
+       /* Update edit only if item is in the list */
+       if(index >= 0)
+       {
+           lphc->wState |= CBF_NOLBSELECT;
+           CBUpdateEdit( lphc, index );
+           lphc->wState &= ~CBF_NOLBSELECT;
+       }
        }
        ReleaseCapture();
@@ -1904 +1904 @@
       {
 
-        /* System messages */
-
-        case WM_NCCREATE:
-        {
-                LONG style = unicode ? ((LPCREATESTRUCTW)lParam)->style :
-                                       ((LPCREATESTRUCTA)lParam)->style;
+    /* System messages */
+
+        case WM_NCCREATE:
+    {
+        LONG style = unicode ? ((LPCREATESTRUCTW)lParam)->style :
+                       ((LPCREATESTRUCTA)lParam)->style;
                 return COMBO_NCCreate(hwnd, style);
-        }
-        case WM_NCDESTROY:
-                COMBO_NCDestroy(lphc);
-                break;/* -> DefWindowProc */
-
-        case WM_CREATE:
-        {
-                HWND hwndParent;
-                LONG style;
-                if(unicode)
-                {
-                    hwndParent = ((LPCREATESTRUCTW)lParam)->hwndParent;
-                    style = ((LPCREATESTRUCTW)lParam)->style;
-                }
-                else
-                {
-                    hwndParent = ((LPCREATESTRUCTA)lParam)->hwndParent;
-                    style = ((LPCREATESTRUCTA)lParam)->style;
-                }
+    }
+        case WM_NCDESTROY:
+        COMBO_NCDestroy(lphc);
+        break;/* -> DefWindowProc */
+
+        case WM_CREATE:
+    {
+        HWND hwndParent;
+        LONG style;
+        if(unicode)
+        {
+            hwndParent = ((LPCREATESTRUCTW)lParam)->hwndParent;
+            style = ((LPCREATESTRUCTW)lParam)->style;
+        }
+        else
+        {
+            hwndParent = ((LPCREATESTRUCTA)lParam)->hwndParent;
+            style = ((LPCREATESTRUCTA)lParam)->style;
+        }
                 return COMBO_Create(hwnd, lphc, hwndParent, style);
-        }
+    }
 
         case WM_PRINTCLIENT:
-                if (lParam & PRF_ERASEBKGND)
-                  COMBO_EraseBackground(hwnd, lphc, wParam);
-
-                /* Fallthrough */
-        case WM_PAINT:
-                /* wParam may contain a valid HDC! */
-                return  COMBO_Paint(lphc, wParam);
-        case WM_ERASEBKGND:
-                return  COMBO_EraseBackground(hwnd, lphc, wParam);
-        case WM_GETDLGCODE:
-        {
-                LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS;
-                if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
-                {
-                   int vk = (int)((LPMSG)lParam)->wParam;
-
-                   if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED))
-                       result |= DLGC_WANTMESSAGE;
-                }
-                return  result;
-        }
-        case WM_WINDOWPOSCHANGING:
-                return  COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam);
+            if (lParam & PRF_ERASEBKGND)
+          COMBO_EraseBackground(hwnd, lphc, wParam);
+
+        /* Fallthrough */
+        case WM_PAINT:
+        /* wParam may contain a valid HDC! */
+        return  COMBO_Paint(lphc, wParam);
+    case WM_ERASEBKGND:
+        return  COMBO_EraseBackground(hwnd, lphc, wParam);
+    case WM_GETDLGCODE:
+    {
+        LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS;
+        if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
+        {
+           int vk = (int)((LPMSG)lParam)->wParam;
+
+           if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED))
+               result |= DLGC_WANTMESSAGE;
+        }
+        return  result;
+    }
+    case WM_WINDOWPOSCHANGING:
+            return  COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam);
     case WM_WINDOWPOSCHANGED:
         /* SetWindowPos can be called on a Combobox to resize its Listbox.
@@ -1964 +1964 @@
          */
         /* fall through */
-        case WM_SIZE:
-                if( lphc->hWndLBox &&
-                  !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc );
-                return  TRUE;
-        case WM_SETFONT:
-                COMBO_Font( lphc, (HFONT16)wParam, (BOOL)lParam );
-                return  TRUE;
-        case WM_GETFONT:
-                return  (LRESULT)lphc->hFont;
-        case WM_SETFOCUS:
-                if( lphc->wState & CBF_EDIT )
-                    SetFocus( lphc->hWndEdit );
-                else
-                    COMBO_SetFocus( lphc );
-                return  TRUE;
-        case WM_KILLFOCUS:
+    case WM_SIZE:
+            if( lphc->hWndLBox &&
+          !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc );
+        return  TRUE;
+    case WM_SETFONT:
+        COMBO_Font( lphc, (HFONT16)wParam, (BOOL)lParam );
+        return  TRUE;
+    case WM_GETFONT:
+        return  (LRESULT)lphc->hFont;
+    case WM_SETFOCUS:
+        if( lphc->wState & CBF_EDIT )
+            SetFocus( lphc->hWndEdit );
+        else
+            COMBO_SetFocus( lphc );
+        return  TRUE;
+    case WM_KILLFOCUS:
             {
                 HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam );
-                if( !hwndFocus ||
-                    (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox ))
-                    COMBO_KillFocus( lphc );
-                return  TRUE;
+        if( !hwndFocus ||
+            (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox ))
+            COMBO_KillFocus( lphc );
+        return  TRUE;
             }
-        case WM_COMMAND:
-                return  COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) );
-        case WM_GETTEXT:
-                return COMBO_GetText( lphc, (INT)wParam, lParam, unicode );
-        case WM_SETTEXT:
-        case WM_GETTEXTLENGTH:
-        case WM_CLEAR:
+    case WM_COMMAND:
+        return  COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) );
+    case WM_GETTEXT:
+        return COMBO_GetText( lphc, (INT)wParam, lParam, unicode );
+    case WM_SETTEXT:
+    case WM_GETTEXTLENGTH:
+    case WM_CLEAR:
                 if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT))
                 {
@@ -2000 +2000 @@
                 return SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, j, 0);
                 }
-                else if( lphc->wState & CBF_EDIT )
-                {
-                    LRESULT ret;
-                    lphc->wState |= CBF_NOEDITNOTIFY;
-                    ret = unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) :
-                                    SendMessageA(lphc->hWndEdit, message, wParam, lParam);
-                    lphc->wState &= ~CBF_NOEDITNOTIFY;
-                    return ret;
-                }
-                else return CB_ERR;
-        case WM_CUT:
+        else if( lphc->wState & CBF_EDIT )
+        {
+            LRESULT ret;
+            lphc->wState |= CBF_NOEDITNOTIFY;
+            ret = unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) :
+                    SendMessageA(lphc->hWndEdit, message, wParam, lParam);
+            lphc->wState &= ~CBF_NOEDITNOTIFY;
+            return ret;
+        }
+        else return CB_ERR;
+    case WM_CUT:
         case WM_PASTE:
-        case WM_COPY:
-                if( lphc->wState & CBF_EDIT )
-                {
-                    return unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) :
-                                     SendMessageA(lphc->hWndEdit, message, wParam, lParam);
-                }
-                else return  CB_ERR;
-
-        case WM_DRAWITEM:
-        case WM_DELETEITEM:
-        case WM_COMPAREITEM:
-        case WM_MEASUREITEM:
-                return COMBO_ItemOp(lphc, message, lParam);
-        case WM_ENABLE:
-                if( lphc->wState & CBF_EDIT )
-                    EnableWindow( lphc->hWndEdit, (BOOL)wParam );
-                EnableWindow( lphc->hWndLBox, (BOOL)wParam );
-
-                /* Force the control to repaint when the enabled state changes. */
-                InvalidateRect(lphc->self, NULL, TRUE);
-                return  TRUE;
-        case WM_SETREDRAW:
-                if( wParam )
-                    lphc->wState &= ~CBF_NOREDRAW;
-                else
-                    lphc->wState |= CBF_NOREDRAW;
-
-                if( lphc->wState & CBF_EDIT )
-                    SendMessageW(lphc->hWndEdit, message, wParam, lParam);
-                SendMessageW(lphc->hWndLBox, message, wParam, lParam);
-                return  0;
-        case WM_SYSKEYDOWN:
-                if( KEYDATA_ALT & HIWORD(lParam) )
-                    if( wParam == VK_UP || wParam == VK_DOWN )
-                        COMBO_FlipListbox( lphc, FALSE, FALSE );
+    case WM_COPY:
+        if( lphc->wState & CBF_EDIT )
+        {
+            return unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) :
+                     SendMessageA(lphc->hWndEdit, message, wParam, lParam);
+        }
+        else return  CB_ERR;
+
+    case WM_DRAWITEM:
+    case WM_DELETEITEM:
+    case WM_COMPAREITEM:
+    case WM_MEASUREITEM:
+        return COMBO_ItemOp(lphc, message, lParam);
+    case WM_ENABLE:
+        if( lphc->wState & CBF_EDIT )
+            EnableWindow( lphc->hWndEdit, (BOOL)wParam );
+        EnableWindow( lphc->hWndLBox, (BOOL)wParam );
+
+        /* Force the control to repaint when the enabled state changes. */
+        InvalidateRect(lphc->self, NULL, TRUE);
+        return  TRUE;
+    case WM_SETREDRAW:
+        if( wParam )
+            lphc->wState &= ~CBF_NOREDRAW;
+        else
+            lphc->wState |= CBF_NOREDRAW;
+
+        if( lphc->wState & CBF_EDIT )
+            SendMessageW(lphc->hWndEdit, message, wParam, lParam);
+        SendMessageW(lphc->hWndLBox, message, wParam, lParam);
+        return  0;
+    case WM_SYSKEYDOWN:
+        if( KEYDATA_ALT & HIWORD(lParam) )
+            if( wParam == VK_UP || wParam == VK_DOWN )
+            COMBO_FlipListbox( lphc, FALSE, FALSE );
                 return  0;
 
-        case WM_CHAR:
-        case WM_KEYDOWN:
-        {
-                HWND hwndTarget;
-
-                if ((wParam == VK_RETURN || wParam == VK_ESCAPE) &&
-                     (lphc->wState & CBF_DROPPED))
-                {
-                   CBRollUp( lphc, wParam == VK_RETURN, FALSE );
-                   return TRUE;
-                }
-
-                if( lphc->wState & CBF_EDIT )
-                    hwndTarget = lphc->hWndEdit;
-                else
-                    hwndTarget = lphc->hWndLBox;
-
-                return unicode ? SendMessageW(hwndTarget, message, wParam, lParam) :
-                                 SendMessageA(hwndTarget, message, wParam, lParam);
-        }
-        case WM_LBUTTONDOWN:
-                if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self );
-                if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam );
-                return  TRUE;
-        case WM_LBUTTONUP:
-                COMBO_LButtonUp( lphc );
-                return  TRUE;
-        case WM_MOUSEMOVE:
-                if( lphc->wState & CBF_CAPTURE )
-                    COMBO_MouseMove( lphc, wParam, lParam );
-                return  TRUE;
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+#endif
+    case WM_CHAR:
+    case WM_KEYDOWN:
+    {
+        HWND hwndTarget;
+
+        if ((wParam == VK_RETURN || wParam == VK_ESCAPE) &&
+             (lphc->wState & CBF_DROPPED))
+        {
+           CBRollUp( lphc, wParam == VK_RETURN, FALSE );
+           return TRUE;
+        }
+
+        if( lphc->wState & CBF_EDIT )
+            hwndTarget = lphc->hWndEdit;
+        else
+            hwndTarget = lphc->hWndLBox;
+
+        return unicode ? SendMessageW(hwndTarget, message, wParam, lParam) :
+                 SendMessageA(hwndTarget, message, wParam, lParam);
+    }
+    case WM_LBUTTONDOWN:
+        if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self );
+        if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam );
+        return  TRUE;
+    case WM_LBUTTONUP:
+        COMBO_LButtonUp( lphc );
+        return  TRUE;
+    case WM_MOUSEMOVE:
+        if( lphc->wState & CBF_CAPTURE )
+            COMBO_MouseMove( lphc, wParam, lParam );
+        return  TRUE;
 
         case WM_MOUSEWHEEL:
                 if (wParam & (MK_SHIFT | MK_CONTROL))
                     return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) :
-                                     DefWindowProcA(hwnd, message, wParam, lParam);
+                     DefWindowProcA(hwnd, message, wParam, lParam);
                 if (SHIWORD(wParam) > 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_UP, 0);
                 if (SHIWORD(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0);
                 return TRUE;
 
-        /* Combo messages */
-
-        case CB_ADDSTRING16:
-                if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
-                /* fall through */
-        case CB_ADDSTRING:
-                return unicode ? SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam) :
-                                 SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
-        case CB_INSERTSTRING16:
-                wParam = (INT)(INT16)wParam;
-                if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
-                /* fall through */
-        case CB_INSERTSTRING:
-                return unicode ? SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam) :
-                                 SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
-        case CB_DELETESTRING16:
-        case CB_DELETESTRING:
-                return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) :
-                                 SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0);
-        case CB_SELECTSTRING16:
-                wParam = (INT)(INT16)wParam;
-                if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
-                /* fall through */
-        case CB_SELECTSTRING:
-                return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode);
-        case CB_FINDSTRING16:
-                wParam = (INT)(INT16)wParam;
-                if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
-                /* fall through */
-        case CB_FINDSTRING:
-                return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) :
-                                 SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam);
-        case CB_FINDSTRINGEXACT16:
-                wParam = (INT)(INT16)wParam;
-                if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
-                /* fall through */
-        case CB_FINDSTRINGEXACT:
-                return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) :
-                                 SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam);
-        case CB_SETITEMHEIGHT16:
-                wParam = (INT)(INT16)wParam;    /* signed integer */
-                /* fall through */
-        case CB_SETITEMHEIGHT:
-                return  COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam);
-        case CB_GETITEMHEIGHT16:
-                wParam = (INT)(INT16)wParam;
-                /* fall through */
-        case CB_GETITEMHEIGHT:
-                if( (INT)wParam >= 0 )  /* listbox item */
+    /* Combo messages */
+
+    case CB_ADDSTRING16:
+        if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
+        /* fall through */
+    case CB_ADDSTRING:
+        return unicode ? SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam) :
+                 SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, lParam);
+    case CB_INSERTSTRING16:
+        wParam = (INT)(INT16)wParam;
+        if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
+        /* fall through */
+    case CB_INSERTSTRING:
+        return unicode ? SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam) :
+                 SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam);
+    case CB_DELETESTRING16:
+    case CB_DELETESTRING:
+        return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) :
+                 SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0);
+    case CB_SELECTSTRING16:
+        wParam = (INT)(INT16)wParam;
+        if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
+        /* fall through */
+    case CB_SELECTSTRING:
+        return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode);
+    case CB_FINDSTRING16:
+        wParam = (INT)(INT16)wParam;
+        if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
+        /* fall through */
+    case CB_FINDSTRING:
+        return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) :
+                 SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam);
+    case CB_FINDSTRINGEXACT16:
+        wParam = (INT)(INT16)wParam;
+        if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam);
+        /* fall through */
+    case CB_FINDSTRINGEXACT:
+        return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) :
+                 SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam);
+    case CB_SETITEMHEIGHT16:
+        wParam = (INT)(INT16)wParam;    /* signed integer */
+        /* fall through */
+    case CB_SETITEMHEIGHT:
+        return  COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam);
+    case CB_GETITEMHEIGHT16:
+        wParam = (INT)(INT16)wParam;
+        /* fall through */
+    case CB_GETITEMHEIGHT:
+        if( (INT)wParam >= 0 )  /* listbox item */
                     return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0);
                 return  CBGetTextAreaHeight(hwnd, lphc);
-        case CB_RESETCONTENT16:
-        case CB_RESETCONTENT:
-                SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0);
+    case CB_RESETCONTENT16:
+    case CB_RESETCONTENT:
+        SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0);
                 if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) )
-                {
-                    static const WCHAR empty_stringW[] = { 0 };
+        {
+            static const WCHAR empty_stringW[] = { 0 };
                     SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW);
-                }
+        }
                 else
                     InvalidateRect(lphc->self, NULL, TRUE);
-                return  TRUE;
-        case CB_INITSTORAGE:
-                return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
-        case CB_GETHORIZONTALEXTENT:
-                return SendMessageW(lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0);
-        case CB_SETHORIZONTALEXTENT:
-                return SendMessageW(lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0);
-        case CB_GETTOPINDEX:
-                return SendMessageW(lphc->hWndLBox, LB_GETTOPINDEX, 0, 0);
-        case CB_GETLOCALE:
-                return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0);
-        case CB_SETLOCALE:
-                return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0);
-        case CB_GETDROPPEDWIDTH:
-                if( lphc->droppedWidth )
+        return  TRUE;
+    case CB_INITSTORAGE:
+        return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
+    case CB_GETHORIZONTALEXTENT:
+        return SendMessageW(lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0);
+    case CB_SETHORIZONTALEXTENT:
+        return SendMessageW(lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0);
+    case CB_GETTOPINDEX:
+        return SendMessageW(lphc->hWndLBox, LB_GETTOPINDEX, 0, 0);
+    case CB_GETLOCALE:
+        return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0);
+    case CB_SETLOCALE:
+        return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0);
+    case CB_GETDROPPEDWIDTH:
+        if( lphc->droppedWidth )
                     return  lphc->droppedWidth;
-                return  lphc->droppedRect.right - lphc->droppedRect.left;
-        case CB_SETDROPPEDWIDTH:
-                if( (CB_GETTYPE(lphc) != CBS_SIMPLE) &&
-                    (INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam;
-                return  CB_ERR;
-        case CB_GETDROPPEDCONTROLRECT16:
-                lParam = (LPARAM)MapSL(lParam);
-                if( lParam )
-                {
-                    RECT        r;
-                    CBGetDroppedControlRect( lphc, &r );
-                    CONV_RECT32TO16( &r, (LPRECT16)lParam );
-                }
-                return  CB_OKAY;
-        case CB_GETDROPPEDCONTROLRECT:
-                if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam );
-                return  CB_OKAY;
-        case CB_GETDROPPEDSTATE16:
-        case CB_GETDROPPEDSTATE:
-                return  (lphc->wState & CBF_DROPPED) ? TRUE : FALSE;
-        case CB_DIR16:
+        return  lphc->droppedRect.right - lphc->droppedRect.left;
+    case CB_SETDROPPEDWIDTH:
+        if( (CB_GETTYPE(lphc) != CBS_SIMPLE) &&
+            (INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam;
+        return  CB_ERR;
+    case CB_GETDROPPEDCONTROLRECT16:
+        lParam = (LPARAM)MapSL(lParam);
+        if( lParam )
+        {
+            RECT    r;
+            CBGetDroppedControlRect( lphc, &r );
+            CONV_RECT32TO16( &r, (LPRECT16)lParam );
+        }
+        return  CB_OKAY;
+    case CB_GETDROPPEDCONTROLRECT:
+        if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam );
+        return  CB_OKAY;
+    case CB_GETDROPPEDSTATE16:
+    case CB_GETDROPPEDSTATE:
+        return  (lphc->wState & CBF_DROPPED) ? TRUE : FALSE;
+    case CB_DIR16:
                 lParam = (LPARAM)MapSL(lParam);
-                message = LB_DIR16;
+        message = LB_DIR16;
                 /* fall through */
-        case CB_DIR:
-                if(message == CB_DIR) message = LB_DIR;
-                return unicode ? SendMessageW(lphc->hWndLBox, message, wParam, lParam) :
-                                 SendMessageA(lphc->hWndLBox, message, wParam, lParam);
-
-        case CB_SHOWDROPDOWN16:
-        case CB_SHOWDROPDOWN:
-                if( CB_GETTYPE(lphc) != CBS_SIMPLE )
-                {
-                    if( wParam )
-                    {
-                        if( !(lphc->wState & CBF_DROPPED) )
-                            CBDropDown( lphc );
-                    }
-                    else
-                        if( lphc->wState & CBF_DROPPED )
-                            CBRollUp( lphc, FALSE, TRUE );
-                }
-                return  TRUE;
-        case CB_GETCOUNT16:
-        case CB_GETCOUNT:
-                return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0);
-        case CB_GETCURSEL16:
-        case CB_GETCURSEL:
-                return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
-        case CB_SETCURSEL16:
-                wParam = (INT)(INT16)wParam;
-                /* fall through */
-        case CB_SETCURSEL:
-                lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0);
-                if( lParam >= 0 )
-                    SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0);
-
-                /* no LBN_SELCHANGE in this case, update manually */
-                if( lphc->wState & CBF_EDIT )
-                    CBUpdateEdit( lphc, (INT)wParam );
-                else
-                    InvalidateRect(lphc->self, &lphc->textRect, TRUE);
-                lphc->wState &= ~CBF_SELCHANGE;
-                return  lParam;
-        case CB_GETLBTEXT16:
-                wParam = (INT)(INT16)wParam;
-                lParam = (LPARAM)MapSL(lParam);
-                /* fall through */
-        case CB_GETLBTEXT:
-                return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) :
-                                 SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam);
-        case CB_GETLBTEXTLEN16:
-                wParam = (INT)(INT16)wParam;
-                /* fall through */
-        case CB_GETLBTEXTLEN:
-                return SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0);
-        case CB_GETITEMDATA16:
-                wParam = (INT)(INT16)wParam;
-                /* fall through */
-        case CB_GETITEMDATA:
-                return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0);
-        case CB_SETITEMDATA16:
-                wParam = (INT)(INT16)wParam;
-                /* fall through */
-        case CB_SETITEMDATA:
-                return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam);
-        case CB_GETEDITSEL16:
-                wParam = lParam = 0;   /* just in case */
-                /* fall through */
-        case CB_GETEDITSEL:
-                /* Edit checks passed parameters itself */
-                if( lphc->wState & CBF_EDIT )
-                    return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam);
-                return  CB_ERR;
-        case CB_SETEDITSEL16:
-        case CB_SETEDITSEL:
-                if( lphc->wState & CBF_EDIT )
+    case CB_DIR:
+        if(message == CB_DIR) message = LB_DIR;
+        return unicode ? SendMessageW(lphc->hWndLBox, message, wParam, lParam) :
+                 SendMessageA(lphc->hWndLBox, message, wParam, lParam);
+
+    case CB_SHOWDROPDOWN16:
+    case CB_SHOWDROPDOWN:
+        if( CB_GETTYPE(lphc) != CBS_SIMPLE )
+        {
+            if( wParam )
+            {
+            if( !(lphc->wState & CBF_DROPPED) )
+                CBDropDown( lphc );
+            }
+            else
+            if( lphc->wState & CBF_DROPPED )
+                    CBRollUp( lphc, FALSE, TRUE );
+        }
+        return  TRUE;
+    case CB_GETCOUNT16:
+    case CB_GETCOUNT:
+        return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0);
+    case CB_GETCURSEL16:
+    case CB_GETCURSEL:
+        return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
+    case CB_SETCURSEL16:
+        wParam = (INT)(INT16)wParam;
+        /* fall through */
+    case CB_SETCURSEL:
+        lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0);
+            if( lParam >= 0 )
+                SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0);
+
+        /* no LBN_SELCHANGE in this case, update manually */
+        if( lphc->wState & CBF_EDIT )
+            CBUpdateEdit( lphc, (INT)wParam );
+        else
+            InvalidateRect(lphc->self, &lphc->textRect, TRUE);
+        lphc->wState &= ~CBF_SELCHANGE;
+            return  lParam;
+    case CB_GETLBTEXT16:
+        wParam = (INT)(INT16)wParam;
+        lParam = (LPARAM)MapSL(lParam);
+        /* fall through */
+    case CB_GETLBTEXT:
+        return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) :
+                 SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam);
+    case CB_GETLBTEXTLEN16:
+        wParam = (INT)(INT16)wParam;
+        /* fall through */
+    case CB_GETLBTEXTLEN:
+        return SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0);
+    case CB_GETITEMDATA16:
+        wParam = (INT)(INT16)wParam;
+        /* fall through */
+    case CB_GETITEMDATA:
+        return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0);
+    case CB_SETITEMDATA16:
+        wParam = (INT)(INT16)wParam;
+        /* fall through */
+    case CB_SETITEMDATA:
+        return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam);
+    case CB_GETEDITSEL16:
+        wParam = lParam = 0;   /* just in case */
+        /* fall through */
+    case CB_GETEDITSEL:
+        /* Edit checks passed parameters itself */
+        if( lphc->wState & CBF_EDIT )
+            return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam);
+        return  CB_ERR;
+    case CB_SETEDITSEL16:
+    case CB_SETEDITSEL:
+        if( lphc->wState & CBF_EDIT )
                     return SendMessageW(lphc->hWndEdit, EM_SETSEL,
-                          (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) );
-                return  CB_ERR;
-        case CB_SETEXTENDEDUI16:
-        case CB_SETEXTENDEDUI:
+              (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) );
+        return  CB_ERR;
+    case CB_SETEXTENDEDUI16:
+    case CB_SETEXTENDEDUI:
                 if( CB_GETTYPE(lphc) == CBS_SIMPLE )
                     return  CB_ERR;
-                if( wParam )
-                    lphc->wState |= CBF_EUI;
-                else lphc->wState &= ~CBF_EUI;
-                return  CB_OKAY;
-        case CB_GETEXTENDEDUI16:
-        case CB_GETEXTENDEDUI:
-                return  (lphc->wState & CBF_EUI) ? TRUE : FALSE;
-
-        default:
-                if (message >= WM_USER)
-                    WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",
-                        message - WM_USER, wParam, lParam );
-                break;
+        if( wParam )
+            lphc->wState |= CBF_EUI;
+        else lphc->wState &= ~CBF_EUI;
+        return  CB_OKAY;
+    case CB_GETEXTENDEDUI16:
+    case CB_GETEXTENDEDUI:
+        return  (lphc->wState & CBF_EUI) ? TRUE : FALSE;
+
+    default:
+        if (message >= WM_USER)
+            WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",
+            message - WM_USER, wParam, lParam );
+        break;
       }
       return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) :

trunk/src/user32/edit.c

@@ -888 +888 @@
     case WM_CHAR:
     {
-#ifdef __WIN32OS2__
-        static BOOL bDbcsLead = FALSE;
-        static CHAR cDbcsLead = 0;
-
         WCHAR charW;
         DPRINTF_EDIT_MSG32("WM_CHAR");
@@ -899 +895 @@
         else
         {
-            WCHAR charA = bDbcsLead ? (( wParam << 8 ) | cDbcsLead ) : wParam;
-            int   size = bDbcsLead ? 2 : 1;
-
-            bDbcsLead = !bDbcsLead && IsDBCSLeadByte( wParam );
-
-            if( bDbcsLead )
-                cDbcsLead = wParam;
-            else
-                MultiByteToWideChar(CP_ACP, 0, (LPSTR)&charA, size, &charW, 1);
+            CHAR charA = wParam;
+            MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
         }
 
@@ -916 +905 @@
            break;
         }
-        if( !bDbcsLead )
-            EDIT_WM_Char(hwnd, es, charW);
-#else
-                WCHAR charW;
-                DPRINTF_EDIT_MSG32("WM_CHAR");
-
-                if(unicode)
-                    charW = wParam;
-                else
-                {
-                    CHAR charA = wParam;
-                    MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
-                }
-
-                if ((charW == VK_RETURN || charW == VK_ESCAPE) && es->hwndListBox)
-                {
-                   if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0))
-                      SendMessageW(GetParent(hwnd), WM_KEYDOWN, charW, 0);
-                   break;
-                }
-                EDIT_WM_Char(hwnd, es, charW);
-#endif
+        EDIT_WM_Char(hwnd, es, charW);
         break;
     }
@@ -1016 +984 @@
         result = EDIT_WM_HScroll(hwnd, es, LOWORD(wParam), SHIWORD(wParam));
         break;
+
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+    {
+        WCHAR charW;
+        DPRINTF_EDIT_MSG32("WM_IME_CHAR");
+
+        if(unicode)
+            charW = wParam;
+        else
+        {
+            // always DBCS char
+            CHAR charA[ 2 ];
+
+            charA[ 0 ] = ( CHAR )( wParam >> 8 );
+            charA[ 1 ] = ( CHAR )wParam;
+
+            MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )&charW, 1);
+        }
+
+        EDIT_WM_Char(hwnd, es, charW);
+        break;
+    }
+#endif
 
     case WM_KEYDOWN:

trunk/src/user32/listbox.c

@@ -2992 +2992 @@
     case WM_CHAR:
     {
-#ifdef __WIN32OS2__
-        static BOOL bDbcsLead = FALSE;
-        static CHAR cDbcsLead = 0;
-
         WCHAR charW;
         if(unicode)
@@ -3001 +2997 @@
         else
         {
-            WCHAR charA = bDbcsLead ? (( wParam << 8 ) | cDbcsLead ) : wParam;
-            int   size = bDbcsLead ? 2 : 1;
-
-            bDbcsLead = !bDbcsLead && IsDBCSLeadByte( wParam );
-
-            if( bDbcsLead )
-                cDbcsLead = wParam;
-            else
-                MultiByteToWideChar(CP_ACP, 0, (LPSTR)&charA, size, &charW, 1);
-        }
-        return bDbcsLead ? 0 : LISTBOX_HandleChar( hwnd, descr, charW );
-#else
+            CHAR charA = (CHAR)wParam;
+            MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
+        }
+        return LISTBOX_HandleChar( hwnd, descr, charW );
+    }
+
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+    {
         WCHAR charW;
+
         if(unicode)
             charW = (WCHAR)wParam;
         else
         {
-            CHAR charA = (CHAR)wParam;
-            MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
+            // always DBCS char
+            CHAR charA[ 2 ];
+
+            charA[ 0 ] = ( CHAR )( wParam >> 8 );
+            charA[ 1 ] = ( CHAR )wParam;
+
+            MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )&charW, 1);
         }
         return LISTBOX_HandleChar( hwnd, descr, charW );
+    }
 #endif
-    }
 
     case WM_SYSTIMER:

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.74 2003-08-06 11:00:44 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.75 2003-08-08 13:30:19 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -236 +236 @@
 // Check for a queued WM_CHAR message (e.g. inserted by TranslateMessage)
 //******************************************************************************
-BOOL ReturnQueuedWMCHAR(LPMSG pMsg, TEB *teb, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax, 
+BOOL ReturnQueuedWMCHAR(LPMSG pMsg, TEB *teb, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                         BOOL isUnicode, BOOL fRemove)
 {
@@ -251 +251 @@
                 return FALSE;
         }
-    
+
         if(fRemove & PM_REMOVE_W) {
             teb->o.odin.fTranslated = FALSE;
@@ -276 +276 @@
         // call the keyboard hook here
         // send keyboard messages to the registered hooks
-        if(fRemove & PM_REMOVE_W) 
+        if(fRemove & PM_REMOVE_W)
         {
             switch (pMsg->message)
@@ -291 +291 @@
             }
         }
-    
+
         //GetMessageW and PeekMessageW expect the character code in UTF-16
         //(we save it in ascii format)
@@ -298 +298 @@
             CHAR  charA;
             WCHAR charW;
-    
+
             charA = pMsg->wParam;
             MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1);
@@ -400 +400 @@
             goto continuegetmsg;
         break;
-    case WINWM_CHAR:
-    case WINWM_SYSCHAR:
+    case WINWM_IME_CHAR:
         // prevent from calling wrong DispatchMsg() (DBCS generated WM_CHAR)
         memset( &teb->o.odin.winmsg, 0, sizeof( MSG ));
@@ -464 +463 @@
         ULONG ulPMFilter;
 
-        for(int i=0;i<uMsgFilterMax-uMsgFilterMin+1;i++) 
+        for(int i=0;i<uMsgFilterMax-uMsgFilterMin+1;i++)
         {
             rc = 0;
@@ -523 +522 @@
                 goto continuepeekmsg;
             break;
-        case WINWM_CHAR:
-        case WINWM_SYSCHAR:
+        case WINWM_IME_CHAR:
             // prevent from calling wrong DispatchMsg() (DBCS generated WM_CHAR)
             memset( &teb->o.odin.winmsg, 0, sizeof( MSG ));

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.21 2003-07-28 11:27:45 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.22 2003-08-08 13:30:19 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -147 +147 @@
 #define WINWM_SYSDEADCHAR           0x0107
 #define WINWM_KEYLAST               0x0108
+#define WINWM_IME_STARTCOMPOSITION  0x010D
+#define WINWM_IME_ENDCOMPOSITION    0x010E
+#define WINWM_IME_COMPOSITION       0x010F
+#define WINWM_IME_KEYLAST           0x010F
 #define WINWM_INITDIALOG            0x0110
 #define WINWM_COMMAND               0x0111
@@ -195 +199 @@
 #define WINWM_DROPFILES             0x0233
 #define WINWM_MDIREFRESHMENU        0x0234
+#define WINWM_IME_SETCONTEXT        0x0281
+#define WINWM_IME_NOTIFY            0x0282
+#define WINWM_IME_CONTROL           0x0283
+#define WINWM_IME_COMPOSITIONFULL   0x0284
+#define WINWM_IME_SELECT            0x0285
+#define WINWM_IME_CHAR              0x0286
+#define WINWM_IME_REQUEST           0x0288
+#define WINWM_IME_KEYDOWN           0x0290
+#define WINWM_IME_KEYUP             0x0291
 #define WINWM_CUT                   0x0300
 #define WINWM_COPY                  0x0301

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.114 2003-08-06 11:00:45 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.115 2003-08-08 13:30:19 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -720 +720 @@
         WORD  wWinScan;
 
-        if ( (!IsDBCSEnv() && scanCode == 0) || 
-             (scanCode==0 ) && !( flags & KC_CHAR ) ) 
+        if ( (!IsDBCSEnv() && scanCode == 0) ||
+             (scanCode==0 ) && !( flags & KC_CHAR ) )
         {
             goto dummymessage;
@@ -746 +746 @@
             if( CHAR2FROMMP( os2Msg->mp2 ))     // DBCS character
             {
+                CHAR dbcsCh[ 2 ] = { CHAR1FROMMP( os2Msg->mp2 ), CHAR2FROMMP( os2Msg->mp2 )};
+
                 if( isUnicode )
                 {
-                    char  dbcsCh[] = { CHAR1FROMMP( os2Msg->mp2 ), CHAR2FROMMP( os2Msg->mp2 ), 0 };
-                    WCHAR uniChar[ 2 ];
-
-                    lstrcpynAtoW(( LPWSTR )&uniChar, ( LPCSTR )&dbcsCh, 2 );
-                    winMsg->wParam = ( WPARAM )uniChar[ 0 ];
+                    WCHAR  uniChar;
+
+                    MultiByteToWideChar( CP_ACP, 0, dbcsCh, 2, &uniChar, 1 );
+                    winMsg->wParam = ( WPARAM )uniChar;
                 }
-                // insert DBCS trail byte for Non-Unicode window
-                else if(fMsgRemoved && !(teb->o.odin.fTranslated))
-                {
-                    MSG extramsg;
-                    memcpy(&extramsg, winMsg, sizeof(MSG));
-
-                    //After SetFocus(0), all keystrokes are converted in WM_SYS*
-                    extramsg.message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR : WINWM_CHAR;
-
-                    extramsg.wParam = CHAR2FROMMP( os2Msg->mp2 );
-                    extramsg.lParam = 0;
-
-                    setThreadQueueExtraCharMessage(teb, &extramsg);
-                }
+                else
+                    winMsg->wParam = ( dbcsCh[ 0 ] << 8 ) | dbcsCh[ 1 ];
             }
         }
@@ -830 +819 @@
           else if( scanCode == 0 )
           {
-            //After SetFocus(0), all keystrokes are converted in WM_SYS*
-            winMsg->message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR :  WINWM_CHAR;
+            if( CHAR2FROMMP( os2Msg->mp2 ))
+                winMsg->message = WINWM_IME_CHAR;
+            else
+            {
+                //After SetFocus(0), all keystrokes are converted in WM_SYS*
+                winMsg->message = (fIgnoreKeystrokes) ? WINWM_SYSCHAR :  WINWM_CHAR;
+            }
           }
           else

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.376 2003-07-31 15:56:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.377 2003-08-08 13:30:20 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2123 +2123 @@
         return 0; //comctl32 controls expect this
 
+    case WM_IME_CHAR:
+        if( wParam & 0xFF00 ) // DBCS ? 
+            SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam >> 8 ), lParam ); 
+        SendMessageA( getWindowHandle(), WM_CHAR, ( WPARAM )( BYTE )( wParam & 0xFF ), lParam );
+        break;
+
     default:
         return 0;
@@ -2205 +2211 @@
         return TRUE;
     }
+
+    case WM_IME_CHAR:
+        SendMessageW( getWindowHandle(), WM_CHAR, wParam, lParam );
+        return 0;
 
     default:

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.46 2003-08-04 17:01:58 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.47 2003-08-08 13:30:22 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -35 +35 @@
 #include "timer.h"
 
-#define DBG_LOCALLOG    DBG_windowmsg
+#define DBG_LOCALLOG    DBG_windowmsg
 #include "dbglocal.h"
 
@@ -50 +50 @@
     if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
     {
-        if (msg->lParam)
+    if (msg->lParam)
         {
 /*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
@@ -56 +56 @@
             /* before calling window proc, verify whether timer is still valid;
                there's a slim chance that the application kills the timer
-               between GetMessage and DispatchMessage API calls */
+           between GetMessage and DispatchMessage API calls */
             if (!TIMER_IsTimerValid(msg->hwnd, (UINT) msg->wParam, msg->lParam))
                 return 0; /* invalid winproc */
 
-            return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
+        return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
                                    msg->message, msg->wParam, GetTickCount() );
         }
@@ -76 +76 @@
     if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
     {
-        if (msg->lParam)
+    if (msg->lParam)
         {
 /*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
@@ -82 +82 @@
             /* before calling window proc, verify whether timer is still valid;
                there's a slim chance that the application kills the timer
-               between GetMessage and DispatchMessage API calls */
+           between GetMessage and DispatchMessage API calls */
             if (!TIMER_IsTimerValid(msg->hwnd, (UINT) msg->wParam, msg->lParam))
                 return 0; /* invalid winproc */
 
-            return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd,
+        return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd,
                                    msg->message, msg->wParam, GetTickCount() );
         }
@@ -100 +100 @@
          (msg->message >  WM_SYSKEYUP)||
          (msg->message == WM_CHAR)    ||
+#ifdef __WIN32OS2__
+         (msg->message == WM_DEADCHAR)||
+         (msg->message == WM_IME_CHAR) )
+#else
          (msg->message == WM_DEADCHAR) )
+#endif
     {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -448 +453 @@
         return 0;
 
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+    {
+        // always DBCS char
+        CHAR charA[ 2 ];
+
+        charA[ 0 ] = ( CHAR )( *pwparam >> 8 );
+        charA[ 1 ] = ( CHAR )*pwparam;
+
+        MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )pwparam, 1);
+
+        return 0;
+    }
+#endif
+
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
@@ -725 +745 @@
         return 0;
 
+#ifdef __WIN32OS2__
+    case WM_IME_CHAR:
+    {   // always DBCS char
+        CHAR charA[ 2 ];
+
+        WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )pwparam, 1, ( LPSTR )charA, 2, 0, 0 );
+        *pwparam = ( charA[ 0 ] << 8 ) | charA[ 1 ];
+
+        return 0;
+    }
+#endif
+
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
@@ -862 +894 @@
     LRESULT result;
 
-#ifdef __WIN32OS2__
-    if( IsDBCSEnv() && msg == WM_CHAR )
-    {
-        static BYTE dbcsLead = 0;
-        WCHAR charA = wParam;
-        int size = dbcsLead ? 2 : 1;
-
-        if( dbcsLead )
-               charA = ( charA << 8 ) | dbcsLead;
-        else if( IsDBCSLeadByte( wParam ))
-        {
-            dbcsLead = wParam;
-            return 0;
-        }
-        MultiByteToWideChar( CP_ACP, 0, ( LPSTR )&charA, size, ( LPWSTR )&wParam, 1 );
-
-        dbcsLead = 0;
-    }
-    else
-#endif
     if (WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam ) == -1) return 0;
 
@@ -888 +900 @@
 
 #ifdef __WIN32OS2__
-    if(IsDBCSEnv()) 
+    if(IsDBCSEnv())
     {
       switch( msg )
@@ -940 +952 @@
     LRESULT result;
 
-#ifdef __WIN32OS2__
-    if( IsDBCSEnv() && msg == WM_CHAR )
-    {
-        char charA[ 2 ];
-
-        if( WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )&wParam, 1, ( LPSTR )charA, 2, 0, 0 ) > 1 )
-        {
-            func( hwnd, msg, ( WPARAM )charA[ 0 ], lParam );
-            wParam = charA[ 1 ];
-        }
-        else
-            wParam = charA[ 0 ];
-    }
-    else
-#endif
     if (WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam ) == -1) return 0;