[WIN32K]

Update all brushes in DC_vPrepareDCsForBlit. This allows us to simplify the code elsewhere.

svn path=/trunk/; revision=50997

diff --git a/reactos/subsystems/win32/win32k/objects/dclife.c b/reactos/subsystems/win32/win32k/objects/dclife.c
index 108762e..a283a8d 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/dclife.c
+++ b/reactos/subsystems/win32/win32k/objects/dclife.c
@@ -480,6 +480,15 @@ DC_vPrepareDCsForBlit(PDC pdc1,
 {
     PDC pdcFirst, pdcSecond;
     PRECT prcFirst, prcSecond;
 {
     PDC pdcFirst, pdcSecond;
     PRECT prcFirst, prcSecond;

+
+    /* Update brushes */
+    if (pdc1->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(pdc1);
+    if (pdc1->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
+        DC_vUpdateLineBrush(pdc1);
+    if(pdc1->pdcattr->ulDirty_ & DIRTY_TEXT)
+        DC_vUpdateTextBrush(pdc1);
+

     /* Lock them in good order */
     if(pdc2)
     {
     /* Lock them in good order */
     if(pdc2)
     {