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

Updated symbol visibility of GFX channel.

Browse Source
This commit is contained in:
Armin Novak 2016-10-17 09:05:54 +02:00
parent b6907aa2b1
commit 4dfdf83d68
6 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
channels/rdpgfx/client/rdpgfx_codec.h
View File

@ -26,9 +26,10 @@
#include <winpr/stream.h> #include <winpr/stream.h>
#include <freerdp/channels/rdpgfx.h> #include <freerdp/channels/rdpgfx.h>
#include <freerdp/api.h>
#include "rdpgfx_main.h" #include "rdpgfx_main.h"
UINT rdpgfx_decode(RDPGFX_PLUGIN* gfx, RDPGFX_SURFACE_COMMAND* cmd); FREERDP_LOCAL UINT rdpgfx_decode(RDPGFX_PLUGIN* gfx, RDPGFX_SURFACE_COMMAND* cmd);
#endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_CODEC_H */ #endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_CODEC_H */

12
channels/rdpgfx/client/rdpgfx_main.c
View File

@ -322,7 +322,7 @@ static UINT rdpgfx_recv_evict_cache_entry_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_recv_cache_import_reply_pdu(RDPGFX_CHANNEL_CALLBACK* callback, static UINT rdpgfx_recv_cache_import_reply_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
wStream* s) wStream* s)
{ {
UINT16 index; UINT16 index;
@ -416,7 +416,7 @@ static UINT rdpgfx_recv_create_surface_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_recv_delete_surface_pdu(RDPGFX_CHANNEL_CALLBACK* callback, static UINT rdpgfx_recv_delete_surface_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
wStream* s) wStream* s)
{ {
RDPGFX_DELETE_SURFACE_PDU pdu; RDPGFX_DELETE_SURFACE_PDU pdu;
@ -712,7 +712,7 @@ static UINT rdpgfx_recv_delete_encoding_context_pdu(RDPGFX_CHANNEL_CALLBACK*
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_recv_solid_fill_pdu(RDPGFX_CHANNEL_CALLBACK* callback, wStream* s) static UINT rdpgfx_recv_solid_fill_pdu(RDPGFX_CHANNEL_CALLBACK* callback, wStream* s)
{ {
UINT16 index; UINT16 index;
RECTANGLE_16* fillRect; RECTANGLE_16* fillRect;
@ -908,7 +908,7 @@ static UINT rdpgfx_recv_surface_to_cache_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_recv_cache_to_surface_pdu(RDPGFX_CHANNEL_CALLBACK* callback, static UINT rdpgfx_recv_cache_to_surface_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
wStream* s) wStream* s)
{ {
UINT16 index; UINT16 index;
@ -1014,7 +1014,7 @@ static UINT rdpgfx_recv_map_surface_to_output_pdu(RDPGFX_CHANNEL_CALLBACK*
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_recv_map_surface_to_window_pdu(RDPGFX_CHANNEL_CALLBACK* callback, static UINT rdpgfx_recv_map_surface_to_window_pdu(RDPGFX_CHANNEL_CALLBACK* callback,
wStream* s) wStream* s)
{ {
RDPGFX_MAP_SURFACE_TO_WINDOW_PDU pdu; RDPGFX_MAP_SURFACE_TO_WINDOW_PDU pdu;
@ -1557,7 +1557,7 @@ static UINT rdpgfx_set_cache_slot_data(RdpgfxClientContext* context,
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cacheSlot) static void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cacheSlot)
{ {
void* pData = NULL; void* pData = NULL;
RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*) context->handle; RDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*) context->handle;

18
channels/rdpgfx/rdpgfx_common.c
View File

@ -31,7 +31,7 @@
#include "rdpgfx_common.h" #include "rdpgfx_common.h"
const char* RDPGFX_CMDID_STRINGS[] = static const char* RDPGFX_CMDID_STRINGS[] =
{ {
"RDPGFX_CMDID_UNUSED_0000", "RDPGFX_CMDID_UNUSED_0000",
"RDPGFX_CMDID_WIRETOSURFACE_1", "RDPGFX_CMDID_WIRETOSURFACE_1",
@ -72,20 +72,28 @@ const char* rdpgfx_get_codec_id_string(UINT16 codecId)
{ {
case RDPGFX_CODECID_UNCOMPRESSED: case RDPGFX_CODECID_UNCOMPRESSED:
return "RDPGFX_CODECID_UNCOMPRESSED"; return "RDPGFX_CODECID_UNCOMPRESSED";
case RDPGFX_CODECID_CAVIDEO: case RDPGFX_CODECID_CAVIDEO:
return "RDPGFX_CODECID_CAVIDEO"; return "RDPGFX_CODECID_CAVIDEO";
case RDPGFX_CODECID_CLEARCODEC: case RDPGFX_CODECID_CLEARCODEC:
return "RDPGFX_CODECID_CLEARCODEC"; return "RDPGFX_CODECID_CLEARCODEC";
case RDPGFX_CODECID_PLANAR: case RDPGFX_CODECID_PLANAR:
return "RDPGFX_CODECID_PLANAR"; return "RDPGFX_CODECID_PLANAR";
case RDPGFX_CODECID_AVC420: case RDPGFX_CODECID_AVC420:
return "RDPGFX_CODECID_AVC420"; return "RDPGFX_CODECID_AVC420";
case RDPGFX_CODECID_AVC444: case RDPGFX_CODECID_AVC444:
return "RDPGFX_CODECID_AVC444"; return "RDPGFX_CODECID_AVC444";
case RDPGFX_CODECID_ALPHA: case RDPGFX_CODECID_ALPHA:
return "RDPGFX_CODECID_ALPHA"; return "RDPGFX_CODECID_ALPHA";
case RDPGFX_CODECID_CAPROGRESSIVE: case RDPGFX_CODECID_CAPROGRESSIVE:
return "RDPGFX_CODECID_CAPROGRESSIVE"; return "RDPGFX_CODECID_CAPROGRESSIVE";
case RDPGFX_CODECID_CAPROGRESSIVE_V2: case RDPGFX_CODECID_CAPROGRESSIVE_V2:
return "RDPGFX_CODECID_CAPROGRESSIVE_V2"; return "RDPGFX_CODECID_CAPROGRESSIVE_V2";
} }
@ -109,7 +117,6 @@ UINT rdpgfx_read_header(wStream* s, RDPGFX_HEADER* header)
Stream_Read_UINT16(s, header->cmdId); /* cmdId (2 bytes) */ Stream_Read_UINT16(s, header->cmdId); /* cmdId (2 bytes) */
Stream_Read_UINT16(s, header->flags); /* flags (2 bytes) */ Stream_Read_UINT16(s, header->flags); /* flags (2 bytes) */
Stream_Read_UINT32(s, header->pduLength); /* pduLength (4 bytes) */ Stream_Read_UINT32(s, header->pduLength); /* pduLength (4 bytes) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -123,7 +130,6 @@ UINT rdpgfx_write_header(wStream* s, RDPGFX_HEADER* header)
Stream_Write_UINT16(s, header->cmdId); /* cmdId (2 bytes) */ Stream_Write_UINT16(s, header->cmdId); /* cmdId (2 bytes) */
Stream_Write_UINT16(s, header->flags); /* flags (2 bytes) */ Stream_Write_UINT16(s, header->flags); /* flags (2 bytes) */
Stream_Write_UINT32(s, header->pduLength); /* pduLength (4 bytes) */ Stream_Write_UINT32(s, header->pduLength); /* pduLength (4 bytes) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -142,7 +148,6 @@ UINT rdpgfx_read_point16(wStream* s, RDPGFX_POINT16* pt16)
Stream_Read_UINT16(s, pt16->x); /* x (2 bytes) */ Stream_Read_UINT16(s, pt16->x); /* x (2 bytes) */
Stream_Read_UINT16(s, pt16->y); /* y (2 bytes) */ Stream_Read_UINT16(s, pt16->y); /* y (2 bytes) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -155,7 +160,6 @@ UINT rdpgfx_write_point16(wStream* s, RDPGFX_POINT16* point16)
{ {
Stream_Write_UINT16(s, point16->x); /* x (2 bytes) */ Stream_Write_UINT16(s, point16->x); /* x (2 bytes) */
Stream_Write_UINT16(s, point16->y); /* y (2 bytes) */ Stream_Write_UINT16(s, point16->y); /* y (2 bytes) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -176,7 +180,6 @@ UINT rdpgfx_read_rect16(wStream* s, RECTANGLE_16* rect16)
Stream_Read_UINT16(s, rect16->top); /* top (2 bytes) */ Stream_Read_UINT16(s, rect16->top); /* top (2 bytes) */
Stream_Read_UINT16(s, rect16->right); /* right (2 bytes) */ Stream_Read_UINT16(s, rect16->right); /* right (2 bytes) */
Stream_Read_UINT16(s, rect16->bottom); /* bottom (2 bytes) */ Stream_Read_UINT16(s, rect16->bottom); /* bottom (2 bytes) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -191,7 +194,6 @@ UINT rdpgfx_write_rect16(wStream* s, RECTANGLE_16* rect16)
Stream_Write_UINT16(s, rect16->top); /* top (2 bytes) */ Stream_Write_UINT16(s, rect16->top); /* top (2 bytes) */
Stream_Write_UINT16(s, rect16->right); /* right (2 bytes) */ Stream_Write_UINT16(s, rect16->right); /* right (2 bytes) */
Stream_Write_UINT16(s, rect16->bottom); /* bottom (2 bytes) */ Stream_Write_UINT16(s, rect16->bottom); /* bottom (2 bytes) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -212,7 +214,6 @@ UINT rdpgfx_read_color32(wStream* s, RDPGFX_COLOR32* color32)
Stream_Read_UINT8(s, color32->G); /* G (1 byte) */ Stream_Read_UINT8(s, color32->G); /* G (1 byte) */
Stream_Read_UINT8(s, color32->R); /* R (1 byte) */ Stream_Read_UINT8(s, color32->R); /* R (1 byte) */
Stream_Read_UINT8(s, color32->XA); /* XA (1 byte) */ Stream_Read_UINT8(s, color32->XA); /* XA (1 byte) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
@ -227,6 +228,5 @@ UINT rdpgfx_write_color32(wStream* s, RDPGFX_COLOR32* color32)
Stream_Write_UINT8(s, color32->G); /* G (1 byte) */ Stream_Write_UINT8(s, color32->G); /* G (1 byte) */
Stream_Write_UINT8(s, color32->R); /* R (1 byte) */ Stream_Write_UINT8(s, color32->R); /* R (1 byte) */
Stream_Write_UINT8(s, color32->XA); /* XA (1 byte) */ Stream_Write_UINT8(s, color32->XA); /* XA (1 byte) */
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }

21
channels/rdpgfx/rdpgfx_common.h
View File

@ -26,21 +26,22 @@
#include <winpr/stream.h> #include <winpr/stream.h>
#include <freerdp/channels/rdpgfx.h> #include <freerdp/channels/rdpgfx.h>
#include <freerdp/api.h>
const char* rdpgfx_get_cmd_id_string(UINT16 cmdId); FREERDP_LOCAL const char* rdpgfx_get_cmd_id_string(UINT16 cmdId);
const char* rdpgfx_get_codec_id_string(UINT16 codecId); FREERDP_LOCAL const char* rdpgfx_get_codec_id_string(UINT16 codecId);
UINT rdpgfx_read_header(wStream* s, RDPGFX_HEADER* header); FREERDP_LOCAL UINT rdpgfx_read_header(wStream* s, RDPGFX_HEADER* header);
UINT rdpgfx_write_header(wStream* s, RDPGFX_HEADER* header); FREERDP_LOCAL UINT rdpgfx_write_header(wStream* s, RDPGFX_HEADER* header);
UINT rdpgfx_read_point16(wStream* s, RDPGFX_POINT16* pt16); FREERDP_LOCAL UINT rdpgfx_read_point16(wStream* s, RDPGFX_POINT16* pt16);
UINT rdpgfx_write_point16(wStream* s, RDPGFX_POINT16* point16); FREERDP_LOCAL UINT rdpgfx_write_point16(wStream* s, RDPGFX_POINT16* point16);
UINT rdpgfx_read_rect16(wStream* s, RECTANGLE_16* rect16); FREERDP_LOCAL UINT rdpgfx_read_rect16(wStream* s, RECTANGLE_16* rect16);
UINT rdpgfx_write_rect16(wStream* s, RECTANGLE_16* rect16); FREERDP_LOCAL UINT rdpgfx_write_rect16(wStream* s, RECTANGLE_16* rect16);
UINT rdpgfx_read_color32(wStream* s, RDPGFX_COLOR32* color32); FREERDP_LOCAL UINT rdpgfx_read_color32(wStream* s, RDPGFX_COLOR32* color32);
UINT rdpgfx_write_color32(wStream* s, RDPGFX_COLOR32* color32); FREERDP_LOCAL UINT rdpgfx_write_color32(wStream* s, RDPGFX_COLOR32* color32);
#endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_COMMON_H */ #endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_COMMON_H */

6
channels/rdpgfx/server/rdpgfx_main.c
View File

@ -345,7 +345,7 @@ static UINT rdpgfx_send_create_surface_pdu(RdpgfxServerContext* context,
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_send_delete_surface_pdu(RdpgfxServerContext* context, static UINT rdpgfx_send_delete_surface_pdu(RdpgfxServerContext* context,
RDPGFX_DELETE_SURFACE_PDU* pdu) RDPGFX_DELETE_SURFACE_PDU* pdu)
{ {
wStream* s = rdpgfx_server_single_packet_new(RDPGFX_CMDID_DELETESURFACE, 2); wStream* s = rdpgfx_server_single_packet_new(RDPGFX_CMDID_DELETESURFACE, 2);
@ -829,7 +829,7 @@ static UINT rdpgfx_send_delete_encoding_context_pdu(RdpgfxServerContext*
* *
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
UINT rdpgfx_send_solid_fill_pdu(RdpgfxServerContext* context, static UINT rdpgfx_send_solid_fill_pdu(RdpgfxServerContext* context,
RDPGFX_SOLID_FILL_PDU* pdu) RDPGFX_SOLID_FILL_PDU* pdu)
{ {
UINT error = CHANNEL_RC_OK; UINT error = CHANNEL_RC_OK;
@ -1576,7 +1576,7 @@ void rdpgfx_server_context_free(RdpgfxServerContext* context)
free(context); free(context);
} }
FREERDP_API HANDLE rdpgfx_server_get_event_handle(RdpgfxServerContext* context) HANDLE rdpgfx_server_get_event_handle(RdpgfxServerContext* context)
{ {
return context->priv->channelEvent; return context->priv->channelEvent;
} }

4
scripts/format_code.sh
View File

@ -31,9 +31,9 @@ if [ $# -le 0 ]; then
fi fi
$ASTYLE --lineend=linux --mode=c --indent=tab=4 --pad-header --pad-oper --style=allman --min-conditional-indent=0 \ $ASTYLE --lineend=linux --mode=c --indent=tab=4 --pad-header --pad-oper --style=allman --min-conditional-indent=0 \
--indent-switches --indent-cases --indent-preprocessor -k1 --max-code-length=80 \ --indent-switches --indent-cases --indent-preprocessor -k1 --max-code-length=100 \
--indent-col1-comments --delete-empty-lines --break-closing-brackets \ --indent-col1-comments --delete-empty-lines --break-closing-brackets \
--align-pointer=type --indent-labels -xe \ --align-pointer=type --indent-labels -xe --break-after-logical \
--unpad-paren --break-blocks $@ --unpad-paren --break-blocks $@
exit $? exit $?