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

gdiplus: Add basic implementation of GdipDrawDriverString.

This commit is contained in:
Vincent Povirk 2011-03-31 17:39:30 -05:00 committed by Alexandre Julliard
parent ae608e6ec3
commit 15140a722e
2 changed files with 84 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
dlls/gdiplus/graphics.c
View File

@ -5587,6 +5587,68 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT
return NotImplemented;
}
static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length,
GDIPCONST GpFont *font, GDIPCONST GpBrush *brush,
GDIPCONST PointF *positions, INT flags,
GDIPCONST GpMatrix *matrix )
{
static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance);
INT save_state;
GpPointF pt[4];
REAL angle, rel_width, rel_height;
LOGFONTW lfw;
HFONT unscaled_font, hfont;
TEXTMETRICW textmet;
if (flags & unsupported_flags)
FIXME("Ignoring flags %x\n", flags & unsupported_flags);
if (matrix)
FIXME("Ignoring matrix\n");
save_state = SaveDC(graphics->hdc);
SetBkMode(graphics->hdc, TRANSPARENT);
SetTextColor(graphics->hdc, brush->lb.lbColor);
pt[0].X = 0.0;
pt[0].Y = 0.0;
pt[1].X = 1.0;
pt[1].Y = 0.0;
pt[2].X = 0.0;
pt[2].Y = 1.0;
pt[3] = positions[0];
GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 4);
angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X));
rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+
(pt[1].X-pt[0].X)*(pt[1].X-pt[0].X));
rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+
(pt[2].X-pt[0].X)*(pt[2].X-pt[0].X));
unscaled_font = CreateFontIndirectW(&font->lfw);
SelectObject(graphics->hdc, unscaled_font);
GetTextMetricsW(graphics->hdc, &textmet);
lfw = font->lfw;
lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height);
lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width);
lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0);
hfont = CreateFontIndirectW(&lfw);
SelectObject(graphics->hdc, hfont);
DeleteObject(unscaled_font);
SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT);
ExtTextOutW(graphics->hdc, roundr(pt[3].X), roundr(pt[3].Y), ETO_GLYPH_INDEX, NULL, text, length, NULL);
RestoreDC(graphics->hdc, save_state);
DeleteObject(hfont);
return Ok;
}
/*****************************************************************************
* GdipDrawDriverString [GDIPLUS.@]
*/
@ -5595,8 +5657,27 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16
GDIPCONST PointF *positions, INT flags,
GDIPCONST GpMatrix *matrix )
{
FIXME("(%p %p %d %p %p %p %d %p): stub\n", graphics, text, length, font, brush, positions, flags, matrix);
return NotImplemented;
GpStatus stat=NotImplemented;
TRACE("(%p %s %p %p %p %d %p)\n", graphics, debugstr_wn(text, length), font, brush, positions, flags, matrix);
if (!graphics || !text || !font || !brush || !positions)
return InvalidParameter;
if (length == -1)
length = strlenW(text);
if (graphics->hdc &&
((flags & DriverStringOptionsRealizedAdvance) || length <= 1) &&
brush->bt == BrushTypeSolidColor &&
(((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000)
stat = GDI32_GdipDrawDriverString(graphics, text, length, font, brush,
positions, flags, matrix);
if (stat == NotImplemented)
FIXME("Not fully implemented\n");
return stat;
}
GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect,

2
dlls/gdiplus/tests/graphics.c
View File

@ -1990,7 +1990,6 @@ static void test_GdipDrawString(void)
status = GdipCreateMatrix(&matrix);
expect(Ok, status);
todo_wine {
status = GdipDrawDriverString(NULL, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
@ -2006,6 +2005,7 @@ todo_wine {
status = GdipDrawDriverString(graphics, string, 4, fnt, brush, NULL, DriverStringOptionsCmapLookup, matrix);
expect(InvalidParameter, status);
todo_wine {
status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup|0x10, matrix);
expect(Ok, status);