dwindows: android/dw.cpp comparison

comparison android/dw.cpp @ 2810:e0ac1ef1c85b

Android: JNI changes to address potential memory/object leaks. While I haven't done any memory leak testing, while researching how to improve performance, it has come to my attention that I should be releasing various objects. Particularly java string related references. Always call DeleteLocalRef() after NewStringUTF() and... Always call ReleaseStringUTFChars() after GetStringUTFChars().

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 26 Jul 2022 19:40:46 +0000
parents	f910da0418f6
children	723b79981427

comparison

equal deleted inserted replaced

-:f81e92947f4a
+:e0ac1ef1c85b
 return JNI_VERSION_1_6;
 }
 jclass _dw_find_class(JNIEnv *env, const char* name)
 {
-return static_cast<jclass>(env->CallObjectMethod(_dw_class_loader, _dw_class_method, env->NewStringUTF(name)));
+jstring jname = env->NewStringUTF(name);
+jclass clazz = static_cast<jclass>(env->CallObjectMethod(_dw_class_loader, _dw_class_method, jname));
+env->DeleteLocalRef(jname);
+return clazz;
 }
 // Do a quick check if an exception occurred...
 // Display then clear it so we can continue...
 // Return TRUE if an exception had occurred
 *      path: The path to the Android app.
 */
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_dwindowsInit(JNIEnv* env, jobject obj, jstring apppath, jstring appcache, jstring appID)
 {
-char *arg = strdup(env->GetStringUTFChars((jstring)apppath, nullptr));
+const char *arg = env->GetStringUTFChars((jstring)apppath, nullptr);
 const char *cache = env->GetStringUTFChars((jstring)appcache, nullptr);
 const char *appid = env->GetStringUTFChars((jstring)appID, nullptr);
 char *home = getenv("HOME");
 if(!_dw_main_event)
 if(cache)
 {
 /* Store the passed in path for dw_app_dir() */
 strncpy(_dw_exec_dir, cache, MAX_PATH);
+env->ReleaseStringUTFChars(appcache, cache);
 }
 /* Store the best path for dw_user_dir() */
 if(home)
 strncpy(_dw_user_dir, home, MAX_PATH);
 else if(arg)
 strcpy(_dw_user_dir, "/");
 if(appid)
 {
 /* Store our reported Android AppID */
 strncpy(_dw_app_id, appid, _DW_APP_ID_SIZE);
+env->ReleaseStringUTFChars(appID, appid);
 }
 /* Launch the new thread to execute dwmain() */
-dw_thread_new((void *) _dw_main_launch, arg, 0);
+dw_thread_new((void *) _dw_main_launch, strdup(arg ? arg : ""), 0);
+if(arg)
+env->ReleaseStringUTFChars(apppath, arg);
 }
 typedef struct _dwsighandler
 {
 struct _dwsighandler   *next;
 int (*keypressfunc)(HWND, char, int, int, void *, char *) = (int (* API)(HWND, char, int, int, void *, char *))handler->signalfunction;
 char *utf8 = (char *)params[1], ch = (char)DW_POINTER_TO_INT(params[3]);
 int vk = DW_POINTER_TO_INT(params[4]), special = DW_POINTER_TO_INT(params[5]);
 retval = keypressfunc(handler->window, ch, (int)vk, special, handler->data, utf8);
+if(utf8)
+free(utf8);
 break;
 }
 /* Button press and release event */
 case _DW_EVENT_BUTTON_PRESS:
 case _DW_EVENT_BUTTON_RELEASE:
 }
 /* Container class selection event */
 case _DW_EVENT_ITEM_ENTER:
 {
 int (*containerselectfunc)(HWND, char *, void *, void *) =(int (* API)(HWND, char *, void *, void *)) handler->signalfunction;
+char *text = (char *)params[1];
-retval = containerselectfunc(handler->window, (char *)params[1], handler->data, params[7]);
+retval = containerselectfunc(handler->window, text, handler->data, params[7]);
+if(text)
+free(text);
 break;
 }
 /* Container context menu event */
 case _DW_EVENT_ITEM_CONTEXT:
 {
 void *user = params[7];
 int x = DW_POINTER_TO_INT(params[3]);
 int y = DW_POINTER_TO_INT(params[4]);
 retval = containercontextfunc(handler->window, text, x, y, handler->data, user);
+if(text)
+free(text);
 break;
 }
 /* Generic selection changed event for several classes */
 case _DW_EVENT_LIST_SELECT:
 case _DW_EVENT_VALUE_CHANGED:
 int (* API treeselectfunc)(HWND, HTREEITEM, char *, void *, void *) = (int (* API)(HWND, HTREEITEM, char *, void *, void *))handler->signalfunction;
 char *text = (char *)params[1];
 void *user = params[7];
 retval = treeselectfunc(handler->window, (jobject)params[0], text, handler->data, user);
