morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[core,settings] fix missing setting copy

Browse Source
This commit is contained in:
akallabeth
2024-12-12 15:35:11 +01:00
parent 369b6d0244
commit 9909ae2eb4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libfreerdp/core/settings.c
View File

@@ -1341,15 +1341,17 @@ static BOOL freerdp_settings_int_buffer_copy(rdpSettings* _settings, const rdpSe
{ FreeRDP_BitmapCacheV2NumCells, FreeRDP_BitmapCacheV2CellInfo },
{ FreeRDP_RedirectionPasswordLength, FreeRDP_RedirectionPassword },
{ FreeRDP_RedirectionTsvUrlLength, FreeRDP_RedirectionTsvUrl },
{ FreeRDP_RedirectionGuidLength, FreeRDP_RedirectionGuid }
{ FreeRDP_RedirectionGuidLength, FreeRDP_RedirectionGuid },
{ FreeRDP_MonitorDefArraySize, FreeRDP_MonitorDefArray }
};
for (int i = 0; i < ARRAYSIZE(pointerDefs); i++)
for (size_t i = 0; i < ARRAYSIZE(pointerDefs); i++)
{
UINT32 n = freerdp_settings_get_uint32(settings, pointerDefs[i].lenKey);
const PointerDefs* keys = &pointerDefs[i];
UINT32 n = freerdp_settings_get_uint32(settings, keys->lenKey);
const void* ptr = freerdp_settings_get_pointer(settings, pointerDefs[i].pointerKey);
if (!freerdp_settings_set_pointer_len(_settings, pointerDefs[i].pointerKey, ptr, n))
const void* ptr = freerdp_settings_get_pointer(settings, keys->pointerKey);
if (!freerdp_settings_set_pointer_len(_settings, keys->pointerKey, ptr, n))
goto out_fail;
}
@@ -1718,9 +1720,7 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings)
if (nrIds == 0)
{
rdpMonitor monitor = { 0 };
if (!freerdp_settings_set_uint32(settings, FreeRDP_NumMonitorIds, 1) ||
!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorDefArray, &monitor, 1))
if (!freerdp_settings_set_uint32(settings, FreeRDP_NumMonitorIds, 1))
return FALSE;
}
if (!useMonitors || (count == 0))