Changeset 4194 for trunk/src/user32/winproc.cpp

Timestamp:

Sep 5, 2000, 9:20:38 PM (25 years ago)

Author:

sandervl

Message:

WM_FOCUSCHANGE fixes + misc fixes

File:

• trunk/src/user32/winproc.cpp (modified) (5 diffs)

trunk/src/user32/winproc.cpp

@@ -1 @@
-/* $Id: winproc.cpp,v 1.5 2000-09-04 18:23:58 sandervl Exp $ */
+/* $Id: winproc.cpp,v 1.6 2000-09-05 19:20:38 sandervl Exp $ */
 /*
  * Window procedure callbacks
@@ -302 +302 @@
     WINDOWPROC *proc = WINPROC_GetPtr( func );
 
+    if(proc) {
+          dprintf2(("CallWindowProcA %x %x %x %x %x -> proc %x, type %d, org func %x", func, hwnd, msg, wParam, lParam, proc, proc->type, WINPROC_THUNKPROC(proc)));
+    }
+    else  dprintf2(("CallWindowProcA %x %x %x %x %x (unknown proc)", func, hwnd, msg, wParam, lParam));
+   
     Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window) {
@@ -310 +315 @@
 
     if (!proc) return func(hwnd, msg, wParam, lParam );
-
-#if testing
-    func = WINPROC_GetProc( (HWINDOWPROC)proc, WIN_PROC_32A );
-    return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
-#endif
 
     switch(proc->type)
@@ -337 +337 @@
     WINDOWPROC *proc = WINPROC_GetPtr( func );
 
+    if(proc) {
+          dprintf2(("CallWindowProcW %x %x %x %x %x -> proc %x, type %d, org func %x", func, hwnd, msg, wParam, lParam, proc, proc->type, WINPROC_THUNKPROC(proc)));
+    }
+    else  dprintf2(("CallWindowProcW %x %x %x %x %x (unknown proc)", func, hwnd, msg, wParam, lParam));
+
     Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window) {
@@ -345 +350 @@
 
     if (!proc) return func( hwnd, msg, wParam, lParam );
-
-#if testing
-    func = WINPROC_GetProc( (HWINDOWPROC)proc, WIN_PROC_32W );
-    return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
-#endif
 
     switch(proc->type)