From 98c11f0ae41500b848ecd77282ac5219bce02037 Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Wed, 24 Aug 2011 10:07:06 +0800 Subject: [PATCH] server: define surfcmd header length constants. --- libfreerdp-core/fastpath.c | 5 ++++- libfreerdp-core/surface.c | 12 ++++-------- libfreerdp-core/surface.h | 7 +++++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libfreerdp-core/fastpath.c b/libfreerdp-core/fastpath.c index 7dd5a048a..15f80f3d7 100644 --- a/libfreerdp-core/fastpath.c +++ b/libfreerdp-core/fastpath.c @@ -498,7 +498,10 @@ boolean fastpath_send_surface_bits(rdpFastPath* fastpath, SURFACE_BITS_COMMAND* size = 0; if (i == 0) - size += update_write_surfcmd_surface_bits_header(s, cmd); + { + update_write_surfcmd_surface_bits_header(s, cmd); + size += SURFCMD_SURFACE_BITS_HEADER_LENGTH; + } fragment_size = MIN(stream_get_left(s), bitmapDataLength); if (fragment_size == bitmapDataLength) diff --git a/libfreerdp-core/surface.c b/libfreerdp-core/surface.c index 48fa014ed..6c17e310c 100644 --- a/libfreerdp-core/surface.c +++ b/libfreerdp-core/surface.c @@ -84,9 +84,9 @@ boolean update_recv_surfcmds(rdpUpdate* update, uint16 size, STREAM* s) return True; } -int update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cmd) +void update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cmd) { - stream_check_size(s, 22); + stream_check_size(s, SURFCMD_SURFACE_BITS_HEADER_LENGTH); stream_write_uint16(s, CMDTYPE_STREAM_SURFACE_BITS); @@ -100,19 +100,15 @@ int update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cm stream_write_uint16(s, cmd->width); stream_write_uint16(s, cmd->height); stream_write_uint32(s, cmd->bitmapDataLength); - - return 22; } -int update_write_surfcmd_frame_marker(STREAM* s, uint16 frameAction, uint32 frameId) +void update_write_surfcmd_frame_marker(STREAM* s, uint16 frameAction, uint32 frameId) { - stream_check_size(s, 8); + stream_check_size(s, SURFCMD_FRAME_MARKER_LENGTH); stream_write_uint16(s, CMDTYPE_FRAME_MARKER); stream_write_uint16(s, frameAction); stream_write_uint32(s, frameId); - - return 8; } diff --git a/libfreerdp-core/surface.h b/libfreerdp-core/surface.h index 37a9d069b..e1a24301e 100644 --- a/libfreerdp-core/surface.h +++ b/libfreerdp-core/surface.h @@ -23,10 +23,13 @@ #include "rdp.h" #include +#define SURFCMD_SURFACE_BITS_HEADER_LENGTH 22 +#define SURFCMD_FRAME_MARKER_LENGTH 8 + boolean update_recv_surfcmds(rdpUpdate* update, uint16 size, STREAM* s); -int update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cmd); -int update_write_surfcmd_frame_marker(STREAM* s, uint16 frameAction, uint32 frameId); +void update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cmd); +void update_write_surfcmd_frame_marker(STREAM* s, uint16 frameAction, uint32 frameId); #endif /* __SURFACE */