Changeset 4188 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

SetWindowLong changes + fixes for GWL_WNDPROC

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)
• window.cpp (modified) (3 diffs)
• winproc.cpp (modified) (3 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.50 2000-06-07 14:51:29 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.51 2000-09-04 18:23:55 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -1062 +1062 @@
     {
     case DWL_DLGPROC:
+    {
+        //Note: Type of SetWindowLong determines new window proc type
+        //      UNLESS the new window proc has already been registered
+        //      (use the old type in that case)
+        //      (VERIFIED in NT 4, SP6)
+        WINDOWPROCTYPE type = WINPROC_GetProcType((HWINDOWPROC)value);
+        if(type == WIN_PROC_INVALID) {
+                type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
+        }
         oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
-        WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
+        WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, type, WIN_PROC_WINDOW);
         return oldval;
+    }
     case DWL_MSGRESULT:
         oldval = msgResult;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.209 2000-09-02 08:30:09 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.210 2000-09-04 18:23:56 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2078 +2078 @@
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
-    if(getWindowHandle() == 0x6800001d && nCmdShow == 1) {
-        rc = 0;
-    }
     wasVisible = (getStyle() & WS_VISIBLE) != 0;
 
@@ -2189 +2186 @@
    RECT oldClientRect = rectClient;
 
-    if(getWindowHandle() == 0x6800000a) {
-        rc = FALSE;
-    }
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
@@ -3060 +3054 @@
         }
         case GWL_WNDPROC:
-                oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
-                WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, WINPROC_GetProcType(win32wndproc), WIN_PROC_WINDOW);
+        {
+                //Note: Type of SetWindowLong determines new window proc type
+                //      UNLESS the new window proc has already been registered
+                //      (use the old type in that case)
+                //      (VERIFIED in NT 4, SP6)
+                WINDOWPROCTYPE type = WINPROC_GetProcType((HWINDOWPROC)value);
+                if(type == WIN_PROC_INVALID) {
+                        type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
+                }
+                oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+                WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
                 return oldval;
-
+        }
         case GWL_HINSTANCE:
                 oldval = hInstance;

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.73 2000-09-02 08:30:11 sandervl Exp $ */
+/* $Id: window.cpp,v 1.74 2000-09-04 18:23:58 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -802 +802 @@
         return 0;
     }
-    dprintf(("GetWindowTextW %x", hwnd));
+#ifdef DEBUG
+    int rc = window->GetWindowTextW(lpsz, cch);
+    if(rc) {
+        LPSTR astring = UnicodeToAsciiString(lpsz);
+        dprintf(("GetWindowTextW %x %s", hwnd, lpsz));
+        free(astring);
+    }
+    else dprintf(("GetWindowTextW %x returned %d", hwnd, rc));
+    return rc;
+#else
     return window->GetWindowTextW(lpsz, cch);
+#endif
 }
 //******************************************************************************
@@ -832 +842 @@
         return 0;
     }
-    dprintf(("SetWindowTextW %x", hwnd));
+#ifdef DEBUG
+    LPSTR astring = UnicodeToAsciiString(lpsz);
+    dprintf(("SetWindowTextW %x %s", hwnd, astring));
+    free(astring);
+    if(hwnd == 0x68000008) {
+        int i;
+        i = 5;
+    }
+#endif
     return window->SetWindowTextW((LPWSTR)lpsz);
 }

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
 }