Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
- revert unwanted change from r46964
  - Use MouseSafetyOnDrawStart/End in GreExtTextOutW when we already hold the blit lock

svn path=/branches/reactos-yarotows/; revision=46969
This commit is contained in:
Jérôme Gardou 2010-04-20 22:20:55 +00:00
parent 2f9569c2e5
commit d8020bbbe1
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subsystems/win32/win32k/objects/bitblt.c
View file

@ -936,6 +936,7 @@ IntPatBlt(
{ {
RECTL DestRect; RECTL DestRect;
SURFACE *psurf; SURFACE *psurf;
EBRUSHOBJ eboFill ;
POINTL BrushOrigin; POINTL BrushOrigin;
BOOL ret; BOOL ret;
@ -985,6 +986,8 @@ IntPatBlt(
if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
DC_vUpdateFillBrush(pdc); DC_vUpdateFillBrush(pdc);
EBRUSHOBJ_vInit(&eboFill, pbrush, pdc);
ret = IntEngBitBlt( ret = IntEngBitBlt(
&psurf->SurfObj, &psurf->SurfObj,
NULL, NULL,
@ -994,12 +997,14 @@ IntPatBlt(
&DestRect, &DestRect,
NULL, NULL,
NULL, NULL,
&pdc->eboFill.BrushObject, &eboFill.BrushObject,
&BrushOrigin, &BrushOrigin,
ROP3_TO_ROP4(dwRop)); ROP3_TO_ROP4(dwRop));
DC_vFinishBlit(pdc, NULL); DC_vFinishBlit(pdc, NULL);
EBRUSHOBJ_vCleanup(&eboFill);
return ret; return ret;
} }

8
subsystems/win32/win32k/objects/freetype.c
View file

@ -3506,7 +3506,7 @@ GreExtTextOutW(
DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6;
DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6);
DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 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( IntEngBitBlt(
&psurf->SurfObj, &psurf->SurfObj,
NULL, NULL,
@ -3519,7 +3519,7 @@ GreExtTextOutW(
&dc->eboBackground.BrushObject, &dc->eboBackground.BrushObject,
&BrushOrigin, &BrushOrigin,
ROP3_TO_ROP4(PATCOPY)); ROP3_TO_ROP4(PATCOPY));
DC_vFinishBlit(dc, NULL); MouseSafetyOnDrawEnd(dc->ppdev);
BackgroundLeft = DestRect.right; BackgroundLeft = DestRect.right;
} }
@ -3574,7 +3574,7 @@ GreExtTextOutW(
DestRect.right = lprc->right + dc->ptlDCOrig.x; DestRect.right = lprc->right + dc->ptlDCOrig.x;
DoBreak = TRUE; DoBreak = TRUE;
} }
DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
IntEngMaskBlt( IntEngMaskBlt(
SurfObj, SurfObj,
SourceGlyphSurf, SourceGlyphSurf,
@ -3585,7 +3585,7 @@ GreExtTextOutW(
(PPOINTL)&MaskRect, (PPOINTL)&MaskRect,
&dc->eboText.BrushObject, &dc->eboText.BrushObject,
&BrushOrigin); &BrushOrigin);
DC_vFinishBlit(dc, NULL); MouseSafetyOnDrawEnd(dc->ppdev) ;
EngUnlockSurface(SourceGlyphSurf); EngUnlockSurface(SourceGlyphSurf);
EngDeleteSurface((HSURF)HSourceGlyph); EngDeleteSurface((HSURF)HSourceGlyph);