Changeset 5083 for trunk/src/user32/win32wbase.cpp

Timestamp:

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

Author:

sandervl

Message:

heap corruption bugfix

File:

• trunk/src/user32/win32wbase.cpp (modified) (6 diffs)

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;