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

Fixed signed/unsigned warnings.

Browse Source
This commit is contained in:
Armin Novak 2018-11-19 17:24:06 +01:00
parent 75d532f87c
commit d75c464dbd
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/freerdp/gdi/gdi.h
View File

@ -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;

10
libfreerdp/gdi/drawing.c
View File

@ -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;
}

6
libfreerdp/gdi/drawing.h
View File

@ -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

2
libfreerdp/gdi/line.c
View File

@ -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;