wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 970483 - Fix the logic to determine the pre-RTM Windows 7. r=bbondy

Browse Source
This commit is contained in:
Masatoshi Kimura 2014-02-12 23:49:06 +09:00
parent 993fe2763e
commit e5fc47840c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -628,7 +628,7 @@ gfxWindowsPlatform::CreatePlatformFontList()
#ifdef CAIRO_HAS_DWRITE_FONT
// bug 630201 - older pre-RTM versions of Direct2D/DirectWrite cause odd
// crashers so blacklist them altogether
if (IsWin7RTMOrLater() && GetDWriteFactory()) {
if (IsNotWin7PreRTM() && GetDWriteFactory()) {
pfl = new gfxDWriteFontList();
if (NS_SUCCEEDED(pfl->InitFontList())) {
return pfl;

6
xpcom/base/WindowsVersion.h
View File

@ -114,10 +114,10 @@ namespace mozilla
{ return IsWindowsVersionOrLater(0x06020000ul); }
MOZ_ALWAYS_INLINE bool
IsWin7RTMOrLater()
IsNotWin7PreRTM()
{
return IsWin7SP1OrLater() ||
(IsWin7OrLater() && IsWindowsBuildOrLater(7600));
return IsWin7SP1OrLater() || !IsWin7OrLater() ||
IsWindowsBuildOrLater(7600);
}
}