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

sync client_info struct with A8

Browse Source
This commit is contained in:
Jay Sorg 2013-03-26 12:40:22 -07:00
parent cab868a3a9
commit b107414b54
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/xrdp_client_info.h
View File

@ -86,6 +86,9 @@ struct xrdp_client_info
int jpeg_prop_len; int jpeg_prop_len;
char jpeg_prop[64]; char jpeg_prop[64];
int v3_codec_id; int v3_codec_id;
int rfx_min_pixel;
char orders[32];
int order_flags_ex;
int use_bulk_comp; int use_bulk_comp;
int pointer_flags; /* 0 color, 1 new */ int pointer_flags; /* 0 color, 1 new */
}; };

9
libxrdp/xrdp_rdp.c
View File

@ -829,6 +829,7 @@ xrdp_process_capset_order(struct xrdp_rdp *self, struct stream *s,
int i; int i;
char order_caps[32]; char order_caps[32];
int ex_flags; int ex_flags;
int cap_flags;
DEBUG(("order capabilities")); DEBUG(("order capabilities"));
in_uint8s(s, 20); /* Terminal desc, pad */ in_uint8s(s, 20); /* Terminal desc, pad */
@ -837,8 +838,9 @@ xrdp_process_capset_order(struct xrdp_rdp *self, struct stream *s,
in_uint8s(s, 2); /* Pad */ in_uint8s(s, 2); /* Pad */
in_uint8s(s, 2); /* Max order level */ in_uint8s(s, 2); /* Max order level */
in_uint8s(s, 2); /* Number of fonts */ in_uint8s(s, 2); /* Number of fonts */
in_uint8s(s, 2); /* Capability flags */ in_uint16_le(s, cap_flags); /* Capability flags */
in_uint8a(s, order_caps, 32); /* Orders supported */ in_uint8a(s, order_caps, 32); /* Orders supported */
g_memcpy(self->client_info.orders, order_caps, 32);
DEBUG(("dest blt-0 %d", order_caps[0])); DEBUG(("dest blt-0 %d", order_caps[0]));
DEBUG(("pat blt-1 %d", order_caps[1])); DEBUG(("pat blt-1 %d", order_caps[1]));
DEBUG(("screen blt-2 %d", order_caps[2])); DEBUG(("screen blt-2 %d", order_caps[2]));
@ -862,12 +864,15 @@ xrdp_process_capset_order(struct xrdp_rdp *self, struct stream *s,
/* read extended order support flags */ /* read extended order support flags */
in_uint16_le(s, ex_flags); /* Ex flags */ in_uint16_le(s, ex_flags); /* Ex flags */
if (cap_flags & 0x80) /* ORDER_FLAGS_EXTRA_SUPPORT */
{
self->client_info.order_flags_ex = ex_flags;
if (ex_flags & XR_ORDERFLAGS_EX_CACHE_BITMAP_REV3_SUPPORT) if (ex_flags & XR_ORDERFLAGS_EX_CACHE_BITMAP_REV3_SUPPORT)
{ {
g_writeln("xrdp_process_capset_order: bitmap cache v3 supported"); g_writeln("xrdp_process_capset_order: bitmap cache v3 supported");
self->client_info.bitmap_cache_version |= 4; self->client_info.bitmap_cache_version |= 4;
} }
}
in_uint8s(s, 4); /* Pad */ in_uint8s(s, 4); /* Pad */
in_uint32_le(s, i); /* desktop cache size, usually 0x38400 */ in_uint32_le(s, i); /* desktop cache size, usually 0x38400 */