Changeset 10607 for trunk/src/user32/windowmsg.cpp

Timestamp:

May 24, 2004, 11:02:01 AM (21 years ago)

Author:

sandervl

Message:

KOM: Updates

File:

• trunk/src/user32/windowmsg.cpp (modified) (13 diffs)

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.50 2004-05-11 09:08:20 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.51 2004-05-24 09:02:01 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -34 +34 @@
 #define INCL_TIMERWIN32
 #include "timer.h"
-#include "callwrap.h"
 
 #define DBG_LOCALLOG    DBG_windowmsg
@@ -327 +326 @@
  * @author  knut st. osmundsen <bird-srcspam@anduin.net>
  * @remark  One cannot attach a threads input queue to it self.
- * @remark  This implemenation requires the thread which input is 'forwarded' to
- *          process it's message queue. Window (and wine) will not bother that thread
- *          at all with the messages. (DEADLOCK WARNING)
  * @todo    Not sure if all this is 100% ok according to the windows reality.
  *          I'm sure some error cases aren't caught.
@@ -566 +562 @@
     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);
+        INT  lenA = 1;
+
+        if( IsDBCSLeadByte(( CHAR )( *pwparam >> 8 )))
+        {
+            charA[ 0 ] = ( CHAR )( *pwparam >> 8 );
+            charA[ 1 ] = ( CHAR )*pwparam;
+            lenA = 2;
+        }
+        else
+            charA[ 0 ] = ( CHAR )*pwparam;
+
+        MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, lenA, ( LPWSTR )pwparam, 1);
 
         return 0;
@@ -857 +859 @@
 #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 ];
+        INT  lenA;
+
+        lenA = WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )pwparam, 1, ( LPSTR )charA, 2, 0, 0 );
+        if( lenA > 1 )
+            *pwparam = ( charA[ 0 ] << 8 ) | charA[ 1 ];
+        else
+            *pwparam = charA[ 0 ];
 
         return 0;
@@ -1003 +1009 @@
 {
     LRESULT result;
+    LPARAM old = lParam;
 
     if (WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam ) == -1) return 0;
 
-    result = WrapCallback4(func,  hwnd, msg, wParam, lParam );
+    result = func( hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
 
@@ -1017 +1024 @@
         {
             LPWSTR ustr = ( LPWSTR )HeapAlloc( GetProcessHeap(), 0, ( result + 1 ) * sizeof( WCHAR ));
-            result = WrapCallback4(func,  hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )ustr );
+            result = func( hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )ustr );
             result = lstrlenWtoA( ustr, result );
             HeapFree( GetProcessHeap(), 0, ustr );
@@ -1026 +1033 @@
         {
             LPWSTR ustr = ( LPWSTR )HeapAlloc( GetProcessHeap(), 0, ( result + 1 ) * sizeof( WCHAR ));
-            result = WrapCallback4(func,  hwnd, LB_GETTEXT, wParam, ( LPARAM )ustr );
+            result = func( hwnd, LB_GETTEXT, wParam, ( LPARAM )ustr );
             if( result != LB_ERR )
                 result = lstrlenWtoA( ustr, result );
@@ -1038 +1045 @@
         {
             LPWSTR ustr = ( LPWSTR )HeapAlloc( GetProcessHeap(), 0, ( result + 1 ) * sizeof( WCHAR ));
-            result = WrapCallback4(func,  hwnd, CB_GETLBTEXT, wParam, ( LPARAM )ustr );
+            result = func( hwnd, CB_GETLBTEXT, wParam, ( LPARAM )ustr );
             if( result != CB_ERR )
                 result = lstrlenWtoA( ustr, result );
@@ -1064 +1071 @@
     if (WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam ) == -1) return 0;
 
-    result = WrapCallback4(func,  hwnd, msg, wParam, lParam );
+    result = func( hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam );
 
@@ -1075 +1082 @@
         {
             LPSTR astr = ( LPSTR )HeapAlloc( GetProcessHeap(), 0, result + 1 );
-            result = WrapCallback4(func,  hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )astr );
+            result = func( hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )astr );
             result = lstrlenAtoW( astr, result );
             HeapFree( GetProcessHeap(), 0, astr );
@@ -1084 +1091 @@
         {
             LPSTR astr = ( LPSTR )HeapAlloc( GetProcessHeap(), 0, result + 1 );
-            result = WrapCallback4(func,  hwnd, LB_GETTEXT, wParam, ( LPARAM )astr );
+            result = func( hwnd, LB_GETTEXT, wParam, ( LPARAM )astr );
             if( result != LB_ERR )
                 result = lstrlenAtoW( astr, result );
@@ -1096 +1103 @@
         {
             LPSTR astr = ( LPSTR )HeapAlloc( GetProcessHeap(), 0, result + 1 );
-            result = WrapCallback4(func,  hwnd, CB_GETLBTEXT, wParam, ( LPARAM )astr );
+            result = func( hwnd, CB_GETLBTEXT, wParam, ( LPARAM )astr );
             if( result != CB_ERR )
                 result = lstrlenAtoW( astr, result );