gdiplus: Set font emSize to height minus internal leading.

Signed-off-by: Shawn M. Chapla <schapla@codeweavers.com> Signed-off-by: Esme Povirk <esme@codewevers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Set font emSize to height minus internal leading.
04d53626 · Shawn M. Chapla · Alexandre Julliard · bfc84040 · 04d53626 · 04d53626
Commit 04d53626 authored Jul 14, 2020 by Shawn M. Chapla Committed by Alexandre Julliard Jul 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

font.c dlls/gdiplus/font.c +1 -1

font.c dlls/gdiplus/tests/font.c +1 -1

No files found.
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -219,7 +219,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
    if (!*font) return OutOfMemory;

    (*font)->unit = UnitWorld;
-    (*font)->emSize = otm.otmTextMetrics.tmAscent;
+    (*font)->emSize = otm.otmTextMetrics.tmHeight - otm.otmTextMetrics.tmInternalLeading;
    (*font)->otm = otm;

    stat = GdipCreateFontFamilyFromName(facename, NULL, &(*font)->family);

--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -344,7 +344,7 @@ static void test_logfont(void)

            stat = GdipGetFontSize(font, &rval);
            expect(Ok, stat);
-            todo_wine expectf(test_sizes[i].expected, rval);
+            expectf(test_sizes[i].expected, rval);

            GdipDeleteFont(font);
            font = NULL;