From e4a68d776fdcb68f29fb4269914df6b6c037ea91 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 22 Sep 2019 11:09:44 -0700
Subject: [PATCH] GUACAMOLE-249: Correct prototypes of glyph handlers.

---
 src/protocols/rdp/rdp_glyph.c | 11 ++++++-----
 src/protocols/rdp/rdp_glyph.h | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/protocols/rdp/rdp_glyph.c b/src/protocols/rdp/rdp_glyph.c
index 6bb8f59d..01ea7d4d 100644
--- a/src/protocols/rdp/rdp_glyph.c
+++ b/src/protocols/rdp/rdp_glyph.c
@@ -95,7 +95,7 @@ BOOL guac_rdp_glyph_new(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);
 
     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,
-        UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor, BOOL redundant) {
+BOOL guac_rdp_glyph_begindraw(rdpContext* context, INT32 x, INT32 y,
+        INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor,
+        BOOL redundant) {
 
     guac_client* client = ((rdp_freerdp_context*) context)->client;
     guac_rdp_client* rdp_client =
@@ -153,8 +154,8 @@ BOOL guac_rdp_glyph_begindraw(rdpContext* context,
 
 }
 
-BOOL guac_rdp_glyph_enddraw(rdpContext* context,
-        UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor) {
+BOOL guac_rdp_glyph_enddraw(rdpContext* context, INT32 x, INT32 y,
+        INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor) {
     /* IGNORE */
     return TRUE;
 }
diff --git a/src/protocols/rdp/rdp_glyph.h b/src/protocols/rdp/rdp_glyph.h
index 10b79cd2..c14efbbc 100644
--- a/src/protocols/rdp/rdp_glyph.h
+++ b/src/protocols/rdp/rdp_glyph.h
@@ -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.
  */
 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);
 
 /**
@@ -123,8 +123,9 @@ void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph);
  *     be translated via guac_rdp_convert_color(). If the background is
  *     transparent, this value is undefined.
  */
-BOOL guac_rdp_glyph_begindraw(rdpContext* context,
-        UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor, BOOL redundant);
+BOOL guac_rdp_glyph_begindraw(rdpContext* context, INT32 x, INT32 y,
+        INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor,
+        BOOL redundant);
 
 /**
  * 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
  *     transparent, this value is undefined.
  */
-BOOL guac_rdp_glyph_enddraw(rdpContext* context,
-        UINT32 x, UINT32 y, UINT32 width, UINT32 height, UINT32 fgcolor, UINT32 bgcolor);
+BOOL guac_rdp_glyph_enddraw(rdpContext* context, INT32 x, INT32 y,
+        INT32 width, INT32 height, UINT32 fgcolor, UINT32 bgcolor);
 
 #endif