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

gdiplus: Implement GdipGetLineSpacing.

This commit is contained in:
Hans Leidekker 2008-11-24 10:21:44 +01:00 committed by Alexandre Julliard
parent 67a9170aca
commit c04b7c5b0f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/gdiplus/font.c
View File

@ -667,8 +667,7 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U
{ {
if (!(family && EmHeight)) return InvalidParameter; if (!(family && EmHeight)) return InvalidParameter;
TRACE("%p (%s), %d, %p, stub!\n", family, TRACE("%p (%s), %d, %p\n", family, debugstr_w(family->FamilyName), style, EmHeight);
debugstr_w(family->FamilyName), style, EmHeight);
*EmHeight = family->tmw.ntmSizeEM; *EmHeight = family->tmw.ntmSizeEM;
@ -693,11 +692,16 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U
GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family,
INT style, UINT16* LineSpacing) INT style, UINT16* LineSpacing)
{ {
if (!(family && LineSpacing)) return InvalidParameter; TRACE("%p, %d, %p\n", family, style, LineSpacing);
FIXME("stub!\n"); if (!(family && LineSpacing))
return InvalidParameter;
return NotImplemented; if (style) FIXME("ignoring style\n");
*LineSpacing = family->tmw.tmAscent + family->tmw.tmDescent + family->tmw.tmExternalLeading;
return Ok;
} }
GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family,

6
dlls/gdiplus/tests/font.c
View File

@ -246,12 +246,9 @@ static void test_fontfamily_properties (void)
skip("Arial not installed\n"); skip("Arial not installed\n");
else else
{ {
todo_wine
{
stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
expect(Ok, stat); expect(Ok, stat);
ok (result == 2355, "Expected 2355, got %d\n", result); ok (result == 2355, "Expected 2355, got %d\n", result);
}
result = 0; result = 0;
stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
expect(Ok, stat); expect(Ok, stat);
@ -272,12 +269,9 @@ todo_wine
else else
{ {
result = 0; result = 0;
todo_wine
{
stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
expect(Ok, stat); expect(Ok, stat);
ok(result == 2355, "Expected 2355, got %d\n", result); ok(result == 2355, "Expected 2355, got %d\n", result);
}
result = 0; result = 0;
stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
expect(Ok, stat); expect(Ok, stat);