Changeset 21308 for trunk/src/user32

Timestamp:

Jun 18, 2009, 6:27:45 PM (16 years ago)

Author:

ydario

Message:

Minor updates, backout imm changes.

Location:

trunk/src/user32

Files:

• Makefile (modified) (1 diff)
• USER32.DEF (modified) (1 diff)
• edit.c (modified) (7 diffs)
• listbox.c (modified) (1 diff)
• oslibmsgtranslate.cpp (modified) (6 diffs)
• pmwindow.cpp (modified) (5 diffs)

trunk/src/user32/Makefile

@@ -130 +130 @@
 $(ODIN32_LIB)/libuls.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
+$(ODIN32_LIB)/imm32os2.lib \
 OS2386.LIB \
 $(RTLLIB_O)

trunk/src/user32/USER32.DEF

@@ -750 +750 @@
     _clipboardPMToOdinFormat@4                                   @2043 NONAME
     _clipboardOdinToPMFormat@4                                   @2044 NONAME
+
+    _GetOS2Icon@4                                                @2045 NONAME

trunk/src/user32/edit.c

@@ -31 +31 @@
 #include "ctrlconf.h"
 #include <heapstring.h>
+#include <imm.h>
 #endif
 
@@ -128 +129 @@
     HLOCAL hloc32A;     /* alias for ANSI control receiving EM_GETHANDLE
                    or EM_SETHANDLE */
+#ifdef __WIN32OS2__
+    LPWSTR  compStr;
+    INT     compStrLen;
+    BOOL    moveCaret;
+    DWORD   sentenceMode;
+#endif
 } EDITSTATE;
 
@@ -1113 +1120 @@
             // always DBCS char
             CHAR charA[ 2 ];
-
+            INT  lenA = 1;
+
+            if( IsDBCSLeadByte(( CHAR )( wParam >> 8 )))
+            {
                 charA[ 0 ] = ( CHAR )( wParam >> 8 );
                 charA[ 1 ] = ( CHAR )wParam;
-
-            MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )&charW, 1);
+                lenA = 2;
+            }
+            else
+                charA[ 0 ] = ( CHAR )wParam;
+
+            MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, lenA, ( LPWSTR )&charW, 1);
         }
 
@@ -1123 +1137 @@
         break;
     }
