mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 05:57:27 +00:00
conhost: Set correct face name when the specified font is not available.
conhost.exe currently copies the user-specified face name from the LOGFONT structure. This results in an invalid face name when the specified font is not available. Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
fb0f6b4be4
commit
303f8042f9
|
@ -678,6 +678,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont )
|
|||
struct font_info *font_info = &console->active->font;
|
||||
HFONT font, old_font;
|
||||
TEXTMETRICW tm;
|
||||
WCHAR face_name[LF_FACESIZE];
|
||||
CPINFO cpinfo;
|
||||
HDC dc;
|
||||
|
||||
|
@ -703,6 +704,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont )
|
|||
|
||||
old_font = SelectObject( dc, font );
|
||||
GetTextMetricsW( dc, &tm );
|
||||
font_info->face_len = GetTextFaceW( dc, ARRAY_SIZE(face_name), face_name ) - 1;
|
||||
SelectObject( dc, old_font );
|
||||
ReleaseDC( console->win, dc );
|
||||
|
||||
|
@ -712,9 +714,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont )
|
|||
font_info->weight = tm.tmWeight;
|
||||
|
||||
free( font_info->face_name );
|
||||
font_info->face_len = wcslen( logfont->lfFaceName );
|
||||
font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) );
|
||||
memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) );
|
||||
memcpy( font_info->face_name, face_name, font_info->face_len * sizeof(WCHAR) );
|
||||
|
||||
/* FIXME: use maximum width for DBCS codepages since some chars take two cells */
|
||||
if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2)
|
||||
|
|
Loading…
Reference in a new issue