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

Revision: 2529
Author:   elias_naur
Date:     2006-07-15 16:31:37 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2529&view=rev

Log Message:
-----------
Windows: Use env.MSSdk, not MSSDK (the capitalization is important in ant). The MSVC compiler doesn't seem to mind if the PLTSDK is included or not, though (if it did, we would have noticed the incorrect env. variable)

Modified Paths:
--------------
    trunk/LWJGL/platform_build/mingw_ant/build.xml
    trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 23:20:06 UTC (rev 2528)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 23:31:37 UTC (rev 2529)
@@ -4,7 +4,6 @@
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="dxhome" location="${env.DXSDK_DIR}"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
 	<property name="program_files" location="${env.ProgramFiles}"/>
 	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
 	<property name="chome" location="c:/MinGW"/>
@@ -15,7 +14,6 @@
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="${gcc}" dest="." skipemptyfilesets="true">
 			<arg line="-c -Wall -O2 -std=gnu99"/>
-			<arg value="-I${sdkhome}/include"/>
 			<arg value="-I${dxhome}/include"/>
 			<arg value="-I${alhome}/include"/>
 			<arg value="-I${java.home}/../include"/>
@@ -37,7 +35,6 @@
 			<srcfile/>
 			<arg value="-L${java.home}/../lib"/>
 			<arg value="-L${dxhome}/lib/x86"/>
-			<arg value="-L${sdkhome}/lib"/>
 			<arg value="-L${alhome}/libs"/>
 			<arg line="${libs}"/>
 			<fileset dir="." includes="*.o"/>

Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-15 23:20:06 UTC (rev 2528)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-15 23:31:37 UTC (rev 2529)
@@ -4,7 +4,7 @@
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="dxhome" location="${env.DXSDK_DIR}"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
+	<property name="sdkhome" location="${env.MSSdk}"/>
 	<property name="program_files" location="${env.ProgramFiles}"/>
 	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
 	<property name="dllname" value="lwjgl.dll"/>


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

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

Log Message:
-----------
Windows: Make mingw build.xml strip the dll after linking. Delete optional build files from mingw_ant.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/mingw_ant/build.xml

Removed Paths:
-------------
    trunk/LWJGL/platform_build/mingw_ant/build_devil.xml
    trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml
Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 23:04:07 UTC (rev 2527)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 23:20:06 UTC (rev 2528)
@@ -9,6 +9,7 @@
 	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
 	<property name="chome" location="c:/MinGW"/>
 	<property name="gcc" location="${chome}/bin/gcc"/>
+	<property name="strip" location="${chome}/bin/strip"/>
 	<property name="dllname" value="lwjgl.dll"/>
 
 	<target name="compile_dir">
@@ -54,6 +55,9 @@
 		<property name="libs" value="-lKernel32 -lole32 -ldinput -ldxguid -lOpenGL32 -lVersion -luser32 -lGdi32 -lAdvapi32 -ljawt -lwinmm"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>
+		<apply dir="." executable="${strip}">
+			<fileset file="${dllname}"/>
+		</apply>
     </target>
 </project>
 

Deleted: trunk/LWJGL/platform_build/mingw_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build_devil.xml	2006-07-15 23:04:07 UTC (rev 2527)
+++ trunk/LWJGL/platform_build/mingw_ant/build_devil.xml	2006-07-15 23:20:06 UTC (rev 2528)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="devil" basedir="../../bin/devil" default="compile">
-	<property name="native" location="../../src/native"/>
-	<property environment="env"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
-	<property name="fmodhome" location="${env.FMODHOME}"/>
-	<property name="dllname" value="lwjgl-devil.dll"/>
-
-	<target name="compile_dir">
-		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
-			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${java.home}\..\include"/>
-			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}\common"/>
-			<srcfile/>
-			<fileset dir="${native}/common/devil" includes="*.c"/>
-			<fileset dir="${native}/common" includes="*common*.c"/>
-			<mapper type="glob" from="*.c" to="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="link">
-		<apply dir="." parallel="true" executable="cl" failonerror="true">
-			<arg line="/LD /nologo"/>
-			<srcfile/>
-			<arg line="/Fe${dllname} /link"/>
-			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/OPT:REF"/>
-			<arg value="/OPT:ICF"/>
-			<fileset dir="." includes="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="clean">
-		<delete>
-			<fileset dir="." includes="*.obj"/>
-			<fileset dir="." includes="*.dll"/>
-			<fileset dir="." includes="*.exp"/>
-			<fileset dir="." includes="*.lib"/>			
-		</delete>
-	</target>
-
-	<target name="compile" depends="clean">
-		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
-		<antcall target="compile_dir"/>
-		<antcall target="link"/>
-    </target>
-</project>
-

Deleted: trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml	2006-07-15 23:04:07 UTC (rev 2527)
+++ trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml	2006-07-15 23:20:06 UTC (rev 2528)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="fmod3" basedir="../../bin/fmod3" default="compile">
-	<property name="native" location="../../src/native"/>
-	<property environment="env"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
-	<property name="fmodhome" location="${env.FMODHOME}"/>
-	<property name="dllname" value="lwjgl-fmod3.dll"/>
-
-	<target name="compile_dir">
-		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
-			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${java.home}\..\include"/>
-			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}\common"/>
-			<arg value="/I${fmodhome}\api\inc"/>
-			<srcfile/>
-			<fileset dir="${native}/common/fmod3" includes="*.c"/>
-			<fileset dir="${native}/common" includes="*common*.c"/>
-			<mapper type="glob" from="*.c" to="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="link">
-		<apply dir="." parallel="true" executable="cl" failonerror="true">
-			<arg line="/LD /nologo"/>
-			<srcfile/>
-			<arg line="/Fe${dllname} /link"/>
-			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/OPT:REF"/>
-			<arg value="/OPT:ICF"/>
-			<fileset dir="." includes="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="clean">
-		<delete>
-			<fileset dir="." includes="*.obj"/>
-			<fileset dir="." includes="*.dll"/>
-			<fileset dir="." includes="*.exp"/>
-			<fileset dir="." includes="*.lib"/>			
-		</delete>
-	</target>
-
-	<target name="compile" depends="clean">
-		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
-		<antcall target="compile_dir"/>
-		<antcall target="link"/>
-    </target>
-</project>
-


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

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

Log Message:
-----------
Windows: mingw path fixes

Modified Paths:
--------------
    trunk/LWJGL/platform_build/mingw_ant/build.xml
Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 21:44:59 UTC (rev 2526)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 23:04:07 UTC (rev 2527)
@@ -34,10 +34,10 @@
 			<arg value="-Wl,--kill-at"/>
 			<arg line="-shared -o ${dllname}"/>
 			<srcfile/>
-			<arg value="-L${java.home}\..\lib"/>
-			<arg value="-L${dxhome}\lib\x86"/>
-			<arg value="-L${sdkhome}\lib"/>
-			<arg value="-L${alhome}\libs"/>
+			<arg value="-L${java.home}/../lib"/>
+			<arg value="-L${dxhome}/lib/x86"/>
+			<arg value="-L${sdkhome}/lib"/>
+			<arg value="-L${alhome}/libs"/>
 			<arg line="${libs}"/>
 			<fileset dir="." includes="*.o"/>
 		</apply>


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

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

Log Message:
-----------
Windows: added build.xml for MinGW building of lwjgl.dll. Hopefully this could enable us to build 64 bit versions of the natives in the future. It currently works, with some manual removal of double declarations of symbols in dinput.h(!)

Added Paths:
-----------
    trunk/LWJGL/platform_build/mingw_ant/
    trunk/LWJGL/platform_build/mingw_ant/build.xml
    trunk/LWJGL/platform_build/mingw_ant/build_devil.xml
    trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml

Removed Paths:
-------------
    trunk/LWJGL/platform_build/mingw_ant/build.xml
    trunk/LWJGL/platform_build/mingw_ant/build_devil.xml
    trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml
Copied: trunk/LWJGL/platform_build/mingw_ant (from rev 2514, trunk/LWJGL/platform_build/windows_ant)

Deleted: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-14 16:14:52 UTC (rev 2514)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 21:44:59 UTC (rev 2526)
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="lwjgl native code, native code" basedir="../../bin/lwjgl" default="compile">
-	<property name="native" location="../../src/native"/>
-	<property environment="env"/>
-	<property name="dxhome" location="${env.DXSDK_DIR}"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
-	<property name="program_files" location="${env.ProgramFiles}"/>
-	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
-	<property name="dllname" value="lwjgl.dll"/>
-
-	<target name="compile_dir">
-		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
-			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${dxhome}\include"/>
-			<arg value="/I${alhome}\include"/>
-			<arg value="/I${java.home}\..\include"/>
-			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}\common"/>
-			<arg value="/I${native}\windows"/>
-			<srcfile/>
-			<fileset dir="${native}/windows" includes="*.c"/>
-			<fileset dir="${native}/common" includes="*.c"/>
-			<fileset dir="${native}/generated" includes="*.c"/>
-			<mapper type="glob" from="*.c" to="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="link">
-		<apply dir="." parallel="true" executable="cl" failonerror="true">
-			<arg line="/LD /nologo"/>
-			<srcfile/>
-			<arg line="/Fe${dllname} /link"/>
-			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${dxhome}\lib\x86"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/LIBPATH:${alhome}\libs"/>
-			<arg value="/OPT:REF"/>
-			<arg value="/OPT:ICF"/>
-			<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
-			<fileset dir="." includes="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="clean">
-		<delete>
-			<fileset dir="." includes="*.obj"/>
-			<fileset dir="." includes="*.dll"/>
-			<fileset dir="." includes="*.exp"/>
-			<fileset dir="." includes="*.lib"/>
-		</delete>
-	</target>
-	
-	<target name="compile">
-		<property name="libs" value="Kernel32.lib ole32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
-		<antcall target="compile_dir"/>
-		<antcall target="link"/>
-    </target>
-</project>
-

Copied: trunk/LWJGL/platform_build/mingw_ant/build.xml (from rev 2520, trunk/LWJGL/platform_build/windows_ant/build.xml)
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2006-07-15 21:44:59 UTC (rev 2526)
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<project name="lwjgl native code, native code" basedir="../../bin/lwjgl" default="compile">
+	<property name="native" location="../../src/native"/>
+	<property environment="env"/>
+	<property name="dxhome" location="${env.DXSDK_DIR}"/>
+	<property name="sdkhome" location="${env.MSSDK}"/>
+	<property name="program_files" location="${env.ProgramFiles}"/>
+	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
+	<property name="chome" location="c:/MinGW"/>
+	<property name="gcc" location="${chome}/bin/gcc"/>
+	<property name="dllname" value="lwjgl.dll"/>
+
+	<target name="compile_dir">
+		<apply dir="." failonerror="true" executable="${gcc}" dest="." skipemptyfilesets="true">
+			<arg line="-c -Wall -O2 -std=gnu99"/>
+			<arg value="-I${sdkhome}/include"/>
+			<arg value="-I${dxhome}/include"/>
+			<arg value="-I${alhome}/include"/>
+			<arg value="-I${java.home}/../include"/>
+			<arg value="-I${java.home}/../include/win32"/>
+			<arg value="-I${native}/common"/>
+			<arg value="-I${native}/windows"/>
+			<srcfile/>
+			<fileset dir="${native}/windows" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*.c"/>
+			<fileset dir="${native}/generated" includes="*.c"/>
+			<mapper type="glob" from="*.c" to="*.o"/>
+		</apply>
+	</target>
+
+	<target name="link">
+		<apply dir="." parallel="true" executable="${gcc}" failonerror="true">
+			<arg value="-Wl,--kill-at"/>
+			<arg line="-shared -o ${dllname}"/>
+			<srcfile/>
+			<arg value="-L${java.home}\..\lib"/>
+			<arg value="-L${dxhome}\lib\x86"/>
+			<arg value="-L${sdkhome}\lib"/>
+			<arg value="-L${alhome}\libs"/>
+			<arg line="${libs}"/>
+			<fileset dir="." includes="*.o"/>
+		</apply>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.o"/>
+			<fileset dir="." includes="*.dll"/>
+		</delete>
+	</target>
+	
+	<target name="compile">
+		<property name="libs" value="-lKernel32 -lole32 -ldinput -ldxguid -lOpenGL32 -lVersion -luser32 -lGdi32 -lAdvapi32 -ljawt -lwinmm"/>
+		<antcall target="compile_dir"/>
+		<antcall target="link"/>
+    </target>
+</project>
+

