morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refactored ClipboardSetData.

Browse Source
This commit is contained in:
Armin Novak
2016-10-06 13:31:25 +02:00
parent 2db04736ac
commit 8f1adf64ee
7 changed files with 302 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/Android/android_cliprdr.c
View File

@@ -420,14 +420,9 @@ static UINT android_cliprdr_server_format_data_response(
formatId = format->formatId;
size = formatDataResponse->dataLen;
data = (BYTE*) malloc(size);
if (!data)
return ERROR_INTERNAL_ERROR;
CopyMemory(data, formatDataResponse->requestedFormatData, size);
if (!ClipboardSetData(afc->clipboard, formatId, data, size))
if (!ClipboardSetData(afc->clipboard, formatId,
formatDataResponse->requestedFormatData, size))
return ERROR_INTERNAL_ERROR;
SetEvent(afc->clipboardRequestEvent);

125
client/Android/android_event.c
View File

@@ -28,30 +28,30 @@
#include "android_freerdp.h"
#include "android_cliprdr.h"
BOOL android_push_event(freerdp * inst, ANDROID_EVENT* event)
BOOL android_push_event(freerdp* inst, ANDROID_EVENT* event)
{
androidContext* aCtx = (androidContext*)inst->context;
if (aCtx->event_queue->count >= aCtx->event_queue->size)
{
int new_size;
void* new_events;
new_size = aCtx->event_queue->size * 2;
new_events = realloc((void*) aCtx->event_queue->events,
sizeof(ANDROID_EVENT*) * new_size);
sizeof(ANDROID_EVENT*) * new_size);
if (!new_events)
return FALSE;
aCtx->event_queue->events = new_events;
aCtx->event_queue->size = new_size;
}
aCtx->event_queue->events[(aCtx->event_queue->count)++] = event;
return SetEvent(aCtx->event_queue->isSet);
}
static ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE * queue)
static ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE* queue)
{
ANDROID_EVENT* event;
@@ -59,11 +59,10 @@ static ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE * queue)
return NULL;
event = queue->events[0];
return event;
}
static ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE * queue)
static ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE* queue)
{
int i;
ANDROID_EVENT* event;
@@ -101,44 +100,31 @@ static BOOL android_process_event(ANDROID_EVENT_QUEUE* queue, freerdp* inst)
else if (event->type == EVENT_TYPE_KEY_UNICODE)
{
ANDROID_EVENT_KEY* key_event = (ANDROID_EVENT_KEY*) event;
inst->input->UnicodeKeyboardEvent(inst->input, key_event->flags, key_event->scancode);
inst->input->UnicodeKeyboardEvent(inst->input, key_event->flags,
key_event->scancode);
android_event_free((ANDROID_EVENT*)key_event);
}
else if (event->type == EVENT_TYPE_CURSOR)
{
ANDROID_EVENT_CURSOR* cursor_event = (ANDROID_EVENT_CURSOR*) event;
inst->input->MouseEvent(inst->input, cursor_event->flags, cursor_event->x, cursor_event->y);
inst->input->MouseEvent(inst->input, cursor_event->flags, cursor_event->x,
cursor_event->y);
android_event_free((ANDROID_EVENT*)cursor_event);
}
else if (event->type == EVENT_TYPE_CLIPBOARD)
{
BYTE* data;
UINT32 size;
UINT32 formatId;
ANDROID_EVENT_CLIPBOARD* clipboard_event = (ANDROID_EVENT_CLIPBOARD*) event;
formatId = ClipboardRegisterFormat(afc->clipboard, "UTF8_STRING");
size = clipboard_event->data_length;
if (size)
{
data = (BYTE*) malloc(size);
if (!data)
return -1;
CopyMemory(data, clipboard_event->data, size);
ClipboardSetData(afc->clipboard, formatId, (void*) data, size);
}
ClipboardSetData(afc->clipboard, formatId, clipboard_event->data, size);
else
{
ClipboardEmpty(afc->clipboard);
}
android_cliprdr_send_client_format_list(afc->cliprdr);
android_event_free((ANDROID_EVENT*)clipboard_event);
}
else if (event->type == EVENT_TYPE_DISCONNECT)
@@ -151,7 +137,7 @@ static BOOL android_process_event(ANDROID_EVENT_QUEUE* queue, freerdp* inst)
return TRUE;
}
HANDLE android_get_handle(freerdp *inst)
HANDLE android_get_handle(freerdp* inst)
{
androidContext* aCtx;
@@ -159,13 +145,14 @@ HANDLE android_get_handle(freerdp *inst)
return NULL;
aCtx = (androidContext*)inst->context;
if (!aCtx->event_queue || !aCtx->event_queue->isSet)
return NULL;
return aCtx->event_queue->isSet;
}
BOOL android_check_handle(freerdp * inst)
BOOL android_check_handle(freerdp* inst)
{
androidContext* aCtx;
@@ -173,6 +160,7 @@ BOOL android_check_handle(freerdp * inst)
return FALSE;
aCtx = (androidContext*)inst->context;
if (!aCtx->event_queue || !aCtx->event_queue->isSet)
return FALSE;
@@ -180,7 +168,8 @@ BOOL android_check_handle(freerdp * inst)
{
if (!ResetEvent(aCtx->event_queue->isSet))
return FALSE;
if(!android_process_event(aCtx->event_queue, inst))
if (!android_process_event(aCtx->event_queue, inst))
return FALSE;
}
@@ -190,15 +179,14 @@ BOOL android_check_handle(freerdp * inst)
ANDROID_EVENT_KEY* android_event_key_new(int flags, UINT16 scancode)
{
ANDROID_EVENT_KEY* event;
event = (ANDROID_EVENT_KEY*) calloc(1, sizeof(ANDROID_EVENT_KEY));
if (!event)
return NULL;
event->type = EVENT_TYPE_KEY;
event->flags = flags;
event->scancode = scancode;
return event;
}
@@ -210,14 +198,13 @@ static void android_event_key_free(ANDROID_EVENT_KEY* event)
ANDROID_EVENT_KEY* android_event_unicodekey_new(UINT16 key)
{
ANDROID_EVENT_KEY* event;
event = (ANDROID_EVENT_KEY*) calloc(1, sizeof(ANDROID_EVENT_KEY));
if (!event)
return NULL;
event->type = EVENT_TYPE_KEY_UNICODE;
event->scancode = key;
return event;
}
@@ -229,8 +216,8 @@ static void android_event_unicodekey_free(ANDROID_EVENT_KEY* event)
ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y)
{
ANDROID_EVENT_CURSOR* event;
event = (ANDROID_EVENT_CURSOR*) calloc(1, sizeof(ANDROID_EVENT_CURSOR));
if (!event)
return NULL;
@@ -238,7 +225,6 @@ ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y)
event->x = x;
event->y = y;
event->flags = flags;
return event;
}
@@ -250,8 +236,8 @@ static void android_event_cursor_free(ANDROID_EVENT_CURSOR* event)
ANDROID_EVENT* android_event_disconnect_new()
{
ANDROID_EVENT* event;
event = (ANDROID_EVENT*) calloc(1, sizeof(ANDROID_EVENT));
if (!event)
return NULL;
@@ -264,23 +250,27 @@ static void android_event_disconnect_free(ANDROID_EVENT* event)
free(event);
}
ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(void* data, int data_length)
ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(void* data,
int data_length)
{
ANDROID_EVENT_CLIPBOARD* event;
event = (ANDROID_EVENT_CLIPBOARD*) calloc(1, sizeof(ANDROID_EVENT_CLIPBOARD));
if (!event)
return NULL;
event->type = EVENT_TYPE_CLIPBOARD;
if (data)
{
event->data = malloc(data_length);
if (!event->data)
{
free(event);
return NULL;
}
memcpy(event->data, data, data_length);
event->data_length = data_length;
}
@@ -297,12 +287,12 @@ static void android_event_clipboard_free(ANDROID_EVENT_CLIPBOARD* event)
}
}
BOOL android_event_queue_init(freerdp * inst)
BOOL android_event_queue_init(freerdp* inst)
{
androidContext* aCtx = (androidContext*)inst->context;
ANDROID_EVENT_QUEUE* queue;
queue = (ANDROID_EVENT_QUEUE*) calloc(1, sizeof(ANDROID_EVENT_QUEUE));
if (!queue)
{
WLog_ERR(TAG, "android_event_queue_init: memory allocation failed");
@@ -311,15 +301,16 @@ BOOL android_event_queue_init(freerdp * inst)
queue->size = 16;
queue->count = 0;
queue->isSet = CreateEventA(NULL, TRUE, FALSE, NULL);
if (!queue->isSet)
{
free (queue);
free(queue);
return FALSE;
}
queue->events = (ANDROID_EVENT**) calloc(sizeof(ANDROID_EVENT*), queue->size);
if (!queue->events)
{
WLog_ERR(TAG, "android_event_queue_init: memory allocation failed");
@@ -327,12 +318,12 @@ BOOL android_event_queue_init(freerdp * inst)
free(queue);
return FALSE;
}
aCtx->event_queue = queue;
aCtx->event_queue = queue;
return TRUE;
}
void android_event_queue_uninit(freerdp * inst)
void android_event_queue_uninit(freerdp* inst)
{
androidContext* aCtx;
ANDROID_EVENT_QUEUE* queue;
@@ -350,13 +341,15 @@ void android_event_queue_uninit(freerdp * inst)
CloseHandle(queue->isSet);
queue->isSet = NULL;
}
if (queue->events)
{
free (queue->events);
free(queue->events);
queue->events = NULL;
queue->size = 0;
queue->count = 0;
}
free(queue);
}
}
@@ -366,23 +359,29 @@ void android_event_free(ANDROID_EVENT* event)
if (!event)
return;
switch(event->type) {
case EVENT_TYPE_KEY:
android_event_key_free((ANDROID_EVENT_KEY*)event);
break;
case EVENT_TYPE_KEY_UNICODE:
android_event_unicodekey_free((ANDROID_EVENT_KEY*)event);
break;
case EVENT_TYPE_CURSOR:
android_event_cursor_free((ANDROID_EVENT_CURSOR*)event);
break;
case EVENT_TYPE_DISCONNECT:
android_event_disconnect_free((ANDROID_EVENT*)event);
break;
case EVENT_TYPE_CLIPBOARD:
android_event_clipboard_free((ANDROID_EVENT_CLIPBOARD*)event);
break;
default:
break;
switch (event->type)
{
case EVENT_TYPE_KEY:
android_event_key_free((ANDROID_EVENT_KEY*)event);
break;
case EVENT_TYPE_KEY_UNICODE:
android_event_unicodekey_free((ANDROID_EVENT_KEY*)event);
break;
case EVENT_TYPE_CURSOR:
android_event_cursor_free((ANDROID_EVENT_CURSOR*)event);
break;
case EVENT_TYPE_DISCONNECT:
android_event_disconnect_free((ANDROID_EVENT*)event);
break;
case EVENT_TYPE_CLIPBOARD:
android_event_clipboard_free((ANDROID_EVENT_CLIPBOARD*)event);
break;
default:
break;
}
}