Adam Petaccia : gdiplus: Implement GdipGetEmHeight.
Alexandre Julliard
julliard at winehq.org
Mon Jul 7 09:19:42 CDT 2008
Module: wine
Branch: master
Commit: d17d5664129c20c16282df1d05a9c67df258b11f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17d5664129c20c16282df1d05a9c67df258b11f
Author: Adam Petaccia <adam at tpetaccia.com>
Date: Thu Jul 3 14:27:02 2008 -0400
gdiplus: Implement GdipGetEmHeight.
---
dlls/gdiplus/font.c | 7 +++++--
dlls/gdiplus/tests/font.c | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index baba8e9..217481a 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -554,9 +554,12 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U
{
if (!(family && EmHeight)) return InvalidParameter;
- FIXME("Stub!\n");
+ TRACE("%p (%s), %d, %p, stub!\n", family,
+ debugstr_w(family->FamilyName), style, EmHeight);
- return NotImplemented;
+ *EmHeight = family->tmw.ntmSizeEM;
+
+ return Ok;
}
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index b1cb340..51fd327 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -204,11 +204,11 @@ todo_wine
stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
ok (result == 2355, "Expected 2355, got %d\n", result);
+}
result = 0;
stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
ok(result == 2048, "Expected 2048, got %d\n", result);
-}
result = 0;
stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
@@ -225,11 +225,11 @@ todo_wine
stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
ok(result == 2355, "Expected 2355, got %d\n", result);
+}
result = 0;
stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
ok(result == 2048, "Expected 2048, got %d\n", result);
-}
result = 0;
stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
More information about the wine-cvs
mailing list