fix(dyncall): invalid handling of 64-bit integers on 32-bit architect…

…ures
LWJGL · May 8, 2017 · 26459f7 · 26459f7
1 parent d19afa2
commit 26459f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/doc/notes/3.1.2.md b/doc/notes/3.1.2.md
@@ -42,6 +42,7 @@ This build includes the following changes:
 - OpenAL: Removed buffer auto-sizing from `alcCaptureSamples`. The number of samples must now be specified explicitly, similar to `alcRenderSamplesSOFT`.
 - Vulkan: Function addresses are now retrieved only once, using the optimal method for each function type.
     * This avoids warnings on pedantic validation layers.
+- Fixed callback invocation bugs on 32-bit architectures.
 
 ### Breaking Changes
 

diff --git a/modules/core/src/main/c/system/org_lwjgl_system_Callback.c b/modules/core/src/main/c/system/org_lwjgl_system_Callback.c
@@ -49,7 +49,7 @@ static char cbHandlerV(DCCallback *cb, DCArgs *args, DCValue *result, void *user
 	(*env)->CallVoidMethod(env,
 		(jobject)userdata,
 		javaCallbackV,
-		args
+		(jlong)(intptr_t)args
 	);
 
 	// Check for exception
@@ -69,7 +69,7 @@ static char cbHandlerV(DCCallback *cb, DCArgs *args, DCValue *result, void *user
 		*(Type*)result = (Type)(*env)->Call##JavaType##Method(env, \
 			(jobject)userdata, \
 			javaCallback##Name, \
-			args \
+			(jlong)(intptr_t)args \
 		); \
 \
 		if ( (*env)->ExceptionCheck(env) && async ) \

diff --git a/modules/generator/src/main/kotlin/org/lwjgl/generator/CallbackFunction.kt b/modules/generator/src/main/kotlin/org/lwjgl/generator/CallbackFunction.kt
@@ -46,8 +46,10 @@ class CallbackFunction(
 	private val NativeType.argType
 		get() = if (this is PointerType || mapping === PrimitiveMapping.POINTER)
 			"Pointer"
-		else if (mapping == PrimitiveMapping.BOOLEAN)
+		else if (mapping === PrimitiveMapping.BOOLEAN)
 			"Bool"
+		else if (mapping === PrimitiveMapping.LONG)
+			"LongLong"
 		else
 			(mapping as PrimitiveMapping).javaMethodName.upperCaseFirst