gdi32: Move more font metrics information to the generic font structure.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Move more font metrics information to the generic font structure.
c44c347d · Alexandre Julliard · 16b8f2b3 · c44c347d · c44c347d · c44c347d
Commit c44c347d authored Oct 22, 2020 by Alexandre Julliard
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

font.c dlls/gdi32/font.c +1 -0

freetype.c dlls/gdi32/freetype.c +0 -0

gdi_private.h dlls/gdi32/gdi_private.h +9 -0

No files found.
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -413,6 +413,7 @@ struct gdi_font *alloc_gdi_font(void)

    font->refcount = 1;
    font->matrix.eM11 = font->matrix.eM22 = 1.0;
+    font->scale_y = 1.0;

    if (!(font->handle = alloc_font_handle( font )))
    {

--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -319,6 +319,15 @@ struct gdi_font
    LOGFONTW               lf;
    FMAT2                  matrix;
    UINT                   face_index;
+    double                 scale_y;
+    INT                    aveWidth;
+    INT                    ppem;
+    SHORT                  yMax;
+    SHORT                  yMin;
+    UINT                   ntmFlags;
+    UINT                   ntmCellHeight;
+    UINT                   ntmAvgWidth;
+    UINT                   aa_flags;
    BOOL                   can_use_bitmap : 1;
    BOOL                   fake_italic : 1;
    BOOL                   fake_bold : 1;