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

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

Browse Source
This commit is contained in:
Laxmikant Rashinkar 2013-05-21 12:57:20 -07:00
commit 551cf6a7fe
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libxrdp/libxrdp.c
View File

@ -428,17 +428,20 @@ libxrdp_send_pointer(struct xrdp_session *session, int cache_idx,
int data_bytes; int data_bytes;
DEBUG(("libxrdp_send_pointer sending cursor")); DEBUG(("libxrdp_send_pointer sending cursor"));
if (bpp == 0)
{
bpp = 24;
}
/* error check */ /* error check */
if ((session->client_info->pointer_flags & 1) == 0) if ((session->client_info->pointer_flags & 1) == 0)
{ {
if (bpp != 0) if (bpp != 24)
{ {
g_writeln("libxrdp_send_pointer: error"); g_writeln("libxrdp_send_pointer: error");
return 1; return 1;
} }
} }
if ((bpp != 0) && (bpp == 15) && (bpp != 16) && if ((bpp == 15) && (bpp != 16) && (bpp != 24) && (bpp != 32))
(bpp != 24) && (bpp != 32))
{ {
g_writeln("libxrdp_send_pointer: error"); g_writeln("libxrdp_send_pointer: error");
return 1; return 1;
@ -446,7 +449,7 @@ libxrdp_send_pointer(struct xrdp_session *session, int cache_idx,
make_stream(s); make_stream(s);
init_stream(s, 8192); init_stream(s, 8192);
xrdp_rdp_init_data((struct xrdp_rdp *)session->rdp, s); xrdp_rdp_init_data((struct xrdp_rdp *)session->rdp, s);
if (bpp == 0) if ((session->client_info->pointer_flags & 1) == 0)
{ {
out_uint16_le(s, RDP_POINTER_COLOR); out_uint16_le(s, RDP_POINTER_COLOR);
out_uint16_le(s, 0); /* pad */ out_uint16_le(s, 0); /* pad */
@ -481,7 +484,6 @@ libxrdp_send_pointer(struct xrdp_session *session, int cache_idx,
} }
} }
break; break;
case 0:
case 24: case 24:
p = data; p = data;
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)

3
xorg/X11R7.6/rdp/rdpdraw.c
View File

@ -739,7 +739,8 @@ xrdp_is_os(PixmapPtr pix, rdpPixmapPtr priv)
{ {
width = pix->drawable.width; width = pix->drawable.width;
height = pix->drawable.height; height = pix->drawable.height;
if ((pix->drawable.depth >= g_rdpScreen.depth) && if ((pix->usage_hint == 0) &&
(pix->drawable.depth >= g_rdpScreen.depth) &&
(width > 1) && (height > 1) && (priv->kind_width > 0)) (width > 1) && (height > 1) && (priv->kind_width > 0))
{ {
LLOGLN(10, ("%d %d", priv->kind_width, pix->drawable.width)); LLOGLN(10, ("%d %d", priv->kind_width, pix->drawable.width));