[PATCH v2 2/3] conhost: Only save console settings that differ from the global defaults
Hugh McMaster
hugh.mcmaster at outlook.com
Tue Apr 19 06:26:34 CDT 2022
On Windows, app-specific subkeys of HKCU\Console only hold console settings
that differ from the global defaults.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/conhost/window.c | 139 +++++++++++++++++++++++++++-----------
1 file changed, 98 insertions(+), 41 deletions(-)
diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 130be396820..8dbb92732fe 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -280,69 +280,127 @@ static void load_config( const WCHAR *key_name, struct console_config *config )
TRACE( "%s\n", debugstr_config( config ));
}
-static void save_registry_key( HKEY key, const struct console_config *config )
+#define CMP(x) (config->x != defconfig.x)
+
+static void save_registry_key( HKEY key, const struct console_config *config, BOOL save_all )
{
+ struct console_config defconfig;
DWORD val, width, height, i;
WCHAR color_name[13];
TRACE( "%s\n", debugstr_config( config ));
+ if (!save_all)
+ load_config( NULL, &defconfig );
+
for (i = 0; i < ARRAY_SIZE(config->color_map); i++)
{
- wsprintfW( color_name, L"ColorTable%02d", i );
- val = config->color_map[i];
- RegSetValueExW( key, color_name, 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(color_map[i]))
+ {
+ wsprintfW( color_name, L"ColorTable%02d", i );
+ val = config->color_map[i];
+ RegSetValueExW( key, color_name, 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
}
- val = config->cursor_size;
- RegSetValueExW( key, L"CursorSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(cursor_size))
+ {
+ val = config->cursor_size;
+ RegSetValueExW( key, L"CursorSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->cursor_visible;
- RegSetValueExW( key, L"CursorVisible", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(cursor_visible))
+ {
+ val = config->cursor_visible;
+ RegSetValueExW( key, L"CursorVisible", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->edition_mode;
- RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(edition_mode))
+ {
+ val = config->edition_mode;
+ RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name,
- (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) );
+ if (save_all || lstrcmpW( config->face_name, defconfig.face_name ))
+ {
+ RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name,
+ (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) );
+ }
- val = config->font_pitch_family;
- RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(font_pitch_family))
+ {
+ val = config->font_pitch_family;
+ RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- width = MulDiv( config->cell_width, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() );
- height = MulDiv( config->cell_height, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() );
- val = MAKELONG( width, height );
- RegSetValueExW( key, L"FontSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(cell_width) || CMP(cell_height))
+ {
+ width = MulDiv( config->cell_width, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() );
+ height = MulDiv( config->cell_height, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() );
+ val = MAKELONG( width, height );
+
+ RegSetValueExW( key, L"FontSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->font_weight;
- RegSetValueExW( key, L"FontWeight", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(font_weight))
+ {
+ val = config->font_weight;
+ RegSetValueExW( key, L"FontWeight", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->history_size;
- RegSetValueExW( key, L"HistoryBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(history_size))
+ {
+ val = config->history_size;
+ RegSetValueExW( key, L"HistoryBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->history_mode;
- RegSetValueExW( key, L"HistoryNoDup", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(history_mode))
+ {
+ val = config->history_mode;
+ RegSetValueExW( key, L"HistoryNoDup", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->insert_mode;
- RegSetValueExW( key, L"InsertMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(insert_mode))
+ {
+ val = config->insert_mode;
+ RegSetValueExW( key, L"InsertMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->menu_mask;
- RegSetValueExW( key, L"MenuMask", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(menu_mask))
+ {
+ val = config->menu_mask;
+ RegSetValueExW( key, L"MenuMask", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->popup_attr;
- RegSetValueExW( key, L"PopupColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(popup_attr))
+ {
+ val = config->popup_attr;
+ RegSetValueExW( key, L"PopupColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->quick_edit;
- RegSetValueExW( key, L"QuickEdit", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(quick_edit))
+ {
+ val = config->quick_edit;
+ RegSetValueExW( key, L"QuickEdit", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = MAKELONG(config->sb_width, config->sb_height);
- RegSetValueExW( key, L"ScreenBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(sb_width) || CMP(sb_height))
+ {
+ val = MAKELONG(config->sb_width, config->sb_height);
+ RegSetValueExW( key, L"ScreenBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = config->attr;
- RegSetValueExW( key, L"ScreenColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(attr))
+ {
+ val = config->attr;
+ RegSetValueExW( key, L"ScreenColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
- val = MAKELONG( config->win_width, config->win_height );
- RegSetValueExW( key, L"WindowSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ if (save_all || CMP(win_width) || CMP(win_height))
+ {
+ val = MAKELONG( config->win_width, config->win_height );
+ RegSetValueExW( key, L"WindowSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+ }
}
static void save_config( const WCHAR *key_name, const struct console_config *config )
@@ -365,12 +423,11 @@ static void save_config( const WCHAR *key_name, const struct console_config *con
}
else
{
- /* FIXME: maybe only save the values different from the default value ? */
- save_registry_key( app_key, config );
+ save_registry_key( app_key, config, FALSE );
RegCloseKey( app_key );
}
}
- else save_registry_key( key, config );
+ else save_registry_key( key, config, TRUE );
RegCloseKey(key);
}
--
2.35.2
More information about the wine-devel
mailing list