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 706908 - Support Windows 8 from gfxInfo and the graphics blacklist. r=bjacob

Browse Source
This commit is contained in:
Joe Drew 2012-08-31 12:42:07 -04:00
parent f64f72f056
commit 6d09b14c65
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widget/cocoa/GfxInfo.mm
View File

@ -30,6 +30,7 @@
#define MAC_OS_X_VERSION_10_5_HEX 0x00001050
#define MAC_OS_X_VERSION_10_6_HEX 0x00001060
#define MAC_OS_X_VERSION_10_7_HEX 0x00001070
#define MAC_OS_X_VERSION_10_8_HEX 0x00001080
using namespace mozilla;
using namespace mozilla::widget;
@ -52,6 +53,8 @@ OSXVersionToOperatingSystem(uint32_t aOSXVersion)
return DRIVER_OS_OS_X_10_6;
case MAC_OS_X_VERSION_10_7_HEX:
return DRIVER_OS_OS_X_10_7;
case MAC_OS_X_VERSION_10_8_HEX:
return DRIVER_OS_OS_X_10_8;
}
return DRIVER_OS_UNKNOWN;

2
widget/windows/GfxInfo.cpp
View File

@ -717,6 +717,8 @@ WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
return DRIVER_OS_WINDOWS_VISTA;
case gfxWindowsPlatform::kWindows7:
return DRIVER_OS_WINDOWS_7;
case gfxWindowsPlatform::kWindows8:
return DRIVER_OS_WINDOWS_8;
case gfxWindowsPlatform::kWindowsUnknown:
default:
return DRIVER_OS_UNKNOWN;

2
widget/xpwidgets/GfxDriverInfo.h
View File

@ -26,10 +26,12 @@ enum OperatingSystem {
DRIVER_OS_WINDOWS_SERVER_2003,
DRIVER_OS_WINDOWS_VISTA,
DRIVER_OS_WINDOWS_7,
DRIVER_OS_WINDOWS_8,
DRIVER_OS_LINUX,
DRIVER_OS_OS_X_10_5,
DRIVER_OS_OS_X_10_6,
DRIVER_OS_OS_X_10_7,
DRIVER_OS_OS_X_10_8,
DRIVER_OS_ANDROID,
DRIVER_OS_ALL
};

4
widget/xpwidgets/GfxInfoBase.cpp
View File

@ -204,6 +204,8 @@ BlacklistOSToOperatingSystem(const nsAString& os)
return DRIVER_OS_WINDOWS_VISTA;
else if (os == NS_LITERAL_STRING("WINNT 6.1"))
return DRIVER_OS_WINDOWS_7;
else if (os == NS_LITERAL_STRING("WINNT 6.2"))
return DRIVER_OS_WINDOWS_8;
else if (os == NS_LITERAL_STRING("Linux"))
return DRIVER_OS_LINUX;
else if (os == NS_LITERAL_STRING("Darwin 9"))
@ -212,6 +214,8 @@ BlacklistOSToOperatingSystem(const nsAString& os)
return DRIVER_OS_OS_X_10_6;
else if (os == NS_LITERAL_STRING("Darwin 11"))
return DRIVER_OS_OS_X_10_7;
else if (os == NS_LITERAL_STRING("Darwin 12"))
return DRIVER_OS_OS_X_10_8;
else if (os == NS_LITERAL_STRING("Android"))
return DRIVER_OS_ANDROID;
else if (os == NS_LITERAL_STRING("All"))