Changeset 10216 for trunk/src/user32/listbox.c

Timestamp:

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

Author:

sandervl

Message:

KOM: WM_IME_CHAR generation + processing added for DBCS input

File:

• trunk/src/user32/listbox.c (modified) (2 diffs)

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: