Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: app_x64.manifest
- ===================================================================
- --- app_x64.manifest (revision 2566)
- +++ app_x64.manifest (working copy)
- @@ -21,8 +21,6 @@
- </trustInfo>
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- - <!-- Windows 8.1 -->
- - <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- <!-- Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!-- Windows 7 -->
- @@ -29,6 +27,10 @@
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- <!-- Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
- + <!-- Windows 8.1 -->
- + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- + <!-- Windows 10 -->
- + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
- </application>
- </compatibility>
- </asmv1:assembly>
- Index: app_x86.manifest
- ===================================================================
- --- app_x86.manifest (revision 2566)
- +++ app_x86.manifest (working copy)
- @@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
- -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
- <assemblyIdentity processorArchitecture="x86" type="win32" name="MeGUI" version="0.3.0.1008" />
- <description>MeGUI</description>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- @@ -26,8 +26,6 @@
- </trustInfo>
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- - <!-- Windows 8.1 -->
- - <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- <!-- Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!-- Windows 7 -->
- @@ -34,6 +32,10 @@
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- <!-- Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
- + <!-- Windows 8.1 -->
- + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- + <!-- Windows 10 -->
- + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
- </application>
- </compatibility>
- <dependency>
- @@ -41,4 +43,9 @@
- <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="x86" />
- </dependentAssembly>
- </dependency>
- + <asmv3:application>
- + <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
- + <dpiAware>true</dpiAware>
- + </asmv3:windowsSettings>
- + </asmv3:application>
- </assembly>
- Index: core/util/OSInfo.cs
- ===================================================================
- --- core/util/OSInfo.cs (revision 2566)
- +++ core/util/OSInfo.cs (working copy)
- @@ -86,6 +86,10 @@
- private const int PRODUCT_CORE = 0x00000065;
- private const int PRODUCT_CORE_N = 0x00000062;
- private const int PRODUCT_CORE_COUNTRYSPECIFIC = 0x00000063;
- + private const int PRODUCT_MOBILE_CORE = 0x00000068;
- + private const int PRODUCT_MOBILE_ENTERPRISE = 0x00000085;
- + private const int PRODUCT_EDUCATION = 0x00000079;
- + private const int PRODUCT_EDUCATION_N = 0x0000007A;
- #endregion
- #region Public Methods
- @@ -163,9 +167,10 @@
- case 10:
- {
- if (osInfo.Version.Revision.ToString() == "2222A")
- - osName = "Windows 98 Second Edition";
- + osName = "Windows 98 Second Edition";
- else osName = "Windows 98";
- - } break;
- + }
- + break;
- case 90: osName = "Windows Me"; break;
- }
- break;
- @@ -191,17 +196,17 @@
- case 0: // win2K
- {
- if ((osVersionInfo.wSuiteMask & VER_SUITE_DATACENTER) == VER_SUITE_DATACENTER)
- - osName = "Windows 2000 Datacenter Server";
- + osName = "Windows 2000 Datacenter Server";
- else if ((osVersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE) == VER_SUITE_ENTERPRISE)
- - osName = "Windows 2000 Advanced Server";
- + osName = "Windows 2000 Advanced Server";
- else
- - osName = "Windows 2000";
- + osName = "Windows 2000";
- break;
- - }
- + }
- case 1: // winXP
- {
- if ((osVersionInfo.wSuiteMask & VER_SUITE_PERSONAL) == VER_SUITE_PERSONAL)
- - osName = "Windows XP Home Edition";
- + osName = "Windows XP Home Edition";
- else osName = "Windows XP Professional";
- x64Detection = true;
- break;
- @@ -209,16 +214,17 @@
- case 2: // winserver 2003
- {
- if ((osVersionInfo.wSuiteMask & VER_SUITE_DATACENTER) == VER_SUITE_DATACENTER)
- - osName = "Windows Server 2003 DataCenter Edition";
- + osName = "Windows Server 2003 DataCenter Edition";
- else if ((osVersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE) == VER_SUITE_ENTERPRISE)
- - osName = "Windows Server 2003 Enterprise Edition";
- + osName = "Windows Server 2003 Enterprise Edition";
- else if ((osVersionInfo.wSuiteMask & VER_SUITE_BLADE) == VER_SUITE_BLADE)
- - osName = "Windows Server 2003 Web Edition";
- + osName = "Windows Server 2003 Web Edition";
- else osName = "Windows Server 2003 Standard Edition";
- x64Detection = true;
- break;
- }
- - } break;
- + }
- + break;
- }
- case 6:
- {
- @@ -240,17 +246,18 @@
- {
- switch (edition)
- {
- - case PRODUCT_ULTIMATE: osName = "Windows Vista Ultimate Edition"; break;
- + case PRODUCT_ULTIMATE: osName = "Windows Vista Ultimate Edition"; break;
- case PRODUCT_HOME_BASIC:
- case PRODUCT_HOME_BASIC_N: osName = "Windows Vista Home Basic Edition"; break;
- - case PRODUCT_HOME_PREMIUM: osName = "Windows Vista Premium Edition"; break;
- - case PRODUCT_ENTERPRISE: osName = "Windows Vista Enterprise Edition"; break;
- + case PRODUCT_HOME_PREMIUM: osName = "Windows Vista Premium Edition"; break;
- + case PRODUCT_ENTERPRISE: osName = "Windows Vista Enterprise Edition"; break;
- case PRODUCT_BUSINESS:
- - case PRODUCT_BUSINESS_N: osName = "Windows Vista Business Edition"; break;
- - case PRODUCT_STARTER: osName = "Windows Vista Starter Edition"; break;
- - default: osName = "Windows Vista"; break;
- + case PRODUCT_BUSINESS_N: osName = "Windows Vista Business Edition"; break;
- + case PRODUCT_STARTER: osName = "Windows Vista Starter Edition"; break;
- + default: osName = "Windows Vista"; break;
- }
- - } break;
- + }
- + break;
- }
- case 3: // Server 2008
- {
- @@ -262,7 +269,8 @@
- osName = "Windows Server 2008";
- break;
- }
- - } break;
- + }
- + break;
- }
- case 1: // Se7en
- {
- @@ -285,7 +293,8 @@
- case PRODUCT_STARTER: osName = "Windows 7 Starter Edition"; break;
- default: osName = "Windows 7"; break;
- }
- - } break;
- + }
- + break;
- }
- case 2: // Windows 8
- {
- @@ -301,7 +310,7 @@
- case PRODUCT_CORE:
- case PRODUCT_CORE_COUNTRYSPECIFIC:
- case PRODUCT_CORE_N: osName = "Windows 8 Standard Edition"; break;
- - case PRODUCT_ENTERPRISE:
- + case PRODUCT_ENTERPRISE:
- case PRODUCT_ENTERPRISE_N: osName = "Windows 8 Entreprise Edition"; break;
- case PRODUCT_PROFESSIONAL:
- case PRODUCT_PROFESSIONAL_N: osName = "Windows 8 Professional Edition"; break;
- @@ -308,7 +317,8 @@
- case PRODUCT_PROFESSIONAL_WMC: osName = "Windows 8 Professional with Media Center Edition"; break;
- default: osName = "Windows 8"; break;
- }
- - } break;
- + }
- + break;
- }
- case 3: // Windows 8.1
- {
- @@ -331,13 +341,57 @@
- case PRODUCT_PROFESSIONAL_WMC: osName = "Windows 8.1 Professional with Media Center Edition"; break;
- default: osName = "Windows 8.1"; break;
- }
- - } break;
- + }
- + break;
- }
- }
- break;
- }
- - } break;
- + case 10:
- + {
- + x64Detection = true;
- + switch (osInfo.Version.Minor)
- + {
- + case 0:
- + {
- + switch (osVersionInfo.wProductType)
- + {
- + case 1: // X
- + {
- + uint edition = PRODUCT_UNDEFINED;
- + if (GetProductInfo(osVersionInfo.dwMajorVersion,
- + osVersionInfo.dwMinorVersion,
- + osVersionInfo.wServicePackMajor,
- + osVersionInfo.wServicePackMinor,
- + out edition))
- + {
- + switch (edition)
- + {
- + case PRODUCT_CORE:
- + case PRODUCT_CORE_COUNTRYSPECIFIC:
- + case PRODUCT_CORE_N: osName = "Windows 10 Standard Edition"; break;
- + case PRODUCT_ENTERPRISE:
- + case PRODUCT_ENTERPRISE_N: osName = "Windows 10 Entreprise Edition"; break;
- + case PRODUCT_PROFESSIONAL:
- + case PRODUCT_PROFESSIONAL_N: osName = "Windows 10 Professional Edition"; break;
- + case PRODUCT_EDUCATION:
- + case PRODUCT_EDUCATION_N: osName = "Windows 10 Education Edition"; break;
- + case PRODUCT_MOBILE_CORE:
- + case PRODUCT_MOBILE_ENTERPRISE: osName = "Windows 10 Mobile Edition"; break;
- + default: osName = "Windows 10"; break;
- + }
- + }
- + break;
- + }
- + }
- + break;
- + }
- + }
- + }
- + break;
- + }
- }
- + break;
- }
- }
- #if x64
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement