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

libfreerdp-core: improve primary order encoding

Browse Source
This commit is contained in:
Marc-André Moreau 2013-05-07 17:40:54 -04:00
parent fe42b77118
commit 8446c61724
2 changed files with 81 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
libfreerdp/core/orders.c
View File

@ -1507,6 +1507,7 @@ BOOL update_read_cache_bitmap_order(wStream* s, CACHE_BITMAP_ORDER* cache_bitmap
{ {
if (Stream_GetRemainingLength(s) < 9) if (Stream_GetRemainingLength(s) < 9)
return FALSE; return FALSE;
stream_read_BYTE(s, cache_bitmap_order->cacheId); /* cacheId (1 byte) */ stream_read_BYTE(s, cache_bitmap_order->cacheId); /* cacheId (1 byte) */
Stream_Seek_BYTE(s); /* pad1Octet (1 byte) */ Stream_Seek_BYTE(s); /* pad1Octet (1 byte) */
stream_read_BYTE(s, cache_bitmap_order->bitmapWidth); /* bitmapWidth (1 byte) */ stream_read_BYTE(s, cache_bitmap_order->bitmapWidth); /* bitmapWidth (1 byte) */
@ -1520,8 +1521,10 @@ BOOL update_read_cache_bitmap_order(wStream* s, CACHE_BITMAP_ORDER* cache_bitmap
if ((flags & NO_BITMAP_COMPRESSION_HDR) == 0) if ((flags & NO_BITMAP_COMPRESSION_HDR) == 0)
{ {
BYTE* bitmapComprHdr = (BYTE*) &(cache_bitmap_order->bitmapComprHdr); BYTE* bitmapComprHdr = (BYTE*) &(cache_bitmap_order->bitmapComprHdr);
if (Stream_GetRemainingLength(s) < 8) if (Stream_GetRemainingLength(s) < 8)
return FALSE; return FALSE;
stream_read(s, bitmapComprHdr, 8); /* bitmapComprHdr (8 bytes) */ stream_read(s, bitmapComprHdr, 8); /* bitmapComprHdr (8 bytes) */
cache_bitmap_order->bitmapLength -= 8; cache_bitmap_order->bitmapLength -= 8;
} }
@ -1540,80 +1543,82 @@ BOOL update_read_cache_bitmap_order(wStream* s, CACHE_BITMAP_ORDER* cache_bitmap
stream_get_mark(s, cache_bitmap_order->bitmapDataStream); stream_get_mark(s, cache_bitmap_order->bitmapDataStream);
Stream_Seek(s, cache_bitmap_order->bitmapLength); /* bitmapDataStream */ Stream_Seek(s, cache_bitmap_order->bitmapLength); /* bitmapDataStream */
} }
cache_bitmap_order->compressed = compressed; cache_bitmap_order->compressed = compressed;
return TRUE; return TRUE;
} }
BOOL update_read_cache_bitmap_v2_order(wStream* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order, BOOL compressed, UINT16 flags) BOOL update_read_cache_bitmap_v2_order(wStream* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2, BOOL compressed, UINT16 flags)
{ {
BYTE bitsPerPixelId; BYTE bitsPerPixelId;
cache_bitmap_v2_order->cacheId = flags & 0x0003; cache_bitmap_v2->cacheId = flags & 0x0003;
cache_bitmap_v2_order->flags = (flags & 0xFF80) >> 7; cache_bitmap_v2->flags = (flags & 0xFF80) >> 7;
bitsPerPixelId = (flags & 0x0078) >> 3; bitsPerPixelId = (flags & 0x0078) >> 3;
cache_bitmap_v2_order->bitmapBpp = CBR2_BPP[bitsPerPixelId]; cache_bitmap_v2->bitmapBpp = CBR2_BPP[bitsPerPixelId];
if (cache_bitmap_v2_order->flags & CBR2_PERSISTENT_KEY_PRESENT) if (cache_bitmap_v2->flags & CBR2_PERSISTENT_KEY_PRESENT)
{ {
if (Stream_GetRemainingLength(s) < 8) if (Stream_GetRemainingLength(s) < 8)
return FALSE; return FALSE;
stream_read_UINT32(s, cache_bitmap_v2_order->key1); /* key1 (4 bytes) */ stream_read_UINT32(s, cache_bitmap_v2->key1); /* key1 (4 bytes) */
stream_read_UINT32(s, cache_bitmap_v2_order->key2); /* key2 (4 bytes) */ stream_read_UINT32(s, cache_bitmap_v2->key2); /* key2 (4 bytes) */
} }
if (cache_bitmap_v2_order->flags & CBR2_HEIGHT_SAME_AS_WIDTH) if (cache_bitmap_v2->flags & CBR2_HEIGHT_SAME_AS_WIDTH)
{ {
if (!update_read_2byte_unsigned(s, &cache_bitmap_v2_order->bitmapWidth)) /* bitmapWidth */ if (!update_read_2byte_unsigned(s, &cache_bitmap_v2->bitmapWidth)) /* bitmapWidth */
return FALSE; return FALSE;
cache_bitmap_v2_order->bitmapHeight = cache_bitmap_v2_order->bitmapWidth; cache_bitmap_v2->bitmapHeight = cache_bitmap_v2->bitmapWidth;
} }
else else
{ {
if (!update_read_2byte_unsigned(s, &cache_bitmap_v2_order->bitmapWidth) || /* bitmapWidth */ if (!update_read_2byte_unsigned(s, &cache_bitmap_v2->bitmapWidth) || /* bitmapWidth */
!update_read_2byte_unsigned(s, &cache_bitmap_v2_order->bitmapHeight)) /* bitmapHeight */ !update_read_2byte_unsigned(s, &cache_bitmap_v2->bitmapHeight)) /* bitmapHeight */
return FALSE; return FALSE;
} }
if (!update_read_4byte_unsigned(s, &cache_bitmap_v2_order->bitmapLength) || /* bitmapLength */ if (!update_read_4byte_unsigned(s, &cache_bitmap_v2->bitmapLength) || /* bitmapLength */
!update_read_2byte_unsigned(s, &cache_bitmap_v2_order->cacheIndex)) /* cacheIndex */ !update_read_2byte_unsigned(s, &cache_bitmap_v2->cacheIndex)) /* cacheIndex */
return FALSE; return FALSE;
if (cache_bitmap_v2_order->flags & CBR2_DO_NOT_CACHE) if (cache_bitmap_v2->flags & CBR2_DO_NOT_CACHE)
cache_bitmap_v2_order->cacheIndex = BITMAP_CACHE_WAITING_LIST_INDEX; cache_bitmap_v2->cacheIndex = BITMAP_CACHE_WAITING_LIST_INDEX;
if (compressed) if (compressed)
{ {
if (!(cache_bitmap_v2_order->flags & CBR2_NO_BITMAP_COMPRESSION_HDR)) if (!(cache_bitmap_v2->flags & CBR2_NO_BITMAP_COMPRESSION_HDR))
{ {
if (Stream_GetRemainingLength(s) < 8) if (Stream_GetRemainingLength(s) < 8)
return FALSE; return FALSE;
stream_read_UINT16(s, cache_bitmap_v2_order->cbCompFirstRowSize); /* cbCompFirstRowSize (2 bytes) */ stream_read_UINT16(s, cache_bitmap_v2->cbCompFirstRowSize); /* cbCompFirstRowSize (2 bytes) */
stream_read_UINT16(s, cache_bitmap_v2_order->cbCompMainBodySize); /* cbCompMainBodySize (2 bytes) */ stream_read_UINT16(s, cache_bitmap_v2->cbCompMainBodySize); /* cbCompMainBodySize (2 bytes) */
stream_read_UINT16(s, cache_bitmap_v2_order->cbScanWidth); /* cbScanWidth (2 bytes) */ stream_read_UINT16(s, cache_bitmap_v2->cbScanWidth); /* cbScanWidth (2 bytes) */
stream_read_UINT16(s, cache_bitmap_v2_order->cbUncompressedSize); /* cbUncompressedSize (2 bytes) */ stream_read_UINT16(s, cache_bitmap_v2->cbUncompressedSize); /* cbUncompressedSize (2 bytes) */
cache_bitmap_v2_order->bitmapLength = cache_bitmap_v2_order->cbCompMainBodySize; cache_bitmap_v2->bitmapLength = cache_bitmap_v2->cbCompMainBodySize;
} }
if (Stream_GetRemainingLength(s) < cache_bitmap_v2_order->bitmapLength) if (Stream_GetRemainingLength(s) < cache_bitmap_v2->bitmapLength)
return FALSE; return FALSE;
stream_get_mark(s, cache_bitmap_v2_order->bitmapDataStream); stream_get_mark(s, cache_bitmap_v2->bitmapDataStream);
Stream_Seek(s, cache_bitmap_v2_order->bitmapLength); Stream_Seek(s, cache_bitmap_v2->bitmapLength);
} }
else else
{ {
if (Stream_GetRemainingLength(s) < cache_bitmap_v2_order->bitmapLength) if (Stream_GetRemainingLength(s) < cache_bitmap_v2->bitmapLength)
return FALSE; return FALSE;
stream_get_mark(s, cache_bitmap_v2_order->bitmapDataStream); stream_get_mark(s, cache_bitmap_v2->bitmapDataStream);
Stream_Seek(s, cache_bitmap_v2_order->bitmapLength); Stream_Seek(s, cache_bitmap_v2->bitmapLength);
} }
cache_bitmap_v2_order->compressed = compressed; cache_bitmap_v2->compressed = compressed;
return TRUE; return TRUE;
} }
@ -2186,6 +2191,7 @@ BOOL update_read_field_flags(wStream* s, UINT32* fieldFlags, BYTE flags, BYTE fi
stream_read_BYTE(s, byte); stream_read_BYTE(s, byte);
*fieldFlags |= byte << (i * 8); *fieldFlags |= byte << (i * 8);
} }
return TRUE; return TRUE;
} }
@ -2194,11 +2200,31 @@ BOOL update_write_field_flags(wStream* s, UINT32 fieldFlags, BYTE flags, BYTE fi
int i; int i;
BYTE byte; BYTE byte;
for (i = fieldBytes - 1; i >= 0; i--) if (fieldBytes == 1)
{ {
byte = (fieldFlags << (i * 8)) & 0xFF; byte = fieldFlags & 0xFF;
stream_write_BYTE(s, byte); stream_write_BYTE(s, byte);
} }
else if (fieldBytes == 2)
{
byte = fieldFlags & 0xFF;
stream_write_BYTE(s, byte);
byte = (fieldFlags >> 8) & 0xFF;
stream_write_BYTE(s, byte);
}
else if (fieldBytes == 3)
{
byte = fieldFlags & 0xFF;
stream_write_BYTE(s, byte);
byte = (fieldFlags >> 8) & 0xFF;
stream_write_BYTE(s, byte);
byte = (fieldFlags >> 16) & 0xFF;
stream_write_BYTE(s, byte);
}
else
{
return FALSE;
}
return TRUE; return TRUE;
} }
@ -2452,6 +2478,7 @@ BOOL update_recv_secondary_order(rdpUpdate* update, wStream* s, BYTE flags)
if (Stream_GetRemainingLength(s) < 5) if (Stream_GetRemainingLength(s) < 5)
return FALSE; return FALSE;
stream_read_UINT16(s, orderLength); /* orderLength (2 bytes) */ stream_read_UINT16(s, orderLength); /* orderLength (2 bytes) */
stream_read_UINT16(s, extraFlags); /* extraFlags (2 bytes) */ stream_read_UINT16(s, extraFlags); /* extraFlags (2 bytes) */
stream_read_BYTE(s, orderType); /* orderType (1 byte) */ stream_read_BYTE(s, orderType); /* orderType (1 byte) */

