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

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

Modified Files:
	extgl.cpp 
Log Message:


Index: extgl.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extgl.cpp	26 Sep 2003 18:36:54 -0000	1.2
+++ extgl.cpp	28 Sep 2003 13:09:17 -0000	1.3
@@ -1593,7 +1593,7 @@
 
 #ifdef _X11
 /** returns true if the extention is available */
-static int GLXQueryExtension(JNIEnv* env, jobject ext_set, Display *disp, int screen, const char *name)
+static bool GLXQueryExtension(JNIEnv* env, jobject ext_set, Display *disp, int screen, const char *name)
 {
 	const GLubyte *exts = (const GLubyte *)glXQueryExtensionsString(disp, screen);
 	return QueryExtension(env, ext_set, exts, name);

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
New API for adapter queries

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- org_lwjgl_Display.cpp	16 Sep 2003 15:42:25 -0000	1.49
+++ org_lwjgl_Display.cpp	28 Sep 2003 06:55:00 -0000	1.50
@@ -51,7 +51,6 @@
 WORD* currentGamma = new WORD[256 * 3]; // Current gamma settings
 DEVMODE devmode; // Now we'll remember this value for the future
 
-
 /*
  * Class:     org_lwjgl_Display
  * Method:    nGetAvailableDisplayModes
@@ -467,7 +466,149 @@
 	}
 
 	ReleaseDC(NULL, screenDC);
+
+}
+
+char * getDriver() {
+    #define MY_BUFSIZE 256
+
+    HKEY hKey;
+    static TCHAR szAdapterKey[MY_BUFSIZE], szDriverValue[MY_BUFSIZE];
+    DWORD dwBufLen = MY_BUFSIZE;
+    LONG lRet;
+
+    if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+        TEXT("HARDWARE\\DeviceMap\\Video"),
+                    0,
+                    KEY_QUERY_VALUE,
+                    &hKey) != ERROR_SUCCESS) return NULL;
+
+    lRet = RegQueryValueEx(hKey,
+                    TEXT("\\Device\\Video0"),
+                    NULL,
+                    NULL,
+                    (LPBYTE)szAdapterKey,
+                    &dwBufLen);
+
+    RegCloseKey(hKey);
+
+    if(lRet != ERROR_SUCCESS) return NULL;
+
+#ifdef _DEBUG
+	printf("Adapter key: %s\n", szAdapterKey);
+#endif
+
+	// szAdapterKey now contains something like \Registry\Machine\System\CurrentControlSet\Control\Video\{B70DBD2A-90C4-41CF-A58E-F3BA69F1A6BC}\0000
+	// We'll check for the first chunk:
+	if (strncmp("\\Registry\\Machine", szAdapterKey, 17) == 0) {
+		// Yes, it's right, so let's look for that key now
+
+		TCHAR szDriverKey[MY_BUFSIZE];
+		strcpy(szDriverKey, &szAdapterKey[18]);
+#ifdef _DEBUG
+		printf("Driver key: %s\n", szDriverKey);
+#endif
+
+		if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+			TEXT(szDriverKey),
+						0,
+						KEY_QUERY_VALUE,
+						&hKey) != ERROR_SUCCESS) return NULL;
+
+		lRet = RegQueryValueEx(hKey,
+						TEXT("InstalledDisplayDrivers"),
+						NULL,
+						NULL,
+						(LPBYTE)szDriverValue,
+						&dwBufLen);
+
+		RegCloseKey(hKey);
+
+	}
+
+	if(lRet != ERROR_SUCCESS) return NULL;
+
+	return szDriverValue;
 }
+
+/*
+ * Class:     org_lwjgl_Display
+ * Method:    getAdapter
+ */
+JNIEXPORT jstring JNICALL Java_org_lwjgl_Display_getAdapter
+  (JNIEnv * env, jclass clazz)
+{
+
+	jstring ret = NULL;
+	char * driver = getDriver();
+	if (driver == NULL) {
+		return NULL;
+	}
+	ret = env->NewStringUTF(
+		driver
+	);
+	return ret;
+}
+
+
+
+/*
+ * Class:     org_lwjgl_Display
+ * Method:    getVersion
+ */
+JNIEXPORT jstring JNICALL Java_org_lwjgl_Display_getVersion
+  (JNIEnv * env, jclass clazz)
+{
+	jstring ret = NULL;
+
+	TCHAR driverDLL[256] = "\0";
+
+	char * driver = getDriver();
+	if (driver == NULL) {
+		return NULL;
+	}
+	strcat(driverDLL, driver);
+	strcat(driverDLL, ".dll");
+#ifdef _DEBUG
+	printf("Driver dll = %s\n", driverDLL);
+#endif
+	DWORD var = 0;
+	DWORD dwInfoSize = GetFileVersionInfoSize(driverDLL, &var);
+	LPVOID lpInfoBuff = new unsigned char[dwInfoSize];
+	BOOL bRetval = GetFileVersionInfo(driverDLL, NULL, dwInfoSize, lpInfoBuff);
+	if (bRetval == 0) {
+#ifdef _DEBUG
+		printf("GetFileVersionInfo failed\n");
+#endif
+	} else {
+		VS_FIXEDFILEINFO * fxdFileInfo;
+
+		UINT uiLen = 0;
+		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void **) &fxdFileInfo, &uiLen);
+		if (bRetval == 0) {
+#ifdef _DEBUG
+			printf("VerQueryValue failed\n");
+#endif
+		} else {
+			TCHAR version[256];
+			TCHAR ms[10], ls[10];
+			sprintf(ms, "%d.%d\0", fxdFileInfo->dwProductVersionMS >> 16, fxdFileInfo->dwProductVersionMS & 0xFFFF);
+			sprintf(ls, "%d.%d\0", fxdFileInfo->dwProductVersionLS >> 16, fxdFileInfo->dwProductVersionLS & 0xFFFF);
+			sprintf(version, "%s.%s\0", ms, ls);
+			ret = env->NewStringUTF(
+				version
+			);
+		}
+	}
+
+	delete lpInfoBuff;
+
+	return ret;
+}
+
+
+
+
 
 
 

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv12469/src/java/org/lwjgl

