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

Timestamp:

Oct 14, 1999, 11:22:43 AM (26 years ago)

Author:

sandervl

Message:

Window creation rewrite + bugfixes. NOT WORKING CORRECTLY YET..

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.40 1999-10-13 14:24:27 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.41 1999-10-14 09:22:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -40 +40 @@
 #include "pmframe.h"
 #include "win32wdesktop.h"
+#include <wprocess.h>
 
 #define HAS_DLGFRAME(style,exStyle) \
@@ -96 +97 @@
 {
   isUnicode        = FALSE;
-  fCreated         = FALSE;
   fFirstShow       = TRUE;
   fIsDialog        = FALSE;
   fInternalMsg     = FALSE;
+  fNoSizeMsg       = FALSE;
 
   windowNameA      = NULL;
@@ -203 +204 @@
 {
  char  buffer[256];
- INT   sw = SW_SHOW;
  POINT maxSize, maxPos, minTrack, maxTrack;
 
@@ -210 +210 @@
 #endif
 
+    sw = SW_SHOW;
     SetLastError(0);
 
@@ -463 +464 @@
   rectClient        = rectWindow;
 
-//CB: dwOSFrameStyle handled by OSLibWinConvertStyle
-//    OSLibWinCreateWindow: perhaps problems
-//    shouldn't we always use a frame? -> no problems with scrollbars
-
   if(HIWORD(cs->lpszName))
   {
@@ -474 +471 @@
   }
 
+  //copy pointer of CREATESTRUCT for usage in MsgCreate method
+  tmpcs = cs;
+
+  //Store our window object pointer in thread local memory, so PMWINDOW.CPP can retrieve it
+  THDB *thdb = GetThreadTHDB();
+
+  if(thdb == NULL) {
+        dprintf(("Window creation failed - thdb == NULL")); //this is VERY bad
+        ExitProcess(666);
+        return FALSE;
+  }
+
+  thdb->newWindow = (ULONG)this;
+
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  dwOSWinStyle, dwOSFrameStyle, (char *)windowNameA,
@@ -485 +496 @@
         return FALSE;
   }
+  SetLastError(0);
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::MsgCreate(HWND hwndFrame, HWND hwndClient)
+{
+ POINT maxPos;
+ CREATESTRUCTA  *cs = tmpcs;  //pointer to CREATESTRUCT used in CreateWindowExA method
+
+  OS2Hwnd      = hwndClient;
+  OS2HwndFrame = hwndFrame;
+//  if(!isFrameWindow())
+//        OS2HwndFrame = hwndClient;
 
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
@@ -523 +548 @@
 #endif
 
-  if (cs->style & WS_HSCROLL)
+  if (dwStyle & WS_HSCROLL)
   {
         hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
-        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
-  }
-
-  if (cs->style & WS_VSCROLL) {
+//        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
+  }
+
+  if (dwStyle & WS_VSCROLL) {
         hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
-        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
+//        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
   }
 
@@ -558 +583 @@
   if(windowClass->getIcon())
         SetIcon(windowClass->getIcon());
-
-  if(getParent()) {
-        SetWindowPos(getParent()->getWindowHandle(), rectClient.left, rectClient.top,
-                     rectClient.right-rectClient.left,
-                     rectClient.bottom-rectClient.top,
-                     SWP_NOACTIVATE | SWP_NOZORDER );
-  }
-  else {
-        SetWindowPos(HWND_TOP, rectClient.left, rectClient.top,
-                     rectClient.right-rectClient.left,
-                     rectClient.bottom-rectClient.top,
-                     SWP_NOACTIVATE);
-  }
 
   //Subclass frame
@@ -580 +592 @@
   }
 
-  //Get the client window rectangle
-  GetClientRect(Win32Hwnd, &rectClient);
-
   /* Send the WM_CREATE message
    * Perhaps we shouldn't allow width/height changes as well.
@@ -589 +598 @@
   maxPos.x = rectWindow.left; maxPos.y = rectWindow.top;
 
+  fNoSizeMsg = TRUE;
+  if(getParent()) {
+        SetWindowPos(getParent()->getWindowHandle(), rectClient.left, rectClient.top,
+                     rectClient.right-rectClient.left,
+                     rectClient.bottom-rectClient.top,
+                     SWP_NOACTIVATE | SWP_NOZORDER );
+  }
+  else {
+        SetWindowPos(HWND_TOP, rectClient.left, rectClient.top,
+                     rectClient.right-rectClient.left,
+                     rectClient.bottom-rectClient.top,
+                     SWP_NOACTIVATE);
+  }
+  fNoSizeMsg = FALSE;
+
   if(SendMessageA(WM_NCCREATE, 0, (LPARAM)cs) )
   {
-        fCreated = TRUE; //Allow WM_SIZE messages now
         SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
 
@@ -604 +627 @@
                 SendMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
             }
+
             if (cs->style & WS_VISIBLE) ShowWindow( sw );
 
@@ -617 +641 @@
   }
   dprintf(("Window creation FAILED (NCCREATE cancelled creation)"));
-  fCreated = FALSE;
-  OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
-  OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
-  DestroyWindow();
   SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
   return FALSE;
-}
-//******************************************************************************
-//******************************************************************************
-ULONG Win32BaseWindow::MsgCreate(HWND hwndOS2, ULONG initParam)
-{
-  OS2Hwnd = hwndOS2;
-  return SendInternalMessageA(WM_CREATE, 0, initParam);
 }
 //******************************************************************************
@@ -680 +693 @@
 {
     dprintf(("MsgPosChanging"));
-#if 1
-    if(fCreated == FALSE) {
+    if(fNoSizeMsg)
         return 1;
-    }
-#endif
+
     return SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, lp);
 }
@@ -692 +703 @@
 {
     dprintf(("MsgPosChanged"));
-#if 1
-    if(fCreated == FALSE) {
+    if(fNoSizeMsg)
         return 1;
-    }
-#endif
+
     return SendInternalMessageA(WM_WINDOWPOSCHANGED, 0, lp);
 }
@@ -704 +713 @@
 {
     dprintf(("MsgMove to (%d,%d)", x, y));
-    if(fCreated == FALSE) {
+    if(fNoSizeMsg)
         return 1;
-    }
 
     return SendInternalMessageA(WM_MOVE, 0, MAKELONG((USHORT)x, (USHORT)y));
@@ -755 +763 @@
 {
  WORD fwSizeType = 0;
-
-    if(fCreated == FALSE) {//Solitaire crashes if it receives a WM_SIZE during CreateWindowEx (normal or our fault?)
-        return 1;
-    }
 
     if(fMinimize) {
@@ -1115 +1119 @@
 }
 //******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::isFrameWindow()
+{
+    if((getParent() == NULL || getParent() == windowDesktop) && ((dwStyle & WS_CAPTION) == WS_CAPTION))
+        return TRUE;
+
+    return FALSE;
+}
+//******************************************************************************
 //TODO: Not complete (flags)
 //******************************************************************************
@@ -1176 +1189 @@
         {
             infoPtr->Page = info->nPage;
+            dprintf(("SetScrollInfo: Set pagesize to %d", info->nPage));
             OSLibWinSetScrollPageSize(OS2HwndFrame, hwndScroll, info->nPage, infoPtr->MaxVal, fRedraw);
         }
@@ -1186 +1200 @@
         {
             infoPtr->CurVal = info->nPos;
+            dprintf(("SetScrollInfo: Set scroll position to %d", info->nPos));
             OSLibWinSetScrollPos(OS2HwndFrame, hwndScroll, info->nPos, fRedraw);
         }
@@ -1208 +1223 @@
                 infoPtr->MaxVal = info->nMax;
 
+                dprintf(("SetScrollInfo: Set scroll range to (%d,%d)", info->nMin, info->nMax));
                 OSLibWinSetScrollRange(OS2HwndFrame, hwndScroll, info->nMin, info->nMax, fRedraw);
             }
@@ -1984 +2000 @@
        {
            hParent = getParent()->getOS2WindowHandle();
-           OSLibWinQueryWindowPos(isFrameWindow() ? OS2HwndFrame:OS2Hwnd, &swpOld);
        }
-       else
-           OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
+       OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
    }
 
@@ -1994 +2008 @@
       return TRUE;
 
-   if ((swp.fl & SWPOS_ZORDER) && (swp.hwndInsertBehind > HWNDOS_BOTTOM))
+//   if ((swp.fl & SWPOS_ZORDER) && (swp.hwndInsertBehind > HWNDOS_BOTTOM))
+   if ((swp.hwndInsertBehind > HWNDOS_BOTTOM))
    {
-      Win32BaseWindow *wndBehind = Win32BaseWindow::GetWindowFromHandle(swp.hwndInsertBehind);
-      swp.hwndInsertBehind   = wndBehind->getOS2WindowHandle();
+        Win32BaseWindow *wndBehind = Win32BaseWindow::GetWindowFromHandle(swp.hwndInsertBehind);
+        if(wndBehind) {
+            swp.hwndInsertBehind   = wndBehind->getOS2WindowHandle();
+        }
+        else {
+            dprintf(("ERROR: SetWindowPos: hwndInsertBehind %x invalid!",swp.hwndInsertBehind));
+            swp.hwndInsertBehind = 0;
+        }
    }
+#if 0
    if (isFrameWindow())
    {
@@ -2015 +2037 @@
    }
    else
-      swp.hwnd = OS2Hwnd;
+#endif
+      swp.hwnd = OS2HwndFrame;
 
    dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));