From d12497abebff7f8446441f3785b5822488180f50 Mon Sep 17 00:00:00 2001
From: "FWoltermann@gmail.com"
 <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>
Date: Fri, 9 Dec 2011 16:54:57 +0000
Subject: Adding code to detect Win XP x64/Vista/7

---
 nGenEx/MachineInfo.cpp | 57 +++++++++++++++++++++++++++++++++++++++-----------
 nGenEx/MachineInfo.h   |  2 +-
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/nGenEx/MachineInfo.cpp b/nGenEx/MachineInfo.cpp
index c57bd56..750b959 100644
--- a/nGenEx/MachineInfo.cpp
+++ b/nGenEx/MachineInfo.cpp
@@ -63,7 +63,11 @@ MachineInfo::GetShortDescription()
       "Windows 98",
       "Windows NT",
       "Windows 2000",
-      "Windows XP"
+      "Windows XP",
+	  "Windows XP x64",
+	  "Windows Vista",
+	  "Windows Seven",
+	  "Future Windows"
    };
 
    int cpu_index = GetCpuClass();
@@ -72,7 +76,6 @@ MachineInfo::GetShortDescription()
 
    int os_index = GetPlatform();
    if (os_index < 0)      os_index = 0;
-   else if (os_index > 5) os_index = 5;
 
    sprintf_s(desc, "%s %d MHz %d MB RAM %s",
       cpu_names[cpu_index],
@@ -231,27 +234,29 @@ MachineInfo::GetPlatform()
 
       switch (os_ver.dwPlatformId) {
       default:
-      case VER_PLATFORM_WIN32s: {
+      case VER_PLATFORM_WIN32s:
+		case VER_PLATFORM_WIN32_WINDOWS: {
          char msg[256];
          sprintf_s(msg, "Invalid Operating System Platform: %d\n", os_ver.dwPlatformId);
          Print(msg);
          }
          break;
 
-      case VER_PLATFORM_WIN32_WINDOWS:
-         if (os_ver.dwMajorVersion == 4 && os_ver.dwMinorVersion == 0)
-            platform = OS_WIN95;
-         else
-            platform = OS_WIN98;
-         break;
-
       case VER_PLATFORM_WIN32_NT:
          if (os_ver.dwMajorVersion == 4)
             platform = OS_WINNT;
-         else if (os_ver.dwMajorVersion == 5 && os_ver.dwMinorVersion ==  0)
+         else if (os_ver.dwMajorVersion == 5 && os_ver.dwMinorVersion == 0)
             platform = OS_WIN2K;
-         else if (os_ver.dwMajorVersion >= 5)
+		 else if (os_ver.dwMajorVersion == 5 && os_ver.dwMinorVersion == 1)
             platform = OS_WINXP;
+		 else if (os_ver.dwMajorVersion == 5 && os_ver.dwMinorVersion == 2)
+			 platform = OS_WINXP64;
+		 else if (os_ver.dwMajorVersion == 6 && os_ver.dwMinorVersion == 0)
+			 platform = OS_WINVISTA;
+		 else if (os_ver.dwMajorVersion == 6 && os_ver.dwMinorVersion == 1)
+			 platform = OS_WINSEVEN;
+		 else if (os_ver.dwMajorVersion >= 6)
+			 platform = OS_WINFUTURE;
 
          else {
             platform = OS_INVALID;
@@ -330,6 +335,34 @@ MachineInfo::DescribeMachine()
               os_ver.dwBuildNumber,
               os_ver.szCSDVersion);
       break;
+   case OS_WINXP64:
+	   sprintf_s(txt, "Windows XP x64 %d.%d (Build %d) %s",
+              os_ver.dwMajorVersion,
+              os_ver.dwMinorVersion,
+              os_ver.dwBuildNumber,
+              os_ver.szCSDVersion);
+      break;
+   case OS_WINVISTA:
+	   sprintf_s(txt, "Windows Vista %d.%d (Build %d) %s",
+              os_ver.dwMajorVersion,
+              os_ver.dwMinorVersion,
+              os_ver.dwBuildNumber,
+              os_ver.szCSDVersion);
+      break;
+   case OS_WINSEVEN:
+	   sprintf_s(txt, "Windows 7 %d.%d (Build %d) %s",
+              os_ver.dwMajorVersion,
+              os_ver.dwMinorVersion,
+              os_ver.dwBuildNumber,
+              os_ver.szCSDVersion);
+      break;
+   case OS_WINFUTURE:
+	   sprintf_s(txt, "Windows from the future %d.%d (Build %d) %s",
+              os_ver.dwMajorVersion,
+              os_ver.dwMinorVersion,
+              os_ver.dwBuildNumber,
+              os_ver.szCSDVersion);
+      break;
 
    default:
       sprintf_s(txt, "Unknown Operating System Platform");
diff --git a/nGenEx/MachineInfo.h b/nGenEx/MachineInfo.h
index 58f26f4..77c9150 100644
--- a/nGenEx/MachineInfo.h
+++ b/nGenEx/MachineInfo.h
@@ -23,7 +23,7 @@ class MachineInfo
 {
 public:
    enum { CPU_INVALID, CPU_P5=5, CPU_P6=6, CPU_P7=7, CPU_PLUS };
-   enum { OS_INVALID,  OS_WIN95, OS_WIN98, OS_WINNT, OS_WIN2K, OS_WINXP };
+   enum { OS_INVALID,  OS_WIN95, OS_WIN98, OS_WINNT, OS_WIN2K, OS_WINXP, OS_WINXP64, OS_WINVISTA, OS_WINSEVEN, OS_WINFUTURE };
    enum { DX_NONE,     DX_3=3,   DX_5=5,   DX_6=6,   DX_7=7,   DX_8=8, DX_9=9, DX_PLUS };
 
    static int     GetCpuClass();
-- 
cgit v1.1