Deleted: trunk/LWJGL/platform_build/mingw_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_devil.xml	2006-07-14 16:14:52 UTC (rev 2514)
+++ trunk/LWJGL/platform_build/mingw_ant/build_devil.xml	2006-07-15 21:44:59 UTC (rev 2526)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="devil" basedir="../../bin/devil" default="compile">
-	<property name="native" location="../../src/native"/>
-	<property environment="env"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
-	<property name="fmodhome" location="${env.FMODHOME}"/>
-	<property name="dllname" value="lwjgl-devil.dll"/>
-
-	<target name="compile_dir">
-		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
-			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${java.home}\..\include"/>
-			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}\common"/>
-			<srcfile/>
-			<fileset dir="${native}/common/devil" includes="*.c"/>
-			<fileset dir="${native}/common" includes="*common*.c"/>
-			<mapper type="glob" from="*.c" to="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="link">
-		<apply dir="." parallel="true" executable="cl" failonerror="true">
-			<arg line="/LD /nologo"/>
-			<srcfile/>
-			<arg line="/Fe${dllname} /link"/>
-			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/OPT:REF"/>
-			<arg value="/OPT:ICF"/>
-			<fileset dir="." includes="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="clean">
-		<delete>
-			<fileset dir="." includes="*.obj"/>
-			<fileset dir="." includes="*.dll"/>
-			<fileset dir="." includes="*.exp"/>
-			<fileset dir="." includes="*.lib"/>			
-		</delete>
-	</target>
-
-	<target name="compile" depends="clean">
-		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
-		<antcall target="compile_dir"/>
-		<antcall target="link"/>
-    </target>
-</project>
-

Copied: trunk/LWJGL/platform_build/mingw_ant/build_devil.xml (from rev 2520, trunk/LWJGL/platform_build/windows_ant/build_devil.xml)
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build_devil.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/mingw_ant/build_devil.xml	2006-07-15 21:44:59 UTC (rev 2526)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<project name="devil" basedir="../../bin/devil" default="compile">
+	<property name="native" location="../../src/native"/>
+	<property environment="env"/>
+	<property name="sdkhome" location="${env.MSSDK}"/>
+	<property name="fmodhome" location="${env.FMODHOME}"/>
+	<property name="dllname" value="lwjgl-devil.dll"/>
+
+	<target name="compile_dir">
+		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg value="/I${sdkhome}\include"/>
+			<arg value="/I${java.home}\..\include"/>
+			<arg value="/I${java.home}\..\include\win32"/>
+			<arg value="/I${native}\common"/>
+			<srcfile/>
+			<fileset dir="${native}/common/devil" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*common*.c"/>
+			<mapper type="glob" from="*.c" to="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="link">
+		<apply dir="." parallel="true" executable="cl" failonerror="true">
+			<arg line="/LD /nologo"/>
+			<srcfile/>
+			<arg line="/Fe${dllname} /link"/>
+			<arg value="/LIBPATH:${java.home}\..\lib"/>
+			<arg value="/LIBPATH:${sdkhome}\lib"/>
+			<arg value="/OPT:REF"/>
+			<arg value="/OPT:ICF"/>
+			<fileset dir="." includes="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.obj"/>
+			<fileset dir="." includes="*.dll"/>
+			<fileset dir="." includes="*.exp"/>
+			<fileset dir="." includes="*.lib"/>			
+		</delete>
+	</target>
+
+	<target name="compile" depends="clean">
+		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
+		<antcall target="compile_dir"/>
+		<antcall target="link"/>
+    </target>
+</project>
+

Deleted: trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml	2006-07-14 16:14:52 UTC (rev 2514)
+++ trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml	2006-07-15 21:44:59 UTC (rev 2526)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="fmod3" basedir="../../bin/fmod3" default="compile">
-	<property name="native" location="../../src/native"/>
-	<property environment="env"/>
-	<property name="sdkhome" location="${env.MSSDK}"/>
-	<property name="fmodhome" location="${env.FMODHOME}"/>
-	<property name="dllname" value="lwjgl-fmod3.dll"/>
-
-	<target name="compile_dir">
-		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
-			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${java.home}\..\include"/>
-			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${native}\common"/>
-			<arg value="/I${fmodhome}\api\inc"/>
-			<srcfile/>
-			<fileset dir="${native}/common/fmod3" includes="*.c"/>
-			<fileset dir="${native}/common" includes="*common*.c"/>
-			<mapper type="glob" from="*.c" to="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="link">
-		<apply dir="." parallel="true" executable="cl" failonerror="true">
-			<arg line="/LD /nologo"/>
-			<srcfile/>
-			<arg line="/Fe${dllname} /link"/>
-			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/OPT:REF"/>
-			<arg value="/OPT:ICF"/>
-			<fileset dir="." includes="*.obj"/>
-		</apply>
-	</target>
-
-	<target name="clean">
-		<delete>
-			<fileset dir="." includes="*.obj"/>
-			<fileset dir="." includes="*.dll"/>
-			<fileset dir="." includes="*.exp"/>
-			<fileset dir="." includes="*.lib"/>			
-		</delete>
-	</target>
-
-	<target name="compile" depends="clean">
-		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
-		<antcall target="compile_dir"/>
-		<antcall target="link"/>
-    </target>
-</project>
-

Copied: trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml (from rev 2520, trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml)
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/mingw_ant/build_fmod3.xml	2006-07-15 21:44:59 UTC (rev 2526)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<project name="fmod3" basedir="../../bin/fmod3" default="compile">
+	<property name="native" location="../../src/native"/>
+	<property environment="env"/>
+	<property name="sdkhome" location="${env.MSSDK}"/>
+	<property name="fmodhome" location="${env.FMODHOME}"/>
+	<property name="dllname" value="lwjgl-fmod3.dll"/>
+
+	<target name="compile_dir">
+		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg value="/I${sdkhome}\include"/>
+			<arg value="/I${java.home}\..\include"/>
+			<arg value="/I${java.home}\..\include\win32"/>
+			<arg value="/I${native}\common"/>
+			<arg value="/I${fmodhome}\api\inc"/>
+			<srcfile/>
+			<fileset dir="${native}/common/fmod3" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*common*.c"/>
+			<mapper type="glob" from="*.c" to="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="link">
+		<apply dir="." parallel="true" executable="cl" failonerror="true">
+			<arg line="/LD /nologo"/>
+			<srcfile/>
+			<arg line="/Fe${dllname} /link"/>
+			<arg value="/LIBPATH:${java.home}\..\lib"/>
+			<arg value="/LIBPATH:${sdkhome}\lib"/>
+			<arg value="/OPT:REF"/>
+			<arg value="/OPT:ICF"/>
+			<fileset dir="." includes="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.obj"/>
+			<fileset dir="." includes="*.dll"/>
+			<fileset dir="." includes="*.exp"/>
+			<fileset dir="." includes="*.lib"/>			
+		</delete>
+	</target>
+
+	<target name="compile" depends="clean">
+		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
+		<antcall target="compile_dir"/>
+		<antcall target="link"/>
+    </target>
+</project>
+


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

