[[ Bug ]] Fix nativeNotify to use correctly sized parameters to cast pointers

montegoulding · montegoulding · commit 9060e102b6c1 · 2018-10-11T13:15:44.000+11:00
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -246,10 +246,10 @@ public void run()
         });
     }
 	
-	public void nativeNotify(int p_callback, int p_context)
-	{
-		final int t_callback = p_callback;
-		final int t_context = p_context;
+	public void nativeNotify(long p_callback, long p_context)
+    {
+        final long t_callback = p_callback;
+		final long t_context = p_context;
 		post(new Runnable() {
 			public void run()
 			{
@@ -3800,7 +3800,7 @@ public static native void doPurchaseStateChanged(boolean verified, int purchaseS
 	public static native void doResume();
 	public static native void doLowMemory();
 
-	public static native void doNativeNotify(int callback, int context);
+	public static native void doNativeNotify(long callback, long context);
 			 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -2947,8 +2947,8 @@ class MCRunOnMainThreadHelper
 	int m_options;
 };
 
-extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doNativeNotify(JNIEnv *env, jobject object, int p_callback, int p_context) __attribute__((visibility("default")));
-JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doNativeNotify(JNIEnv *env, jobject object, int p_callback, int p_context)
+extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doNativeNotify(JNIEnv *env, jobject object, jlong p_callback, jlong p_context) __attribute__((visibility("default")));
+JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doNativeNotify(JNIEnv *env, jobject object, jlong p_callback, jlong p_context)
 {
 	co_yield_to_engine_and_call((co_yield_callback_t)p_callback, (void *)p_context);
 }
@@ -2993,8 +2993,8 @@ bool android_run_on_main_thread(void *p_callback, void *p_callback_state, int p_
 		
 		MCRunOnMainThreadHelper *t_helper;
 		t_helper = new (nothrow) MCRunOnMainThreadHelper(p_callback, p_callback_state, p_options);
-		MCAndroidEngineCall("nativeNotify", "vii", nil, MCRunOnMainThreadHelper::DispatchThunk, t_helper);
-		return true;
+		MCAndroidEngineCall("nativeNotify", "vjj", nil, reinterpret_cast<jlong>(MCRunOnMainThreadHelper::DispatchThunk), reinterpret_cast<jlong>(t_helper));
+        return true;
 	}
 	
 	// Unsafe and immediate -> queue and perform
@@ -3011,8 +3011,8 @@ bool android_run_on_main_thread(void *p_callback, void *p_callback_state, int p_
 		
 		MCRunOnMainThreadHelper *t_helper;
 		t_helper = new (nothrow) MCRunOnMainThreadHelper(p_callback, p_callback_state, p_options & ~kMCExternalRunOnMainThreadPost);
-		MCAndroidEngineCall("nativeNotify", "vii", nil, MCRunOnMainThreadHelper::DispatchThunk, t_helper);
-		return true;
+		MCAndroidEngineCall("nativeNotify", "vjj", nil, reinterpret_cast<jlong>(MCRunOnMainThreadHelper::DispatchThunk), reinterpret_cast<jlong>(t_helper));
+        return true;
 	}
 	
 	// Safe and immediate -> post to front of event queue
