[PATCH 1/2] conhost: Remove duplicate lines from current_config()

[Hugh McMaster]

Signed-off-by: Hugh McMaster 
---
 programs/conhost/window.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 92970b44f0e..3af80383958 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -1925,8 +1925,6 @@ static void current_config( struct console *console, struct console_config *conf
     config->popup_attr = console->active->popup_attr;
     memcpy( config->color_map, console->active->color_map, sizeof(config->color_map) );

-    config->win_height  = console->active->win.bottom - console->active->win.top + 1;
-    config->win_width   = console->active->win.right - console->active->win.left + 1;
     config->cell_width  = console->active->font.width;
     config->cell_height = console->active->font.height;
     config->font_weight = console->active->font.weight;

[PATCH 2/2] conhost: Set screen buffer height to 150 characters in registry defaults

[Hugh McMaster]

This matches the defaults in create_screen_buffer().

Signed-off-by: Hugh McMaster 
---
 programs/conhost/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 3af80383958..4033eefa313 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -256,7 +256,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config )
     config->menu_mask    = 0;
     config->popup_attr   = 0xF5;
     config->quick_edit   = 0;
-    config->sb_height    = 25;
+    config->sb_height    = 150;
     config->sb_width     = 80;
     config->attr         = 0x000F;
     config->win_height   = 25;

[PATCH 2/2] conhost: Set screen buffer height to 150 characters in registry defaults

[Jacek Caban]

Signed-off-by: Jacek Caban

[Jacek Caban]

Signed-off-by: Jacek Caban