Revision: 2525
Author:   elias_naur
Date:     2006-07-15 14:37:50 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2525&view=rev

Log Message:
-----------
Windows: Fix warning

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c	2006-07-15 21:01:11 UTC (rev 2524)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c	2006-07-15 21:37:50 UTC (rev 2525)
@@ -54,7 +54,7 @@
 		throwFormattedException(env, "CoInitializeEx failed (%x)", ret);
 		return (LONG_PTR)NULL;
 	}
-	ret = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8, &lpdi);
+	ret = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8, (void *)&lpdi);
 	if (ret != DI_OK && ret != DIERR_BETADIRECTINPUTVERSION) {
 		throwFormattedException(env, "Failed to create DirectInput (%x)", ret);
 		return (LONG_PTR)NULL;


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

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

Log Message:
-----------
Windows: Replace _WIN32 macro with _MSC_VER since the conditionals are really for the MSVC compiler, not for the windows platform in general. Code cleanup.

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/common_tools.c
    trunk/LWJGL/src/native/common/common_tools.h
    trunk/LWJGL/src/native/windows/org_lwjgl_input_Cursor.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-15 20:25:56 UTC (rev 2523)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-15 21:01:11 UTC (rev 2524)
@@ -39,11 +39,6 @@
 
 #include <jni.h>
 #include <stdlib.h>
-
-#ifdef _WIN32
-#include <wtypes.h>
-#endif
-
 #include "common_tools.h"
 #include "org_lwjgl_DefaultSysImplementation.h"
 
@@ -81,7 +76,7 @@
 #define BUFFER_SIZE 4000
 	char buffer[BUFFER_SIZE];
 	jstring str;
-#ifdef _WIN32
+#ifdef _MSC_VER
 	vsnprintf_s(buffer, BUFFER_SIZE, _TRUNCATE, format, ap);
 #else
 	vsnprintf(buffer, BUFFER_SIZE, format, ap);

Modified: trunk/LWJGL/src/native/common/common_tools.h
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.h	2006-07-15 20:25:56 UTC (rev 2523)
+++ trunk/LWJGL/src/native/common/common_tools.h	2006-07-15 21:01:11 UTC (rev 2524)
@@ -57,7 +57,7 @@
 #endif
 #endif
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #define inline __inline
 #include <Basetsd.h>
 #else

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_input_Cursor.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_input_Cursor.c	2006-07-15 20:25:56 UTC (rev 2523)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_input_Cursor.c	2006-07-15 21:01:11 UTC (rev 2524)
@@ -88,7 +88,7 @@
 
 	colorDIB = CreateDIBSection(GetDC(NULL), (BITMAPINFO*)&(bitmapInfo),
 			DIB_RGB_COLORS,
-			(void**)&(ptrCursorImage),
+			(void*)&(ptrCursorImage),
 			NULL, 0);
 	srcPtr = pixels;
 	dstPtr = ptrCursorImage;

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-07-15 20:25:56 UTC (rev 2523)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-07-15 21:01:11 UTC (rev 2524)
@@ -119,7 +119,7 @@
 			message_time = GetMessageTime();
 			handleMessage_method = (*env)->GetStaticMethodID(env, display_class_global, "handleMessage", "(JIJJJ)Z");
 			if (handleMessage_method != NULL)
-				if ((*env)->CallStaticBooleanMethod(env, display_class_global, handleMessage_method, (jlong)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time))
+				if ((*env)->CallStaticBooleanMethod(env, display_class_global, handleMessage_method, (jlong)(intptr_t)hWnd, (jint)msg, (jlong)wParam, (jlong)lParam, (jlong)message_time))
 					return 0;
 		}
 	}
@@ -190,7 +190,6 @@
 	jfieldID fid_height = (*env)->GetFieldID(env, cls_displayMode, "height", "I");
 	int width = (*env)->GetIntField(env, mode, fid_width);
 	int height = (*env)->GetIntField(env, mode, fid_height);
-	BOOL result;
 	bool isUndecorated;          // Whether we're undecorated or not
 	static bool oneShotInitialised = false;
 	if (!oneShotInitialised) {
@@ -321,8 +320,6 @@
 	char *ptrCursorImage;
 	int x, y;
 	char *dstPtr;
-	int pixelCount;
-	int scanlinePad;
 	int wordAlignedWidth;
 	int imageSize;
 	unsigned char *maskPixels;
@@ -332,8 +329,6 @@
 	int scanlineWidth;
 	HBITMAP colorDIB;
 	
-    jsize pixelsLen = width * height;
-	
 	memset(&bitmapInfo, 0, sizeof(BITMAPINFO));
 	bitmapInfo.bmiHeader.biSize              = sizeof(BITMAPINFOHEADER);
 	bitmapInfo.bmiHeader.biWidth             = width;
@@ -343,7 +338,7 @@
 	bitmapInfo.bmiHeader.biCompression       = BI_RGB;
 
 	colorDIB = CreateDIBSection(GetDC(NULL), (BITMAPINFO*)&(bitmapInfo),
-			DIB_RGB_COLORS, (void**)&(ptrCursorImage), NULL, 0);
+			DIB_RGB_COLORS, (void*)&(ptrCursorImage), NULL, 0);
 	if (!ptrCursorImage) {
 		throwException(env, "Could not allocate DIB section.");
 	}
