From 27e0aa2bdee0635fcbb9bcb6e18f68560887fa07 Mon Sep 17 00:00:00 2001
From: rotthh <rotthh@dispostable.com>
Date: Mon, 17 Aug 2015 21:04:44 +0200
Subject: [PATCH 1/6] Windows 8.1 and 10 support

---
 Client/Client.csproj                 |  4 ++++
 Client/Core/Helper/PlatformHelper.cs | 18 ++++++++++++++++++
 Server/Core/Helper/PlatformHelper.cs | 27 ++++++++++++++++++++++++++-
 Server/Server.csproj                 |  8 +++++---
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Client/Client.csproj b/Client/Client.csproj
index cb4dfdb2..8d57bae0 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -38,6 +38,9 @@
   <PropertyGroup>
     <StartupObject>xClient.Program</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />
@@ -210,6 +213,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Client/Core/Helper/PlatformHelper.cs b/Client/Core/Helper/PlatformHelper.cs
index 4f8a1e9b..94ac94ca 100644
--- a/Client/Core/Helper/PlatformHelper.cs
+++ b/Client/Core/Helper/PlatformHelper.cs
@@ -16,6 +16,8 @@ namespace xClient.Core.Helper
             VistaOrHigher = Win32NT && Environment.OSVersion.Version.Major >= 6;
             SevenOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(6, 1));
             EightOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(6, 2, 9200));
+            EightPointOneOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(6, 3));
+            TenOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(10, 0));
             RunningOnMono = Type.GetType("Mono.Runtime") != null;
 
             Name = "Unknown OS";
@@ -90,5 +92,21 @@ namespace xClient.Core.Helper
         ///   <c>true</c> if the Operating System is Windows 8 or higher; otherwise, <c>false</c>.
         /// </value>
         public static bool EightOrHigher { get; private set; }
+
+        /// <summary>
+        /// Returns a value indicating whether the Operating System is Windows 8.1 or higher.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the Operating System is Windows 8.1 or higher; otherwise, <c>false</c>.
+        /// </value>
+        public static bool EightPointOneOrHigher { get; private set; }
+
+        /// <summary>
+        /// Returns a value indicating whether the Operating System is Windows 10 or higher.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the Operating System is Windows 10 or higher; otherwise, <c>false</c>.
+        /// </value>
+        public static bool TenOrHigher { get; private set; }
     }
 }
diff --git a/Server/Core/Helper/PlatformHelper.cs b/Server/Core/Helper/PlatformHelper.cs
index c53c33c9..de02e428 100644
--- a/Server/Core/Helper/PlatformHelper.cs
+++ b/Server/Core/Helper/PlatformHelper.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Management;
+using System.Text.RegularExpressions;
 
-namespace xServer.Core.Helper
+namespace xClient.Core.Helper
 {
     public static class PlatformHelper
     {
@@ -14,9 +16,16 @@ namespace xServer.Core.Helper
             VistaOrHigher = Win32NT && Environment.OSVersion.Version.Major >= 6;
             SevenOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(6, 1));
             EightOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(6, 2, 9200));
+            EightPointOneOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(6, 3));
+            TenOrHigher = Win32NT && (Environment.OSVersion.Version >= new Version(10, 0));
             RunningOnMono = Type.GetType("Mono.Runtime") != null;
         }
 
+        /// <summary>
+        /// Gets the name of the operating system running on this computer (including the edition).
+        /// </summary>
+        public static string Name { get; private set; }
+
         /// <summary>
         /// Determines if the current application is 32 or 64-bit.
         /// </summary>
@@ -69,5 +78,21 @@ namespace xServer.Core.Helper
         ///   <c>true</c> if the Operating System is Windows 8 or higher; otherwise, <c>false</c>.
         /// </value>
         public static bool EightOrHigher { get; private set; }
+
+        /// <summary>
+        /// Returns a value indicating whether the Operating System is Windows 8.1 or higher.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the Operating System is Windows 8.1 or higher; otherwise, <c>false</c>.
+        /// </value>
+        public static bool EightPointOneOrHigher { get; private set; }
+
+        /// <summary>
+        /// Returns a value indicating whether the Operating System is Windows 10 or higher.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the Operating System is Windows 10 or higher; otherwise, <c>false</c>.
+        /// </value>
+        public static bool TenOrHigher { get; private set; }
     }
 }
diff --git a/Server/Server.csproj b/Server/Server.csproj
index 99e5be1d..00ec7bf4 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -40,12 +40,13 @@
   <PropertyGroup>
     <StartupObject>xServer.Program</StartupObject>
   </PropertyGroup>
-  <PropertyGroup>
-    <NoWin32Manifest>true</NoWin32Manifest>
-  </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <ApplicationIcon>xRAT-64x64.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -436,6 +437,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <Compile Include="Core\Extensions\SocketExtensions.cs" />
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

From 8fe29af29e305e969e3989bb941c670c805ccd07 Mon Sep 17 00:00:00 2001
From: rotthh <rotthh@dispostable.com>
Date: Mon, 17 Aug 2015 21:06:07 +0200
Subject: [PATCH 2/6] Windows 8.1 and 10 support

---
 Client/app.manifest | 61 +++++++++++++++++++++++++++++++++++++++++++++
 Server/app.manifest | 61 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 Client/app.manifest
 create mode 100644 Server/app.manifest

