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

Timestamp:

Dec 24, 1999, 10:44:04 PM (26 years ago)

Author:

sandervl

Message:

some fixes

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.29 1999-12-24 18:39:10 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.30 1999-12-24 21:44:03 sandervl Exp $ */
 
 /*
@@ -436 +436 @@
    }
 
+   if(hWnd == 0x6800003a) {
+        hwnd = 0x6800003a; 
+   }
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
@@ -469 +472 @@
    lpps->hdc = (HDC)hps;
 
-//   if (wnd->isEraseBkgnd())
-       wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
-   wnd->setSupressErase (FALSE);
+   if(!wnd->isSuppressErase()) {
+        wnd->setSuppressErase(TRUE);
+        wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
+   }
    lpps->fErase = wnd->isPSErase();
 
@@ -495 +499 @@
 BOOL WIN32API EndPaint (HWND hwnd, const PAINTSTRUCT_W *pPaint)
 {
-dprintf (("USER32: EndPaint(%x)", hwnd));
+   dprintf (("USER32: EndPaint(%x)", hwnd));
 
    if (!pPaint || !pPaint->hdc )
@@ -518 +522 @@
        O32_EndPaint (HWND_DESKTOP, pPaint);
    }
+   wnd->setSuppressErase(FALSE);
 
 exit:
@@ -869 +874 @@
       wnd->setEraseBkgnd (FALSE);
 
-   if (redraw & RDW_UPDATENOW_W)
-      wnd->setSupressErase (FALSE);
-   else if (redraw & RDW_ERASENOW_W)
-      wnd->setSupressErase (FALSE);
+//SvL: Test
+//   if (redraw & RDW_UPDATENOW_W)
+//      wnd->setSuppressErase (FALSE);
+//   else if (redraw & RDW_ERASENOW_W)
+//      wnd->setSuppressErase (FALSE);
 #if 0
    else
@@ -882 +888 @@
                 && (redraw & RDW_NOERASE_W) == 0);
 
-      wnd->setSupressErase (!erase);
+      wnd->setSuppressErase (!erase);
    }
 
@@ -982 +988 @@
       WinReleasePS (hpsTemp);
 
-   if ((redraw & RDW_INVALIDATE_W) == 0)
-      wnd->setSupressErase (FALSE);
-   else if ((redraw & RDW_ERASENOW_W) == RDW_ERASENOW_W)
-      wnd->setSupressErase (TRUE);
+//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)
@@ -1383 +1390 @@
 BOOL WIN32API ValidateRect( HWND hwnd, const RECT * lprc)
 {
-    dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
+    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));
 }