[Java-game-lib-cvs] CVS: LWJGL/src/native/win32 org_lwjgl_Display.cpp,1.43,1.44

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Fixed display mode code paths

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.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- org_lwjgl_Display.cpp	2 Sep 2003 11:30:36 -0000	1.43
+++ org_lwjgl_Display.cpp	10 Sep 2003 22:35:06 -0000	1.44
@@ -44,8 +44,8 @@
 
 #define WINDOWCLASSNAME "LWJGLWINDOW"
 
-jobjectArray GetAvailableDisplayModesNT(JNIEnv * env);
-jobjectArray GetAvailableDisplayModes9x(JNIEnv * env);
+jobjectArray GetAvailableDisplayModesEx(JNIEnv * env);
+jobjectArray GetAvailableDisplayModes(JNIEnv * env);
 bool modeSet = false; // Whether we've done a display mode change
 WORD* originalGamma = new WORD[256 * 3]; // Original gamma settings
 WORD* currentGamma = new WORD[256 * 3]; // Current gamma settings
@@ -67,23 +67,24 @@
 	osvi.dwOSVersionInfoSize = sizeof(osvi);
 	GetVersionEx(&osvi);
 	
-	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 5 ||
+            osvi.swPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion >= 10) {
 #ifdef _DEBUG
-  printf("Selecting NT display mode check\n");
+		printf("Selecting extended display mode check\n");
 #endif	
-    return GetAvailableDisplayModesNT(env);
-  }
-  
+		return GetAvailableDisplayModesEx(env);
+	} else {
 #ifdef _DEBUG
-  printf("Selecting 9x display mode check");
+		printf("Selecting standard display mode check");
 #endif	
-  return GetAvailableDisplayModes9x(env);
+		return GetAvailableDisplayModes(env);
+	}
 }
 
 /**
- * Choose displaymodes using NT codepath (multiple displaydevices)
+ * Choose displaymodes using extended codepath (multiple displaydevices)
  */
-jobjectArray GetAvailableDisplayModesNT(JNIEnv * env) {
+jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) {
 	int i = 0, j = 0, n = 0;
 	int AvailableModes = 0;
 
@@ -142,9 +143,9 @@
 }
 
 /**
- * Choose displaymodes using 9x codepath (single displaydevice)
+ * Choose displaymodes using standard codepath (single displaydevice)
  */
-jobjectArray GetAvailableDisplayModes9x(JNIEnv * env) {
+jobjectArray GetAvailableDisplayModes(JNIEnv * env) {
 	int i = 0, j = 0, n = 0;
 	int AvailableModes = 0;