35
libfreerdp/core/update.c
View File

@ -577,22 +577,29 @@ static void update_send_patblt(rdpContext* context, PATBLT_ORDER* patblt)
{ {
wStream* s; wStream* s;
BYTE *bm, *em; BYTE *bm, *em;
int headerLength;
ORDER_INFO orderInfo; ORDER_INFO orderInfo;
rdpRdp* rdp = context->rdp; rdpRdp* rdp = context->rdp;
orderInfo.controlFlags = ORDER_STANDARD | ORDER_TYPE_CHANGE;
orderInfo.orderType = ORDER_TYPE_PATBLT;
orderInfo.fieldFlags = 0; orderInfo.fieldFlags = 0;
headerLength = 4 + PRIMARY_DRAWING_ORDER_FIELD_BYTES[orderInfo.orderType];
s = fastpath_update_pdu_init(rdp->fastpath); s = fastpath_update_pdu_init(rdp->fastpath);
bm = Stream_Pointer(s); bm = Stream_Pointer(s);
Stream_Seek(s, 5); Stream_Seek(s, headerLength);
update_write_patblt_order(s, &orderInfo, patblt); update_write_patblt_order(s, &orderInfo, patblt);
em = Stream_Pointer(s); em = Stream_Pointer(s);
Stream_Pointer(s) = bm; Stream_Pointer(s) = bm;
stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */ stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */
stream_write_BYTE(s, ORDER_STANDARD | ORDER_TYPE_CHANGE); /* controlFlags (1 byte) */ stream_write_BYTE(s, orderInfo.controlFlags); /* controlFlags (1 byte) */
stream_write_BYTE(s, ORDER_TYPE_PATBLT); /* orderType (1 byte) */ stream_write_BYTE(s, orderInfo.orderType); /* orderType (1 byte) */
stream_write_BYTE(s, orderInfo.fieldFlags); /* fieldFlags (variable) */ update_write_field_flags(s, orderInfo.fieldFlags, orderInfo.controlFlags,
PRIMARY_DRAWING_ORDER_FIELD_BYTES[orderInfo.orderType]);
Stream_Pointer(s) = em; Stream_Pointer(s) = em;
fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_ORDERS, s); fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_ORDERS, s);
@ -687,7 +694,6 @@ static void update_send_memblt(rdpContext* context, MEMBLT_ORDER* memblt)
stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */ stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */
stream_write_BYTE(s, orderInfo.controlFlags); /* controlFlags (1 byte) */ stream_write_BYTE(s, orderInfo.controlFlags); /* controlFlags (1 byte) */
stream_write_BYTE(s, orderInfo.orderType); /* orderType (1 byte) */ stream_write_BYTE(s, orderInfo.orderType); /* orderType (1 byte) */
stream_write_BYTE(s, orderInfo.fieldFlags); /* fieldFlags (variable) */
update_write_field_flags(s, orderInfo.fieldFlags, orderInfo.controlFlags, update_write_field_flags(s, orderInfo.fieldFlags, orderInfo.controlFlags,
PRIMARY_DRAWING_ORDER_FIELD_BYTES[orderInfo.orderType]); PRIMARY_DRAWING_ORDER_FIELD_BYTES[orderInfo.orderType]);
Stream_Pointer(s) = em; Stream_Pointer(s) = em;
@ -720,7 +726,6 @@ static void update_send_glyph_index(rdpContext* context, GLYPH_INDEX_ORDER* glyp
stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */ stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */
stream_write_BYTE(s, orderInfo.controlFlags); /* controlFlags (1 byte) */ stream_write_BYTE(s, orderInfo.controlFlags); /* controlFlags (1 byte) */
stream_write_BYTE(s, orderInfo.orderType); /* orderType (1 byte) */ stream_write_BYTE(s, orderInfo.orderType); /* orderType (1 byte) */
stream_write_BYTE(s, orderInfo.fieldFlags); /* fieldFlags (variable) */
update_write_field_flags(s, orderInfo.fieldFlags, orderInfo.controlFlags, update_write_field_flags(s, orderInfo.fieldFlags, orderInfo.controlFlags,
PRIMARY_DRAWING_ORDER_FIELD_BYTES[orderInfo.orderType]); PRIMARY_DRAWING_ORDER_FIELD_BYTES[orderInfo.orderType]);
Stream_Pointer(s) = em; Stream_Pointer(s) = em;
@ -731,23 +736,26 @@ static void update_send_glyph_index(rdpContext* context, GLYPH_INDEX_ORDER* glyp
static void update_send_cache_bitmap_v2(rdpContext* context, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2) static void update_send_cache_bitmap_v2(rdpContext* context, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2)
{ {
wStream* s; wStream* s;
UINT16 flags;
BYTE *bm, *em; BYTE *bm, *em;
UINT16 extraFlags;
INT16 orderLength;
rdpRdp* rdp = context->rdp; rdpRdp* rdp = context->rdp;
flags = 0; extraFlags = 0;
s = fastpath_update_pdu_init(rdp->fastpath); s = fastpath_update_pdu_init(rdp->fastpath);
bm = Stream_Pointer(s); bm = Stream_Pointer(s);
Stream_Seek(s, 8); Stream_Seek(s, 8);
update_write_cache_bitmap_v2_order(s, cache_bitmap_v2, cache_bitmap_v2->compressed, &flags); update_write_cache_bitmap_v2_order(s, cache_bitmap_v2, cache_bitmap_v2->compressed, &extraFlags);
em = Stream_Pointer(s); em = Stream_Pointer(s);
orderLength = (em - bm) - 13 - 2;
Stream_Pointer(s) = bm; Stream_Pointer(s) = bm;
stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */ stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */
stream_write_BYTE(s, ORDER_STANDARD | ORDER_SECONDARY | ORDER_TYPE_CHANGE); /* controlFlags (1 byte) */ stream_write_BYTE(s, ORDER_STANDARD | ORDER_SECONDARY | ORDER_TYPE_CHANGE); /* controlFlags (1 byte) */
stream_write_UINT16(s, (em - bm) - 13); /* orderLength (2 bytes) */ stream_write_UINT16(s, orderLength); /* orderLength (2 bytes) */
stream_write_UINT16(s, flags); /* extraFlags (2 bytes) */ stream_write_UINT16(s, extraFlags); /* extraFlags (2 bytes) */
stream_write_BYTE(s, ORDER_TYPE_BITMAP_UNCOMPRESSED_V2); /* orderType (1 byte) */ stream_write_BYTE(s, ORDER_TYPE_BITMAP_UNCOMPRESSED_V2); /* orderType (1 byte) */
Stream_Pointer(s) = em; Stream_Pointer(s) = em;
@ -759,6 +767,7 @@ static void update_send_cache_glyph_v2(rdpContext* context, CACHE_GLYPH_V2_ORDER
wStream* s; wStream* s;
UINT16 flags; UINT16 flags;
BYTE *bm, *em; BYTE *bm, *em;
INT16 orderLength;
rdpRdp* rdp = context->rdp; rdpRdp* rdp = context->rdp;
flags = 0; flags = 0;
@ -769,10 +778,12 @@ static void update_send_cache_glyph_v2(rdpContext* context, CACHE_GLYPH_V2_ORDER
update_write_cache_glyph_v2_order(s, cache_glyph_v2, &flags); update_write_cache_glyph_v2_order(s, cache_glyph_v2, &flags);
em = Stream_Pointer(s); em = Stream_Pointer(s);
orderLength = (em - bm) - 13 - 2;
Stream_Pointer(s) = bm; Stream_Pointer(s) = bm;
stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */ stream_write_UINT16(s, 1); /* numberOrders (2 bytes) */
stream_write_BYTE(s, ORDER_STANDARD | ORDER_SECONDARY | ORDER_TYPE_CHANGE); /* controlFlags (1 byte) */ stream_write_BYTE(s, ORDER_STANDARD | ORDER_SECONDARY | ORDER_TYPE_CHANGE); /* controlFlags (1 byte) */
stream_write_UINT16(s, (em - bm) - 13); /* orderLength (2 bytes) */ stream_write_UINT16(s, orderLength); /* orderLength (2 bytes) */
stream_write_UINT16(s, flags); /* extraFlags (2 bytes) */ stream_write_UINT16(s, flags); /* extraFlags (2 bytes) */
stream_write_BYTE(s, ORDER_TYPE_CACHE_GLYPH); /* orderType (1 byte) */ stream_write_BYTE(s, ORDER_TYPE_CACHE_GLYPH); /* orderType (1 byte) */
Stream_Pointer(s) = em; Stream_Pointer(s) = em;