зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1844908 - Remove unused Windows version check functions. r=handyman
Differential Revision: https://phabricator.services.mozilla.com/D184309
This commit is contained in:
Родитель
0ed4fc212e
Коммит
84f3eeec16
|
@ -14,73 +14,6 @@
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
inline bool IsWindowsVersionOrLater(uint32_t aVersion) {
|
||||
static Atomic<uint32_t> minVersion(0);
|
||||
static Atomic<uint32_t> maxVersion(UINT32_MAX);
|
||||
|
||||
if (minVersion >= aVersion) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (aVersion >= maxVersion) {
|
||||
return false;
|
||||
}
|
||||
|
||||
OSVERSIONINFOEXW info;
|
||||
ZeroMemory(&info, sizeof(OSVERSIONINFOEXW));
|
||||
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
|
||||
info.dwMajorVersion = aVersion >> 24;
|
||||
info.dwMinorVersion = (aVersion >> 16) & 0xFF;
|
||||
info.wServicePackMajor = (aVersion >> 8) & 0xFF;
|
||||
info.wServicePackMinor = aVersion & 0xFF;
|
||||
|
||||
DWORDLONG conditionMask = 0;
|
||||
VER_SET_CONDITION(conditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
|
||||
VER_SET_CONDITION(conditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
|
||||
VER_SET_CONDITION(conditionMask, VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
|
||||
VER_SET_CONDITION(conditionMask, VER_SERVICEPACKMINOR, VER_GREATER_EQUAL);
|
||||
|
||||
if (VerifyVersionInfoW(&info,
|
||||
VER_MAJORVERSION | VER_MINORVERSION |
|
||||
VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
|
||||
conditionMask)) {
|
||||
minVersion = aVersion;
|
||||
return true;
|
||||
}
|
||||
|
||||
maxVersion = aVersion;
|
||||
return false;
|
||||
}
|
||||
|
||||
inline bool IsWindowsBuildOrLater(uint32_t aBuild) {
|
||||
static Atomic<uint32_t> minBuild(0);
|
||||
static Atomic<uint32_t> maxBuild(UINT32_MAX);
|
||||
|
||||
if (minBuild >= aBuild) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (aBuild >= maxBuild) {
|
||||
return false;
|
||||
}
|
||||
|
||||
OSVERSIONINFOEXW info;
|
||||
ZeroMemory(&info, sizeof(OSVERSIONINFOEXW));
|
||||
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
|
||||
info.dwBuildNumber = aBuild;
|
||||
|
||||
DWORDLONG conditionMask = 0;
|
||||
VER_SET_CONDITION(conditionMask, VER_BUILDNUMBER, VER_GREATER_EQUAL);
|
||||
|
||||
if (VerifyVersionInfoW(&info, VER_BUILDNUMBER, conditionMask)) {
|
||||
minBuild = aBuild;
|
||||
return true;
|
||||
}
|
||||
|
||||
maxBuild = aBuild;
|
||||
return false;
|
||||
}
|
||||
|
||||
inline bool IsWindows10BuildOrLater(uint32_t aBuild) {
|
||||
static Atomic<uint32_t> minBuild(0);
|
||||
static Atomic<uint32_t> maxBuild(UINT32_MAX);
|
||||
|
@ -118,26 +51,6 @@ inline bool IsWindows10BuildOrLater(uint32_t aBuild) {
|
|||
return false;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin7SP1OrLater() {
|
||||
return IsWindowsVersionOrLater(0x06010100ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin8OrLater() {
|
||||
return IsWindowsVersionOrLater(0x06020000ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin8Point1OrLater() {
|
||||
return IsWindowsVersionOrLater(0x06030000ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin10OrLater() {
|
||||
return IsWindowsVersionOrLater(0x0a000000ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin10November2015UpdateOrLater() {
|
||||
return IsWindows10BuildOrLater(10586);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin10AnniversaryUpdateOrLater() {
|
||||
return IsWindows10BuildOrLater(14393);
|
||||
}
|
||||
|
@ -150,60 +63,14 @@ MOZ_ALWAYS_INLINE bool IsWin10FallCreatorsUpdateOrLater() {
|
|||
return IsWindows10BuildOrLater(16299);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin10April2018UpdateOrLater() {
|
||||
return IsWindows10BuildOrLater(17134);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin10Sep2018UpdateOrLater() {
|
||||
return IsWindows10BuildOrLater(17763);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin10May2019UpdateOrLater() {
|
||||
return IsWindows10BuildOrLater(18362);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsWin11OrLater() {
|
||||
return IsWindows10BuildOrLater(22000);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool IsNotWin7PreRTM() {
|
||||
return IsWin7SP1OrLater() || IsWindowsBuildOrLater(7600);
|
||||
}
|
||||
|
||||
inline bool IsWin7AndPre2000Compatible() {
|
||||
/*
|
||||
* See Bug 1279171.
|
||||
* We'd like to avoid using WMF on specific OS version when compatibility
|
||||
* mode is in effect. The purpose of this function is to check if FF runs on
|
||||
* Win7 OS with application compatibility mode being set to 95/98/ME.
|
||||
* Those compatibility mode options (95/98/ME) can only display and
|
||||
* be selected for 32-bit application.
|
||||
* If the compatibility mode is in effect, the GetVersionEx function will
|
||||
* report the OS as it identifies itself, which may not be the OS that is
|
||||
* installed.
|
||||
* Note : 1) We only target for Win7 build number greater than 7600.
|
||||
* 2) GetVersionEx may be altered or unavailable for release after
|
||||
* Win8.1. Set pragma to avoid build warning as error.
|
||||
*/
|
||||
bool isWin7 = IsNotWin7PreRTM() && !IsWin8OrLater();
|
||||
if (!isWin7) {
|
||||
return false;
|
||||
}
|
||||
|
||||
OSVERSIONINFOEXW info;
|
||||
ZeroMemory(&info, sizeof(OSVERSIONINFOEXW));
|
||||
|
||||
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4996)
|
||||
bool success = GetVersionExW((LPOSVERSIONINFOW)&info);
|
||||
#pragma warning(pop)
|
||||
if (!success) {
|
||||
return false;
|
||||
}
|
||||
return info.dwMajorVersion < 5;
|
||||
}
|
||||
|
||||
// Whether we're a Windows 11 build with "Suggested actions" feature which
|
||||
// causes hangs. See bug 1774285.
|
||||
MOZ_ALWAYS_INLINE bool NeedsWindows11SuggestedActionsWorkaround() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче