From 769e006dfe6e365b1fc82cd57915dc0f841fbec4 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Mon, 7 May 2012 11:21:47 -0700
Subject: [PATCH] freerdp1: fixes from ArvidNorr

---
 freerdp1/xrdp-color.c   | 8 ++++++++
 freerdp1/xrdp-freerdp.c | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/freerdp1/xrdp-color.c b/freerdp1/xrdp-color.c
index 0ff2e39d..ef74d1c5 100644
--- a/freerdp1/xrdp-color.c
+++ b/freerdp1/xrdp-color.c
@@ -131,6 +131,10 @@ convert_bitmap(int in_bpp, int out_bpp, char* bmpdata,
     }
     return out;
   }
+  if ((in_bpp == 15) && (out_bpp == 15))
+  {
+    return bmpdata;
+  }
   if ((in_bpp == 16) && (out_bpp == 16))
   {
     return bmpdata;
@@ -239,6 +243,10 @@ convert_color(int in_bpp, int out_bpp, int in_color, int* palette)
     pixel = COLOR24BGR(red, green, blue);
     return pixel;
   }
+  if ((in_bpp == 15) && (out_bpp == 15))
+  {
+    return in_color;
+  }
   if ((in_bpp == 16) && (out_bpp == 16))
   {
     return in_color;
diff --git a/freerdp1/xrdp-freerdp.c b/freerdp1/xrdp-freerdp.c
index 69bc0ca0..2377f217 100644
--- a/freerdp1/xrdp-freerdp.c
+++ b/freerdp1/xrdp-freerdp.c
@@ -152,6 +152,10 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
     case 16: /* key up */
       mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3);
       break;
+    case 17: /*Synchronize*/
+      LLOGLN(0, ("Synchronized event handled"));
+      mod->inst->input->SynchronizeEvent(mod->inst->input, 0);
+      break;
     case 100: /* mouse move */
       LLOGLN(10, ("mouse move %d %d", param1, param2));
       x = param1;
@@ -255,6 +259,9 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
           break;
       }
       break;
+    default:
+      LLOGLN(0, ("Unhandled message type in eventhandler %d", msg));
+      break;
   }
   return 0;
 }