+
+    case WM_IME_COMPOSITION:
+    {
+        HIMC    himc;
+        LONG    bufSize;
+        INT     i;
+        BOOL    passToDefWnd = FALSE;
+#ifdef DEBUG
+        LPSTR   strA;
+        INT     lenA;
+#endif
+
+        DPRINTF_EDIT_MSG32("WM_IME_COMPOSITION");
+
+        himc = ImmGetContext( hwnd );
+
+        if( es->sentenceMode )
+            passToDefWnd = TRUE;
+        else if( lParam & GCS_RESULTSTR )
+        {
+            LPWSTR  resultStr = NULL;
+            INT     resultStrLen = 0;
+
+            dprintf(("WM_IME_COMPOSITION : GCS_RESULTSTR"));
+
+            bufSize = ImmGetCompositionStringW( himc, GCS_RESULTSTR, NULL, 0 );
+            if( bufSize > 0 )
+            {
+                INT i;
+
+                resultStrLen = bufSize / sizeof( WCHAR );
+                resultStr = malloc( bufSize + sizeof( WCHAR ));
+                resultStr[ resultStrLen ] = 0;
+
+                ImmGetCompositionStringW( himc, GCS_RESULTSTR, resultStr, bufSize );
+
+#ifdef DEBUG
+                lenA = WideCharToMultiByte( CP_ACP, 0, resultStr, resultStrLen, 0, 0, 0, 0 );
+                strA = malloc( lenA + 1 );
+                WideCharToMultiByte( CP_ACP, 0, resultStr, resultStrLen, strA, lenA, 0, 0 );
+                strA[ lenA ] = 0;
+                dprintf(("Result String : '%s'", strA ));
+                free( strA );
+                dprintf(("Composition Len %d", es->compStrLen ));
+#endif
+                DestroyCaret();
+                if( es->compStrLen > 0 )
+                {
+                    EDIT_EM_SetSel(hwnd, es, (UINT)-1, 0, FALSE);
+                    for( i = 0; i < es->compStrLen; i++ )
+                        EDIT_MoveForward(hwnd, es, TRUE);
+                    EDIT_WM_Clear(hwnd, es);
+                }
+
+                EDIT_EM_ReplaceSel(hwnd, es, TRUE, resultStr, TRUE);
+
+                CreateCaret(hwnd, 0, 2, es->line_height);
+                EDIT_SetCaretPos(hwnd, es, es->selection_end, es->flags & EF_AFTER_WRAP);
+                ShowCaret(hwnd);
+
+                free( resultStr );
+
+            }
+
+            if( es->compStr )
+                free( es->compStr );
+
+            es->compStr = NULL;
+            es->compStrLen = 0;
+        }
+        else if( lParam & GCS_COMPSTR )
+        {
+            INT prevLen = es->compStrLen;
+
+            dprintf(("WM_IME_COMPOSITION : GCS_COMPSTR"));
+
+            if( es->compStr )
+                free( es->compStr );
+
+            es->compStr = NULL;
+            es->compStrLen = 0;
+
+            bufSize = ImmGetCompositionStringW( himc, GCS_COMPSTR, NULL, 0 );
+            if( bufSize > 0 )
+            {
+                HDC     hdc;
+                SIZE    size;
+                BOOL    oldMoveCaret;
+
+                es->compStrLen = bufSize / sizeof( WCHAR );
+                es->compStr = malloc( bufSize + sizeof( WCHAR ));
+                es->compStr[ es->compStrLen ] = 0;
+
+                ImmGetCompositionStringW( himc, GCS_COMPSTR, es->compStr, bufSize );
+
+#ifdef DEBUG
+                lenA = WideCharToMultiByte( CP_ACP, 0, es->compStr, es->compStrLen, 0, 0, 0, 0 );
+                strA = malloc( lenA + 1 );
+                WideCharToMultiByte( CP_ACP, 0, es->compStr, es->compStrLen, strA, lenA, 0, 0  );
+                strA[ lenA ] = 0;
+                dprintf(("Composition String : '%s'", strA ));
+                free( strA );
+#endif
+                hdc = GetDC( hwnd );
+                GetTextExtentPoint32W( hdc, es->compStr, es->compStrLen, &size);
+                ReleaseDC( hwnd, hdc );
+
+                oldMoveCaret = es->moveCaret;
+
+                es->moveCaret = FALSE; // to prevent cursor from flashing too many
+
+                if( prevLen > 0 )
+                {
+                    EDIT_EM_SetSel(hwnd, es, (UINT)-1, 0, FALSE);
+                    for( i = 0; i < prevLen; i++ )
+                        EDIT_MoveForward(hwnd, es, TRUE);
+                    EDIT_WM_Clear(hwnd, es);
+                }
+
+                EDIT_EM_ReplaceSel(hwnd, es, TRUE, es->compStr, TRUE);
+
+                for( i = 0; i < es->compStrLen; i++ )
+                    EDIT_MoveBackward(hwnd, es, FALSE);
+
+                es->moveCaret = oldMoveCaret;
+
+                CreateCaret(hwnd, 0, size.cx, es->line_height);
+                EDIT_SetCaretPos(hwnd, es, es->selection_end, es->flags & EF_AFTER_WRAP);
+                ShowCaret(hwnd);
+            }
+        }
+        else
+            passToDefWnd = TRUE;
+
+        ImmReleaseContext( hwnd, himc );
+
+        if( passToDefWnd )
+        {
+            if( unicode )
+                result = DefWindowProcW( hwnd, msg, wParam, lParam );
+            else
+                result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        }
+        break;
+    }
+
+    case WM_IME_COMPOSITIONFULL:
+        DPRINTF_EDIT_MSG32("WM_IME_COMPOSITIONFULL");
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_CONTROL:
+        DPRINTF_EDIT_MSG32("WM_IME_CONTROL");
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_ENDCOMPOSITION:
+        DPRINTF_EDIT_MSG32("WM_IME_ENDCOMPOSITION");
+
+        if( es->compStr )
+        {
+            INT i;
+
+            DestroyCaret();
+
+            EDIT_EM_SetSel(hwnd, es, (UINT)-1, 0, FALSE);
+            for( i = 0; i < es->compStrLen; i++ )
+                EDIT_MoveForward(hwnd, es, TRUE);
+            EDIT_WM_Clear(hwnd, es);
+
+            CreateCaret(hwnd, 0, 2, es->line_height);
+            EDIT_SetCaretPos(hwnd, es, es->selection_end, es->flags & EF_AFTER_WRAP);
+            ShowCaret(hwnd);
+
+            free( es->compStr );
+        }
+
+        es->compStr = NULL;
+        es->compStrLen = 0;
+
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_NOTIFY:
+        DPRINTF_EDIT_MSG32("WM_IME_NOTIFY");
+
+        if( wParam == IMN_SETSENTENCEMODE )
+        {
+            HIMC  himc;
+            DWORD conversionMode;
+
+            himc = ImmGetContext( hwnd );
+
+            ImmGetConversionStatus( himc, &conversionMode, &es->sentenceMode );
+
+            ImmReleaseContext( hwnd, himc );
+        }
+
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_REQUEST:
+        DPRINTF_EDIT_MSG32("WM_IME_REQUEST");
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_SELECT:
+        DPRINTF_EDIT_MSG32("WM_IME_SELECT");
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_SETCONTEXT:
+        DPRINTF_EDIT_MSG32("WM_IME_SETCONTEXT");
+
+        dprintf(("ImmGetProperty %08lx", ImmGetProperty( 0, IGP_CONVERSION )));
+
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case WM_IME_STARTCOMPOSITION:
+        DPRINTF_EDIT_MSG32("WM_IME_STARTCOMPOSITION");
+
+        es->compStr = NULL;
+        es->compStrLen = 0;
+
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case EM_GETIMESTATUS:
+        DPRINTF_EDIT_MSG32("EM_GETIMESTATUS");
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
+
+    case EM_SETIMESTATUS:
+        DPRINTF_EDIT_MSG32("EM_SETIMESTATUS");
+        if( unicode )
+            result = DefWindowProcW( hwnd, msg, wParam, lParam );
+        else
+            result = DefWindowProcA( hwnd, msg, wParam, lParam );
+        break;
 #endif
 
