Merge pull request #1709 from bmiklautz/fix/sfreerdp

sfreerdp: updated to use latest WTSAPI
This commit is contained in:
Marc-André Moreau 2014-03-03 12:13:37 -05:00
commit 1d67de61c9
2 changed files with 6 additions and 3 deletions

View File

@ -30,6 +30,9 @@
#include <winpr/crt.h>
#include <winpr/synch.h>
#include <freerdp/channels/wtsvc.h>
#include <freerdp/channels/channels.h>
#include <freerdp/constants.h>
#include <freerdp/utils/tcp.h>
@ -450,7 +453,6 @@ static void* tf_debug_channel_thread_func(void* arg)
BOOL tf_peer_post_connect(freerdp_peer* client)
{
int i;
testPeerContext* context = (testPeerContext*) client->context;
/**
@ -492,7 +494,7 @@ BOOL tf_peer_post_connect(freerdp_peer* client)
if (WTSVirtualChannelManagerIsChannelJoined(context->vcm, "rdpdbg"))
{
context->debug_channel = WTSVirtualChannelManagerOpenEx(context->vcm, "rdpdbg", 0);
context->debug_channel = WTSVirtualChannelOpen(context->vcm, WTS_CURRENT_SESSION, "rdpdbg");
if (context->debug_channel != NULL)
{
@ -825,6 +827,7 @@ int main(int argc, char* argv[])
{
freerdp_listener* instance;
WTSRegisterWtsApiFunctionTable(FreeRDP_InitWtsApi());
instance = freerdp_listener_new();
instance->PeerAccepted = test_peer_accepted;

View File

@ -48,7 +48,7 @@ struct test_peer_context
BOOL activated;
HANDLE event;
HANDLE stopEvent;
WTSVirtualChannelManager* vcm;
HANDLE vcm;
void* debug_channel;
HANDLE debug_channel_thread;
audin_server_context* audin;