Nikolay Sivov : gdi32: Pick first charmap if none was selected using preferred encoding.
Alexandre Julliard
julliard at winehq.org
Fri Oct 20 07:19:59 CDT 2017
Module: wine
Branch: stable
Commit: 9f96ad8edb12e53c54bc235da57ea8ffc5bdd951
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f96ad8edb12e53c54bc235da57ea8ffc5bdd951
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Sep 26 10:13:47 2017 +0100
gdi32: Pick first charmap if none was selected using preferred encoding.
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>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit d82321006de92dcd74465c905121618a76eae76a)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/gdi32/freetype.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index a5147b5..e8cdd14 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5145,6 +5145,13 @@ static FT_Encoding pick_charmap( FT_Face face, int charset )
if (select_charmap( face, *encs )) break;
encs++;
}
+
+ if (!face->charmap && face->num_charmaps)
+ {
+ if (!pFT_Set_Charmap(face, face->charmaps[0]))
+ return face->charmap->encoding;
+ }
+
return *encs;
}
More information about the wine-cvs
mailing list