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

libfreerdp-core: fix sending of bitmap updates

Browse Source
This commit is contained in:
Marc-André Moreau 2013-08-07 23:46:17 -04:00
parent 8ca74a2766
commit f1c0ffb130
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libfreerdp/core/update.c
View File

@ -34,15 +34,13 @@
#include <freerdp/peer.h> #include <freerdp/peer.h>
#include <freerdp/codec/bitmap.h> #include <freerdp/codec/bitmap.h>
/* const char* const UPDATE_TYPE_STRINGS[] =
static const char* const UPDATE_TYPE_STRINGS[] =
{ {
"Orders", "Orders",
"Bitmap", "Bitmap",
"Palette", "Palette",
"Synchronize" "Synchronize"
}; };
*/
extern const BYTE PRIMARY_DRAWING_ORDER_FIELD_BYTES[]; extern const BYTE PRIMARY_DRAWING_ORDER_FIELD_BYTES[];
@ -107,6 +105,7 @@ BOOL update_read_bitmap_data(rdpUpdate* update, wStream* s, BITMAP_DATA* bitmapD
Stream_GetPointer(s, bitmapData->bitmapDataStream); Stream_GetPointer(s, bitmapData->bitmapDataStream);
Stream_Seek(s, bitmapData->bitmapLength); Stream_Seek(s, bitmapData->bitmapLength);
} }
return TRUE; return TRUE;
} }
@ -114,6 +113,18 @@ BOOL update_write_bitmap_data(rdpUpdate* update, wStream* s, BITMAP_DATA* bitmap
{ {
Stream_EnsureRemainingCapacity(s, 64 + bitmapData->bitmapLength); Stream_EnsureRemainingCapacity(s, 64 + bitmapData->bitmapLength);
bitmapData->flags = 0;
bitmapData->cbCompFirstRowSize = 0;
if (bitmapData->compressed)
bitmapData->flags |= BITMAP_COMPRESSION;
if (update->context->settings->NoBitmapCompressionHeader)
{
bitmapData->flags |= NO_BITMAP_COMPRESSION_HDR;
bitmapData->cbCompMainBodySize = bitmapData->bitmapLength;
}
Stream_Write_UINT16(s, bitmapData->destLeft); Stream_Write_UINT16(s, bitmapData->destLeft);
Stream_Write_UINT16(s, bitmapData->destTop); Stream_Write_UINT16(s, bitmapData->destTop);
Stream_Write_UINT16(s, bitmapData->destRight); Stream_Write_UINT16(s, bitmapData->destRight);
@ -124,12 +135,6 @@ BOOL update_write_bitmap_data(rdpUpdate* update, wStream* s, BITMAP_DATA* bitmap
Stream_Write_UINT16(s, bitmapData->flags); Stream_Write_UINT16(s, bitmapData->flags);
Stream_Write_UINT16(s, bitmapData->bitmapLength); Stream_Write_UINT16(s, bitmapData->bitmapLength);
if (bitmapData->compressed)
bitmapData->flags |= BITMAP_COMPRESSION;
if (update->context->settings->NoBitmapCompressionHeader)
bitmapData->flags |= NO_BITMAP_COMPRESSION_HDR;
if (bitmapData->flags & BITMAP_COMPRESSION) if (bitmapData->flags & BITMAP_COMPRESSION)
{ {
if (!(bitmapData->flags & NO_BITMAP_COMPRESSION_HDR)) if (!(bitmapData->flags & NO_BITMAP_COMPRESSION_HDR))
@ -168,7 +173,7 @@ BOOL update_read_bitmap_update(rdpUpdate* update, wStream* s, BITMAP_UPDATE* bit
bitmapUpdate->rectangles = (BITMAP_DATA*) realloc(bitmapUpdate->rectangles, bitmapUpdate->rectangles = (BITMAP_DATA*) realloc(bitmapUpdate->rectangles,
sizeof(BITMAP_DATA) * count); sizeof(BITMAP_DATA) * count);
memset(&bitmapUpdate->rectangles[bitmapUpdate->count], 0, ZeroMemory(&bitmapUpdate->rectangles[bitmapUpdate->count],
sizeof(BITMAP_DATA) * (count - bitmapUpdate->count)); sizeof(BITMAP_DATA) * (count - bitmapUpdate->count));
bitmapUpdate->count = count; bitmapUpdate->count = count;
@ -189,6 +194,8 @@ BOOL update_write_bitmap_update(rdpUpdate* update, wStream* s, BITMAP_UPDATE* bi
Stream_EnsureRemainingCapacity(s, 32); Stream_EnsureRemainingCapacity(s, 32);
Stream_Write_UINT16(s, UPDATE_TYPE_BITMAP); /* updateType */
Stream_Write_UINT16(s, bitmapUpdate->number); /* numberRectangles (2 bytes) */ Stream_Write_UINT16(s, bitmapUpdate->number); /* numberRectangles (2 bytes) */
/* rectangles */ /* rectangles */
@ -413,7 +420,7 @@ BOOL update_recv(rdpUpdate* update, wStream* s)
Stream_Read_UINT16(s, updateType); /* updateType (2 bytes) */ Stream_Read_UINT16(s, updateType); /* updateType (2 bytes) */
//fprintf(stderr, "%s Update Data PDU\n", UPDATE_TYPE_STRINGS[updateType]); //printf("%s Update Data PDU\n", UPDATE_TYPE_STRINGS[updateType]);
IFCALL(update->BeginPaint, context); IFCALL(update->BeginPaint, context);
@ -858,11 +865,14 @@ static void update_send_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap
rdpRdp* rdp = context->rdp; rdpRdp* rdp = context->rdp;
rdpUpdate* update = context->update; rdpUpdate* update = context->update;
update_force_flush(context);
s = fastpath_update_pdu_init(rdp->fastpath); s = fastpath_update_pdu_init(rdp->fastpath);
update_write_bitmap_update(update, s, bitmapUpdate); update_write_bitmap_update(update, s, bitmapUpdate);
fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_BITMAP, s); fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_BITMAP, s);
update_force_flush(context);
Stream_Release(s); Stream_Release(s);
} }

2
libfreerdp/core/update.h
View File

@ -45,7 +45,7 @@ void update_free_bitmap(BITMAP_UPDATE* bitmap_update);
void update_reset_state(rdpUpdate* update); void update_reset_state(rdpUpdate* update);
void update_post_connect(rdpUpdate* update); void update_post_connect(rdpUpdate* update);
BOOL update_read_bitmap(rdpUpdate* update, wStream* s, BITMAP_UPDATE* bitmap_update); BOOL update_read_bitmap_update(rdpUpdate* update, wStream* s, BITMAP_UPDATE* bitmapUpdate);
BOOL update_read_palette(rdpUpdate* update, wStream* s, PALETTE_UPDATE* palette_update); BOOL update_read_palette(rdpUpdate* update, wStream* s, PALETTE_UPDATE* palette_update);
BOOL update_recv_play_sound(rdpUpdate* update, wStream* s); BOOL update_recv_play_sound(rdpUpdate* update, wStream* s);
BOOL update_recv_pointer(rdpUpdate* update, wStream* s); BOOL update_recv_pointer(rdpUpdate* update, wStream* s);