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

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15451/src/native/win32

Modified Files:
	display.cpp 
Log Message:


Index: display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- display.cpp	9 Nov 2004 11:00:49 -0000	1.6
+++ display.cpp	13 Nov 2004 22:27:19 -0000	1.7
@@ -52,8 +52,8 @@
 static jobjectArray GetAvailableDisplayModes(JNIEnv * env);
 static char * getDriver();
 static bool modeSet = false; // Whether we've done a display mode change
-static WORD originalGamma[256 * 3]; // Original gamma settings
-static WORD currentGamma[256 * 3]; // Current gamma settings
+static WORD originalGamma[GAMMA_SIZE]; // Original gamma settings
+static WORD currentGamma[GAMMA_SIZE]; // Current gamma settings
 static DEVMODE devmode; // Now we'll remember this value for the future
 extern HWND				display_hwnd;						              // Handle to the window
 extern RECT clientSize;

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv887

Modified Files:
	org_lwjgl_devil_IL.c 
Log Message:
lets use proper arguments for localizing string call

Index: org_lwjgl_devil_IL.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_devil_IL.c	13 Nov 2004 21:06:34 -0000	1.6
+++ org_lwjgl_devil_IL.c	13 Nov 2004 21:12:09 -0000	1.7
@@ -39,7 +39,7 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyPal(JNIEnv *env, jclass clazz, jstring fileName) {
-	char *strFileName = GetStringNativeChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilApplyPal((const ILstring)strFileName);
 	free(strFileName);
 
@@ -424,7 +424,7 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadImage(JNIEnv *env, jclass clazz, jstring fileName) {
-	char *strFileName = GetStringNativeChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilLoadImage((const ILstring)strFileName);
 	free(strFileName);
 
@@ -498,7 +498,7 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveLoad(JNIEnv *env, jclass clazz, jstring ext) {
-	char *strExt = GetStringNativeChars(env, ext, 0);
+	char *strExt = GetStringNativeChars(env, ext);
 	jboolean result = ilRemoveLoad((const ILstring)strExt);
 	free(strExt);
 
@@ -511,7 +511,7 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveSave(JNIEnv *env, jclass clazz, jstring ext) {
-	char *strExt = GetStringNativeChars(env, ext, 0);
+	char *strExt = GetStringNativeChars(env, ext);
 	jboolean result = ilRemoveSave((const ILstring)strExt);
 	free(strExt);
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32036/macosx

Modified Files:
	org_lwjgl_Sys.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_Sys.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Sys.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Sys.c	11 Nov 2004 16:03:17 -0000	1.1
+++ org_lwjgl_Sys.c	13 Nov 2004 21:06:37 -0000	1.2
@@ -97,7 +97,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL
   (JNIEnv * env, jclass clazz, jstring url)
 {
-/*	const char * urlString = env->GetStringUTFChars(url, NULL);
+/*	char * urlString = GetStringNativeChars(env, url);
 
 	OSStatus err;
 	ICInstance inst;
@@ -106,7 +106,7 @@
 	Str255  urlStr;
 
 	CopyCStringToPascal(urlString, urlStr);
-	env->ReleaseStringUTFChars(url, urlString);
+	free(urlString);
 	err = ICStart(&inst, '????'); // Use your creator code if you have one!
 	if (err == noErr) {
 		startSel = 0;

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32036/linux

Modified Files:
	org_lwjgl_Sys.c org_lwjgl_opengl_Display.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_Sys.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_Sys.c	10 Sep 2004 08:13:55 -0000	1.6
+++ org_lwjgl_Sys.c	13 Nov 2004 21:06:36 -0000	1.7
@@ -140,13 +140,14 @@
 
 JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nAlert(JNIEnv * env, jclass clazz, jstring title, jstring message)
 {
-	jboolean copy = JNI_FALSE;
-	const char * eMessageText = (*env)->GetStringUTFChars(env, message, &copy);
-	const char * cTitleBarText = (*env)->GetStringUTFChars(env, title, &copy);
-	printf("*** Alert ***\n%s\n%s\n", cTitleBarText, eMessageText);
+	char * eMessageText = GetStringNativeChars(env, message);
+	char * cTitleBarText = GetStringNativeChars(env, title);
+	MessageBox(getCurrentHWND(), eMessageText, cTitleBarText, MB_OK | MB_TOPMOST);
 
-	(*env)->ReleaseStringUTFChars(env, message, eMessageText);
-	(*env)->ReleaseStringUTFChars(env, title, cTitleBarText);
+	printfDebug("*** Alert ***%s\n%s\n", cTitleBarText, eMessageText);
+	
+	free(eMessageText);
+	free(cTitleBarText);
 }
 
 JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getNativeLibraryVersion(JNIEnv *env, jclass clazz) {
@@ -161,9 +162,9 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL
   (JNIEnv * env, jclass clazz, jstring url)
 {
-	const char * urlString = (*env)->GetStringUTFChars(env, url, NULL);
+	char * urlString = GetStringNativeChars(env, url);
 	printf("*** Please visit %s\n", urlString);
-	(*env)->ReleaseStringUTFChars(env, url, urlString);
+	free(urlString);
 }
 
 

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_opengl_Display.c	6 Nov 2004 09:41:02 -0000	1.10
+++ org_lwjgl_opengl_Display.c	13 Nov 2004 21:06:36 -0000	1.11
@@ -310,9 +310,9 @@
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_setTitle(JNIEnv * env, jobject this, jstring title_obj) {
-	const char * title = (*env)->GetStringUTFChars(env, title_obj, NULL);
+	char * title = GetStringNativeChars(env, title_obj);
 	setWindowTitle(title);
-	(*env)->ReleaseStringUTFChars(env, title_obj, title);
+	free(title);
 }
 
 static void destroyWindow(void) {

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32036/common/fmod3

Modified Files:
	org_lwjgl_fmod3_FMOD.c org_lwjgl_fmod3_FMusic.c 
	org_lwjgl_fmod3_FSound.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_fmod3_FMusic.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_fmod3_FMusic.c	2 Nov 2004 14:43:16 -0000	1.3
+++ org_lwjgl_fmod3_FMusic.c	13 Nov 2004 21:06:35 -0000	1.4
@@ -45,8 +45,11 @@
  * Signature: (Ljava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSong(JNIEnv *env, jclass clazz, jstring name) {
-  const char* filename = (const char*) ((*env)->GetStringUTFChars(env, name, 0));
-  return (jlong) fmod_instance->FMUSIC_LoadSong(filename);
+  jlong result;
+  char* filename = GetStringNativeChars(env, name);
+  result = (jlong) fmod_instance->FMUSIC_LoadSong(filename);
+  free(filename);
+  return result;
 }
 
 /*
@@ -72,12 +75,15 @@
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSongEx__Ljava_lang_String_2IIILjava_nio_IntBuffer_2II
   (JNIEnv *env, jclass clazz, jstring name, jint offset, jint length, jint mode, jobject sampleList, jint sampleListOffset, jint samplelistnum){
-    int *sampleData = NULL;
-    const char* filename = (const char*) ((*env)->GetStringUTFChars(env, name, 0));
+    jlong result;
+	int *sampleData = NULL;
+    char* filename = GetStringNativeChars(env, name);
     if(sampleList != NULL) {
       sampleData = sampleListOffset + (int *) (*env)->GetDirectBufferAddress(env, sampleList);
     }
-    return (jlong) fmod_instance->FMUSIC_LoadSongEx(filename, offset, length, mode, sampleData, samplelistnum);
+    result = (jlong) fmod_instance->FMUSIC_LoadSongEx(filename, offset, length, mode, sampleData, samplelistnum);
+	free(filename);
+	return result;
   }
   
 

Index: org_lwjgl_fmod3_FSound.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_fmod3_FSound.c	13 Nov 2004 20:52:47 -0000	1.5
+++ org_lwjgl_fmod3_FSound.c	13 Nov 2004 21:06:35 -0000	1.6
@@ -449,8 +449,11 @@
 * Signature: (ILjava/lang/String;III)J
 */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1Load__ILjava_lang_String_2III(JNIEnv * env, jclass clazz, jint index, jstring name, jint inputmode, jint offset, jint length) { 
-	const char* nName = (const char*) ((*env)->GetStringUTFChars(env, name, 0));
-  return (long) fmod_instance->FSOUND_Sample_Load(index, nName, inputmode, offset, length);
+  jlong result;
+  char* nName = GetStringNativeChars(env, name);
+  result = (jlong) fmod_instance->FSOUND_Sample_Load(index, nName, inputmode, offset, length);
+  free(nName);
+  return result;
 }
 
 /*
@@ -977,8 +980,11 @@
 * Signature: (Ljava/lang/String;III)J
 */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1Open__Ljava_lang_String_2III(JNIEnv * env, jclass clazz, jstring name, jint mode, jint offset, jint length) {
-  const char* filename = (const char*) ((*env)->GetStringUTFChars(env, name, 0));
-  return (jlong) fmod_instance->FSOUND_Stream_Open(filename, mode, offset, length);
+  jlong result;
+  char* filename = GetStringNativeChars(env, name);
+  result = (jlong) fmod_instance->FSOUND_Stream_Open(filename, mode, offset, length);
+  free(filename);
+  return result;
 }
 
 /*
@@ -1043,9 +1049,9 @@
 * Signature: (JILjava/lang/String;)J
 */
 JNIEXPORT jobject JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1AddSyncPoint(JNIEnv * env, jclass clazz, jlong stream, jint pcmOffset, jstring name) {
-	const char * nName = (*env)->GetStringUTFChars(env, name, 0);
+	char * nName = GetStringNativeChars(env, name);
 	FSOUND_SYNCPOINT * result = fmod_instance->FSOUND_Stream_AddSyncPoint((FSOUND_STREAM*) stream, pcmOffset, (void *) nName);
-	(*env)->ReleaseStringUTFChars (env, name, nName);
+	free(nName);
 	return safeNewBuffer(env, result, 0);;
 }
 
@@ -1087,7 +1093,7 @@
 * Signature: (JILjava/lang/String;Lorg/lwjgl/fmod_instance/FSoundTagField;)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1FindTagField(JNIEnv * env, jclass clazz, jlong stream, jint type, jstring name, jobject tagField) {
-	const char * nName = (*env)->GetStringUTFChars(env, name, 0);
+	char * nName = GetStringNativeChars(env, name);
 	bool result = false;
 	void* value;
 	jint length;
@@ -1100,7 +1106,7 @@
 		(*env)->CallVoidMethod(env, tagField, mid, name, safeNewBuffer(env, value, length), type);
 		result = true;
 	}
-	(*env)->ReleaseStringUTFChars (env, name, nName);
+	free(nName);
 	return result;
 }
 
@@ -1288,9 +1294,9 @@
 * Signature: (Ljava/lang/String;)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1Stream_1Net_1SetProxy(JNIEnv * env, jclass clazz, jstring proxy) {
-  const char * proxyString = (*env)->GetStringUTFChars(env, proxy, 0);
+  char * proxyString = GetStringNativeChars(env, proxy);
   jboolean result = fmod_instance->FSOUND_Stream_Net_SetProxy(proxyString);
-  (*env)->ReleaseStringUTFChars(env, proxy, proxyString);
+  free(proxyString);
   return result;
 }
 

Index: org_lwjgl_fmod3_FMOD.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_fmod3_FMOD.c	2 Nov 2004 15:51:09 -0000	1.4
+++ org_lwjgl_fmod3_FMOD.c	13 Nov 2004 21:06:35 -0000	1.5
@@ -65,12 +65,12 @@
 	jsize pathcount = (*env)->GetArrayLength(env, paths);
 	int i;
 	jstring path;
-	const char *path_str;
+	char *path_str;
 	char *lib_str;
 	
 	for(i=0;i<pathcount;i++) {
 		path = (jstring) (*env)->GetObjectArrayElement(env, paths, i);
-		path_str = (*env)->GetStringUTFChars(env, path, NULL);
+		path_str = GetStringNativeChars(env, path);
 #ifdef _WIN32
 		lib_str = concatenate(path_str, "fmod.dll");
 #endif
@@ -82,8 +82,8 @@
 #endif	
 		printfDebug("Testing '%s'\n", lib_str);
 		fmod_create(env, lib_str);
-    free(lib_str);
-		(*env)->ReleaseStringUTFChars(env, path, path_str);
+		free(lib_str);
+		free(path_str);
 
 		if(fmod_instance != NULL) {
 			return;

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32036/common

Modified Files:
	common_tools.c common_tools.h extal.c org_lwjgl_openal_AL10.c 
	org_lwjgl_openal_ALC.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_openal_AL10.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL10.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_AL10.c	3 Nov 2004 12:10:20 -0000	1.2
+++ org_lwjgl_openal_AL10.c	13 Nov 2004 21:06:34 -0000	1.3
@@ -294,9 +294,9 @@
  * ALboolean alIsExtensionPresent(ALubyte *extName);
  */
 static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent (JNIEnv *env, jclass clazz, jstring fname) {
-	ALubyte* functionname = (ALubyte*) ((*env)->GetStringUTFChars(env, fname, 0));
+	ALubyte* functionname = (ALubyte*) GetStringNativeChars(env, fname);
 	jboolean result = (jboolean) alIsExtensionPresent(functionname);
-	(*env)->ReleaseStringUTFChars(env, (jstring)functionname, 0);
+	free(functionname);
 	
 	CHECK_AL_ERROR
 	return result;
@@ -309,9 +309,9 @@
  * ALenum alGetEnumValue(ALubyte *enumName);
  */
 static jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue (JNIEnv *env, jclass clazz, jstring ename) {
-	ALubyte* functionname = (ALubyte*) ((*env)->GetStringUTFChars(env, ename, 0));
+	ALubyte* functionname = (ALubyte*) GetStringNativeChars(env, ename);
 	jint result = (jint) alGetEnumValue(functionname);
-	(*env)->ReleaseStringUTFChars(env, (jstring)functionname, 0);
+	free(functionname);
 
 	CHECK_AL_ERROR
 	return result;

Index: common_tools.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- common_tools.c	2 Nov 2004 14:43:16 -0000	1.6
+++ common_tools.c	13 Nov 2004 21:06:33 -0000	1.7
@@ -161,6 +161,45 @@
 	throwGeneralException(env, "org/lwjgl/LWJGLException", err);
 }
 
+// retrieves the locale-specific C string
+char * GetStringNativeChars(JNIEnv *env, jstring jstr) { 
+  jbyteArray bytes = 0; 
+  jthrowable exc; 
+  char *result = 0; 
+  jclass jcls_str;
+  jmethodID MID_String_getBytes;
+
+  /* out of memory error? */ 
+  if ((*env)->EnsureLocalCapacity(env, 2) < 0) { 
+    return 0; 
+  } 
+
+  // aquire getBytes method
+  jcls_str = (*env)->FindClass(env, "java/lang/String"); 
+  MID_String_getBytes = (*env)->GetMethodID(env, jcls_str, "getBytes", "()[B"); 
+
+  // get the bytes
+  bytes = (jbyteArray) (*env)->CallObjectMethod(env, jstr, MID_String_getBytes); 
+  exc = (*env)->ExceptionOccurred(env); 
+
+  // if no exception occured while getting bytes - continue
+  if (!exc) { 
+    jint len = (*env)->GetArrayLength(env, bytes); 
+    result = (char *) malloc(len + 1); 
+    if (result == 0) { 
+      throwGeneralException(env, "java/lang/OutOfMemoryError", NULL); 
+      (*env)->DeleteLocalRef(env, bytes); 
+      return 0; 
+    } 
+    (*env)->GetByteArrayRegion(env, bytes, 0, len, (jbyte *) result); 
+    result[len] = 0; /* NULL-terminate */ 
+  } else { 
+    (*env)->DeleteLocalRef(env, exc); 
+  } 
+  (*env)->DeleteLocalRef(env, bytes); 
+  return (char*) result;
+}
+
 bool ext_InitializeFunctions(ExtGetProcAddressPROC gpa, int num_functions, ExtFunction *functions) {
 	int i;
 	void **ext_function_pointer_pointer;

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- common_tools.h	2 Nov 2004 15:51:08 -0000	1.28
+++ common_tools.h	13 Nov 2004 21:06:33 -0000	1.29
@@ -130,7 +130,7 @@
 extern void setDebugEnabled(bool enable);
 extern void printfDebug(const char *format, ...);
 extern bool getBooleanProperty(JNIEnv *env, const char* propertyName);
-
+extern char * GetStringNativeChars(JNIEnv *env, jstring jstr);
 
 extern void ext_InitializeClass(JNIEnv *env, jclass clazz, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions);
 extern bool ext_InitializeFunctions(ExtGetProcAddressPROC gpa, int num_functions, ExtFunction *functions);

Index: extal.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- extal.c	5 Nov 2004 10:29:57 -0000	1.18
+++ extal.c	13 Nov 2004 21:06:33 -0000	1.19
@@ -147,13 +147,13 @@
 	jsize pathcount = (*env)->GetArrayLength(env, oalPaths);
 	int i;
 	jstring path;
-	const char *path_str;
+	char *path_str;
 	char *lib_str;
 
 	printfDebug("Found %d OpenAL paths\n", (int)pathcount);
 	for(i=0;i<pathcount;i++) {
 		path = (jstring) (*env)->GetObjectArrayElement(env, oalPaths, i);
-		path_str = (*env)->GetStringUTFChars(env, path, NULL);
+		path_str = GetStringNativeChars(env, path);
 		printfDebug("Testing '%s'\n", path_str);
 #ifdef _WIN32
 		lib_str = concatenate(path_str, "lwjglaudio.dll");
@@ -190,7 +190,7 @@
 			printfDebug("Found OpenAL at '%s'\n", path_str);
 			return true;
 		}
-		(*env)->ReleaseStringUTFChars(env, path, path_str);
+		free(path_str);
 	}
 	throwException(env, "Could not load openal library.");
 	return false;

Index: org_lwjgl_openal_ALC.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_openal_ALC.c	3 Nov 2004 12:10:20 -0000	1.3
+++ org_lwjgl_openal_ALC.c	13 Nov 2004 21:06:34 -0000	1.4
@@ -117,16 +117,15 @@
  * ALCdevice *alcOpenDevice( const ALubyte *tokstr );
  */
 static jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice (JNIEnv *env, jclass clazz, jstring tokstr) {
-	const char * tokenstring;
+	char * tokenstring;
 	ALCdevice* device;
 	/* get ready to create ALCdevice instance */
 	jobject alcDevice_object	= NULL;
 	jclass alcDevice_class		= NULL;
 	jmethodID alcDevice_method	= NULL;
 
-	jboolean isCopy = JNI_FALSE;
 	if(tokstr != NULL) {
-		tokenstring = ((*env)->GetStringUTFChars(env, tokstr, &isCopy));
+		tokenstring = GetStringNativeChars(env, tokstr);
 	} else {
 		tokenstring = NULL;
 	}
@@ -137,7 +136,7 @@
 	/* if error - cleanup and get out */
 	if(device == NULL) {
 		if(tokenstring != NULL) {
-			(*env)->ReleaseStringUTFChars(env, tokstr, tokenstring);
+			free(tokenstring);
 		}
 		return NULL;
 	}
@@ -151,7 +150,7 @@
 
 	/* clean up */
 	if (tokenstring != NULL)
-		(*env)->ReleaseStringUTFChars(env, tokstr, tokenstring);
+		free(tokenstring);
 
 	return alcDevice_object;
 }
@@ -324,11 +323,11 @@
  */
 static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jint deviceaddress, jstring extName) {
 	/* get extension */
-	ALubyte* functionname = (ALubyte*) ((*env)->GetStringUTFChars(env, extName, 0));
+	ALubyte* functionname = (ALubyte*) GetStringNativeChars(env, extName);
 	
 	jboolean result = (jboolean) alcIsExtensionPresent((ALCdevice*) deviceaddress, functionname);
 	
-	(*env)->ReleaseStringUTFChars(env, extName, (const char *)functionname);
+	free(functionname);
 	
 	CHECK_ALC_ERROR
 	return result;
@@ -342,11 +341,11 @@
  */
 static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jint deviceaddress, jstring enumName) {	
 	/* get extension */
-	ALubyte* enumerationname = (ALubyte*) ((*env)->GetStringUTFChars(env, enumName, 0));
+	ALubyte* enumerationname = (ALubyte*) GetStringNativeChars(env, enumName);
 	
 	jint result = (jint) alcGetEnumValue((ALCdevice*) deviceaddress, enumerationname);
 	
-	(*env)->ReleaseStringUTFChars(env, enumName, (const char *)enumerationname);
+	free(enumerationname);
 	
 	CHECK_ALC_ERROR
 	return result;

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32036/common/devil

Modified Files:
	org_lwjgl_devil_IL.c 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_devil_IL.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_devil_IL.c	13 Nov 2004 20:55:22 -0000	1.5
+++ org_lwjgl_devil_IL.c	13 Nov 2004 21:06:34 -0000	1.6
@@ -39,9 +39,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyPal(JNIEnv *env, jclass clazz, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName, 0);
 	jboolean result = ilApplyPal((const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -52,11 +52,11 @@
  * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyProfile(JNIEnv *env, jclass clazz, jstring inProfile, jstring outProfile) {
-	const char *strInProfile = (*env)->GetStringUTFChars(env, inProfile, 0);
-	const char *strOutProfile = (*env)->GetStringUTFChars(env, outProfile, 0);
+	char *strInProfile = GetStringNativeChars(env, inProfile);
+	char *strOutProfile = GetStringNativeChars(env, outProfile);
 	jboolean result = ilApplyProfile((const ILstring)strInProfile, (const ILstring)strOutProfile);
-	(*env)->ReleaseStringUTFChars(env, inProfile, strInProfile);
-	(*env)->ReleaseStringUTFChars(env, outProfile, strOutProfile);
+	free(strInProfile);
+	free(strOutProfile);
 
 	return result;
 }
@@ -378,9 +378,9 @@
  * Signature: (ILjava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilIsValid(JNIEnv *env, jclass clazz, jint type, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilIsValid((ILuint)type, (const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -411,9 +411,9 @@
  * Signature: (ILjava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoad(JNIEnv *env, jclass clazz, jint type, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilLoad((ILenum)type, (const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -424,9 +424,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadImage(JNIEnv *env, jclass clazz, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName, 0);
 	jboolean result = ilLoadImage((const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -449,9 +449,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadPal(JNIEnv *env, jclass clazz, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilLoadPal((const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -498,9 +498,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveLoad(JNIEnv *env, jclass clazz, jstring ext) {
-	const char *strExt = (*env)->GetStringUTFChars(env, ext, 0);
+	char *strExt = GetStringNativeChars(env, ext, 0);
 	jboolean result = ilRemoveLoad((const ILstring)strExt);
-	(*env)->ReleaseStringUTFChars(env, ext, strExt);
+	free(strExt);
 
 	return result;
 }
@@ -511,9 +511,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveSave(JNIEnv *env, jclass clazz, jstring ext) {
-	const char *strExt = (*env)->GetStringUTFChars(env, ext, 0);
+	char *strExt = GetStringNativeChars(env, ext, 0);
 	jboolean result = ilRemoveSave((const ILstring)strExt);
-	(*env)->ReleaseStringUTFChars(env, ext, strExt);
+	free(strExt);
 
 	return result;
 }
@@ -551,9 +551,9 @@
  * Signature: (ILjava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSave(JNIEnv *env, jclass clazz, jint type, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilSave((ILenum)type, (const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -564,9 +564,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSaveImage(JNIEnv *env, jclass clazz, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilSaveImage((const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -588,9 +588,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSavePal(JNIEnv *env, jclass clazz, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilSavePal((const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -641,10 +641,10 @@
  * Signature: (ILjava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_ilSetString(JNIEnv *env, jclass clazz, jint mode, jstring string) {
-	const char *strString = (*env)->GetStringUTFChars(env, string, 0);
+	char *strString = GetStringNativeChars(env, string);
 
 	ilSetString(mode, (const ILstring)strString);
-	(*env)->ReleaseStringUTFChars(env, string, strString);
+	free(strString);
 }
 
 /*
@@ -682,9 +682,9 @@
  * Signature: (Ljava/lang/String;IIIB)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadData(JNIEnv *env, jclass clazz, jstring fileName, jint width, jint height, jint depth, jbyte bpp) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilLoadData((const ILstring)strFileName, (ILuint)width, (ILuint)height, (ILuint)depth, (ILubyte)bpp);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }
@@ -706,9 +706,9 @@
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilSaveData(JNIEnv *env, jclass clazz, jstring fileName) {
-	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
+	char *strFileName = GetStringNativeChars(env, fileName);
 	jboolean result = ilSaveData((const ILstring)strFileName);
-	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
+	free(strFileName);
 
 	return result;
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32036/win32

Modified Files:
	org_lwjgl_Sys.cpp org_lwjgl_opengl_Display.cpp 
Log Message:
changed String handling to use proper localizing method

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- org_lwjgl_opengl_Display.cpp	9 Nov 2004 11:17:28 -0000	1.33
+++ org_lwjgl_opengl_Display.cpp	13 Nov 2004 21:06:38 -0000	1.34
@@ -47,6 +47,7 @@
 #include "extgl_wgl.h"
 #include "display.h"
 #include "org_lwjgl_opengl_Win32Display.h"
+#include <malloc.h>
 
 static bool				oneShotInitialised = false;     // Registers the LWJGL window class
 
@@ -525,9 +526,9 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_setTitle
   (JNIEnv * env, jobject self, jstring title_obj)
 {
-	const char * title = env->GetStringUTFChars(title_obj, NULL);
+	char * title = GetStringNativeChars(env, title_obj);
 	SetWindowText(display_hwnd, title);
-	env->ReleaseStringUTFChars(title_obj, title);
+	free(title);
 }
 
 /*

Index: org_lwjgl_Sys.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- org_lwjgl_Sys.cpp	22 Sep 2004 15:06:27 -0000	1.35
+++ org_lwjgl_Sys.cpp	13 Nov 2004 21:06:37 -0000	1.36
@@ -42,6 +42,7 @@
 #include "Window.h"
 #include "org_lwjgl_Sys.h"
 #include "common_tools.h"
+#include <malloc.h>
 
 unsigned __int64		hires_timer_freq = 0;			// Hires timer frequency
 unsigned __int64		hires_timer = 0;				// Hires timer current time
@@ -119,15 +120,14 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nAlert
   (JNIEnv * env, jclass clazz, jstring title, jstring message)
 {
-	jboolean copy = JNI_FALSE;
-	const char * eMessageText = env->GetStringUTFChars(message, &copy);
-	const char * cTitleBarText = env->GetStringUTFChars(title, &copy);
+	char * eMessageText = GetStringNativeChars(env, message);
+	char * cTitleBarText = GetStringNativeChars(env, title);
 	MessageBox(getCurrentHWND(), eMessageText, cTitleBarText, MB_OK | MB_TOPMOST);
 
 	printfDebug("*** Alert ***%s\n%s\n", cTitleBarText, eMessageText);
 	
-	env->ReleaseStringUTFChars(message, eMessageText);
-	env->ReleaseStringUTFChars(title, cTitleBarText);
+	free(eMessageText);
+	free(cTitleBarText);
 }
 
 /*
@@ -138,13 +138,13 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL
   (JNIEnv * env, jclass clazz, jstring url)
 {
-	const char * urlString = env->GetStringUTFChars(url, NULL);
+	char * urlString = GetStringNativeChars(env, url);
 
 	char command[256];
 	strcpy(command, "");
 	strcat(command, "rundll32 url.dll,FileProtocolHandler ");
 	strncat(command, urlString, 200); // Prevent buffer overflow
-	env->ReleaseStringUTFChars(url, urlString);
+	free(urlString);
 
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29598

Modified Files:
	org_lwjgl_devil_IL.c 
Log Message:
fix #ifdef and miscellaneous compilation issues

Index: org_lwjgl_devil_IL.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_devil_IL.c	12 Nov 2004 02:54:31 -0000	1.4
+++ org_lwjgl_devil_IL.c	13 Nov 2004 20:55:22 -0000	1.5
@@ -5,6 +5,7 @@
 
 #ifdef __cplusplus
 extern "C" {
+#endif
 /*
  * Class:     org_lwjgl_devil_IL
  * Method:    ilActiveImage
@@ -39,7 +40,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilApplyPal(JNIEnv *env, jclass clazz, jstring fileName) {
 	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
-	jboolean result = ilApplyPal((const ILstring*)strFileName);
+	jboolean result = ilApplyPal((const ILstring)strFileName);
 	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
 
 	return result;
@@ -424,7 +425,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilLoadImage(JNIEnv *env, jclass clazz, jstring fileName) {
 	const char *strFileName = (*env)->GetStringUTFChars(env, fileName, 0);
-	jboolean result = ilLoadImage((const ILstring*)strFileName);
+	jboolean result = ilLoadImage((const ILstring)strFileName);
 	(*env)->ReleaseStringUTFChars(env, fileName, strFileName);
 
 	return result;
@@ -499,7 +500,7 @@
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveLoad(JNIEnv *env, jclass clazz, jstring ext) {
 	const char *strExt = (*env)->GetStringUTFChars(env, ext, 0);
 	jboolean result = ilRemoveLoad((const ILstring)strExt);
-	(*env)->ReleaseStringUTFChars(env, fileName, strExt);
+	(*env)->ReleaseStringUTFChars(env, ext, strExt);
 
 	return result;
 }
@@ -512,7 +513,7 @@
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_ilRemoveSave(JNIEnv *env, jclass clazz, jstring ext) {
 	const char *strExt = (*env)->GetStringUTFChars(env, ext, 0);
 	jboolean result = ilRemoveSave((const ILstring)strExt);
-	(*env)->ReleaseStringUTFChars(env, fileName, strExt);
+	(*env)->ReleaseStringUTFChars(env, ext, strExt);
 
 	return result;
 }
@@ -718,4 +719,3 @@
 #ifdef __cplusplus
 }
 #endif
-#endif

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29056

Modified Files:
	org_lwjgl_fmod3_FSound.c 
Log Message:
fix pointer

Index: org_lwjgl_fmod3_FSound.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_fmod3_FSound.c	2 Nov 2004 14:43:16 -0000	1.4
+++ org_lwjgl_fmod3_FSound.c	13 Nov 2004 20:52:47 -0000	1.5
@@ -1870,7 +1870,7 @@
   jfieldID highPriority;
   jint highPriorityValue;
   jmethodID priority;
-  JavaVM jvm = getJVM();
+  JavaVM* jvm = getJVM();
   (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void*)&stream_jnienv, NULL);
   
   // set to high priority

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27904

Removed Files:
	ltmain.sh subdirs 
Log Message:
Remove more autoconf files

--- subdirs DELETED ---

--- ltmain.sh DELETED ---

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27629/common/ext

Removed Files:
	Makefile.am 
Log Message:
Remove more autoconf files

--- Makefile.am DELETED ---

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27629

Removed Files:
	Makefile.am acinclude.m4 autogen.sh dummy.c 
Log Message:
Remove more autoconf files

--- acinclude.m4 DELETED ---

--- dummy.c DELETED ---

--- Makefile.am DELETED ---

--- autogen.sh DELETED ---

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12453

Modified Files:
	KeyboardEventQueue.java 
Log Message:
Mac OS X fixed isKeyDown not working

Index: KeyboardEventQueue.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- KeyboardEventQueue.java	11 Nov 2004 16:03:15 -0000	1.1
+++ KeyboardEventQueue.java	13 Nov 2004 08:48:56 -0000	1.2
@@ -258,20 +258,21 @@
 		key_down_buffer.position(old_position);
 	}
 	
-	private synchronized void handleKey(int key_code, int state, char character) {
+	private synchronized void handleKey(int key_code, byte state, char character) {
 		int key_code_mapped = KEY_MAP[key_code];
 		if (character == KeyEvent.CHAR_UNDEFINED)
 			character = Keyboard.CHAR_NONE;
+		key_states[key_code_mapped] = state;
 		int key_int_char = ((int)character) & 0xffff;
 		putKeyboardEvent(key_code_mapped, state, key_int_char);
 	}
 
 	public void keyPressed(KeyEvent e) {
-		handleKey(e.getKeyCode(), 1, e.getKeyChar());
+		handleKey(e.getKeyCode(), (byte)1, e.getKeyChar());
 	}
 
 	public void keyReleased(KeyEvent e) {
-		handleKey(e.getKeyCode(), 0, Keyboard.CHAR_NONE);
+		handleKey(e.getKeyCode(), (byte)0, Keyboard.CHAR_NONE);
 	}
 
 	public void keyTyped(KeyEvent e) {