Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
	libfreerdp/gdi/gdi.c

diff --cc libfreerdp/gdi/gdi.c
index d960f94,22f5351..83ba654
--- 1/libfreerdp/gdi/gdi.c
--- 2/libfreerdp/gdi/gdi.c
+++ b/libfreerdp/gdi/gdi.c
@@@ -889,38 -889,40 +889,39 @@@ static void gdi_mem3blt(rdpContext* con
        gdi_SetTextColor(gdi->drawing->hdc, originalColor);
  }
  
- void gdi_polygon_sc(rdpContext* context, POLYGON_SC_ORDER* polygon_sc)
+ static void gdi_polygon_sc(rdpContext* context, POLYGON_SC_ORDER* polygon_sc)
  {
-       WLog_ERR(TAG,  "PolygonSC");
+       WLog_VRB(TAG,  "not implemented");
  }
  
- void gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb)
+ static void gdi_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb)
  {
-       WLog_ERR(TAG,  "PolygonCB");
+       WLog_VRB(TAG,  "not implemented");
  }
  
- void gdi_ellipse_sc(rdpContext* context, ELLIPSE_SC_ORDER* ellipse_sc)
+ static void gdi_ellipse_sc(rdpContext* context, ELLIPSE_SC_ORDER* ellipse_sc)
  {
-       WLog_ERR(TAG,  "EllipseSC");
+       WLog_VRB(TAG,  "not implemented");
  }
  
- void gdi_ellipse_cb(rdpContext* context, ELLIPSE_CB_ORDER* ellipse_cb)
+ static void gdi_ellipse_cb(rdpContext* context, ELLIPSE_CB_ORDER* ellipse_cb)
  {
-       WLog_ERR(TAG,  "EllipseCB");
+       WLog_VRB(TAG,  "not implemented");
  }
  
- void gdi_frame_marker(rdpContext* context, FRAME_MARKER_ORDER* frameMarker)
+ static void gdi_frame_marker(rdpContext* context, FRAME_MARKER_ORDER* frameMarker)
  {
 -              WLog_VRB(TAG,  "not implemented");
 +
++
  }
  
 -static void gdi_surface_frame_marker(rdpContext* context, SURFACE_FRAME_MARKER* surface_frame_marker)
 +void gdi_surface_frame_marker(rdpContext* context, SURFACE_FRAME_MARKER* surfaceFrameMarker)
  {
        DEBUG_GDI("frameId %d frameAction %d",
 -              surface_frame_marker->frameId,
 -              surface_frame_marker->frameAction);
 -
 -      /* TODO: Implement frame marker completely */
 +              surfaceFrameMarker->frameId,
 +              surfaceFrameMarker->frameAction);
  
 -      switch (surface_frame_marker->frameAction)
 +      switch (surfaceFrameMarker->frameAction)
        {
                case SURFACECMD_FRAMEACTION_BEGIN:
                        break;