mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2014-12-21 14:22:09 -05:00
commit d5edfa4721
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/core/client.c
View File

@ -242,8 +242,6 @@ int freerdp_channels_data(freerdp* instance, UINT16 channelId, BYTE* data, int d
for (index = 0; index < mcs->channelCount; index++)
{
channel = &mcs->channels[index];
if (mcs->channels[index].ChannelId == channelId)
{
channel = &mcs->channels[index];

4
libfreerdp/core/server.c
View File

@ -691,7 +691,7 @@ HANDLE WINAPI FreeRDP_WTSOpenServerA(LPSTR pServerName)
vcm->queue = MessageQueue_New(NULL);
vcm->dvc_channel_id_seq = 1;
vcm->dvc_channel_id_seq = 0;
vcm->dynamicVirtualChannels = ArrayList_New(TRUE);
client->ReceiveChannelData = WTSReceiveChannelData;
@ -991,7 +991,7 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualNam
channel->receiveData = Stream_New(NULL, client->settings->VirtualChannelChunkSize);
channel->queue = MessageQueue_New(NULL);
channel->channelId = vcm->dvc_channel_id_seq++;
channel->channelId = InterlockedIncrement(&vcm->dvc_channel_id_seq);
ArrayList_Add(vcm->dynamicVirtualChannels, channel);
s = Stream_New(NULL, 64);

2
libfreerdp/core/server.h
View File

@ -90,7 +90,7 @@ struct WTSVirtualChannelManager
rdpPeerChannel* drdynvc_channel;
BYTE drdynvc_state;
UINT32 dvc_channel_id_seq;
LONG dvc_channel_id_seq;
wArrayList* dynamicVirtualChannels;
};