Changeset 2881 for trunk/src/user32/dc.cpp

Timestamp:

Feb 24, 2000, 8:19:10 PM (26 years ago)

Author:

sandervl

Message:

WS_MAXIMIZE & WS_MINIMIZE flags updated when necessary & RedrawWindow changes

File:

• trunk/src/user32/dc.cpp (modified) (13 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.48 2000-02-16 14:34:13 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.49 2000-02-24 19:19:07 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #include <winerror.h>
 
-#define DBG_LOCALLOG    DBG_dc
+#define DBG_LOCALLOG    DBG_dc
 #include "dbglocal.h"
 
@@ -488 +488 @@
 
    pHps->hdcType = TYPE_3;
+
+   HideCaret(hwnd);
+
+   if(wnd->needsEraseBkgnd()) {
+        wnd->setEraseBkgnd(FALSE);
+        lpps->fErase = (wnd->MsgEraseBackGround(pHps->hps) != 0);
+   }
+   else lpps->fErase = TRUE;
    lpps->hdc = (HDC)hps;
-
-   if(!wnd->isSuppressErase()) {
-        wnd->setSuppressErase(TRUE);
-        wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
-   }
-   lpps->fErase = wnd->isPSErase();
 
    if (!hPS_ownDC)
@@ -522 +524 @@
    dprintf (("USER32: EndPaint(%x)", hwnd));
 
+   ShowCaret(hwnd);
    if (!pPaint || !pPaint->hdc )
       return TRUE;
@@ -534 +537 @@
           WinEndPaint (pHps->hps);
    }
-   wnd->setSuppressErase(FALSE);
+   wnd->setEraseBkgnd(TRUE);
 
 exit:
@@ -618 +621 @@
    }
 
-   if(!wnd->isSuppressErase() && lComplexity != RGN_NULL) {
-        wnd->setSuppressErase(TRUE);
-        wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(pHps->hps));
-   }
-   lpps->fErase = wnd->isPSErase(); //correct ??
+   if(wnd->needsEraseBkgnd() && lComplexity != RGN_NULL) {
+        wnd->setEraseBkgnd(FALSE);
+        lpps->fErase = (wnd->MsgEraseBackGround(pHps->hps) != 0);
+   }
+   else lpps->fErase = TRUE;
+
    lpps->hdc    = (HDC)pHps->hps;
 
@@ -683 +687 @@
         dprintf(("EndPaint: wrong hdc %x!!", pPaint->hdc));
    }
-   wnd->setSuppressErase(FALSE);
+   wnd->setEraseBkgnd(TRUE);
    ShowCaret(hwnd);
 
@@ -1045 +1049 @@
    if (redraw & (RDW_FRAME_W | RDW_NOFRAME_W))
    {
-      O32_SetLastError (ERROR_NOT_SUPPORTED);
-      return FALSE;
+        O32_SetLastError (ERROR_NOT_SUPPORTED);
+        return FALSE;
    }
 
@@ -1056 +1060 @@
          return FALSE;
 #else
