mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 09:54:42 +00:00
Bug 1325368 - Assume Win7 or later when testing Windows version. r=jimm
MozReview-Commit-ID: 718G0htR17H --HG-- extra : rebase_source : e6f7a3584f03c802218a1de526345e1df1e67cf8
This commit is contained in:
parent
c8d27a5a4f
commit
a35278e9a7
@ -29,7 +29,6 @@
|
||||
|
||||
#include "mozilla/MemoryReporting.h"
|
||||
#include "mozilla/Telemetry.h"
|
||||
#include "mozilla/WindowsVersion.h"
|
||||
|
||||
#include <usp10.h>
|
||||
|
||||
|
@ -84,81 +84,6 @@ IsWindowsBuildOrLater(uint32_t aBuild)
|
||||
return false;
|
||||
}
|
||||
|
||||
#if defined(_M_X64) || defined(_M_AMD64)
|
||||
// We support only Win7 or later on Win64.
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsXPSP3OrLater()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin2003OrLater()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin2003SP2OrLater()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsVistaOrLater()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsVistaSP1OrLater()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin7OrLater()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsXPSP3OrLater()
|
||||
{
|
||||
return IsWindowsVersionOrLater(0x05010300ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin2003OrLater()
|
||||
{
|
||||
return IsWindowsVersionOrLater(0x05020000ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin2003SP2OrLater()
|
||||
{
|
||||
return IsWindowsVersionOrLater(0x05020200ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsVistaOrLater()
|
||||
{
|
||||
return IsWindowsVersionOrLater(0x06000000ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsVistaSP1OrLater()
|
||||
{
|
||||
return IsWindowsVersionOrLater(0x06000100ul);
|
||||
}
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin7OrLater()
|
||||
{
|
||||
return IsWindowsVersionOrLater(0x06010000ul);
|
||||
}
|
||||
#endif
|
||||
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsWin7SP1OrLater()
|
||||
{
|
||||
@ -186,8 +111,7 @@ IsWin10OrLater()
|
||||
MOZ_ALWAYS_INLINE bool
|
||||
IsNotWin7PreRTM()
|
||||
{
|
||||
return IsWin7SP1OrLater() || !IsWin7OrLater() ||
|
||||
IsWindowsBuildOrLater(7600);
|
||||
return IsWin7SP1OrLater() || IsWindowsBuildOrLater(7600);
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
@ -418,10 +418,7 @@ public:
|
||||
* Operating system versions.
|
||||
*/
|
||||
enum OperatingSystemVersion {
|
||||
// XXX: The XP and Vista values can now be removed (see bug 1330146).
|
||||
eOperatingSystemVersion_WindowsXP = 0,
|
||||
eOperatingSystemVersion_WindowsVista,
|
||||
eOperatingSystemVersion_Windows7,
|
||||
eOperatingSystemVersion_Windows7 = 2,
|
||||
eOperatingSystemVersion_Windows8,
|
||||
eOperatingSystemVersion_Windows10,
|
||||
eOperatingSystemVersion_Unknown
|
||||
|
@ -10,7 +10,6 @@
|
||||
#include "mozilla/MouseEvents.h"
|
||||
#include "mozilla/MiscEvents.h"
|
||||
#include "mozilla/TextEvents.h"
|
||||
#include "mozilla/WindowsVersion.h"
|
||||
|
||||
#include "nsAlgorithm.h"
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
|
@ -45,10 +45,6 @@
|
||||
#define MOZ_WM_DEADCHAR (WM_APP+0x031E)
|
||||
#define MOZ_WM_SYSDEADCHAR (WM_APP+0x031F)
|
||||
|
||||
// Internal message for ensuring the file picker is visible on multi monitor
|
||||
// systems, and when the screen resolution changes.
|
||||
#define MOZ_WM_ENSUREVISIBLE (WM_APP+0x374F)
|
||||
|
||||
// XXX Should rename them to MOZ_WM_* and use safer values!
|
||||
// Messages for fullscreen transition window
|
||||
#define WM_FULLSCREEN_TRANSITION_BEFORE (WM_USER + 0)
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "mozilla/MiscEvents.h"
|
||||
#include "mozilla/MouseEvents.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "mozilla/WindowsVersion.h"
|
||||
|
||||
#include <psapi.h>
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "nsPIDOMWindow.h"
|
||||
#include "nsAppDirectoryServiceDefs.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "mozilla/WindowsVersion.h"
|
||||
#include <io.h>
|
||||
#include <propvarutil.h>
|
||||
#include <propkey.h>
|
||||
|
@ -38,7 +38,6 @@
|
||||
|
||||
#include "WinUtils.h"
|
||||
#include "mozilla/LazyIdleThread.h"
|
||||
#include "mozilla/WindowsVersion.h"
|
||||
#include <algorithm>
|
||||
|
||||
|
||||
|
@ -37,8 +37,6 @@ using namespace mozilla::widget;
|
||||
char16_t *nsFilePicker::mLastUsedUnicodeDirectory;
|
||||
char nsFilePicker::mLastUsedDirectory[MAX_PATH+1] = { 0 };
|
||||
|
||||
static const wchar_t kDialogPtrProp[] = L"DialogPtrProperty";
|
||||
static const DWORD kDialogTimerID = 9999;
|
||||
static const unsigned long kDialogTimerTimeout = 300;
|
||||
|
||||
#define MAX_EXTENSION_LENGTH 10
|
||||
|
Loading…
Reference in New Issue
Block a user