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

ms-rdpbcgr.h : Rename incorrect pointer update constants

Browse Source 
Rename the defines from [MS-RDPBCGR] 2.2.9.1.1.4 and
2.2.9.1.1.4.3 to match the documentation.
This commit is contained in:
matt335672
2025-09-09 12:00:12 +01:00
parent aade869fb7
commit 557b580cb0
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/ms-rdpbcgr.h
+10 -8
View File
@@ -542,16 +542,18 @@
)
/* Server Pointer Update PDU: messageType (2.2.9.1.1.4) */
/* TODO: to be renamed */
#define RDP_POINTER_SYSTEM 1 /* TS_PTRMSGTYPE_SYSTEM */
#define RDP_POINTER_MOVE 3
#define RDP_POINTER_COLOR 6
#define RDP_POINTER_CACHED 7
#define RDP_POINTER_POINTER 8
#define TS_PTRMSGTYPE_SYSTEM 1
#define TS_PTRMSGTYPE_POSITION 3
#define TS_PTRMSGTYPE_COLOR 6
#define TS_PTRMSGTYPE_CACHED 7
#define TS_PTRMSGTYPE_POINTER 8
/* System Pointer Update: systemPointerType (2.2.9.1.1.4.3) */
#define RDP_NULL_POINTER 0
#define RDP_DEFAULT_POINTER 0x7F00
/* These may also be defined by freerdp */
#ifndef SYSPTR_NULL
#define SYSPTR_NULL 0
#define SYSPTR_DEFAULT 0x7F00
#endif
/* Server Fast-Path Update PDU: action (2.2.9.1.2) */
#define FASTPATH_OUTPUT_ACTION_FASTPATH 0x0
libxrdp/libxrdp.c
+7 -7
View File
@@ -748,7 +748,7 @@ libxrdp_send_pointer_system(struct xrdp_session *session, int pointer_type)
make_stream(s);
init_stream(s, 8192);
xrdp_rdp_init_data((struct xrdp_rdp *)(session->rdp), s);
out_uint16_le(s, RDP_POINTER_SYSTEM);
out_uint16_le(s, TS_PTRMSGTYPE_SYSTEM);
out_uint16_le(s, 0); /* pad */
out_uint32_le(s, pointer_type);
s_mark_end(s);
@@ -829,19 +829,19 @@ libxrdp_send_pointer(struct xrdp_session *session, int cache_idx,
xrdp_rdp_init_data((struct xrdp_rdp *)session->rdp, s);
if ((session->client_info->pointer_flags & 1) == 0)
{
out_uint16_le(s, RDP_POINTER_COLOR);
out_uint16_le(s, TS_PTRMSGTYPE_COLOR);
out_uint16_le(s, 0); /* pad */
LOG_DEVEL(LOG_LEVEL_TRACE, "Adding header [MS-RDPBCGR] TS_POINTER_PDU "
"messageType %d (TS_PTRMSGTYPE_COLOR), pad2Octets <ignored>",
RDP_POINTER_COLOR);
TS_PTRMSGTYPE_COLOR);
}
else
{
out_uint16_le(s, RDP_POINTER_POINTER);
out_uint16_le(s, TS_PTRMSGTYPE_POINTER);
out_uint16_le(s, 0); /* pad */
LOG_DEVEL(LOG_LEVEL_TRACE, "Adding header [MS-RDPBCGR] TS_POINTER_PDU "
"messageType %d (TS_PTRMSGTYPE_POINTER), pad2Octets <ignored>",
RDP_POINTER_POINTER);
TS_PTRMSGTYPE_POINTER);
out_uint16_le(s, bpp); /* TS_POINTERATTRIBUTE -> xorBpp */
}
@@ -992,11 +992,11 @@ libxrdp_set_pointer(struct xrdp_session *session, int cache_idx)
else
{
xrdp_rdp_init_data((struct xrdp_rdp *)session->rdp, s);
out_uint16_le(s, RDP_POINTER_CACHED);
out_uint16_le(s, TS_PTRMSGTYPE_CACHED);
out_uint16_le(s, 0); /* pad */
LOG_DEVEL(LOG_LEVEL_TRACE, "Adding header [MS-RDPBCGR] TS_POINTER_PDU "
"messageType %d (TS_PTRMSGTYPE_CACHED), pad2Octets <ignored>",
RDP_POINTER_CACHED);
TS_PTRMSGTYPE_CACHED);
}
out_uint16_le(s, cache_idx); /* cache_idx */