Changeset 10602 for trunk/src/user32/winproc.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/winproc.cpp (modified) (5 diffs)

trunk/src/user32/winproc.cpp

@@ -1 @@
-/* $Id: winproc.cpp,v 1.8 2003-10-02 10:36:00 sandervl Exp $ */
+/* $Id: winproc.cpp,v 1.9 2004-05-11 09:08:20 sandervl Exp $ */
 /*
  * Window procedure callbacks
@@ -17 +17 @@
 #include <os2win.h>
 #include <string.h>
+#include "callwrap.h"
 #include <win\winproc.h>
 #include <win\debugtools.h>
@@ -313 +314 @@
     }
 
-    if (!proc) return func(hwnd, msg, wParam, lParam );
+    if (!proc) return WrapCallback4(func, hwnd, msg, wParam, lParam );
 
     switch(proc->type)
     {
     case WIN_PROC_32A:
-        return func(hwnd, msg, wParam, lParam );
+        return WrapCallback4(func, hwnd, msg, wParam, lParam );
     case WIN_PROC_32W:
         return WINPROC_CallProc32ATo32W( func, hwnd, msg, wParam, lParam );
@@ -347 +348 @@
     }
 
-    if (!proc) return func( hwnd, msg, wParam, lParam );
+    if (!proc) return WrapCallback4(func,  hwnd, msg, wParam, lParam );
 
     switch(proc->type)
@@ -354 +355 @@
         return WINPROC_CallProc32WTo32A( func, hwnd, msg, wParam, lParam );
     case WIN_PROC_32W:
-        return func(hwnd, msg, wParam, lParam );
+        return WrapCallback4(func, hwnd, msg, wParam, lParam );
     default:
         WARN_(relay)("Invalid proc %p\n", proc );