maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-249: Correct prototypes of glyph handlers.

Browse Source
This commit is contained in:
Michael Jumper 2019-09-22 11:09:44 -07:00
parent 9b08a716d6
commit e4a68d776f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/protocols/rdp/rdp_glyph.c
View File

@ -95,7 +95,7 @@ BOOL guac_rdp_glyph_new(rdpContext* context, const rdpGlyph* glyph) {
} }
BOOL guac_rdp_glyph_draw(rdpContext* context, const rdpGlyph* glyph, BOOL guac_rdp_glyph_draw(rdpContext* context, const rdpGlyph* glyph,
UINT32 x, UINT32 y, UINT32 w, UINT32 h, UINT32 sx, UINT32 sy, INT32 x, INT32 y, INT32 w, INT32 h, INT32 sx, INT32 sy,
BOOL redundant); BOOL redundant);
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
@ -124,8 +124,9 @@ void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph) {
} }
BOOL guac_rdp_glyph_begindraw(rdpContext* context, BOOL guac_rdp_glyph_begindraw(rdpContext* context, INT32 x, INT32 y,
UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor, BOOL redundant) { INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor,
BOOL redundant) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = guac_rdp_client* rdp_client =
@ -153,8 +154,8 @@ BOOL guac_rdp_glyph_begindraw(rdpContext* context,
} }
BOOL guac_rdp_glyph_enddraw(rdpContext* context, BOOL guac_rdp_glyph_enddraw(rdpContext* context, INT32 x, INT32 y,
UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor) { INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor) {
/* IGNORE */ /* IGNORE */
return TRUE; return TRUE;
} }

11
src/protocols/rdp/rdp_glyph.h
View File

@ -73,7 +73,7 @@ BOOL guac_rdp_glyph_new(rdpContext* context, const rdpGlyph* glyph);
* The destination Y coordinate of the upper-left corner of the glyph. * The destination Y coordinate of the upper-left corner of the glyph.
*/ */
BOOL guac_rdp_glyph_draw(rdpContext* context, const rdpGlyph* glyph, BOOL guac_rdp_glyph_draw(rdpContext* context, const rdpGlyph* glyph,
UINT32 x, UINT32 y, UINT32 w, UINT32 h, UINT32 sx, UINT32 sy, INT32 x, INT32 y, INT32 w, INT32 h, INT32 sx, INT32 sy,
BOOL redundant); BOOL redundant);
/** /**
@ -123,8 +123,9 @@ void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph);
* be translated via guac_rdp_convert_color(). If the background is * be translated via guac_rdp_convert_color(). If the background is
* transparent, this value is undefined. * transparent, this value is undefined.
*/ */
BOOL guac_rdp_glyph_begindraw(rdpContext* context, BOOL guac_rdp_glyph_begindraw(rdpContext* context, INT32 x, INT32 y,
UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor, BOOL redundant); INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor,
BOOL redundant);
/** /**
* Called immediately after rendering a series of glyphs. Unlike * Called immediately after rendering a series of glyphs. Unlike
@ -160,7 +161,7 @@ BOOL guac_rdp_glyph_begindraw(rdpContext* context,
* be translated via guac_rdp_convert_color(). If the background is * be translated via guac_rdp_convert_color(). If the background is
* transparent, this value is undefined. * transparent, this value is undefined.
*/ */
BOOL guac_rdp_glyph_enddraw(rdpContext* context, BOOL guac_rdp_glyph_enddraw(rdpContext* context, INT32 x, INT32 y,
UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor); INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor);
#endif #endif