Changeset 3754 for trunk/src

Timestamp:

Jun 26, 2000, 12:27:10 PM (25 years ago)

Author:

sandervl

Message:

InvalidateRect/Rgn fixes

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.63 2000-06-23 19:04:10 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.64 2000-06-26 10:27:10 sandervl Exp $ */
 
 /*
@@ -1121 +1121 @@
             success = WinInvalidateRect (hwnd, &rectl, IncludeChildren);
 
+#ifdef DEBUG
+        if(WinQueryUpdateRect(hwnd, NULL) == FALSE) {
+                dprintf(("WARNING: WinQueryUpdateRect %x (%d,%d)(%d,%d) returned false even though we just invalidated part of a window!!!", hwnd, rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
+        }
+#endif
+
         if (!success) goto error;
    }
@@ -1202 +1208 @@
 //******************************************************************************
 //******************************************************************************
+BOOL WIN32API ValidateRect( HWND hwnd, const RECT * lprc)
+{
+    if(lprc) {
+         dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
+    }
+    else dprintf(("USER32: ValidateRect %x", hwnd));
+
+    return RedrawWindow( hwnd, lprc, 0, RDW_VALIDATE_W | RDW_NOCHILDREN_W | (hwnd==0 ? RDW_UPDATENOW_W : 0));
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API ValidateRgn( HWND hwnd, HRGN  hrgn)
+{
+    dprintf(("USER32: ValidateRgn %x %x", hwnd, hrgn));
+    return RedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE_W | RDW_NOCHILDREN_W | (hwnd==0 ? RDW_UPDATENOW_W : 0));
+}
+//******************************************************************************
+//******************************************************************************
 BOOL WIN32API InvalidateRect (HWND hwnd, const RECT *pRect, BOOL erase)
 {
@@ -1210 +1234 @@
    }
    else dprintf(("InvalidateRect %x NULL erase=%d", hwnd, erase));
-   if(hwnd == 0x6800000f) {
-        result = 0;
-   }
    result = RedrawWindow (hwnd, pRect, NULLHANDLE,
-                          RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
+//SvL: If all children are included, then WinInvalidateRect is called
+//     with fIncludeChildren=1 -> rect of hwnd isn't invalid if child(ren)
+//     overlap(s) it completely (EVEN if window doesn't have WS_CLIPCHILREN!)
+//     -> example: XWing vs Tie Fighter install window
+//     WinInvalidateRect with fIncludeChildren=0 invalidates both the parent
+//     and child windows
+//                          RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
+                          RDW_NOCHILDREN_W | RDW_INVALIDATE_W |
                           (erase ? RDW_ERASE_W : RDW_NOERASE_W) |
                           (hwnd == NULLHANDLE ? RDW_UPDATENOW_W : 0));
@@ -1227 +1255 @@
    dprintf(("InvalidateRgn %x %x erase=%d", hwnd, hrgn, erase));
    result = RedrawWindow (hwnd, NULL, hrgn,
-                          RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
+//SvL: If all children are included, then WinInvalidateRegion is called
+//     with fIncludeChildren=1 -> region of hwnd isn't invalid if child(ren)
+//     overlap(s) it completely (EVEN if window doesn't have WS_CLIPCHILREN!)
+//     -> example: XWing vs Tie Fighter install window
+//     WinInvalidateRegion with fIncludeChildren=0 invalidates both the parent
+//     and child windows
+//                          RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
+                          RDW_NOCHILDREN_W | RDW_INVALIDATE_W |
                           (erase ? RDW_ERASE_W : RDW_NOERASE_W) |
                           (hwnd == NULLHANDLE ? RDW_UPDATENOW_W : 0));
@@ -1620 +1655 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API ValidateRect( HWND hwnd, const RECT * lprc)
-{
-    if(lprc) {
-         dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
-    }
-    else dprintf(("USER32: ValidateRect %x", hwnd));
-
-    return RedrawWindow( hwnd, lprc, 0, RDW_VALIDATE_W | RDW_NOCHILDREN_W | (hwnd==0 ? RDW_UPDATENOW_W : 0));
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API ValidateRgn( HWND hwnd, HRGN  hrgn)
-{
-    dprintf(("USER32: ValidateRgn %x %x", hwnd, hrgn));
-    return RedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE_W | RDW_NOCHILDREN_W | (hwnd==0 ? RDW_UPDATENOW_W : 0));
-}
-//******************************************************************************
-//******************************************************************************