Windows 8.1 support (also properly target Windows versions greater than Vista)

This commit is contained in:
Barry Harris 2014-01-11 11:01:07 +00:00
parent 2c861d8e99
commit 8fc9ef2b03
2 changed files with 30 additions and 2 deletions

View File

@ -12,4 +12,26 @@
/>
</dependentAssembly>
</dependency>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel
level="asInvoker"
uiAccess="false"
/>
</requestedPrivileges>
</security>
</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 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
</application>
</compatibility>
</assembly>

View File

@ -156,7 +156,7 @@ int PrintOSInfo()
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx((OSVERSIONINFO*)&osvi);
}
AddText(_T("OS: "));
{
if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
@ -170,7 +170,7 @@ int PrintOSInfo()
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) {
AddText(_T("Microsoft Windows 2003 "));
}
if (osvi.dwMajorVersion < 5 || osvi.dwMinorVersion > 2) {
if (osvi.dwMajorVersion < 5 || osvi.dwMinorVersion > 3) {
AddText(_T("Microsoft Windows NT %d.%d "), osvi.dwMajorVersion, osvi.dwMinorVersion);
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 && osvi.wProductType == VER_NT_WORKSTATION) {
@ -191,6 +191,12 @@ int PrintOSInfo()
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 "));
}
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3 && osvi.wProductType == VER_NT_WORKSTATION) {
AddText(_T("Microsoft Windows 8.1 "));
}
if (osvi.dwMajorVersion == 5) {
if (osvi.wProductType == VER_NT_WORKSTATION) {