@@ -2440 +2721 @@
 {
     LRESULT res = EDIT_EM_PosFromChar(hwnd, es, pos, after_wrap);
+
+#ifdef __WIN32OS2__
+    if( es->moveCaret )
+    {
+        HIMC            himc;
+        CANDIDATEFORM   candForm;
+
+        himc = ImmGetContext( hwnd );
+
+#endif
+
     SetCaretPos(SLOWORD(res), SHIWORD(res));
+
+#ifdef __WIN32OS2__
+        if( es->sentenceMode )
+        {
+            COMPOSITIONFORM cf;
+
+            cf.dwStyle = CFS_POINT;
+            cf.ptCurrentPos.x = SLOWORD( res );
+            cf.ptCurrentPos.y = SHIWORD( res );
+
+            ImmSetCompositionWindow( himc, &cf );
+        }
+
+        candForm.dwIndex = 0;
+        candForm.dwStyle = CFS_CANDIDATEPOS;
+        candForm.ptCurrentPos.x = SLOWORD( res );
+        candForm.ptCurrentPos.y = SHIWORD( res ) + es->line_height;
+
+        ImmSetCandidateWindow( himc, &candForm );
+
+        ImmReleaseContext( hwnd, himc );
+    }
+#endif
 }
 
@@ -4773 +5088 @@
     }
 
+#ifdef __WIN32OS2__
+    es->compStr = NULL;
+    es->compStrLen = 0;
+    es->moveCaret = TRUE;
+    {
+        HIMC  himc;
+        DWORD conversionMode;
+
+        himc = ImmGetContext( hwnd );
+
+        ImmGetConversionStatus( himc, &conversionMode, &es->sentenceMode );
+
+        ImmReleaseContext( hwnd, himc );
+    }
+#endif
+
     return TRUE;
 }
@@ -4904 +5235 @@
     es->font = font;
     dc = GetDC(hwnd);
+#ifdef __WIN32OS2__
+    // todo : set font of IME window
+#endif
     if (font)
         old_font = SelectObject(dc, font);

trunk/src/user32/listbox.c

@@ -3028 +3028 @@
             // always DBCS char
             CHAR charA[ 2 ];
-
+            INT  lenA = 1;
+
+            if( IsDBCSLeadByte(( CHAR )( wParam >> 8 )))
+            {
                 charA[ 0 ] = ( CHAR )( wParam >> 8 );
                 charA[ 1 ] = ( CHAR )wParam;
-
-            MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )&charW, 1);
+                lenA = 2;
+            }
+            else
+                charA[ 0 ] = ( CHAR )wParam;
+
+            MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, lenA, ( LPWSTR )&charW, 1);
         }
         return LISTBOX_HandleChar( hwnd, descr, charW );

