From 841cb70f91465d722b14fae43117e5f17ec6ed58 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 2 May 2019 07:03:16 +0200 Subject: [PATCH] Fixed const correctness of gfx function pointer Signed-off-by: Mati Shabtay --- channels/rdpgfx/client/rdpgfx_main.c | 2 +- channels/rdpgfx/rdpgfx_common.c | 8 +++--- channels/rdpgfx/rdpgfx_common.h | 8 +++--- channels/rdpgfx/server/rdpgfx_main.c | 55 ++++++++++++++++++------------------ include/freerdp/server/rdpgfx.h | 50 +++++++++++++++++--------------- server/shadow/shadow_client.c | 4 +-- 6 files changed, 66 insertions(+), 61 deletions(-) diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index c7b17e2..9074e35 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -265,7 +265,7 @@ static UINT rdpgfx_recv_caps_confirm_pdu(RDPGFX_CHANNEL_CALLBACK* callback, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_frame_acknowledge_pdu(RdpgfxClientContext* context, - RDPGFX_FRAME_ACKNOWLEDGE_PDU* pdu) + const RDPGFX_FRAME_ACKNOWLEDGE_PDU* pdu) { UINT error; wStream* s; diff --git a/channels/rdpgfx/rdpgfx_common.c b/channels/rdpgfx/rdpgfx_common.c index cb8379c..1a01db3 100644 --- a/channels/rdpgfx/rdpgfx_common.c +++ b/channels/rdpgfx/rdpgfx_common.c @@ -130,7 +130,7 @@ UINT rdpgfx_read_header(wStream* s, RDPGFX_HEADER* header) * * @return 0 on success, otherwise a Win32 error code */ -UINT rdpgfx_write_header(wStream* s, RDPGFX_HEADER* header) +UINT rdpgfx_write_header(wStream* s, const RDPGFX_HEADER* header) { Stream_Write_UINT16(s, header->cmdId); /* cmdId (2 bytes) */ Stream_Write_UINT16(s, header->flags); /* flags (2 bytes) */ @@ -161,7 +161,7 @@ UINT rdpgfx_read_point16(wStream* s, RDPGFX_POINT16* pt16) * * @return 0 on success, otherwise a Win32 error code */ -UINT rdpgfx_write_point16(wStream* s, RDPGFX_POINT16* point16) +UINT rdpgfx_write_point16(wStream* s, const RDPGFX_POINT16* point16) { Stream_Write_UINT16(s, point16->x); /* x (2 bytes) */ Stream_Write_UINT16(s, point16->y); /* y (2 bytes) */ @@ -193,7 +193,7 @@ UINT rdpgfx_read_rect16(wStream* s, RECTANGLE_16* rect16) * * @return 0 on success, otherwise a Win32 error code */ -UINT rdpgfx_write_rect16(wStream* s, RECTANGLE_16* rect16) +UINT rdpgfx_write_rect16(wStream* s, const RECTANGLE_16* rect16) { Stream_Write_UINT16(s, rect16->left); /* left (2 bytes) */ Stream_Write_UINT16(s, rect16->top); /* top (2 bytes) */ @@ -227,7 +227,7 @@ UINT rdpgfx_read_color32(wStream* s, RDPGFX_COLOR32* color32) * * @return 0 on success, otherwise a Win32 error code */ -UINT rdpgfx_write_color32(wStream* s, RDPGFX_COLOR32* color32) +UINT rdpgfx_write_color32(wStream* s, const RDPGFX_COLOR32* color32) { Stream_Write_UINT8(s, color32->B); /* B (1 byte) */ Stream_Write_UINT8(s, color32->G); /* G (1 byte) */ diff --git a/channels/rdpgfx/rdpgfx_common.h b/channels/rdpgfx/rdpgfx_common.h index d9d7270..3a3b280 100644 --- a/channels/rdpgfx/rdpgfx_common.h +++ b/channels/rdpgfx/rdpgfx_common.h @@ -32,16 +32,16 @@ FREERDP_LOCAL const char* rdpgfx_get_cmd_id_string(UINT16 cmdId); FREERDP_LOCAL const char* rdpgfx_get_codec_id_string(UINT16 codecId); FREERDP_LOCAL UINT rdpgfx_read_header(wStream* s, RDPGFX_HEADER* header); -FREERDP_LOCAL UINT rdpgfx_write_header(wStream* s, RDPGFX_HEADER* header); +FREERDP_LOCAL UINT rdpgfx_write_header(wStream* s, const RDPGFX_HEADER* header); FREERDP_LOCAL UINT rdpgfx_read_point16(wStream* s, RDPGFX_POINT16* pt16); -FREERDP_LOCAL UINT rdpgfx_write_point16(wStream* s, RDPGFX_POINT16* point16); +FREERDP_LOCAL UINT rdpgfx_write_point16(wStream* s, const RDPGFX_POINT16* point16); FREERDP_LOCAL UINT rdpgfx_read_rect16(wStream* s, RECTANGLE_16* rect16); -FREERDP_LOCAL UINT rdpgfx_write_rect16(wStream* s, RECTANGLE_16* rect16); +FREERDP_LOCAL UINT rdpgfx_write_rect16(wStream* s, const RECTANGLE_16* rect16); FREERDP_LOCAL UINT rdpgfx_read_color32(wStream* s, RDPGFX_COLOR32* color32); -FREERDP_LOCAL UINT rdpgfx_write_color32(wStream* s, RDPGFX_COLOR32* color32); +FREERDP_LOCAL UINT rdpgfx_write_color32(wStream* s, const RDPGFX_COLOR32* color32); #endif /* FREERDP_CHANNEL_RDPGFX_COMMON_H */ diff --git a/channels/rdpgfx/server/rdpgfx_main.c b/channels/rdpgfx/server/rdpgfx_main.c index d8e4754..8191826 100644 --- a/channels/rdpgfx/server/rdpgfx_main.c +++ b/channels/rdpgfx/server/rdpgfx_main.c @@ -54,6 +54,7 @@ static INLINE UINT32 rdpgfx_pdu_length(UINT32 dataLen) return RDPGFX_HEADER_SIZE + dataLen; } + static INLINE UINT rdpgfx_server_packet_init_header(wStream* s, UINT16 cmdId, UINT32 pduLength) { @@ -200,7 +201,7 @@ static INLINE UINT rdpgfx_server_single_packet_send( * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_caps_confirm_pdu(RdpgfxServerContext* context, - RDPGFX_CAPS_CONFIRM_PDU* capsConfirm) + const RDPGFX_CAPS_CONFIRM_PDU* capsConfirm) { RDPGFX_CAPSET* capsSet = capsConfirm->capsSet; wStream* s = rdpgfx_server_single_packet_new( @@ -232,7 +233,7 @@ static UINT rdpgfx_send_caps_confirm_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_reset_graphics_pdu(RdpgfxServerContext* context, - RDPGFX_RESET_GRAPHICS_PDU* pdu) + const RDPGFX_RESET_GRAPHICS_PDU* pdu) { UINT32 index; MONITOR_DEF* monitor; @@ -281,7 +282,7 @@ static UINT rdpgfx_send_reset_graphics_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_evict_cache_entry_pdu(RdpgfxServerContext* context, - RDPGFX_EVICT_CACHE_ENTRY_PDU* pdu) + const RDPGFX_EVICT_CACHE_ENTRY_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new(RDPGFX_CMDID_EVICTCACHEENTRY, 2); @@ -301,7 +302,7 @@ static UINT rdpgfx_send_evict_cache_entry_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_cache_import_reply_pdu(RdpgfxServerContext* context, - RDPGFX_CACHE_IMPORT_REPLY_PDU* pdu) + const RDPGFX_CACHE_IMPORT_REPLY_PDU* pdu) { UINT16 index; wStream* s = rdpgfx_server_single_packet_new( @@ -331,7 +332,7 @@ static UINT rdpgfx_send_cache_import_reply_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_create_surface_pdu(RdpgfxServerContext* context, - RDPGFX_CREATE_SURFACE_PDU* pdu) + const RDPGFX_CREATE_SURFACE_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new(RDPGFX_CMDID_CREATESURFACE, 7); @@ -354,7 +355,7 @@ static UINT rdpgfx_send_create_surface_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_delete_surface_pdu(RdpgfxServerContext* context, - RDPGFX_DELETE_SURFACE_PDU* pdu) + const RDPGFX_DELETE_SURFACE_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new(RDPGFX_CMDID_DELETESURFACE, 2); @@ -369,14 +370,14 @@ static UINT rdpgfx_send_delete_surface_pdu(RdpgfxServerContext* context, } static INLINE void rdpgfx_write_start_frame_pdu(wStream* s, - RDPGFX_START_FRAME_PDU* pdu) + const RDPGFX_START_FRAME_PDU* pdu) { Stream_Write_UINT32(s, pdu->timestamp); /* timestamp (4 bytes) */ Stream_Write_UINT32(s, pdu->frameId); /* frameId (4 bytes) */ } static INLINE void rdpgfx_write_end_frame_pdu(wStream* s, - RDPGFX_END_FRAME_PDU* pdu) + const RDPGFX_END_FRAME_PDU* pdu) { Stream_Write_UINT32(s, pdu->frameId); /* frameId (4 bytes) */ } @@ -387,7 +388,7 @@ static INLINE void rdpgfx_write_end_frame_pdu(wStream* s, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_start_frame_pdu(RdpgfxServerContext* context, - RDPGFX_START_FRAME_PDU* pdu) + const RDPGFX_START_FRAME_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_STARTFRAME, @@ -409,7 +410,7 @@ static UINT rdpgfx_send_start_frame_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_end_frame_pdu(RdpgfxServerContext* context, - RDPGFX_END_FRAME_PDU* pdu) + const RDPGFX_END_FRAME_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_ENDFRAME, @@ -432,7 +433,7 @@ static UINT rdpgfx_send_end_frame_pdu(RdpgfxServerContext* context, * @return estimated size */ static INLINE UINT32 rdpgfx_estimate_h264_avc420( - RDPGFX_AVC420_BITMAP_STREAM* havc420) + const RDPGFX_AVC420_BITMAP_STREAM* havc420) { /* H264 metadata + H264 stream. See rdpgfx_write_h264_avc420 */ return sizeof(UINT32) /* numRegionRects */ @@ -447,7 +448,7 @@ static INLINE UINT32 rdpgfx_estimate_h264_avc420( * * @return estimated size */ -static INLINE UINT32 rdpgfx_estimate_surface_command(RDPGFX_SURFACE_COMMAND* +static INLINE UINT32 rdpgfx_estimate_surface_command(const RDPGFX_SURFACE_COMMAND* cmd) { RDPGFX_AVC420_BITMAP_STREAM* havc420 = NULL; @@ -494,7 +495,7 @@ static INLINE UINT32 rdpgfx_estimate_surface_command(RDPGFX_SURFACE_COMMAND* * * @return 0 on success, otherwise a Win32 error code */ -static INLINE UINT16 rdpgfx_surface_command_cmdid(RDPGFX_SURFACE_COMMAND* cmd) +static INLINE UINT16 rdpgfx_surface_command_cmdid(const RDPGFX_SURFACE_COMMAND* cmd) { if (cmd->codecId == RDPGFX_CODECID_CAPROGRESSIVE || cmd->codecId == RDPGFX_CODECID_CAPROGRESSIVE_V2) @@ -510,7 +511,7 @@ static INLINE UINT16 rdpgfx_surface_command_cmdid(RDPGFX_SURFACE_COMMAND* cmd) * * @return 0 on success, otherwise a Win32 error code */ -static UINT rdpgfx_write_h264_metablock(wStream* s, RDPGFX_H264_METABLOCK* meta) +static UINT rdpgfx_write_h264_metablock(wStream* s, const RDPGFX_H264_METABLOCK* meta) { UINT32 index; RECTANGLE_16* regionRect; @@ -579,7 +580,7 @@ static INLINE UINT rdpgfx_write_h264_avc420(wStream* s, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_write_surface_command(wStream* s, - RDPGFX_SURFACE_COMMAND* cmd) + const RDPGFX_SURFACE_COMMAND* cmd) { UINT error = CHANNEL_RC_OK; RDPGFX_AVC420_BITMAP_STREAM* havc420 = NULL; @@ -688,7 +689,7 @@ static UINT rdpgfx_write_surface_command(wStream* s, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_surface_command(RdpgfxServerContext* context, - RDPGFX_SURFACE_COMMAND* cmd) + const RDPGFX_SURFACE_COMMAND* cmd) { UINT error = CHANNEL_RC_OK; wStream* s; @@ -725,8 +726,8 @@ error: * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_surface_frame_command(RdpgfxServerContext* context, - RDPGFX_SURFACE_COMMAND* cmd, RDPGFX_START_FRAME_PDU* startFrame, - RDPGFX_END_FRAME_PDU* endFrame) + const RDPGFX_SURFACE_COMMAND* cmd, const RDPGFX_START_FRAME_PDU* startFrame, + const RDPGFX_END_FRAME_PDU* endFrame) { UINT error = CHANNEL_RC_OK; @@ -821,7 +822,7 @@ error: */ static UINT rdpgfx_send_delete_encoding_context_pdu(RdpgfxServerContext* context, - RDPGFX_DELETE_ENCODING_CONTEXT_PDU* pdu) + const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_DELETEENCODINGCONTEXT, 6); @@ -843,7 +844,7 @@ static UINT rdpgfx_send_delete_encoding_context_pdu(RdpgfxServerContext* * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_solid_fill_pdu(RdpgfxServerContext* context, - RDPGFX_SOLID_FILL_PDU* pdu) + const RDPGFX_SOLID_FILL_PDU* pdu) { UINT error = CHANNEL_RC_OK; UINT16 index; @@ -892,7 +893,7 @@ error: * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_surface_to_surface_pdu(RdpgfxServerContext* context, - RDPGFX_SURFACE_TO_SURFACE_PDU* pdu) + const RDPGFX_SURFACE_TO_SURFACE_PDU* pdu) { UINT error = CHANNEL_RC_OK; UINT16 index; @@ -942,7 +943,7 @@ error: * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_surface_to_cache_pdu(RdpgfxServerContext* context, - RDPGFX_SURFACE_TO_CACHE_PDU* pdu) + const RDPGFX_SURFACE_TO_CACHE_PDU* pdu) { UINT error = CHANNEL_RC_OK; wStream* s = rdpgfx_server_single_packet_new( @@ -977,7 +978,7 @@ error: * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_cache_to_surface_pdu(RdpgfxServerContext* context, - RDPGFX_CACHE_TO_SURFACE_PDU* pdu) + const RDPGFX_CACHE_TO_SURFACE_PDU* pdu) { UINT error = CHANNEL_RC_OK; UINT16 index; @@ -1019,7 +1020,7 @@ error: * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_map_surface_to_output_pdu(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* pdu) + const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_MAPSURFACETOOUTPUT, 12); @@ -1043,7 +1044,7 @@ static UINT rdpgfx_send_map_surface_to_output_pdu(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT rdpgfx_send_map_surface_to_window_pdu(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* pdu) + const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_MAPSURFACETOWINDOW, 18); @@ -1062,7 +1063,7 @@ static UINT rdpgfx_send_map_surface_to_window_pdu(RdpgfxServerContext* context, } static UINT rdpgfx_send_map_surface_to_scaled_window_pdu(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* pdu) + const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_MAPSURFACETOWINDOW, 18); @@ -1281,7 +1282,7 @@ static UINT rdpgfx_recv_qoe_frame_acknowledge_pdu(RdpgfxServerContext* context, } static UINT rdpgfx_send_map_surface_to_scaled_output_pdu(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* pdu) + const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* pdu) { wStream* s = rdpgfx_server_single_packet_new( RDPGFX_CMDID_MAPSURFACETOSCALEDOUTPUT, 12); diff --git a/include/freerdp/server/rdpgfx.h b/include/freerdp/server/rdpgfx.h index e5c3917..e9e7f62 100644 --- a/include/freerdp/server/rdpgfx.h +++ b/include/freerdp/server/rdpgfx.h @@ -29,47 +29,51 @@ typedef BOOL (*psRdpgfxServerOpen)(RdpgfxServerContext* context); typedef BOOL (*psRdpgfxServerClose)(RdpgfxServerContext* context); typedef UINT(*psRdpgfxResetGraphics)(RdpgfxServerContext* context, - RDPGFX_RESET_GRAPHICS_PDU* resetGraphics); -typedef UINT(*psRdpgfxStartFrame)(RdpgfxServerContext* context, RDPGFX_START_FRAME_PDU* startFrame); -typedef UINT(*psRdpgfxEndFrame)(RdpgfxServerContext* context, RDPGFX_END_FRAME_PDU* endFrame); -typedef UINT(*psRdpgfxSurfaceCommand)(RdpgfxServerContext* context, RDPGFX_SURFACE_COMMAND* cmd); + const RDPGFX_RESET_GRAPHICS_PDU* resetGraphics); +typedef UINT(*psRdpgfxStartFrame)(RdpgfxServerContext* context, + const RDPGFX_START_FRAME_PDU* startFrame); +typedef UINT(*psRdpgfxEndFrame)(RdpgfxServerContext* context, const RDPGFX_END_FRAME_PDU* endFrame); +typedef UINT(*psRdpgfxSurfaceCommand)(RdpgfxServerContext* context, + const RDPGFX_SURFACE_COMMAND* cmd); typedef UINT(*psRdpgfxSurfaceFrameCommand)(RdpgfxServerContext* context, - RDPGFX_SURFACE_COMMAND* cmd, RDPGFX_START_FRAME_PDU* startFrame, RDPGFX_END_FRAME_PDU* endFrame); + const RDPGFX_SURFACE_COMMAND* cmd, const RDPGFX_START_FRAME_PDU* startFrame, + const RDPGFX_END_FRAME_PDU* endFrame); typedef UINT(*psRdpgfxDeleteEncodingContext)(RdpgfxServerContext* context, - RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext); + const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext); typedef UINT(*psRdpgfxCreateSurface)(RdpgfxServerContext* context, - RDPGFX_CREATE_SURFACE_PDU* createSurface); + const RDPGFX_CREATE_SURFACE_PDU* createSurface); typedef UINT(*psRdpgfxDeleteSurface)(RdpgfxServerContext* context, - RDPGFX_DELETE_SURFACE_PDU* deleteSurface); -typedef UINT(*psRdpgfxSolidFill)(RdpgfxServerContext* context, RDPGFX_SOLID_FILL_PDU* solidFill); + const RDPGFX_DELETE_SURFACE_PDU* deleteSurface); +typedef UINT(*psRdpgfxSolidFill)(RdpgfxServerContext* context, + const RDPGFX_SOLID_FILL_PDU* solidFill); typedef UINT(*psRdpgfxSurfaceToSurface)(RdpgfxServerContext* context, - RDPGFX_SURFACE_TO_SURFACE_PDU* surfaceToSurface); + const RDPGFX_SURFACE_TO_SURFACE_PDU* surfaceToSurface); typedef UINT(*psRdpgfxSurfaceToCache)(RdpgfxServerContext* context, - RDPGFX_SURFACE_TO_CACHE_PDU* surfaceToCache); + const RDPGFX_SURFACE_TO_CACHE_PDU* surfaceToCache); typedef UINT(*psRdpgfxCacheToSurface)(RdpgfxServerContext* context, - RDPGFX_CACHE_TO_SURFACE_PDU* cacheToSurface); + const RDPGFX_CACHE_TO_SURFACE_PDU* cacheToSurface); typedef UINT(*psRdpgfxCacheImportOffer)(RdpgfxServerContext* context, - RDPGFX_CACHE_IMPORT_OFFER_PDU* cacheImportOffer); + const RDPGFX_CACHE_IMPORT_OFFER_PDU* cacheImportOffer); typedef UINT(*psRdpgfxCacheImportReply)(RdpgfxServerContext* context, - RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply); + const RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply); typedef UINT(*psRdpgfxEvictCacheEntry)(RdpgfxServerContext* context, - RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry); + const RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry); typedef UINT(*psRdpgfxMapSurfaceToOutput)(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput); + const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput); typedef UINT(*psRdpgfxMapSurfaceToWindow)(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow); + const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow); typedef UINT(*psRdpgfxMapSurfaceToScaledOutput)(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput); + const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput); typedef UINT(*psRdpgfxMapSurfaceToScaledWindow)(RdpgfxServerContext* context, - RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow); + const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow); typedef UINT(*psRdpgfxCapsAdvertise)(RdpgfxServerContext* context, - RDPGFX_CAPS_ADVERTISE_PDU* capsAdvertise); + const RDPGFX_CAPS_ADVERTISE_PDU* capsAdvertise); typedef UINT(*psRdpgfxCapsConfirm)(RdpgfxServerContext* context, - RDPGFX_CAPS_CONFIRM_PDU* capsConfirm); + const RDPGFX_CAPS_CONFIRM_PDU* capsConfirm); typedef UINT(*psRdpgfxFrameAcknowledge)(RdpgfxServerContext* context, - RDPGFX_FRAME_ACKNOWLEDGE_PDU* frameAcknowledge); + const RDPGFX_FRAME_ACKNOWLEDGE_PDU* frameAcknowledge); typedef UINT(*psRdpgfxQoeFrameAcknowledge)(RdpgfxServerContext* context, - RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU* qoeFrameAcknowledge); + const RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU* qoeFrameAcknowledge); struct _rdpgfx_server_context { diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index e30d87a..7cc99ef 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -605,7 +605,7 @@ static BOOL shadow_client_surface_frame_acknowledge(rdpShadowClient* client, } static UINT shadow_client_rdpgfx_frame_acknowledge(RdpgfxServerContext* context, - RDPGFX_FRAME_ACKNOWLEDGE_PDU* frameAcknowledge) + const RDPGFX_FRAME_ACKNOWLEDGE_PDU* frameAcknowledge) { rdpShadowClient* client = (rdpShadowClient*)context->custom; shadow_client_common_frame_acknowledge(client, frameAcknowledge->frameId); @@ -619,7 +619,7 @@ static UINT shadow_client_rdpgfx_frame_acknowledge(RdpgfxServerContext* context, * @return 0 on success, otherwise a Win32 error code */ static UINT shadow_client_rdpgfx_caps_advertise(RdpgfxServerContext* context, - RDPGFX_CAPS_ADVERTISE_PDU* capsAdvertise) + const RDPGFX_CAPS_ADVERTISE_PDU* capsAdvertise) { UINT16 index; rdpSettings* settings = context->rdpcontext->settings; -- 2.7.4