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

GUACAMOLE-249: Migrate to libwinpr "CF_*" constants for clipboard formats.

Browse Source 
The "CB_FORMAT_*" constants which used to be defined by FreeRDP no
longer exist.
This commit is contained in:
Michael Jumper 2019-09-22 12:24:16 -07:00
parent 3b560044bc
commit 9fa9adbd58
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/protocols/rdp/rdp.c
View File

@ -566,7 +566,7 @@ static int guac_rdp_handle_connection(guac_client* client) {
rdp_client->current_surface = rdp_client->display->default_surface; rdp_client->current_surface = rdp_client->display->default_surface;
rdp_client->requested_clipboard_format = CB_FORMAT_TEXT; rdp_client->requested_clipboard_format = CF_TEXT;
rdp_client->available_svc = guac_common_list_alloc(); rdp_client->available_svc = guac_common_list_alloc();
freerdp_channels_global_init(); freerdp_channels_global_init();

20
src/protocols/rdp/rdp_cliprdr.c
View File

@ -82,8 +82,8 @@ void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event) {
/* Respond with supported format list */ /* Respond with supported format list */
format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2); format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2);
format_list->formats[0] = CB_FORMAT_TEXT; format_list->formats[0] = CF_TEXT;
format_list->formats[1] = CB_FORMAT_UNICODETEXT; format_list->formats[1] = CF_UNICODETEXT;
format_list->num_formats = 2; format_list->num_formats = 2;
freerdp_channels_send_event(channels, (wMessage*) format_list); freerdp_channels_send_event(channels, (wMessage*) format_list);
@ -132,22 +132,22 @@ void guac_rdp_process_cb_format_list(guac_client* client,
for (i=0; i<event->num_formats; i++) { for (i=0; i<event->num_formats; i++) {
/* If plain text available, request it */ /* If plain text available, request it */
if (event->formats[i] == CB_FORMAT_TEXT) if (event->formats[i] == CF_TEXT)
formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252; formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252;
else if (event->formats[i] == CB_FORMAT_UNICODETEXT) else if (event->formats[i] == CF_UNICODETEXT)
formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16; formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16;
} }
/* Prefer Unicode to plain text */ /* Prefer Unicode to plain text */
if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) { if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) {
__guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT); __guac_rdp_cb_request_format(client, CF_UNICODETEXT);
return; return;
} }
/* Use plain text if Unicode unavailable */ /* Use plain text if Unicode unavailable */
if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) { if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) {
__guac_rdp_cb_request_format(client, CB_FORMAT_TEXT); __guac_rdp_cb_request_format(client, CF_TEXT);
return; return;
} }
@ -171,11 +171,11 @@ void guac_rdp_process_cb_data_request(guac_client* client,
/* Determine output encoding */ /* Determine output encoding */
switch (event->format) { switch (event->format) {
case CB_FORMAT_TEXT: case CF_TEXT:
writer = GUAC_WRITE_CP1252; writer = GUAC_WRITE_CP1252;
break; break;
case CB_FORMAT_UNICODETEXT: case CF_UNICODETEXT:
writer = GUAC_WRITE_UTF16; writer = GUAC_WRITE_UTF16;
break; break;
@ -218,12 +218,12 @@ void guac_rdp_process_cb_data_response(guac_client* client,
switch (rdp_client->requested_clipboard_format) { switch (rdp_client->requested_clipboard_format) {
/* Non-Unicode */ /* Non-Unicode */
case CB_FORMAT_TEXT: case CF_TEXT:
reader = GUAC_READ_CP1252; reader = GUAC_READ_CP1252;
break; break;
/* Unicode (UTF-16) */ /* Unicode (UTF-16) */
case CB_FORMAT_UNICODETEXT: case CF_UNICODETEXT:
reader = GUAC_READ_UTF16; reader = GUAC_READ_UTF16;
break; break;

4
src/protocols/rdp/rdp_stream.c
View File

@ -293,8 +293,8 @@ int guac_rdp_clipboard_end_handler(guac_user* user, guac_stream* stream) {
/* Notify server that text data is now available */ /* Notify server that text data is now available */
format_list->formats = (UINT32*) malloc(sizeof(UINT32) * 2); format_list->formats = (UINT32*) malloc(sizeof(UINT32) * 2);
format_list->formats[0] = CB_FORMAT_TEXT; format_list->formats[0] = CF_TEXT;
format_list->formats[1] = CB_FORMAT_UNICODETEXT; format_list->formats[1] = CF_UNICODETEXT;
format_list->num_formats = 2; format_list->num_formats = 2;
freerdp_channels_send_event(channels, (wMessage*) format_list); freerdp_channels_send_event(channels, (wMessage*) format_list);