conhost: Migrate from FontPitchFamily to FontFamily.

To ensure a seamless transition between value names, we try loading the registry value from FontFamily first and FontPitchFamily second. Any changes to the console font family are saved to the new value name.

conhost: Migrate from FontPitchFamily to FontFamily.
0e6b21ef · Hugh McMaster · Alexandre Julliard · f2a07805 · 0e6b21ef
Commit 0e6b21ef authored Dec 23, 2022 by Hugh McMaster Committed by Alexandre Julliard Jan 11, 2023
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

window.c programs/conhost/window.c +3 -2

No files found.
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -166,7 +166,8 @@ static void load_registry_key( HKEY key, struct console_config *config )
    RegQueryValueExW( key, L"FaceName", 0, &type, (BYTE *)&config->face_name, &count );

    count = sizeof(val);
-    if (!RegQueryValueExW( key, L"FontPitchFamily", 0, &type, (BYTE *)&val, &count ))
+    if (!RegQueryValueExW( key, L"FontFamily", 0, &type, (BYTE *)&val, &count ) ||
+        !RegQueryValueExW( key, L"FontPitchFamily", 0, &type, (BYTE *)&val, &count ))
        config->font_pitch_family = val;

    count = sizeof(val);
@@ -330,7 +331,7 @@ static void save_registry_key( HKEY key, const struct console_config *config, BO
    if (save_all || config->font_pitch_family != default_config.font_pitch_family)
    {
        val = config->font_pitch_family;
-        RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
+        RegSetValueExW( key, L"FontFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) );
    }

    if (save_all || config->cell_height != default_config.cell_height ||