From 2759680b8b01ef9c8b126cd933e99fa3028f26cd Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Tue, 9 Sep 2025 14:31:36 +0100 Subject: [PATCH] ms-rdpbcgr.h: Rename incorrect PDUTYPE2_ defines Rename the defines from [MS-RDPBCGR] 2.2.8.1.1.1.2 to match the documentation. --- common/ms-rdpbcgr.h | 20 ++++++++++---------- libxrdp/libxrdp.c | 14 +++++++------- libxrdp/xrdp_orders.c | 4 ++-- libxrdp/xrdp_rdp.c | 26 +++++++++++++------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/common/ms-rdpbcgr.h b/common/ms-rdpbcgr.h index 7526cd63..7e88757c 100644 --- a/common/ms-rdpbcgr.h +++ b/common/ms-rdpbcgr.h @@ -449,21 +449,21 @@ ) /* Share Data Header: pduType2 (2.2.8.1.1.1.2) */ -/* TODO: to be renamed */ -#define RDP_DATA_PDU_UPDATE 2 /* PDUTYPE2_UPDATE */ -#define RDP_DATA_PDU_CONTROL 20 -#define RDP_DATA_PDU_POINTER 27 -#define RDP_DATA_PDU_INPUT 28 -#define RDP_DATA_PDU_SYNCHRONISE 31 +#define PDUTYPE2_UPDATE 2 +#define PDUTYPE2_CONTROL 20 +#define PDUTYPE2_POINTER 27 +#define PDUTYPE2_INPUT 28 +#define PDUTYPE2_SYNCHRONISE 31 #define PDUTYPE2_REFRESH_RECT 33 -#define RDP_DATA_PDU_PLAY_SOUND 34 +#define PDUTYPE2_PLAY_SOUND 34 #define PDUTYPE2_SUPPRESS_OUTPUT 35 #define PDUTYPE2_SHUTDOWN_REQUEST 36 #define PDUTYPE2_SHUTDOWN_DENIED 37 -#define RDP_DATA_PDU_LOGON 38 -#define RDP_DATA_PDU_FONT2 39 -#define RDP_DATA_PDU_DISCONNECT 47 +#define PDUTYPE2_SAVE_SESSION_INFO 38 +#define PDUTYPE2_FONTLIST 39 +#define PDUTYPE2_SET_ERROR_INFO_PDU 47 #define PDUTYPE2_MONITOR_LAYOUT_PDU 55 +#define PDUTYPE2_FRAME_ACKNOWLEDGE 56 /* From [MS-RDPRFX] */ /* TS_SECURITY_HEADER: flags (2.2.8.1.1.2.1) */ #define SEC_EXCHANGE_PKT 0x0001 diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index 45ee867f..c5eae70e 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -393,7 +393,7 @@ libxrdp_send_palette(struct xrdp_session *session, int *palette) "numberColors 256, paletteEntries ", RDP_UPDATE_PALETTE); xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, - RDP_DATA_PDU_UPDATE); + PDUTYPE2_UPDATE); } free_stream(s); @@ -432,7 +432,7 @@ libxrdp_send_bell(struct xrdp_session *session) LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_PLAY_SOUND_PDU_DATA " "duration 100 ms, frequency 440 Hz"); - if (xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, RDP_DATA_PDU_PLAY_SOUND) != 0) + if (xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, PDUTYPE2_PLAY_SOUND) != 0) { LOG(LOG_LEVEL_ERROR, "libxrdp_send_bell: xrdp_rdp_send_data failed"); free_stream(s); @@ -621,7 +621,7 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height, RDP_UPDATE_BITMAP, num_updates); xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, - RDP_DATA_PDU_UPDATE); + PDUTYPE2_UPDATE); if (total_bufsize > MAX_BITMAP_BUF_SIZE) { @@ -729,7 +729,7 @@ libxrdp_send_bitmap(struct xrdp_session *session, int width, int height, "rectangles ", RDP_UPDATE_BITMAP); xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, - RDP_DATA_PDU_UPDATE); + PDUTYPE2_UPDATE); i = i + lines_sending; } } @@ -753,7 +753,7 @@ libxrdp_send_pointer_system(struct xrdp_session *session, int pointer_type) out_uint32_le(s, pointer_type); s_mark_end(s); xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, - RDP_DATA_PDU_POINTER); + PDUTYPE2_POINTER); free_stream(s); return 0; } @@ -965,7 +965,7 @@ libxrdp_send_pointer(struct xrdp_session *session, int cache_idx, bpp, cache_idx, x, y, width, height, mask_bytes, data_bytes); } xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, - RDP_DATA_PDU_POINTER); + PDUTYPE2_POINTER); } free_stream(s); return 0; @@ -1019,7 +1019,7 @@ libxrdp_set_pointer(struct xrdp_session *session, int cache_idx) LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_CACHEDPOINTERATTRIBUTE " "cacheIndex %d", cache_idx); xrdp_rdp_send_data((struct xrdp_rdp *)session->rdp, s, - RDP_DATA_PDU_POINTER); + PDUTYPE2_POINTER); } free_stream(s); return 0; diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index 79b33472..36ba9764 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -169,7 +169,7 @@ xrdp_orders_send(struct xrdp_orders *self) else { if (xrdp_rdp_send_data(self->rdp_layer, self->out_s, - RDP_DATA_PDU_UPDATE) != 0) + PDUTYPE2_UPDATE) != 0) { LOG(LOG_LEVEL_ERROR, "xrdp_orders_send: xrdp_rdp_send_data failed"); @@ -207,7 +207,7 @@ xrdp_orders_force_send(struct xrdp_orders *self) else { if (xrdp_rdp_send_data(self->rdp_layer, self->out_s, - RDP_DATA_PDU_UPDATE) != 0) + PDUTYPE2_UPDATE) != 0) { return 1; } diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index ff74f8e3..8521a3f4 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -914,7 +914,7 @@ xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self) "updateType %s (%d)", GRAPHICS_UPDATE_TYPE_TO_STR(RDP_UPDATE_SYNCHRONIZE), RDP_UPDATE_SYNCHRONIZE); - if (xrdp_rdp_send_data(self, s, RDP_DATA_PDU_UPDATE) != 0) + if (xrdp_rdp_send_data(self, s, PDUTYPE2_UPDATE) != 0) { LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] TS_UPDATE_SYNC failed"); free_stream(s); @@ -1095,7 +1095,7 @@ xrdp_rdp_send_synchronise(struct xrdp_rdp *self) LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_SYNCHRONIZE_PDU " "messageType 1, targetUser 1002"); - if (xrdp_rdp_send_data(self, s, RDP_DATA_PDU_SYNCHRONISE) != 0) + if (xrdp_rdp_send_data(self, s, PDUTYPE2_SYNCHRONISE) != 0) { LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] TS_SYNCHRONIZE_PDU failed"); free_stream(s); @@ -1131,7 +1131,7 @@ xrdp_rdp_send_control(struct xrdp_rdp *self, int action, LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_CONTROL_PDU " "action %d, grantId 0, controlId 1002", action); - if (xrdp_rdp_send_data(self, s, RDP_DATA_PDU_CONTROL) != 0) + if (xrdp_rdp_send_data(self, s, PDUTYPE2_CONTROL) != 0) { LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] TS_CONTROL_PDU failed"); free_stream(s); @@ -1388,7 +1388,7 @@ xrdp_rdp_send_set_error(struct xrdp_rdp *self, int reason) LOG_DEVEL(LOG_LEVEL_TRACE, "Sending [MS-RDPBCGR] TS_SET_ERROR_INFO_PDU " "errorInfo 0x%8.8x", reason); - if (xrdp_rdp_send_data(self, s, RDP_DATA_PDU_DISCONNECT) != 0) + if (xrdp_rdp_send_data(self, s, PDUTYPE2_SET_ERROR_INFO_PDU) != 0) { LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] TS_SET_ERROR_INFO_PDU failed"); @@ -1549,35 +1549,35 @@ xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s) switch (pduType2) { - case RDP_DATA_PDU_POINTER: /* 27(0x1b) */ + case PDUTYPE2_POINTER: xrdp_rdp_process_data_pointer(self, s); break; - case RDP_DATA_PDU_INPUT: /* 28(0x1c) */ + case PDUTYPE2_INPUT: xrdp_rdp_process_data_input(self, s); break; - case RDP_DATA_PDU_CONTROL: /* 20(0x14) */ + case PDUTYPE2_CONTROL: xrdp_rdp_process_data_control(self, s); break; - case RDP_DATA_PDU_SYNCHRONISE: /* 31(0x1f) */ + case PDUTYPE2_SYNCHRONISE: xrdp_rdp_process_data_sync(self); break; case PDUTYPE2_REFRESH_RECT: xrdp_rdp_process_screen_update(self, s); break; - case PDUTYPE2_SUPPRESS_OUTPUT: /* 35(0x23) */ + case PDUTYPE2_SUPPRESS_OUTPUT: xrdp_rdp_process_suppress(self, s); break; - case PDUTYPE2_SHUTDOWN_REQUEST: /* 36(0x24) ?? disconnect query? */ + case PDUTYPE2_SHUTDOWN_REQUEST: /* when this message comes, send a 37 back so the client */ /* is sure the connection is alive and it can ask if user */ /* really wants to disconnect */ LOG_DEVEL(LOG_LEVEL_TRACE, "Received [MS-RDPBCGR] TS_SHUTDOWN_REQ_PDU"); xrdp_rdp_send_disconnect_query_response(self); /* send a 37 back */ break; - case RDP_DATA_PDU_FONT2: /* 39(0x27) */ + case PDUTYPE2_FONTLIST: xrdp_rdp_process_data_font(self, s); break; - case 56: /* PDUTYPE2_FRAME_ACKNOWLEDGE 0x38 */ + case PDUTYPE2_FRAME_ACKNOWLEDGE: xrdp_rdp_process_frame_ack(self, s); break; default: @@ -1680,7 +1680,7 @@ xrdp_rdp_send_session_info(struct xrdp_rdp *self, const char *data, "infoType 0x%8.8x, infoData ", *((unsigned int *) data)); - if (xrdp_rdp_send_data(self, s, RDP_DATA_PDU_LOGON) != 0) + if (xrdp_rdp_send_data(self, s, PDUTYPE2_SAVE_SESSION_INFO) != 0) { LOG(LOG_LEVEL_ERROR, "Sending [MS-RDPBCGR] TS_SAVE_SESSION_INFO_PDU_DATA failed"); free_stream(s);