ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Added draw_polyline error checking.

This commit is contained in:
Evan Stade 2007-07-11 18:07:44 -07:00 committed by Alexandre Julliard
parent fa31217d6e
commit 6f4ab52824
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/gdiplus/graphics.c
View File

@ -282,12 +282,23 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt)
/* Draws lines between the given points, and if caps is true then draws an endcap /* Draws lines between the given points, and if caps is true then draws an endcap
* at the end of the last line. FIXME: Startcaps not implemented. */ * at the end of the last line. FIXME: Startcaps not implemented. */
static void draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, static GpStatus draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt,
INT count, BOOL caps) INT count, BOOL caps)
{ {
POINT *pti = GdipAlloc(count * sizeof(POINT)); POINT *pti;
REAL x = pt[count - 1].X, y = pt[count - 1].Y; REAL x = pt[count - 1].X, y = pt[count - 1].Y;
INT i; INT i;
GpStatus status = GenericError;
if(!count)
return Ok;
pti = GdipAlloc(count * sizeof(POINT));
if(!pti){
status = OutOfMemory;
goto end;
}
if(caps){ if(caps){
if(pen->endcap == LineCapArrowAnchor) if(pen->endcap == LineCapArrowAnchor)
@ -306,7 +317,11 @@ static void draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt,
pti[i].y = roundr(y); pti[i].y = roundr(y);
Polyline(hdc, pti, count); Polyline(hdc, pti, count);
end:
GdipFree(pti); GdipFree(pti);
return status;
} }
/* Conducts a linear search to find the bezier points that will back off /* Conducts a linear search to find the bezier points that will back off
@ -660,6 +675,7 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1,
{ {
INT save_state; INT save_state;
GpPointF pt[2]; GpPointF pt[2];
GpStatus retval;
if(!pen || !graphics) if(!pen || !graphics)
return InvalidParameter; return InvalidParameter;
@ -673,17 +689,18 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1,
EndPath(graphics->hdc); EndPath(graphics->hdc);
SelectObject(graphics->hdc, pen->gdipen); SelectObject(graphics->hdc, pen->gdipen);
draw_polyline(graphics->hdc, pen, pt, 2, TRUE); retval = draw_polyline(graphics->hdc, pen, pt, 2, TRUE);
RestoreDC(graphics->hdc, save_state); RestoreDC(graphics->hdc, save_state);
return Ok; return retval;
} }
GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST
GpPointF *points, INT count) GpPointF *points, INT count)
{ {
INT save_state; INT save_state;
GpStatus retval;
if(!pen || !graphics || (count < 2)) if(!pen || !graphics || (count < 2))
return InvalidParameter; return InvalidParameter;
@ -692,11 +709,11 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST
EndPath(graphics->hdc); EndPath(graphics->hdc);
SelectObject(graphics->hdc, pen->gdipen); SelectObject(graphics->hdc, pen->gdipen);
draw_polyline(graphics->hdc, pen, points, count, TRUE); retval = draw_polyline(graphics->hdc, pen, points, count, TRUE);
RestoreDC(graphics->hdc, save_state); RestoreDC(graphics->hdc, save_state);
return Ok; return retval;
} }
GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path)