Hugh McMaster : conhost: Migrate from FontPitchFamily to FontFamily.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0e6b21ef1d775c34fa14d8f527468b1a65df3eda
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0e6b21ef1d775c34fa14d8f527468b1...

Author: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Date:   Fri Dec 23 22:09:49 2022 +1100

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.

---

 programs/conhost/window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 3db4b159696..0a44186beb1 100644
--- 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 ||