Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib: [2515] trunk/LWJGL/src/native/windows/display.c

Revision: 2515
Author:   elias_naur
Date:     2006-07-15 10:44:53 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2515&view=rev

Log Message:
-----------
Windows: Removed unused variable from display.c

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/display.c
Modified: trunk/LWJGL/src/native/windows/display.c
===================================================================
--- trunk/LWJGL/src/native/windows/display.c	2006-07-14 16:14:52 UTC (rev 2514)
+++ trunk/LWJGL/src/native/windows/display.c	2006-07-15 17:44:53 UTC (rev 2515)
@@ -206,7 +206,6 @@
 	int i;
 	float scaledRampEntry;
 	WORD rampEntry;
-	HDC screenDC;
 	const float *gammaRamp = (const float *)(*env)->GetDirectBufferAddress(env, float_gamma_obj);
 	jint gamma_ramp_length = (*env)->GetDirectBufferCapacity(env, float_gamma_obj);
 	jobject native_ramp;


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

Revision: 2518
Author:   elias_naur
Date:     2006-07-15 11:43:04 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2518&view=rev

Log Message:
-----------
Windows: Forgot display.c in last commit

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/display.c
Modified: trunk/LWJGL/src/native/windows/display.c
===================================================================
--- trunk/LWJGL/src/native/windows/display.c	2006-07-15 18:36:46 UTC (rev 2517)
+++ trunk/LWJGL/src/native/windows/display.c	2006-07-15 18:43:04 UTC (rev 2518)
@@ -247,26 +247,20 @@
 	jstring ret = NULL;
 
 	const char *dll_ext = ".dll";
-	TCHAR driverDLL[BUFFER_SIZE] = "\0";
 	DWORD var = 0;
 	DWORD dwInfoSize;
 	LPVOID lpInfoBuff;
 	BOOL bRetval;
 
-	if (driver == NULL) {
-		return NULL;
-	}
-	strncat_s(driverDLL, BUFFER_SIZE, driver, strlen(driver));
-	strncat_s(driverDLL, BUFFER_SIZE, dll_ext, strlen(dll_ext));
-	dwInfoSize = GetFileVersionInfoSize(driverDLL, &var);
+	dwInfoSize = GetFileVersionInfoSize(driver, &var);
 	lpInfoBuff = malloc(dwInfoSize);
-	bRetval = GetFileVersionInfo(driverDLL, 0, dwInfoSize, lpInfoBuff);
+	bRetval = GetFileVersionInfo(driver, 0, dwInfoSize, lpInfoBuff);
 	if (bRetval == 0) {
 	} else {
 		VS_FIXEDFILEINFO * fxdFileInfo;
 
 		UINT uiLen = 0;
-		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void **) &fxdFileInfo, &uiLen);
+		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void *)&fxdFileInfo, &uiLen);
 		if (bRetval != 0) {
 			TCHAR version[BUFFER_SIZE];
 			TCHAR ms[BUFFER_SIZE], ls[BUFFER_SIZE];


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

Revision: 2519
Author:   elias_naur
Date:     2006-07-15 11:45:20 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2519&view=rev

Log Message:
-----------
Windows: Added NULL check to malloc in display.c

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/display.c
Modified: trunk/LWJGL/src/native/windows/display.c
===================================================================
--- trunk/LWJGL/src/native/windows/display.c	2006-07-15 18:43:04 UTC (rev 2518)
+++ trunk/LWJGL/src/native/windows/display.c	2006-07-15 18:45:20 UTC (rev 2519)
@@ -254,6 +254,10 @@
 
 	dwInfoSize = GetFileVersionInfoSize(driver, &var);
 	lpInfoBuff = malloc(dwInfoSize);
+	if (lpInfoBuff == NULL) {
+		throwException(env, "Failed to allocate lpInfoBuff");
+		return NULL;
+	}
 	bRetval = GetFileVersionInfo(driver, 0, dwInfoSize, lpInfoBuff);
 	if (bRetval == 0) {
 	} else {


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