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

Fixed resource cleanup, using DEBUG_WARN now for error messages.

Browse Source
This commit is contained in:
Armin Novak 2013-11-12 10:24:13 +01:00
parent f93b69320f
commit 2af8efb26b
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
client/Android/FreeRDPCore/jni/android_jni_callback.c
View File

@ -13,7 +13,6 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <android/log.h>
#include "android_jni_callback.h" #include "android_jni_callback.h"
#include "android_debug.h" #include "android_debug.h"
@ -36,24 +35,30 @@ void jni_load_class(JNIEnv *env, const char *path, jobject *objptr)
if (!class) if (!class)
{ {
DEBUG_ANDROID("jni_load_class: failed to find class %s", path); DEBUG_WARN("jni_load_class: failed to find class %s", path);
goto finish;
} }
method = (*env)->GetMethodID(env, class, "<init>", "()V"); method = (*env)->GetMethodID(env, class, "<init>", "()V");
if (!method) if (!method)
{ {
DEBUG_ANDROID("jni_load_class: failed to find class constructor of %s", path); DEBUG_WARN("jni_load_class: failed to find class constructor of %s", path);
goto finish;
} }
object = (*env)->NewObject(env, class, method); object = (*env)->NewObject(env, class, method);
if (!object) if (!object)
{ {
DEBUG_ANDROID("jni_load_class: failed create new object of %s", path); DEBUG_WARN("jni_load_class: failed create new object of %s", path);
goto finish;
} }
(*objptr) = (*env)->NewGlobalRef(env, object); (*objptr) = (*env)->NewGlobalRef(env, object);
finish:
while(0);
} }
jint init_callback_environment(JavaVM* vm) jint init_callback_environment(JavaVM* vm)
@ -61,7 +66,7 @@ jint init_callback_environment(JavaVM* vm)
JNIEnv* env; JNIEnv* env;
if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_4) != JNI_OK) if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_4) != JNI_OK)
{ {
DEBUG_ANDROID("JNI_OnLoad: failed to obtain current JNI environment"); DEBUG_WARN("JNI_OnLoad: failed to obtain current JNI environment");
return -1; return -1;
} }
@ -83,7 +88,7 @@ jboolean jni_attach_thread(JNIEnv** env)
if ((*jVM)->GetEnv(jVM, (void**) env, JNI_VERSION_1_4) != JNI_OK) if ((*jVM)->GetEnv(jVM, (void**) env, JNI_VERSION_1_4) != JNI_OK)
{ {
DEBUG_ANDROID("android_java_callback: failed to obtain current JNI environment"); DEBUG_WARN("android_java_callback: failed to obtain current JNI environment");
} }
return JNI_TRUE; return JNI_TRUE;
@ -113,17 +118,20 @@ void java_callback_void(jobject obj, const char * callback, const char* signatur
jObjClass = (*env)->GetObjectClass(env, obj); jObjClass = (*env)->GetObjectClass(env, obj);
if (!jObjClass) { if (!jObjClass) {
DEBUG_ANDROID("android_java_callback: failed to get class reference"); DEBUG_WARN("android_java_callback: failed to get class reference");
goto finish;
} }
jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature); jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
if (!jCallback) { if (!jCallback) {
DEBUG_ANDROID("android_java_callback: failed to get method id"); DEBUG_WARN("android_java_callback: failed to get method id");
goto finish;
} }
(*env)->CallStaticVoidMethodV(env, jObjClass, jCallback, args); (*env)->CallStaticVoidMethodV(env, jObjClass, jCallback, args);
finish:
if(attached == JNI_TRUE) if(attached == JNI_TRUE)
jni_detach_thread(); jni_detach_thread();
} }
@ -134,6 +142,7 @@ jboolean java_callback_bool(jobject obj, const char * callback, const char* sign
jclass jObjClass; jclass jObjClass;
jmethodID jCallback; jmethodID jCallback;
jboolean attached; jboolean attached;
jboolean res = JNI_FALSE;
JNIEnv *env; JNIEnv *env;
DEBUG_ANDROID("java_callback: %s (%s)", callback, signature); DEBUG_ANDROID("java_callback: %s (%s)", callback, signature);
@ -143,17 +152,20 @@ jboolean java_callback_bool(jobject obj, const char * callback, const char* sign
jObjClass = (*env)->GetObjectClass(env, obj); jObjClass = (*env)->GetObjectClass(env, obj);
if (!jObjClass) { if (!jObjClass) {
DEBUG_ANDROID("android_java_callback: failed to get class reference"); DEBUG_WARN("android_java_callback: failed to get class reference");
goto finish;
} }
jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature); jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
if (!jCallback) { if (!jCallback) {
DEBUG_ANDROID("android_java_callback: failed to get method id"); DEBUG_WARN("android_java_callback: failed to get method id");
goto finish;
} }
jboolean res = (*env)->CallStaticBooleanMethodV(env, jObjClass, jCallback, args); res = (*env)->CallStaticBooleanMethodV(env, jObjClass, jCallback, args);
finish:
if(attached == JNI_TRUE) if(attached == JNI_TRUE)
jni_detach_thread(); jni_detach_thread();