mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-06-04 08:29:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

[misc] small Windows versioning improvement

Browse source 
* Actually define a WINDOWS_11 version and use it when Windows 11 is detected.
* Also some comment cleanup.
This commit is contained in:
Pete Batard 2021-09-28 15:39:51 +01:00
parent d203c91403
commit aba6c7d996
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
5 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/stdfn.c
View file

@ -310,7 +310,9 @@ static const char* GetEdition(DWORD ProductType)
}
}
// From smartmontools os_win32.cpp
/*
* Modified from smartmontools' os_win32.cpp
*/
void GetWindowsVersion(void)
{
OSVERSIONINFOEXA vi, vi2;
@ -371,27 +373,32 @@ void GetWindowsVersion(void)
ws = (vi.wProductType <= VER_NT_WORKSTATION);
nWindowsVersion = vi.dwMajorVersion << 4 | vi.dwMinorVersion;
switch (nWindowsVersion) {
case 0x51: w = "XP";
case WINDOWS_XP: w = "XP";
break;
case 0x52: w = (!GetSystemMetrics(89)?"Server 2003":"Server 2003_R2");
case WINDOWS_2003: w = (ws ? "XP_64" : (!GetSystemMetrics(89) ? "Server 2003" : "Server 2003_R2"));
break;
case 0x60: w = (ws?"Vista":"Server 2008");
case WINDOWS_VISTA: w = (ws ? "Vista" : "Server 2008");
break;
case 0x61: w = (ws?"7":"Server 2008_R2");
case WINDOWS_7: w = (ws ? "7" : "Server 2008_R2");
break;
case 0x62: w = (ws?"8":"Server 2012");
case WINDOWS_8: w = (ws ? "8" : "Server 2012");
break;
case 0x63: w = (ws?"8.1":"Server 2012_R2");
case WINDOWS_8_1: w = (ws ? "8.1" : "Server 2012_R2");
break;
case 0x64: w = (ws?"10 (Preview 1)":"Server 10 (Preview 1)");
case WINDOWS_10_PREVIEW1: w = (ws ? "10 (Preview 1)" : "Server 10 (Preview 1)");
break;
// Starting with Windows 10 Preview 2, the major is the same as the public-facing version
case 0xA0: w = (ws?((vi.dwBuildNumber<20000)?"10":"11"):((vi.dwBuildNumber<17763)?"Server 2016":"Server 2019"));
break;
case 0xB0: w = (ws?"11":"Server 2022");
case WINDOWS_10:
if (vi.dwBuildNumber < 20000) {
w = (ws ? "10" : ((vi.dwBuildNumber < 17763) ? "Server 2016" : "Server 2019"));
break;
}
nWindowsVersion = WINDOWS_11;
// Fall through
case WINDOWS_11: w = (ws ? "11" : "Server 2022");
break;
default:
if (nWindowsVersion < 0x51)
if (nWindowsVersion < WINDOWS_XP)
nWindowsVersion = WINDOWS_UNSUPPORTED;
else
w = "12 or later";