trunk/src/user32/oslibmsgtranslate.cpp

@@ -15 +15 @@
  *
  */
+#define  INCL_NLS
+#define  INCL_GPI
 #define  INCL_WIN
 #define  INCL_PM
@@ -42 +44 @@
 #include "user32api.h"
 
+#include <os2im.h>
+#include <im32.h>
 
 #define DBG_LOCALLOG    DBG_oslibmsgtranslate
@@ -48 +52 @@
 static BOOL fGenerateDoubleClick = FALSE;
 static MSG  doubleClickMsg = {0};
+
+extern UINT WINAPI GetACP(void); // from winnls.h
 
 //For wheel mouse translation
@@ -753 +759 @@
         if( scanCode != 0 )
         {
+            switch( SHORT2FROMMP( os2Msg->mp2 ))
+            {
+                // for Korean
+                case VK_DBE_HANJA :
+                    bWinVKey = 0x19;
+                    break;
+
+                case VK_DBE_HANGEUL :
+                    bWinVKey = 0x15;
+                    break;
+
+                case VK_DBE_JAMO :
+                    bWinVKey = 0;
+                    break;
+
+                // for Japan
+                case VK_DBE_KATAKANA :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_HIRAGANA :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_SBCSCHAR :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_DBCSCHAR :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_SBCSDBCSCHAR :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_ROMAN :
+                    bWinVKey = 0;
+                    break;
+
+                // for PRC-Chinese
+                case VK_DBE_HANZI :
+                    bWinVKey = 0;
+                    break;
+
+                // for Taiwan
+                case VK_DBE_TSANGJYE :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_PHONETIC :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_CONV :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_NOCONV :
+                    bWinVKey = 0;
+                    break;
+
+                case VK_DBE_ALPHANUMERIC :
+                    switch( GetACP())
+                    {
+                        case 949 :  // Korea
+                        case 1361 :
+                            bWinVKey = 0x15;
+                            break;
+
+                        case 932 :  // Japan
+                        case 942 :
+                        case 943 :
+
+                        case 936 :  // PRC
+                        case 1381 :
+
+                        case 950 :  // Taiwan
+                        default :
+                            bWinVKey = 0;
+                    }
+                    break;
+
+                default :
                     KeyTranslatePMScanToWinVKey(usPMScanCode,
                                                 FALSE,
@@ -758 +848 @@
                                                 &wWinScan,
                                                 &fWinExtended);
+            }
+
             winMsg->wParam = bWinVKey;
         }
@@ -1079 +1171 @@
         break;
 
