<lf><cr> should be <cr><lf>

6 files changed, 25 insertions, 25 deletions

diff --git a/xrdp/xrdp_cache.c b/xrdp/xrdp_cache.c
index 72e11ed9..06fc978d 100644
--- a/xrdp/xrdp_cache.c
+++ b/xrdp/xrdp_cache.c
@@ -154,7 +154,7 @@ xrdp_cache_add_bitmap(struct xrdp_cache* self, struct xrdp_bitmap* bitmap)
 #endif
       {
         self->bitmap_items[i][j].stamp = self->bitmap_stamp;
-        DEBUG(("found bitmap at %d %d\n\r", i, j));
+        DEBUG(("found bitmap at %d %d\r\n", i, j));
         xrdp_bitmap_delete(bitmap);
         return MAKELONG(j, i);
       }
@@ -172,7 +172,7 @@ xrdp_cache_add_bitmap(struct xrdp_cache* self, struct xrdp_bitmap* bitmap)
 #endif
       {
         self->bitmap_items[i][j].stamp = self->bitmap_stamp;
-        DEBUG(("found bitmap at %d %d\n\r", i, j));
+        DEBUG(("found bitmap at %d %d\r\n", i, j));
         xrdp_bitmap_delete(bitmap);
         return MAKELONG(j, i);
       }
@@ -190,7 +190,7 @@ xrdp_cache_add_bitmap(struct xrdp_cache* self, struct xrdp_bitmap* bitmap)
 #endif
       {
         self->bitmap_items[i][j].stamp = self->bitmap_stamp;
-        DEBUG(("found bitmap at %d %d\n\r", i, j));
+        DEBUG(("found bitmap at %d %d\r\n", i, j));
         xrdp_bitmap_delete(bitmap);
         return MAKELONG(j, i);
       }
@@ -198,7 +198,7 @@ xrdp_cache_add_bitmap(struct xrdp_cache* self, struct xrdp_bitmap* bitmap)
   }
   else
   {
-    g_printf("error in xrdp_cache_add_bitmap, too big(%d)\n\r", bmp_size);
+    g_printf("error in xrdp_cache_add_bitmap, too big(%d)\r\n", bmp_size);
   }
   /* look for oldest */
   cache_id = 0;
@@ -243,7 +243,7 @@ xrdp_cache_add_bitmap(struct xrdp_cache* self, struct xrdp_bitmap* bitmap)
       }
     }
   }
-  DEBUG(("adding bitmap at %d %d\n\r", cache_id, cache_idx));
+  DEBUG(("adding bitmap at %d %d\r\n", cache_id, cache_idx));
   /* set, send bitmap and return */
   xrdp_bitmap_delete(self->bitmap_items[cache_id][cache_idx].bitmap);
   self->bitmap_items[cache_id][cache_idx].bitmap = bitmap;
@@ -336,7 +336,7 @@ xrdp_cache_add_char(struct xrdp_cache* self,
       if (xrdp_font_item_compare(&self->char_items[i][j].font_item, font_item))
       {
         self->char_items[i][j].stamp = self->char_stamp;
-        DEBUG(("found font at %d %d\n\r", i, j));
+        DEBUG(("found font at %d %d\r\n", i, j));
         return MAKELONG(j, i);
       }
     }
@@ -357,7 +357,7 @@ xrdp_cache_add_char(struct xrdp_cache* self,
       }
     }
   }
-  DEBUG(("adding char at %d %d\n\r", f, c));
+  DEBUG(("adding char at %d %d\r\n", f, c));
   /* set, send char and return */
   fi = &self->char_items[f][c].font_item;
   g_free(fi->data);
@@ -404,7 +404,7 @@ xrdp_cache_add_pointer(struct xrdp_cache* self,
       self->pointer_items[i].stamp = self->pointer_stamp;
       xrdp_wm_set_pointer(self->wm, i);
       self->wm->current_pointer = i;
-      DEBUG(("found pointer at %d\n\r", i));
+      DEBUG(("found pointer at %d\r\n", i));
       return i;
     }
   }
@@ -432,7 +432,7 @@ xrdp_cache_add_pointer(struct xrdp_cache* self,
                        self->pointer_items[index].x,
                        self->pointer_items[index].y);
   self->wm->current_pointer = index;
-  DEBUG(("adding pointer at %d\n\r", index));
+  DEBUG(("adding pointer at %d\r\n", index));
   return index;
 }
 
@@ -460,6 +460,6 @@ xrdp_cache_add_pointer_static(struct xrdp_cache* self,
                        self->pointer_items[index].x,
                        self->pointer_items[index].y);
   self->wm->current_pointer = index;
-  DEBUG(("adding pointer at %d\n\r", index));
+  DEBUG(("adding pointer at %d\r\n", index));
   return index;
 }
diff --git a/xrdp/xrdp_interface.c b/xrdp/xrdp_interface.c
index 0d1264b8..ea3f7d20 100644
--- a/xrdp/xrdp_interface.c
+++ b/xrdp/xrdp_interface.c
@@ -187,7 +187,7 @@ server_msg(struct xrdp_mod* mod, char* msg, int code)
   if (code == 1)
   {
     g_printf(msg);
-    g_printf("\n\r");
+    g_printf("\r\n");
     return 0;
   }
   wm = (struct xrdp_wm*)mod->wm;
diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c
index a78b15a4..d767d2be 100644
--- a/xrdp/xrdp_listen.c
+++ b/xrdp/xrdp_listen.c
@@ -116,7 +116,7 @@ xrdp_listen_delete_pro(struct xrdp_listen* self, struct xrdp_process* pro)
   {
     if (self->process_list[i] == pro)
     {
-      DEBUG(("process deleted\n\r"));
+      DEBUG(("process deleted\r\n"));
       xrdp_process_delete(pro);
       self->process_list[i] = 0;
       return 0;
@@ -130,9 +130,9 @@ xrdp_listen_delete_pro(struct xrdp_listen* self, struct xrdp_process* pro)
 THREAD_RV THREAD_CC
 xrdp_process_run(void* in_val)
 {
-  DEBUG(("process started\n\r"));
+  DEBUG(("process started\r\n"));
   xrdp_process_main_loop(g_process);
-  DEBUG(("process done\n\r"));
+  DEBUG(("process done\r\n"));
   return 0;
 }
 
@@ -149,12 +149,12 @@ xrdp_listen_main_loop(struct xrdp_listen* self)
   error = g_tcp_bind(self->sck, "3389");
   if (error != 0)
   {
-    g_printf("listening on 3390\n\r");
+    g_printf("listening on 3390\r\n");
     error = g_tcp_bind(self->sck, "3390");
   }
   if (error != 0)
   {
-    g_printf("bind error in xrdp_listen_main_loop\n\r");
+    g_printf("bind error in xrdp_listen_main_loop\r\n");
     g_tcp_close(self->sck);
     self->status = -1;
     return 1;
@@ -193,7 +193,7 @@ xrdp_listen_main_loop(struct xrdp_listen* self)
   }
   else
   {
-    DEBUG(("listen error in xrdp_listen_main_loop\n\r"));
+    DEBUG(("listen error in xrdp_listen_main_loop\r\n"));
   }
   xrdp_listen_term_processes(self);
   g_tcp_close(self->sck);
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
index 3a345edb..18e6eec1 100644
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@@ -128,7 +128,7 @@ xrdp_wm_setup_mod1(struct xrdp_wm* self,
       }
       if (func == 0)
       {
-        g_printf("error finding proc mod_init in %s\n\r", mod_data->lib);
+        g_printf("error finding proc mod_init in %s\r\n", mod_data->lib);
       }
       self->mod_init = (struct xrdp_mod* (*)(void))func;
       func = g_get_proc_address(self->mod_handle, "mod_exit");
@@ -138,7 +138,7 @@ xrdp_wm_setup_mod1(struct xrdp_wm* self,
       }
       if (func == 0)
       {
-        g_printf("error finding proc mod_exit in %s\n\r", mod_data->lib);
+        g_printf("error finding proc mod_exit in %s\r\n", mod_data->lib);
       }
       self->mod_exit = (int (*)(struct xrdp_mod*))func;
       if (self->mod_init != 0 && self->mod_exit != 0)
@@ -148,7 +148,7 @@ xrdp_wm_setup_mod1(struct xrdp_wm* self,
     }
     else
     {
-      g_printf("error loading %s\n\r", mod_data->lib);
+      g_printf("error loading %s\r\n", mod_data->lib);
     }
     if (self->mod != 0)
     {
@@ -179,7 +179,7 @@ xrdp_wm_setup_mod1(struct xrdp_wm* self,
   /* id self->mod is null, there must be a problem */
   if (self->mod == 0)
   {
-    DEBUG(("problem loading lib in xrdp_wm_setup_mod1\n\r"));
+    DEBUG(("problem loading lib in xrdp_wm_setup_mod1\r\n"));
     return 1;
   }
   return 0;
diff --git a/xrdp/xrdp_region.c b/xrdp/xrdp_region.c
index 2f5ade6c..23f40ab3 100644
--- a/xrdp/xrdp_region.c
+++ b/xrdp/xrdp_region.c
@@ -275,7 +275,7 @@ xrdp_region_subtract_rect(struct xrdp_region* self,
     }
     else
     {
-      g_printf("error in xrdp_region_subtract_rect\n\r");
+      g_printf("error in xrdp_region_subtract_rect\r\n");
     }
   }
   return 0;
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 39807fa2..a107813b 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -342,11 +342,11 @@ xrdp_wm_load_static_pointers(struct xrdp_wm* self)
 {
   struct xrdp_pointer_item pointer_item;
 
-  DEBUG(("sending cursor\n\r"));
+  DEBUG(("sending cursor\r\n"));
   xrdp_wm_load_pointer(self, "cursor1.cur", pointer_item.data,
                        pointer_item.mask, &pointer_item.x, &pointer_item.y);
   xrdp_cache_add_pointer_static(self->cache, &pointer_item, 1);
-  DEBUG(("sending cursor\n\r"));
+  DEBUG(("sending cursor\r\n"));
   xrdp_wm_load_pointer(self, "cursor0.cur", pointer_item.data,
                        pointer_item.mask, &pointer_item.x, &pointer_item.y);
   xrdp_cache_add_pointer_static(self->cache, &pointer_item, 0);
@@ -1175,7 +1175,7 @@ static int APP_CC
 xrdp_wm_process_input_mouse(struct xrdp_wm* self, int device_flags,
                             int x, int y)
 {
-  DEBUG(("mouse event flags %4.4x x %d y %d\n\r", device_flags, x, y));
+  DEBUG(("mouse event flags %4.4x x %d y %d\r\n", device_flags, x, y));
   if (device_flags & MOUSE_FLAG_MOVE) /* 0x0800 */
   {
     xrdp_wm_mouse_move(self->pro_layer->wm, x, y);