Author: fireball Date: Wed Jul 22 14:17:20 2009 New Revision: 42141
URL: http://svn.reactos.org/svn/reactos?rev=42141&view=rev Log: - Silent debug prints in eng/engsurf.c. - Fix a typo in the comments of gdi/misc.c. - Offset source point in BitBlt by vport origin too. - Offset coordinates once in GreTextOut, so that SharpGlyphMono works with already offsetted device coordinates. - Offset coordinates by vport origin in GrePolyline and GreRectangle.
Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/
#include <win32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h>
/* PUBLIC FUNCTIONS **********************************************************/
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -197,7 +197,7 @@ /* Get a pointer to the DC */ pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC);
- /* Draw the polygon */ + /* Draw the polyline */ GrePolyline(pDC, pt, count);
/* Release the object */
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -182,8 +182,8 @@
if (pSrc) { - SourcePoint.x += pSrc->rcDcRect.left; - SourcePoint.y += pSrc->rcDcRect.top; + SourcePoint.x += pSrc->rcDcRect.left + pSrc->rcVport.left; + SourcePoint.y += pSrc->rcDcRect.top + pSrc->rcVport.left; }
/* Perform the bitblt operation */
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -62,14 +62,13 @@ } while (bits & bitsMask); rcBounds.left = xspan; rcBounds.top = y; rcBounds.right = xspan+lenspan; rcBounds.bottom = y+1; - RECTL_vOffsetRect(&rcBounds, physDev->rcVport.left, physDev->rcVport.top); GreLineTo(&physDev->pBitmap->SurfObj, NULL, &textBrush, - xspan + physDev->rcVport.left, - y + physDev->rcVport.top, - xspan + lenspan + physDev->rcVport.left, - y + physDev->rcVport.top, + xspan, + y, + xspan + lenspan, + y, &rcBounds, 0); xspan += lenspan; @@ -158,8 +157,8 @@ //sharp_glyph_fn = SharpGlyphGray;
for(idx = 0; idx < count; idx++) { - sharp_glyph_fn(pDC, pDC->rcDcRect.left + x + xoff, - pDC->rcDcRect.top + y + yoff, + sharp_glyph_fn(pDC, pDC->rcDcRect.left + pDC->rcVport.left + x + xoff, + pDC->rcDcRect.top + pDC->rcVport.top + y + yoff, formatEntry->bitmaps[wstr[idx]], &formatEntry->gis[wstr[idx]]); if(lpDx) {
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -124,10 +124,10 @@ bRet = GreLineTo(&pDC->pBitmap->SurfObj, NULL,//dc->rosdc.CombinedClip, &pDC->pLineBrush->BrushObj, - ptPoints[i].x + pDC->rcDcRect.left, - ptPoints[i].y + pDC->rcDcRect.top, - ptPoints[i+1].x + pDC->rcDcRect.left, - ptPoints[i+1].y + pDC->rcDcRect.top, + ptPoints[i].x + pDC->rcDcRect.left + pDC->rcVport.left, + ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top, + ptPoints[i+1].x + pDC->rcDcRect.left + pDC->rcVport.left, + ptPoints[i+1].y + pDC->rcDcRect.top + pDC->rcVport.top, &DestRect, // Bounding rectangle Mix); }
Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -27,10 +27,10 @@ MIX Mix; POINT BrushOrigin = {0, 0};
- DestRect.left = LeftRect + pDC->rcDcRect.left; - DestRect.right = RightRect + pDC->rcDcRect.left; - DestRect.top = TopRect + pDC->rcDcRect.top; - DestRect.bottom = BottomRect + pDC->rcDcRect.top; + DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; + DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; + DestRect.top = TopRect + pDC->rcDcRect.top + pDC->rcVport.top; + DestRect.bottom = BottomRect + pDC->rcDcRect.top + pDC->rcVport.top;
/* Draw brush-based rectangle */ if (pDC->pFillBrush)