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

Timestamp:

Jan 27, 2000, 6:21:10 PM (26 years ago)

Author:

cbratschi

Message:

WINE code clean-up

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.36 2000-01-25 20:39:41 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.37 2000-01-27 17:21:08 cbratschi Exp $ */
 
 /*
@@ -828 +828 @@
    if (hwnd)
    {
-        Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
-        if(wnd == NULL) {
-                dprintf(("ERROR: ReleaseDC %x %x failed", hwnd, hdc));
-                return 0;
-        }
-        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+        Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+        if(wnd == NULL) {
+                dprintf(("ERROR: ReleaseDC %x %x failed", hwnd, hdc));
+                return 0;
+        }
+        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
 //      isOwnDC = wnd->isOwnDC() && wnd->getOwnDC();
-        isOwnDC = wnd->isOwnDC() && (wnd->getOwnDC() == hdc);
+        isOwnDC = wnd->isOwnDC() && (wnd->getOwnDC() == hdc);
    }
    if (isOwnDC)
@@ -1040 +1040 @@
 {
    BOOL result;
-   
+
    result = RedrawWindow (hwnd, pRect, NULLHANDLE,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
@@ -1250 +1250 @@
  APIRET  rc;
  RECTL   clientRect;
+ PRECT   pClientRect;
  RECTL   scrollRect;
  RECTL   clipRect;
- PRECT   pClientRect;
  PRECTL  pScrollRect = NULL;
  PRECTL  pClipRect   = NULL;
@@ -1263 +1263 @@
     }
     dprintf(("ScrollWindow %x %d %d %x %x", hwnd, dx, dy, pScroll, pClip));
+
     pClientRect = window->getClientRectPtr();
     clientRect.xLeft   = 0;
@@ -1268 +1269 @@
     clientRect.xRight  = pClientRect->right - pClientRect->left;
     clientRect.yTop    = pClientRect->bottom - pClientRect->top;
+
     if(pScroll) {
          mapWin32ToOS2Rect(window,(RECT *)pScroll, (PRECTLOS2)&scrollRect);