diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-03-26 12:40:22 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-03-26 12:40:22 -0700 |
| commit | b107414b5481fd56ada2b52560626c63d1cb450c (patch) | |
| tree | 8cc69216a5e0137551dbed3f0d7c0424e326f165 | |
| parent | cab868a3a994bff903c5aac96afda648a370f6f1 (diff) | |
| download | xrdp-proprietary-b107414b5481fd56ada2b52560626c63d1cb450c.tar.gz xrdp-proprietary-b107414b5481fd56ada2b52560626c63d1cb450c.zip | |
sync client_info struct with A8
| -rw-r--r-- | common/xrdp_client_info.h | 3 | ||||
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h index 61daea7a..591d49d7 100644 --- a/common/xrdp_client_info.h +++ b/common/xrdp_client_info.h @@ -86,6 +86,9 @@ struct xrdp_client_info int jpeg_prop_len; char jpeg_prop[64]; int v3_codec_id; + int rfx_min_pixel; + char orders[32]; + int order_flags_ex; int use_bulk_comp; int pointer_flags; /* 0 color, 1 new */ }; diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index 9f238378..642da9b0 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -829,6 +829,7 @@ xrdp_process_capset_order(struct xrdp_rdp *self, struct stream *s, int i; char order_caps[32]; int ex_flags; + int cap_flags; DEBUG(("order capabilities")); 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); /* Max order level */ 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 */ + g_memcpy(self->client_info.orders, order_caps, 32); DEBUG(("dest blt-0 %d", order_caps[0])); DEBUG(("pat blt-1 %d", order_caps[1])); 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 */ in_uint16_le(s, ex_flags); /* Ex flags */ - if (ex_flags & XR_ORDERFLAGS_EX_CACHE_BITMAP_REV3_SUPPORT) + if (cap_flags & 0x80) /* ORDER_FLAGS_EXTRA_SUPPORT */ { - g_writeln("xrdp_process_capset_order: bitmap cache v3 supported"); - self->client_info.bitmap_cache_version |= 4; + self->client_info.order_flags_ex = ex_flags; + if (ex_flags & XR_ORDERFLAGS_EX_CACHE_BITMAP_REV3_SUPPORT) + { + g_writeln("xrdp_process_capset_order: bitmap cache v3 supported"); + self->client_info.bitmap_cache_version |= 4; + } } - in_uint8s(s, 4); /* Pad */ in_uint32_le(s, i); /* desktop cache size, usually 0x38400 */ |