Merge pull request #1727 from nfedera/fix-2014-03-06-01

Fix handling of "no CAPSET_TYPE_SURFACE_COMMANDS"
This commit is contained in:
Marc-André Moreau 2014-03-06 13:25:46 -05:00
commit 4a6b1f358e

View File

@ -2395,7 +2395,7 @@ BOOL rdp_read_surface_commands_capability_set(wStream* s, UINT16 length, rdpSett
Stream_Seek_UINT32(s); /* reserved (4 bytes) */
settings->SurfaceCommandsEnabled = TRUE;
settings->SurfaceFrameMarkerEnabled = (cmdFlags & SURFCMDS_FRAME_MARKER);
settings->SurfaceFrameMarkerEnabled = (cmdFlags & SURFCMDS_FRAME_MARKER) ? TRUE : FALSE;
return TRUE;
}
@ -3567,6 +3567,8 @@ BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s)
if (!settings->ReceivedCapabilities[CAPSET_TYPE_SURFACE_COMMANDS])
{
/* client does not support surface commands */
settings->SurfaceCommandsEnabled = FALSE;
settings->SurfaceFrameMarkerEnabled = FALSE;
}
if (!settings->ReceivedCapabilities[CAPSET_TYPE_FRAME_ACKNOWLEDGE])