gdiplus: GdipGetFontHeightGivenDPI: Return a valid value for UnitPixel.

f5e9a01c · Adam Petaccia · Alexandre Julliard · 74c8117a · f5e9a01c
Commit f5e9a01c authored Aug 27, 2008 by Adam Petaccia Committed by Alexandre Julliard Aug 28, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 3 deletions

font.c dlls/gdiplus/font.c +13 -3

No files found.
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -428,12 +428,22 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font,
 */
 GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, REAL *height)
 {
+    TRACE("%p (%s), %f, %p\n", font,
+            debugstr_w(font->lfw.lfFaceName), dpi, height);
    if (!(font && height)) return InvalidParameter;
-    FIXME("%p (%s), %f, %p\n", font,
+    switch (font->unit)
-            debugstr_w(font->lfw.lfFaceName), dpi, height);
+    {
+        case UnitPixel:
+            *height = font->emSize;
+            break;
+        default:
+            FIXME("Unhandled unit type: %d\n", font->unit);
+            return NotImplemented;
+    }
-    return NotImplemented;
+    return Ok;
 }
 /***********************************************************************