Changeset 2552 for trunk/src

Timestamp:

Jan 28, 2000, 11:26:01 PM (26 years ago)

Author:

sandervl

Message:

Don't call default frame handler for WM_ADJUSTWINDOWPOS

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (7 diffs)
• pmframe.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (2 diffs)
• window.cpp (modified) (6 diffs)
• wndmsg.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.37 2000-01-27 17:21:08 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.38 2000-01-28 22:25:59 sandervl Exp $ */
 
 /*
@@ -438 +438 @@
    HPS      hPS_ownDC = NULLHANDLE;
 
-   dprintf (("USER32: BeginPaint(%x)", hWnd));
-
    if ( !lpps )
    {
-      O32_SetLastError (ERROR_INVALID_PARAMETER);
-      return (HDC)NULLHANDLE;
+        dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
+        O32_SetLastError (ERROR_INVALID_PARAMETER);
+        return (HDC)NULLHANDLE;
    }
 
@@ -459 +458 @@
                 if (!pHps)
                 {
+                        dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
                         O32_SetLastError (ERROR_INVALID_PARAMETER);
                         return (HDC)NULLHANDLE;
@@ -504 +504 @@
 
    O32_SetLastError(0);
+   dprintf(("USER32: BeginPaint %x -> hdc %x", hWnd, pHps->hps));
    return (HDC)pHps->hps;
 }
@@ -688 +689 @@
       hWindow = HWND_DESKTOP;
 
-   dprintf (("User32: GetDCEx hwnd %x (%x %x) -> wnd %x", hwnd, hrgn, flags, wnd));
-
    //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
 //   isWindowOwnDC = (((hWindow == HWND_DESKTOP) ? FALSE : (wnd->isOwnDC() && wnd->getOwnDC()))
@@ -707 +706 @@
 
          pHps->hdcType = TYPE_1;
+         dprintf (("User32: GetDCEx hwnd %x (%x %x) -> wnd %x hdc %x", hwnd, hrgn, flags, wnd, hps));
          return (HDC)hps;
       }
@@ -784 +784 @@
    GpiSetDrawControl (hps, DCTL_DISPLAY, drawingAllowed ? DCTL_ON : DCTL_OFF);
 
+   dprintf (("User32: GetDCEx hwnd %x (%x %x) -> hdc %x", hwnd, hrgn, flags, pHps->hps));
    return (HDC)pHps->hps;
 

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.40 2000-01-27 21:50:01 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.41 2000-01-28 22:25:59 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -279 +279 @@
           return (MRESULT)0xf;
         }
-        goto RunDefFrameProc;
+        RestoreOS2TIB();
+        return (MRESULT)0;
     }
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.82 2000-01-27 21:50:01 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.83 2000-01-28 22:25:59 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -403 +403 @@
         if(wndpars->fsStatus & (WPM_CCHTEXT | WPM_TEXT))
         {
+            if(wndpars->fsStatus & WPM_TEXT)
+                win32wnd->MsgGetText(wndpars->pszText, wndpars->cchText);
             if(wndpars->fsStatus & WPM_CCHTEXT)
                 wndpars->cchText = win32wnd->MsgGetTextLength();
-            if(wndpars->fsStatus & WPM_TEXT)
-                wndpars->pszText = win32wnd->MsgGetText();
 
             wndpars->fsStatus = 0;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.147 2000-01-27 21:50:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.148 2000-01-28 22:26:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -649 +649 @@
         if( (SendInternalMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {
-            if(!(flags & WIN_NEED_SIZE)) {
+            if(!(flags & WIN_NEED_SIZE))
+            {
+             LPARAM lParam;
+
                 SendInternalMessageA(WM_SIZE, SIZE_RESTORED,
                                 MAKELONG(rectClient.right-rectClient.left,
                                          rectClient.bottom-rectClient.top));
-                SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
+
+                if(getParent()) {//in parent coordinates
+                    POINT point;
+
+                    point.x = rectClient.left;
+                    point.y = rectClient.top;
+                    MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+
+                    lParam = MAKELONG(point.x, point.y);
+                }
+                else {//in screen coordinates
+                    lParam = MAKELONG(rectWindow.left+rectClient.left, rectWindow.top+rectClient.top);
+                }
+
+                SendInternalMessageA(WM_MOVE, 0, lParam);
             }
 
@@ -1052 +1069 @@
     point.y = lpWndPos->y;
     if (getParent()) ClientToScreen(getParent()->getWindowHandle(),&point);
+
     setWindowRect(point.x,point.y,point.x+lpWndPos->cx,point.y+lpWndPos->cy);
     newWindowRect = rectWindow;
@@ -1093 +1111 @@
 //******************************************************************************
 //******************************************************************************
-char *Win32BaseWindow::MsgGetText()
-{
-    SendInternalMessageA(WM_GETTEXT, wndNameLength, (LPARAM)windowNameA);
-    return windowNameA;
+void Win32BaseWindow::MsgGetText(char *wndtext, ULONG textlength)
+{
+    SendInternalMessageA(WM_GETTEXT, textlength, (LPARAM)wndtext);
 }
 //******************************************************************************
@@ -1395 +1412 @@
             SetCursor(hCursor);
             return 1;
-          } else return 0;
-        } else return 0;
+          }
+          else return 0;
+        }
+        else return 0;
     }
 
@@ -1409 +1428 @@
         if (!(wpos->flags & SWP_NOMOVE) && !(wpos->flags & SWP_NOCLIENTMOVE))
         {
-            SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
+            SendInternalMessageA(WM_MOVE, 0, MAKELONG(wpos->x + rectClient.left, wpos->y + rectClient.top));
         }
         if (!(wpos->flags & SWP_NOSIZE) && !(wpos->flags & SWP_NOCLIENTSIZE))
         {
             if (dwStyle & WS_MAXIMIZE) wp = SIZE_MAXIMIZED;
-            else if (dwStyle & WS_MINIMIZE) wp = SIZE_MINIMIZED;
+            else
+            if (dwStyle & WS_MINIMIZE) wp = SIZE_MINIMIZED;
 
             SendInternalMessageA(WM_SIZE, wp, MAKELONG(rectClient.right  - rectClient.left,

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.76 2000-01-27 21:50:02 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.77 2000-01-28 22:26:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -123 +123 @@
          ULONG  MsgSetText(LPSTR lpsz, LONG cch);
          ULONG  MsgGetTextLength();
-         char  *MsgGetText();
+         void   MsgGetText(char *wndtext, ULONG textlength);
          VOID   updateWindowStyle(DWORD oldExStyle,DWORD oldStyle);
 

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.52 2000-01-27 17:21:10 cbratschi Exp $ */
+/* $Id: window.cpp,v 1.53 2000-01-28 22:26:01 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -653 +653 @@
     else
       window = windowDesktop;
+
     if(!window) {
         dprintf(("GetWindowRect, window %x not found", hwnd));
@@ -662 +663 @@
         return FALSE;
     }
-    *pRect = *window->getWindowRect();
+    *pRect = *window->getWindowRect(); //always in screen coordinates
+
     dprintf(("GetWindowRect %x (%d,%d) (%d,%d)", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom));
     return TRUE;
@@ -928 +930 @@
 {
     HWND DesktopWindow = windowDesktop->getWindowHandle();
-    dprintf(("USER32: GetDesktopWindow, return %d\n", DesktopWindow));
+    dprintf2(("USER32: GetDesktopWindow, returned %d\n", DesktopWindow));
     return DesktopWindow;
 }
@@ -1053 +1055 @@
     DWP *pDWP;
 
-    dprintf(("USER32:  BeginDeferWindowPos\n"));
     if (count <= 0)
     {
+        dprintf(("USER32: BeginDeferWindowPos invalid param %d", count));
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
     }
+    dprintf(("USER32: BeginDeferWindowPos %d", count));
     handle = (HDWP)HeapAlloc(GetProcessHeap(), 0, sizeof(DWP) + (count-1)*sizeof(WINDOWPOS) );
     if (!handle)
@@ -1100 +1103 @@
     }
 
+    dprintf(("USER32: DeferWindowPos hdwp %x hwnd %x hwndAfter %x (%d,%d)(%d,%d) %x", hdwp, hwnd, hwndAfter,
+              x, y, cx, cy, flags));
 
 /* Numega Bounds Checker Demo dislikes the following code.

trunk/src/user32/wndmsg.cpp

@@ -1 @@
-/* $Id: wndmsg.cpp,v 1.11 2000-01-27 21:50:03 sandervl Exp $ */
+/* $Id: wndmsg.cpp,v 1.12 2000-01-28 22:26:01 sandervl Exp $ */
 /*
  * Win32 window message text function for OS/2
@@ -712 +712 @@
         if(PostSpyMessage(hwnd, Msg, wParam, lParam) == FALSE)
         {
-#if 1
-            if(!CheckCurFS()) {
-                dprintf(("FS CORRUPT!!!!"));
-            }
-#endif
             if(fInternalMsg) {
                     dprintf(("SendInternalMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));