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

ms-rdpbcgr.h: Rename incorrect slow path constants

Browse Source 
Rename the defines from [MS-RDPBCGR] 2.2.9.1.1.3.1 to match
the documentation.
This commit is contained in:
matt335672
2025-09-09 15:02:55 +01:00
parent 2759680b8b
commit 0a13316e6a
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/ms-rdpbcgr.h
+8 -9
View File
@@ -527,17 +527,16 @@
#define FASTPATH_INPUT_KBDFLAGS_EXTENDED1 0x04
/* Slow-Path Graphics Update: updateType (2.2.9.1.1.3.1) */
/* TODO: to be renamed */
#define RDP_UPDATE_ORDERS 0
#define RDP_UPDATE_BITMAP 1
#define RDP_UPDATE_PALETTE 2
#define RDP_UPDATE_SYNCHRONIZE 3
#define UPDATETYPE_ORDERS 0
#define UPDATETYPE_BITMAP 1
#define UPDATETYPE_PALETTE 2
#define UPDATETYPE_SYNCHRONIZE 3
#define GRAPHICS_UPDATE_TYPE_TO_STR(type) \
((type) == RDP_UPDATE_ORDERS ? "RDP_UPDATE_ORDERS" : \
(type) == RDP_UPDATE_BITMAP ? "RDP_UPDATE_BITMAP" : \
(type) == RDP_UPDATE_PALETTE ? "RDP_UPDATE_PALETTE" : \
(type) == RDP_UPDATE_SYNCHRONIZE ? "RDP_UPDATE_SYNCHRONIZE" : \
((type) == UPDATETYPE_ORDERS ? "UPDATETYPE_ORDERS" : \
(type) == UPDATETYPE_BITMAP ? "UPDATETYPE_BITMAP" : \
(type) == UPDATETYPE_PALETTE ? "UPDATETYPE_PALETTE" : \
(type) == UPDATETYPE_SYNCHRONIZE ? "UPDATETYPE_SYNCHRONIZE" : \
"unknown" \
)
libxrdp/libxrdp.c
+7 -7
View File
@@ -357,7 +357,7 @@ libxrdp_send_palette(struct xrdp_session *session, int *palette)
}
/* TS_UPDATE_PALETTE_DATA */
out_uint16_le(s, RDP_UPDATE_PALETTE); /* updateType */
out_uint16_le(s, UPDATETYPE_PALETTE); /* updateType */
out_uint16_le(s, 0); /* pad2Octets */
out_uint16_le(s, 256); /* # of colors (low-bytes) */
out_uint16_le(s, 0); /* # of colors (high-bytes) */
@@ -377,7 +377,7 @@ libxrdp_send_palette(struct xrdp_session *session, int *palette)
LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_FP_UPDATE_PALETTE "
"paletteUpdateData = { updateType %d (UPDATETYPE_PALETTE), "
"pad2Octets <ignored>, numberColors 256, "
"paletteEntries <omitted from log> }", RDP_UPDATE_PALETTE);
"paletteEntries <omitted from log> }", UPDATETYPE_PALETTE);
if (xrdp_rdp_send_fastpath((struct xrdp_rdp *)session->rdp, s,
FASTPATH_UPDATETYPE_PALETTE) != 0)
{
@@ -391,7 +391,7 @@ libxrdp_send_palette(struct xrdp_session *session, int *palette)
LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_UPDATE_PALETTE_DATA "
"updateType %d (UPDATETYPE_PALETTE), pad2Octets <ignored>, "
"numberColors 256, paletteEntries <omitted from log>",
RDP_UPDATE_PALETTE);
UPDATETYPE_PALETTE);
xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s,
PDUTYPE2_UPDATE);
}
@@ -512,7 +512,7 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height,
total_bufsize = 0;
num_updates = 0;
xrdp_rdp_init_data((struct xrdp_rdp *)session->rdp, s);
out_uint16_le(s, RDP_UPDATE_BITMAP); /* updateType */
out_uint16_le(s, UPDATETYPE_BITMAP); /* updateType */
p_num_updates = s->p;
out_uint8s(s, 2); /* num_updates set later */
@@ -618,7 +618,7 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height,
LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_UPDATE_BITMAP_DATA "
"updateType %d (UPDATETYPE_BITMAP), numberRectangles %d, "
"rectangles <omitted from log>",
RDP_UPDATE_BITMAP, num_updates);
UPDATETYPE_BITMAP, num_updates);
xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s,
PDUTYPE2_UPDATE);
@@ -659,7 +659,7 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height,
p += server_line_bytes * lines_sending;
xrdp_rdp_init_data((struct xrdp_rdp *)session->rdp, s);
out_uint16_le(s, RDP_UPDATE_BITMAP);
out_uint16_le(s, UPDATETYPE_BITMAP);
out_uint16_le(s, 1); /* num updates */
out_uint16_le(s, x);
out_uint16_le(s, y + i);
@@ -727,7 +727,7 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height,
LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_UPDATE_BITMAP_DATA "
"updateType %d (UPDATETYPE_BITMAP), numberRectangles 1, "
"rectangles <omitted from log>",
RDP_UPDATE_BITMAP);
UPDATETYPE_BITMAP);
xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s,
PDUTYPE2_UPDATE);
i = i + lines_sending;
libxrdp/xrdp_orders.c
+2 -2
View File
@@ -124,7 +124,7 @@ xrdp_orders_init(struct xrdp_orders *self)
LOG(LOG_LEVEL_ERROR, "xrdp_orders_init: xrdp_rdp_init_data failed");
return 1;
}
out_uint16_le(self->out_s, RDP_UPDATE_ORDERS); /* updateType */
out_uint16_le(self->out_s, UPDATETYPE_ORDERS); /* updateType */
out_uint8s(self->out_s, 2); /* pad */
self->order_count_ptr = self->out_s->p;
out_uint8s(self->out_s, 2); /* number of orders, set later */
@@ -132,7 +132,7 @@ xrdp_orders_init(struct xrdp_orders *self)
LOG_DEVEL(LOG_LEVEL_TRACE, "Adding header [MS-RDPEGDI] TS_UPDATE_ORDERS_PDU_DATA "
"updateType %d (UPDATETYPE_ORDERS), pad2OctetsA <ignored>, "
"numberOrders <to be set later>, pad2OctetsB <ignored>",
RDP_UPDATE_ORDERS);
UPDATETYPE_ORDERS);
}
}
return 0;
libxrdp/xrdp_rdp.c
+3 -3
View File
@@ -890,7 +890,7 @@ xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self)
free_stream(s);
return 1;
}
out_uint16_le(s, RDP_UPDATE_SYNCHRONIZE); /* updateType */
out_uint16_le(s, UPDATETYPE_SYNCHRONIZE); /* updateType */
out_uint16_le(s, 0); /* pad */
}
@@ -912,8 +912,8 @@ xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self)
{
LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_UPDATE_SYNC "
"updateType %s (%d)",
GRAPHICS_UPDATE_TYPE_TO_STR(RDP_UPDATE_SYNCHRONIZE),
RDP_UPDATE_SYNCHRONIZE);
GRAPHICS_UPDATE_TYPE_TO_STR(UPDATETYPE_SYNCHRONIZE),
UPDATETYPE_SYNCHRONIZE);
if (xrdp_rdp_send_data(self, s, PDUTYPE2_UPDATE) != 0)
{
LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] TS_UPDATE_SYNC failed");