+if(text)
+free(text);
 break;
 }
 /* Set Focus event */
 case _DW_EVENT_SET_FOCUS:
 {
 {
 int (* API htmlresultfunc)(HWND, int, char *, void *, void *) = (int (* API)(HWND, int, char *, void *, void *))handler->signalfunction;
 char *result = (char *)params[1];
 retval = htmlresultfunc(handler->window, result ? DW_ERROR_NONE : DW_ERROR_UNKNOWN, result, params[7], handler->data);
+if(result)
+free(result);
 break;
 }
 /* HTML changed event */
 case _DW_EVENT_HTML_CHANGED:
 {
 int (* API htmlchangedfunc)(HWND, int, char *, void *) = (int (* API)(HWND, int, char *, void *))handler->signalfunction;
 char *uri = (char *)params[1];
 retval = htmlchangedfunc(handler->window, DW_POINTER_TO_INT(params[3]), uri, handler->data);
+if(uri)
+free(uri);
 break;
 }
 }
 }
 return retval;
 Java_org_dbsoft_dwindows_DWindows_eventHandler(JNIEnv* env, jobject obj, jobject obj1, jobject obj2,
 jint message, jstring str1, jstring str2,
 jint inta, jint intb, jint intc, jint intd) {
 const char *utf81 = str1 ? env->GetStringUTFChars(str1, nullptr) : nullptr;
 const char *utf82 = str2 ? env->GetStringUTFChars(str2, nullptr) : nullptr;
-void *params[_DW_EVENT_PARAM_SIZE] = { DW_POINTER(obj2), DW_POINTER(utf81), DW_POINTER(utf82),
+void *params[_DW_EVENT_PARAM_SIZE] = { DW_POINTER(obj2), DW_POINTER(utf81 ? strdup(utf81) : nullptr),
+DW_POINTER(utf82 ? strdup(utf82) : nullptr),
 DW_INT_TO_POINTER(inta), DW_INT_TO_POINTER(intb),
 DW_INT_TO_POINTER(intc), DW_INT_TO_POINTER(intd), nullptr,
 DW_INT_TO_POINTER(message), nullptr };
-return _dw_event_handler(obj1, params);
+int retval = _dw_event_handler(obj1, params);
+if(utf81)
+env->ReleaseStringUTFChars(str1, utf81);
+if(utf82)
+env->ReleaseStringUTFChars(str2, utf82);
+return retval;
 }
 /* A more simple method for quicker calls */
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerSimple(JNIEnv* env, jobject obj, jobject obj1, jint message)
 /* Handlers for HTML events */
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerHTMLResult(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jstring htmlResult, jlong data) {
 const char *result = env->GetStringUTFChars(htmlResult, nullptr);
-void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(result), nullptr, nullptr, nullptr, nullptr, nullptr,
+void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(result ? strdup(result) : nullptr), nullptr,
-DW_INT_TO_POINTER(data), DW_INT_TO_POINTER(message), nullptr };
+nullptr, nullptr, nullptr, nullptr, DW_INT_TO_POINTER(data),
+DW_INT_TO_POINTER(message), nullptr };
 _dw_event_handler(obj1, params);
+if(result)
+env->ReleaseStringUTFChars(htmlResult, result);
 }
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWWebViewClient_eventHandlerHTMLChanged(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jstring URI, jint status) {
 const char *uri = env->GetStringUTFChars(URI, nullptr);
-void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(uri), nullptr, DW_INT_TO_POINTER(status),
+void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(uri ? strdup(uri) : nullptr), nullptr,
-nullptr, nullptr, nullptr, nullptr, DW_INT_TO_POINTER(message), nullptr };
+DW_INT_TO_POINTER(status), nullptr, nullptr, nullptr, nullptr,
+DW_INT_TO_POINTER(message), nullptr };
 _dw_event_handler(obj1, params);
+if(uri)
+env->ReleaseStringUTFChars(URI, uri);
 }
 typedef struct _dwprint
 {
 int (*drawfunc)(HPRINT, HPIXMAP, int, void *);
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerContainer(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jstring jtitle, jint x, jint y, jlong data) {
 const char *title = jtitle ? env->GetStringUTFChars(jtitle, nullptr) : nullptr;
-void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(title), nullptr, DW_INT_TO_POINTER(x), DW_INT_TO_POINTER(y),
+void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(title ? strdup(title) : nullptr), nullptr,
-nullptr, nullptr, DW_POINTER(data), DW_INT_TO_POINTER(message), nullptr };
+DW_INT_TO_POINTER(x), DW_INT_TO_POINTER(y), nullptr, nullptr,
+DW_POINTER(data), DW_INT_TO_POINTER(message), nullptr };
 _dw_event_handler(obj1, params);
+if(title)
+env->ReleaseStringUTFChars(jtitle, title);
 }
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerTree(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jobject item, jstring jtitle, jlong data) {
 const char *title = jtitle ? env->GetStringUTFChars(jtitle, nullptr) : nullptr;
-void *params[_DW_EVENT_PARAM_SIZE] = { DW_POINTER(item), DW_POINTER(title), nullptr, nullptr, nullptr,
+void *params[_DW_EVENT_PARAM_SIZE] = { DW_POINTER(item), DW_POINTER(title ? strdup(title) : nullptr),
-nullptr, nullptr, DW_POINTER(data), DW_INT_TO_POINTER(message), nullptr };
+nullptr, nullptr, nullptr, nullptr, nullptr, DW_POINTER(data),
+DW_INT_TO_POINTER(message), nullptr };
 _dw_event_handler(obj1, params);
+if(title)
+env->ReleaseStringUTFChars(jtitle, title);
 }
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerTreeItem(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jobject item) {
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerKey(JNIEnv *env, jobject obj, jobject obj1, jint message, jint ch,
 jint vk, jint modifiers, jstring str) {
 const char *cstr = str ? env->GetStringUTFChars(str, nullptr) : nullptr;
-void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(cstr), nullptr, DW_INT_TO_POINTER(ch), DW_INT_TO_POINTER(vk),
+void *params[_DW_EVENT_PARAM_SIZE] = { nullptr, DW_POINTER(cstr ? strdup(cstr) : nullptr), nullptr,
-DW_INT_TO_POINTER(modifiers), nullptr, nullptr, DW_INT_TO_POINTER(message), nullptr };
+DW_INT_TO_POINTER(ch), DW_INT_TO_POINTER(vk), DW_INT_TO_POINTER(modifiers),
+nullptr, nullptr, DW_INT_TO_POINTER(message), nullptr };
 _dw_event_handler(obj1, params);
+if(cstr)
+env->ReleaseStringUTFChars(str, cstr);
 }
 /* Handler for Timer events */
 JNIEXPORT jint JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerTimer(JNIEnv* env, jobject obj, jlong sigfunc, jlong data) {
 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);
