morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

wtsapi: add new kind of query to retrieve the open status

Browse Source
This commit is contained in:
David Fort
2022-12-26 00:01:27 +01:00
committed by Martin Fleisz
parent 73495a1576
commit 9e3bc8e3af
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libfreerdp/core/server.c
View File

@@ -192,6 +192,7 @@ static BOOL wts_read_drdynvc_create_response(rdpPeerChannel* channel, wStream* s
channel->dvc_open_state = DVC_OPEN_STATE_SUCCEEDED;
}
channel->creationStatus = (INT32)CreationStatus;
IFCALLRET(channel->vcm->dvc_creation_status, status, channel->vcm->dvc_creation_status_userdata,
channel->channelId, (INT32)CreationStatus);
if (!status)
@@ -1216,6 +1217,8 @@ static rdpPeerChannel* channel_new(WTSVirtualChannelManager* vcm, freerdp_peer*
channel->channelId = ChannelId;
channel->index = index;
channel->channelType = type;
channel->creationStatus =
(type == RDP_PEER_CHANNEL_TYPE_SVC) ? ERROR_SUCCESS : ERROR_OPERATION_IN_PROGRESS;
channel->receiveData = Stream_New(NULL, chunkSize);
if (!channel->receiveData)
@@ -1628,11 +1631,10 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CL
WINPR_ASSERT(channel);
hEvent = MessageQueue_Event(channel->queue);
switch ((UINT32)WtsVirtualClass)
{
case WTSVirtualFileHandle:
hEvent = MessageQueue_Event(channel->queue);
pfd = GetEventWaitObject(hEvent);
if (pfd)
@@ -1657,6 +1659,8 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CL
break;
case WTSVirtualEventHandle:
hEvent = MessageQueue_Event(channel->queue);
*ppBuffer = malloc(sizeof(HANDLE));
if (!*ppBuffer)
@@ -1713,7 +1717,24 @@ BOOL WINAPI FreeRDP_WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CL
}
break;
case WTSVirtualChannelOpenStatus:
{
INT32 value = channel->creationStatus;
status = TRUE;
*ppBuffer = malloc(sizeof(value));
if (!*ppBuffer)
{
SetLastError(E_OUTOFMEMORY);
status = FALSE;
}
else
{
CopyMemory(*ppBuffer, &value, sizeof(value));
*pBytesReturned = sizeof(value);
}
break;
}
default:
break;
}

1
libfreerdp/core/server.h
View File

@@ -64,6 +64,7 @@ struct rdp_peer_channel
wMessageQueue* queue;
BYTE dvc_open_state;
INT32 creationStatus;
UINT32 dvc_total_length;
rdpMcsChannel* mcsChannel;

5
winpr/include/winpr/wtsapi.h
View File

@@ -760,8 +760,9 @@ typedef enum
{
WTSVirtualClientData,
WTSVirtualFileHandle,
WTSVirtualEventHandle, /* Extended */
WTSVirtualChannelReady /* Extended */
WTSVirtualEventHandle, /* Extended */
WTSVirtualChannelReady, /* Extended */
WTSVirtualChannelOpenStatus /* Extended */
} WTS_VIRTUAL_CLASS;
typedef struct