Changeset 5173 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

DestroyWindow during CreateWindow fix

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (7 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.87 2001-02-18 17:03:47 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.88 2001-02-18 17:59:04 sandervl Exp $ */
 
 /*
@@ -471 +471 @@
 //testestest
    GpiQueryViewingLimits(pHps->hps, &rectWindowOS2);
-   dprintf(("view limits (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+   dprintf2(("view limits (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
    GpiQueryDefViewingLimits(pHps->hps, &rectWindowOS2);
-   dprintf(("def view limits (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+   dprintf2(("def view limits (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
    GpiQueryPageViewport(pHps->hps, &rectWindowOS2);
-   dprintf(("page viewport (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+   dprintf2(("page viewport (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
 
    GpiQueryGraphicsField(pHps->hps, &rectWindowOS2);
-   dprintf(("graphics field (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+   dprintf2(("graphics field (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
 
    SIZEL size;
    GpiQueryPickApertureSize(pHps->hps, &size);
-   dprintf(("page viewport (%d,%d)", size.cx, size.cy));
+   dprintf2(("page viewport (%d,%d)", size.cx, size.cy));
 //testestest
 

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.56 2001-02-08 18:17:16 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.57 2001-02-18 17:59:05 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -216 +216 @@
 ULONG Win32Dialog::MsgCreate(HWND hwndOS2)
 {
- CREATESTRUCTA  *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
- LPARAM       param = tmpParam;
- LPSTR  dlgTemplate = tmpDlgTemplate;
-
-    Win32BaseWindow::MsgCreate(hwndOS2);
+ CREATESTRUCTA *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
+ LPARAM         param = tmpParam;
+ LPSTR          dlgTemplate = tmpDlgTemplate;
+
+    if(Win32BaseWindow::MsgCreate(hwndOS2) == FALSE) {
+        dprintf(("********* DIALOG CREATION FAILED! (main dialog window) ************"));
+        return FALSE;
+    }
 
     if(!isUnicode) {

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;
     }

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.105 2001-02-17 14:49:26 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.106 2001-02-18 17:59:05 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -358 +358 @@
         BOOL    fDestroyWindowCalled;   //DestroyWindow was called for this window
         BOOL    fCreated;
+        BOOL    fCreationFinished;      //True when window or dialog has been created successfully
+                                        //Needed to prevent DestroyWindow from deleting the window
+                                        //object during construction
         BOOL    fTaskList;              //should be listed in PM tasklist or not
         BOOL    fXDefault;