[PATCH] gdi32: Pick first charmap if none was selected using preferred encoding

Nikolay Sivov nsivov at codeweavers.com
Mon Sep 25 06:21:02 CDT 2017


FreeType 2.8.1 has similar logic removed from WinFNT module,
that always pre-selected first charmap.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

For https://bugs.winehq.org/show_bug.cgi?id=43715

 dlls/gdi32/freetype.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 13edef6601..bf566f382c 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5150,6 +5150,10 @@ static FT_Encoding pick_charmap( FT_Face face, int charset )
         if (select_charmap( face, *encs )) break;
         encs++;
     }
+
+    if (!face->charmap && face->num_charmaps)
+        face->charmap = face->charmaps[0];
+
     return *encs;
 }
 
-- 
2.14.1




More information about the wine-patches mailing list