mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed android client.

Browse Source
This commit is contained in:
Armin Novak 2016-08-04 13:25:52 +02:00
parent 4027a1d978
commit c3e6240f41
8 changed files with 635 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/Android/CMakeLists.txt
View File

@ -43,11 +43,9 @@ endif()
add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp freerdp-client)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dl)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} log)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} jnigraphics)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

4
client/Android/Studio/aFreeRDP/build.gradle
View File

@ -15,6 +15,10 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
jniDebuggable true
renderscriptDebuggable true
}
}
}

4
client/Android/Studio/freeRDPCore/build.gradle
View File

@ -14,6 +14,10 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
jniDebuggable true
renderscriptDebuggable true
}
}
}

41
client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionActivity.java
View File

@ -1092,6 +1092,47 @@ public class SessionActivity extends ActionBarActivity implements
return callbackDialogResult;
}
@Override
public boolean OnGatewayAuthenticate(StringBuilder username, StringBuilder domain, StringBuilder password) {
// this is where the return code of our dialog will be stored
callbackDialogResult = false;
// set text fields
((EditText) userCredView.findViewById(R.id.editTextUsername))
.setText(username);
((EditText) userCredView.findViewById(R.id.editTextDomain))
.setText(domain);
((EditText) userCredView.findViewById(R.id.editTextPassword))
.setText(password);
// start dialog in UI thread
uiHandler.sendMessage(Message.obtain(null, UIHandler.SHOW_DIALOG,
dlgUserCredentials));
// wait for result
try {
synchronized (dlgUserCredentials) {
dlgUserCredentials.wait();
}
} catch (InterruptedException e) {
}
// clear buffers
username.setLength(0);
domain.setLength(0);
password.setLength(0);
// read back user credentials
username.append(((EditText) userCredView
.findViewById(R.id.editTextUsername)).getText().toString());
domain.append(((EditText) userCredView
.findViewById(R.id.editTextDomain)).getText().toString());
password.append(((EditText) userCredView
.findViewById(R.id.editTextPassword)).getText().toString());
return callbackDialogResult;
}
@Override
public int OnVerifiyCertificate(String commonName, String subject, String issuer, String fingerprint, boolean mismatch) {
// see if global settings says accept all

13
client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java
View File

@ -89,6 +89,8 @@ public class LibFreeRDP {
void OnSettingsChanged(int width, int height, int bpp);
boolean OnAuthenticate(StringBuilder username, StringBuilder domain, StringBuilder password);
boolean OnGatewayAuthenticate(StringBuilder username, StringBuilder domain, StringBuilder
password);
int OnVerifiyCertificate(String commonName, String subject,
String issuer, String fingerprint, boolean mismatch);
@ -390,6 +392,17 @@ public class LibFreeRDP {
return false;
}
private static boolean OnGatewayAuthenticate(int inst, StringBuilder username, StringBuilder
domain, StringBuilder password) {
SessionState s = GlobalApp.getSession(inst);
if (s == null)
return false;
UIEventListener uiEventListener = s.getUIEventListener();
if (uiEventListener != null)
return uiEventListener.OnGatewayAuthenticate(username, domain, password);
return false;
}
private static int OnVerifyCertificate(int inst, String commonName, String subject,
String issuer, String fingerprint, boolean
hostMismatch) {

260
client/Android/android_cliprdr.c
View File

@ -35,8 +35,9 @@
#include "android_jni_utils.h"
#include "android_jni_callback.h"
int android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
UINT android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
{
UINT rc = ERROR_INTERNAL_ERROR;
UINT32 index;
UINT32 formatId;
UINT32 numFormats;
@ -44,23 +45,27 @@ int android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
const char* formatName;
CLIPRDR_FORMAT* formats;
CLIPRDR_FORMAT_LIST formatList;
if (!cliprdr)
return ERROR_INVALID_PARAMETER;
androidContext* afc = (androidContext*) cliprdr->custom;
ZeroMemory(&formatList, sizeof(CLIPRDR_FORMAT_LIST));
if (!afc || !afc->cliprdr)
return ERROR_INVALID_PARAMETER;
ZeroMemory(&formatList, sizeof(CLIPRDR_FORMAT_LIST));
pFormatIds = NULL;
numFormats = ClipboardGetFormatIds(afc->clipboard, &pFormatIds);
formats = (CLIPRDR_FORMAT*) calloc(numFormats, sizeof(CLIPRDR_FORMAT));
if (!formats)
return -1;
goto fail;
for (index = 0; index < numFormats; index++)
{
formatId = pFormatIds[index];
formatName = ClipboardGetFormatName(afc->clipboard, formatId);
formats[index].formatId = formatId;
formats[index].formatName = NULL;
@ -72,50 +77,59 @@ int android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr)
formatList.numFormats = numFormats;
formatList.formats = formats;
afc->cliprdr->ClientFormatList(afc->cliprdr, &formatList);
if (!afc->cliprdr->ClientFormatList)
goto fail;
rc = afc->cliprdr->ClientFormatList(afc->cliprdr, &formatList);
fail:
free(pFormatIds);
free(formats);
return 1;
return rc;
}
int android_cliprdr_send_client_format_data_request(CliprdrClientContext* cliprdr, UINT32 formatId)
static UINT android_cliprdr_send_client_format_data_request(
CliprdrClientContext* cliprdr, UINT32 formatId)
{
UINT rc = ERROR_INVALID_PARAMETER;
CLIPRDR_FORMAT_DATA_REQUEST formatDataRequest;
androidContext* afc = (androidContext*) cliprdr->custom;
androidContext* afc;
if (!cliprdr)
goto fail;
afc = (androidContext*) cliprdr->custom;
if (!afc || !afc->clipboardRequestEvent || !cliprdr->ClientFormatDataRequest)
goto fail;
ZeroMemory(&formatDataRequest, sizeof(CLIPRDR_FORMAT_DATA_REQUEST));
formatDataRequest.msgType = CB_FORMAT_DATA_REQUEST;
formatDataRequest.msgFlags = 0;
formatDataRequest.requestedFormatId = formatId;
afc->requestedFormatId = formatId;
ResetEvent(afc->clipboardRequestEvent);
cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest);
return 1;
rc = cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest);
fail:
return rc;
}
int android_cliprdr_send_client_capabilities(CliprdrClientContext* cliprdr)
static UINT android_cliprdr_send_client_capabilities(CliprdrClientContext*
cliprdr)
{
CLIPRDR_CAPABILITIES capabilities;
CLIPRDR_GENERAL_CAPABILITY_SET generalCapabilitySet;
capabilities.cCapabilitiesSets = 1;
capabilities.capabilitySets = (CLIPRDR_CAPABILITY_SET*) &(generalCapabilitySet);
if (!cliprdr || !cliprdr->ClientCapabilities)
return ERROR_INVALID_PARAMETER;
capabilities.cCapabilitiesSets = 1;
capabilities.capabilitySets = (CLIPRDR_CAPABILITY_SET*) &
(generalCapabilitySet);
generalCapabilitySet.capabilitySetType = CB_CAPSTYPE_GENERAL;
generalCapabilitySet.capabilitySetLength = 12;
generalCapabilitySet.version = CB_CAPS_VERSION_2;
generalCapabilitySet.generalFlags = CB_USE_LONG_FORMAT_NAMES;
cliprdr->ClientCapabilities(cliprdr, &capabilities);
return 1;
return cliprdr->ClientCapabilities(cliprdr, &capabilities);
}
/**
@ -123,14 +137,27 @@ int android_cliprdr_send_client_capabilities(CliprdrClientContext* cliprdr)
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_monitor_ready(CliprdrClientContext* cliprdr, CLIPRDR_MONITOR_READY* monitorReady)
static UINT android_cliprdr_monitor_ready(CliprdrClientContext* cliprdr,
CLIPRDR_MONITOR_READY* monitorReady)
{
androidContext* afc = (androidContext*) cliprdr->custom;
UINT rc;
androidContext* afc;
if (!cliprdr || !monitorReady)
return ERROR_INVALID_PARAMETER;
afc = (androidContext*) cliprdr->custom;
if (!afc)
return ERROR_INVALID_PARAMETER;
if ((rc = android_cliprdr_send_client_capabilities(cliprdr)) != CHANNEL_RC_OK)
return rc;
if ((rc = android_cliprdr_send_client_format_list(cliprdr)) != CHANNEL_RC_OK)
return rc;
afc->clipboardSync = TRUE;
android_cliprdr_send_client_capabilities(cliprdr);
android_cliprdr_send_client_format_list(cliprdr);
return CHANNEL_RC_OK;
}
@ -139,11 +166,20 @@ UINT android_cliprdr_monitor_ready(CliprdrClientContext* cliprdr, CLIPRDR_MONITO
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_capabilities(CliprdrClientContext* cliprdr, CLIPRDR_CAPABILITIES* capabilities)
static UINT android_cliprdr_server_capabilities(CliprdrClientContext* cliprdr,
CLIPRDR_CAPABILITIES* capabilities)
{
UINT32 index;
CLIPRDR_CAPABILITY_SET* capabilitySet;
androidContext* afc = (androidContext*) cliprdr->custom;
androidContext* afc;
if (!cliprdr || !capabilities)
return ERROR_INVALID_PARAMETER;
afc = (androidContext*) cliprdr->custom;
if (!afc)
return ERROR_INVALID_PARAMETER;
for (index = 0; index < capabilities->cCapabilitiesSets; index++)
{
@ -153,8 +189,7 @@ UINT android_cliprdr_server_capabilities(CliprdrClientContext* cliprdr, CLIPRDR_
(capabilitySet->capabilitySetLength >= CB_CAPSTYPE_GENERAL_LEN))
{
CLIPRDR_GENERAL_CAPABILITY_SET* generalCapabilitySet
= (CLIPRDR_GENERAL_CAPABILITY_SET*) capabilitySet;
= (CLIPRDR_GENERAL_CAPABILITY_SET*) capabilitySet;
afc->clipboardCapabilities = generalCapabilitySet->generalFlags;
break;
}
@ -168,18 +203,26 @@ UINT android_cliprdr_server_capabilities(CliprdrClientContext* cliprdr, CLIPRDR_
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr, CLIPRDR_FORMAT_LIST* formatList)
static UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr,
CLIPRDR_FORMAT_LIST* formatList)
{
UINT rc;
UINT32 index;
CLIPRDR_FORMAT* format;
androidContext* afc = (androidContext*) cliprdr->custom;
androidContext* afc;
if (!cliprdr || !formatList)
return ERROR_INVALID_PARAMETER;
afc = (androidContext*) cliprdr->custom;
if (!afc)
return ERROR_INVALID_PARAMETER;
if (afc->serverFormats)
{
for (index = 0; index < afc->numServerFormats; index++)
{
free(afc->serverFormats[index].formatName);
}
free(afc->serverFormats);
afc->serverFormats = NULL;
@ -190,7 +233,8 @@ UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr, CLIPRDR_F
return CHANNEL_RC_OK;
afc->numServerFormats = formatList->numFormats;
afc->serverFormats = (CLIPRDR_FORMAT*) calloc(afc->numServerFormats, sizeof(CLIPRDR_FORMAT));
afc->serverFormats = (CLIPRDR_FORMAT*) calloc(afc->numServerFormats,
sizeof(CLIPRDR_FORMAT));
if (!afc->serverFormats)
return CHANNEL_RC_NO_MEMORY;
@ -201,7 +245,8 @@ UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr, CLIPRDR_F
afc->serverFormats[index].formatName = NULL;
if (formatList->formats[index].formatName)
afc->serverFormats[index].formatName = _strdup(formatList->formats[index].formatName);
afc->serverFormats[index].formatName = _strdup(
formatList->formats[index].formatName);
}
for (index = 0; index < afc->numServerFormats; index++)
@ -210,12 +255,18 @@ UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr, CLIPRDR_F
if (format->formatId == CF_UNICODETEXT)
{
android_cliprdr_send_client_format_data_request(cliprdr, CF_UNICODETEXT);
if ((rc = android_cliprdr_send_client_format_data_request(cliprdr,
CF_UNICODETEXT)) != CHANNEL_RC_OK)
return rc;
break;
}
else if (format->formatId == CF_TEXT)
{
android_cliprdr_send_client_format_data_request(cliprdr, CF_TEXT);
if ((rc = android_cliprdr_send_client_format_data_request(cliprdr,
CF_TEXT)) != CHANNEL_RC_OK)
return rc;
break;
}
}
@ -228,8 +279,13 @@ UINT android_cliprdr_server_format_list(CliprdrClientContext* cliprdr, CLIPRDR_F
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_format_list_response(CliprdrClientContext* cliprdr, CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse)
static UINT android_cliprdr_server_format_list_response(
CliprdrClientContext* cliprdr,
CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse)
{
if (!cliprdr || !formatListResponse)
return ERROR_INVALID_PARAMETER;
return CHANNEL_RC_OK;
}
@ -238,8 +294,13 @@ UINT android_cliprdr_server_format_list_response(CliprdrClientContext* cliprdr,
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_lock_clipboard_data(CliprdrClientContext* cliprdr, CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData)
static UINT android_cliprdr_server_lock_clipboard_data(CliprdrClientContext*
cliprdr,
CLIPRDR_LOCK_CLIPBOARD_DATA* lockClipboardData)
{
if (!cliprdr || !lockClipboardData)
return ERROR_INVALID_PARAMETER;
return CHANNEL_RC_OK;
}
@ -248,8 +309,13 @@ UINT android_cliprdr_server_lock_clipboard_data(CliprdrClientContext* cliprdr, C
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_unlock_clipboard_data(CliprdrClientContext* cliprdr, CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData)
static UINT android_cliprdr_server_unlock_clipboard_data(
CliprdrClientContext* cliprdr,
CLIPRDR_UNLOCK_CLIPBOARD_DATA* unlockClipboardData)
{
if (!cliprdr || !unlockClipboardData)
return ERROR_INVALID_PARAMETER;
return CHANNEL_RC_OK;
}
@ -258,19 +324,28 @@ UINT android_cliprdr_server_unlock_clipboard_data(CliprdrClientContext* cliprdr,
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_format_data_request(CliprdrClientContext* cliprdr, CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest)
static UINT android_cliprdr_server_format_data_request(CliprdrClientContext*
cliprdr,
CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest)
{
UINT rc;
BYTE* data;
UINT32 size;
UINT32 formatId;
CLIPRDR_FORMAT_DATA_RESPONSE response;
androidContext* afc = (androidContext*) cliprdr->custom;
androidContext* afc;
if (!cliprdr || !formatDataRequest || !cliprdr->ClientFormatDataResponse)
return ERROR_INVALID_PARAMETER;
afc = (androidContext*) cliprdr->custom;
if (!afc)
return ERROR_INVALID_PARAMETER;
ZeroMemory(&response, sizeof(CLIPRDR_FORMAT_DATA_RESPONSE));
formatId = formatDataRequest->requestedFormatId;
data = (BYTE*) ClipboardGetData(afc->clipboard, formatId, &size);
response.msgFlags = CB_RESPONSE_OK;
response.dataLen = size;
response.requestedFormatData = data;
@ -282,11 +357,9 @@ UINT android_cliprdr_server_format_data_request(CliprdrClientContext* cliprdr, C
response.requestedFormatData = NULL;
}
cliprdr->ClientFormatDataResponse(cliprdr, &response);
rc = cliprdr->ClientFormatDataResponse(cliprdr, &response);
free(data);
return CHANNEL_RC_OK;
return rc;
}
/**
@ -294,15 +367,30 @@ UINT android_cliprdr_server_format_data_request(CliprdrClientContext* cliprdr, C
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr, CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse)
static UINT android_cliprdr_server_format_data_response(
CliprdrClientContext* cliprdr,
CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse)
{
BYTE* data;
UINT32 size;
UINT32 index;
UINT32 formatId;
CLIPRDR_FORMAT* format = NULL;
androidContext* afc = (androidContext*) cliprdr->custom;
freerdp* instance = ((rdpContext*) afc)->instance;
androidContext* afc;
freerdp* instance;
if (!cliprdr || !formatDataResponse)
return ERROR_INVALID_PARAMETER;
afc = (androidContext*) cliprdr->custom;
if (!afc)
return ERROR_INVALID_PARAMETER;
instance = ((rdpContext*) afc)->instance;
if (!instance)
return ERROR_INVALID_PARAMETER;
for (index = 0; index < afc->numServerFormats; index++)
{
@ -323,9 +411,14 @@ UINT android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr,
size = formatDataResponse->dataLen;
data = (BYTE*) malloc(size);
if (!data)
return ERROR_INTERNAL_ERROR;
CopyMemory(data, formatDataResponse->requestedFormatData, size);
ClipboardSetData(afc->clipboard, formatId, data, size);
if (!ClipboardSetData(afc->clipboard, formatId, data, size))
return ERROR_INTERNAL_ERROR;
SetEvent(afc->clipboardRequestEvent);
@ -334,22 +427,16 @@ UINT android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr,
JNIEnv* env;
jstring jdata;
jboolean attached;
formatId = ClipboardRegisterFormat(afc->clipboard, "UTF8_STRING");
data = (void*) ClipboardGetData(afc->clipboard, formatId, &size);
attached = jni_attach_thread(&env);
jdata = jniNewStringUTF(env, data, size);
freerdp_callback("OnRemoteClipboardChanged", "(ILjava/lang/String;)V", instance, jdata);
freerdp_callback("OnRemoteClipboardChanged", "(ILjava/lang/String;)V", instance,
jdata);
(*env)->DeleteLocalRef(env, jdata);
if (attached == JNI_TRUE)
{
jni_detach_thread();
}
}
return CHANNEL_RC_OK;
@ -360,8 +447,13 @@ UINT android_cliprdr_server_format_data_response(CliprdrClientContext* cliprdr,
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_file_contents_request(CliprdrClientContext* cliprdr, CLIPRDR_FILE_CONTENTS_REQUEST* fileContentsRequest)
static UINT android_cliprdr_server_file_contents_request(
CliprdrClientContext* cliprdr,
CLIPRDR_FILE_CONTENTS_REQUEST* fileContentsRequest)
{
if (!cliprdr || !fileContentsRequest)
return ERROR_INVALID_PARAMETER;
return CHANNEL_RC_OK;
}
@ -370,51 +462,61 @@ UINT android_cliprdr_server_file_contents_request(CliprdrClientContext* cliprdr,
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT android_cliprdr_server_file_contents_response(CliprdrClientContext* cliprdr, CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse)
static UINT android_cliprdr_server_file_contents_response(
CliprdrClientContext* cliprdr,
CLIPRDR_FILE_CONTENTS_RESPONSE* fileContentsResponse)
{
if (!cliprdr || !fileContentsResponse)
return ERROR_INVALID_PARAMETER;
return CHANNEL_RC_OK;
}
int android_cliprdr_init(androidContext* afc, CliprdrClientContext* cliprdr)
BOOL android_cliprdr_init(androidContext* afc, CliprdrClientContext* cliprdr)
{
wClipboard* clipboard;
HANDLE hevent;
if (!afc || !cliprdr)
return FALSE;
if (!(hevent = CreateEvent(NULL, TRUE, FALSE, NULL)))
return 0;
return FALSE;
if (!(clipboard = ClipboardCreate()))
{
CloseHandle(hevent);
return 0;
return FALSE;
}
afc->cliprdr = cliprdr;
afc->clipboard = clipboard;
afc->clipboardRequestEvent = hevent;
cliprdr->custom = (void*) afc;
cliprdr->MonitorReady = android_cliprdr_monitor_ready;
cliprdr->ServerCapabilities = android_cliprdr_server_capabilities;
cliprdr->ServerFormatList = android_cliprdr_server_format_list;
cliprdr->ServerFormatListResponse = android_cliprdr_server_format_list_response;
cliprdr->ServerLockClipboardData = android_cliprdr_server_lock_clipboard_data;
cliprdr->ServerUnlockClipboardData = android_cliprdr_server_unlock_clipboard_data;
cliprdr->ServerUnlockClipboardData =
android_cliprdr_server_unlock_clipboard_data;
cliprdr->ServerFormatDataRequest = android_cliprdr_server_format_data_request;
cliprdr->ServerFormatDataResponse = android_cliprdr_server_format_data_response;
cliprdr->ServerFileContentsRequest = android_cliprdr_server_file_contents_request;
cliprdr->ServerFileContentsResponse = android_cliprdr_server_file_contents_response;
return 1;
cliprdr->ServerFileContentsRequest =
android_cliprdr_server_file_contents_request;
cliprdr->ServerFileContentsResponse =
android_cliprdr_server_file_contents_response;
return TRUE;
}
int android_cliprdr_uninit(androidContext* afc, CliprdrClientContext* cliprdr)
BOOL android_cliprdr_uninit(androidContext* afc, CliprdrClientContext* cliprdr)
{
if (!afc || !cliprdr)
return FALSE;
cliprdr->custom = NULL;
afc->cliprdr = NULL;
ClipboardDestroy(afc->clipboard);
CloseHandle(afc->clipboardRequestEvent);
return 1;
return TRUE;
}

6
client/Android/android_cliprdr.h
View File

@ -24,9 +24,9 @@
#include "android_freerdp.h"
int android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr);
UINT android_cliprdr_send_client_format_list(CliprdrClientContext* cliprdr);
int android_cliprdr_init(androidContext* afc, CliprdrClientContext* cliprdr);
int android_cliprdr_uninit(androidContext* afc, CliprdrClientContext* cliprdr);
BOOL android_cliprdr_init(androidContext* afc, CliprdrClientContext* cliprdr);
BOOL android_cliprdr_uninit(androidContext* afc, CliprdrClientContext* cliprdr);
#endif /* __ANDROID_CLIPRDR_H__ */

655
client/Android/android_freerdp.c
View File

File diff suppressed because it is too large Load Diff