From fec031ebe59e10aa64191208b03f1f4f15d037ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 13 Dec 2011 15:56:06 -0500 Subject: [PATCH] libfreerdp-core: fix sending of font capabilities, fix encoding of bitmap cache cell info --- libfreerdp-core/capabilities.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libfreerdp-core/capabilities.c b/libfreerdp-core/capabilities.c index f94ad7cab..56133b4c4 100644 --- a/libfreerdp-core/capabilities.c +++ b/libfreerdp-core/capabilities.c @@ -928,7 +928,7 @@ void rdp_write_bitmap_cache_cell_info(STREAM* s, BITMAP_CACHE_V2_CELL_INFO* cell * is used to indicate a persistent bitmap cache. */ - info = cellInfo->numEntries || (cellInfo->persistent << 31); + info = (cellInfo->numEntries | (cellInfo->persistent << 31)); stream_write_uint32(s, info); } @@ -1930,7 +1930,7 @@ void rdp_write_confirm_active(STREAM* s, rdpSettings* settings) stream_write_uint16(s, 0); /* pad2Octets (2 bytes) */ /* Capability Sets */ - numberCapabilities = 14; + numberCapabilities = 15; rdp_write_general_capability_set(s, settings); rdp_write_bitmap_capability_set(s, settings); rdp_write_order_capability_set(s, settings); @@ -1947,6 +1947,7 @@ void rdp_write_confirm_active(STREAM* s, rdpSettings* settings) rdp_write_virtual_channel_capability_set(s, settings); rdp_write_sound_capability_set(s, settings); rdp_write_share_capability_set(s, settings); + rdp_write_font_capability_set(s, settings); rdp_write_control_capability_set(s, settings); rdp_write_color_cache_capability_set(s, settings); rdp_write_window_activation_capability_set(s, settings);