uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1267 from metalefty/rename_constants

Browse Source 
Rename constants
master
metalefty 6 years ago committed by GitHub
parent bc9dcbeb19 062699334e
commit 7469d559a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 176 additions and 178 deletions
Show Stats Download Patch File Download Diff File

48
common/xrdp_constants.h
Unescape View File

@ -385,15 +385,14 @@
#define RDP_MPPC_DICT_SIZE 8192 /* RDP 4.0 | MS-RDPBCGR 3.1.8 */ #define RDP_MPPC_DICT_SIZE 8192 /* RDP 4.0 | MS-RDPBCGR 3.1.8 */
/* Drawing Order: controlFlags (MS-RDPEGDI 2.2.2.2.1, ) */ /* Drawing Order: controlFlags (MS-RDPEGDI 2.2.2.2.1, ) */
/* TODO: to be renamed */ #define TS_STANDARD 0x01
#define RDP_ORDER_STANDARD 0x01 #define TS_SECONDARY 0x02
#define RDP_ORDER_SECONDARY 0x02 #define TS_BOUNDS 0x04
#define RDP_ORDER_BOUNDS 0x04 #define TS_TYPE_CHANGE 0x08
#define RDP_ORDER_CHANGE 0x08 #define TS_DELTA_COORDINATES 0x10
#define RDP_ORDER_DELTA 0x10 #define TS_ZERO_BOUNDS_DELTAS 0x20
#define RDP_ORDER_LASTBOUNDS 0x20 #define TS_ZERO_FIELD_BYTE_BIT0 0x40
#define RDP_ORDER_SMALL 0x40 #define TS_ZERO_FIELD_BYTE_BIT1 0x80
#define RDP_ORDER_TINY 0x80
/* Drawing Order: orderType (MS-RDPEGDI 2.2.2.2.1.1.2) ? */ /* Drawing Order: orderType (MS-RDPEGDI 2.2.2.2.1.1.2) ? */
#define RDP_ORDER_DESTBLT 0 #define RDP_ORDER_DESTBLT 0
@ -409,15 +408,14 @@
#define RDP_ORDER_COMPOSITE 37 /* 0x25 */ #define RDP_ORDER_COMPOSITE 37 /* 0x25 */
/* Secondary Drawing Order Header: orderType (MS-RDPEGDI 2.2.2.2.1.2.1.1) */ /* Secondary Drawing Order Header: orderType (MS-RDPEGDI 2.2.2.2.1.2.1.1) */
/* TODO: to be renamed */ #define TS_CACHE_BITMAP_UNCOMPRESSED 0x00
#define RDP_ORDER_RAW_BMPCACHE 0 #define TS_CACHE_COLOR_TABLE 0x01
#define RDP_ORDER_COLCACHE 1 #define TS_CACHE_BITMAP_COMPRESSED 0x02
#define RDP_ORDER_BMPCACHE 2 #define TS_CACHE_GLYPH 0x03
#define RDP_ORDER_FONTCACHE 3 #define TS_CACHE_BITMAP_UNCOMPRESSED_REV2 0x04
#define RDP_ORDER_RAW_BMPCACHE2 4 #define TS_CACHE_BITMAP_COMPRESSED_REV2 0x05
#define RDP_ORDER_BMPCACHE2 5 #define TS_CACHE_BRUSH 0x07
#define RDP_ORDER_BRUSHCACHE 7 #define TS_CACHE_BITMAP_COMPRESSED_REV3 0x08
#define RDP_ORDER_BMPCACHE3 8
/* Maps to generalCapabilitySet in T.128 page 138 */ /* Maps to generalCapabilitySet in T.128 page 138 */
@ -433,7 +431,7 @@
#define ORDER_CAP_NEGOTIATE 2 /* NEGOTIATEORDERSUPPORT? not used */ #define ORDER_CAP_NEGOTIATE 2 /* NEGOTIATEORDERSUPPORT? not used */
#define ORDER_CAP_NOSUPPORT 4 /* not used */ #define ORDER_CAP_NOSUPPORT 4 /* not used */
#define CAPSTYPE_BITMACACHE 0x0004 #define CAPSTYPE_BITMAPCACHE 0x0004
#define CAPSTYPE_BITMAPCACHE_LEN 0x28 #define CAPSTYPE_BITMAPCACHE_LEN 0x28
#define CAPSTYPE_CONTROL 0x0005 #define CAPSTYPE_CONTROL 0x0005
@ -673,12 +671,12 @@
#define LICENCE_SIGNATURE_SIZE 16 #define LICENCE_SIGNATURE_SIZE 16
/* RDP PDU codes */ /* PDU Types (MS-RDPBCGR 2.2.8.1.1.1.1) */
#define RDP_PDU_DEMAND_ACTIVE 1 #define PDUTYPE_DEMANDACTIVEPDU 0x1
#define RDP_PDU_CONFIRM_ACTIVE 3 #define PDUTYPE_CONFIRMACTIVEPDU 0x3
#define RDP_PDU_REDIRECT 4 #define PDUTYPE_DEACTIVATEALLPDU 0x6
#define RDP_PDU_DEACTIVATE 6 #define PDUTYPE_DATAPDU 0x7
#define RDP_PDU_DATA 7 #define PDUTYPE_SERVER_REDIR_PKT 0xA
/* See T.128 */ /* See T.128 */
/* not used anywhere */ /* not used anywhere */

