Skip to content

W
wine-cw
Commit 6aadb22b authored by Hidenori Takeshima's avatar Hidenori Takeshima Committed by Alexandre Julliard
Browse files
Options

Use hard-coded font name bindings only with the ANSI_CHARSET (non-US

charsets with no font name shouldn't be bound to US charset).
parent a781a319
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 1 deletion
graphics/x11drv/xfont.c
View file @ 6aadb22b
...@@ -2602,6 +2602,17 @@ static UINT XFONT_MatchFIList( fontMatch* pfm ) ...@@ -2602,6 +2602,17 @@ static UINT XFONT_MatchFIList( fontMatch* pfm )
} }
/*********************************************************************** /***********************************************************************
* XFONT_is_ansi_charset
*
* returns TRUE if the given charset is ANSI_CHARSET.
*/
static BOOL XFONT_is_ansi_charset( UINT charset )
{
return ((charset == ANSI_CHARSET) ||
(charset == DEFAULT_CHARSET && GetACP() == 1252));
}
/***********************************************************************
* XFONT_MatchDeviceFont * XFONT_MatchDeviceFont
* *
* Scan font resource tree. * Scan font resource tree.
...@@ -2619,7 +2630,9 @@ static void XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm) ...@@ -2619,7 +2630,9 @@ static void XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm)
pfm->pfi = NULL; pfm->pfi = NULL;
if( !fm.plf->lfFaceName[0] ) /* the following hard-coded font binding assumes 'ANSI_CHARSET'. */
if( !fm.plf->lfFaceName[0] &&
XFONT_is_ansi_charset(fm.plf->lfCharSet) )
{ {
switch(fm.plf->lfPitchAndFamily & 0xf0) switch(fm.plf->lfPitchAndFamily & 0xf0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment