diff options
| author | Jean-Louis Dupond <jean-louis@dupond.be> | 2013-02-11 19:25:48 +0400 |
|---|---|---|
| committer | Jean-Louis Dupond <jean-louis@dupond.be> | 2013-02-11 19:25:48 +0400 |
| commit | 5b83addbac1ac986b275e83c0a23bce0d3d618e8 (patch) | |
| tree | e73d9030aba933c60695501cb4ae18ea37453a90 /remmina-plugins/rdp | |
| parent | 8dfff3bea1879aadc9484585f0422fcff369ccdd (diff) | |
Closes #144: Fix compiling against current FreeRDP master
Diffstat (limited to 'remmina-plugins/rdp')
| -rw-r--r-- | remmina-plugins/rdp/rdp_cliprdr.c | 11 | ||||
| -rw-r--r-- | remmina-plugins/rdp/rdp_gdi.c | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/remmina-plugins/rdp/rdp_cliprdr.c b/remmina-plugins/rdp/rdp_cliprdr.c index 9e7dea5ea..b06e3bee8 100644 --- a/remmina-plugins/rdp/rdp_cliprdr.c +++ b/remmina-plugins/rdp/rdp_cliprdr.c @@ -23,7 +23,6 @@ #include <freerdp/freerdp.h> #include <freerdp/utils/event.h> -#include <freerdp/utils/unicode.h> #include <freerdp/channels/channels.h> #include <freerdp/client/cliprdr.h> @@ -204,7 +203,7 @@ void remmina_rdp_cliprdr_process_data_response(RemminaProtocolWidget* gp, RDP_CB int size; rfContext* rfi = GET_DATA(gp); GdkPixbufLoader *pixbuf; - gpointer output; + gpointer output = NULL; data = event->data; size = event->size; @@ -215,7 +214,7 @@ void remmina_rdp_cliprdr_process_data_response(RemminaProtocolWidget* gp, RDP_CB { case CB_FORMAT_UNICODETEXT: { - size = freerdp_UnicodeToAsciiAlloc((WCHAR*)data, (CHAR**)&data, size/2); + size = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*)data, size / 2, (CHAR**)&data, 0, NULL, NULL); crlf2lf(data, &size); output = data; break; @@ -277,10 +276,6 @@ void remmina_rdp_cliprdr_process_data_response(RemminaProtocolWidget* gp, RDP_CB } } } - else - { - output = NULL; - } g_async_queue_push(rfi->clipboard_queue, output); } @@ -428,7 +423,7 @@ void remmina_rdp_cliprdr_get_clipboard_data(RemminaProtocolWidget* gp, RemminaPl { size = strlen((char*)inbuf); inbuf = lf2crlf(inbuf, &size); - size = (freerdp_AsciiToUnicodeAlloc((CHAR*)inbuf, (WCHAR**)&outbuf, 0) + 1) * 2; + size = (ConvertToUnicode(CP_UTF8, 0, (CHAR*)inbuf, -1, (WCHAR**)&outbuf, 0) + 1) * 2; g_free(inbuf); break; } diff --git a/remmina-plugins/rdp/rdp_gdi.c b/remmina-plugins/rdp/rdp_gdi.c index a385b3784..edf29df65 100644 --- a/remmina-plugins/rdp/rdp_gdi.c +++ b/remmina-plugins/rdp/rdp_gdi.c @@ -112,7 +112,7 @@ static void rf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surfa RemminaPluginRdpUiObject* ui; rfContext* rfi = (rfContext*) context; - if (surface_bits_command->codecID == CODEC_ID_REMOTEFX && rfi->rfx_context) + if (surface_bits_command->codecID == RDP_CODEC_ID_REMOTEFX && rfi->rfx_context) { message = rfx_process_message(rfi->rfx_context, surface_bits_command->bitmapData, surface_bits_command->bitmapDataLength); @@ -125,7 +125,7 @@ static void rf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surfa rf_queue_ui(rfi->protocol_widget, ui); } - else if (surface_bits_command->codecID == CODEC_ID_NONE) + else if (surface_bits_command->codecID == RDP_CODEC_ID_NONE) { bitmap = (UINT8*) malloc(surface_bits_command->width * surface_bits_command->height * 4); |