Changeset 2421 for trunk/src/user32/new/dc.cpp

Timestamp:

Jan 12, 2000, 6:37:29 PM (26 years ago)

Author:

cbratschi

Message:

fixed WM_CALCVALIDRECTS, added region for WM_NCPAINT

File:

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

trunk/src/user32/new/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.10 2000-01-07 17:38:46 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.11 2000-01-12 17:37:28 cbratschi Exp $ */
 
 /*
@@ -553 +553 @@
    if (updateRegionExists)
    {
+      //CB: for PM empty rect is valid
+      if ((rectl.xLeft == rectl.xRight) || (rectl.yTop == rectl.yBottom)) return FALSE;
       //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
 //      if (wnd->isOwnDC() && wnd->getOwnDC())
@@ -604 +606 @@
 
    if (updateRegionExists)
+   {
+     //CB: for PM empty rect is valid
+     if ((rectl.xLeft == rectl.xRight) || (rectl.yTop == rectl.yBottom)) return FALSE;
      mapOS2ToWin32Rect(hwnd,(PRECTLOS2)&rectl,pRect);
-   else
-     pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
+   } else
+       pRect->left = pRect->top = pRect->right = pRect->bottom = 0;
 
    return updateRegionExists;
@@ -722 +727 @@
       ULONG BytesNeeded;
       PRGNDATA_W RgnData;
-      PRECTL pr;
+      PRECT pr;
       int i;
-      LONG height = OSLibQueryScreenHeight();
+      RECTL rectl;
 
       if (!hrgn)
@@ -736 +741 @@
 
       i = RgnData->rdh.nCount;
-      pr = (PRECTL)(RgnData->Buffer);
+      pr = (PRECT)(RgnData->Buffer);
 
       success = TRUE;
       if (flags & DCX_EXCLUDERGN_W)
+      {
+#if 0 //CB: todo
          for (; (i > 0) && success; i--, pr++) {
             LONG y = pr->yBottom;
@@ -747 +754 @@
             success &= GpiExcludeClipRectangle (pHps->hps, pr);
          }
-      else
-         for (; (i > 0) && success; i--, pr++) {
-            LONG y = pr->yBottom;
-
-            pr->yBottom = height - pr->yTop;
-            pr->yTop    = height - y;
-            success &= GpiIntersectClipRectangle (pHps->hps, pr);
-         }
+#endif
+      } else //DCX_INTERSECTRGN_W
+      {
+        O32_SelectClipRgn(pHps->hps,hrgn); //CB: works so far
+      }
       if (!success)
          goto error;