@@ -435,7 +430,7 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetWindowIcon16
   (JNIEnv *env, jclass clazz, jobject iconBuffer)
 {
-	int *imgData = (int *)(*env)->GetDirectBufferAddress(env, iconBuffer);
+	jint *imgData = (jint *)(*env)->GetDirectBufferAddress(env, iconBuffer);
 	
 	freeSmallIcon();
 	small_icon = createWindowIcon(env, imgData, 16, 16);
@@ -453,7 +448,7 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetWindowIcon32
   (JNIEnv *env, jclass clazz, jobject iconBuffer)
 {
-	int *imgData = (int *)(*env)->GetDirectBufferAddress(env, iconBuffer);
+	jint *imgData = (jint *)(*env)->GetDirectBufferAddress(env, iconBuffer);
 	
 	freeLargeIcon();
 	large_icon = createWindowIcon(env, imgData, 32, 32);


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

Revision: 2523
Author:   elias_naur
Date:     2006-07-15 13:25:56 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2523&view=rev

Log Message:
-----------
Windows: Don't use a non-portable anonymous struct in contex.h

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java
    trunk/LWJGL/src/native/windows/context.h
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c
Modified: trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java	2006-07-15 19:55:42 UTC (rev 2522)
+++ trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java	2006-07-15 20:25:56 UTC (rev 2523)
@@ -69,7 +69,6 @@
     
     System.out.println("Info about current:");
     System.out.println("Graphics card: " + Display.getAdapter() + ", version: " + Display.getVersion());
-System.exit(1);
     System.out.println("Resolution: " + 
         Display.getDisplayMode().getWidth()      + "x" + 
         Display.getDisplayMode().getHeight()     + "x" + 

Modified: trunk/LWJGL/src/native/windows/context.h
===================================================================
--- trunk/LWJGL/src/native/windows/context.h	2006-07-15 19:55:42 UTC (rev 2522)
+++ trunk/LWJGL/src/native/windows/context.h	2006-07-15 20:25:56 UTC (rev 2523)
@@ -55,7 +55,7 @@
 			// created the pbuffer
 			WGLExtensions extensions;
 		} pbuffer;
-	};
+	} u;
 	HDC format_hdc;
 	HDC drawable_hdc;
 } WindowsPeerInfo;

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c	2006-07-15 19:55:42 UTC (rev 2522)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c	2006-07-15 20:25:56 UTC (rev 2523)
@@ -166,23 +166,23 @@
 		return;
 	}
 	peer_info->format_hdc = Pbuffer_dc;
-	peer_info->pbuffer.extensions = extensions;
-	peer_info->pbuffer.pbuffer = Pbuffer;
+	peer_info->u.pbuffer.extensions = extensions;
+	peer_info->u.pbuffer.pbuffer = Pbuffer;
 	peer_info->drawable_hdc = Pbuffer_dc;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nDestroy
   (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	peer_info->pbuffer.extensions.wglReleasePbufferDCARB(peer_info->pbuffer.pbuffer, peer_info->drawable_hdc);
-	peer_info->pbuffer.extensions.wglDestroyPbufferARB(peer_info->pbuffer.pbuffer);
+	peer_info->u.pbuffer.extensions.wglReleasePbufferDCARB(peer_info->u.pbuffer.pbuffer, peer_info->drawable_hdc);
+	peer_info->u.pbuffer.extensions.wglDestroyPbufferARB(peer_info->u.pbuffer.pbuffer);
 }
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nIsBufferLost
   (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	BOOL buffer_lost;
-	peer_info->pbuffer.extensions.wglQueryPbufferARB(peer_info->pbuffer.pbuffer, WGL_PBUFFER_LOST_ARB, &buffer_lost);
+	peer_info->u.pbuffer.extensions.wglQueryPbufferARB(peer_info->u.pbuffer.pbuffer, WGL_PBUFFER_LOST_ARB, &buffer_lost);
 	return buffer_lost ? JNI_TRUE : JNI_FALSE;
 }
 
@@ -195,17 +195,17 @@
 	attribs[1] = value;
 	attribs[2] = 0;
 
-	peer_info->pbuffer.extensions.wglSetPbufferAttribARB(peer_info->pbuffer.pbuffer, attribs);
+	peer_info->u.pbuffer.extensions.wglSetPbufferAttribARB(peer_info->u.pbuffer.pbuffer, attribs);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nBindTexImageToPbuffer
   (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint buffer) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	peer_info->pbuffer.extensions.wglBindTexImageARB(peer_info->pbuffer.pbuffer, buffer);
+	peer_info->u.pbuffer.extensions.wglBindTexImageARB(peer_info->u.pbuffer.pbuffer, buffer);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsPbufferPeerInfo_nReleaseTexImageFromPbuffer
   (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint buffer) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	peer_info->pbuffer.extensions.wglReleaseTexImageARB(peer_info->pbuffer.pbuffer, buffer);
+	peer_info->u.pbuffer.extensions.wglReleaseTexImageARB(peer_info->u.pbuffer.pbuffer, buffer);
 }

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c	2006-07-15 19:55:42 UTC (rev 2522)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c	2006-07-15 20:25:56 UTC (rev 2523)
@@ -50,7 +50,7 @@
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	AWTSurfaceLock *surface = (AWTSurfaceLock *)(*env)->GetDirectBufferAddress(env, lock_buffer_handle);
 	JAWT_Win32DrawingSurfaceInfo *win32_dsi = (JAWT_Win32DrawingSurfaceInfo *)surface->dsi->platformInfo;
-	peer_info->format_hwnd = win32_dsi->hwnd;
+	peer_info->u.format_hwnd = win32_dsi->hwnd;
 	peer_info->format_hdc = win32_dsi->hdc;
 	peer_info->drawable_hdc = win32_dsi->hdc;
 }

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c	2006-07-15 19:55:42 UTC (rev 2522)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDisplayPeerInfo.c	2006-07-15 20:25:56 UTC (rev 2523)
@@ -53,14 +53,14 @@
 		return;
 	}
 	dummy_hdc = GetDC(dummy_hwnd);
-	peer_info->format_hwnd = dummy_hwnd;
+	peer_info->u.format_hwnd = dummy_hwnd;
 	peer_info->format_hdc = dummy_hdc;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_nDestroy
   (JNIEnv *env, jclass clazz, jobject peer_info_handle) {
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	closeWindow(&peer_info->format_hwnd, &peer_info->format_hdc);
+	closeWindow(&peer_info->u.format_hwnd, &peer_info->format_hdc);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplayPeerInfo_nInitDC


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

Revision: 2522
Author:   elias_naur
Date:     2006-07-15 12:55:42 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2522&view=rev

Log Message:
-----------
Windows: Cleanup

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/display.c
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
Modified: trunk/LWJGL/src/native/windows/display.c
===================================================================
--- trunk/LWJGL/src/native/windows/display.c	2006-07-15 19:45:36 UTC (rev 2521)
+++ trunk/LWJGL/src/native/windows/display.c	2006-07-15 19:55:42 UTC (rev 2522)
@@ -269,7 +269,7 @@
 		VS_FIXEDFILEINFO * fxdFileInfo;
 
 		UINT uiLen = 0;
-		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), &fxdFileInfo, &uiLen);
+		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void *)&fxdFileInfo, &uiLen);
 		if (bRetval != 0)
 			ret = (*env)->NewObject(env, version_class, version_cons, fxdFileInfo->dwProductVersionMS, fxdFileInfo->dwProductVersionLS);
 	}

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c	2006-07-15 19:45:36 UTC (rev 2521)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c	2006-07-15 19:55:42 UTC (rev 2522)
@@ -128,11 +128,8 @@
 	int origin_x = 0; int origin_y = 0;
 	HWND dummy_hwnd;
 	HDC dummy_hdc;
