Android: Improve msgbox, printf cdi workaround

core/imgread/common.cpp

@@ -138,7 +138,12 @@ Disc* OpenDisc(const wchar* fn)
 
 		if (cdi_parse == drivers[i]) {
 			const wchar warn_str[] = "Warning: CDI Image Loaded!\n  Many CDI images are known to be defective, GDI or CHD format is preferred. Please only file bug reports when using images known to be good (GDI or CHD).";
-			msgboxf(warn_str,MBX_ICONASTERISK);// if (OS_DlgYes!=os_Dialog(OS_DialogYesNo, cdiWarn_S)) rv=0;
+#ifdef _ANDROID
+			printf(warn_str);
+#else
+			msgboxf(warn_str, MBX_ICONASTERISK);// if (OS_DlgYes!=os_Dialog(OS_DialogYesNo, cdiWarn_S)) rv=0;
+#endif
+            break;
 		}
 	}
 
@@ -440,4 +445,4 @@ DiscType GuessDiscType(bool m1, bool m2, bool da)
 		return CdRom_Extra;
 	else
 		return CdRom;
-}
+}

shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java

@@ -652,19 +652,20 @@ int WriteBuffer(short[] samples, int wait)
         void showMessage(final String msg) {
             handler.post(new Runnable() {
                 public void run() {
-                    Log.d(context.getApplicationContext().getPackageName(), msg);
+                    Log.d(context.getPackageName(), msg);
                     Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
                 }
             });
         }
 
-        void coreMessage(byte[] msg) {
+        public int coreMessage(byte[] msg) {
             try {
                 showMessage(new String(msg, "UTF-8"));
             }
             catch (UnsupportedEncodingException e) {
                 showMessage("coreMessage: Failed to display error");
             }
+            return 1;
         }
 
         void Die() {

shell/android-studio/reicast/src/main/jni/src/Android.cpp

@@ -336,30 +336,25 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_run(JNIEnv *env,jobje
 
 	jsamples=env->NewShortArray(SAMPLE_COUNT*2);
 	writemid=env->GetMethodID(env->GetObjectClass(emu),"WriteBuffer","([SI)I");
-    coreMessageMid=env->GetMethodID(env->GetObjectClass(emu),"coreMessage","([B)V");
+    coreMessageMid=env->GetMethodID(env->GetObjectClass(emu),"coreMessage","([B)I");
     dieMid=env->GetMethodID(env->GetObjectClass(emu),"Die","()V");
-//	msgboxf("HELLO!", MBX_OK);
-
+
 	dc_run();
 }
 
-int msgboxf(const wchar* Text,unsigned int Type,...)
-{
-  wchar S[2048];
-  va_list Args;
-
-  va_start(Args,Type);
-  vsnprintf(S, 2048,Text,Args);
-  va_end(Args);
-  puts(S);
+int msgboxf(const wchar* text,unsigned int type,...) {
+    va_list args;
 
-  int byteCount = strlen(S);
-  jbyteArray bytes = jenv->NewByteArray(byteCount);
-  jenv->SetByteArrayRegion(bytes, 0, byteCount, (jbyte*)S);
+    wchar temp[2048];
+    va_start(args, type);
+    vsprintf(temp, text, args);
+    va_end(args);
 
-  jenv->CallVoidMethod(emu,coreMessageMid,bytes);
+    int byteCount = strlen(temp);
+    jbyteArray bytes = jenv->NewByteArray(byteCount);
+    jenv->SetByteArrayRegion(bytes, 0, byteCount, (jbyte *) temp);
 
-  return (MBX_OK);
+    return jenv->CallIntMethod(emu, coreMessageMid, bytes);
 }
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip)