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

[Huw Davies]

On Mon, Sep 25, 2017 at 02:21:02PM +0300, Nikolay Sivov wrote:
> FreeType 2.8.1 has similar logic removed from WinFNT module,
> that always pre-selected first charmap.
>
> Signed-off-by: Nikolay Sivov <nsivov(a)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];
> +

Manipulating face->charmap directly doesn't look right, you probably
want to use FT_Set_Charmap().

Huw.