ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved Windows and Visual Studio version detection

Browse Source 
This now uses the CurrentBuild key to detect the Windows version and only falls back to product name, if that fails.
This is needed because Windows 11 reports itself as Windows 10 in the product name key.
This commit is contained in:
Axel Kohlmeyer
2022-05-21 23:33:13 -04:00
parent 007588f9cb
commit 93692ce308
1 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/platform.cpp
View File

@ -186,13 +186,57 @@ std::string platform::os_info()
char value[1024];
DWORD value_length = 1024;
const char *subkey = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
const char *entry = "ProductName";
const char *entry = "CurrentBuild";
RegGetValue(HKEY_LOCAL_MACHINE, subkey, entry, RRF_RT_REG_SZ, nullptr, &value,
(LPDWORD) &value_length);
// enforce zero termination
value[1023] = '\0';
buf = value;
auto build = std::string(value);
if (build == "6002") {
buf = "Windows Vista";
} else if (build == "7601") {
buf = "Windows 7";
} else if (build == "9200") {
buf = "Windows 8";
} else if (build == "9600") {
buf = "Windows 8.1";
} else if (build == "10240") {
buf = "Windows 10 1507";
} else if (build == "10586") {
buf = "Windows 10 1511";
} else if (build == "14393") {
buf = "Windows 10 1607";
} else if (build == "15063") {
buf = "Windows 10 1703";
} else if (build == "16299") {
buf = "Windows 10 1709";
} else if (build == "17134") {
buf = "Windows 10 1803";
} else if (build == "17763") {
buf = "Windows 10 1809";
} else if (build == "18362") {
buf = "Windows 10 1903";
} else if (build == "18363") {
buf = "Windows 10 1909";
} else if (build == "19041") {
buf = "Windows 10 2004";
} else if (build == "19042") {
buf = "Windows 10 20H2";
} else if (build == "19043") {
buf = "Windows 10 21H1";
} else if (build == "19044") {
buf = "Windows 10 21H2";
} else if (build == "22000") {
buf = "Windows 11 21H2";
} else {
const char *entry = "ProductName";
RegGetValue(HKEY_LOCAL_MACHINE, subkey, entry, RRF_RT_REG_SZ, nullptr, &value,
(LPDWORD) &value_length);
// enforce zero termination
value[1023] = '\0';
buf = value;
}
DWORD fullversion, majorv, minorv, buildv = 0;
fullversion = GetVersion();
majorv = (DWORD) (LOBYTE(LOWORD(fullversion)));
@ -303,11 +347,18 @@ std::string platform::compiler_info()
__MINGW32_MINOR_VERSION, __VERSION__);
#elif defined(__GNUC__)
buf = fmt::format("GNU C++ {}", __VERSION__);
#elif defined(_MSC_VER) && (_MSC_VER > 1920) && (_MSC_VER < 2000)
#elif defined(_MSC_VER) && (_MSC_VER >= 1920) && (_MSC_VER < 1930)
constexpr int major = _MSC_VER / 100;
constexpr int minor = _MSC_VER - major * 100;
buf = "Microsoft Visual Studio 20" + std::to_string(major) + ", C/C++ " +
std::to_string(major - 5) + "." + std::to_string(minor);
constexpr int patch = minor - 20;
buf = fmt::format("Microsoft Visual Studio 2019 Version 16.{}, C/C++ {}.{}", patch, major - 5,
minor);
#elif defined(_MSC_VER) && (_MSC_VER >= 1930) && (_MSC_VER < 2000)
constexpr int major = _MSC_VER / 100;
constexpr int minor = _MSC_VER - major * 100;
constexpr int patch = minor - 30;
buf = fmt::format("Microsoft Visual Studio 2022 Version 17.{}, C/C++ {}.{}", patch, major - 5,
minor);
#else
buf = "(Unknown)";
#endif