Commit 14e0df1f authored by Evan Stade's avatar Evan Stade Committed by Alexandre Julliard

gdiplus: Updated GdipDrawRectangleI.

parent a4fff714
......@@ -22,7 +22,7 @@
#include "windef.h"
#include "gdiplus.h"
#define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_ENDCAP_FLAT)
#define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_ENDCAP_FLAT | PS_JOIN_MITER)
COLORREF ARGB2COLORREF(ARGB color);
......
......@@ -590,31 +590,19 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x,
GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x,
INT y, INT width, INT height)
{
LOGBRUSH lb;
HPEN hpen;
HGDIOBJ old_obj;
INT save_state;
if(!pen || !graphics)
return InvalidParameter;
lb.lbStyle = BS_SOLID;
lb.lbColor = pen->color;
lb.lbHatch = 0;
hpen = ExtCreatePen(PS_GEOMETRIC | PS_ENDCAP_SQUARE, (INT) pen->width,
&lb, 0, NULL);
old_obj = SelectObject(graphics->hdc, hpen);
save_state = SaveDC(graphics->hdc);
EndPath(graphics->hdc);
SelectObject(graphics->hdc, pen->gdipen);
SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH));
/* assume pen aligment centered */
MoveToEx(graphics->hdc, x, y, NULL);
LineTo(graphics->hdc, x+width, y);
LineTo(graphics->hdc, x+width, y+height);
LineTo(graphics->hdc, x, y+height);
LineTo(graphics->hdc, x, y);
Rectangle(graphics->hdc, x, y, x + width, y + height);
SelectObject(graphics->hdc, old_obj);
DeleteObject(hpen);
RestoreDC(graphics->hdc, save_state);
return Ok;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment