[ros-diffs] [jgardou] 46969: [WIN32K] - revert unwanted change from r46964 - Use MouseSafetyOnDrawStart/End in GreExtTextOutW when we already hold the blit lock

Author: jgardou
Date: Wed Apr 21 00:20:55 2010
New Revision: 46969

URL: http://svn.reactos.org/svn/reactos?rev=46969&view=rev
Log:
[WIN32K]
  - revert unwanted change from r46964
  - Use MouseSafetyOnDrawStart/End in GreExtTextOutW when we already hold the blit lock

Modified:
    branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c
    branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c

Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1]
(original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed
Apr 21 00:20:55 2010
@@ -936,6 +936,7 @@
 {
     RECTL DestRect;
     SURFACE *psurf;
+    EBRUSHOBJ eboFill ;
     POINTL BrushOrigin;
     BOOL ret;
 
@@ -984,6 +985,8 @@
 
     if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
         DC_vUpdateFillBrush(pdc);
+
+    EBRUSHOBJ_vInit(&eboFill, pbrush, pdc);
 
     ret = IntEngBitBlt(
         &psurf->SurfObj,
@@ -994,11 +997,13 @@
         &DestRect,
         NULL,
         NULL,
-        &pdc->eboFill.BrushObject,
+        &eboFill.BrushObject,
         &BrushOrigin,
         ROP3_TO_ROP4(dwRop));
 
     DC_vFinishBlit(pdc, NULL);
+
+    EBRUSHOBJ_vCleanup(&eboFill);
 
     return ret;
 }

Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1]
(original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed
Apr 21 00:20:55 2010
@@ -3506,7 +3506,7 @@
             DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32)
>> 6;
             DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32)
>> 6);
             DestRect.bottom = TextTop + yoff + ((32 -
face->size->metrics.descender) >> 6);
-            DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect);
+            MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top,
DestRect.right, DestRect.bottom);
             IntEngBitBlt(
                 &psurf->SurfObj,
                 NULL,
@@ -3519,7 +3519,7 @@
                 &dc->eboBackground.BrushObject,
                 &BrushOrigin,
                 ROP3_TO_ROP4(PATCOPY));
-            DC_vFinishBlit(dc, NULL);
+            MouseSafetyOnDrawEnd(dc->ppdev);
             BackgroundLeft = DestRect.right;
 
         }
@@ -3574,7 +3574,7 @@
             DestRect.right = lprc->right + dc->ptlDCOrig.x;
             DoBreak = TRUE;
         }
-        DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect);
+        MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right,
DestRect.bottom);
         IntEngMaskBlt(
             SurfObj,
             SourceGlyphSurf,
@@ -3585,7 +3585,7 @@
             (PPOINTL)&MaskRect,
             &dc->eboText.BrushObject,
             &BrushOrigin);
-        DC_vFinishBlit(dc, NULL);
+        MouseSafetyOnDrawEnd(dc->ppdev) ;
 
         EngUnlockSurface(SourceGlyphSurf);
         EngDeleteSurface((HSURF)HSourceGlyph);