+env->DeleteLocalRef(jstr);
 }
 else {
 /* Output to stderr, if there is another way to send it
 * on the implementation platform, change this.
 */
 jmethodID messageBox = env->GetMethodID(clazz, "messageBox",
 "(Ljava/lang/String;Ljava/lang/String;I)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, messageBox, jstrtitle, jstr, flags);
 _dw_jni_check_exception(env);
+env->DeleteLocalRef(jstr);
+env->DeleteLocalRef(jstrtitle);
 }
 return retval;
 }
 /*
 {
 const char *str = env->GetStringUTFChars(jresult, nullptr);
 if(str)
 retval = strdup(str);
 }
+env->DeleteLocalRef(jstr);
+if(path)
+env->DeleteLocalRef(path);
+if(jext)
+env->DeleteLocalRef(jext);
 }
 return retval;
 }
 int API dw_file_open(const char *path, int mode)
 jmethodID fileOpen = env->GetMethodID(clazz, "fileOpen",
 "(Ljava/lang/String;I)I");
 // Call the method on the object
 retval = (int) env->CallIntMethod(_dw_obj, fileOpen, jstr, (jint) mode);
 _dw_jni_check_exception(env);
+env->DeleteLocalRef(jstr);
 }
 }
 return retval;
 }
 JNIEnv *env;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 const char *utf8 = nullptr;
+char *retval = 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 clipboardGetText = env->GetMethodID(clazz, "clipboardGetText",
 // Call the method on the object
 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;
+if(utf8)
+{
+retval = strdup(utf8);
+env->ReleaseStringUTFChars(result, utf8);
+}
+return retval;
 }
 return nullptr;
 }
 /*
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Allocates and initializes a dialog struct.
 // Get the method that you want to call
 jmethodID groupBoxNew = env->GetMethodID(clazz, "groupBoxNew",
 "(IILjava/lang/String;)Landroid/widget/LinearLayout;");
 // Call the method on the object
 jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, groupBoxNew, type, pad, jstr), _DW_REFERENCE_WEAK);
+if(jstr)
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, buttonNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, entryfieldNew, jstr, (int)cid, password), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 /*
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, bitmapButtonNew, jstr, (int)resid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Construct a String
 jstring jstr = env->NewStringUTF(text);
-jstring path = env->NewStringUTF(text);
+jstring path = env->NewStringUTF(filename);
 // 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 bitmapButtonNewFromFile = env->GetMethodID(clazz, "bitmapButtonNewFromFile",
 "(Ljava/lang/String;ILjava/lang/String;)Landroid/widget/ImageButton;");
 // Call the method on the object
 jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, bitmapButtonNewFromFile, jstr, (int)cid, path), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
+env->DeleteLocalRef(path);
 return result;
 }
 return nullptr;
 }
 // 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 = _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
+// TODO: Clean up after the array now that we are finished
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, spinButtonNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, radioButtonNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, checkboxNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Inserts the specified text into the listbox's (or combobox) entry list.
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Appends the specified text items to the listbox's (or combobox) entry list.
 // Get the UTF8 string result
 if(result)
 {
 const char *utf8 = env->GetStringUTFChars(result, nullptr);
-strncpy(buffer, utf8, length);
+if(utf8)
+{
+strncpy(buffer, utf8, length);
+env->ReleaseStringUTFChars(result, utf8);
+}
 }
 }
 }
 /*
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Returns the index to the item in the list currently selected.
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, comboBoxNew, jstr, (int)cid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 "(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;
+env->DeleteLocalRef(jstr);
 }
 return retval;
 }
 /*
 "(Landroid/widget/EditText;Ljava/lang/String;II)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, mleSearch, handle, jstr, point, (jint)flags);
 if(_dw_jni_check_exception(env))
 retval = DW_ERROR_UNKNOWN;
+env->DeleteLocalRef(jstr);
 }
 return retval;
 }
 /*
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, textNew, jstr, (int)cid, status), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 // 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, fgcolor, bgcolor);
 _dw_jni_check_exception(env);
+env->DeleteLocalRef(jstr);
 }
 }
 /* Query the width and height of a text string.
 * Parameters:
 if(width)
 *width = dimensions & 0xFFFF;
 if(height)
 *height = (dimensions >> 32) & 0xFFFF;
+env->DeleteLocalRef(jstr);
 }
 }
 /* Draw a polygon on a window (preferably a render window).
 * Parameters:
 jmethodID treeInsertAfter = env->GetMethodID(clazz, "treeInsertAfter",
 "(Lorg/dbsoft/dwindows/DWTree;Lorg/dbsoft/dwindows/DWTreeItem;Ljava/lang/String;Landroid/graphics/drawable/Drawable;Lorg/dbsoft/dwindows/DWTreeItem;J)Lorg/dbsoft/dwindows/DWTreeItem;");
 // Call the method on the object
 jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, treeInsertAfter, handle, item,
 jstr, icon, parent, (jlong)itemdata), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 JNIEnv *env;
 if(handle && item && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 const char *utf8 = nullptr;
+char *retval = 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 treeGetTitle = env->GetMethodID(clazz, "treeGetTitle",
 // Call the method on the object
 jstring result = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, treeGetTitle, handle, item), _DW_REFERENCE_NONE);
 // Get the UTF8 string result
 if(result)
 utf8 = env->GetStringUTFChars(result, nullptr);
-return utf8 ? strdup(utf8) : nullptr;
+if(utf8)
+{
+retval = strdup(utf8);
+env->ReleaseStringUTFChars(result, utf8);
+}
 }
 return nullptr;
 }
 /*
 // Get the method that you want to call
 jmethodID treeItemChange = env->GetMethodID(clazz, "treeItemChange",
 "(Lorg/dbsoft/dwindows/DWTree;Lorg/dbsoft/dwindows/DWTreeItem;Ljava/lang/String;Landroid/graphics/drawable/Drawable;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, treeItemChange, handle, item, jstr, icon);
+_dw_jni_check_exception(env);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Sets the item data of a tree item.
 "(Landroid/widget/ListView;Ljava/lang/String;I)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerNew, handle, jstr, (int)flags[z]);
 if(_dw_jni_check_exception(env))
 retval = DW_ERROR_GENERAL;
+env->DeleteLocalRef(jstr);
 }
 }
 }
 return retval;
 }
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 else if((columntype & DW_CFA_ULONG))
 {
 ULONG num = *((ULONG *)data);
 jmethodID containerChangeRowTitle = env->GetMethodID(clazz, "containerChangeRowTitle",
 "(Landroid/widget/ListView;ILjava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerChangeRowTitle, handle, row, jstr);
 _dw_jni_check_exception(env);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Sets the title of a row in the container.
 } else {
 // 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 containerGetTitleStart = env->GetMethodID(clazz, "containerGetTitleStart",
 "(Landroid/widget/ListView;I)Ljava/lang/String;");
 // Call the method on the object
 jstring jstr = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, containerGetTitleStart, handle, (jint)flags), _DW_REFERENCE_NONE);
-char *str;
+if(jstr)
+{
-if(jstr && (str = (char *)env->GetStringUTFChars(jstr, nullptr)))
+const char *str = env->GetStringUTFChars(jstr, nullptr);
-retval = strdup(str);
+if(str)
+{
+retval = strdup(str);
+env->ReleaseStringUTFChars(jstr, str);
+}
+}
 }
 }
 return retval;
 }
 // Get the method that you want to call
 jmethodID containerGetTitleNext = env->GetMethodID(clazz, "containerGetTitleNext",
 "(Landroid/widget/ListView;I)Ljava/lang/String;");
 // Call the method on the object
 jstring jstr = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, containerGetTitleNext, handle, (jint)flags), _DW_REFERENCE_NONE);
-char *str;
+if(jstr)
+{
-if(jstr && (str = (char *)env->GetStringUTFChars(jstr, nullptr)))
+const char *str = env->GetStringUTFChars(jstr, nullptr);
-retval = strdup(str);
+if(str)
+{
+retval = strdup(str);
+env->ReleaseStringUTFChars(jstr, str);
+}
+}
 }
 }
 return retval;
 }
 jmethodID containerCursor = env->GetMethodID(clazz, "containerCursor",
 "(Landroid/widget/ListView;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerCursor, handle, jstr);
 _dw_jni_check_exception(env);
+if(jstr)
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Cursors the item with the data speficied, and scrolls to that item.
 jmethodID containerRowDeleteByTitle = env->GetMethodID(clazz, "containerRowDeleteByTitle",
 "(Landroid/widget/ListView;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, containerRowDeleteByTitle, handle, jstr);
 _dw_jni_check_exception(env);
+if(jstr)
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Deletes the item with the data speficied.
 jmethodID iconNew = env->GetMethodID(clazz, "iconNew",
 "(Ljava/lang/String;[BII)Landroid/graphics/drawable/Drawable;");
 // Call the method on the object
 jobject result = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, iconNew,
 file, bytearray, len, resid), _DW_REFERENCE_STRONG);
-// Clean up after the array now that we are finished
+// TODO: Clean up after the array now that we are finished
 //if(bytearray)
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
+if(file)
+env->DeleteLocalRef(file);
 return result;
 }
 return nullptr;
 }
 {
 JNIEnv *env;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
-// Construct a string
-jstring file = nullptr;
-if(filename)
-file = env->NewStringUTF(filename);
 // Construct a byte array
 jbyteArray bytearray = nullptr;
 if(data && len > 0)
 {
 bytearray = env->NewByteArray(len);
 env->SetByteArrayRegion(bytearray, 0, len, reinterpret_cast<const jbyte *>(data));
 }
 if(!_dw_jni_check_exception(env))
 {
+// Construct a string
+jstring file = nullptr;
+if(filename)
+file = env->NewStringUTF(filename);
 // 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 pixmapNew = env->GetMethodID(clazz, "pixmapNew",
 "(IILjava/lang/String;[BII)Landroid/graphics/Bitmap;");
 (jint) width,
 (jint) height,
 file, bytearray, len,
 resid),
 _DW_REFERENCE_STRONG);
-// Clean up after the array now that we are finished
+// TODO: Clean up after the array now that we are finished
 //if(bytearray)
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
+if(file)
+env->DeleteLocalRef(file);
 return result;
 }
 }
 return nullptr;
 }
 pixmap->typeface = typeface;
 if(oldtypeface)
 env->DeleteGlobalRef(oldtypeface);
 pixmap->fontsize = atoi(fontname);
 }
+env->DeleteLocalRef(jstr);
 return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;
 }
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_html_raw(HWND handle, const char *string)
 {
 JNIEnv *env;
+int retval = DW_ERROR_GENERAL;
 if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Construct a String
 jstring jstr = env->NewStringUTF(string);
 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);
 if(!_dw_jni_check_exception(env))
-return DW_ERROR_NONE;
+retval = DW_ERROR_NONE;
-}
+env->DeleteLocalRef(jstr);
-return DW_ERROR_GENERAL;
+}
+return retval;
 }
 /*
 * Render file or web page in the embedded HTML widget..
 * Parameters:
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_html_url(HWND handle, const char *url)
 {
 JNIEnv *env;
+int retval = DW_ERROR_GENERAL;
 if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Construct a String
 jstring jstr = env->NewStringUTF(url);
 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);
 if(!_dw_jni_check_exception(env))
-return DW_ERROR_NONE;
+retval = DW_ERROR_NONE;
-}
+env->DeleteLocalRef(jstr);
-return DW_ERROR_GENERAL;
+}
+return retval;
 }
 /*
 * Executes the javascript contained in "script" in the HTML window.
 * Parameters:
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_html_javascript_run(HWND handle, const char *script, void *scriptdata)
 {
 JNIEnv *env;
+int retval = DW_ERROR_GENERAL;
 if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Construct a String
 jstring jstr = env->NewStringUTF(script);
 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);
 if(!_dw_jni_check_exception(env))
-return DW_ERROR_NONE;
+retval = DW_ERROR_NONE;
-}
+env->DeleteLocalRef(jstr);
-return DW_ERROR_UNKNOWN;
+}
+return retval;
 }
 /*
 * Create a new HTML window (widget) to be packed.
 * Parameters:
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, menuAppendItem, menux, jstr, (int)itemid, (int)flags, end, check, submenux), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Sets the text on the specified notebook tab status area.
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, windowNew, jstr, (int)flStyle), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(jstr);
 return result;
 }
 return nullptr;
 }
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_window_set_font(HWND handle, const char *fontname)
 {
 JNIEnv *env;
+int retval = DW_ERROR_GENERAL;
 if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Construct a string
 jstring jstr = env->NewStringUTF(fontname);
 jmethodID windowSetFont = env->GetMethodID(clazz, "windowSetFont",
 "(Landroid/view/View;Ljava/lang/String;)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, windowSetFont, handle, jstr);
 if(!_dw_jni_check_exception(env))
-return DW_ERROR_NONE;
+retval = DW_ERROR_NONE;
-}
+env->DeleteLocalRef(jstr);
-return DW_ERROR_GENERAL;
+}
+return retval;
 }
 /*
 * Returns the current font for the specified window.
 * Parameters:
 "(Landroid/view/View;)Ljava/lang/String;");
 // Call the method on the object
 jstring jstr = (jstring)_dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, windowGetFont, handle), _DW_REFERENCE_NONE);
 if(jstr)
-fontname = strdup(env->GetStringUTFChars(jstr, nullptr));
+{
+const char *str = env->GetStringUTFChars(jstr, nullptr);
+if(str)
+{
+fontname = strdup(str);
+env->ReleaseStringUTFChars(jstr, str);
+}
+}
 }
 return fontname;
 }
 /* Allows the user to choose a font using the system's font chooser dialog.
 JNIEnv *env;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 const char *utf8 = nullptr;
+char *retval = 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 windowGetText = env->GetMethodID(clazz, "windowGetText",
 // Call the method on the object
 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;
+if(utf8)
+{
+retval = strdup(utf8);
+env->ReleaseStringUTFChars(result, utf8);
+}
 }
 return nullptr;
 }
 /*
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Sets the text used for a given window's floating bubble help.
 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);
+if(jstr)
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Sets the icon used for a given window.
 if(!osName[0])
 {
 JNIEnv *jenv;
 const char *release = nullptr;
+jstring jstr = nullptr;
 if((jenv = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 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)_dw_jni_check_result(jenv, jenv->CallObjectMethod(_dw_obj, androidGetRelease), _DW_REFERENCE_NONE);
+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",
 release ? " " : "", release ? release : "");
+if(release)
+jenv->ReleaseStringUTFChars(jstr, release);
 }
 memset(env, '\0', sizeof(DWEnv));
 strncpy(env->osName, osName, sizeof(env->osName)-1);
 strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
 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);
+env->DeleteLocalRef(jstr);
 }
 }
 /*
 * Gets a named user data item from a window handle.
 "(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;
+env->DeleteLocalRef(jstr);
 }
 return retval;
 }
 /*
 "(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;
+env->DeleteLocalRef(appid);
+env->DeleteLocalRef(appname);
 }
 return DW_ERROR_NONE;
 }
 /*
 "(Ljava/lang/String;)I");
 // Call the method on the object
 retval = env->CallIntMethod(_dw_obj, browseURL, jstr);
 if(_dw_jni_check_exception(env))
 retval = DW_ERROR_UNKNOWN;
+env->DeleteLocalRef(jstr);
 }
 return retval;
 }
 /*
 "(JILjava/lang/String;II)Landroid/print/PrintJob;");
 // Call the method on the object
 print->printjob = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, printRun, (jlong)pr, (jint)print->flags, jstr, (jint)print->pages, (jint)flags), _DW_REFERENCE_WEAK);
 if(print->printjob)
 retval = DW_ERROR_NONE;
+env->DeleteLocalRef(jstr);
 }
 return retval;
 }
 /*
 // 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 = _dw_jni_check_result(env, env->CallObjectMethod(_dw_obj, notificationNew, ntitle, image, ndesc, appid), _DW_REFERENCE_WEAK);
+env->DeleteLocalRef(appid);
+env->DeleteLocalRef(ntitle);
 return result;
 }
 return nullptr;
 }

Mercurial > dwindows

comparison android/dw.cpp @ 2810:e0ac1ef1c85b