diff --git a/include/freerdp/gdi/gdi.h b/include/freerdp/gdi/gdi.h
index 9024f8345..c6baf47d5 100644
--- a/include/freerdp/gdi/gdi.h
+++ b/include/freerdp/gdi/gdi.h
@@ -470,8 +470,8 @@ struct _GDI_DC
 	HGDI_RGN clip;
 	HGDI_PEN pen;
 	HGDI_WND hwnd;
-	UINT32 drawMode;
-	UINT32 bkMode;
+	INT32 drawMode;
+	INT32 bkMode;
 };
 typedef struct _GDI_DC GDI_DC;
 typedef GDI_DC* HGDI_DC;
diff --git a/libfreerdp/gdi/drawing.c b/libfreerdp/gdi/drawing.c
index fe642006c..dbbeb7a1c 100644
--- a/libfreerdp/gdi/drawing.c
+++ b/libfreerdp/gdi/drawing.c
@@ -42,7 +42,7 @@
  * @return draw mode
  */
 
-UINT32 gdi_GetROP2(HGDI_DC hdc)
+INT32 gdi_GetROP2(HGDI_DC hdc)
 {
 	return hdc->drawMode;
 }
@@ -55,9 +55,9 @@ UINT32 gdi_GetROP2(HGDI_DC hdc)
  * @return previous draw mode
  */
 
-UINT32 gdi_SetROP2(HGDI_DC hdc, int fnDrawMode)
+INT32 gdi_SetROP2(HGDI_DC hdc, INT32 fnDrawMode)
 {
-	UINT32 prevDrawMode = hdc->drawMode;
+	INT32 prevDrawMode = hdc->drawMode;
 
 	if (fnDrawMode > 0 && fnDrawMode <= 16)
 		hdc->drawMode = fnDrawMode;
@@ -113,11 +113,11 @@ UINT32 gdi_GetBkMode(HGDI_DC hdc)
  */
 
 
-BOOL gdi_SetBkMode(HGDI_DC hdc, int iBkMode)
+INT32 gdi_SetBkMode(HGDI_DC hdc, INT32 iBkMode)
 {
 	if (iBkMode == GDI_OPAQUE || iBkMode == GDI_TRANSPARENT)
 	{
-		int previousBkMode = hdc->bkMode;
+		INT32 previousBkMode = hdc->bkMode;
 		hdc->bkMode = iBkMode;
 		return previousBkMode;
 	}
diff --git a/libfreerdp/gdi/drawing.h b/libfreerdp/gdi/drawing.h
index 94daef965..bc3c1cecb 100644
--- a/libfreerdp/gdi/drawing.h
+++ b/libfreerdp/gdi/drawing.h
@@ -29,12 +29,12 @@
 extern "C" {
 #endif
 
-FREERDP_LOCAL UINT32 gdi_GetROP2(HGDI_DC hdc);
-FREERDP_LOCAL UINT32 gdi_SetROP2(HGDI_DC hdc, int fnDrawMode);
+FREERDP_LOCAL INT32 gdi_GetROP2(HGDI_DC hdc);
+FREERDP_LOCAL INT32 gdi_SetROP2(HGDI_DC hdc, INT32 fnDrawMode);
 FREERDP_LOCAL UINT32 gdi_GetBkColor(HGDI_DC hdc);
 FREERDP_LOCAL UINT32 gdi_SetBkColor(HGDI_DC hdc, UINT32 crColor);
 FREERDP_LOCAL UINT32 gdi_GetBkMode(HGDI_DC hdc);
-FREERDP_LOCAL BOOL gdi_SetBkMode(HGDI_DC hdc, int iBkMode);
+FREERDP_LOCAL INT32 gdi_SetBkMode(HGDI_DC hdc, INT32 iBkMode);
 FREERDP_LOCAL UINT32 gdi_SetTextColor(HGDI_DC hdc, UINT32 crColor);
 
 #ifdef __cplusplus
diff --git a/libfreerdp/gdi/line.c b/libfreerdp/gdi/line.c
index 8564dc4a2..cc022e50c 100644
--- a/libfreerdp/gdi/line.c
+++ b/libfreerdp/gdi/line.c
@@ -135,7 +135,7 @@ BOOL gdi_LineTo(HGDI_DC hdc, UINT32 nXEnd, UINT32 nYEnd)
 	INT32 bx2, by2;
 	HGDI_BITMAP bmp;
 	UINT32 pen;
-	UINT32 rop2 = gdi_GetROP2(hdc);
+	INT32 rop2 = gdi_GetROP2(hdc);
 	x1 = hdc->pen->posX;
 	y1 = hdc->pen->posY;
 	x2 = nXEnd;