From 0aec39dcbe5be6fb1d01459eeab10d72487112c9 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Mon, 13 Jun 2005 02:02:21 +0000 Subject: [PATCH] revert back to 15869 for current change break 32 / 8 bpp for vbe drv, and vmware drv the mouse did not redaw some dialog box was wrong. and alot more svn path=/trunk/; revision=15881 --- reactos/subsys/win32k/eng/lineto.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c index 8c24a538474..b162a053a11 100644 --- a/reactos/subsys/win32k/eng/lineto.c +++ b/reactos/subsys/win32k/eng/lineto.c @@ -486,7 +486,7 @@ EngLineTo(SURFOBJ *DestObj, BOOL STDCALL IntEngLineTo(BITMAPOBJ *DestObj, - CLIPOBJ *ClipObj, + CLIPOBJ *Clip, BRUSHOBJ *Brush, LONG x1, LONG y1, @@ -517,26 +517,6 @@ 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); @@ -549,7 +529,7 @@ IntEngLineTo(BITMAPOBJ *DestObj, { /* Call the driver's DrvLineTo */ ret = GDIDEVFUNCS(DestSurf).LineTo( - DestSurf, ClipObj, Brush, x1, y1, x2, y2, &b, Mix); + DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, Mix); } #if 0 @@ -561,7 +541,7 @@ IntEngLineTo(BITMAPOBJ *DestObj, if (! ret) { - ret = EngLineTo(DestSurf, ClipObj, Brush, x1, y1, x2, y2, RectBounds, Mix); + ret = EngLineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, Mix); } MouseSafetyOnDrawEnd(DestSurf);