Akihiro Sagawa : gdi32: Fix font rendering issue when child font is used.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 308a0cf72d884f2b716b6df6954ef55e572b07cc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=308a0cf72d884f2b716b6df69...

Author: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Date:   Fri Nov  6 21:16:35 2020 +0900

gdi32: Fix font rendering issue when child font is used.

Otherwise, freetype_get_glyph_outline() fails at FT_Load_Glyph due to
combination of base_font's ft_face and child font's glyph index.

Fixes a regression introduced by 044315c0b3890676d9fd751d8191b0b7381e0b97.

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/gdi32/freetype.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 70a4b18c4f8..61397e8b542 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -3219,7 +3219,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph
                                                const MAT2 *lpmat, BOOL tategaki )
 {
     struct gdi_font *base_font = font->base_font ? font->base_font : font;
-    FT_Face ft_face = get_ft_face( base_font );
+    FT_Face ft_face = get_ft_face( font );
     FT_Glyph_Metrics metrics;
     FT_Error err;
     FT_BBox bbox;