windows 10 support

This commit is contained in:
Barry Harris 2015-04-28 14:51:54 +00:00
parent 8356584546
commit f5ad44e8d0
2 changed files with 22 additions and 12 deletions

View File

@ -23,15 +23,17 @@
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<application>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
</application>
</compatibility>
</assembly>

View File

@ -161,6 +161,8 @@ int PrintOSInfo()
GetVersionEx((OSVERSIONINFO*)&osvi);
}
bprintf(PRINT_NORMAL, _T("%i, %i\n"), osvi.dwMajorVersion, osvi.dwMinorVersion);
AddText(_T("OS: "));
{
if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
@ -181,26 +183,32 @@ int PrintOSInfo()
AddText(_T("Microsoft Windows Vista "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 && osvi.wProductType != VER_NT_WORKSTATION) {
AddText(_T("Microsoft Server 2008 "));
AddText(_T("Microsoft Windows Server 2008 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 && osvi.wProductType != VER_NT_WORKSTATION) {
AddText(_T("Microsoft Server 2008 R2 "));
AddText(_T("Microsoft Windows Server 2008 R2 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 && osvi.wProductType == VER_NT_WORKSTATION) {
AddText(_T("Microsoft Windows 7 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2 && osvi.wProductType != VER_NT_WORKSTATION) {
AddText(_T("Microsoft Server 2012 "));
AddText(_T("Microsoft Windows Server 2012 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2 && osvi.wProductType == VER_NT_WORKSTATION) {
AddText(_T("Microsoft Windows 8 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3 && osvi.wProductType != VER_NT_WORKSTATION) {
AddText(_T("Microsoft Server 2012 R2 "));
AddText(_T("Microsoft Windows Server 2012 R2 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3 && osvi.wProductType == VER_NT_WORKSTATION) {
AddText(_T("Microsoft Windows 8.1 "));
}
if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.wProductType != VER_NT_WORKSTATION) {
AddText(_T("Microsoft Windows Server Technical Preview "));
}
if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.wProductType == VER_NT_WORKSTATION) {
AddText(_T("Microsoft Windows 10 Technical Preview "));
}
if (osvi.dwMajorVersion == 5) {
if (osvi.wProductType == VER_NT_WORKSTATION) {