diff --git a/Client/app.manifest b/Client/app.manifest
new file mode 100644
index 00000000..3df6215b
--- /dev/null
+++ b/Client/app.manifest
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. 
+      Windows will automatically select the most compatible environment.-->
+
+      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
+
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+
+      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
+
+      <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+
+      <!-- If your application is designed to work with Windows 10, uncomment the following supportedOS node-->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+
+    </application>
+  </compatibility>
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+
+</asmv1:assembly>
diff --git a/Server/app.manifest b/Server/app.manifest
new file mode 100644
index 00000000..3df6215b
--- /dev/null
+++ b/Server/app.manifest
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. 
+      Windows will automatically select the most compatible environment.-->
+
+      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
+
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+
+      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
+
+      <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+
+      <!-- If your application is designed to work with Windows 10, uncomment the following supportedOS node-->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+
+    </application>
+  </compatibility>
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+
+</asmv1:assembly>

From ffe728ff10fe2246413293b5cca1ac85c77c3627 Mon Sep 17 00:00:00 2001
From: rotthh <rotthh@dispostable.com>
Date: Mon, 17 Aug 2015 21:12:41 +0200
Subject: [PATCH 3/6] Windows 8.1 and 10 support

---
 Server/Core/Helper/PlatformHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Server/Core/Helper/PlatformHelper.cs b/Server/Core/Helper/PlatformHelper.cs
index de02e428..2cab0972 100644
--- a/Server/Core/Helper/PlatformHelper.cs
+++ b/Server/Core/Helper/PlatformHelper.cs
@@ -2,7 +2,7 @@
 using System.Management;
 using System.Text.RegularExpressions;
 
-namespace xClient.Core.Helper
+namespace xServer.Core.Helper
 {
     public static class PlatformHelper
     {

From 05e032338b30fb485ad058391b1e9d57e4fc820c Mon Sep 17 00:00:00 2001
From: rotthh <rotthh@dispostable.com>
Date: Mon, 17 Aug 2015 21:14:19 +0200
Subject: [PATCH 4/6] Windows 8.1 and 10 support

---
 Server/Core/Helper/PlatformHelper.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Server/Core/Helper/PlatformHelper.cs b/Server/Core/Helper/PlatformHelper.cs
index 2cab0972..49cdf293 100644
--- a/Server/Core/Helper/PlatformHelper.cs
+++ b/Server/Core/Helper/PlatformHelper.cs
@@ -21,11 +21,6 @@ namespace xServer.Core.Helper
             RunningOnMono = Type.GetType("Mono.Runtime") != null;
         }
 
-        /// <summary>
-        /// Gets the name of the operating system running on this computer (including the edition).
-        /// </summary>
-        public static string Name { get; private set; }
-
         /// <summary>
         /// Determines if the current application is 32 or 64-bit.
         /// </summary>

From 1509765960921c0106838db0f39c173e25442b8b Mon Sep 17 00:00:00 2001
From: MaxXor <admin@maxxor.org>
Date: Tue, 18 Aug 2015 07:19:42 +0200
Subject: [PATCH 5/6] Improved manifest files

---
 Client/app.manifest | 50 ++++++++-------------------------------------
 Server/app.manifest | 50 ++++++++-------------------------------------
 2 files changed, 18 insertions(+), 82 deletions(-)

diff --git a/Client/app.manifest b/Client/app.manifest
index 3df6215b..cebc371f 100644
--- a/Client/app.manifest
+++ b/Client/app.manifest
@@ -4,18 +4,6 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel node will disable file and registry virtualization.
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
     </security>
@@ -23,39 +11,19 @@
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- A list of all Windows versions that this application is designed to work with. 
-      Windows will automatically select the most compatible environment.-->
+      <!-- A list of all Windows versions that this application is designed to work with. -->
+      <!-- Windows XP ignores this section. -->
 
-      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
-
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-
-      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
-
-      <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-
-      <!-- If your application is designed to work with Windows 10, uncomment the following supportedOS node-->
+      <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-
     </application>
   </compatibility>
-
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!-- <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>-->
-
 </asmv1:assembly>
diff --git a/Server/app.manifest b/Server/app.manifest
index 3df6215b..cebc371f 100644
--- a/Server/app.manifest
+++ b/Server/app.manifest
@@ -4,18 +4,6 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel node will disable file and registry virtualization.
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
     </security>
@@ -23,39 +11,19 @@
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- A list of all Windows versions that this application is designed to work with. 
-      Windows will automatically select the most compatible environment.-->
+      <!-- A list of all Windows versions that this application is designed to work with. -->
+      <!-- Windows XP ignores this section. -->
 
-      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
-
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-
-      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
-
-      <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-
-      <!-- If your application is designed to work with Windows 10, uncomment the following supportedOS node-->
+      <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-
     </application>
   </compatibility>
-
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!-- <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>-->
-
 </asmv1:assembly>

From 92a366ca19b6a4941eeac6905b217b3d32014459 Mon Sep 17 00:00:00 2001
From: MaxXor <admin@maxxor.org>
Date: Tue, 18 Aug 2015 07:20:38 +0200
Subject: [PATCH 6/6] Small fix

---
 Server/Core/Helper/PlatformHelper.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Server/Core/Helper/PlatformHelper.cs b/Server/Core/Helper/PlatformHelper.cs
index 49cdf293..acc31df6 100644
--- a/Server/Core/Helper/PlatformHelper.cs
+++ b/Server/Core/Helper/PlatformHelper.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Management;
-using System.Text.RegularExpressions;
 
 namespace xServer.Core.Helper
 {