Changeset 4188 for trunk/src/user32/win32wbase.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/win32wbase.cpp (modified) (4 diffs)

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;