ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineconsole: Try harder to get a scalable font. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-10-10 20:43:02 +02:00
parent 8386157caa
commit cf3e22ed6b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/wineconsole/user.c
View File

@ -338,6 +338,9 @@ BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW*
switch (pass) /* we get increasingly lenient in later passes */ switch (pass) /* we get increasingly lenient in later passes */
{ {
case 0: case 0:
if (type & RASTER_FONTTYPE) return FALSE;
/* fall through */
case 1:
if (type & RASTER_FONTTYPE) if (type & RASTER_FONTTYPE)
{ {
if (tm->tmMaxCharWidth * data->curcfg.win_width >= GetSystemMetrics(SM_CXSCREEN) || if (tm->tmMaxCharWidth * data->curcfg.win_width >= GetSystemMetrics(SM_CXSCREEN) ||
@ -345,10 +348,10 @@ BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW*
return FALSE; return FALSE;
} }
/* fall through */ /* fall through */
case 1: case 2:
if (tm->tmCharSet != DEFAULT_CHARSET && tm->tmCharSet != g_uiDefaultCharset) return FALSE; if (tm->tmCharSet != DEFAULT_CHARSET && tm->tmCharSet != g_uiDefaultCharset) return FALSE;
/* fall through */ /* fall through */
case 2: case 3:
if (tm->tmItalic || tm->tmUnderlined || tm->tmStruckOut) return FALSE; if (tm->tmItalic || tm->tmUnderlined || tm->tmStruckOut) return FALSE;
break; break;
} }
@ -366,12 +369,13 @@ BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf, int
{ {
case 0: case 0:
case 1: case 1:
case 2:
if (lf->lfCharSet != DEFAULT_CHARSET && lf->lfCharSet != g_uiDefaultCharset) return FALSE; if (lf->lfCharSet != DEFAULT_CHARSET && lf->lfCharSet != g_uiDefaultCharset) return FALSE;
/* fall through */ /* fall through */
case 2: case 3:
if ((lf->lfPitchAndFamily & 3) != FIXED_PITCH) return FALSE; if ((lf->lfPitchAndFamily & 3) != FIXED_PITCH) return FALSE;
/* fall through */ /* fall through */
case 3: case 4:
if (lf->lfFaceName[0] == '@') return FALSE; if (lf->lfFaceName[0] == '@') return FALSE;
break; break;
} }
@ -554,7 +558,7 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font,
WINE_WARN("Couldn't match the font from registry... trying to find one\n"); WINE_WARN("Couldn't match the font from registry... trying to find one\n");
fc.data = data; fc.data = data;
fc.done = FALSE; fc.done = FALSE;
for (fc.pass = 0; fc.pass <= 4; fc.pass++) for (fc.pass = 0; fc.pass <= 5; fc.pass++)
{ {
EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc);
if (fc.done) return; if (fc.done) return;