Hugh McMaster : conhost: Update debug output and comments when loading/saving settings.

Alexandre Julliard julliard at winehq.org
Thu Jun 9 16:28:34 CDT 2022


Module: wine
Branch: master
Commit: 577258a98106271d0aaa43beb660b42cfc4b3894
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=577258a98106271d0aaa43beb660b42cfc4b3894

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Fri Jun  3 19:35:16 2022 +1000

conhost: Update debug output and comments when loading/saving settings.

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/conhost/window.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index b72278ddc0e..3db4b159696 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -239,7 +239,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config )
 
     HKEY key, app_key;
 
-    TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name ));
+    TRACE( "Loading default console settings\n" );
 
     memcpy( config->color_map, color_map, sizeof(color_map) );
     memset( config->face_name, 0, sizeof(config->face_name) );
@@ -265,13 +265,15 @@ static void load_config( const WCHAR *key_name, struct console_config *config )
     config->win_pos.Y    = 0;
     config->edition_mode = 0;
 
-    /* read global settings */
+    /* Load default console settings */
     if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Console", &key ))
     {
         load_registry_key( key, config );
-        /* if requested, load part related to console title */
+
+        /* Load app-specific console settings (if any) */
         if (key_name && !RegOpenKeyW( key, key_name, &app_key ))
         {
+            TRACE( "Loading %s console settings\n", wine_dbgstr_w(key_name) );
             load_registry_key( app_key, config );
             RegCloseKey( app_key );
         }
@@ -408,7 +410,7 @@ static void save_config( const WCHAR *key_name, const struct console_config *con
 {
     HKEY key, app_key;
 
-    TRACE( "%s %s\n", debugstr_w( key_name ), debugstr_config( config ));
+    TRACE( "Saving %s console settings\n", key_name ? debugstr_w( key_name ) : "default" );
 
     if (RegCreateKeyW( HKEY_CURRENT_USER, L"Console", &key ))
     {




More information about the wine-cvs mailing list