From 236e987482cd774a7bed8275195c77bee8062038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Troch?= <JoelTroch@users.noreply.github.com>
Date: Fri, 17 Oct 2014 11:54:09 +0200
Subject: Added Windows 10 in OS detection and manifest file.

The official name for the server version of Windows 10
is "Windows 10 Server Technical Preview" but since
"Technical Preview" is a detail, I haven't included it.

Closes #1435
---
 src/OSInfo.cpp                       | 7 +++++++
 src/mumble/mumble.appcompat.manifest | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/OSInfo.cpp b/src/OSInfo.cpp
index d5949bf69..ce9757468 100644
--- a/src/OSInfo.cpp
+++ b/src/OSInfo.cpp
@@ -210,6 +210,13 @@ QString OSInfo::getOSDisplayableVersion() {
 				osdispver = QLatin1String("Windows Server 2012 R2");
 			}
 		}
+		else if (ovi.dwMinorVersion == 4) {
+			if (ovi.wProductType == VER_NT_WORKSTATION) {
+				osdispver = QLatin1String("Windows 10");
+			} else {
+				osdispver = QLatin1String("Windows 10 Server");
+			}
+		}
 
 		typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
 		PGPI pGetProductInfo = (PGPI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetProductInfo");
diff --git a/src/mumble/mumble.appcompat.manifest b/src/mumble/mumble.appcompat.manifest
index b5e27a356..fa9d34422 100644
--- a/src/mumble/mumble.appcompat.manifest
+++ b/src/mumble/mumble.appcompat.manifest
@@ -6,6 +6,7 @@
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- Win 7 -->
       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- Win 8 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- Win 8.1 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- Win 10 -->
     </application>
   </compatibility>
 </assembly>
-- 
cgit v1.2.3