From 49ffaf08266aa9bcc1062ec34a3296fbb508ec1f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 2 Apr 2014 14:10:45 -0700 Subject: [PATCH] GUAC-584: Use CP1252 for RDP copy of non-unicode text. --- src/protocols/rdp/rdp_cliprdr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/protocols/rdp/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c index 24b8fe41..4008e6a0 100644 --- a/src/protocols/rdp/rdp_cliprdr.c +++ b/src/protocols/rdp/rdp_cliprdr.c @@ -153,14 +153,12 @@ void guac_rdp_process_cb_format_list(guac_client* client, /* Prefer Unicode to plain text */ if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) { - guac_client_log_info(client, "Requesting unicode text"); __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT); return; } /* Use plain text if Unicode unavailable */ 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); return; } @@ -226,7 +224,7 @@ void guac_rdp_process_cb_data_response(guac_client* client, /* Non-Unicode */ case CB_FORMAT_TEXT: - reader = GUAC_READ_UTF8; + reader = GUAC_READ_CP1252; break; /* Unicode (UTF-16) */