From d60045ae1a8b269d800e6a1bdeb942291b43f0a1 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 13 Jan 2026 16:43:59 +0100 Subject: [PATCH] [chanels,various] fix VirtualChannelEntryEx parameter types --- channels/cliprdr/client/cliprdr_main.c | 2 +- channels/rail/client/rail_main.c | 2 +- channels/rdp2tcp/client/rdp2tcp_main.c | 2 +- channels/rdpdr/client/rdpdr_main.c | 13 +++++-------- channels/rdpsnd/client/rdpsnd_main.c | 4 ++-- channels/remdesk/client/remdesk_main.c | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index fc88dbcf0..f4ce710d9 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -1134,7 +1134,7 @@ static VOID VCAPITYPE cliprdr_virtual_channel_init_event_ex(LPVOID lpUserParam, /* cliprdr is always built-in */ #define VirtualChannelEntryEx cliprdr_VirtualChannelEntryEx -FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, +FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { UINT rc = 0; diff --git a/channels/rail/client/rail_main.c b/channels/rail/client/rail_main.c index 256336481..41fa9c8d3 100644 --- a/channels/rail/client/rail_main.c +++ b/channels/rail/client/rail_main.c @@ -676,7 +676,7 @@ static VOID VCAPITYPE rail_virtual_channel_init_event_ex(LPVOID lpUserParam, LPV /* rail is always built-in */ #define VirtualChannelEntryEx rail_VirtualChannelEntryEx -FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, +FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { UINT rc = 0; diff --git a/channels/rdp2tcp/client/rdp2tcp_main.c b/channels/rdp2tcp/client/rdp2tcp_main.c index 69ad8564d..826f152c1 100644 --- a/channels/rdp2tcp/client/rdp2tcp_main.c +++ b/channels/rdp2tcp/client/rdp2tcp_main.c @@ -289,7 +289,7 @@ static VOID VCAPITYPE VirtualChannelInitEventEx(LPVOID lpUserParam, LPVOID pInit } #define VirtualChannelEntryEx rdp2tcp_VirtualChannelEntryEx -FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, +FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index cc84c8ac8..caf2d6371 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -2420,17 +2420,13 @@ static VOID VCAPITYPE rdpdr_virtual_channel_init_event_ex(LPVOID lpUserParam, LP /* rdpdr is always built-in */ #define VirtualChannelEntryEx rdpdr_VirtualChannelEntryEx -FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, +FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { - UINT rc = 0; - rdpdrPlugin* rdpdr = NULL; - CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = NULL; - WINPR_ASSERT(pEntryPoints); WINPR_ASSERT(pInitHandle); - rdpdr = (rdpdrPlugin*)calloc(1, sizeof(rdpdrPlugin)); + rdpdrPlugin* rdpdr = (rdpdrPlugin*)calloc(1, sizeof(rdpdrPlugin)); if (!rdpdr) { @@ -2463,7 +2459,8 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS p (void)sprintf_s(rdpdr->channelDef.name, ARRAYSIZE(rdpdr->channelDef.name), RDPDR_SVC_CHANNEL_NAME); rdpdr->sequenceId = 0; - pEntryPointsEx = (CHANNEL_ENTRY_POINTS_FREERDP_EX*)pEntryPoints; + CHANNEL_ENTRY_POINTS_FREERDP_EX* pEntryPointsEx = + (CHANNEL_ENTRY_POINTS_FREERDP_EX*)pEntryPoints; if ((pEntryPointsEx->cbSize >= sizeof(CHANNEL_ENTRY_POINTS_FREERDP_EX)) && (pEntryPointsEx->MagicNumber == FREERDP_CHANNEL_MAGIC_NUMBER)) @@ -2476,7 +2473,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS p CopyMemory(&(rdpdr->channelEntryPoints), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_FREERDP_EX)); rdpdr->InitHandle = pInitHandle; - rc = rdpdr->channelEntryPoints.pVirtualChannelInitEx( + const UINT rc = rdpdr->channelEntryPoints.pVirtualChannelInitEx( rdpdr, &rdpdr->context, pInitHandle, &rdpdr->channelDef, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, rdpdr_virtual_channel_init_event_ex); diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index af313f8d7..49c763a87 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -1567,8 +1567,8 @@ fail: return NULL; } /* rdpsnd is always built-in */ -FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, - PVOID pInitHandle)) +FREERDP_ENTRY_POINT(BOOL VCAPITYPE rdpsnd_VirtualChannelEntryEx( + PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { UINT rc = 0; rdpsndPlugin* rdpsnd = NULL; diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index e1a75cb9b..4127c789e 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -987,7 +987,7 @@ static VOID VCAPITYPE remdesk_virtual_channel_init_event_ex(LPVOID lpUserParam, /* remdesk is always built-in */ #define VirtualChannelEntryEx remdesk_VirtualChannelEntryEx -FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, +FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS_EX pEntryPoints, PVOID pInitHandle)) { UINT rc = 0;