Allow identification of Windows Vista/Windows 7 in logfiles (as opposed to "unknown NT-based").

src/archutils/Win32/DebugInfoHunt.cpp

@@ -191,7 +191,7 @@ static void GetDriveDebugInfo()
 
 static void GetWindowsVersionDebugInfo()
 {
-	/* Detect operating system. */
+	// Detect operating system.
 	OSVERSIONINFO ovi;
 	ovi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	if (!GetVersionEx(&ovi))
@@ -200,6 +200,7 @@ static void GetWindowsVersionDebugInfo()
 		return;
 	}
 
+
 	RString Ver = ssprintf("Windows %i.%i (", ovi.dwMajorVersion, ovi.dwMinorVersion);
 	if(ovi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
 	{
@@ -220,6 +221,35 @@ static void GetWindowsVersionDebugInfo()
 			Ver += "Win2000";
 		else if(ovi.dwMajorVersion == 5 && ovi.dwMinorVersion == 1)
 			Ver += "WinXP";
+		else if(ovi.dwMajorVersion == 5 && ovi.dwMinorVersion == 2)
+		{
+			Ver += "WinServer2003";
+			// todo: check for R2
+			/*
+			if(GetSystemMetrics(SM_SERVERR2) != 0)
+				Ver += "R2";
+			*/
+		}
+		else if(ovi.dwMajorVersion == 6 && ovi.dwMinorVersion == 0)
+		{
+			Ver += "Vista";
+			// todo: make this check work
+			/*
+			if(ovi.wProductType == VER_NT_WORKSTATION)
+				Ver += "Vista";
+			else
+				Ver += "WinServer2008";
+			*/
+		}
+		else if(ovi.dwMajorVersion == 6 && ovi.dwMinorVersion == 1)
+			Ver += "Win7";
+			// todo: make this check work
+			/*
+			if(ovi.wProductType == VER_NT_WORKSTATION)
+				Ver += "Win7";
+			else
+				Ver += "WinServer2008 R2";
+			*/
 		else
 			Ver += "unknown NT-based";
 	} else Ver += "???";