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

Timestamp:

Feb 18, 2001, 6:59:05 PM (25 years ago)

Author:

sandervl

Message:

DestroyWindow during CreateWindow fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.236 2001-02-18 14:18:39 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.237 2001-02-18 17:59:05 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -97 +97 @@
   fComingToTop     = FALSE;
   fCreateSetWindowPos = FALSE;
+  fCreationFinished= FALSE;
 
   windowNameA      = NULL;
@@ -470 +471 @@
     }
     OSLibWinSetVisibleRegionNotify(OS2Hwnd, TRUE);
+    fCreationFinished = TRUE;   //creation done with success
     SetLastError(0);
     return TRUE;
@@ -477 +479 @@
 BOOL Win32BaseWindow::MsgCreate(HWND hwndOS2)
 {
- CREATESTRUCTA  *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
- POINT maxSize, maxPos, minTrack, maxTrack;
+ CREATESTRUCTA *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
+ POINT          maxSize, maxPos, minTrack, maxTrack;
+ HWND           hwnd = getWindowHandle();
 
     OS2Hwnd      = hwndOS2;
@@ -707 +710 @@
                                          rectClient.bottom-rectClient.top));
 
+                if(!::IsWindow(hwnd))
+                {
+                    dprintf(("Createwindow: WM_SIZE destroyed window"));
+                    goto end;
+                }
                 SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
+                if(!::IsWindow(hwnd))
+                {
+                    dprintf(("Createwindow: WM_MOVE destroyed window"));
+                    goto end;
+                }
             }
             if (getStyle() & (WS_MINIMIZE | WS_MAXIMIZE))
             {
-                        RECT newPos;
-                        UINT swFlag = (getStyle() & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE;
+                RECT newPos;
+                UINT swFlag = (getStyle() & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE;
                 setStyle(getStyle() & ~(WS_MAXIMIZE | WS_MINIMIZE));
-                        MinMaximize(swFlag, &newPos);
+                MinMaximize(swFlag, &newPos);
                 swFlag = ((getStyle() & WS_CHILD) || GetActiveWindow()) ? SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED
                                                                         : SWP_NOZORDER | SWP_FRAMECHANGED;
                 SetWindowPos(0, newPos.left, newPos.top,  newPos.right, newPos.bottom, swFlag);
+                if(!::IsWindow(hwnd))
+                {
+                    dprintf(("Createwindow: min/max destroyed window"));
+                    goto end;
+                }
             }
 
@@ -727 +745 @@
                     getParent()->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, getWindowId()), (LPARAM)getWindowHandle());
                 }
-                if(!::IsWindow(getWindowHandle()))
+                if(!::IsWindow(hwnd))
                 {
                     dprintf(("Createwindow: WM_PARENTNOTIFY destroyed window"));
@@ -796 +814 @@
     TIMER_KillTimerFromWindow(OS2Hwnd);
 
-    if(getFirstChild() == NULL) {
+    if(getFirstChild() == NULL && fCreationFinished) {
         delete this;
     }