dwindows: android/dw.cpp comparison

comparison android/dw.cpp @ 2557:756331246f94

Android: Implement Java exception handling, make sure all return values from JNI are sane. This allows you to break in _dw_jni_check_exception() on or before return TRUE to catch any Java exceptions, otherwise they will be cleared and the functions will return failure. Fix the NullPointerException from the last commit, it was in windowGetData with a non existant key in the data SimpleArrayMap.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 17 May 2021 21:11:40 +0000
parents	d2d8c66ad062
children	ebc6a4ff5f1f

comparison

equal deleted inserted replaced

-:d2d8c66ad062
+:756331246f94
 jclass _dw_find_class(JNIEnv *env, const char* name)
 {
 return static_cast<jclass>(env->CallObjectMethod(_dw_class_loader, _dw_class_method, env->NewStringUTF(name)));
 }
+// Do a quick check if an exception occurred...
+// Display then clear it so we can continue...
+// Return TRUE if an exception had occurred
+int _dw_jni_check_exception(JNIEnv *env)
+{
+if(env->ExceptionCheck())
+{
+env->ExceptionDescribe();
+env->ExceptionClear();
+return TRUE;
+}
+return FALSE;
+}
+#define _DW_REFERENCE_NONE   0
+#define _DW_REFERENCE_WEAK   1
+#define _DW_REFERENCE_STRONG 2
+// Handle returns from JNI functions and make sure the
+// return value is sane...
+// Reference: 0 no reference 1 weak 2 strong
+jobject _dw_jni_check_result(JNIEnv *env, jobject obj, int reference)
+{
+jobject result = nullptr;
+if(!_dw_jni_check_exception(env) && obj)
+{
+if(reference == 1)
+result = env->NewWeakGlobalRef(obj);
+else if(reference == 2)
+result = env->NewGlobalRef(obj);
+else
+result = obj;
+}
+return result;
+}
 /* Call the dwmain entry point, Android has no args, so just pass the app path */
 void _dw_main_launch(char *arg)
 {
 static HEV startup = nullptr;
 }
 int _dw_dark_mode_detected()
 {
 JNIEnv *env;
+int retval = DW_ERROR_UNKNOWN;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID darkModeDetected = env->GetMethodID(clazz, "darkModeDetected",
 "()I");
 // Call the method on the object
-return env->CallIntMethod(_dw_obj, darkModeDetected);
+retval = env->CallIntMethod(_dw_obj, darkModeDetected);
-}
+_dw_jni_check_exception(env);
-return DW_ERROR_UNKNOWN;
+}
+return retval;
 }
 /*
 * Runs a message loop for Dynamic Windows.
 */
 // Get the method that you want to call
 jmethodID dwMain = env->GetMethodID(clazz, "dwMain",
 "()V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, dwMain);
+_dw_jni_check_exception(env);
 }
 /* We don't actually run a loop here,
 * we launched a new thread to run the loop there.
 * Just wait for dw_main_quit() on the DWMainEvent.
 // Get the method that you want to call
 jmethodID mainSleep = env->GetMethodID(clazz, "mainSleep",
 "(I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, mainSleep, milliseconds);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Processes a single message iteration and returns.
 // Get the method that you want to call
 jmethodID dwindowsExit = env->GetMethodID(clazz, "dwindowsExit",
 "(I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, dwindowsExit, exitcode);
+_dw_jni_check_exception(env);
 }
 // We shouldn't get here, but in case JNI can't call dwindowsExit...
 exit(exitcode);
 }
 // Get the method that you want to call
 jmethodID debugMessage = env->GetMethodID(clazz, "debugMessage",
 "(Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, debugMessage, jstr);
+_dw_jni_check_exception(env);
 }
 else {
 /* Output to stderr, if there is another way to send it
 * on the implementation platform, change this.
 */
 int API dw_messagebox(const char *title, int flags, const char *format, ...)
 {
 va_list args;
 char outbuf[1025] = {0};
 JNIEnv *env;
+int retval = 0;
 va_start(args, format);
 vsnprintf(outbuf, 1024, format, args);
 va_end(args);
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID messageBox = env->GetMethodID(clazz, "messageBox",
 "(Ljava/lang/String;Ljava/lang/String;I)I");
 // Call the method on the object
-return env->CallIntMethod(_dw_obj, messageBox, jstrtitle, jstr, flags);
+retval = env->CallIntMethod(_dw_obj, messageBox, jstrtitle, jstr, flags);
-}
+_dw_jni_check_exception(env);
-return 0;
+}
+return retval;
 }
 /*
 * Opens a file dialog and queries user selection.
 * Parameters:
 *
 */
 char * API dw_file_browse(const char *title, const char *defpath, const char *ext, int flags)
 {
 JNIEnv *env;
+char *retval = nullptr;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Use a long parameter
 jstring jstr = env->NewStringUTF(title);
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID fileBrowse = env->GetMethodID(clazz, "fileBrowse",
 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
 // Call the method on the object
-jstring jresult = (jstring)env->CallObjectMethod(_dw_obj, fileBrowse, jstr, path, jext, flags);
+jstring jresult = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, fileBrowse, jstr, path, jext, flags), _DW_REFERENCE_NONE);
 if(jresult)
-return strdup(env->GetStringUTFChars(jresult, nullptr));
+retval = strdup(env->GetStringUTFChars(jresult, nullptr));
 }
