livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15997 Windows 11 detection

meow-7.2.2
Andrey Kleshchev 2021-10-20 23:57:48 +03:00
parent eb9a3ea902
commit 1b5d151c15
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llcommon/llsys.cpp
View File

@ -140,13 +140,7 @@ LLOSInfo::LLOSInfo() :
#if LL_WINDOWS
if (IsWindowsVersionOrGreater(11, 0, 0))
{
mMajorVer = 11;
mMinorVer = 0;
mOSStringSimple = "Microsoft Windows 11 ";
}
else if (IsWindows10OrGreater())
if (IsWindows10OrGreater())
{
mMajorVer = 10;
mMinorVer = 0;
@ -279,6 +273,21 @@ LLOSInfo::LLOSInfo() :
ubr = data;
}
}
if (mBuild >= 22000)
{
// At release Windows 11 version was 10.0.22000.194
// Windows 10 version was 10.0.19043.1266
// There is no warranty that Win10 build won't increase,
// so until better solution is found or Microsoft updates
// SDK with IsWindows11OrGreater(), indicate "10/11"
//
// Current alternatives:
// Query WMI's Win32_OperatingSystem for OS string. Slow
// and likely to return 'compatibility' string.
// Check presence of dlls/libs or may be their version.
mOSStringSimple = "Microsoft Windows 10/11";
}
}
mOSString = mOSStringSimple;