Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 01:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-apply r15878 as it wasn't the cause of the problems

Browse source 
svn path=/trunk/; revision=15902
This commit is contained in:
Gé van Geldorp 2005-06-13 22:27:09 +00:00
parent 08d5e5e7e5
commit 9c3a32fd9e
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/subsys/win32k/eng/lineto.c
View file

@ -486,7 +486,7 @@ EngLineTo(SURFOBJ *DestObj,
BOOL STDCALL
IntEngLineTo(BITMAPOBJ *DestObj,
CLIPOBJ *Clip,
CLIPOBJ *ClipObj,
BRUSHOBJ *Brush,
LONG x1,
LONG y1,
@ -517,6 +517,26 @@ IntEngLineTo(BITMAPOBJ *DestObj,
/* No success yet */
ret = FALSE;
/* Clip lines totally outside the clip region. This is not done as an
* optimization (there are very few lines drawn outside the region) but
* as a workaround for what seems to be a problem in the CL54XX driver */
if (NULL == ClipObj || DC_TRIVIAL == ClipObj->iDComplexity)
{
b.left = 0;
b.right = DestSurf->sizlBitmap.cx;
b.top = 0;
b.bottom = DestSurf->sizlBitmap.cy;
}
else
{
b = ClipObj->rclBounds;
}
if ((x1 < b.left && x2 < b.left) || (b.right <= x1 && b.right <= x2) ||
(y1 < b.top && y2 < b.top) || (b.bottom <= y1 && b.bottom <= y2))
{
return TRUE;
}
b.left = min(x1, x2);
b.right = max(x1, x2);
b.top = min(y1, y2);
@ -529,7 +549,7 @@ IntEngLineTo(BITMAPOBJ *DestObj,
{
/* Call the driver's DrvLineTo */
ret = GDIDEVFUNCS(DestSurf).LineTo(
DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, Mix);
DestSurf, ClipObj, Brush, x1, y1, x2, y2, &b, Mix);
}
#if 0
@ -541,7 +561,7 @@ IntEngLineTo(BITMAPOBJ *DestObj,
if (! ret)
{
ret = EngLineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, Mix);
ret = EngLineTo(DestSurf, ClipObj, Brush, x1, y1, x2, y2, RectBounds, Mix);
}
MouseSafetyOnDrawEnd(DestSurf);