[Gdiplus 16/16] Implement GdipGetEmHeight

Adam Petaccia adam at tpetaccia.com
Wed Jul 2 12:26:08 CDT 2008


---
 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 f22afad..53d73b9 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -563,9 +563,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 9784725..2872a92 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -205,11 +205,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);
@@ -226,11 +226,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);
-- 
1.5.4.3




More information about the wine-patches mailing list