-	HGLRC dummy_context;
 	HPBUFFERARB Pbuffer;
 	HDC Pbuffer_dc;
-	HDC saved_hdc;
-	HGLRC saved_context;
 	WGLExtensions extensions;
 	const int *pBufferAttribs_ptr;
 	WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);


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

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

Log Message:
-----------
Windows: Moved NativeSysImplementation.java to WindowsSysImplementation.java and moved some native code to java.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java
    trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java

Removed Paths:
-------------
    trunk/LWJGL/src/java/org/lwjgl/NativeSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/Win32SysImplementation.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-15 19:25:13 UTC (rev 2520)
+++ trunk/LWJGL/build.xml	2006-07-15 19:45:36 UTC (rev 2521)
@@ -514,7 +514,7 @@
 			<class name="org.lwjgl.opengl.WindowsPbufferPeerInfo" />
 			<class name="org.lwjgl.opengl.WindowsDisplay" />
 			<class name="org.lwjgl.opengl.WindowsRegistry" />
-			<class name="org.lwjgl.NativeSysImplementation" />
+			<class name="org.lwjgl.WindowsSysImplementation" />
 			<class name="org.lwjgl.opengl.WindowsAWTGLCanvasPeerInfo" />
 			<class name="org.lwjgl.opengl.WindowsPeerInfo" />
 			<class name="org.lwjgl.opengl.WindowsDisplayPeerInfo" />

Deleted: trunk/LWJGL/src/java/org/lwjgl/NativeSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/NativeSysImplementation.java	2006-07-15 19:25:13 UTC (rev 2520)
+++ trunk/LWJGL/src/java/org/lwjgl/NativeSysImplementation.java	2006-07-15 19:45:36 UTC (rev 2521)
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl;
-
-/**
- * A SysImplementation that uses native calls only.
- * <p>
- * @author $Author$
- * @version $Revision$
- * $Id$
- */
-class NativeSysImplementation extends DefaultSysImplementation {
-	
-	static {
-		Sys.initialize();
-	}
-	
-	public native long getTimerResolution();
-
-	public native long getTime();
-
-	public native void alert(String title, String message);
-
-	public native boolean openURL(String url);
-
-	public native String getClipboard();
-}

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-15 19:25:13 UTC (rev 2520)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-15 19:45:36 UTC (rev 2521)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "1.0beta2";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 2;
+	static final int JNI_VERSION = 3;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;
@@ -114,7 +114,7 @@
 				class_name = "org.lwjgl.LinuxSysImplementation";
 				break;
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				class_name = "org.lwjgl.Win32SysImplementation";
+				class_name = "org.lwjgl.WindowsSysImplementation";
 				break;
 			case LWJGLUtil.PLATFORM_MACOSX:
 				class_name = "org.lwjgl.MacOSXSysImplementation";

Deleted: trunk/LWJGL/src/java/org/lwjgl/Win32SysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Win32SysImplementation.java	2006-07-15 19:25:13 UTC (rev 2520)
+++ trunk/LWJGL/src/java/org/lwjgl/Win32SysImplementation.java	2006-07-15 19:45:36 UTC (rev 2521)
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl;
-
-/**
- * <p>
- * Win32 SysImplementation. This is just a straightforward NativsSysImplementation.
- * </p>
- * @author $Author$
- * @version $Revision$
- * $Id$
- */
-class Win32SysImplementation extends NativeSysImplementation {
-}

