mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix initialization of LargePointer flags 

Capability exchange is first reading server capabilities,
mask these with local settings and send only what both support.
This commit is contained in:
akallabeth 2020-04-22 11:05:45 +02:00
parent a75280300a
commit 0a86090ff1
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/cmdline.c
View File

@ -3265,8 +3265,6 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
if (settings->RemoteFxCodec || settings->NSCodec || settings->SupportGraphicsPipeline)
{
settings->FastPathOutput = TRUE;
settings->LargePointerFlag =
0x0002; /* (LARGE_POINTER_FLAG_96x96 | LARGE_POINTER_FLAG_384x384); */
settings->FrameMarkerCommandEnabled = TRUE;
settings->ColorDepth = 32;
}

3
libfreerdp/core/capabilities.c
View File

@ -2548,8 +2548,7 @@ static BOOL rdp_read_large_pointer_capability_set(wStream* s, rdpSettings* setti
return FALSE;
Stream_Read_UINT16(s, largePointerSupportFlags); /* largePointerSupportFlags (2 bytes) */
settings->LargePointerFlag =
largePointerSupportFlags & (LARGE_POINTER_FLAG_96x96 | LARGE_POINTER_FLAG_384x384);
settings->LargePointerFlag &= largePointerSupportFlags;
if ((largePointerSupportFlags & ~(LARGE_POINTER_FLAG_96x96 | LARGE_POINTER_FLAG_384x384)) != 0)
{
WLog_WARN(