-      hwnd = HWND_DESKTOP;
-      wnd  = Win32BaseWindow::GetWindowFromOS2Handle(OSLIB_HWND_DESKTOP);
-
-      if (!wnd)
-      {
-         dprintf(("USER32:dc: RedrawWindow can't find desktop window %08xh\n",
+        hwnd = HWND_DESKTOP;
+        wnd  = Win32BaseWindow::GetWindowFromOS2Handle(OSLIB_HWND_DESKTOP);
+
+        if (!wnd)
+        {
+            dprintf(("USER32:dc: RedrawWindow can't find desktop window %08xh\n",
+                      hwnd));
+            O32_SetLastError (ERROR_INVALID_PARAMETER);
+            return FALSE;
+        }
+#endif
+   }
+   else
+   {
+        wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+
+        if (!wnd)
+        {
+            dprintf(("USER32:dc: RedrawWindow can't find window %08xh\n",
                   hwnd));
-         O32_SetLastError (ERROR_INVALID_PARAMETER);
-         return FALSE;
-      }
-#endif
-   }
-   else
-   {
-      wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
-
-      if (!wnd)
-      {
-         dprintf(("USER32:dc: RedrawWindow can't find window %08xh\n",
-                  hwnd));
-         O32_SetLastError (ERROR_INVALID_PARAMETER);
-         return FALSE;
-      }
-      hwnd = wnd->getOS2WindowHandle();
+            O32_SetLastError (ERROR_INVALID_PARAMETER);
+            return FALSE;
+        }
+        hwnd = wnd->getOS2WindowHandle();
    }
 
@@ -1088 +1092 @@
    RECTL rectl;
 
-   if (redraw & RDW_UPDATENOW_W) redraw &= ~RDW_ERASENOW_W;
-
-   //SvL: Should we check if there is already an invalidated window part before
-   //     deciding to skip erase?
-   if(redraw & RDW_NOERASE_W || ((redraw & (RDW_INVALIDATE_W|RDW_ERASE_W|RDW_ERASENOW_W)) == RDW_INVALIDATE_W)) {
-        wnd->setSuppressErase(TRUE);
-   }
-   else wnd->setSuppressErase(FALSE);
-
    if (hrgn)
    {
@@ -1136 +1131 @@
    if (redraw & RDW_INVALIDATE_W)
    {
-      if (redraw & RDW_ERASE_W)
-         wnd->setEraseBkgnd (TRUE, TRUE);
-
-      if (!pRect && !hrgn)
-         success = WinInvalidateRect (hwnd, NULL, IncludeChildren);
-      else if (hrgn)
-         success = WinInvalidateRegion (hwnd, hrgnTemp, IncludeChildren);
-      else
-         success = WinInvalidateRect (hwnd, &rectl, IncludeChildren);
-      if (!success) goto error;
+        //TODO: SvL: pingpong.exe doesn't have RDW_NOERASE, but doesn't want WM_ERASEBKGND msgs
+        if (redraw & RDW_ERASE_W)
+            wnd->setEraseBkgnd (TRUE);
+
+        if (!pRect && !hrgn)
+            success = WinInvalidateRect (hwnd, NULL, IncludeChildren);
+        else
+        if (hrgn)
+            success = WinInvalidateRegion (hwnd, hrgnTemp, IncludeChildren);
+        else
+            success = WinInvalidateRect (hwnd, &rectl, IncludeChildren);
+
+        if (!success) goto error;
    }
    else if (redraw & RDW_VALIDATE_W)
    {
-      if (WinQueryUpdateRect (hwnd, NULL))
-      {
-         if (!pRect && !hrgn)
-            success = WinValidateRect (hwnd, NULL, IncludeChildren);
-         else if (hrgn)
-            success = WinValidateRegion (hwnd, hrgnTemp, IncludeChildren);
-         else
-            success = WinValidateRect (hwnd, &rectl, IncludeChildren);
-         if (!success) goto error;
-      }
+        if (redraw & RDW_NOERASE_W)
+            wnd->setEraseBkgnd(FALSE);
+
+        if (WinQueryUpdateRect (hwnd, NULL))
+        {
+            if (!pRect && !hrgn)
+                success = WinValidateRect (hwnd, NULL, IncludeChildren);
+            else
+            if (hrgn)
+                success = WinValidateRegion (hwnd, hrgnTemp, IncludeChildren);
+            else
+                success = WinValidateRect (hwnd, &rectl, IncludeChildren);
+            if (!success) goto error;
+        }
    }
 
    if(WinQueryUpdateRect(hwnd, NULL))
    {
+        //TODO: Does this work if RDW_ALLCHILDREN is set??
         if(redraw & RDW_UPDATENOW_W) {
                 wnd->MsgPaint (0, FALSE);
         }
         else
-        if((redraw & RDW_ERASE_W) && (redraw & RDW_ERASENOW_W))
-                wnd->setEraseBkgnd (FALSE, !sendEraseBkgnd (wnd));
+//        if((redraw & RDW_ERASE_W) && (redraw & RDW_ERASENOW_W))
+        if(redraw & RDW_ERASENOW_W && wnd->needsEraseBkgnd())
+                wnd->setEraseBkgnd(sendEraseBkgnd(wnd) == 0);
    }
    else if((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))
@@ -1185 +1189 @@
       WinReleasePS (hpsTemp);
 
-//SvL: Test
-//   if ((redraw & RDW_INVALIDATE_W) == 0)
-//      wnd->setSuppressErase (FALSE);
-//   else if ((redraw & RDW_ERASENOW_W) == RDW_ERASENOW_W)
-//      wnd->setSuppressErase (TRUE);
-
    if (!success)
       O32_SetLastError (ERROR_INVALID_PARAMETER);
@@ -1208 +1206 @@
 
    dprintf (("User32: UpdateWindow hwnd %x", hwnd));
-////SvL: This doesn't work right (it's what Wine does) -> TODO
-////   return RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW_W | RDW_NOCHILDREN_W);
+////SvL: This doesn't work right (Wine uses RDW_NOCHILDREN_W -> doesn't work here)
+////     Breaks vpbuddy
+////   return RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW_W | RDW_ALLCHILDREN_W);
    WinUpdateWindow(wnd->getOS2WindowHandle());
    return TRUE;