maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Init RemoteApp settings. Load RAIL plugin.

Browse Source
This commit is contained in:
Michael Jumper 2014-01-29 16:25:30 -08:00
parent 56c8c4f740
commit 68879cc2ec
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/protocols/rdp/client.c
View File

@ -188,6 +188,34 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
} }
/* Load RAIL plugin if RemoteApp in use */
if (guac_client_data->settings.remote_app_name != NULL
|| guac_client_data->settings.remote_app_command != NULL) {
#ifdef LEGACY_FREERDP
RDP_PLUGIN_DATA* plugin_data = malloc(sizeof(RDP_PLUGIN_DATA) * 2);
plugin_data[0].size = sizeof(RDP_PLUGIN_DATA);
plugin_data[0].data[0] = guac_client_data->settings.remote_app_name;
plugin_data[0].data[1] = guac_client_data->settings.remote_app_command;
plugin_data[0].data[2] = NULL;
plugin_data[0].data[3] = NULL;
plugin_data[1].size = 0;
/* Attempt to load rail */
if (freerdp_channels_load_plugin(channels, instance->settings,
"rail", plugin_data))
guac_client_log_error(client, "Failed to load rail plugin.");
#else
/* Attempt to load rail */
if (freerdp_channels_load_plugin(channels, instance->settings,
"rail", instance->settings))
guac_client_log_error(client, "Failed to load rail plugin.");
#endif
}
/* Init color conversion structure */ /* Init color conversion structure */
clrconv = calloc(1, sizeof(CLRCONV)); clrconv = calloc(1, sizeof(CLRCONV));
clrconv->alpha = 1; clrconv->alpha = 1;

16
src/protocols/rdp/rdp_settings.c
View File

@ -169,6 +169,22 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
rdp_settings->DisableEncryption = FALSE; rdp_settings->DisableEncryption = FALSE;
#endif #endif
/* RemoteApp */
if (guac_settings->remote_app_name != NULL
|| guac_settings->remote_app_command != NULL) {
#ifdef LEGACY_RDPSETTINGS
rdp_settings->workarea = TRUE;
rdp_settings->remote_app = TRUE;
rdp_settings->rail_langbar_supported = TRUE;
#else
rdp_settings->Workarea = TRUE;
rdp_settings->RemoteApplicationMode = TRUE;
rdp_settings->RemoteAppLanguageBarSupported = TRUE;
rdp_settings->RemoteApplicationProgram = guac_settings->remote_app_name;
rdp_settings->RemoteApplicationCmdLine = guac_settings->remote_app_command;
#endif
}
/* Order support */ /* Order support */
#ifdef LEGACY_RDPSETTINGS #ifdef LEGACY_RDPSETTINGS
bitmap_cache = rdp_settings->bitmap_cache; bitmap_cache = rdp_settings->bitmap_cache;