Changeset 239

Timestamp:

Jun 28, 1999, 6:59:43 PM (26 years ago)

Author:

sandervl

Message:

Get/SetWindowLong bugfixes

Location:

trunk

Files:

• changelog (modified) (1 diff)
• include/wndproc.h (modified) (2 diffs)
• src/user32/setwindow.cpp (modified) (3 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.31 1999-06-27 21:57:47 sandervl Exp $ */
+ /* $Id: changelog,v 1.32 1999-06-28 16:58:26 sandervl Exp $ */
+ 99-06-28: Christoph Bratschi
+        - USER32: AsciiToUnicodeN bugfix (unicode.cpp)
+
+ 99-06-28: Sander van Leeuwen
+        - USER32: Get/SetWindowLongA bugfix for dialog controls
+
  99-06-27: Sander van Leeuwen
         - USER32: Message handler updates & lots of bugfixes 

trunk/include/wndproc.h

@@ -1 @@
-/* $Id: wndproc.h,v 1.5 1999-06-27 21:56:00 sandervl Exp $ */
+/* $Id: wndproc.h,v 1.6 1999-06-28 16:58:41 sandervl Exp $ */
 
 /*
@@ -58 +58 @@
                         pCallback = pUserCallback; 
                 };
+    WNDPROC_O32 GetOrgOS2Callback() { return pOS2Callback; };
+
          int    IsWindow() { return fIsWindow; };
 

trunk/src/user32/setwindow.cpp

@@ -1 @@
-/* $Id: setwindow.cpp,v 1.5 1999-06-27 21:59:40 sandervl Exp $ */
+/* $Id: setwindow.cpp,v 1.6 1999-06-28 16:59:43 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
         else {
                 if(!(nIndex == DWL_DLGPROC && wndproc->IsWindow() == TRUE)) {
+                        if(arg3 == (LONG)wndproc->GetWin32ToOS2Callback()) {
+                                //restore original dialog control handler
+                                dprintf(("SetWindowLongA: restore original dialog control handler"));
+                                rc = (LONG)wndproc->GetWin32Callback();
+                                wndproc->SetWin32Callback(0);
+#ifdef DEBUG
+                                if(wndproc->GetOrgOS2Callback() == NULL) {
+                                        DebugInt3();
+                                }
+#endif
+                                O32_SetWindowLong(hwnd, nIndex, (LONG)wndproc->GetOrgOS2Callback());
+                                return rc;
+                        }
                         rc = (LONG)wndproc->GetWin32Callback();
                         if(rc == 0) {
@@ -89 +102 @@
         if(wndproc) {
                 if(!(nIndex == DWL_DLGPROC && wndproc->IsWindow() == TRUE))
-                        return (LONG)wndproc->GetWin32Callback();
+                {
+                        rc = (LONG)wndproc->GetWin32Callback();
+                        if(rc == 0) {
+                                //window proc that was just created with os/2 callback only
+                                rc = (LONG) wndproc->GetWin32ToOS2Callback();
+                        }
+                        return rc;
+                }
         }
         else {//probably a dialog box control