commit 2a2321bbca3ef72649dc34a185bc6f7cef4a58fa
author Alexandre Julliard <julliard@winehq.org> Sat Aug 19 21:38:55 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 19 21:38:55 2000 +0000
tree 4d6b9768a706f9aca41ae05b8b8d1e65d49977f0
parent 9fcb4f551e680e90168131ba4c2a85f8a773bb86

Authors: Alexandre Julliard <julliard@codeweavers.com> (for Corel), Albert den Haan <albertd@corel.com>
Added syslevel locking for GDI operations.
Propagate the changes through the graphics code.

windows/scroll.c

diff --git a/windows/scroll.c b/windows/scroll.c
index 9bc803c..4eb1760 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -81,7 +81,7 @@
 {
     RECT rect, rClip, rSrc;
     POINT src, dest;
-    DC *dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC);
+    DC *dc = DC_GetDCUpdate( hdc );
 
     TRACE("%04x %d,%d hrgnUpdate=%04x rcUpdate = %p cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d)\n",
                    (HDC16)hdc, dx, dy, hrgnUpdate, rcUpdate, 
@@ -126,7 +126,7 @@
                            rSrc.right - rSrc.left, rSrc.bottom - rSrc.top,
                            hdc, src.x, src.y, SRCCOPY))
             {
-                GDI_HEAP_UNLOCK( hdc );
+                GDI_ReleaseObj( hdc );
                 return FALSE;
             }
         }
@@ -171,7 +171,7 @@
        if (rcUpdate) SetRectEmpty(rcUpdate);
     }
 
-    GDI_HEAP_UNLOCK( hdc );
+    GDI_ReleaseObj( hdc );
     return TRUE;
 }
 
@@ -254,7 +254,6 @@
 
     if (!IsRectEmpty(&cliprc) && (dx || dy))
     {
-	DC*	dc;
 	HDC	hDC;
 	BOOL  bUpdate = (rcUpdate || hrgnUpdate || flags & (SW_INVALIDATE | SW_ERASE));
 	HRGN  hrgnClip = CreateRectRgnIndirect(&cliprc);
@@ -276,13 +275,15 @@
 	hDC = GetDCEx( hwnd, hrgnClip, DCX_CACHE | DCX_USESTYLE |
                          DCX_KEEPCLIPRGN | DCX_INTERSECTRGN |
 		       ((flags & SW_SCROLLCHILDREN) ? DCX_NOCLIPCHILDREN : 0) );
-	if( (dc = (DC *)GDI_GetObjPtr(hDC, DC_MAGIC)) )
+	if (hDC)
 	{
-            if (dc->w.hVisRgn) {
                 wnd->pDriver->pSurfaceCopy(wnd,hDC,dx,dy,&rc,bUpdate);
-
                 if( bUpdate )
                     {
+                DC*	dc;
+
+                if( (dc = DC_GetDCPtr(hDC)) )
+                {
                         OffsetRgn( hrgnTemp, dc->w.DCOrgX, dc->w.DCOrgY );
                         CombineRgn( hrgnTemp, hrgnTemp, dc->w.hVisRgn,
                                       RGN_AND );
@@ -295,10 +296,10 @@
                                           RGN_DIFF );
 
                         if( rcUpdate ) GetRgnBox( hrgnUpdate, rcUpdate );
+                        GDI_ReleaseObj( hDC );
                     }
             }
             ReleaseDC(hwnd, hDC);
-            GDI_HEAP_UNLOCK( hDC );
         }
 
 	if( wnd->hrgnUpdate > 1 )