+    case WM_IMENOTIFY:
+        dprintf(("WM_IMENOTIFY"));
+
+        winMsg->wParam = 0;
+        winMsg->lParam = 0;
+
+        switch(( ULONG )os2Msg->mp1 )
+        {
+            case IMN_STARTCONVERSION :
+                winMsg->message = WM_IME_STARTCOMPOSITION_W;
+                break;
+
+            case IMN_ENDCONVERSION :
+                winMsg->message = WM_IME_ENDCOMPOSITION_W;
+                break;
+
+            case IMN_CONVERSIONFULL :
+                winMsg->message = WM_IME_COMPOSITIONFULL_W;
+                break;
+
+            case IMN_IMECHANGED :
+                winMsg->message = WM_IME_SELECT_W;
+                // todo
+                // fall through
+
+            default :
+                goto dummymessage;
+
+        }
+        break;
+
+    case WM_IMEREQUEST:
+        winMsg->wParam = 0;
+        winMsg->lParam = 0;
+
+        switch(( ULONG )os2Msg->mp1 )
+        {
+            case IMR_INSTANCEACTIVATE :
+            {
+                USHORT usIMR_IA = LOUSHORT( os2Msg->mp2 );
+
+                winMsg->message = WM_IME_SETCONTEXT_W;
+                winMsg->wParam = HIUSHORT( os2Msg->mp2 );
+
+                if( usIMR_IA & IMR_IA_STATUS )
+                    winMsg->lParam |= ISC_SHOWUIGUIDELINE_W;
+
+                if( usIMR_IA & IMR_IA_CONVERSION )
+                    winMsg->lParam |= ISC_SHOWUICOMPOSITIONWINDOW_W;
+
+                if( usIMR_IA & IMR_IA_CANDIDATE )
+                    winMsg->lParam |= ISC_SHOWUIALLCANDIDATEWINDOW_W;
+
+                if( usIMR_IA & IMR_IA_INFOMSG )
+                    winMsg->lParam |= 0; // todo
+
+                if( usIMR_IA & IMR_IA_REGWORD )
+                    winMsg->lParam |= 0; // todo
+                break;
+            }
+
+            case IMR_STATUS :
+                winMsg->message = WM_IME_NOTIFY_W;
+
+                switch(( ULONG )os2Msg->mp2 )
+                {
+                    case IMR_STATUS_SHOW :
+                        winMsg->wParam = IMN_OPENSTATUSWINDOW_W;
+                        break;
+
+                    case IMR_STATUS_HIDE :
+                        winMsg->wParam = IMN_CLOSESTATUSWINDOW_W;
+                        break;
+
+                    case IMR_STATUS_INPUTMODE : // IMN_SETOPENSTATUS followed by IMN_SETCONVERSIONMODE
+                        winMsg->wParam = IMN_SETOPENSTATUS_W;
+                        break;
+
+                    case IMR_STATUS_CONVERSIONMODE :
+                        winMsg->wParam = IMN_SETSENTENCEMODE_W;
+                        break;
+
+                    case IMR_STATUS_STATUSPOS :
+                        winMsg->wParam = IMN_SETSTATUSWINDOWPOS_W;
+                        break;
+
+                    case IMR_STATUS_STRING :
+                    case IMR_STATUS_STRINGATTR :
+                    case IMR_STATUS_CURSORPOS :
+                    case IMR_STATUS_CURSORATTR :
+
+                    default :
+                        // todo
+                        goto dummymessage;
+
+                }
+                break;
+
+            case IMR_CONVRESULT :
+            {
+                ULONG ulIMR = ( ULONG )os2Msg->mp2;
+
+                winMsg->message = WM_IME_COMPOSITION_W;
+                winMsg->wParam = 0; // todo : current DBCS char
+
+                if( ulIMR & IMR_CONV_CONVERSIONSTRING )
+                    winMsg->lParam |= GCS_COMPSTR_W;
+
+                if( ulIMR & IMR_CONV_CONVERSIONATTR )
+                    winMsg->lParam |= GCS_COMPATTR_W;
+
+                if( ulIMR & IMR_CONV_CONVERSIONCLAUSE )
+                    winMsg->lParam |= GCS_COMPCLAUSE_W;
+
+                if( ulIMR & IMR_CONV_READINGSTRING )
+                    winMsg->lParam |= GCS_COMPREADSTR_W;
+
+                if( ulIMR & IMR_CONV_READINGATTR )
+                    winMsg->lParam |= GCS_COMPREADATTR_W;
+
+                if( ulIMR & IMR_CONV_READINGCLAUSE )
+                    winMsg->lParam |= GCS_COMPREADCLAUSE_W;
+
+                if( ulIMR & IMR_CONV_CURSORPOS )
+                    winMsg->lParam |= GCS_CURSORPOS_W;
+
+                if( ulIMR & IMR_CONV_CURSORATTR )
+                    winMsg->lParam |= 0; // todo
+
+                if( ulIMR & IMR_CONV_CHANGESTART )
+                    winMsg->lParam |= GCS_DELTASTART_W;
+
+                if( ulIMR & IMR_CONV_INSERTCHAR )
+                    winMsg->lParam |= CS_INSERTCHAR_W;
+
+                if( ulIMR & IMR_CONV_NOMOVECARET )
+                    winMsg->lParam |= CS_NOMOVECARET_W;
+
+                if( ulIMR & IMR_CONV_CONVERSIONFONT )
+                    winMsg->lParam |= 0; // todo
+
+                if( ulIMR & IMR_CONV_CONVERSIONPOS )
+                    winMsg->lParam |= 0; // todo
+
+                if( ulIMR & IMR_RESULT_RESULTSTRING )
+                    winMsg->lParam = GCS_RESULTSTR_W; // clear all composition info
+
+                if( ulIMR & IMR_RESULT_RESULTATTR )
+                    winMsg->lParam |= 0; // todo
+
+                if( ulIMR & IMR_RESULT_RESULTCLAUSE )
+                    winMsg->lParam |= GCS_RESULTCLAUSE_W;
+
+                if( ulIMR & IMR_RESULT_READINGSTRING )
+                    winMsg->lParam |= GCS_RESULTREADSTR_W;
+
+                if( ulIMR & IMR_RESULT_READINGATTR )
+                    winMsg->lParam |= 0; // todo
+
+                if( ulIMR & IMR_RESULT_READINGCLAUSE )
+                    winMsg->lParam |= GCS_RESULTREADCLAUSE_W;
+
+                if( ulIMR && ( winMsg->lParam == 0 ))
+                    goto dummymessage;
+                break;
+            }
+
+            case IMR_CANDIDATE :
+                winMsg->message = WM_IME_NOTIFY_W;
+                switch(( ULONG )os2Msg->mp2 )
+                {
+                    case IMR_CANDIDATE_SHOW :
+                    case IMR_CANDIDATE_HIDE :
+                    case IMR_CANDIDATE_SELECT :
+                    case IMR_CANDIDATE_CHANGE :
+                    case IMR_CANDIDATE_CANDIDATEPOS :
+                    default :
+                        // todo
+                        goto dummymessage;
+                }
+                break;
+
+            case IMR_INFOMSG :
+                winMsg->message = WM_IME_NOTIFY_W;
+                winMsg->wParam = IMN_GUIDELINE_W;
+                break;
+
+            case IMR_REGWORD :
+                goto dummymessage;
+
+            case IMR_IMECHANGE :
+                winMsg->message = WM_IME_SELECT_W;
+                // todo
+                goto dummymessage;
+
+            case IMR_CONFIG :
+                // todo
+                goto dummymessage;
+
+            case IMR_DICTIONARY :
+                // todo
+                goto dummymessage;
+
+            case IMR_OTHERINFO :
+                // todo
+                goto dummymessage;
+        }
+        break;
+
+#if 0 // application cannot receive this message
+    case WM_IMECONTROL:
+#endif
     case WM_INITMENU:
     case WM_MENUSELECT:

