Fixed warnings.

diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c
index 2d9e143..aa6ac8f 100644 (file)
--- a/client/X11/xf_gdi.c
+++ b/client/X11/xf_gdi.c
@@ -361,7 +361,9 @@ BOOL xf_gdi_bitmap_update(rdpContext* context,
 
                        if (bitsPerPixel < 32)
                        {
-                               if (!freerdp_client_codecs_prepare(codecs, FREERDP_CODEC_INTERLEAVED))
+                               if (!freerdp_client_codecs_prepare(codecs, FREERDP_CODEC_INTERLEAVED,
+                                                                  xfc->settings->DesktopWidth,
+                                                                  xfc->settings->DesktopHeight))
                                        return FALSE;
 
                                status = interleaved_decompress(codecs->interleaved,
@@ -375,7 +377,9 @@ BOOL xf_gdi_bitmap_update(rdpContext* context,
                        }
                        else
                        {
-                               if (!freerdp_client_codecs_prepare(codecs, FREERDP_CODEC_PLANAR))
+                               if (!freerdp_client_codecs_prepare(codecs, FREERDP_CODEC_PLANAR,
+                                                                  xfc->settings->DesktopWidth,
+                                                                  xfc->settings->DesktopHeight))
                                        return FALSE;
 
                                status = planar_decompress(codecs->planar, pSrcData, SrcSize, pDstData,
@@ -489,7 +493,7 @@ static BOOL xf_gdi_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt)
        return ret;
 }
 
-static BOOL xf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
+static BOOL xf_gdi_patblt(rdpContext* context, const PATBLT_ORDER* patblt)
 {
        Pixmap pattern;
        const rdpBrush* brush;
@@ -1114,7 +1118,6 @@ static BOOL xf_gdi_surface_update_frame(xfContext* xfc, UINT16 tx, UINT16 ty,
 static BOOL xf_gdi_surface_bits(rdpContext* context,
                                                                const SURFACE_BITS_COMMAND* cmd)
 {
-       int i, tx, ty;
        XImage* image;
        BYTE* pSrcData;
        BYTE* pDstData;
@@ -1126,7 +1129,9 @@ static BOOL xf_gdi_surface_bits(rdpContext* context,
 
        if (cmd->codecID == RDP_CODEC_ID_REMOTEFX)
        {
-               if (!freerdp_client_codecs_prepare(xfc->codecs, FREERDP_CODEC_REMOTEFX))
+               if (!freerdp_client_codecs_prepare(xfc->codecs, FREERDP_CODEC_REMOTEFX,
+                                                  xfc->settings->DesktopWidth,
+                                                  xfc->settings->DesktopHeight))
                {
                        xf_unlock_x11(xfc, FALSE);
                        return FALSE;
@@ -1143,31 +1148,28 @@ static BOOL xf_gdi_surface_bits(rdpContext* context,
                        return FALSE;
                }
 
+               XRectangle rect;
+               rect.x = cmd->destLeft;
+               rect.y = cmd->destTop;
+               rect.width = cmd->width;
+               rect.height = cmd->height;
                XSetFunction(xfc->display, xfc->gc, GXcopy);
                XSetFillStyle(xfc->display, xfc->gc, FillSolid);
                XSetClipRectangles(xfc->display, xfc->gc, cmd->destLeft, cmd->destTop,
-                                                  (XRectangle*) message->rects, message->numRects, YXBanded);
+                                                  &rect, 1, YXBanded);
 
                /* Invalidate the updated region */
-               for (i = 0; i < message->numRects; i++)
-               {
-                       tx = message->rects[i].x + cmd->destLeft;
-                       ty = message->rects[i].y + cmd->destTop;
-
-                       if (!xf_gdi_surface_update_frame(xfc, tx, ty, message->rects[i].width,
-                                                                                        message->rects[i].height))
-                       {
-                               ret = FALSE;
-                               break;
-                       }
-               }
+               if (!xf_gdi_surface_update_frame(xfc, rect.x, rect.y,
+                                                rect.width, rect.height))
+                       ret = FALSE;
 
                XSetClipMask(xfc->display, xfc->gc, None);
-               rfx_message_free(xfc->codecs->rfx, message);
        }
        else if (cmd->codecID == RDP_CODEC_ID_NSCODEC)
        {
-               if (!freerdp_client_codecs_prepare(xfc->codecs, FREERDP_CODEC_NSCODEC))
+               if (!freerdp_client_codecs_prepare(xfc->codecs, FREERDP_CODEC_NSCODEC,
+                                                  xfc->settings->DesktopWidth,
+                                                  xfc->settings->DesktopHeight))
                {
                        xf_unlock_x11(xfc, FALSE);
                        return FALSE;

diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c
index a5f3741..521d2ff 100644 (file)
--- a/libfreerdp/cache/brush.c
+++ b/libfreerdp/cache/brush.c
@@ -35,7 +35,7 @@
 #define TAG FREERDP_TAG("cache.brush")
 
 static BOOL update_gdi_patblt(rdpContext* context,
-                                 PATBLT_ORDER* patblt)
+                                 const PATBLT_ORDER* patblt)
 {
        BYTE style;
        BOOL ret = TRUE;

diff --git a/libfreerdp/core/codecs.c b/libfreerdp/core/codecs.c
index 629c123..37a6509 100644 (file)
--- a/libfreerdp/core/codecs.c
+++ b/libfreerdp/core/codecs.c
@@ -53,7 +53,7 @@ BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width
                        return FALSE;
                }
 
-               if (!freerdp_bitmap_planar_context_reset(codecs->planar))
+               if (!freerdp_bitmap_planar_context_reset(codecs->planar, 64, 64))
                {
                        WLog_ERR(TAG, "Failed to reset plannar bitmap codec context");
                        freerdp_bitmap_planar_context_free(codecs->planar);

diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c
index 40c6993..b00c9b5 100644 (file)
--- a/libfreerdp/gdi/gdi.c
+++ b/libfreerdp/gdi/gdi.c
@@ -574,7 +574,7 @@ static BOOL gdi_dstblt(rdpContext* context, const DSTBLT_ORDER* dstblt)
                          gdi_rop3_code(dstblt->bRop), &gdi->palette);
 }
 
-static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
+static BOOL gdi_patblt(rdpContext* context, const PATBLT_ORDER* patblt)
 {
        BYTE* data;
        const rdpBrush* brush = &patblt->brush;
@@ -585,6 +585,9 @@ static BOOL gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
        rdpGdi* gdi = context->gdi;
        BOOL ret = TRUE;
        UINT32 SrcFormat = gdi_get_pixel_format(patblt->brush.bpp, FALSE);
+       DWORD rop = gdi_rop3_code(patblt->bRop);
+       UINT32 nXSrc = 0;
+       UINT32 nYSrc = 0;
        foreColor = ConvertColor(patblt->foreColor, SrcFormat,
                                 gdi->dstFormat, &gdi->palette);
        backColor = ConvertColor(patblt->backColor, SrcFormat,