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

Timestamp:

May 11, 2004, 11:08:20 AM (21 years ago)

Author:

sandervl

Message:

DT: Added wrappers for calling window handlers

File:

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

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.49 2004-02-04 14:59:57 bird Exp $ */
+/* $Id: windowmsg.cpp,v 1.50 2004-05-11 09:08:20 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
@@ -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.
@@ -1002 +1006 @@
     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 );
 
@@ -1013 +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 );
@@ -1022 +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 );
@@ -1034 +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 );
@@ -1060 +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 );
 
@@ -1071 +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 );
@@ -1080 +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 );
@@ -1092 +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 );