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

Timestamp:

Sep 4, 2000, 8:23:58 PM (25 years ago)

Author:

sandervl

Message:

SetWindowLong changes + fixes for GWL_WNDPROC

File:

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

trunk/src/user32/winproc.cpp

@@ -1 @@
-/* $Id: winproc.cpp,v 1.4 2000-02-16 14:28:28 sandervl Exp $ */
+/* $Id: winproc.cpp,v 1.5 2000-09-04 18:23:58 sandervl Exp $ */
 /*
  * Window procedure callbacks
@@ -61 +61 @@
     WINDOWPROC *proc;
 
+    ptr = (BYTE *)handle;
     if(ptr == NULL) {
+        DebugInt3();
         return NULL;
     }
 
-    ptr = (BYTE *)handle;
     /* First check if it is the jmp address */
 //    if (*ptr == 0xe9 /* jmp */) ptr -= (int)&((WINDOWPROC *)0)->jmp -
@@ -131 +132 @@
  WINDOWPROC *lpProc = (WINDOWPROC *)proc;
 
-    if (!lpProc) return NULL;
-
-    /* We want a 32-bit address */
-    return (WNDPROC)&lpProc->jmp;
+    if(!lpProc) {
+        DebugInt3();
+        return NULL;
+    }
+
+    if(type != lpProc->type) {
+         /* Have to return the jmp address if types don't match */
+         return (WNDPROC)&lpProc->jmp;
+    }
+    else return WINPROC_THUNKPROC(lpProc); //return original window proc address if types match
 }