mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

part of merge, composite, out_uint8s fixes

Browse Source
This commit is contained in:
Jay Sorg 2013-07-12 12:21:20 -07:00 committed by Jim Grandy
parent cbb661d6fd
commit 8055745ceb
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xorg/X11R7.6/rdp/rdp.h
View File

@ -455,10 +455,7 @@ rdpRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor,
Bool displayed);
/* rdpglyph.c */
void
rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
int nlists, GlyphListPtr lists, GlyphPtr* glyphs);
/* look in rdpglyph.h */
/* rdpComposite.c */
int
@ -469,11 +466,6 @@ void
rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst,
INT16 yDst, CARD16 width, CARD16 height);
void
rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
PictFormatPtr maskFormat,
INT16 xSrc, INT16 ySrc, int nlists, GlyphListPtr lists,
GlyphPtr* glyphs);
/* rdpinput.c */
int
@ -669,6 +661,13 @@ struct stream
}
#endif
/******************************************************************************/
#define out_uint8(s, v) \
{ \
*((s)->p) = (unsigned char)((v) >> 0); \
(s)->p++; \
}
/******************************************************************************/
#define init_stream(s, v) \
{ \

5
xorg/X11R7.6/rdp/rdpglyph.c
View File

@ -819,7 +819,8 @@ rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
{
PictureScreenPtr ps;
LLOGLN(0, ("rdpGlyphs: op %d xSrc %d ySrc %d maskFormat %p", op, xSrc, ySrc, maskFormat));
LLOGLN(10, ("rdpGlyphs: op %d xSrc %d ySrc %d maskFormat %p",
op, xSrc, ySrc, maskFormat));
if (g_do_glyph_cache && rdpGlyphCheck(nlists, lists, glyphs))
{
@ -843,7 +844,7 @@ rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
rdpup_set_hints(0, 1);
}
g_doing_font = 0;
LLOGLN(0, ("rdpGlyphs: out"));
LLOGLN(10, ("rdpGlyphs: out"));
}
/******************************************************************************/

17
xorg/X11R7.6/rdp/rdpup.c
View File

@ -132,6 +132,7 @@ rdpup_disconnect(void)
{
int index;
LLOGLN(0, ("rdpup_disconnect:"));
RemoveEnabledDevice(g_sck);
g_connected = 0;
g_tcp_close(g_sck);
@ -293,12 +294,14 @@ rdpup_send(char *data, int len)
}
else
{
LLOGLN(0, ("rdpup_send: g_tcp_send failed(returned -1)"));
rdpup_disconnect();
return 1;
}
}
else if (sent == 0)
{
LLOGLN(0, ("rdpup_send: g_tcp_send failed(returned zero)"));
rdpup_disconnect();
return 1;
}
@ -425,12 +428,14 @@ rdpup_recv(char *data, int len)
}
else
{
LLOGLN(0, ("rdpup_recv: g_tcp_recv failed(returned -1)"));
rdpup_disconnect();
return 1;
}
}
else if (rcvd == 0)
{
LLOGLN(0, ("rdpup_recv: g_tcp_recv failed(returned 0)"));
rdpup_disconnect();
return 1;
}
@ -1508,7 +1513,7 @@ rdpup_create_os_surface_bpp(int rdpindex, int width, int height, int bpp)
out_uint32_le(g_out_s, rdpindex);
out_uint16_le(g_out_s, width);
out_uint16_le(g_out_s, height);
out_uint8s(g_out_s, bpp);
out_uint8(g_out_s, bpp);
}
return 0;
}
@ -1858,7 +1863,7 @@ rdpup_send_alpha_area(struct image_data* id, int x, int y, int w, int h)
out_uint16_le(g_out_s, lh);
out_uint16_le(g_out_s, 0);
out_uint16_le(g_out_s, 0);
out_uint8s(g_out_s, 8);
out_uint8(g_out_s, 8);
lx += 64;
}
ly += 64;
@ -2466,7 +2471,7 @@ rdpup_composite(short srcidx, int srcformat, short srcwidth, CARD8 srcrepeat,
out_uint16_le(g_out_s, srcidx);
out_uint32_le(g_out_s, srcformat);
out_uint16_le(g_out_s, srcwidth);
out_uint8s(g_out_s, srcrepeat);
out_uint8(g_out_s, srcrepeat);
if (srctransform == 0)
{
out_uint8s(g_out_s, 10 * 4);
@ -2484,12 +2489,12 @@ rdpup_composite(short srcidx, int srcformat, short srcwidth, CARD8 srcrepeat,
out_uint32_le(g_out_s, srctransform->matrix[2][1]);
out_uint32_le(g_out_s, srctransform->matrix[2][2]);
}
out_uint8s(g_out_s, mskflags);
out_uint8(g_out_s, mskflags);
out_uint16_le(g_out_s, mskidx);
out_uint32_le(g_out_s, mskformat);
out_uint16_le(g_out_s, mskwidth);
out_uint8s(g_out_s, mskrepeat);
out_uint8s(g_out_s, op);
out_uint8(g_out_s, mskrepeat);
out_uint8(g_out_s, op);
out_uint16_le(g_out_s, srcx);
out_uint16_le(g_out_s, srcy);
out_uint16_le(g_out_s, mskx);