4
libxrdp/libxrdp.c
Unescape View File

@ -230,10 +230,10 @@ libxrdp_process_data(struct xrdp_session *session, struct stream *s)
case 0: case 0:
dead_lock_counter++; dead_lock_counter++;
break; break;
case RDP_PDU_CONFIRM_ACTIVE: /* 3 */ case PDUTYPE_CONFIRMACTIVEPDU:
xrdp_caps_process_confirm_active(rdp, s); xrdp_caps_process_confirm_active(rdp, s);
break; break;
case RDP_PDU_DATA: /* 7 */ case PDUTYPE_DATAPDU:
if (xrdp_rdp_process_data(rdp, s) != 0) if (xrdp_rdp_process_data(rdp, s) != 0)
{ {
DEBUG(("libxrdp_process_data returned non zero")); DEBUG(("libxrdp_process_data returned non zero"));

42
libxrdp/xrdp_caps.c
Unescape View File

@ -638,71 +638,71 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s)
switch (type) switch (type)
{ {
case CAPSTYPE_GENERAL: case CAPSTYPE_GENERAL:
DEBUG(("RDP_CAPSET_GENERAL")); DEBUG(("CAPSTYPE_GENERAL"));
xrdp_caps_process_general(self, s, len); xrdp_caps_process_general(self, s, len);
break; break;
case CAPSTYPE_BITMAP: case CAPSTYPE_BITMAP:
DEBUG(("RDP_CAPSET_BITMAP")); DEBUG(("CAPSTYPE_BITMAP"));
break; break;
case CAPSTYPE_ORDER: case CAPSTYPE_ORDER:
DEBUG(("RDP_CAPSET_ORDER")); DEBUG(("CAPSTYPE_ORDER"));
xrdp_caps_process_order(self, s, len); xrdp_caps_process_order(self, s, len);
break; break;
case CAPSTYPE_BITMACACHE: case CAPSTYPE_BITMAPCACHE:
DEBUG(("RDP_CAPSET_BMPCACHE")); DEBUG(("CAPSTYPE_BMPCACHE"));
xrdp_caps_process_bmpcache(self, s, len); xrdp_caps_process_bmpcache(self, s, len);
break; break;
case CAPSTYPE_CONTROL: case CAPSTYPE_CONTROL:
DEBUG(("RDP_CAPSET_CONTROL")); DEBUG(("CAPSTYPE_CONTROL"));
break; break;
case 6: case 6:
xrdp_caps_process_cache_v3_codec_id(self, s, len); xrdp_caps_process_cache_v3_codec_id(self, s, len);
break; break;
case CAPSTYPE_ACTIVATION: case CAPSTYPE_ACTIVATION:
DEBUG(("RDP_CAPSET_ACTIVATE")); DEBUG(("CAPSTYPE_ACTIVAION"));
break; break;
case CAPSTYPE_POINTER: case CAPSTYPE_POINTER:
DEBUG(("RDP_CAPSET_POINTER")); DEBUG(("CAPSTYPE_POINTER"));
xrdp_caps_process_pointer(self, s, len); xrdp_caps_process_pointer(self, s, len);
break; break;
case CAPSTYPE_SHARE: case CAPSTYPE_SHARE:
DEBUG(("RDP_CAPSET_SHARE")); DEBUG(("CAPSTYPE_SHARE"));
break; break;
case CAPSTYPE_COLORCACHE: case CAPSTYPE_COLORCACHE:
DEBUG(("RDP_CAPSET_COLCACHE")); DEBUG(("CAPSTYPE_COLORCACHE"));
break; break;
case CAPSTYPE_SOUND: case CAPSTYPE_SOUND:
DEBUG(("--0x0C")); DEBUG(("CAPSTYPE_SOUND"));
break; break;
case CAPSTYPE_INPUT: case CAPSTYPE_INPUT:
xrdp_caps_process_input(self, s, len); xrdp_caps_process_input(self, s, len);
break; break;
case CAPSTYPE_FONT: case CAPSTYPE_FONT:
DEBUG(("--0x0D")); DEBUG(("CAPSTYPE_FONT"));
break; break;
case CAPSTYPE_BRUSH: case CAPSTYPE_BRUSH:
xrdp_caps_process_brushcache(self, s, len); xrdp_caps_process_brushcache(self, s, len);
break; break;
case CAPSTYPE_GLYPHCACHE: case CAPSTYPE_GLYPHCACHE:
DEBUG(("RDP_CAPSET_GLYPHCACHE")); DEBUG(("CAPSTYPE_GLYPHCACHE"));
xrdp_caps_process_glyphcache(self, s, len); xrdp_caps_process_glyphcache(self, s, len);
break; break;
case CAPSTYPE_BITMAPCACHE_HOSTSUPPORT: case CAPSTYPE_OFFSCREENCACHE:
DEBUG(("CAPSET_TYPE_OFFSCREEN_CACHE")); DEBUG(("CAPSTYPE_OFFSCREENCACHE"));
xrdp_caps_process_offscreen_bmpcache(self, s, len); xrdp_caps_process_offscreen_bmpcache(self, s, len);
break; break;
case CAPSTYPE_BITMAPCACHE_REV2: case CAPSTYPE_BITMAPCACHE_REV2:
DEBUG(("RDP_CAPSET_BMPCACHE2")); DEBUG(("CAPSTYPE_BITMAPCACHE_REV2"));
xrdp_caps_process_bmpcache2(self, s, len); xrdp_caps_process_bmpcache2(self, s, len);
break; break;
case CAPSTYPE_VIRTUALCHANNEL: case CAPSTYPE_VIRTUALCHANNEL:
DEBUG(("--0x14")); DEBUG(("CAPSTYPE_VIRTUALCHANNEL"));
break; break;
case CAPSTYPE_DRAWNINGRIDCACHE: case CAPSTYPE_DRAWNINGRIDCACHE:
DEBUG(("--0x15")); DEBUG(("CAPSTYPE_DRAWNINGRIDCACHE"));
break; break;
case CAPSTYPE_DRAWGDIPLUS: case CAPSTYPE_DRAWGDIPLUS:
DEBUG(("--0x16")); DEBUG(("CAPSTYPE_DRAWGDIPLUS"));
break; break;
case CAPSTYPE_RAIL: case CAPSTYPE_RAIL:
xrdp_caps_process_rail(self, s, len); xrdp_caps_process_rail(self, s, len);
@ -925,7 +925,7 @@ xrdp_caps_send_demand_active(struct xrdp_rdp *self)
out_uint8(s, 75); /* jpeg compression ratio */ out_uint8(s, 75); /* jpeg compression ratio */
/* calculate and set size and count */ /* calculate and set size and count */
codec_caps_size = (int)(s->p - codec_caps_size_ptr); codec_caps_size = (int)(s->p - codec_caps_size_ptr);
codec_caps_size += 2; /* 2 bytes for RDP_CAPSET_BMPCODECS above */ codec_caps_size += 2; /* 2 bytes for CAPSTYPE_BMPCODECS above */
codec_caps_size_ptr[0] = codec_caps_size; codec_caps_size_ptr[0] = codec_caps_size;
codec_caps_size_ptr[1] = codec_caps_size >> 8; codec_caps_size_ptr[1] = codec_caps_size >> 8;
codec_caps_count_ptr[0] = codec_caps_count; codec_caps_count_ptr[0] = codec_caps_count;
@ -1024,7 +1024,7 @@ xrdp_caps_send_demand_active(struct xrdp_rdp *self)
caps_count_ptr[2] = caps_count >> 16; caps_count_ptr[2] = caps_count >> 16;
caps_count_ptr[3] = caps_count >> 24; caps_count_ptr[3] = caps_count >> 24;
if (xrdp_rdp_send(self, s, RDP_PDU_DEMAND_ACTIVE) != 0) if (xrdp_rdp_send(self, s, PDUTYPE_DEMANDACTIVEPDU) != 0)
{ {
free_stream(s); free_stream(s);
return 1; return 1;

242
libxrdp/xrdp_orders.c
Unescape View File

@ -503,11 +503,11 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_RECT) if (self->orders_state.last_order != RDP_ORDER_RECT)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_RECT; self->orders_state.last_order = RDP_ORDER_RECT;
@ -518,11 +518,11 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
if (x < rect->left || y < rect->top || if (x < rect->left || y < rect->top ||
x + cx > rect->right || y + cy > rect->bottom) x + cx > rect->right || y + cy > rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -538,14 +538,14 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
if (xrdp_orders_send_delta(self, vals, 8)) if (xrdp_orders_send_delta(self, vals, 8))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -555,8 +555,8 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -565,7 +565,7 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
{ {
present |= 0x01; present |= 0x01;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, x - self->orders_state.rect_x); out_uint8(self->out_s, x - self->orders_state.rect_x);
} }
@ -581,7 +581,7 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
{ {
present |= 0x02; present |= 0x02;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, y - self->orders_state.rect_y); out_uint8(self->out_s, y - self->orders_state.rect_y);
} }
@ -597,7 +597,7 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
{ {
present |= 0x04; present |= 0x04;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cx - self->orders_state.rect_cx); out_uint8(self->out_s, cx - self->orders_state.rect_cx);
} }
@ -613,7 +613,7 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy,
{ {
present |= 0x08; present |= 0x08;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cy - self->orders_state.rect_cy); out_uint8(self->out_s, cy - self->orders_state.rect_cy);
} }
@ -674,11 +674,11 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_SCREENBLT) if (self->orders_state.last_order != RDP_ORDER_SCREENBLT)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_SCREENBLT; self->orders_state.last_order = RDP_ORDER_SCREENBLT;
@ -689,11 +689,11 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
if (x < rect->left || y < rect->top || if (x < rect->left || y < rect->top ||
x + cx > rect->right || y + cy > rect->bottom) x + cx > rect->right || y + cy > rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -713,14 +713,14 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
if (xrdp_orders_send_delta(self, vals, 12)) if (xrdp_orders_send_delta(self, vals, 12))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -730,8 +730,8 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -740,7 +740,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x01; present |= 0x01;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, x - self->orders_state.scr_blt_x); out_uint8(self->out_s, x - self->orders_state.scr_blt_x);
} }
@ -756,7 +756,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x02; present |= 0x02;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, y - self->orders_state.scr_blt_y); out_uint8(self->out_s, y - self->orders_state.scr_blt_y);
} }
@ -772,7 +772,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x04; present |= 0x04;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cx - self->orders_state.scr_blt_cx); out_uint8(self->out_s, cx - self->orders_state.scr_blt_cx);
} }
@ -788,7 +788,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x08; present |= 0x08;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cy - self->orders_state.scr_blt_cy); out_uint8(self->out_s, cy - self->orders_state.scr_blt_cy);
} }
@ -811,7 +811,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x20; present |= 0x20;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcx - self->orders_state.scr_blt_srcx); out_uint8(self->out_s, srcx - self->orders_state.scr_blt_srcx);
} }
@ -827,7 +827,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x40; present |= 0x40;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcy - self->orders_state.scr_blt_srcy); out_uint8(self->out_s, srcy - self->orders_state.scr_blt_srcy);
} }
@ -866,11 +866,11 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_PATBLT) if (self->orders_state.last_order != RDP_ORDER_PATBLT)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_PATBLT; self->orders_state.last_order = RDP_ORDER_PATBLT;
@ -881,11 +881,11 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
if (x < rect->left || y < rect->top || if (x < rect->left || y < rect->top ||
x + cx > rect->right || y + cy > rect->bottom) x + cx > rect->right || y + cy > rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -901,14 +901,14 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
if (xrdp_orders_send_delta(self, vals, 8)) if (xrdp_orders_send_delta(self, vals, 8))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -918,8 +918,8 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 2); out_uint8s(self->out_s, 2);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -928,7 +928,7 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x0001; present |= 0x0001;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, x - self->orders_state.pat_blt_x); out_uint8(self->out_s, x - self->orders_state.pat_blt_x);
} }
@ -944,7 +944,7 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x0002; present |= 0x0002;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, y - self->orders_state.pat_blt_y); out_uint8(self->out_s, y - self->orders_state.pat_blt_y);
} }
@ -960,7 +960,7 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x0004; present |= 0x0004;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cx - self->orders_state.pat_blt_cx); out_uint8(self->out_s, cx - self->orders_state.pat_blt_cx);
} }
@ -976,7 +976,7 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x0008; present |= 0x0008;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cy - self->orders_state.pat_blt_cy); out_uint8(self->out_s, cy - self->orders_state.pat_blt_cy);
} }
@ -1083,11 +1083,11 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_DESTBLT) if (self->orders_state.last_order != RDP_ORDER_DESTBLT)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_DESTBLT; self->orders_state.last_order = RDP_ORDER_DESTBLT;
@ -1098,11 +1098,11 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
if (x < rect->left || y < rect->top || if (x < rect->left || y < rect->top ||
x + cx > rect->right || y + cy > rect->bottom) x + cx > rect->right || y + cy > rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -1118,14 +1118,14 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
if (xrdp_orders_send_delta(self, vals, 8)) if (xrdp_orders_send_delta(self, vals, 8))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -1135,8 +1135,8 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -1145,7 +1145,7 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x01; present |= 0x01;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, x - self->orders_state.dest_blt_x); out_uint8(self->out_s, x - self->orders_state.dest_blt_x);
} }
@ -1161,7 +1161,7 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x02; present |= 0x02;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, y - self->orders_state.dest_blt_y); out_uint8(self->out_s, y - self->orders_state.dest_blt_y);
} }
@ -1177,7 +1177,7 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x04; present |= 0x04;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cx - self->orders_state.dest_blt_cx); out_uint8(self->out_s, cx - self->orders_state.dest_blt_cx);
} }
@ -1193,7 +1193,7 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,
{ {
present |= 0x08; present |= 0x08;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cy - self->orders_state.dest_blt_cy); out_uint8(self->out_s, cy - self->orders_state.dest_blt_cy);
} }
@ -1254,11 +1254,11 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_LINE) if (self->orders_state.last_order != RDP_ORDER_LINE)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_LINE; self->orders_state.last_order = RDP_ORDER_LINE;
@ -1271,11 +1271,11 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
MAX(endx, startx) >= rect->right || MAX(endx, startx) >= rect->right ||
MAX(endy, starty) >= rect->bottom) MAX(endy, starty) >= rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -1291,14 +1291,14 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
if (xrdp_orders_send_delta(self, vals, 8)) if (xrdp_orders_send_delta(self, vals, 8))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -1308,8 +1308,8 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 2); out_uint8s(self->out_s, 2);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -1325,7 +1325,7 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
{ {
present |= 0x0002; present |= 0x0002;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, startx - self->orders_state.line_startx); out_uint8(self->out_s, startx - self->orders_state.line_startx);
} }
@ -1341,7 +1341,7 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
{ {
present |= 0x0004; present |= 0x0004;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, starty - self->orders_state.line_starty); out_uint8(self->out_s, starty - self->orders_state.line_starty);
} }
@ -1357,7 +1357,7 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
{ {
present |= 0x0008; present |= 0x0008;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, endx - self->orders_state.line_endx); out_uint8(self->out_s, endx - self->orders_state.line_endx);
} }
@ -1373,7 +1373,7 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode,
{ {
present |= 0x0010; present |= 0x0010;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, endy - self->orders_state.line_endy); out_uint8(self->out_s, endy - self->orders_state.line_endy);
} }
@ -1456,11 +1456,11 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_MEMBLT) if (self->orders_state.last_order != RDP_ORDER_MEMBLT)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_MEMBLT; self->orders_state.last_order = RDP_ORDER_MEMBLT;
@ -1471,11 +1471,11 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
if (x < rect->left || y < rect->top || if (x < rect->left || y < rect->top ||
x + cx > rect->right || y + cy > rect->bottom) x + cx > rect->right || y + cy > rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -1495,14 +1495,14 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
if (xrdp_orders_send_delta(self, vals, 12)) if (xrdp_orders_send_delta(self, vals, 12))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -1512,8 +1512,8 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 2); out_uint8s(self->out_s, 2);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -1532,7 +1532,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
{ {
present |= 0x0002; present |= 0x0002;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, x - self->orders_state.mem_blt_x); out_uint8(self->out_s, x - self->orders_state.mem_blt_x);
} }
@ -1548,7 +1548,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
{ {
present |= 0x0004; present |= 0x0004;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, y - self->orders_state.mem_blt_y); out_uint8(self->out_s, y - self->orders_state.mem_blt_y);
} }
@ -1564,7 +1564,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
{ {
present |= 0x0008; present |= 0x0008;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cx - self->orders_state.mem_blt_cx); out_uint8(self->out_s, cx - self->orders_state.mem_blt_cx);
} }
@ -1580,7 +1580,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
{ {
present |= 0x0010; present |= 0x0010;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, cy - self->orders_state.mem_blt_cy); out_uint8(self->out_s, cy - self->orders_state.mem_blt_cy);
} }
@ -1603,7 +1603,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
{ {
present |= 0x0040; present |= 0x0040;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcx - self->orders_state.mem_blt_srcx); out_uint8(self->out_s, srcx - self->orders_state.mem_blt_srcx);
} }
@ -1619,7 +1619,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id,
{ {
present |= 0x0080; present |= 0x0080;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcy - self->orders_state.mem_blt_srcy); out_uint8(self->out_s, srcy - self->orders_state.mem_blt_srcy);
} }
@ -1666,10 +1666,10 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_COMPOSITE) if (self->orders_state.last_order != RDP_ORDER_COMPOSITE)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_COMPOSITE; self->orders_state.last_order = RDP_ORDER_COMPOSITE;
if (rect != 0) if (rect != 0)
@ -1678,11 +1678,11 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (dstx < rect->left || dsty < rect->top || if (dstx < rect->left || dsty < rect->top ||
dstx + width > rect->right || dsty + height > rect->bottom) dstx + width > rect->right || dsty + height > rect->bottom)
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
@ -1709,12 +1709,12 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
vals[19] = self->orders_state.com_blt_mskwidth; vals[19] = self->orders_state.com_blt_mskwidth;
if (xrdp_orders_send_delta(self, vals, 20)) if (xrdp_orders_send_delta(self, vals, 20))
{ {
order_flags |= RDP_ORDER_DELTA; order_flags |= TS_DELTA_COORDINATES;
} }
/* order_flags, set later, 1 byte */ /* order_flags, set later, 1 byte */
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -1722,8 +1722,8 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
/* present, set later, 3 bytes */ /* present, set later, 3 bytes */
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 3); out_uint8s(self->out_s, 3);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -1745,7 +1745,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (srcwidth != self->orders_state.com_blt_srcwidth) if (srcwidth != self->orders_state.com_blt_srcwidth)
{ {
present |= 0x000004; present |= 0x000004;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcwidth - self->orders_state.com_blt_srcwidth); out_uint8(self->out_s, srcwidth - self->orders_state.com_blt_srcwidth);
} }
@ -1821,7 +1821,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (mskwidth != self->orders_state.com_blt_mskwidth) if (mskwidth != self->orders_state.com_blt_mskwidth)
{ {
present |= 0x000200; present |= 0x000200;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, mskwidth - self->orders_state.com_blt_mskwidth); out_uint8(self->out_s, mskwidth - self->orders_state.com_blt_mskwidth);
} }
@ -1849,7 +1849,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (srcx != self->orders_state.com_blt_srcx) if (srcx != self->orders_state.com_blt_srcx)
{ {
present |= 0x001000; present |= 0x001000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcx - self->orders_state.com_blt_srcx); out_uint8(self->out_s, srcx - self->orders_state.com_blt_srcx);
} }
@ -1863,7 +1863,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (srcy != self->orders_state.com_blt_srcy) if (srcy != self->orders_state.com_blt_srcy)
{ {
present |= 0x002000; present |= 0x002000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, srcy - self->orders_state.com_blt_srcy); out_uint8(self->out_s, srcy - self->orders_state.com_blt_srcy);
} }
@ -1877,7 +1877,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (mskx != self->orders_state.com_blt_mskx) if (mskx != self->orders_state.com_blt_mskx)
{ {
present |= 0x004000; present |= 0x004000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, mskx - self->orders_state.com_blt_mskx); out_uint8(self->out_s, mskx - self->orders_state.com_blt_mskx);
} }
@ -1891,7 +1891,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (msky != self->orders_state.com_blt_msky) if (msky != self->orders_state.com_blt_msky)
{ {
present |= 0x008000; present |= 0x008000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, msky - self->orders_state.com_blt_msky); out_uint8(self->out_s, msky - self->orders_state.com_blt_msky);
} }
@ -1905,7 +1905,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (dstx != self->orders_state.com_blt_dstx) if (dstx != self->orders_state.com_blt_dstx)
{ {
present |= 0x010000; present |= 0x010000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, dstx - self->orders_state.com_blt_dstx); out_uint8(self->out_s, dstx - self->orders_state.com_blt_dstx);
} }
@ -1919,7 +1919,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (dsty != self->orders_state.com_blt_dsty) if (dsty != self->orders_state.com_blt_dsty)
{ {
present |= 0x020000; present |= 0x020000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, dsty - self->orders_state.com_blt_dsty); out_uint8(self->out_s, dsty - self->orders_state.com_blt_dsty);
} }
@ -1933,7 +1933,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (width != self->orders_state.com_blt_width) if (width != self->orders_state.com_blt_width)
{ {
present |= 0x040000; present |= 0x040000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, width - self->orders_state.com_blt_width); out_uint8(self->out_s, width - self->orders_state.com_blt_width);
} }
@ -1947,7 +1947,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat,
if (height != self->orders_state.com_blt_height) if (height != self->orders_state.com_blt_height)
{ {
present |= 0x080000; present |= 0x080000;
if (order_flags & RDP_ORDER_DELTA) if (order_flags & TS_DELTA_COORDINATES)
{ {
out_uint8(self->out_s, height - self->orders_state.com_blt_height); out_uint8(self->out_s, height - self->orders_state.com_blt_height);
} }
@ -1995,11 +1995,11 @@ xrdp_orders_text(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD; order_flags = TS_STANDARD;
if (self->orders_state.last_order != RDP_ORDER_TEXT2) if (self->orders_state.last_order != RDP_ORDER_TEXT2)
{ {
order_flags |= RDP_ORDER_CHANGE; order_flags |= TS_TYPE_CHANGE;
} }
self->orders_state.last_order = RDP_ORDER_TEXT2; self->orders_state.last_order = RDP_ORDER_TEXT2;
@ -2017,11 +2017,11 @@ xrdp_orders_text(struct xrdp_orders *self,
clip_right > rect->right || clip_right > rect->right ||
clip_bottom > rect->bottom)) clip_bottom > rect->bottom))
{ {
order_flags |= RDP_ORDER_BOUNDS; order_flags |= TS_BOUNDS;
if (xrdp_orders_last_bounds(self, rect)) if (xrdp_orders_last_bounds(self, rect))
{ {
order_flags |= RDP_ORDER_LASTBOUNDS; order_flags |= TS_ZERO_BOUNDS_DELTAS;
} }
} }
} }
@ -2030,7 +2030,7 @@ xrdp_orders_text(struct xrdp_orders *self,
order_flags_ptr = self->out_s->p; order_flags_ptr = self->out_s->p;
out_uint8s(self->out_s, 1); out_uint8s(self->out_s, 1);
if (order_flags & RDP_ORDER_CHANGE) if (order_flags & TS_TYPE_CHANGE)
{ {
out_uint8(self->out_s, self->orders_state.last_order); out_uint8(self->out_s, self->orders_state.last_order);
} }
@ -2040,8 +2040,8 @@ xrdp_orders_text(struct xrdp_orders *self,
present_ptr = self->out_s->p; present_ptr = self->out_s->p;
out_uint8s(self->out_s, 3); out_uint8s(self->out_s, 3);
if ((order_flags & RDP_ORDER_BOUNDS) && if ((order_flags & TS_BOUNDS) &&
!(order_flags & RDP_ORDER_LASTBOUNDS)) !(order_flags & TS_ZERO_BOUNDS_DELTAS))
{ {
xrdp_orders_out_bounds(self, rect); xrdp_orders_out_bounds(self, rect);
} }
@ -2184,12 +2184,12 @@ xrdp_orders_send_palette(struct xrdp_orders *self, int *palette,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = 1027 - 7; /* length after type minus 7 */ len = 1027 - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
out_uint16_le(self->out_s, 0); /* flags */ out_uint16_le(self->out_s, 0); /* flags */
out_uint8(self->out_s, RDP_ORDER_COLCACHE); /* type */ out_uint8(self->out_s, TS_CACHE_COLOR_TABLE); /* type */
out_uint8(self->out_s, cache_id); out_uint8(self->out_s, cache_id);
out_uint16_le(self->out_s, 256); /* num colors */ out_uint16_le(self->out_s, 256); /* num colors */
@ -2256,12 +2256,12 @@ xrdp_orders_send_raw_bitmap(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = (bufsize + 9) - 7; /* length after type minus 7 */ len = (bufsize + 9) - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
out_uint16_le(self->out_s, 8); /* flags */ out_uint16_le(self->out_s, 8); /* flags */
out_uint8(self->out_s, RDP_ORDER_RAW_BMPCACHE); /* type */ out_uint8(self->out_s, TS_CACHE_BITMAP_UNCOMPRESSED); /* type */
out_uint8(self->out_s, cache_id); out_uint8(self->out_s, cache_id);
out_uint8s(self->out_s, 1); /* pad */ out_uint8s(self->out_s, 1); /* pad */
out_uint8(self->out_s, width + e); out_uint8(self->out_s, width + e);
@ -2402,7 +2402,7 @@ xrdp_orders_send_bitmap(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
if (self->rdp_layer->client_info.op2) if (self->rdp_layer->client_info.op2)
@ -2418,7 +2418,7 @@ xrdp_orders_send_bitmap(struct xrdp_orders *self,
out_uint16_le(self->out_s, 8); /* flags */ out_uint16_le(self->out_s, 8); /* flags */
} }
out_uint8(self->out_s, RDP_ORDER_BMPCACHE); /* type */ out_uint8(self->out_s, TS_CACHE_BITMAP_COMPRESSED); /* type */
out_uint8(self->out_s, cache_id); out_uint8(self->out_s, cache_id);
out_uint8s(self->out_s, 1); /* pad */ out_uint8s(self->out_s, 1); /* pad */
out_uint8(self->out_s, width + e); out_uint8(self->out_s, width + e);
@ -2469,12 +2469,12 @@ xrdp_orders_cache_glyph(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = (datasize + 12) - 7; /* length after type minus 7 */ len = (datasize + 12) - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
out_uint16_le(self->out_s, flags); out_uint16_le(self->out_s, flags);
out_uint8(self->out_s, RDP_ORDER_FONTCACHE); /* type */ out_uint8(self->out_s, TS_CACHE_GLYPH); /* type */
out_uint8(self->out_s, font_index); out_uint8(self->out_s, font_index);
out_uint8(self->out_s, 1); /* num of chars */ out_uint8(self->out_s, 1); /* num of chars */
out_uint16_le(self->out_s, char_index); out_uint16_le(self->out_s, char_index);
@ -2591,12 +2591,12 @@ xrdp_orders_cache_glyph_v2(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len_ptr = self->out_s->p; len_ptr = self->out_s->p;
out_uint16_le(self->out_s, 0); /* set later */ out_uint16_le(self->out_s, 0); /* set later */
out_uint16_le(self->out_s, extra_flags); out_uint16_le(self->out_s, extra_flags);
out_uint8(self->out_s, RDP_ORDER_FONTCACHE); /* type */ out_uint8(self->out_s, TS_CACHE_GLYPH); /* type */
out_uint8(self->out_s, char_index); out_uint8(self->out_s, char_index);
if (write_2byte_signed(self->out_s, font_char->offset) || if (write_2byte_signed(self->out_s, font_char->offset) ||
@ -2683,13 +2683,13 @@ xrdp_orders_send_raw_bitmap2(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = (bufsize + 6) - 7; /* length after type minus 7 */ len = (bufsize + 6) - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
i = (((Bpp + 2) << 3) & 0x38) | (cache_id & 7); i = (((Bpp + 2) << 3) & 0x38) | (cache_id & 7);
out_uint16_le(self->out_s, i); /* flags */ out_uint16_le(self->out_s, i); /* flags */
out_uint8(self->out_s, RDP_ORDER_RAW_BMPCACHE2); /* type */ out_uint8(self->out_s, TS_CACHE_BITMAP_UNCOMPRESSED_REV2); /* type */
out_uint8(self->out_s, width + e); out_uint8(self->out_s, width + e);
out_uint8(self->out_s, height); out_uint8(self->out_s, height);
out_uint16_be(self->out_s, bufsize | 0x4000); out_uint16_be(self->out_s, bufsize | 0x4000);
@ -2830,14 +2830,14 @@ xrdp_orders_send_bitmap2(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = (bufsize + 6) - 7; /* length after type minus 7 */ len = (bufsize + 6) - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
i = (((Bpp + 2) << 3) & 0x38) | (cache_id & 7); i = (((Bpp + 2) << 3) & 0x38) | (cache_id & 7);
i = i | (0x08 << 7); /* CBR2_NO_BITMAP_COMPRESSION_HDR */ i = i | (0x08 << 7); /* CBR2_NO_BITMAP_COMPRESSION_HDR */
out_uint16_le(self->out_s, i); /* flags */ out_uint16_le(self->out_s, i); /* flags */
out_uint8(self->out_s, RDP_ORDER_BMPCACHE2); /* type */ out_uint8(self->out_s, TS_CACHE_BITMAP_COMPRESSED_REV2); /* type */
out_uint8(self->out_s, width + e); out_uint8(self->out_s, width + e);
out_uint8(self->out_s, height); out_uint8(self->out_s, height);
out_uint16_be(self->out_s, bufsize | 0x4000); out_uint16_be(self->out_s, bufsize | 0x4000);
@ -2921,13 +2921,13 @@ xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = (bufsize + 22) - 7; /* length after type minus 7 */ len = (bufsize + 22) - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
i = (((Bpp + 2) << 3) & 0x38) | (cache_id & 7); i = (((Bpp + 2) << 3) & 0x38) | (cache_id & 7);
out_uint16_le(self->out_s, i); /* flags */ out_uint16_le(self->out_s, i); /* flags */
out_uint8(self->out_s, RDP_ORDER_BMPCACHE3); /* type */ out_uint8(self->out_s, TS_CACHE_BITMAP_COMPRESSED_REV3); /* type */
/* cache index */ /* cache index */
out_uint16_le(self->out_s, cache_idx); out_uint16_le(self->out_s, cache_idx);
/* persistent cache key 1/2 */ /* persistent cache key 1/2 */
@ -3068,12 +3068,12 @@ xrdp_orders_send_brush(struct xrdp_orders *self, int width, int height,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_STANDARD | RDP_ORDER_SECONDARY; order_flags = TS_STANDARD | TS_SECONDARY;
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
len = (size + 6) - 7; /* length after type minus 7 */ len = (size + 6) - 7; /* length after type minus 7 */
out_uint16_le(self->out_s, len); out_uint16_le(self->out_s, len);
out_uint16_le(self->out_s, 0); /* flags */ out_uint16_le(self->out_s, 0); /* flags */
out_uint8(self->out_s, RDP_ORDER_BRUSHCACHE); /* type */ out_uint8(self->out_s, TS_CACHE_BRUSH); /* type */
out_uint8(self->out_s, cache_id); out_uint8(self->out_s, cache_id);
out_uint8(self->out_s, bpp); out_uint8(self->out_s, bpp);
out_uint8(self->out_s, width); out_uint8(self->out_s, width);
@ -3113,7 +3113,7 @@ xrdp_orders_send_create_os_surface(struct xrdp_orders *self, int id,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 1 << 2; /* type RDP_ORDER_ALTSEC_CREATE_OFFSCR_BITMAP */ order_flags |= 1 << 2; /* type RDP_ORDER_ALTSEC_CREATE_OFFSCR_BITMAP */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
cache_id = id & 0x7fff; cache_id = id & 0x7fff;
@ -3157,7 +3157,7 @@ xrdp_orders_send_switch_os_surface(struct xrdp_orders *self, int id)
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0 << 2; /* type RDP_ORDER_ALTSEC_SWITCH_SURFACE */ order_flags |= 0 << 2; /* type RDP_ORDER_ALTSEC_SWITCH_SURFACE */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
cache_id = id & 0xffff; cache_id = id & 0xffff;

14
libxrdp/xrdp_orders_rail.c
Unescape View File

@ -43,7 +43,7 @@ xrdp_orders_send_window_delete(struct xrdp_orders *self, int window_id)
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */
@ -76,7 +76,7 @@ xrdp_orders_send_window_cached_icon(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */
@ -170,7 +170,7 @@ xrdp_orders_send_window_icon(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */
@ -373,7 +373,7 @@ xrdp_orders_send_window_new_update(struct xrdp_orders *self, int window_id,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */
@ -517,7 +517,7 @@ xrdp_orders_send_notify_delete(struct xrdp_orders *self, int window_id,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */
@ -611,7 +611,7 @@ xrdp_orders_send_notify_new_update(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */
@ -705,7 +705,7 @@ xrdp_orders_send_monitored_desktop(struct xrdp_orders *self,
return 1; return 1;
} }
self->order_count++; self->order_count++;
order_flags = RDP_ORDER_SECONDARY; order_flags = TS_SECONDARY;
order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */ order_flags |= 0xb << 2; /* type TS_ALTSEC_WINDOW */
out_uint8(self->out_s, order_flags); out_uint8(self->out_s, order_flags);
/* orderSize (2 bytes) */ /* orderSize (2 bytes) */

4
libxrdp/xrdp_rdp.c
Unescape View File

@ -561,7 +561,7 @@ xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s,
DEBUG(("in xrdp_rdp_send_data")); DEBUG(("in xrdp_rdp_send_data"));
s_pop_layer(s, rdp_hdr); s_pop_layer(s, rdp_hdr);
len = (int)(s->end - s->p); len = (int)(s->end - s->p);
pdutype = 0x10 | RDP_PDU_DATA; pdutype = 0x10 | PDUTYPE_DATAPDU;
pdulen = len; pdulen = len;
dlen = len; dlen = len;
ctype = 0; ctype = 0;
@ -1296,7 +1296,7 @@ xrdp_rdp_send_deactivate(struct xrdp_rdp *self)
s_mark_end(s); s_mark_end(s);
if (xrdp_rdp_send(self, s, RDP_PDU_DEACTIVATE) != 0) if (xrdp_rdp_send(self, s, PDUTYPE_DEACTIVATEALLPDU) != 0)
{ {
free_stream(s); free_stream(s);
DEBUG(("out xrdp_rdp_send_deactivate error")); DEBUG(("out xrdp_rdp_send_deactivate error"));

Write Preview
Loading…
Cancel
Save