Modified Files:
	Display.java 
Log Message:
New API for adapter queries

Index: Display.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Display.java	17 Aug 2003 16:38:55 -0000	1.32
+++ Display.java	28 Sep 2003 06:55:01 -0000	1.33
@@ -80,6 +80,9 @@
 	static {
 		System.loadLibrary(Sys.getLibraryName());
 		init();
+		if (Sys.DEBUG) {
+			System.out.println("Adapter: "+getAdapter()+" Version: "+getVersion());
+		}
 	}
 
 	/**
@@ -254,4 +257,19 @@
 	 * Native method to set the gamma ramp.
 	 */
 	private static native boolean setGammaRamp(FloatBuffer gammaRamp);
+	
+	/**
+	 * Get the driver adapter string. This is a unique string describing the actual card's hardware, eg. "Geforce2", "PS2",
+	 * "Radeon9700". If the adapter cannot be determined, this function returns null.
+	 * @return a String
+	 */
+	public static native String getAdapter();
+	
+	/**
+	 * Get the driver version. This is a vendor/adapter specific version string. If the version cannot be determined,
+	 * this function returns null.
+	 * @return a String
+	 */
+	public static native String getVersion();
+	
 }

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

Modified Files:
	org_lwjgl_Display.h 
Log Message:
New API for adapter queries

Index: org_lwjgl_Display.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_Display.h	24 Jun 2003 12:24:55 -0000	1.13
+++ org_lwjgl_Display.h	28 Sep 2003 06:55:01 -0000	1.14
@@ -75,6 +75,20 @@
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp
   (JNIEnv *, jclass, jobject);
 
+/*
+ * Class:     org_lwjgl_Display
+ * Method:    getAdapter
+ */
+JNIEXPORT jstring JNICALL Java_org_lwjgl_Display_getAdapter
+  (JNIEnv * , jclass);
+
+/*
+ * Class:     org_lwjgl_Display
+ * Method:    getVersion
+ */
+JNIEXPORT jstring JNICALL Java_org_lwjgl_Display_getVersion
+  (JNIEnv * , jclass);
+
 #ifdef __cplusplus
 }
 #endif

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Dummy getAdapter()/getVersion() for linux

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- org_lwjgl_Display.cpp	8 Sep 2003 14:51:01 -0000	1.38
+++ org_lwjgl_Display.cpp	28 Sep 2003 07:02:23 -0000	1.39
@@ -334,3 +334,14 @@
 	return JNI_TRUE;
 }
 
+JNIEXPORT jstring JNICALL Java_org_lwjgl_Display_getAdapter
+  (JNIEnv * env, jclass clazz)
+{
+	return NULL;
+}
+
+JNIEXPORT jstring JNICALL Java_org_lwjgl_Display_getVersion
+  (JNIEnv * env, jclass clazz)
+{
+	return NULL;
+}