diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 72aecedd381..f4ed77a69bb 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -154,9 +154,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 -#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 -#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 -#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 +#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9b082dffc26..b8f954acb5d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1731,7 +1731,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, const struct condrv_output_info_params *params, size_t extra_size ) { const struct condrv_output_info *info = ¶ms->info; - WCHAR *font_name; NTSTATUS status; TRACE( "%p\n", screen_buffer ); @@ -1825,30 +1824,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) - { - memcpy( screen_buffer->color_map, info->color_map, sizeof(screen_buffer->color_map) ); - } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) - { - screen_buffer->font.width = info->font_width; - screen_buffer->font.height = info->font_height; - screen_buffer->font.weight = info->font_weight; - screen_buffer->font.pitch_family = info->font_pitch_family; - if (extra_size) - { - const WCHAR *params_font = (const WCHAR *)(params + 1); - extra_size = extra_size / sizeof(WCHAR) * sizeof(WCHAR); - font_name = malloc( extra_size ); - if (font_name) - { - memcpy( font_name, params_font, extra_size ); - free( screen_buffer->font.face_name ); - screen_buffer->font.face_name = font_name; - screen_buffer->font.face_len = extra_size; - } - } - } if (is_active( screen_buffer )) {