Copied: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java (from rev 2520, trunk/LWJGL/src/java/org/lwjgl/NativeSysImplementation.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2006-07-15 19:45:36 UTC (rev 2521)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl;
+
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+import java.security.PrivilegedActionException;
+
+/**
+ * <p>
+ * @author $Author$
+ * @version $Revision$
+ * $Id$
+ */
+class WindowsSysImplementation extends DefaultSysImplementation {
+	static {
+		Sys.initialize();
+	}
+	
+	public long getTimerResolution() {
+		return 1000;
+	}
+
+	public native long getTime();
+
+	public native void alert(String title, String message);
+
+	public boolean openURL(final String url) {
+		try {
+			AccessController.doPrivileged(new PrivilegedExceptionAction() {
+				public Object run() throws Exception {
+					Runtime.getRuntime().exec(new String[]{"rundll32", "url.dll,FileProtocolHandler", url});
+					return null;
+				}
+			});
+			return true;
+		} catch (PrivilegedActionException e) {
+			LWJGLUtil.log("Failed to open url (" + url + "): " + e.getCause().getMessage());
+			return false;
+		}
+	}
+
+	public native String getClipboard();
+}

Modified: trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java	2006-07-15 19:25:13 UTC (rev 2520)
+++ trunk/LWJGL/src/java/org/lwjgl/test/DisplayTest.java	2006-07-15 19:45:36 UTC (rev 2521)
@@ -69,6 +69,7 @@
     
     System.out.println("Info about current:");
     System.out.println("Graphics card: " + Display.getAdapter() + ", version: " + Display.getVersion());
+System.exit(1);
     System.out.println("Resolution: " + 
         Display.getDisplayMode().getWidth()      + "x" + 
         Display.getDisplayMode().getHeight()     + "x" + 

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c	2006-07-15 19:25:13 UTC (rev 2520)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c	2006-07-15 19:45:36 UTC (rev 2521)
@@ -41,48 +41,21 @@
 
 #include "Window.h"
 #include "mmsystem.h"
-#include "org_lwjgl_NativeSysImplementation.h"
+#include "org_lwjgl_WindowsSysImplementation.h"
 #include "common_tools.h"
 #include <malloc.h>
 
-/*
- * Class:     org_lwjgl_Sys
- * Method:    getTimerResolution
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_NativeSysImplementation_getTimerResolution
-  (JNIEnv * env, jobject ignored)
-{
-	return (jlong) 1000L;
-}
-
-/*
- * Class:     org_lwjgl_Sys
- * Method:    ngetTime
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_NativeSysImplementation_getTime
-  (JNIEnv * env, jobject ignored)
-{
-
-	MMRESULT result;
+JNIEXPORT jlong JNICALL Java_org_lwjgl_WindowsSysImplementation_getTime(JNIEnv * env, jobject ignored) {
 	DWORD time;
 
-	result = timeBeginPeriod(1);
+	timeBeginPeriod(1);
 	time = timeGetTime();
-	result = timeEndPeriod(1);
+	timeEndPeriod(1);
 
 	return time;
 }
 
-/*
- * Class:     org_lwjgl_Sys
- * Method:    alert
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_NativeSysImplementation_alert
-  (JNIEnv * env, jobject ignored, jstring title, jstring message)
-{
+JNIEXPORT void JNICALL Java_org_lwjgl_WindowsSysImplementation_alert(JNIEnv * env, jobject ignored, jstring title, jstring message) {
 	char * eMessageText = GetStringNativeChars(env, message);
 	char * cTitleBarText = GetStringNativeChars(env, title);
 	MessageBox(getCurrentHWND(), eMessageText, cTitleBarText, MB_OK | MB_TOPMOST);
@@ -93,56 +66,7 @@
 	free(cTitleBarText);
 }
 
-/*
- * Class:     org_lwjgl_Sys
- * Method:    openURL
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_NativeSysImplementation_openURL
-  (JNIEnv * env, jobject ignored, jstring url)
-{
-#define BUFFER_SIZE 1024
-	const char *std_args = "rundll32 url.dll,FileProtocolHandler ";
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-
-	char * urlString = GetStringNativeChars(env, url);
-
-	char command[BUFFER_SIZE];
-	strncpy_s(command, BUFFER_SIZE, "", 1);
-	strncat_s(command, BUFFER_SIZE, std_args, _TRUNCATE);
-	strncat_s(command, BUFFER_SIZE, urlString, _TRUNCATE);
-	free(urlString);
-
-	ZeroMemory( &si, sizeof(si) );
-	si.cb = sizeof(si);
-	ZeroMemory( &pi, sizeof(pi) );
-
-	// Start the child process. 
-	if( !CreateProcess( NULL, // No module name (use command line). 
-		command,		  // Command line. 
-		NULL,			 // Process handle not inheritable. 
-		NULL,			 // Thread handle not inheritable. 
-		FALSE,			// Set handle inheritance to FALSE. 
-		0,				// No creation flags. 
-		NULL,			 // Use parent's environment block. 
-		NULL,			 // Use parent's starting directory. 
-		&si,			  // Pointer to STARTUPINFO structure.
-		&pi )			 // Pointer to PROCESS_INFORMATION structure.
-	) 
-	{
-		printfDebugJava(env, "Failed to open URL %s", urlString);
-		return JNI_FALSE;
-	}
-
-	// Close process and thread handles. 
-	CloseHandle( pi.hProcess );
-	CloseHandle( pi.hThread );
-
-	return JNI_TRUE;
-}
-
-JNIEXPORT jstring JNICALL Java_org_lwjgl_NativeSysImplementation_getClipboard
+JNIEXPORT jstring JNICALL Java_org_lwjgl_WindowsSysImplementation_getClipboard
   (JNIEnv * env, jobject ignored)
 {
 	// Check to see if there's text available in the clipboard


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

Revision: 2520
Author:   elias_naur
Date:     2006-07-15 12:25:13 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2520&view=rev

Log Message:
-----------
Windows: Move more of Display.getVersion to java

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/display.c
    trunk/LWJGL/src/native/windows/display.h
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsFileVersion.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-15 18:45:20 UTC (rev 2519)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-15 19:25:13 UTC (rev 2520)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "1.0beta2";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 1;
+	static final int JNI_VERSION = 2;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2006-07-15 18:45:20 UTC (rev 2519)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2006-07-15 19:25:13 UTC (rev 2520)
@@ -248,12 +248,13 @@
 	
 	public String getVersion() {
 		String driver = getAdapter();
-		if (driver != null)
-			return nGetVersion(driver);
-		else
+		if (driver != null) {
+			WindowsFileVersion version = nGetVersion(driver + ".dll");
+			return version.toString();
+		} else
 			return null;
 	}
-	private native String nGetVersion(String driver);
+	private native WindowsFileVersion nGetVersion(String driver);
 
 	public DisplayMode init() throws LWJGLException {
 		current_gamma = saved_gamma = getCurrentGammaRamp();

Copied: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsFileVersion.java (from rev 2514, trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsRegistry.java)
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsFileVersion.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsFileVersion.java	2006-07-15 19:25:13 UTC (rev 2520)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+/**
+ * @author elias_naur
+ */
+
+final class WindowsFileVersion {
+	private final int product_version_ms;
+	private final int product_version_ls;
+
+	public WindowsFileVersion(int product_version_ms, int product_version_ls) {
+		this.product_version_ms = product_version_ms;
+		this.product_version_ls = product_version_ls;
+	}
+
+	public String toString() {
+		int f1 = (product_version_ms >> 16) & 0xFFFF;
+		int f2 = product_version_ms & 0xFFFF;
+		int f3 = (product_version_ls >> 16) & 0xFFFF;
+		int f4 = product_version_ls & 0xFFFF;
+		return f1 + "." + f2 + "." + f3 + "." + f4;
+	}
+}

Modified: trunk/LWJGL/src/native/windows/display.c
===================================================================
--- trunk/LWJGL/src/native/windows/display.c	2006-07-15 18:45:20 UTC (rev 2519)
+++ trunk/LWJGL/src/native/windows/display.c	2006-07-15 19:25:13 UTC (rev 2520)
@@ -241,17 +241,23 @@
 	ChangeDisplaySettings(NULL, 0);
 }
 
-jstring getVersion(JNIEnv * env, char *driver)
+jobject getVersion(JNIEnv * env, char *driver)
 {
-#define BUFFER_SIZE 1024
-	jstring ret = NULL;
-
-	const char *dll_ext = ".dll";
 	DWORD var = 0;
 	DWORD dwInfoSize;
 	LPVOID lpInfoBuff;
 	BOOL bRetval;
+	jclass version_class;
+	jmethodID version_cons;
+	jobject ret = NULL;
 
+	version_class = (*env)->FindClass(env, "org/lwjgl/opengl/WindowsFileVersion");
+	if (version_class == NULL)
+		return NULL;
+	version_cons = (*env)->GetMethodID(env, version_class, "<init>", "(II)V");
+	if (version_cons == NULL)
+		return NULL;
+
 	dwInfoSize = GetFileVersionInfoSize(driver, &var);
 	lpInfoBuff = malloc(dwInfoSize);
 	if (lpInfoBuff == NULL) {
@@ -259,20 +265,13 @@
 		return NULL;
 	}
 	bRetval = GetFileVersionInfo(driver, 0, dwInfoSize, lpInfoBuff);
-	if (bRetval == 0) {
-	} else {
+	if (bRetval != 0) {
 		VS_FIXEDFILEINFO * fxdFileInfo;
 
 		UINT uiLen = 0;
-		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void *)&fxdFileInfo, &uiLen);
-		if (bRetval != 0) {
-			TCHAR version[BUFFER_SIZE];
-			TCHAR ms[BUFFER_SIZE], ls[BUFFER_SIZE];
-			_snprintf_s(ms, BUFFER_SIZE, _TRUNCATE, "%d.%d\0", fxdFileInfo->dwProductVersionMS >> 16, fxdFileInfo->dwProductVersionMS & 0xFFFF);
-			_snprintf_s(ls, BUFFER_SIZE, _TRUNCATE, "%d.%d\0", fxdFileInfo->dwProductVersionLS >> 16, fxdFileInfo->dwProductVersionLS & 0xFFFF);
-			_snprintf_s(version, BUFFER_SIZE, _TRUNCATE, "%s.%s\0", ms, ls);
-			ret = NewStringNative(env, version);
-		}
+		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), &fxdFileInfo, &uiLen);
+		if (bRetval != 0)
+			ret = (*env)->NewObject(env, version_class, version_cons, fxdFileInfo->dwProductVersionMS, fxdFileInfo->dwProductVersionLS);
 	}
 
 	free(lpInfoBuff);

