Changeset 5083 for trunk/src

Timestamp:

Feb 10, 2001, 11:31:31 AM (25 years ago)

Author:

sandervl

Message:

heap corruption bugfix

Location:

trunk/src/user32

Files:

• gen_object.cpp (modified) (2 diffs)
• win32class.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (6 diffs)

trunk/src/user32/gen_object.cpp

@@ -1 @@
-/* $Id: gen_object.cpp,v 1.6 2000-03-13 13:10:45 sandervl Exp $ */
+/* $Id: gen_object.cpp,v 1.7 2001-02-10 10:31:31 sandervl Exp $ */
 /*
  * Generic Object Class for OS/2
@@ -13 +13 @@
 #include <os2wrap.h>
 #include <stdlib.h>
+#include <misc.h>
 #include <win32type.h>
 #include <gen_object.h>
-#include <misc.h>
 #include <vmutex.h>
 

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.20 2001-02-02 19:04:02 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.21 2001-02-10 10:31:31 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -363 +363 @@
                 AsciiToUnicode(menuNameA, menuNameW);
         }
+
   }
   else {//id
@@ -482 +483 @@
                         break;
                 }
-                SetLastError(ERROR_INVALID_PARAMETER);
+                SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
                 if(classNameA) {
                       dprintf2(("WARNING: Win32WndClass::setClassLongA %s: %d %x -> wrong INDEX", classNameA, index, lNewVal));

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.233 2001-02-09 18:30:25 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.234 2001-02-10 10:31:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -553 +553 @@
     }
 
-
 //SvL: This completely messes up MS Word 97 (no button bar, no menu)
 #if 0
@@ -1889 +1888 @@
 {
  LRESULT rc;
+ HWND    hwnd = getWindowHandle();
  BOOL    fInternalMsgBackup = fInternalMsg;
 
@@ -1940 +1940 @@
                 break;
   }
+  if(!::IsWindow(hwnd)) {
+        //window might have been destroyed by now. (this pointer invalid)
+        //we must return immediately
+        //(MS Visual C++ install heap corruption)
+        //TODO: could happen in several places here!!!!
+        return rc;
+  }
   fInternalMsg = fInternalMsgBackup;
   return rc;
@@ -1949 +1956 @@
 {
  LRESULT rc;
+ HWND    hwnd = getWindowHandle();
  BOOL    fInternalMsgBackup = fInternalMsg;
 
@@ -1987 +1995 @@
                 rc = CallWindowProcW(win32wndproc, getWindowHandle(), Msg, wParam, lParam);
                 break;
+  }
+  if(!::IsWindow(hwnd)) {
+        //window might have been destroyed by now. (this pointer invalid)
+        //we must return immediately
+        //(MS Visual C++ install heap corruption)
+        //TODO: could happen in several places here!!!!
+        return rc;
   }
   fInternalMsg = fInternalMsgBackup;