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

GUAC-584: Use CP1252 for RDP copy of non-unicode text.

Browse Source
This commit is contained in:
Michael Jumper 2014-04-02 14:10:45 -07:00
parent da5404f612
commit 49ffaf0826
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,14 +153,12 @@ void guac_rdp_process_cb_format_list(guac_client* client,
/* 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_client_log_info(client, "Requesting unicode text");
__guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT); __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT);
return; return;
} }
/* Use plain text if Unicode unavailable */ /* Use plain text if Unicode unavailable */
if (formats & GUAC_RDP_CLIPBOARD_FORMAT_ISO8859_1) { if (formats & GUAC_RDP_CLIPBOARD_FORMAT_ISO8859_1) {
guac_client_log_info(client, "Requesting plain text");
__guac_rdp_cb_request_format(client, CB_FORMAT_TEXT); __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT);
return; return;
} }
@ -226,7 +224,7 @@ void guac_rdp_process_cb_data_response(guac_client* client,
/* Non-Unicode */ /* Non-Unicode */
case CB_FORMAT_TEXT: case CB_FORMAT_TEXT:
reader = GUAC_READ_UTF8; reader = GUAC_READ_CP1252;
break; break;
/* Unicode (UTF-16) */ /* Unicode (UTF-16) */