Modified: trunk/LWJGL/src/native/windows/display.h
===================================================================
--- trunk/LWJGL/src/native/windows/display.h	2006-07-15 18:45:20 UTC (rev 2519)
+++ trunk/LWJGL/src/native/windows/display.h	2006-07-15 19:25:13 UTC (rev 2520)
@@ -51,7 +51,7 @@
 extern void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer);
 extern jobject getCurrentGammaRamp(JNIEnv *env);
 extern jobject getCurrentDisplayMode(JNIEnv * env);
-extern jstring getVersion(JNIEnv * env, char *driver);
+extern jobject getVersion(JNIEnv * env, char *driver);
 extern jobject convertToNativeRamp(JNIEnv *env, jobject float_gamma_obj);
 
 #endif

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-07-15 18:45:20 UTC (rev 2519)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2006-07-15 19:25:13 UTC (rev 2520)
@@ -275,7 +275,7 @@
 	SetFocus(hwnd);
 }
 
-JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nGetVersion(JNIEnv *env, jobject self, jstring driver) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nGetVersion(JNIEnv *env, jobject self, jstring driver) {
 	char *driver_str;
 	jstring result;
 	driver_str = GetStringNativeChars(env, driver);


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.

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: 2517
Author:   elias_naur
Date:     2006-07-15 11:36:46 -0700 (Sat, 15 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2517&view=rev

Log Message:
-----------
Fixed SysTest.java

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/SysTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/SysTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/SysTest.java	2006-07-15 18:31:09 UTC (rev 2516)
+++ trunk/LWJGL/src/java/org/lwjgl/test/SysTest.java	2006-07-15 18:36:46 UTC (rev 2517)
@@ -100,9 +100,9 @@
   
     pause(2000);
   
-    time = Sys.getTime();
-    System.out.println("Current time: " + time);
-    System.out.println("Actually slept for: " + (time / (float) resolution) + " seconds");
+    long time2 = Sys.getTime();
+    System.out.println("Current time: " + time2);
+    System.out.println("Actually slept for: " + ((time2 - time) / (float) resolution) + " seconds");
     System.out.println("---- Test Timer ----\n"); 
   }
   


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

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

Log Message:
-----------
Windows: Don't release clipboard data before use

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c	2006-07-15 17:44:53 UTC (rev 2515)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c	2006-07-15 18:31:09 UTC (rev 2516)
@@ -142,43 +142,50 @@
 	return JNI_TRUE;
 }
 
-const void * getClipboard(int type)
-{
-
-	void * ret;
-	HANDLE hglb;
-	// Open the clipboard
-	if (!OpenClipboard(NULL)) 
-		return NULL; 
-
-	hglb = GetClipboardData(type); 
-	if (hglb != NULL) { 
-		ret = GlobalLock(hglb); 
-		if (ret != NULL) { 
-			GlobalUnlock(hglb); 
-		} 
-	} 
-
-	// Close the clipboard now we're done
-	CloseClipboard(); 
-
-	return ret;
-
-}
-
 JNIEXPORT jstring JNICALL Java_org_lwjgl_NativeSysImplementation_getClipboard
   (JNIEnv * env, jobject ignored)
 {
 	// Check to see if there's text available in the clipboard
 	BOOL textAvailable = IsClipboardFormatAvailable(CF_TEXT);
 	BOOL unicodeAvailable = IsClipboardFormatAvailable(CF_UNICODETEXT);
+	void *clipboard_data;
+	jstring ret;
+	HANDLE hglb;
+	const wchar_t * str;
 
 	if (unicodeAvailable) {
-		const wchar_t * str = (const wchar_t *) getClipboard(CF_UNICODETEXT);
-		return (*env)->NewString(env, str, wcslen(str));
+		if (!OpenClipboard(NULL))
+			return NULL;
+		hglb = GetClipboardData(CF_UNICODETEXT);
+		if (hglb == NULL) {
+			CloseClipboard();
+			return NULL;
+		}
+		clipboard_data = GlobalLock(hglb);
+		if (clipboard_data == NULL) {
+			CloseClipboard();
+			return NULL;
+		}
+		str = (const wchar_t *)clipboard_data;
+		ret = (*env)->NewString(env, str, wcslen(str));
 	} else if (textAvailable) {
-		return NewStringNative(env, (const char *) getClipboard(CF_TEXT));
+		if (!OpenClipboard(NULL))
+			return NULL;
+		hglb = GetClipboardData(CF_TEXT);
+		if (hglb == NULL) {
+			CloseClipboard();
+			return NULL;
+		}
+		clipboard_data = GlobalLock(hglb);
+		if (clipboard_data == NULL) {
+			CloseClipboard();
+			return NULL;
+		}
+		ret = NewStringNative(env, (const char *) clipboard_data);
 	} else {
 		return NULL;
 	}
+	GlobalUnlock(hglb);
+	CloseClipboard();
+	return ret;
 }


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

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.