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

Merge pull request #4527 from jkaivo/master

Browse Source 
PCB support
This commit is contained in:
akallabeth 2018-04-03 10:22:08 +02:00 committed by GitHub
commit a51e5a9084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/common/file.c
View File

@ -298,6 +298,8 @@ static int freerdp_client_rdp_file_set_string(rdpFile* file, const char* name, c
tmp = &file->DevicesToRedirect;
else if (_stricmp(name, "winposstr") == 0)
tmp = &file->WinPosStr;
else if (_stricmp(name, "pcb") == 0)
tmp = &file->PreconnectionBlob;
else
standard = 1;
@ -612,6 +614,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
SETTING_MODIFIED_SET_STRING(file->RemoteApplicationCmdLine, settings, RemoteApplicationCmdLine);
SETTING_MODIFIED_SET(file->SpanMonitors, settings, SpanMonitors);
SETTING_MODIFIED_SET(file->UseMultiMon, settings, UseMultimon);
SETTING_MODIFIED_SET_STRING(file->PreconnectionBlob, settings, PreconnectionBlob);
return TRUE;
}
@ -1058,6 +1061,13 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
freerdp_set_param_uint32(settings, FreeRDP_KeyboardHook, file->KeyboardHook);
}
if (~((size_t) file->PreconnectionBlob))
{
freerdp_set_param_string(settings, FreeRDP_PreconnectionBlob, file->PreconnectionBlob);
freerdp_set_param_bool(settings, FreeRDP_SendPreconnectionPdu, TRUE);
freerdp_set_param_bool(settings, FreeRDP_VmConnectMode, TRUE);
}
if (file->argc > 1)
{
char* ConnectionFile = settings->ConnectionFile;

2
include/freerdp/client/file.h
View File

@ -151,6 +151,8 @@ struct rdp_file
LPSTR DevicesToRedirect; /* devicestoredirect */
LPSTR WinPosStr; /* winposstr */
LPSTR PreconnectionBlob; /* pcb */
int lineCount;
int lineSize;
rdpFileLine* lines;