Identify Windows 10 in the startup window/log. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4891 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-01-11 04:52:45 +00:00
parent c591711fe8
commit 16b9b19e53
5 changed files with 33 additions and 31 deletions

View file

@ -54,41 +54,35 @@ static void win_printversion(void)
switch (osv.dwPlatformId) switch (osv.dwPlatformId)
{ {
case VER_PLATFORM_WIN32_NT: case VER_PLATFORM_WIN32_NT:
if (osv.dwMajorVersion == 5) switch (osv.dwMajorVersion)
{
switch (osv.dwMinorVersion)
{ {
case 1: case 5:
ver = "XP"; switch (osv.dwMinorVersion)
break; {
case 2: case 1: ver = "XP"; break;
ver = osv.wProductType == VER_NT_WORKSTATION ? "XP x64" : "Server 2003"; case 2: ver = osv.wProductType == VER_NT_WORKSTATION ? "XP x64" : "Server 2003"; break;
break; }
} break;
break;
}
if (osv.dwMajorVersion == 6) case 6:
{ switch (osv.dwMinorVersion)
switch (osv.dwMinorVersion) {
{ case 0: ver = osv.wProductType == VER_NT_WORKSTATION ? "Vista" : "Server 2008"; break;
case 0: case 1: ver = osv.wProductType == VER_NT_WORKSTATION ? "7" : "Server 2008 R2"; break;
ver = osv.wProductType == VER_NT_WORKSTATION ? "Vista" : "Server 2008"; case 2: ver = osv.wProductType == VER_NT_WORKSTATION ? "8" : "Server 2012"; break;
break; case 3: ver = osv.wProductType == VER_NT_WORKSTATION ? "8.1" : "Server 2012 R2"; break;
case 1: }
ver = osv.wProductType == VER_NT_WORKSTATION ? "7" : "Server 2008 R2"; break;
break;
case 2: case 10:
ver = osv.wProductType == VER_NT_WORKSTATION ? "8" : "Server 2012"; switch (osv.dwMinorVersion)
break; {
case 3: case 0: ver = osv.wProductType == VER_NT_WORKSTATION ? "10" : "Server 10"; break;
ver = osv.wProductType == VER_NT_WORKSTATION ? "8.1" : "Server 2012 R2"; }
break; break;
} }
break; break;
}
break;
} }
initprintf("Windows %s", ver); initprintf("Windows %s", ver);

View file

@ -34,6 +34,8 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 --> <!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application> </application>
</compatibility> </compatibility>
</assembly> </assembly>

View file

@ -34,6 +34,8 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 --> <!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application> </application>
</compatibility> </compatibility>
</assembly> </assembly>

View file

@ -34,6 +34,8 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 --> <!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application> </application>
</compatibility> </compatibility>
</assembly> </assembly>

View file

@ -34,6 +34,8 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 --> <!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application> </application>
</compatibility> </compatibility>
</assembly> </assembly>