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

Timestamp:

Jun 18, 2009, 12:04:13 PM (16 years ago)

Author:

ydario

Message:

User32 updates.

File:

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

trunk/src/user32/windowmsg.cpp

@@ -34 +34 @@
 #define INCL_TIMERWIN32
 #include "timer.h"
+#include "callwrap.h"
 
 #define DBG_LOCALLOG    DBG_windowmsg
@@ -326 +327 @@
  * @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.
@@ -562 +566 @@
     case WM_IME_CHAR:
     {
+        // always DBCS char
         CHAR charA[ 2 ];
-        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);
+
+        MultiByteToWideChar( CP_ACP, 0, ( LPSTR )charA, 2, ( LPWSTR )pwparam, 1);
 
         return 0;
@@ -859 +857 @@
 #ifdef __WIN32OS2__
     case WM_IME_CHAR:
-    {
+    {   // always DBCS char
         CHAR charA[ 2 ];
-        INT  lenA;
-
-        lenA = WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )pwparam, 1, ( LPSTR )charA, 2, 0, 0 );
-        if( lenA > 1 )
+
+        WideCharToMultiByte( CP_ACP, 0, ( LPWSTR )pwparam, 1, ( LPSTR )charA, 2, 0, 0 );
             *pwparam = ( charA[ 0 ] << 8 ) | charA[ 1 ];
-        else
-            *pwparam = charA[ 0 ];
 
         return 0;
@@ -1009 +1003 @@
 {
     LRESULT result;
-    LPARAM old = lParam;
 
     if (WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam ) == -1) return 0;
 
-    result = func( hwnd, msg, wParam, lParam );
+    result = WrapCallback4(func,  hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
 
@@ -1024 +1017 @@
         {
             LPWSTR ustr = ( LPWSTR )HeapAlloc( GetProcessHeap(), 0, ( result + 1 ) * sizeof( WCHAR ));
-            result = func( hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )ustr );
+            result = WrapCallback4(func,  hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )ustr );
             result = lstrlenWtoA( ustr, result );
             HeapFree( GetProcessHeap(), 0, ustr );
@@ -1033 +1026 @@
         {
             LPWSTR ustr = ( LPWSTR )HeapAlloc( GetProcessHeap(), 0, ( result + 1 ) * sizeof( WCHAR ));
-            result = func( hwnd, LB_GETTEXT, wParam, ( LPARAM )ustr );
+            result = WrapCallback4(func,  hwnd, LB_GETTEXT, wParam, ( LPARAM )ustr );
             if( result != LB_ERR )
                 result = lstrlenWtoA( ustr, result );
@@ -1045 +1038 @@
         {
             LPWSTR ustr = ( LPWSTR )HeapAlloc( GetProcessHeap(), 0, ( result + 1 ) * sizeof( WCHAR ));
-            result = func( hwnd, CB_GETLBTEXT, wParam, ( LPARAM )ustr );
+            result = WrapCallback4(func,  hwnd, CB_GETLBTEXT, wParam, ( LPARAM )ustr );
             if( result != CB_ERR )
                 result = lstrlenWtoA( ustr, result );
@@ -1071 +1064 @@
     if (WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam ) == -1) return 0;
 
-    result = func( hwnd, msg, wParam, lParam );
+    result = WrapCallback4(func,  hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam );
 
@@ -1082 +1075 @@
         {
             LPSTR astr = ( LPSTR )HeapAlloc( GetProcessHeap(), 0, result + 1 );
-            result = func( hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )astr );
+            result = WrapCallback4(func,  hwnd, WM_GETTEXT, ( WPARAM )( result + 1 ), ( LPARAM )astr );
             result = lstrlenAtoW( astr, result );
             HeapFree( GetProcessHeap(), 0, astr );
@@ -1091 +1084 @@
         {
             LPSTR astr = ( LPSTR )HeapAlloc( GetProcessHeap(), 0, result + 1 );
-            result = func( hwnd, LB_GETTEXT, wParam, ( LPARAM )astr );
+            result = WrapCallback4(func,  hwnd, LB_GETTEXT, wParam, ( LPARAM )astr );
             if( result != LB_ERR )
                 result = lstrlenAtoW( astr, result );
@@ -1103 +1096 @@
         {
             LPSTR astr = ( LPSTR )HeapAlloc( GetProcessHeap(), 0, result + 1 );
-            result = func( hwnd, CB_GETLBTEXT, wParam, ( LPARAM )astr );
+            result = WrapCallback4(func,  hwnd, CB_GETLBTEXT, wParam, ( LPARAM )astr );
             if( result != CB_ERR )
                 result = lstrlenAtoW( astr, result );