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

[settings,caps] fix cursor chache and request size

Browse Source 
* Set a reasonably large supported cursor cache size for clients
* Ensure the MaxRequestSize is large enough to hold a large pointer
  update
This commit is contained in:
akallabeth 2022-12-05 16:46:02 +01:00 committed by akallabeth
parent ca5684c968
commit 8d9faa761a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libfreerdp/core/settings.c
View File

@ -492,7 +492,11 @@ rdpSettings* freerdp_settings_new(DWORD flags)
* if we are in server mode send a reasonable large cache size, * if we are in server mode send a reasonable large cache size,
* if we are in client mode just set the value to the maximum we want to * if we are in client mode just set the value to the maximum we want to
* support and during capability exchange that size will be limited to the * support and during capability exchange that size will be limited to the
* sizes the server supports */ * sizes the server supports
*
* We have chosen 128 cursors in cache which is at worst 128 * 576kB (384x384 pixel cursor with
* 32bit color depth)
* */
if (freerdp_settings_get_bool(settings, FreeRDP_ServerMode)) if (freerdp_settings_get_bool(settings, FreeRDP_ServerMode))
{ {
if (!freerdp_settings_set_uint32(settings, FreeRDP_PointerCacheSize, 25) || if (!freerdp_settings_set_uint32(settings, FreeRDP_PointerCacheSize, 25) ||
@ -501,13 +505,12 @@ rdpSettings* freerdp_settings_new(DWORD flags)
} }
else else
{ {
if (!freerdp_settings_set_uint32(settings, FreeRDP_PointerCacheSize, UINT16_MAX) || if (!freerdp_settings_set_uint32(settings, FreeRDP_PointerCacheSize, 128) ||
!freerdp_settings_set_uint32(settings, FreeRDP_ColorPointerCacheSize, UINT16_MAX)) !freerdp_settings_set_uint32(settings, FreeRDP_ColorPointerCacheSize, 128))
goto out_fail; goto out_fail;
} }
if (!freerdp_settings_set_bool(settings, FreeRDP_ColorPointerFlag, TRUE) || if (!freerdp_settings_set_uint32(settings, FreeRDP_LargePointerFlag,
!freerdp_settings_set_uint32(settings, FreeRDP_LargePointerFlag,
(LARGE_POINTER_FLAG_96x96 | LARGE_POINTER_FLAG_384x384)) || (LARGE_POINTER_FLAG_96x96 | LARGE_POINTER_FLAG_384x384)) ||
!freerdp_settings_set_bool(settings, FreeRDP_SoundBeepsEnabled, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_SoundBeepsEnabled, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_DrawGdiPlusEnabled, FALSE) || !freerdp_settings_set_bool(settings, FreeRDP_DrawGdiPlusEnabled, FALSE) ||
@ -613,8 +616,10 @@ rdpSettings* freerdp_settings_new(DWORD flags)
!freerdp_settings_set_uint32(settings, FreeRDP_RemoteAppNumIconCacheEntries, 12) || !freerdp_settings_set_uint32(settings, FreeRDP_RemoteAppNumIconCacheEntries, 12) ||
!freerdp_settings_set_uint32(settings, FreeRDP_VirtualChannelChunkSize, !freerdp_settings_set_uint32(settings, FreeRDP_VirtualChannelChunkSize,
CHANNEL_CHUNK_LENGTH) || CHANNEL_CHUNK_LENGTH) ||
/* [MS-RDPBCGR] 2.2.7.2.7 Large Pointer Capability Set (TS_LARGE_POINTER_CAPABILITYSET)
requires at least this size */
!freerdp_settings_set_uint32(settings, FreeRDP_MultifragMaxRequestSize, !freerdp_settings_set_uint32(settings, FreeRDP_MultifragMaxRequestSize,
(flags & FREERDP_SETTINGS_SERVER_MODE) ? 0 : 0xFFFF) || (flags & FREERDP_SETTINGS_SERVER_MODE) ? 0 : 608299) ||
!freerdp_settings_set_bool(settings, FreeRDP_GatewayUseSameCredentials, FALSE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayUseSameCredentials, FALSE) ||
!freerdp_settings_set_bool(settings, FreeRDP_GatewayBypassLocal, FALSE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayBypassLocal, FALSE) ||
!freerdp_settings_set_bool(settings, FreeRDP_GatewayRpcTransport, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayRpcTransport, TRUE) ||