Fixed signedness casts.

diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c
index 759468c..80a9faf 100644 (file)
--- a/libfreerdp/core/gcc.c
+++ b/libfreerdp/core/gcc.c
@@ -1671,7 +1671,7 @@ BOOL gcc_read_client_cluster_data(wStream* s, rdpMcs* mcs, UINT16 blockLength)
 
        if (blockLength != 8)
        {
-               if (Stream_GetRemainingLength(s) >= (blockLength - 8))
+               if (Stream_GetRemainingLength(s) >= (size_t)(blockLength - 8))
                {
                        /* The old Microsoft Mac RDP client can send a pad here */
                        Stream_Seek(s, (blockLength - 8));
@@ -1740,7 +1740,7 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs, UINT16 blockLength)
                monitorCount = settings->MonitorDefArraySize;
        }
 
-       if (((blockLength - 8)  / 20) < monitorCount)
+       if ((UINT32)((blockLength - 8)  / 20) < monitorCount)
                return FALSE;
 
        settings->MonitorCount = monitorCount;

diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c
index 9e3a19c..287f96d 100644 (file)
--- a/libfreerdp/locale/keyboard_xkbfile.c
+++ b/libfreerdp/locale/keyboard_xkbfile.c
@@ -419,7 +419,7 @@ int detect_keyboard_layout_from_xkbfile(void* display, DWORD* keyboardLayoutId)
 
 int freerdp_keyboard_load_map_from_xkbfile(void* display, DWORD x11_keycode_to_rdp_scancode[256])
 {
-       int i, j;
+       size_t i, j;
        BOOL found;
        XkbDescPtr xkb;
        BOOL status = FALSE;