java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2460
Author:   elias_naur
Date:     2006-07-09 01:31:49 -0700 (Sun, 09 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2460&view=rev

Log Message:
-----------
Windows: don't cache the JNIEnv pointer in the message handle, but acquire it through the global JavaVM handle.

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/common_tools.c
    trunk/LWJGL/src/native/common/common_tools.h
    trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-08 22:17:09 UTC (rev 2459)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-09 08:31:49 UTC (rev 2460)
@@ -301,6 +301,12 @@
 	return jvm;
 }
 
+JNIEnv *getThreadEnv() {
+	JNIEnv *env;
+	(*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_4);
+	return env;
+}
+
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
   jvm = vm;
   return JNI_VERSION_1_4;

Modified: trunk/LWJGL/src/native/common/common_tools.h
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.h	2006-07-08 22:17:09 UTC (rev 2459)
+++ trunk/LWJGL/src/native/common/common_tools.h	2006-07-09 08:31:49 UTC (rev 2460)
@@ -122,6 +122,7 @@
 #endif
 
 extern JavaVM *getJVM();
+extern JNIEnv *getThreadEnv();
 extern void initAttribList(attrib_list_t *list);
 extern void putAttrib(attrib_list_t *list, int attrib);
 

Modified: trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c	2006-07-08 22:17:09 UTC (rev 2459)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c	2006-07-09 08:31:49 UTC (rev 2460)
@@ -87,11 +87,10 @@
 							     WPARAM wParam,
 							     LPARAM lParam)
 {
-	JNIEnv *env;
 	jclass display_class;
 	jmethodID handleMessage_method;
 	LONG message_time;
-	env = (JNIEnv *)(LONG_PTR)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	JNIEnv *env = getThreadEnv();
 	if (env != NULL && !(*env)->ExceptionOccurred(env)) {
 		display_class = (*env)->FindClass(env, "org/lwjgl/opengl/Win32Display");
 		if (display_class != NULL) {
@@ -186,7 +185,6 @@
 		throwException(env, "Failed to create the window.");
 		return;
 	}
-	SetWindowLongPtr(display_hwnd, GWLP_USERDATA, (LONG_PTR)env);
 	display_hdc = GetDC(display_hwnd);
 	ShowWindow(display_hwnd, SW_SHOWDEFAULT);
 	UpdateWindow(display_hwnd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.