some ints should be long

xrdp/xrdp_bitmap.c

@@ -188,7 +188,7 @@ void xrdp_bitmap_delete(struct xrdp_bitmap* self)
   }
   if (self->parent != 0)
   {
-    i = xrdp_list_index_of(self->parent->child_list, (int)self);
+    i = xrdp_list_index_of(self->parent->child_list, (long)self);
     if (i >= 0)
     {
       xrdp_list_remove_item(self->parent->child_list, i);
@@ -1103,7 +1103,7 @@ int xrdp_bitmap_invalidate(struct xrdp_bitmap* self, struct xrdp_rect* rect)
   }
   /* notify */
   if (self->notify != 0)
-    self->notify(self, self, WM_PAINT, (int)painter, 0); /* 3 */
+    self->notify(self, self, WM_PAINT, (long)painter, 0); /* 3 */
   /* draw any child windows in the area */
   for (i = 0; i < self->child_list->count; i++)
   {
@@ -1154,7 +1154,7 @@ int xrdp_bitmap_def_proc(struct xrdp_bitmap* self, int msg,
         shift = self->wm->keys[42] || self->wm->keys[54];
         i = -1;
         if (self->child_list != 0)
-          i = xrdp_list_index_of(self->child_list, (int)self->focused_control);
+          i = xrdp_list_index_of(self->child_list, (long)self->focused_control);
         if (shift)
         {
           i--;

xrdp/xrdp_file.c

@@ -51,7 +51,7 @@ int xrdp_file_read_sections(int fd, struct xrdp_list* names)
         in_it = 1;
       else if (c == ']')
       {
-        xrdp_list_add_item(names, (int)g_strdup(text));
+        xrdp_list_add_item(names, (long)g_strdup(text));
         in_it = 0;
         in_it_index = 0;
         g_memset(text, 0, 256);
@@ -179,8 +179,8 @@ int xrdp_file_read_section(int fd, char* section, struct xrdp_list* names,
           while (xrdp_file_read_line(s, text) == 0)
           {
             xrdp_file_split_name_value(text, name, value);
-            xrdp_list_add_item(names, (int)g_strdup(name));
-            xrdp_list_add_item(values, (int)g_strdup(value));
+            xrdp_list_add_item(names, (long)g_strdup(name));
+            xrdp_list_add_item(values, (long)g_strdup(value));
           }
           free_stream(s);
           return 0;

xrdp/xrdp_interface.c

@@ -219,7 +219,7 @@ int server_palette(int* palette)
 /* this is the log windows nofity function */
 int xrdp_wm_log_wnd_notify(struct xrdp_bitmap* wnd,
                            struct xrdp_bitmap* sender,
-                           int msg, int param1, int param2)
+                           int msg, long param1, long param2)
 {
   struct xrdp_painter* painter;
   struct xrdp_wm* wm;

xrdp/xrdp_login_wnd.c

@@ -26,7 +26,7 @@
 /* all login help screen events go here */
 int xrdp_wm_login_help_notify(struct xrdp_bitmap* wnd,
                               struct xrdp_bitmap* sender,
-                              int msg, int param1, int param2)
+                              int msg, long param1, long param2)
 {
   struct xrdp_painter* p;
 
@@ -142,7 +142,7 @@ int xrdp_wm_delete_all_childs(struct xrdp_wm* self)
 /* all login screen events go here */
 int xrdp_wm_login_notify(struct xrdp_bitmap* wnd,
                          struct xrdp_bitmap* sender,
-                         int msg, int param1, int param2)
+                         int msg, long param1, long param2)
 {
   struct xrdp_bitmap* help;
   struct xrdp_bitmap* but;

xrdp/xrdp_region.c

@@ -51,7 +51,7 @@ int xrdp_region_add_rect(struct xrdp_region* self, struct xrdp_rect* rect)
 
   r = (struct xrdp_rect*)g_malloc(sizeof(struct xrdp_rect), 1);
   *r = *rect;
-  xrdp_list_add_item(self->rects, (int)r);
+  xrdp_list_add_item(self->rects, (long)r);
   return 0;
 }
 
@@ -66,7 +66,7 @@ int xrdp_region_insert_rect(struct xrdp_region* self, int i, int left,
   r->top = top;
   r->right = right;
   r->bottom = bottom;
-  xrdp_list_insert_item(self->rects, i, (int)r);
+  xrdp_list_insert_item(self->rects, i, (long)r);
   return 0;
 }
 

xrdp/xrdp_types.h

@@ -468,7 +468,7 @@ struct xrdp_bitmap
   /* msg 1 = click 2 = mouse move 3 = paint 100 = modal result */
   /* see messages in constants.h */
   int (*notify)(struct xrdp_bitmap* wnd, struct xrdp_bitmap* sender,
-                int msg, int param1, int param2);
+                int msg, long param1, long param2);
   /* for bitmap */
   int bpp;
   int line_size; /* in bytes */