From b033259c7a1aa6fb4ce89fe7407ae987fe068d37 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 5 Jul 2023 10:18:30 +0200 Subject: [PATCH] [client,common] fix rdp file key names --- client/common/file.c | 139 ++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/client/common/file.c b/client/common/file.c index b1bced3de..e465df202 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -237,75 +237,76 @@ static const char key_str_winposstr[] = "winposstr"; static const char key_str_pcb[] = "pcb"; static const char key_str_selectedmonitors[] = "selectedmonitors"; -static const char key_int_rdgiskdcproxy[] = "use multimon"; -static const char key_int_use_redirection_server_name[] = "maximizetocurrentdisplays"; -static const char key_int_gatewaycredentialssource[] = "singlemoninwindowedmode"; -static const char key_int_gatewayprofileusagemethod[] = "screen mode id"; -static const char key_int_gatewayusagemethod[] = "span monitors"; -static const char key_int_disableremoteappcapscheck[] = "smart sizing"; -static const char key_int_disableconnectionsharing[] = "dynamic resolution"; -static const char key_int_remoteapplicationexpandworkingdir[] = "enablesuperpan"; -static const char key_int_remoteapplicationexpandcmdline[] = "superpanaccelerationfactor"; -static const char key_int_remoteapplicationmode[] = "desktopwidth"; -static const char key_int_enablecredsspsupport[] = "desktopheight"; -static const char key_int_negotiate_security_layer[] = "desktop size id"; -static const char key_int_prompt_for_credentials[] = "session bpp"; -static const char key_int_promptcredentialonce[] = "desktopscalefactor"; -static const char key_int_authentication_level[] = "compression"; -static const char key_int_public_mode[] = "keyboardhook"; -static const char key_int_autoreconnect_max_retries[] = "disable ctrl+alt+del"; -static const char key_int_autoreconnection_enabled[] = "audiomode"; -static const char key_int_administrative_session[] = "audioqualitymode"; -static const char key_int_connect_to_console[] = "audiocapturemode"; -static const char key_int_disableclipboardredirection[] = "encode redirected video capture"; -static const char key_int_disableprinterredirection[] = "redirected video capture encoding quality"; -static const char key_int_redirectdirectx[] = "videoplaybackmode"; -static const char key_int_redirectposdevices[] = "connection type"; -static const char key_int_redirectclipboard[] = "networkautodetect"; -static const char key_int_redirectsmartcards[] = "bandwidthautodetect"; -static const char key_int_redirectcomports[] = "pinconnectionbar"; -static const char key_int_redirectprinters[] = "displayconnectionbar"; -static const char key_int_redirectdrives[] = "workspaceid"; -static const char key_int_server_port[] = "enableworkspacereconnect"; -static const char key_int_bitmapcachepersistenable[] = "disable wallpaper"; -static const char key_int_bitmapcachesize[] = "allow font smoothing"; -static const char key_int_disable_cursor_setting[] = "allow desktop composition"; -static const char key_int_disable_themes[] = "disable full window drag"; +static const char key_int_rdgiskdcproxy[] = "rdgiskdcproxy"; +static const char key_int_use_redirection_server_name[] = "use redirection server name"; +static const char key_int_gatewaycredentialssource[] = "gatewaycredentialssource"; +static const char key_int_gatewayprofileusagemethod[] = "gatewayprofileusagemethod"; +static const char key_int_gatewayusagemethod[] = "gatewayusagemethod"; +static const char key_int_disableremoteappcapscheck[] = "disableremoteappcapscheck"; +static const char key_int_disableconnectionsharing[] = "disableconnectionsharing"; +static const char key_int_remoteapplicationexpandworkingdir[] = "remoteapplicationexpandworkingdir"; +static const char key_int_remoteapplicationexpandcmdline[] = "remoteapplicationexpandcmdline"; +static const char key_int_remoteapplicationmode[] = "remoteapplicationmode"; +static const char key_int_enablecredsspsupport[] = "enablecredsspsupport"; +static const char key_int_negotiate_security_layer[] = "negotiate security layer"; +static const char key_int_prompt_for_credentials[] = "prompt for credentials"; +static const char key_int_promptcredentialonce[] = "promptcredentialonce"; +static const char key_int_authentication_level[] = "authentication level"; +static const char key_int_public_mode[] = "public mode"; +static const char key_int_autoreconnect_max_retries[] = "autoreconnect max retries"; +static const char key_int_autoreconnection_enabled[] = "autoreconnection enabled"; +static const char key_int_administrative_session[] = "administrative session"; +static const char key_int_connect_to_console[] = "connect to console"; +static const char key_int_disableclipboardredirection[] = "disableclipboardredirection"; +static const char key_int_disableprinterredirection[] = "disableprinterredirection"; +static const char key_int_redirectdirectx[] = "redirectdirectx"; +static const char key_int_redirectposdevices[] = "redirectposdevices"; +static const char key_int_redirectclipboard[] = "redirectclipboard"; +static const char key_int_redirectsmartcards[] = "redirectsmartcards"; +static const char key_int_redirectcomports[] = "redirectcomports"; +static const char key_int_redirectprinters[] = "redirectprinters"; +static const char key_int_redirectdrives[] = "redirectdrives"; +static const char key_int_server_port[] = "server port"; +static const char key_int_bitmapcachepersistenable[] = "bitmapcachepersistenable"; +static const char key_int_bitmapcachesize[] = "bitmapcachesize"; +static const char key_int_disable_cursor_setting[] = "disable cursor setting"; +static const char key_int_disable_themes[] = "disable themes"; static const char key_int_disable_menu_anims[] = "disable menu anims"; -static const char key_int_disable_full_window_drag[] = "disable themes"; -static const char key_int_allo_desktop_composition[] = "disable cursor setting"; -static const char key_int_allow_font_smoothing[] = "bitmapcachesize"; -static const char key_int_disable_wallpaper[] = "bitmapcachepersistenable"; -static const char key_int_enableworkspacereconnect[] = "server port"; -static const char key_int_workspaceid[] = "redirectdrives"; -static const char key_int_displayconnectionbar[] = "redirectprinters"; -static const char key_int_pinconnectionbar[] = "redirectcomports"; -static const char key_int_bandwidthautodetect[] = "redirectsmartcards"; -static const char key_int_networkautodetect[] = "redirectclipboard"; -static const char key_int_connection_type[] = "redirectposdevices"; -static const char key_int_videoplaybackmode[] = "redirectdirectx"; -static const char key_int_redirected_video_capture_encoding_quality[] = "disableprinterredirection"; -static const char key_int_encode_redirected_video_capture[] = "disableclipboardredirection"; -static const char key_int_audiocapturemode[] = "connect to console"; -static const char key_int_audioqualitymode[] = "administrative session"; -static const char key_int_audiomode[] = "autoreconnection enabled"; -static const char key_int_disable_ctrl_alt_del[] = "autoreconnect max retries"; -static const char key_int_keyboardhook[] = "public mode"; -static const char key_int_compression[] = "authentication level"; -static const char key_int_desktopscalefactor[] = "promptcredentialonce"; -static const char key_int_session_bpp[] = "prompt for credentials"; -static const char key_int_desktop_size_id[] = "negotiate security layer"; -static const char key_int_desktopheight[] = "enablecredsspsupport"; -static const char key_int_desktopwidth[] = "remoteapplicationmode"; -static const char key_int_superpanaccelerationfactor[] = "remoteapplicationexpandcmdline"; -static const char key_int_enablesuperpan[] = "remoteapplicationexpandworkingdir"; -static const char key_int_dynamic_resolution[] = "disableconnectionsharing"; -static const char key_int_smart_sizing[] = "disableremoteappcapscheck"; -static const char key_int_span_monitors[] = "gatewayusagemethod"; -static const char key_int_screen_mode_id[] = "gatewayprofileusagemethod"; -static const char key_int_singlemoninwindowedmode[] = "gatewaycredentialssource"; -static const char key_int_maximizetocurrentdisplays[] = "use redirection server name"; -static const char key_int_use_multimon[] = "rdgiskdcproxy"; +static const char key_int_disable_full_window_drag[] = "disable full window drag"; +static const char key_int_allow_desktop_composition[] = "allow desktop composition"; +static const char key_int_allow_font_smoothing[] = "allow font smoothing"; +static const char key_int_disable_wallpaper[] = "disable wallpaper"; +static const char key_int_enableworkspacereconnect[] = "enableworkspacereconnect"; +static const char key_int_workspaceid[] = "workspaceid"; +static const char key_int_displayconnectionbar[] = "displayconnectionbar"; +static const char key_int_pinconnectionbar[] = "pinconnectionbar"; +static const char key_int_bandwidthautodetect[] = "bandwidthautodetect"; +static const char key_int_networkautodetect[] = "networkautodetect"; +static const char key_int_connection_type[] = "connection type"; +static const char key_int_videoplaybackmode[] = "videoplaybackmode"; +static const char key_int_redirected_video_capture_encoding_quality[] = + "redirected video capture encoding quality"; +static const char key_int_encode_redirected_video_capture[] = "encode redirected video capture"; +static const char key_int_audiocapturemode[] = "audiocapturemode"; +static const char key_int_audioqualitymode[] = "audioqualitymode"; +static const char key_int_audiomode[] = "audiomode"; +static const char key_int_disable_ctrl_alt_del[] = "disable ctrl+alt+del"; +static const char key_int_keyboardhook[] = "keyboardhook"; +static const char key_int_compression[] = "compression"; +static const char key_int_desktopscalefactor[] = "desktopscalefactor"; +static const char key_int_session_bpp[] = "session bpp"; +static const char key_int_desktop_size_id[] = "desktop size id"; +static const char key_int_desktopheight[] = "desktopheight"; +static const char key_int_desktopwidth[] = "desktopwidth"; +static const char key_int_superpanaccelerationfactor[] = "superpanaccelerationfactor"; +static const char key_int_enablesuperpan[] = "enablesuperpan"; +static const char key_int_dynamic_resolution[] = "dynamic resolution"; +static const char key_int_smart_sizing[] = "smart sizing"; +static const char key_int_span_monitors[] = "span monitors"; +static const char key_int_screen_mode_id[] = "screen mode id"; +static const char key_int_singlemoninwindowedmode[] = "singlemoninwindowedmode"; +static const char key_int_maximizetocurrentdisplays[] = "maximizetocurrentdisplays"; +static const char key_int_use_multimon[] = "use multimon"; static SSIZE_T freerdp_client_rdp_file_add_line(rdpFile* file); static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(const rdpFile* file, @@ -1435,7 +1436,7 @@ size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, s WRITE_SETTING_INT(key_int_enableworkspacereconnect, file->EnableWorkspaceReconnect); WRITE_SETTING_INT(key_int_disable_wallpaper, file->DisableWallpaper); WRITE_SETTING_INT(key_int_allow_font_smoothing, file->AllowFontSmoothing); - WRITE_SETTING_INT(key_int_allo_desktop_composition, file->AllowDesktopComposition); + WRITE_SETTING_INT(key_int_allow_desktop_composition, file->AllowDesktopComposition); WRITE_SETTING_INT(key_int_disable_full_window_drag, file->DisableFullWindowDrag); WRITE_SETTING_INT(key_int_disable_menu_anims, file->DisableMenuAnims); WRITE_SETTING_INT(key_int_disable_themes, file->DisableThemes);