mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed arguments for peer->ReceiveChannelData

This commit is contained in:
Armin Novak 2020-03-04 14:52:19 +01:00
parent 0f729d2b2c
commit d7ba252cd7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/peer.h
View File

@ -54,7 +54,7 @@ typedef BOOL (*psPeerClientCapabilities)(freerdp_peer* peer);
typedef int (*psPeerSendChannelData)(freerdp_peer* peer, UINT16 channelId, const BYTE* data,
int size);
typedef int (*psPeerReceiveChannelData)(freerdp_peer* peer, UINT16 channelId, const BYTE* data,
int size, int flags, int totalSize);
size_t size, UINT32 flags, size_t totalSize);
typedef HANDLE (*psPeerVirtualChannelOpen)(freerdp_peer* peer, const char* name, UINT32 flags);
typedef BOOL (*psPeerVirtualChannelClose)(freerdp_peer* peer, HANDLE hChannel);

10
libfreerdp/core/server.c
View File

@ -359,13 +359,13 @@ static BOOL wts_write_drdynvc_create_request(wStream* s, UINT32 ChannelId, const
}
static BOOL WTSProcessChannelData(rdpPeerChannel* channel, UINT16 channelId, const BYTE* data,
int s, int flags, int t)
size_t s, UINT32 flags, size_t t)
{
BOOL ret = TRUE;
const size_t size = (size_t)s;
const size_t totalSize = (size_t)t;
if ((s < 0) || (t < 0))
return FALSE;
WINPR_UNUSED(channelId);
if (flags & CHANNEL_FLAG_FIRST)
{
@ -400,8 +400,8 @@ static BOOL WTSProcessChannelData(rdpPeerChannel* channel, UINT16 channelId, con
return ret;
}
static int WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const BYTE* data, int size,
int flags, int totalSize)
static int WTSReceiveChannelData(freerdp_peer* client, UINT16 channelId, const BYTE* data,
size_t size, UINT32 flags, size_t totalSize)
{
UINT32 i;
BOOL status = FALSE;

3
server/proxy/pf_server.c
View File

@ -199,7 +199,8 @@ static BOOL pf_server_adjust_monitor_layout(freerdp_peer* peer)
}
static int pf_server_receive_channel_data_hook(freerdp_peer* peer, UINT16 channelId,
const BYTE* data, int size, int flags, int totalSize)
const BYTE* data, size_t size, UINT32 flags,
size_t totalSize)
{
pServerContext* ps = (pServerContext*)peer->context;
pClientContext* pc = ps->pdata->pc;