-return nullptr;
+return retval;
 }
 /*
 * Gets the contents of the default clipboard as text.
 * Parameters:
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID clipboardGetText = env->GetMethodID(clazz, "clipboardGetText",
 "()Ljava/lang/String;");
 // Call the method on the object
-jstring result = (jstring)env->CallObjectMethod(_dw_obj, clipboardGetText);
+jstring result = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, clipboardGetText), _DW_REFERENCE_NONE);
 // Get the UTF8 string result
 if(result)
 utf8 = env->GetStringUTFChars(result, nullptr);
 return utf8 ? strdup(utf8) : nullptr;
 }
 // Get the method that you want to call
 jmethodID clipboardSetText = env->GetMethodID(clazz, "clipboardSetText",
 "(Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, clipboardSetText, jstr);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Allocates and initializes a dialog struct.
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID boxNew = env->GetMethodID(clazz, "boxNew", "(II)Landroid/widget/LinearLayout;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, boxNew, type, pad));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, boxNew, type, pad), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID scrollBoxNew = env->GetMethodID(clazz, "scrollBoxNew",
 "(II)Landroid/widget/ScrollView;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, scrollBoxNew, type, pad));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, scrollBoxNew, type, pad), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID boxPack = env->GetMethodID(clazz, "boxPack", "(Landroid/view/View;Landroid/view/View;IIIIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, boxPack, box, item, index, width, height, hsize, vsize, pad);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Remove windows (widgets) from the box they are packed into.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID boxUnpack = env->GetMethodID(clazz, "boxUnpack", "(Landroid/view/View;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, boxUnpack, handle);
+_dw_jni_check_exception(env);
 return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID boxUnpackAtIndex = env->GetMethodID(clazz, "boxUnpackAtIndex",
 "(Landroid/widget/LinearLayout;I)Landroid/view/View;");
 // Call the method on the object
-retval = env->CallObjectMethod(_dw_obj, boxUnpackAtIndex, box, index);
+retval = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, boxUnpackAtIndex, box, index), _DW_REFERENCE_WEAK);
 }
 return retval;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID buttonNew = env->GetMethodID(clazz, "buttonNew",
 "(Ljava/lang/String;I)Landroid/widget/Button;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, buttonNew, jstr, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, buttonNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID entryfieldNew = env->GetMethodID(clazz, "entryfieldNew",
 "(Ljava/lang/String;II)Landroid/widget/EditText;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, entryfieldNew, jstr, (int)cid, password));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, entryfieldNew, jstr, (int)cid, password), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 /*
 // Get the method that you want to call
 jmethodID entryfieldSetLimit = env->GetMethodID(clazz, "entryfieldSetLimit",
 "(Landroid/widget/EditText;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, entryfieldSetLimit, handle, (jlong)limit);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a new bitmap button window (widget) to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID bitmapButtonNew = env->GetMethodID(clazz, "bitmapButtonNew",
 "(Ljava/lang/String;I)Landroid/widget/ImageButton;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, bitmapButtonNew, jstr, (int)resid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, bitmapButtonNew, jstr, (int)resid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID bitmapButtonNewFromFile = env->GetMethodID(clazz, "bitmapButtonNewFromFile",
 "(Ljava/lang/String;ILjava/lang/String;)Landroid/widget/ImageButton;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, bitmapButtonNewFromFile, jstr, (int)cid, path));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, bitmapButtonNewFromFile, jstr, (int)cid, path), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID bitmapButtonNewFromData = env->GetMethodID(clazz, "bitmapButtonNewFromData",
 "(Ljava/lang/String;I[BI)Landroid/widget/ImageButton;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, bitmapButtonNewFromData, jstr, (int)cid, bytearray, len));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, bitmapButtonNewFromData, jstr, (int)cid, bytearray, len), _DW_REFERENCE_WEAK);
 // Clean up after the array now that we are finished
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
 return result;
 }
 return nullptr;
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID spinButtonNew = env->GetMethodID(clazz, "spinButtonNew",
 "(Ljava/lang/String;I)Lorg/dbsoft/dwindows/DWSpinButton;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, spinButtonNew, jstr, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, spinButtonNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID spinButtonSetPos = env->GetMethodID(clazz, "spinButtonSetPos",
 "(Lorg/dbsoft/dwindows/DWSpinButton;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, spinButtonSetPos, handle, (jlong)position);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the spinbutton limits.
 // Get the method that you want to call
 jmethodID spinButtonSetLimits = env->GetMethodID(clazz, "spinButtonSetLimits",
 "(Lorg/dbsoft/dwindows/DWSpinButton;JJ)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, spinButtonSetLimits, handle, (jlong)upper, (jlong)lower);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Returns the current value of the spinbutton.
 // Get the method that you want to call
 jmethodID spinButtonGetPos = env->GetMethodID(clazz, "spinButtonGetPos",
 "(Lorg/dbsoft/dwindows/DWSpinButton;)J");
 // Call the method on the object
 retval = env->CallLongMethod(_dw_obj, spinButtonGetPos, handle);
+if(_dw_jni_check_exception(env))
+retval = 0;
 }
 return retval;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID radioButtonNew = env->GetMethodID(clazz, "radioButtonNew",
 "(Ljava/lang/String;I)Landroid/widget/RadioButton;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, radioButtonNew, jstr, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, radioButtonNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID sliderNew = env->GetMethodID(clazz, "sliderNew", "(III)Landroid/widget/SeekBar;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, sliderNew, vertical, increments, (jint)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, sliderNew, vertical, increments, (jint)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 *       Position of the slider in the set range.
 */
 unsigned int API dw_slider_get_pos(HWND handle)
 {
 JNIEnv *env;
+unsigned int retval = 0;
 if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID percentGetPos = env->GetMethodID(clazz, "percentGetPos",
 "(Landroid/widget/ProgressBar;)I");
 // Call the method on the object
-return env->CallIntMethod(_dw_obj, percentGetPos, handle);
+retval = env->CallIntMethod(_dw_obj, percentGetPos, handle);
-}
+if(_dw_jni_check_exception(env))
-return 0;
+retval = 0;
+}
+return retval;
 }
 /*
 * Sets the slider position.
 * Parameters:
 // Get the method that you want to call
 jmethodID percentSetRange = env->GetMethodID(clazz, "percentSetRange",
 "(Landroid/widget/ProgressBar;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, percentSetRange, handle, (jint)range);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a new percent bar window (widget) to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID percentNew = env->GetMethodID(clazz, "percentNew",
 "(I)Landroid/widget/ProgressBar;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, percentNew, (jint)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, percentNew, (jint)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID percentSetPos = env->GetMethodID(clazz, "percentSetPos",
 "(Landroid/widget/ProgressBar;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, percentSetPos, handle, (jint)position);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a new checkbox window (widget) to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID checkboxNew = env->GetMethodID(clazz, "checkboxNew",
 "(Ljava/lang/String;I)Landroid/widget/CheckBox;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, checkboxNew, jstr, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, checkboxNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 *       State of checkbox (TRUE or FALSE).
 */
 int API dw_checkbox_get(HWND handle)
 {
 JNIEnv *env;
+int retval = FALSE;
 if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID checkOrRadioGetChecked = env->GetMethodID(clazz, "checkOrRadioGetChecked",
 "(Landroid/view/View;)Z");
 // Call the method on the object
-return env->CallBooleanMethod(_dw_obj, checkOrRadioGetChecked, handle);
+retval = env->CallBooleanMethod(_dw_obj, checkOrRadioGetChecked, handle);
-}
+if(_dw_jni_check_exception(env))
-return FALSE;
+retval = FALSE;
+}
+return retval;
 }
 /*
 * Sets the state of the checkbox.
 * Parameters:
 // Get the method that you want to call
 jmethodID checkOrRadioSetChecked = env->GetMethodID(clazz, "checkOrRadioSetChecked",
 "(Landroid/view/View;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, checkOrRadioSetChecked, handle, value);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a new listbox window (widget) to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID listBoxNew = env->GetMethodID(clazz, "listBoxNew",
 "(II)Lorg/dbsoft/dwindows/DWListBox;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, listBoxNew, (int)cid, multi));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, listBoxNew, (int)cid, multi), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID listOrComboBoxAppend = env->GetMethodID(clazz, "listOrComboBoxAppend",
 "(Landroid/view/View;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listOrComboBoxAppend, handle, jstr);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Inserts the specified text into the listbox's (or combobox) entry list.
 // Get the method that you want to call
 jmethodID listOrComboBoxInsert = env->GetMethodID(clazz, "listOrComboBoxInsert",
 "(Landroid/view/View;Ljava/lang/String;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listOrComboBoxInsert, handle, jstr, pos);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Appends the specified text items to the listbox's (or combobox) entry list.
 // Get the method that you want to call
 jmethodID listOrComboBoxClear = env->GetMethodID(clazz, "listOrComboBoxClear",
 "(Landroid/view/View;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listOrComboBoxClear, handle);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Returns the listbox's item count.
 // Get the method that you want to call
 jmethodID listOrComboBoxCount = env->GetMethodID(clazz, "listOrComboBoxCount",
 "(Landroid/view/View;)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, listOrComboBoxCount, handle);
+if(_dw_jni_check_exception(env))
+retval = 0;
 }
 return retval;
 }
 /*
 // Get the method that you want to call
 jmethodID listBoxSetTop = env->GetMethodID(clazz, "listBoxSetTop",
 "(Landroid/view/View;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listBoxSetTop, handle, top);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Copies the given index item's text into buffer.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID listOrComboBoxGetText = env->GetMethodID(clazz, "listOrComboBoxGetText",
 "(Landroid/view/View;I)Ljava/lang/String;");
 // Call the method on the object
-jstring result = (jstring)env->CallObjectMethod(_dw_obj, listOrComboBoxGetText, handle, index);
+jstring result = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, listOrComboBoxGetText, handle, index), _DW_REFERENCE_NONE);
 // Get the UTF8 string result
 if(result)
 {
 const char *utf8 = env->GetStringUTFChars(result, nullptr);
 // Get the method that you want to call
 jmethodID listOrComboBoxSetText = env->GetMethodID(clazz, "listOrComboBoxSetText",
 "(Landroid/view/View;ILjava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listOrComboBoxSetText, handle, index, jstr);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Returns the index to the item in the list currently selected.
 // Get the method that you want to call
 jmethodID listOrComboBoxGetSelected = env->GetMethodID(clazz, "listOrComboBoxGetSelected",
 "(Landroid/view/View;)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, listOrComboBoxGetSelected, handle);
+if(_dw_jni_check_exception(env))
+retval = DW_ERROR_UNKNOWN;
 }
 return retval;
 }
 /*
 // Get the method that you want to call
 jmethodID listBoxSelectedMulti = env->GetMethodID(clazz, "listBoxSelectedMulti",
 "(Landroid/view/View;I)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, listBoxSelectedMulti, handle, where);
+if(_dw_jni_check_exception(env))
+retval = DW_ERROR_UNKNOWN;
 }
 return retval;
 }
 /*
 // Get the method that you want to call
 jmethodID listOrComboBoxSelect = env->GetMethodID(clazz, "listOrComboBoxSelect",
 "(Landroid/view/View;II)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listOrComboBoxSelect, handle, index, state);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Deletes the item with given index from the list.
 // Get the method that you want to call
 jmethodID listOrComboBoxDelete = env->GetMethodID(clazz, "listOrComboBoxDelete",
 "(Landroid/view/View;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, listOrComboBoxDelete, handle, index);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a new Combobox window (widget) to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID comboBoxNew = env->GetMethodID(clazz, "comboBoxNew",
 "(Ljava/lang/String;I)Lorg/dbsoft/dwindows/DWComboBox;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, comboBoxNew, jstr, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, comboBoxNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID mleNew = env->GetMethodID(clazz, "mleNew",
 "(I)Landroid/widget/EditText;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, mleNew, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, mleNew, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID mleImport = env->GetMethodID(clazz, "mleImport",
 "(Landroid/widget/EditText;Ljava/lang/String;I)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, mleImport, handle, jstr, startpoint);
+if(_dw_jni_check_exception(env))
+retval = 0;
 }
 return retval;
 }
 /*
 // Get the method that you want to call
 jmethodID mleDelete = env->GetMethodID(clazz, "mleDelete",
 "(Landroid/widget/EditText;II)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, mleDelete, handle, startpoint, length);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Clears all text from an MLE box.
 // Get the method that you want to call
 jmethodID mleClear = env->GetMethodID(clazz, "mleClear",
 "(Landroid/widget/EditText;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, mleClear, handle);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the visible line of an MLE box.
 // Get the method that you want to call
 jmethodID mleSetEditable = env->GetMethodID(clazz, "mleSetEditable",
 "(Landroid/widget/EditText;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, mleSetEditable, handle, state);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the word wrap state of an MLE box.
 // Get the method that you want to call
 jmethodID mleSetWordWrap = env->GetMethodID(clazz, "mleSetWordWrap",
 "(Landroid/widget/EditText;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, mleSetWordWrap, handle, state);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the current cursor position of an MLE box.
 // Get the method that you want to call
 jmethodID mleSetWordWrap = env->GetMethodID(clazz, "mleSetWordWrap",
 "(Landroid/widget/EditText;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, mleSetWordWrap, handle, point);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the word auto complete state of an MLE box.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID textNew = env->GetMethodID(clazz, "textNew",
 "(Ljava/lang/String;II)Landroid/widget/TextView;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, textNew, jstr, (int)cid, status));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, textNew, jstr, (int)cid, status), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID renderNew = env->GetMethodID(clazz, "renderNew",
 "(I)Lorg/dbsoft/dwindows/DWRender;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, renderNew, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, renderNew, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID renderRedraw = env->GetMethodID(clazz, "renderRedraw",
 "(Lorg/dbsoft/dwindows/DWRender;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, renderRedraw, handle);
+_dw_jni_check_exception(env);
 }
 }
 /* Sets the current foreground drawing color.
 * Parameters:
 // Get the method that you want to call
 jmethodID colorSet = env->GetMethodID(clazz, "colorSet",
 "(IIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, colorSet, 0, (jint)DW_RED_VALUE(color), (jint)DW_GREEN_VALUE(color), (jint)DW_BLUE_VALUE(color));
+_dw_jni_check_exception(env);
 }
 }
 /* Sets the current background drawing color.
 * Parameters:
 // Get the method that you want to call
 jmethodID bgColorSet = env->GetMethodID(clazz, "bgColorSet",
 "(IIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, bgColorSet, 0, (jint)DW_RED_VALUE(color), (jint)DW_GREEN_VALUE(color), (jint)DW_BLUE_VALUE(color));
+_dw_jni_check_exception(env);
 }
 }
 /* Allows the user to choose a color using the system's color chooser dialog.
 * Parameters:
 // Get the method that you want to call
 jmethodID drawPoint = env->GetMethodID(clazz, "drawPoint",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;II)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, drawPoint, handle, pixmap ? pixmap->bitmap : nullptr, x, y);
+_dw_jni_check_exception(env);
 }
 }
 /* Draw a line on a window (preferably a render window).
 * Parameters:
 // Get the method that you want to call
 jmethodID drawLine = env->GetMethodID(clazz, "drawLine",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x1, y1, x2, y2);
+_dw_jni_check_exception(env);
 }
 }
 /* Draw text on a window (preferably a render window).
 * Parameters:
 jmethodID drawLine = env->GetMethodID(clazz, "drawText",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IILjava/lang/String;Landroid/graphics/Typeface;ILandroid/view/View;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x, y, jstr,
 pixmap ? pixmap->typeface : nullptr, pixmap ? pixmap->fontsize : 0, pixmap ? pixmap->handle : nullptr);
+_dw_jni_check_exception(env);
 }
 }
 /* Query the width and height of a text string.
 * Parameters:
 jmethodID fontTextExtentsGet = env->GetMethodID(clazz, "fontTextExtentsGet",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;Ljava/lang/String;Landroid/graphics/Typeface;ILandroid/view/View;)J");
 // Call the method on the object
 jlong dimensions = env->CallLongMethod(_dw_obj, fontTextExtentsGet, handle, pixmap ? pixmap->bitmap : nullptr, jstr,
 pixmap ? pixmap->typeface : nullptr, pixmap ? pixmap->fontsize : 0, pixmap ? pixmap->handle : nullptr);
+if(_dw_jni_check_exception(env))
+dimensions = 0;
 if(width)
 *width = dimensions & 0xFFFF;
 if(height)
 *height = (dimensions >> 32) & 0xFFFF;
 // Get the method that you want to call
 jmethodID drawPolygon = env->GetMethodID(clazz, "drawPolygon",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;II[I[I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, drawPolygon, handle, pixmap ? pixmap->bitmap : nullptr, flags, npoints, jx, jy);
+_dw_jni_check_exception(env);
 }
 }
 }
 /* Draw a rectangle on a window (preferably a render window).
 // Get the method that you want to call
 jmethodID drawLine = env->GetMethodID(clazz, "drawRect",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x, y, width, height);
+_dw_jni_check_exception(env);
 }
 }
 /* Draw an arc on a window (preferably a render window).
 * Parameters:
 // Get the method that you want to call
 jmethodID drawLine = env->GetMethodID(clazz, "drawArc",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIIIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, flags, xorigin, yorigin, x1, y1, x2, y2);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a tree object to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID containerNew = env->GetMethodID(clazz, "containerNew",
 "(II)Landroid/widget/ListView;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, containerNew, (int)cid, multi));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, containerNew, (int)cid, multi), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID containerNew = env->GetMethodID(clazz, "containerAddColumn",
 "(Landroid/widget/ListView;Ljava/lang/String;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerNew, handle, jstr, (int)flags[z]);
+_dw_jni_check_exception(env);
 }
 }
 }
 return DW_ERROR_GENERAL;
 }
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_filesystem_setup(HWND handle, unsigned long *flags, char **titles, int count)
 {
 unsigned long fsflags[2] = { DW_CFA_BITMAPORICON, DW_CFA_STRING };
-char *fstitles[2] = { "Icon", "Filename" };
+char *fstitles[2] = { (char *)"Icon", (char *)"Filename" };
 dw_container_setup(handle, fsflags, fstitles, 2, 0);
 dw_container_setup(handle, flags, titles, count, 0);
 return DW_ERROR_GENERAL;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID containerAlloc = env->GetMethodID(clazz, "containerAlloc",
 "(Landroid/widget/ListView;I)Landroid/widget/ListView;");
 // Call the method on the object
-return (void *)env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, containerAlloc, handle, rowcount));
+return (void *)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, containerAlloc, handle, rowcount), _DW_REFERENCE_WEAK);
 }
 return nullptr;
 }
 /*
 // Get the method that you want to call
 jmethodID containerChangeItem = env->GetMethodID(clazz, "containerChangeItemIcon",
 "(Landroid/widget/ListView;IILandroid/graphics/drawable/Drawable;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerChangeItem, handle, column, row, icon);
+_dw_jni_check_exception(env);
 }
 }
 else if((columntype & DW_CFA_STRING))
 {
 const char *tmp = *((const char **)data);
 // Get the method that you want to call
 jmethodID containerChangeItem = env->GetMethodID(clazz, "containerChangeItemString",
 "(Landroid/widget/ListView;IILjava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerChangeItem, handle, column, row, jstr);
+_dw_jni_check_exception(env);
 }
 }
 else if((columntype & DW_CFA_ULONG))
 {
 ULONG num = *((ULONG *)data);
 // Get the method that you want to call
 jmethodID containerChangeItem = env->GetMethodID(clazz, "containerChangeItemInt",
 "(Landroid/widget/ListView;III)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerChangeItem, handle, column, row, (int)num);
+_dw_jni_check_exception(env);
 }
 // TODO: Handle DATE and TIME
 }
 }
 *       Constant identifying the the column type.
 */
 int API dw_container_get_column_type(HWND handle, int column)
 {
 JNIEnv *env;
+int retval = 0;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID containerGetColumnType = env->GetMethodID(clazz, "containerGetColumnType",
 "(Landroid/widget/ListView;I)I");
 // Call the method on the object
-return env->CallIntMethod(_dw_obj, containerGetColumnType, handle, column);
+retval = env->CallIntMethod(_dw_obj, containerGetColumnType, handle, column);
-}
+if(_dw_jni_check_exception(env))
-return 0;
+retval = 0;
+}
+return retval;
 }
 /*
 * Gets column type for a filesystem container column.
 * Parameters:
 // Get the method that you want to call
 jmethodID containerClear = env->GetMethodID(clazz, "containerClear",
 "(Landroid/widget/ListView;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerClear, handle);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Removes the first x rows from a container.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID iconNew = env->GetMethodID(clazz, "iconNew",
 "(Ljava/lang/String;[BII)Landroid/graphics/drawable/Drawable;");
 // Call the method on the object
-jobject result = env->NewGlobalRef(env->CallObjectMethod(_dw_obj, iconNew,
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, iconNew,
-file, bytearray, len, resid));
+file, bytearray, len, resid), _DW_REFERENCE_WEAK);
 // Clean up after the array now that we are finished
 //if(bytearray)
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
 return result;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID mleNew = env->GetMethodID(clazz, "bitmapNew",
 "(I)Landroid/widget/ImageView;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, mleNew, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, mleNew, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 if(data && len > 0)
 {
 bytearray = env->NewByteArray(len);
 env->SetByteArrayRegion(bytearray, 0, len, reinterpret_cast<const jbyte *>(data));
 }
-// First get the class that contains the method you need to call
+if(!_dw_jni_check_exception(env))
-jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
+{
-// Get the method that you want to call
+// First get the class that contains the method you need to call
-jmethodID pixmapNew = env->GetMethodID(clazz, "pixmapNew",
+jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
-"(IILjava/lang/String;[BII)Landroid/graphics/Bitmap;");
+// Get the method that you want to call
-// Call the method on the object
+jmethodID pixmapNew = env->GetMethodID(clazz, "pixmapNew",
-jobject result = env->NewGlobalRef(env->CallObjectMethod(_dw_obj, pixmapNew,
+"(IILjava/lang/String;[BII)Landroid/graphics/Bitmap;");
-(jint)width, (jint)height,
+// Call the method on the object
-file, bytearray, len, resid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, pixmapNew,
-// Clean up after the array now that we are finished
+(jint) width,
-//if(bytearray)
+(jint) height,
+file, bytearray, len,
+resid),
+_DW_REFERENCE_STRONG);
+// Clean up after the array now that we are finished
+//if(bytearray)
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
 return result;
+}
 }
 return nullptr;
 }
 void _dw_pixmap_get_dimensions(HPIXMAP pixmap)
 // Get the method that you want to call
 jmethodID pixmapGetDimensions = env->GetMethodID(clazz, "pixmapGetDimensions",
 "(Landroid/graphics/Bitmap;)J");
 // Call the method on the object
 jlong dimensions = env->CallLongMethod(_dw_obj, pixmapGetDimensions, pixmap->bitmap);
+if(_dw_jni_check_exception(env))
+dimensions = 0;
 pixmap->width = dimensions & 0xFFFF;
 pixmap->height = (dimensions >> 32) & 0xFFFF;
 }
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID typefaceFromFontName = env->GetMethodID(clazz, "typefaceFromFontName",
 "(Ljava/lang/String;)Landroid/graphics/Typeface;");
 // Call the method on the object
-jobject typeface = env->NewGlobalRef(env->CallObjectMethod(_dw_obj, typefaceFromFontName, jstr));
+jobject typeface = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, typefaceFromFontName, jstr), _DW_REFERENCE_STRONG);
 if(typeface)
 {
 jobject oldtypeface = pixmap->typeface;
 pixmap->typeface = typeface;
 if(oldtypeface)
 JNIEnv *env;
 if(pixmap && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 env->DeleteGlobalRef(pixmap->bitmap);
+if(pixmap->typeface)
+env->DeleteGlobalRef(pixmap->typeface);
 free(pixmap);
 }
 }
 }
 // Get the method that you want to call
 jmethodID pixmapBitBlt = env->GetMethodID(clazz, "pixmapBitBlt",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIILorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, pixmapBitBlt, dest, destp ? destp->bitmap : nullptr, xdest, ydest, width, height, src, srcp ? srcp->bitmap : nullptr, xsrc, ysrc, srcwidth, srcheight);
+if(_dw_jni_check_exception(env))
+retval = DW_ERROR_GENERAL;
 }
 return retval;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID calendarNew = env->GetMethodID(clazz, "calendarNew",
 "(I)Landroid/widget/CalendarView;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, calendarNew, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, calendarNew, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID calendarSetDate = env->GetMethodID(clazz, "calendarSetDate",
 "(Landroid/widget/CalendarView;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, calendarSetDate, handle, (jlong)date);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Gets the year, month and day set in the calendar widget.
 // Get the method that you want to call
 jmethodID calendarGetDate = env->GetMethodID(clazz, "calendarGetDate",
 "(Landroid/widget/CalendarView;)J");
 // Call the method on the object
 date = (time_t)env->CallLongMethod(_dw_obj, calendarGetDate, handle);
+if(_dw_jni_check_exception(env))
+date = 0;
 ts = *localtime(&date);
 if(year)
 *year = ts.tm_year + 1900;
 if(month)
 *month = ts.tm_mon + 1;
 // Get the method that you want to call
 jmethodID htmlAction = env->GetMethodID(clazz, "htmlAction",
 "(Landroid/webkit/WebView;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, htmlAction, handle, action);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Render raw HTML code in the embedded HTML widget..
 // Get the method that you want to call
 jmethodID htmlRaw = env->GetMethodID(clazz, "htmlRaw",
 "(Landroid/webkit/WebView;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, htmlRaw, handle, jstr);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 /*
 // Get the method that you want to call
 jmethodID htmlLoadURL = env->GetMethodID(clazz, "htmlLoadURL",
 "(Landroid/webkit/WebView;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, htmlLoadURL, handle, jstr);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 /*
 // Get the method that you want to call
 jmethodID htmlJavascriptRun = env->GetMethodID(clazz, "htmlJavascriptRun",
 "(Landroid/webkit/WebView;Ljava/lang/String;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, htmlJavascriptRun, handle, jstr, (jlong)scriptdata);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_UNKNOWN;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID htmlNew = env->GetMethodID(clazz, "htmlNew",
 "(I)Landroid/webkit/WebView;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, htmlNew, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, htmlNew, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID menuNew = env->GetMethodID(clazz, "menuNew",
 "(I)Lorg/dbsoft/dwindows/DWMenu;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, menuNew, (int)cid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, menuNew, (int)cid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID menuBarNew = env->GetMethodID(clazz, "menuBarNew",
 "(Landroid/view/View;)Lorg/dbsoft/dwindows/DWMenu;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, menuBarNew, location));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, menuBarNew, location), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID menuDestroy = env->GetMethodID(clazz, "menuDestroy",
 "(Lorg/dbsoft/dwindows/DWMenu;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, menuDestroy, *menu);
+_dw_jni_check_exception(env);
 *menu = nullptr;
 }
 }
 /*
 // Get the method that you want to call
 jmethodID menuDeleteItem = env->GetMethodID(clazz, "menuDeleteItem",
 "(Lorg/dbsoft/dwindows/DWMenu;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, menuDeleteItem, menux, (int)id);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_UNKNOWN;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID menuAppendItem = env->GetMethodID(clazz, "menuAppendItem",
 "(Lorg/dbsoft/dwindows/DWMenu;Ljava/lang/String;IIIILorg/dbsoft/dwindows/DWMenu;)Lorg/dbsoft/dwindows/DWMenuItem;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, menuAppendItem, menux, jstr, (int)itemid, (int)flags, end, check, submenux));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, menuAppendItem, menux, jstr, (int)itemid, (int)flags, end, check, submenux), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID menuSetState = env->GetMethodID(clazz, "menuSetState",
 "(Lorg/dbsoft/dwindows/DWMenu;II)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, menuSetState, menux, (int)itemid, (int)state);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a notebook object to be packed.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID notebookNew = env->GetMethodID(clazz, "notebookNew",
 "(II)Landroid/widget/RelativeLayout;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, notebookNew, (int)cid, top));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, notebookNew, (int)cid, top), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID notebookPageNew = env->GetMethodID(clazz, "notebookPageNew",
 "(Landroid/widget/RelativeLayout;JI)J");
 // Call the method on the object
 result = (unsigned long)env->CallLongMethod(_dw_obj, notebookPageNew, handle, (jlong)flags, front);
+if(_dw_jni_check_exception(env))
+result = 0;
 }
 return result;
 }
 /*
 // Get the method that you want to call
 jmethodID notebookPageDestroy = env->GetMethodID(clazz, "notebookPageDestroy",
 "(Landroid/widget/RelativeLayout;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, notebookPageDestroy, handle, (jlong)pageid);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Queries the currently visible page ID.
 // Get the method that you want to call
 jmethodID notebookPageGet = env->GetMethodID(clazz, "notebookPageGet",
 "(Landroid/widget/RelativeLayout;)J");
 // Call the method on the object
 result = (unsigned long)env->CallLongMethod(_dw_obj, notebookPageGet, handle);
+if(_dw_jni_check_exception(env))
+result = 0;
 }
 return result;
 }
 /*
 // Get the method that you want to call
 jmethodID notebookPageSet = env->GetMethodID(clazz, "notebookPageSet",
 "(Landroid/widget/RelativeLayout;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, notebookPageSet, handle, (jlong)pageid);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the text on the specified notebook tab.
 // Get the method that you want to call
 jmethodID notebookPageSetText = env->GetMethodID(clazz, "notebookPageSetText",
 "(Landroid/widget/RelativeLayout;JLjava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, notebookPageSetText, handle, (jlong)pageid, jstr);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the text on the specified notebook tab status area.
 // Get the method that you want to call
 jmethodID notebookPagePack = env->GetMethodID(clazz, "notebookPagePack",
 "(Landroid/widget/RelativeLayout;JLandroid/widget/LinearLayout;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, notebookPagePack, handle, (jlong)pageid, page);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Create a new Window Frame.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID windowNew = env->GetMethodID(clazz, "windowNew",
 "(Ljava/lang/String;I)Landroid/widget/LinearLayout;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, windowNew, jstr, (int)flStyle));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, windowNew, jstr, (int)flStyle), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID windowHideShow = env->GetMethodID(clazz, "windowHideShow",
 "(Landroid/view/View;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowHideShow, handle, state);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 /*
 "(Landroid/view/View;IIIIIIIIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetColor, handle,
 (jint)fore, 0, (jint)DW_RED_VALUE(_fore), (jint)DW_GREEN_VALUE(_fore), (jint)DW_BLUE_VALUE(_fore),
 (jint)back, 0, (jint)DW_RED_VALUE(_back), (jint)DW_GREEN_VALUE(_back), (jint)DW_BLUE_VALUE(_back));
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 /*
 // Get the method that you want to call
 jmethodID windowHideShow = env->GetMethodID(clazz, "windowSetFont",
 "(Landroid/view/View;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowHideShow, handle, jstr);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID windowGetText = env->GetMethodID(clazz, "windowGetText",
 "(Landroid/view/View;)Ljava/lang/String;");
 // Call the method on the object
-jstring result = (jstring)env->CallObjectMethod(_dw_obj, windowGetText, handle);
+jstring result = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, windowGetText, handle), _DW_REFERENCE_NONE);
 // Get the UTF8 string result
 if(result)
 utf8 = env->GetStringUTFChars(result, nullptr);
 return utf8 ? strdup(utf8) : nullptr;
 }
 // Get the method that you want to call
 jmethodID windowSetText = env->GetMethodID(clazz, "windowSetText",
 "(Landroid/view/View;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetText, handle, jstr);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the text used for a given window's floating bubble help.
 // Get the method that you want to call
 jmethodID windowSetEnabled = env->GetMethodID(clazz, "windowSetEnabled",
 "(Landroid/view/View;Z)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetEnabled, handle, state);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Disables given window (widget).
 // Get the method that you want to call
 jmethodID windowSetBitmapFromData = env->GetMethodID(clazz, "windowSetBitmapFromData",
 "(Landroid/view/View;I[BI)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetBitmapFromData, handle, (int)cid, bytearray, len);
+_dw_jni_check_exception(env);
 // Clean up after the array now that we are finished
 //if(bytearray)
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
 }
 }
 // Get the method that you want to call
 jmethodID windowSetBitmapFromData = env->GetMethodID(clazz, "windowSetBitmap",
 "(Landroid/view/View;ILjava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetBitmapFromData, handle, (int)resid, jstr);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Sets the icon used for a given window.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID windowFromId = env->GetMethodID(clazz, "windowFromId",
 "(Landroid/view/View;I)Landroid/view/View;");
 // Call the method on the object
-retval = env->CallObjectMethod(_dw_obj, windowFromId, handle, id);
+retval = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, windowFromId, handle, id), _DW_REFERENCE_NONE);
 }
 return retval;
 }
 /*
 // Get the method that you want to call
 jmethodID screenGetDimensions = env->GetMethodID(clazz, "screenGetDimensions",
 "()J");
 // Call the method on the object
 _dw_screen_dimensions = env->CallLongMethod(_dw_obj, screenGetDimensions);
+if(_dw_jni_check_exception(env))
+_dw_screen_dimensions = 0;
 }
 }
 return _dw_screen_dimensions & 0xFFFF;
 }
 // Get the method that you want to call
 jmethodID screenGetDimensions = env->GetMethodID(clazz, "screenGetDimensions",
 "()J");
 // Call the method on the object
 _dw_screen_dimensions = env->CallLongMethod(_dw_obj, screenGetDimensions);
+if(_dw_jni_check_exception(env))
+_dw_screen_dimensions = 0;
 }
 }
 return (_dw_screen_dimensions >> 32) & 0xFFFF;
 }
 jclass clazz = _dw_find_class(jenv, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID androidGetRelease = jenv->GetMethodID(clazz, "androidGetRelease",
 "()Ljava/lang/String;");
 // Call the method on the object
-jstring jstr = (jstring)jenv->CallObjectMethod(_dw_obj, androidGetRelease);
+jstring jstr = (jstring)_dw_jni_check_result(jenv, jenv->CallObjectMethod(_dw_obj, androidGetRelease), _DW_REFERENCE_NONE);
 if(jstr)
 release = jenv->GetStringUTFChars(jstr, nullptr);
 }
 snprintf(osName, _DW_ENV_STRING_SIZE-1, "Android%s%s",
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID doBeep = env->GetMethodID(clazz, "doBeep", "(I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, doBeep, dur);
+_dw_jni_check_exception(env);
 }
 }
 /* Call this after drawing to the screen to make sure
 * anything you have drawn is visible.
 // Get the method that you want to call
 jmethodID windowSetData = env->GetMethodID(clazz, "windowSetData",
 "(Landroid/view/View;Ljava/lang/String;J)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetData, window, jstr, (jlong)data);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Gets a named user data item from a window handle.
 // Get the method that you want to call
 jmethodID windowGetData = env->GetMethodID(clazz, "windowGetData",
 "(Landroid/view/View;Ljava/lang/String;)J");
 // Call the method on the object
 retval = (void *)env->CallLongMethod(_dw_obj, windowGetData, window, jstr);
+if(_dw_jni_check_exception(env))
+retval = nullptr;
 }
 return retval;
 }
 /*
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID timerConnect = env->GetMethodID(clazz, "timerConnect",
 "(JJJ)Ljava/util/Timer;");
 // Call the method on the object
-retval = DW_POINTER_TO_INT(env->NewGlobalRef(env->CallObjectMethod(_dw_obj,
+retval = DW_POINTER_TO_INT(_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj,
-timerConnect, longinterval, (jlong)sigfunc, (jlong)data)));
+timerConnect, longinterval, (jlong)sigfunc, (jlong)data), _DW_REFERENCE_STRONG));
 }
 return retval;
 }
 /*
 // Get the method that you want to call
 jmethodID timerDisconnect = env->GetMethodID(clazz, "timerDisconnect",
 "(Ljava/util/Timer;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, timerDisconnect, timer);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Add a callback to a window event.
 /* Check if we are on the UI thread */
 int _dw_is_ui_thread(void)
 {
 JNIEnv *env;
+int retval = FALSE;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID isUIThread = env->GetMethodID(clazz, "isUIThread",
 "()Z");
 // Call the method on the object
-return env->CallBooleanMethod(_dw_obj, isUIThread);
+retval = env->CallBooleanMethod(_dw_obj, isUIThread);
-}
+if(_dw_jni_check_exception(env))
-return FALSE;
+retval = FALSE;
+}
+return retval;
 }
 /*
 * Tries to gain access to the semaphore, if it can't it blocks.
 * Parameters:
 // Get the method that you want to call
 jmethodID dwInit = env->GetMethodID(clazz, "dwInit",
 "(Ljava/lang/String;Ljava/lang/String;)I");
 // Call the method on the object
 _dw_android_api = env->CallIntMethod(_dw_obj, dwInit, appid, appname);
+if(_dw_jni_check_exception(env))
+_dw_android_api = 0;
 }
 return DW_ERROR_NONE;
 }
 /*
 // Get the method that you want to call
 jmethodID dwindowsShutdown = env->GetMethodID(clazz, "dwindowsShutdown",
 "()V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, dwindowsShutdown);
+_dw_jni_check_exception(env);
 }
 }
 /*
 * Execute and external program in a seperate session.
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID notificationNew = env->GetMethodID(clazz, "notificationNew",
 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;");
 // Call the method on the object
-jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, notificationNew, ntitle, image, ndesc, appid));
+jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, notificationNew, ntitle, image, ndesc, appid), _DW_REFERENCE_WEAK);
 return result;
 }
 return nullptr;
 }
 // Get the method that you want to call
 jmethodID notificationNew = env->GetMethodID(clazz, "notificationSend",
 "(Landroidx/core/app/NotificationCompat$Builder;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, notificationNew, notification);
-return DW_ERROR_NONE;
+if(!_dw_jni_check_exception(env))
+return DW_ERROR_NONE;
 }
 return DW_ERROR_UNKNOWN;
 }
 /*

Mercurial > dwindows

comparison android/dw.cpp @ 2557:756331246f94