[ros-diffs] [tkreuzer] 41818: IntGdiPolyPatBlt: Don't unnecessarily update the dc's brush, improve and simplyfy code,

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Thu Jul  9 01:05:37 2009
New Revision: 41818

URL: http://svn.reactos.org/svn/reactos?rev=41818&view=rev
Log:
IntGdiPolyPatBlt: Don't unnecessarily update the dc's brush, improve and simplyfy code, 

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/bitblt.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/bitblt.c?rev=41818&r1=41817&r2=41818&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu Jul  9 01:05:37 2009
@@ -928,78 +928,80 @@
 
 BOOL FASTCALL
 IntPatBlt(
-    PDC dc,
+    PDC pdc,
     INT XLeft,
     INT YLeft,
     INT Width,
     INT Height,
-    DWORD ROP,
-    PBRUSH BrushObj)
+    DWORD dwRop,
+    PBRUSH pbrush)
 {
     RECTL DestRect;
     SURFACE *psurf;
     EBRUSHOBJ eboFill;
     POINTL BrushOrigin;
-    BOOL ret = TRUE;
-
-    ASSERT(BrushObj);
-
-    psurf = dc->dclevel.pSurface;
+    BOOL ret;
+
+    ASSERT(pbrush);
+
+    psurf = pdc->dclevel.pSurface;
     if (psurf == NULL)
     {
         SetLastWin32Error(ERROR_INVALID_HANDLE);
         return FALSE;
     }
 
-    if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL))
-    {
-        if (Width > 0)
-        {
-            DestRect.left = XLeft;
-            DestRect.right = XLeft + Width;
-        }
-        else
-        {
-            DestRect.left = XLeft + Width + 1;
-            DestRect.right = XLeft + 1;
-        }
-
-        if (Height > 0)
-        {
-            DestRect.top = YLeft;
-            DestRect.bottom = YLeft + Height;
-        }
-        else
-        {
-            DestRect.top = YLeft + Height + 1;
-            DestRect.bottom = YLeft + 1;
-        }
-
-        IntLPtoDP(dc, (LPPOINT)&DestRect, 2);
-
-        DestRect.left   += dc->ptlDCOrig.x;
-        DestRect.top    += dc->ptlDCOrig.y;
-        DestRect.right  += dc->ptlDCOrig.x;
-        DestRect.bottom += dc->ptlDCOrig.y;
-
-        BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x;
-        BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y;
-
-        EBRUSHOBJ_vInit(&eboFill, BrushObj, dc->rosdc.XlateBrush);
-
-        ret = IntEngBitBlt(
-            &psurf->SurfObj,
-            NULL,
-            NULL,
-            dc->rosdc.CombinedClip,
-            NULL,
-            &DestRect,
-            NULL,
-            NULL,
-            &eboFill.BrushObject, // use pDC->eboFill
-            &BrushOrigin,
-            ROP3_TO_ROP4(ROP));
-    }
+    if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
+    {
+        return TRUE;
+    }
+
+    if (Width > 0)
+    {
+        DestRect.left = XLeft;
+        DestRect.right = XLeft + Width;
+    }
+    else
+    {
+        DestRect.left = XLeft + Width + 1;
+        DestRect.right = XLeft + 1;
+    }
+
+    if (Height > 0)
+    {
+        DestRect.top = YLeft;
+        DestRect.bottom = YLeft + Height;
+    }
+    else
+    {
+        DestRect.top = YLeft + Height + 1;
+        DestRect.bottom = YLeft + 1;
+    }
+
+    IntLPtoDP(pdc, (LPPOINT)&DestRect, 2);
+
+    DestRect.left   += pdc->ptlDCOrig.x;
+    DestRect.top    += pdc->ptlDCOrig.y;
+    DestRect.right  += pdc->ptlDCOrig.x;
+    DestRect.bottom += pdc->ptlDCOrig.y;
+
+    BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x;
+    BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y;
+
+    EBRUSHOBJ_vInit(&eboFill, pbrush, pdc->rosdc.XlateBrush);
+
+    ret = IntEngBitBlt(
+        &psurf->SurfObj,
+        NULL,
+        NULL,
+        pdc->rosdc.CombinedClip,
+        NULL,
+        &DestRect,
+        NULL,
+        NULL,
+        &eboFill.BrushObject, // use pDC->eboFill
+        &BrushOrigin,
+        ROP3_TO_ROP4(dwRop));
 
     return ret;
 }
@@ -1009,52 +1011,46 @@
     HDC hDC,
     DWORD dwRop,
     PPATRECT pRects,
-    int cRects,
+    INT cRects,
     ULONG Reserved)
 {
-    int i;
-    PPATRECT r;
+    INT i;
     PBRUSH pbrush;
-    PDC_ATTR pdcattr;
-    DC *dc;
-
-    dc = DC_LockDc(hDC);
-    if (dc == NULL)
+    PDC pdc;
+
+    pdc = DC_LockDc(hDC);
+    if (!pdc)
     {
         SetLastWin32Error(ERROR_INVALID_HANDLE);
         return FALSE;
     }
-    if (dc->dctype == DC_TYPE_INFO)
-    {
-        DC_UnlockDc(dc);
+
+    if (pdc->dctype == DC_TYPE_INFO)
+    {
+        DC_UnlockDc(pdc);
         /* Yes, Windows really returns TRUE in this case */
         return TRUE;
     }
 
-    pdcattr = dc->pdcattr;
-
-    if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
-        DC_vUpdateFillBrush(dc);
-
-    for (r = pRects, i = 0; i < cRects; i++)
-    {
-        pbrush = BRUSH_LockBrush(r->hBrush);
+    for (i = 0; i < cRects; i++)
+    {
+        pbrush = BRUSH_LockBrush(pRects->hBrush);
         if(pbrush != NULL)
         {
             IntPatBlt(
-                dc,
-                r->r.left,
-                r->r.top,
-                r->r.right,
-                r->r.bottom,
+                pdc,
+                pRects->r.left,
+                pRects->r.top,
+                pRects->r.right,
+                pRects->r.bottom,
                 dwRop,
                 pbrush);
             BRUSH_UnlockBrush(pbrush);
         }
-        r++;
-    }
-
-    DC_UnlockDc(dc);
+        pRects++;
+    }
+
+    DC_UnlockDc(pdc);
 
     return TRUE;
 }