wfreerdp-server: fix negotiation of codecs

diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c
index 6635300..8735004 100644 (file)
--- a/libfreerdp/core/capabilities.c
+++ b/libfreerdp/core/capabilities.c
@@ -1434,6 +1434,7 @@ void rdp_read_bitmap_codecs_capability_set(STREAM* s, uint16 length, rdpSettings
        {
                settings->rfx_codec = false;
                settings->ns_codec = false;
+               settings->jpeg_codec = false;
        }
 
        while (bitmapCodecCount > 0)
@@ -1444,7 +1445,7 @@ void rdp_read_bitmap_codecs_capability_set(STREAM* s, uint16 length, rdpSettings
                        stream_read_uint8(s, settings->rfx_codec_id);
                        settings->rfx_codec = true;
                }
-               else if (settings->server_mode && strncmp((char*)stream_get_tail(s),CODEC_GUID_NSCODEC, 16) == 0)
+               else if (settings->server_mode && strncmp((char*)stream_get_tail(s), CODEC_GUID_NSCODEC, 16) == 0)
                {
                        stream_seek(s, 16); /*codec GUID (16 bytes) */
                        stream_read_uint8(s, settings->ns_codec_id);
@@ -1562,7 +1563,6 @@ void rdp_write_nsc_server_capability_container(STREAM* s, rdpSettings* settings)
        stream_write_uint32(s, 0); /* reserved */
 }
 
-
 /**
  * Write bitmap codecs capability set.\n
  * @msdn{dd891377}
@@ -1578,6 +1578,7 @@ void rdp_write_bitmap_codecs_capability_set(STREAM* s, rdpSettings* settings)
        header = rdp_capability_set_start(s);
 
        bitmapCodecCount = 0;
+
        if (settings->rfx_codec)
                bitmapCodecCount++;
        if (settings->ns_codec)

diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c
index bcb4ff1..b1ffe36 100644 (file)
--- a/libfreerdp/core/update.c
+++ b/libfreerdp/core/update.c
@@ -530,17 +530,29 @@ static void update_send_pointer_cached(rdpContext* context, POINTER_CACHED_UPDAT
 
 boolean update_read_refresh_rect(rdpUpdate* update, STREAM* s)
 {
+       int index;
        uint8 numberOfAreas;
+       RECTANGLE_16* areas;
 
        if (stream_get_left(s) < 4)
                return false;
 
        stream_read_uint8(s, numberOfAreas);
        stream_seek(s, 3); /* pad3Octects */
-       if (stream_get_left(s) < numberOfAreas * 8)
-               return false;
 
-       IFCALL(update->RefreshRect, update->context, numberOfAreas, (RECTANGLE_16*) stream_get_tail(s));
+       areas = (RECTANGLE_16*) malloc(sizeof(RECTANGLE_16) * numberOfAreas);
+
+       for (index = 0; index < numberOfAreas; index++)
+       {
+               stream_read_uint16(s, areas[index].left);
+               stream_read_uint16(s, areas[index].top);
+               stream_read_uint16(s, areas[index].right);
+               stream_read_uint16(s, areas[index].bottom);
+       }
+
+       IFCALL(update->RefreshRect, update->context, numberOfAreas, areas);
+
+       free(areas);
 
        return true;
 }

diff --git a/server/Windows/wfreerdp.c b/server/Windows/wfreerdp.c
index 637f73b..05253d9 100644 (file)
--- a/server/Windows/wfreerdp.c
+++ b/server/Windows/wfreerdp.c
@@ -176,11 +176,16 @@ static DWORD WINAPI wf_peer_main_loop(LPVOID lpParam)
        DWORD nCount;\r
        DWORD status;\r
        HANDLE handles[32];\r
+       rdpSettings* settings;\r
        wfPeerContext* context;\r
        freerdp_peer* client = (freerdp_peer*) lpParam;\r
 \r
        wf_peer_init(client);\r
 \r
+       settings = client->settings;\r
+       settings->rfx_codec = true;\r
+       settings->ns_codec = false;\r
+       settings->jpeg_codec = false;\r
        wf_peer_read_settings(client);\r
 \r
        client->PostConnect = wf_peer_post_connect;\r