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

core: fix refreshRect/suppressOutput capabilities 

refreshRectSupport and suppressOutputSupport of the General
Capability Set (MS-RDPBCGR 2.2.7.1.1) are server-only flags
that indicate whether the Refresh Rect or Suppress Output
PDUs are supported by the server.

Therefore in rdp_read_general_capability_set() we must only
change the respective settings if we are not in server mode.
This commit is contained in:
Norbert Federa 2015-02-18 19:33:19 +01:00
parent f86f5bc252
commit 5f525e4f8d
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libfreerdp/core/capabilities.c
View File

@ -198,11 +198,20 @@ BOOL rdp_read_general_capability_set(wStream* s, UINT16 length, rdpSettings* set
if (!(extraFlags & ENC_SALTED_CHECKSUM))
settings->SaltedChecksum = FALSE;
if (refreshRectSupport == FALSE)
settings->RefreshRect = FALSE;
if (suppressOutputSupport == FALSE)
settings->SuppressOutput = FALSE;
if (!settings->ServerMode)
{
/**
* Note: refreshRectSupport and suppressOutputSupport are
* server-only flags indicating to the client weather the
* respective PDUs are supported. See MS-RDPBCGR 2.2.7.1.1
*/
if (!refreshRectSupport)
settings->RefreshRect = FALSE;
if (!suppressOutputSupport)
settings->SuppressOutput = FALSE;
}
return TRUE;
}

12
libfreerdp/core/update.c
View File

@ -1614,7 +1614,10 @@ BOOL update_read_refresh_rect(rdpUpdate* update, wStream* s)
Stream_Read_UINT16(s, areas[index].bottom);
}
IFCALL(update->RefreshRect, update->context, numberOfAreas, areas);
if (update->context->settings->RefreshRect)
IFCALL(update->RefreshRect, update->context, numberOfAreas, areas);
else
WLog_Print(update->log, WLOG_WARN, "ignoring refresh rect request from client");
free(areas);
@ -1634,8 +1637,11 @@ BOOL update_read_suppress_output(rdpUpdate* update, wStream* s)
if (allowDisplayUpdates > 0 && Stream_GetRemainingLength(s) < 8)
return FALSE;
IFCALL(update->SuppressOutput, update->context, allowDisplayUpdates,
allowDisplayUpdates > 0 ? (RECTANGLE_16*) Stream_Pointer(s) : NULL);
if (update->context->settings->SuppressOutput)
IFCALL(update->SuppressOutput, update->context, allowDisplayUpdates,
allowDisplayUpdates > 0 ? (RECTANGLE_16*) Stream_Pointer(s) : NULL);
else
WLog_Print(update->log, WLOG_WARN, "ignoring suppress output request from client");
return TRUE;
}