From d6a470e9730f56d582243b9585cc51a630467d8d Mon Sep 17 00:00:00 2001 From: speidy Date: Tue, 13 Dec 2016 14:31:27 -0500 Subject: [PATCH] libxrdp: improve messages --- libxrdp/libxrdp.c | 2 +- libxrdp/xrdp_caps.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index a9375ba6..2d59621a 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -1333,7 +1333,7 @@ libxrdp_fastpath_send_surface(struct xrdp_session *session, s->end = data_pad + pad_bytes + data_bytes; s->p = s->data + (rdp_bytes + sec_bytes); /* TS_SURFCMD_STREAM_SURF_BITS */ - out_uint16_le(s, 0x0006); /* CMDTYPE_STREAM_SURFACE_BITS */ + out_uint16_le(s, CMDTYPE_STREAM_SURFACE_BITS); out_uint16_le(s, destLeft); out_uint16_le(s, destTop); out_uint16_le(s, destRight); diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c index 9d3352f2..4db1da5e 100644 --- a/libxrdp/xrdp_caps.c +++ b/libxrdp/xrdp_caps.c @@ -457,7 +457,7 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) if (g_memcmp(codec_guid, XR_CODEC_GUID_NSCODEC, 16) == 0) { - g_writeln("xrdp_caps_process_codecs: nscodec codec id %d prop len %d", + g_writeln("xrdp_caps_process_codecs: nscodec, codec id %d, properties len %d", codec_id, codec_properties_length); self->client_info.ns_codec_id = codec_id; i1 = MIN(64, codec_properties_length); @@ -466,7 +466,7 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) } else if (g_memcmp(codec_guid, XR_CODEC_GUID_REMOTEFX, 16) == 0) { - g_writeln("xrdp_caps_process_codecs: RemoteFX, codec id %d prop len %d", + g_writeln("xrdp_caps_process_codecs: RemoteFX, codec id %d, properites len %d", codec_id, codec_properties_length); self->client_info.rfx_codec_id = codec_id; i1 = MIN(64, codec_properties_length); @@ -475,7 +475,7 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) } else if (g_memcmp(codec_guid, XR_CODEC_GUID_JPEG, 16) == 0) { - g_writeln("xrdp_caps_process_codecs: jpeg codec id %d prop len %d", + g_writeln("xrdp_caps_process_codecs: jpeg, codec id %d, properties len %d", codec_id, codec_properties_length); self->client_info.jpeg_codec_id = codec_id; i1 = MIN(64, codec_properties_length); @@ -492,7 +492,7 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) } else if (g_memcmp(codec_guid, XR_CODEC_GUID_H264, 16) == 0) { - g_writeln("xrdp_caps_process_codecs: h264 codec id %d prop len %d", + g_writeln("xrdp_caps_process_codecs: h264, codec id %d, properties len %d", codec_id, codec_properties_length); self->client_info.h264_codec_id = codec_id; i1 = MIN(64, codec_properties_length); @@ -941,7 +941,7 @@ xrdp_caps_send_demand_active(struct xrdp_rdp *self) out_uint32_le(s, 2); /* 2 frames in flight */ /* surface commands */ - if (self->client_info.use_fast_path & 1) /* surface commands requires fastpath output */ + if (self->client_info.use_fast_path & 1) /* surface commands require fastpath output */ { caps_count++; out_uint16_le(s, RDP_CAPSET_SURFCMDS); /* CAPSETTYPE_SURFACE_COMMANDS */