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

Fixed TestConnect with dynamic channels.

Browse Source
This commit is contained in:
Armin Novak 2017-09-25 13:30:05 +02:00
parent 2e83abb90c
commit ac454628ae
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libfreerdp/core/test/TestConnect.c
View File

@ -9,21 +9,23 @@ static HANDLE s_sync = NULL;
static int runInstance(int argc, char* argv[], freerdp** inst) static int runInstance(int argc, char* argv[], freerdp** inst)
{ {
int rc = -1; int rc = -1;
freerdp* instance = freerdp_new(); RDP_CLIENT_ENTRY_POINTS clientEntryPoints;
ZeroMemory(&clientEntryPoints, sizeof(RDP_CLIENT_ENTRY_POINTS));
clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS);
clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION;
clientEntryPoints.ContextSize = sizeof(rdpContext);
rdpContext* context = freerdp_client_context_new(&clientEntryPoints);
if (!instance) if (!context)
goto finish; goto finish;
if (inst) if (inst)
*inst = instance; *inst = context->instance;
if (!freerdp_context_new(instance)) if (freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE) < 0)
goto finish; goto finish;
if (freerdp_client_settings_parse_command_line(instance->settings, argc, argv, FALSE) < 0) if (!freerdp_client_load_addins(context->channels, context->settings))
goto finish;
if (!freerdp_client_load_addins(instance->context->channels, instance->settings))
goto finish; goto finish;
if (s_sync) if (s_sync)
@ -34,18 +36,17 @@ static int runInstance(int argc, char* argv[], freerdp** inst)
rc = 1; rc = 1;
if (!freerdp_connect(instance)) if (!freerdp_connect(context->instance))
goto finish; goto finish;
rc = 2; rc = 2;
if (!freerdp_disconnect(instance)) if (!freerdp_disconnect(context->instance))
goto finish; goto finish;
rc = 0; rc = 0;
finish: finish:
freerdp_context_free(instance); freerdp_client_context_free(context);
freerdp_free(instance);
return rc; return rc;
} }