From 9148cb7c90c7830cd241dd2babad1f8803bfc506 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Wed, 10 Sep 2003 22:35:06 +0000
Subject: [PATCH] Fixed display mode code paths

---
 src/native/win32/org_lwjgl_Display.cpp | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/native/win32/org_lwjgl_Display.cpp b/src/native/win32/org_lwjgl_Display.cpp
index f947ca08..3dd02920 100644
--- a/src/native/win32/org_lwjgl_Display.cpp
+++ b/src/native/win32/org_lwjgl_Display.cpp
@@ -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 @@ JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
 	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 @@ jobjectArray GetAvailableDisplayModesNT(JNIEnv * env) {
 }
 
 /**
- * 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;