mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 970483 - Part 1: Introduce IsWindowsBuildOrLater() and IsWin7RTMOrLater(). r=bbondy
This commit is contained in:
parent
99e7712add
commit
7638c93a95
@ -11,10 +11,10 @@
|
||||
namespace mozilla
|
||||
{
|
||||
inline bool
|
||||
IsWindowsVersionOrLater(uint64_t aVersion)
|
||||
IsWindowsVersionOrLater(uint32_t aVersion)
|
||||
{
|
||||
static uint64_t minVersion = 0;
|
||||
static uint64_t maxVersion = UINT64_MAX;
|
||||
static uint32_t minVersion = 0;
|
||||
static uint32_t maxVersion = UINT32_MAX;
|
||||
|
||||
if (minVersion >= aVersion) {
|
||||
return true;
|
||||
@ -27,10 +27,10 @@ namespace mozilla
|
||||
OSVERSIONINFOEX info;
|
||||
ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
|
||||
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
|
||||
info.dwMajorVersion = aVersion >> 48;
|
||||
info.dwMinorVersion = (aVersion >> 32) & 0xFFFF;
|
||||
info.wServicePackMajor = (aVersion >> 16) & 0xFFFF;
|
||||
info.wServicePackMinor = aVersion & 0xFFFF;
|
||||
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);
|
||||
@ -50,37 +50,75 @@ namespace mozilla
|
||||
return false;
|
||||
}
|
||||
|
||||
inline bool
|
||||
IsWindowsBuildOrLater(uint32_t aBuild)
|
||||
{
|
||||
static uint32_t minBuild = 0;
|
||||
static uint32_t maxBuild = UINT32_MAX;
|
||||
|
||||
if (minBuild >= aBuild) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (aBuild >= maxBuild) {
|
||||
return false;
|
||||
}
|
||||
|
||||
OSVERSIONINFOEX info;
|
||||
ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
|
||||
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
|
||||
info.dwBuildNumber = aBuild;
|
||||
|
||||
DWORDLONG conditionMask = 0;
|
||||
VER_SET_CONDITION(conditionMask, VER_BUILDNUMBER, VER_GREATER_EQUAL);
|
||||
|
||||
if (VerifyVersionInfo(&info, VER_BUILDNUMBER, conditionMask)) {
|
||||
minBuild = aBuild;
|
||||
return true;
|
||||
}
|
||||
|
||||
maxBuild = aBuild;
|
||||
return false;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsXPSP3OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0005000100030000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x05010300ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin2003OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0005000200000000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x05020000ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin2003SP2OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0005000200020000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x05020200ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsVistaOrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0006000000000000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x06000000ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsVistaSP1OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0006000000010000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x06000100ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin7OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0006000100000000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x06010000ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin7SP1OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0006000100010000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x06010100ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin8OrLater()
|
||||
{ return IsWindowsVersionOrLater(0x0006000200000000ull); }
|
||||
{ return IsWindowsVersionOrLater(0x06020000ul); }
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin7RTMOrLater()
|
||||
{
|
||||
return IsWin7SP1OrLater() ||
|
||||
(IsWin7OrLater() && IsWindowsBuildOrLater(7600));
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* mozilla_WindowsVersion_h */
|
||||
|
Loading…
Reference in New Issue
Block a user