trunk/src/user32/pmwindow.cpp

@@ -61 +61 @@
 #include "user32api.h"
 #include <kbdhook.h>
+#include <heapstring.h>
+
+#include <os2im.h>
+#include <im32.h>
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -140 +144 @@
 #endif
 
+extern "C" ULONG OSLibImSetMsgQueueProperty( ULONG, ULONG );
+
 //******************************************************************************
 // Initialize PM; create hab, message queue and register special Win32 window classes
@@ -194 +200 @@
     BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
     dprintf(("InitPM: WinSetCP was %sOK", rc ? "" : "not "));
+
+    /* IM instace is created per message queue, that is, thread */
+    if( IsDBCSEnv())
+        OSLibImSetMsgQueueProperty( hmq, MQP_INSTANCE_PERMQ );
 
     //CD polling window class
@@ -1004 +1014 @@
         dprintf(("OS2: %s %x %x %x", (msg == WM_HSCROLL) ? "WM_HSCROLL" : "WM_VSCROLL", win32wnd->getWindowHandle(), mp1, mp2));
         win32wnd->DispatchMsgA(pWinMsg);
+        break;
+
+    case WM_IMEREQUEST:
+    case WM_IMECONTROL:
+    case WM_IMENOTIFY:
+        if( pWinMsg->message )
+        {
+            win32wnd->DispatchMsgA( pWinMsg );
+
+            if(( pWinMsg->message = WM_IME_NOTIFY_W ) &&
+               ( pWinMsg->wParam == IMN_SETOPENSTATUS_W ))
+            {
+                MSG m;
+
+                m.message = WM_IME_NOTIFY_W;
+                m.wParam = IMN_SETCONVERSIONMODE_W;
+                m.lParam = 0;
+
+                win32wnd->DispatchMsgA( &m );
+            }
+        }
+        else
+            goto RunDefWndProc;
         break;
 
@@ -2210 +2243 @@
         break;
 
+    case WM_IMEREQUEST:
+    case WM_IMECONTROL:
+    case WM_IMENOTIFY:
+        if( pWinMsg->message )
+        {
+            dprintf(("Frame window received IME message"));
+            win32wnd->DispatchMsgA( pWinMsg );
+
+            if(( pWinMsg->message = WM_IME_NOTIFY_W ) &&
+               ( pWinMsg->wParam == IMN_SETOPENSTATUS_W ))
+            {
+                MSG m;
+
+                m.message = WM_IME_NOTIFY_W;
+                m.wParam = IMN_SETCONVERSIONMODE_W;
+                m.lParam = 0;
+
+                win32wnd->DispatchMsgA( &m );
+            }
+        }
+        else
+            goto RunDefWndProc;
+        break;
+
 #ifdef DEBUG
     case WM_DDE_INITIATE: