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

Merge pull request #5392 from akallabeth/gfx_avc_flag_fixes

Browse Source 
Fixed GFX flags and CapsConfirm return checks
This commit is contained in:
Martin Fleisz 2019-05-09 13:16:08 +02:00 committed by GitHub
commit 6633e01891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channels/rdpgfx/client/rdpgfx_main.c
View File

@ -240,7 +240,10 @@ static UINT rdpgfx_send_supported_caps(RDPGFX_CHANNEL_CALLBACK* callback)
}
if (gfx->ThinClient)
caps10Flags |= RDPGFX_CAPS_FLAG_AVC_THINCLIENT;
{
if ((caps10Flags & RDPGFX_CAPS_FLAG_AVC_DISABLED) == 0)
caps10Flags |= RDPGFX_CAPS_FLAG_AVC_THINCLIENT;
}
if (!rdpgfx_is_capability_filtered(gfx, RDPGFX_CAPVERSION_103))
{
@ -305,12 +308,10 @@ static UINT rdpgfx_recv_caps_confirm_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
WLog_Print(gfx->log, WLOG_DEBUG, "RecvCapsConfirmPdu: version: 0x%08"PRIX32" flags: 0x%08"PRIX32"",
capsSet.version, capsSet.flags);
if (context)
{
IFCALL(context->CapsConfirm, context, &pdu);
}
if (!context)
return ERROR_BAD_CONFIGURATION;
return CHANNEL_RC_OK;
return IFCALLRESULT(CHANNEL_RC_OK, context->CapsConfirm, context, &pdu);
}
/**