+/*
+ * ReactOS W32 Subsystem
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id$ */
#undef WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <ddk/ntddk.h>
#include <win32k/float.h>
#include <win32k/coord.h>
#include <win32k/line.h>
+#define _WIN32K_PATH_INTERNAL
+#include <include/object.h>
+#include <include/path.h>
#include <math.h>
#include <float.h>
#define GROW_FACTOR_DENOM 1 /* Denominator of grow factor */
-static BOOL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode,
- HRGN *pHrgn);
-static void PATH_EmptyPath(GdiPath *pPath);
-static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint,
- BYTE flags);
-static BOOL PATH_ReserveEntries(GdiPath *pPath, INT numEntries);
-static BOOL PATH_GetPathFromHDC(HDC hdc, GdiPath **ppPath);
-static BOOL PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
- double angleStart, double angleEnd, BOOL addMoveTo);
-static void PATH_ScaleNormalizedPoint(FLOAT_POINT corners[], double x,
- double y, POINT *pPoint);
-static void PATH_NormalizePoint(FLOAT_POINT corners[], const FLOAT_POINT
- *pPoint, double *pX, double *pY);
BOOL
STDCALL
-W32kAbortPath(HDC hDC)
+NtGdiAbortPath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kBeginPath(HDC hDC)
+NtGdiBeginPath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
-STDCALL
-W32kCloseFigure(HDC hDC)
+FASTCALL
+IntCloseFigure ( PDC dc )
{
UNIMPLEMENTED;
+ return FALSE;
}
BOOL
STDCALL
-W32kEndPath(HDC hDC)
+NtGdiCloseFigure ( HDC hDC )
+{
+ PDC dc = DC_LockDc ( hDC );
+ BOOL ret = FALSE; // default to failure
+
+ if ( dc )
+ {
+ ret = IntCloseFigure ( dc );
+ DC_UnlockDc ( hDC );
+ }
+
+ return ret;
+}
+
+BOOL
+STDCALL
+NtGdiEndPath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kFillPath(HDC hDC)
+NtGdiFillPath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kFlattenPath(HDC hDC)
+NtGdiFlattenPath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kGetMiterLimit(HDC hDC,
+NtGdiGetMiterLimit(HDC hDC,
PFLOAT Limit)
{
UNIMPLEMENTED;
INT
STDCALL
-W32kGetPath(HDC hDC,
+NtGdiGetPath(HDC hDC,
LPPOINT Points,
LPBYTE Types,
INT nSize)
HRGN
STDCALL
-W32kPathToRegion(HDC hDC)
+NtGdiPathToRegion(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kSetMiterLimit(HDC hDC,
+NtGdiSetMiterLimit(HDC hDC,
FLOAT NewLimit,
PFLOAT OldLimit)
{
BOOL
STDCALL
-W32kStrokeAndFillPath(HDC hDC)
+NtGdiStrokeAndFillPath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kStrokePath(HDC hDC)
+NtGdiStrokePath(HDC hDC)
{
UNIMPLEMENTED;
}
BOOL
STDCALL
-W32kWidenPath(HDC hDC)
+NtGdiWidenPath(HDC hDC)
{
UNIMPLEMENTED;
}
*
* Initializes the GdiPath structure.
*/
-void PATH_InitGdiPath(GdiPath *pPath)
+VOID
+FASTCALL
+PATH_InitGdiPath ( GdiPath *pPath )
{
assert(pPath!=NULL);
*
* Destroys a GdiPath structure (frees the memory in the arrays).
*/
-void PATH_DestroyGdiPath(GdiPath *pPath)
+VOID
+FASTCALL
+PATH_DestroyGdiPath ( GdiPath *pPath )
{
assert(pPath!=NULL);
* not a copy constructor).
* Returns TRUE if successful, else FALSE.
*/
-BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc)
+BOOL
+FASTCALL
+PATH_AssignGdiPath ( GdiPath *pPathDest, const GdiPath *pPathSrc )
{
assert(pPathDest!=NULL && pPathSrc!=NULL);
/* Make sure destination arrays are big enough */
- if(!PATH_ReserveEntries(pPathDest, pPathSrc->numEntriesUsed))
+ if ( !PATH_ReserveEntries(pPathDest, pPathSrc->numEntriesUsed) )
return FALSE;
/* Perform the copy operation */
* open path. This starts a new stroke. Returns TRUE if successful, else
* FALSE.
*/
-BOOL PATH_MoveTo(HDC hdc)
+BOOL
+FASTCALL
+PATH_MoveTo ( PDC dc )
{
GdiPath *pPath;
/* Get pointer to path */
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
/* FIXME: Do we have to call SetLastError? */
return FALSE;
/* Start a new stroke */
- pPath->newStroke=TRUE;
+ pPath->newStroke = TRUE;
return TRUE;
}
* a PT_MOVETO entry, if this is the first LineTo in a stroke).
* Returns TRUE if successful, else FALSE.
*/
-BOOL PATH_LineTo(HDC hdc, INT x, INT y)
+BOOL
+FASTCALL
+PATH_LineTo ( PDC dc, INT x, INT y )
{
GdiPath *pPath;
POINT point, pointCurPos;
/* Get pointer to path */
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
/* Convert point to device coordinates */
point.x=x;
point.y=y;
- if(!W32kLPtoDP(hdc, &point, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &point );
/* Add a PT_MOVETO if necessary */
- if(pPath->newStroke)
+ if ( pPath->newStroke )
{
- pPath->newStroke=FALSE;
- if(!W32kGetCurrentPositionEx(hdc, &pointCurPos) ||
- !W32kLPtoDP(hdc, &pointCurPos, 1))
- return FALSE;
- if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO))
+ pPath->newStroke = FALSE;
+ IntGetCurrentPositionEx ( dc, &pointCurPos );
+ CoordLPtoDP ( dc, &pointCurPos );
+ if ( !PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO) )
return FALSE;
}
* Should be called when a call to Rectangle is performed on a DC that has
* an open path. Returns TRUE if successful, else FALSE.
*/
-BOOL PATH_Rectangle(HDC hdc, INT x1, INT y1, INT x2, INT y2)
+BOOL
+FASTCALL
+PATH_Rectangle ( PDC dc, INT x1, INT y1, INT x2, INT y2 )
{
GdiPath *pPath;
POINT corners[2], pointTemp;
INT temp;
/* Get pointer to path */
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
/* Convert points to device coordinates */
corners[0].y=y1;
corners[1].x=x2;
corners[1].y=y2;
- if(!W32kLPtoDP(hdc, corners, 2))
- return FALSE;
+ IntLPtoDP ( dc, corners, 2 );
/* Make sure first corner is top left and second corner is bottom right */
- if(corners[0].x>corners[1].x)
+ if ( corners[0].x > corners[1].x )
{
temp=corners[0].x;
corners[0].x=corners[1].x;
corners[1].x=temp;
}
- if(corners[0].y>corners[1].y)
+ if ( corners[0].y > corners[1].y )
{
temp=corners[0].y;
corners[0].y=corners[1].y;
}
/* In GM_COMPATIBLE, don't include bottom and right edges */
- if(W32kGetGraphicsMode(hdc)==GM_COMPATIBLE)
+ if ( IntGetGraphicsMode(dc) == GM_COMPATIBLE )
{
corners[1].x--;
corners[1].y--;
}
/* Close any previous figure */
- if(!W32kCloseFigure(hdc))
+ if ( !IntCloseFigure ( dc ) )
{
- /* The W32kCloseFigure call shouldn't have failed */
+ /* The NtGdiCloseFigure call shouldn't have failed */
assert(FALSE);
return FALSE;
}
/* Add four points to the path */
pointTemp.x=corners[1].x;
pointTemp.y=corners[0].y;
- if(!PATH_AddEntry(pPath, &pointTemp, PT_MOVETO))
+ if ( !PATH_AddEntry(pPath, &pointTemp, PT_MOVETO) )
return FALSE;
- if(!PATH_AddEntry(pPath, corners, PT_LINETO))
+ if ( !PATH_AddEntry(pPath, corners, PT_LINETO) )
return FALSE;
pointTemp.x=corners[0].x;
pointTemp.y=corners[1].y;
- if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO))
+ if ( !PATH_AddEntry(pPath, &pointTemp, PT_LINETO) )
return FALSE;
- if(!PATH_AddEntry(pPath, corners+1, PT_LINETO))
+ if ( !PATH_AddEntry(pPath, corners+1, PT_LINETO) )
return FALSE;
/* Close the rectangle figure */
- if(!W32kCloseFigure(hdc))
+ if ( !IntCloseFigure ( dc ) )
{
- /* The W32kCloseFigure call shouldn't have failed */
+ /* The IntCloseFigure call shouldn't have failed */
assert(FALSE);
return FALSE;
}
return TRUE;
}
+BOOL
+FASTCALL
+PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius)
+{
+ UNIMPLEMENTED;
+ return FALSE;
+}
+
/* PATH_Ellipse
*
* Should be called when a call to Ellipse is performed on a DC that has
* an open path. This adds four Bezier splines representing the ellipse
* to the path. Returns TRUE if successful, else FALSE.
*/
-BOOL PATH_Ellipse(HDC hdc, INT x1, INT y1, INT x2, INT y2)
+BOOL
+FASTCALL
+PATH_Ellipse ( PDC dc, INT x1, INT y1, INT x2, INT y2 )
{
/* TODO: This should probably be revised to call PATH_AngleArc */
/* (once it exists) */
- return PATH_Arc(hdc, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2);
+ return PATH_Arc ( dc, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2 );
}
/* PATH_Arc
* an open path. This adds up to five Bezier splines representing the arc
* to the path. Returns TRUE if successful, else FALSE.
*/
-BOOL PATH_Arc(HDC hdc, INT x1, INT y1, INT x2, INT y2,
+BOOL
+FASTCALL
+PATH_Arc ( PDC dc, INT x1, INT y1, INT x2, INT y2,
INT xStart, INT yStart, INT xEnd, INT yEnd)
{
GdiPath *pPath;
FLOAT_POINT corners[2], pointStart, pointEnd;
BOOL start, end;
INT temp;
+ BOOL clockwise;
/* FIXME: This function should check for all possible error returns */
/* FIXME: Do we have to respect newStroke? */
- /* Get pointer to DC */
- pDC=DC_HandleToPtr(hdc);
- if(pDC==NULL)
- return FALSE;
+ ASSERT ( dc );
+
+ clockwise = ( IntGetArcDirection(dc) == AD_CLOCKWISE );
/* Get pointer to path */
- if(!PATH_GetPathFromHDC(hdc, &pPath)){
- DC_ReleasePtr( hdc );
- return FALSE;
- }
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open){
- DC_ReleasePtr( hdc );
+ if ( pPath->state != PATH_Open )
return FALSE;
- }
/* FIXME: Do we have to close the current figure? */
/* Check for zero height / width */
/* FIXME: Only in GM_COMPATIBLE? */
- if(x1==x2 || y1==y2){
- DC_ReleasePtr( hdc );
+ if ( x1==x2 || y1==y2 )
return TRUE;
- }
/* Convert points to device coordinates */
corners[0].x=(FLOAT)x1;
INTERNAL_LPTODP_FLOAT(pDC, &pointEnd);
/* Make sure first corner is top left and second corner is bottom right */
- if(corners[0].x>corners[1].x)
+ if ( corners[0].x > corners[1].x )
{
temp=corners[0].x;
corners[0].x=corners[1].x;
corners[1].x=temp;
}
- if(corners[0].y>corners[1].y)
+ if ( corners[0].y > corners[1].y )
{
temp=corners[0].y;
corners[0].y=corners[1].y;
angleEnd=atan2(y, x);
/* Make sure the end angle is "on the right side" of the start angle */
- if(W32kGetArcDirection(hdc)==AD_CLOCKWISE)
+ if ( clockwise )
{
- if(angleEnd<=angleStart)
+ if ( angleEnd <= angleStart )
{
angleEnd+=2*M_PI;
assert(angleEnd>=angleStart);
}
/* In GM_COMPATIBLE, don't include bottom and right edges */
- if(W32kGetGraphicsMode(hdc)==GM_COMPATIBLE)
+ if ( IntGetGraphicsMode(dc) == GM_COMPATIBLE )
{
corners[1].x--;
corners[1].y--;
if(start)
{
angleStartQuadrant=angleStart;
- if(W32kGetArcDirection(hdc)==AD_CLOCKWISE)
+ if ( clockwise )
angleEndQuadrant=(floor(angleStart/M_PI_2)+1.0)*M_PI_2;
else
angleEndQuadrant=(ceil(angleStart/M_PI_2)-1.0)*M_PI_2;
else
{
angleStartQuadrant=angleEndQuadrant;
- if(W32kGetArcDirection(hdc)==AD_CLOCKWISE)
+ if ( clockwise )
angleEndQuadrant+=M_PI_2;
else
angleEndQuadrant-=M_PI_2;
}
/* Have we reached the last part of the arc? */
- if((W32kGetArcDirection(hdc)==AD_CLOCKWISE &&
- angleEnd<angleEndQuadrant) ||
- (W32kGetArcDirection(hdc)==AD_COUNTERCLOCKWISE &&
- angleEnd>angleEndQuadrant))
+ if ( (clockwise && angleEnd<angleEndQuadrant)
+ || (!clockwise && angleEnd>angleEndQuadrant)
+ )
{
/* Adjust the end angle for this quadrant */
- angleEndQuadrant=angleEnd;
- end=TRUE;
+ angleEndQuadrant = angleEnd;
+ end = TRUE;
}
/* Add the Bezier spline to the path */
- PATH_DoArcPart(pPath, corners, angleStartQuadrant, angleEndQuadrant, start);
- start=FALSE;
- } while(!end);
+ PATH_DoArcPart ( pPath, corners, angleStartQuadrant, angleEndQuadrant, start );
+ start = FALSE;
+ } while(!end);
- DC_ReleasePtr( hdc );
return TRUE;
}
-BOOL PATH_PolyBezierTo(HDC hdc, const POINT *pts, DWORD cbPoints)
+BOOL
+FASTCALL
+PATH_PolyBezierTo ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
POINT pt;
- INT i;
+ ULONG i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+ ASSERT ( cbPoints );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
/* Add a PT_MOVETO if necessary */
- if(pPath->newStroke)
+ if ( pPath->newStroke )
{
pPath->newStroke=FALSE;
- if(!W32kGetCurrentPositionEx(hdc, &pt) ||
- !W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
- if(!PATH_AddEntry(pPath, &pt, PT_MOVETO))
+ IntGetCurrentPositionEx ( dc, &pt );
+ CoordLPtoDP ( dc, &pt );
+ if ( !PATH_AddEntry(pPath, &pt, PT_MOVETO) )
return FALSE;
}
- for(i = 0; i < cbPoints; i++) {
+ for(i = 0; i < cbPoints; i++)
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &pt );
PATH_AddEntry(pPath, &pt, PT_BEZIERTO);
}
return TRUE;
}
-BOOL PATH_PolyBezier(HDC hdc, const POINT *pts, DWORD cbPoints)
+BOOL
+FASTCALL
+PATH_PolyBezier ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
POINT pt;
- INT i;
+ ULONG i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+ ASSERT ( cbPoints );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
- for(i = 0; i < cbPoints; i++) {
+ for ( i = 0; i < cbPoints; i++ )
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
- PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : PT_BEZIERTO);
+ CoordLPtoDP ( dc, &pt );
+ PATH_AddEntry ( pPath, &pt, (i == 0) ? PT_MOVETO : PT_BEZIERTO );
}
+
return TRUE;
}
-BOOL PATH_Polyline(HDC hdc, const POINT *pts, DWORD cbPoints)
+BOOL
+FASTCALL
+PATH_Polyline ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
POINT pt;
- INT i;
+ ULONG i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+ ASSERT ( cbPoints );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
- for(i = 0; i < cbPoints; i++) {
+ for ( i = 0; i < cbPoints; i++ )
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &pt );
PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : PT_LINETO);
}
return TRUE;
}
-BOOL PATH_PolylineTo(HDC hdc, const POINT *pts, DWORD cbPoints)
+BOOL
+FASTCALL
+PATH_PolylineTo ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
POINT pt;
- INT i;
+ ULONG i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+ ASSERT ( cbPoints );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
/* Add a PT_MOVETO if necessary */
- if(pPath->newStroke)
+ if ( pPath->newStroke )
{
- pPath->newStroke=FALSE;
- if(!W32kGetCurrentPositionEx(hdc, &pt) ||
- !W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
- if(!PATH_AddEntry(pPath, &pt, PT_MOVETO))
+ pPath->newStroke = FALSE;
+ IntGetCurrentPositionEx ( dc, &pt );
+ CoordLPtoDP ( dc, &pt );
+ if ( !PATH_AddEntry(pPath, &pt, PT_MOVETO) )
return FALSE;
}
- for(i = 0; i < cbPoints; i++) {
+ for(i = 0; i < cbPoints; i++)
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &pt );
PATH_AddEntry(pPath, &pt, PT_LINETO);
}
}
-BOOL PATH_Polygon(HDC hdc, const POINT *pts, DWORD cbPoints)
+BOOL
+FASTCALL
+PATH_Polygon ( PDC dc, const POINT *pts, DWORD cbPoints )
{
GdiPath *pPath;
POINT pt;
- INT i;
+ ULONG i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
- for(i = 0; i < cbPoints; i++) {
+ for(i = 0; i < cbPoints; i++)
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &pt );
PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO :
((i == cbPoints-1) ? PT_LINETO | PT_CLOSEFIGURE :
PT_LINETO));
return TRUE;
}
-BOOL PATH_PolyPolygon( HDC hdc, const POINT* pts, const INT* counts,
- UINT polygons )
+BOOL
+FASTCALL
+PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons )
{
GdiPath *pPath;
POINT pt, startpt;
- INT poly, point, i;
+ ULONG poly, point, i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+ ASSERT ( counts );
+ ASSERT ( polygons );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open );
return FALSE;
- for(i = 0, poly = 0; poly < polygons; poly++) {
- for(point = 0; point < counts[poly]; point++, i++) {
+ for(i = 0, poly = 0; poly < polygons; poly++)
+ {
+ for(point = 0; point < (ULONG) counts[poly]; point++, i++)
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &pt );
if(point == 0) startpt = pt;
PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO);
}
return TRUE;
}
-BOOL PATH_PolyPolyline( HDC hdc, const POINT* pts, const DWORD* counts,
- DWORD polylines )
+BOOL
+FASTCALL
+PATH_PolyPolyline ( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines )
{
GdiPath *pPath;
POINT pt;
- INT poly, point, i;
+ ULONG poly, point, i;
- if(!PATH_GetPathFromHDC(hdc, &pPath))
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( pts );
+ ASSERT ( counts );
+ ASSERT ( polylines );
+
+ PATH_GetPathFromDC ( dc, &pPath );
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
- for(i = 0, poly = 0; poly < polylines; poly++) {
- for(point = 0; point < counts[poly]; point++, i++) {
+ for(i = 0, poly = 0; poly < polylines; poly++)
+ {
+ for(point = 0; point < counts[poly]; point++, i++)
+ {
pt = pts[i];
- if(!W32kLPtoDP(hdc, &pt, 1))
- return FALSE;
+ CoordLPtoDP ( dc, &pt );
PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO);
}
}
/* PATH_AddFlatBezier
*
*/
-static BOOL PATH_AddFlatBezier(GdiPath *pPath, POINT *pt, BOOL closed)
+BOOL
+FASTCALL
+PATH_AddFlatBezier ( GdiPath *pPath, POINT *pt, BOOL closed )
{
POINT *pts;
INT no, i;
pts = GDI_Bezier( pt, 4, &no );
- if(!pts) return FALSE;
+ if ( !pts ) return FALSE;
for(i = 1; i < no; i++)
PATH_AddEntry(pPath, &pts[i], (i == no-1 && closed) ? PT_LINETO | PT_CLOSEFIGURE : PT_LINETO);
* Replaces Beziers with line segments
*
*/
-static BOOL PATH_FlattenPath(GdiPath *pPath)
+BOOL
+FASTCALL
+PATH_FlattenPath(GdiPath *pPath)
{
GdiPath newPath;
INT srcpt;
* error occurs, SetLastError is called with the appropriate value and
* FALSE is returned.
*/
-static BOOL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode,
- HRGN *pHrgn)
+#if 0
+// FIXME - don't reenable this function until you deal with the
+// const pPath being given to PATH_FlattenPath() - which is
+// expecting a non-const*. Since this function isn't being called
+// at the moment, I'm commenting it out until the issue needs to
+// be addressed.
+BOOL
+FASTCALL
+PATH_PathToRegion ( const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn )
{
int numStrokes, iStroke, i;
INT *pNumPointsInStroke;
HRGN hrgn;
- assert(pPath!=NULL);
- assert(pHrgn!=NULL);
+ assert ( pPath!=NULL );
+ assert ( pHrgn!=NULL );
- PATH_FlattenPath(pPath);
+ PATH_FlattenPath ( pPath );
/* FIXME: What happens when number of points is zero? */
*pHrgn=hrgn;
return TRUE;
}
+#endif
/* PATH_EmptyPath
*
* Removes all entries from the path and sets the path state to PATH_Null.
*/
-static void PATH_EmptyPath(GdiPath *pPath)
+VOID
+FASTCALL
+PATH_EmptyPath ( GdiPath *pPath )
{
assert(pPath!=NULL);
* or PT_BEZIERTO, optionally ORed with PT_CLOSEFIGURE. Returns TRUE if
* successful, FALSE otherwise (e.g. if not enough memory was available).
*/
-BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags)
+BOOL
+FASTCALL
+PATH_AddEntry ( GdiPath *pPath, const POINT *pPoint, BYTE flags )
{
assert(pPath!=NULL);
*/
/* Check that path is open */
- if(pPath->state!=PATH_Open)
+ if ( pPath->state != PATH_Open )
return FALSE;
/* Reserve enough memory for an extra path entry */
- if(!PATH_ReserveEntries(pPath, pPath->numEntriesUsed+1))
+ if ( !PATH_ReserveEntries(pPath, pPath->numEntriesUsed+1) )
return FALSE;
/* Store information in path entry */
* been allocated; allocates larger arrays and copies the existing entries
* to those arrays, if necessary. Returns TRUE if successful, else FALSE.
*/
-static BOOL PATH_ReserveEntries(GdiPath *pPath, INT numEntries)
+BOOL
+FASTCALL
+PATH_ReserveEntries ( GdiPath *pPath, INT numEntries )
{
INT numEntriesToAllocate;
POINT *pPointsNew;
return TRUE;
}
-/* PATH_GetPathFromHDC
+/* PATH_GetPathFromDC
*
* Retrieves a pointer to the GdiPath structure contained in an HDC and
* places it in *ppPath. TRUE is returned if successful, FALSE otherwise.
*/
-static BOOL PATH_GetPathFromHDC(HDC hdc, GdiPath **ppPath)
+VOID
+FASTCALL
+PATH_GetPathFromDC ( PDC dc, GdiPath **ppPath )
{
- DC *pDC;
-
- pDC=DC_HandleToPtr(hdc);
- if(pDC)
- {
- *ppPath=&pDC->w.path;
- DC_ReleasePtr( hdc );
- return TRUE;
- }
- return FALSE;
+ ASSERT ( dc );
+ ASSERT ( ppPath );
+ *ppPath = &dc->w.path;
}
/* PATH_DoArcPart
* point is added to the path; otherwise, it is assumed that the current
* position is equal to the first control point.
*/
-static BOOL PATH_DoArcPart(GdiPath *pPath, FLOAT_POINT corners[],
- double angleStart, double angleEnd, BOOL addMoveTo)
+BOOL
+FASTCALL
+PATH_DoArcPart ( GdiPath *pPath, FLOAT_POINT corners[],
+ double angleStart, double angleEnd, BOOL addMoveTo )
{
double halfAngle, a;
double xNorm[4], yNorm[4];
* coordinates (-1.0, -1.0) correspond to corners[0], the coordinates
* (1.0, 1.0) correspond to corners[1].
*/
-static void PATH_ScaleNormalizedPoint(FLOAT_POINT corners[], double x,
- double y, POINT *pPoint)
+VOID
+FASTCALL
+PATH_ScaleNormalizedPoint ( FLOAT_POINT corners[], double x,
+ double y, POINT *pPoint )
{
+ ASSERT ( corners );
+ ASSERT ( pPoint );
pPoint->x=GDI_ROUND( (double)corners[0].x + (double)(corners[1].x-corners[0].x)*0.5*(x+1.0) );
pPoint->y=GDI_ROUND( (double)corners[0].y + (double)(corners[1].y-corners[0].y)*0.5*(y+1.0) );
}
* Normalizes a point with respect to the box whose corners are passed in
* corners. The normalized coordinates are stored in *pX and *pY.
*/
-static void PATH_NormalizePoint(FLOAT_POINT corners[],
+VOID
+FASTCALL
+PATH_NormalizePoint ( FLOAT_POINT corners[],
const FLOAT_POINT *pPoint,
double *pX, double *pY)
{
+ ASSERT ( corners );
+ ASSERT ( pPoint );
+ ASSERT ( pX );
+ ASSERT ( pY );
*pX=(double)(pPoint->x-corners[0].x)/(double)(corners[1].x-corners[0].x) * 2.0 - 1.0;
*pY=(double)(pPoint->y-corners[0].y)/(double)(corners[1].y-corners[0].y) * 2.0 - 1.0;
}
+/* EOF */