mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client: Fix writing of untouched rdp settings to rdp files

Browse Source 
Since the last change untouched string settings were written to the rdp
file because their default value was set to NULL instead of ~0. This
resulted in settings being written to the rdp file with a value of
"(null)" instead of just being skipped.
This commit is contained in:
Martin Fleisz 2021-06-02 12:29:55 +02:00 committed by akallabeth
parent 31fb2ddc1a
commit be1a1dcbe0
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/common/file.c
View File

@ -97,22 +97,22 @@ struct rdp_file
DWORD EnableSuperSpan; /* enablesuperpan */ DWORD EnableSuperSpan; /* enablesuperpan */
DWORD SuperSpanAccelerationFactor; /* superpanaccelerationfactor */ DWORD SuperSpanAccelerationFactor; /* superpanaccelerationfactor */
DWORD DesktopWidth; /* desktopwidth */ DWORD DesktopWidth; /* desktopwidth */
DWORD DesktopHeight; /* desktopheight */ DWORD DesktopHeight; /* desktopheight */
DWORD DesktopSizeId; /* desktop size id */ DWORD DesktopSizeId; /* desktop size id */
DWORD SessionBpp; /* session bpp */ DWORD SessionBpp; /* session bpp */
DWORD DesktopScaleFactor; /* desktopscalefactor */ DWORD DesktopScaleFactor; /* desktopscalefactor */
DWORD Compression; /* compression */ DWORD Compression; /* compression */
DWORD KeyboardHook; /* keyboardhook */ DWORD KeyboardHook; /* keyboardhook */
DWORD DisableCtrlAltDel; /* disable ctrl+alt+del */ DWORD DisableCtrlAltDel; /* disable ctrl+alt+del */
DWORD AudioMode; /* audiomode */ DWORD AudioMode; /* audiomode */
DWORD AudioQualityMode; /* audioqualitymode */ DWORD AudioQualityMode; /* audioqualitymode */
DWORD AudioCaptureMode; /* audiocapturemode */ DWORD AudioCaptureMode; /* audiocapturemode */
DWORD EncodeRedirectedVideoCapture; /* encode redirected video capture */ DWORD EncodeRedirectedVideoCapture; /* encode redirected video capture */
DWORD RedirectedVideoCaptureEncodingQuality; /* redirected video capture encoding quality */ DWORD RedirectedVideoCaptureEncodingQuality; /* redirected video capture encoding quality */
DWORD VideoPlaybackMode; /* videoplaybackmode */ DWORD VideoPlaybackMode; /* videoplaybackmode */
DWORD ConnectionType; /* connection type */ DWORD ConnectionType; /* connection type */
@ -869,7 +869,7 @@ static INLINE BOOL FILE_POPULATE_STRING(char** _target, const rdpSettings* _sett
str = freerdp_settings_get_string(_settings, _option); str = freerdp_settings_get_string(_settings, _option);
freerdp_client_file_string_check_free(*_target); freerdp_client_file_string_check_free(*_target);
*_target = NULL; *_target = (void*)~((size_t)NULL);
if (str) if (str)
{ {
*_target = _strdup(str); *_target = _strdup(str);
@ -896,6 +896,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
size_t index; size_t index;
UINT32 LoadBalanceInfoLength; UINT32 LoadBalanceInfoLength;
const char* GatewayHostname = NULL; const char* GatewayHostname = NULL;
char* redirectCameras = NULL;
if (!FILE_POPULATE_STRING(&file->Domain, settings, FreeRDP_Domain) || if (!FILE_POPULATE_STRING(&file->Domain, settings, FreeRDP_Domain) ||
!FILE_POPULATE_STRING(&file->Username, settings, FreeRDP_Username) || !FILE_POPULATE_STRING(&file->Username, settings, FreeRDP_Username) ||
@ -1021,7 +1022,9 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
file->AutoReconnectionEnabled = file->AutoReconnectionEnabled =
freerdp_settings_get_bool(settings, FreeRDP_AutoReconnectionEnabled); freerdp_settings_get_bool(settings, FreeRDP_AutoReconnectionEnabled);
file->RedirectSmartCards = freerdp_settings_get_bool(settings, FreeRDP_RedirectSmartCards); file->RedirectSmartCards = freerdp_settings_get_bool(settings, FreeRDP_RedirectSmartCards);
file->RedirectCameras = freerdp_client_channel_args_to_string(settings, "rdpecam", "device:");
redirectCameras = freerdp_client_channel_args_to_string(settings, "rdpecam", "device:");
if (redirectCameras)
{ {
char* str = freerdp_client_channel_args_to_string(settings, "rdpecam", "encode:"); char* str = freerdp_client_channel_args_to_string(settings, "rdpecam", "encode:");
file->EncodeRedirectedVideoCapture = 0; file->EncodeRedirectedVideoCapture = 0;
@ -1034,10 +1037,8 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
file->EncodeRedirectedVideoCapture = val; file->EncodeRedirectedVideoCapture = val;
} }
free(str); free(str);
}
{
char* str = freerdp_client_channel_args_to_string(settings, "rdpecam", "quality:");
str = freerdp_client_channel_args_to_string(settings, "rdpecam", "quality:");
file->RedirectedVideoCaptureEncodingQuality = 0; file->RedirectedVideoCaptureEncodingQuality = 0;
if (str) if (str)
{ {
@ -1050,6 +1051,8 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
} }
} }
free(str); free(str);
file->RedirectCameras = redirectCameras;
} }
#ifdef CHANNEL_URBDRC_CLIENT #ifdef CHANNEL_URBDRC_CLIENT
file->UsbDevicesToRedirect = file->UsbDevicesToRedirect =