strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Windows 7, 8 and 8.1 from driver blocklist code

Browse source 
Change-Id: If3138b9b603c21a9cc6fedc08a7db144fb9f00ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178077
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Ilmari Lauhakangas 2024-12-08 13:34:44 +02:00
parent 7dd9d6525a
commit 599dc2a504
5 changed files with 14 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vcl/inc/driverblocklist.hxx
View file

@ -58,10 +58,7 @@ enum OperatingSystem
{
DRIVER_OS_UNKNOWN = 0,
DRIVER_OS_WINDOWS_FIRST,
DRIVER_OS_WINDOWS_7 = DRIVER_OS_WINDOWS_FIRST,
DRIVER_OS_WINDOWS_8,
DRIVER_OS_WINDOWS_8_1,
DRIVER_OS_WINDOWS_10,
DRIVER_OS_WINDOWS_10 = DRIVER_OS_WINDOWS_FIRST,
DRIVER_OS_WINDOWS_LAST = DRIVER_OS_WINDOWS_10,
DRIVER_OS_WINDOWS_ALL,
DRIVER_OS_LINUX,

14
vcl/qa/cppunit/blocklistparsertest.cxx
View file

@ -108,10 +108,6 @@ void BlocklistParserTest::testEvaluate()
OUString vendorMicrosoft = GetVendorId(VendorMicrosoft);
// Check OS
CPPUNIT_ASSERT_EQUAL(false, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorNVIDIA, u"all"_ustr, DRIVER_OS_WINDOWS_7));
CPPUNIT_ASSERT_EQUAL(false, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorNVIDIA, u"all"_ustr, DRIVER_OS_WINDOWS_8));
CPPUNIT_ASSERT_EQUAL(false, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorNVIDIA, u"all"_ustr, DRIVER_OS_WINDOWS_10));
@ -126,22 +122,20 @@ void BlocklistParserTest::testEvaluate()
aDriveInfos, VersionType::OpenGL, u"10.20.30.50", vendorMicrosoft, u"all"_ustr, DRIVER_OS_OSX_10_8));
// Check Vendors
CPPUNIT_ASSERT_EQUAL(true, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorMicrosoft, u"all"_ustr, DRIVER_OS_WINDOWS_7));
CPPUNIT_ASSERT_EQUAL(true, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorMicrosoft, u"all"_ustr, DRIVER_OS_WINDOWS_10));
// Check Versions
CPPUNIT_ASSERT_EQUAL(true, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.39", vendorAMD, u"all"_ustr, DRIVER_OS_WINDOWS_7));
aDriveInfos, VersionType::OpenGL, u"10.20.30.39", vendorAMD, u"all"_ustr, DRIVER_OS_WINDOWS_10));
CPPUNIT_ASSERT_EQUAL(false, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorAMD, u"all"_ustr, DRIVER_OS_WINDOWS_7));
aDriveInfos, VersionType::OpenGL, u"10.20.30.40", vendorAMD, u"all"_ustr, DRIVER_OS_WINDOWS_10));
CPPUNIT_ASSERT_EQUAL(false, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"10.20.30.41", vendorAMD, u"all"_ustr, DRIVER_OS_WINDOWS_7));
aDriveInfos, VersionType::OpenGL, u"10.20.30.41", vendorAMD, u"all"_ustr, DRIVER_OS_WINDOWS_10));
// Check
CPPUNIT_ASSERT_EQUAL(true, FindBlocklistedDeviceInList(
aDriveInfos, VersionType::OpenGL, u"9.17.10.4229", vendorIntel, u"all"_ustr, DRIVER_OS_WINDOWS_7));
aDriveInfos, VersionType::OpenGL, u"9.17.10.4229", vendorIntel, u"all"_ustr, DRIVER_OS_WINDOWS_10));
}

16
vcl/qa/cppunit/test_blocklist_parse.xml
View file

@ -12,16 +12,16 @@
<entry os="all" vendor="all" compare="less" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="7" vendor="nvidia" compare="equal" version="10.20.30.40">
<entry os="10" vendor="nvidia" compare="equal" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="8" vendor="microsoft" compare="not_equal" version="10.20.30.40">
<entry os="10" vendor="microsoft" compare="not_equal" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="8" vendor="0xcafe" compare="not_equal" version="10.20.30.40">
<entry os="10" vendor="0xcafe" compare="not_equal" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="8_1" compare="between_exclusive" version="10.20.30.40">
<entry os="10" compare="between_exclusive" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="10" compare="between_inclusive" version="10.20.30.40">
@ -38,16 +38,16 @@
<entry os="all" vendor="all" compare="less" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="7" vendor="nvidia" compare="equal" version="10.20.30.40">
<entry os="10" vendor="nvidia" compare="equal" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="8" vendor="microsoft" compare="not_equal" version="10.20.30.40">
<entry os="10" vendor="microsoft" compare="not_equal" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="8" vendor="0xcafe" compare="not_equal" version="10.20.30.40">
<entry os="10" vendor="0xcafe" compare="not_equal" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="8_1" compare="between_exclusive" version="10.20.30.40">
<entry os="10" compare="between_exclusive" version="10.20.30.40">
<device id="all"/>
</entry>
<entry os="10" compare="between_inclusive" version="10.20.30.40">

2
vcl/qa/cppunit/test_blocklist_vulkan.xml
View file

@ -9,7 +9,7 @@
<!--
entry attributes:
os - "all", "7", "8", "8_1", "10"
os - "all", "10"
vendor - "all", "intel", "amd", "nvidia", "microsoft"
compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start"
version

12
vcl/source/helper/driverblocklist.cxx
View file

@ -28,12 +28,6 @@ static OperatingSystem getOperatingSystem(std::string_view rString)
{
if (rString == "all")
return DRIVER_OS_ALL;
else if (rString == "7")
return DRIVER_OS_WINDOWS_7;
else if (rString == "8")
return DRIVER_OS_WINDOWS_8;
else if (rString == "8_1")
return DRIVER_OS_WINDOWS_8_1;
else if (rString == "10")
return DRIVER_OS_WINDOWS_10;
else if (rString == "windows")
@ -537,12 +531,6 @@ static OperatingSystem getOperatingSystem()
// based on http://msdn.microsoft.com/en-us/library/ms724834(VS.85).aspx
switch (DriverBlocklist::GetWindowsVersion())
{
case 0x00060001:
return DRIVER_OS_WINDOWS_7;
case 0x00060002:
return DRIVER_OS_WINDOWS_8;
case 0x00060003:
return DRIVER_OS_WINDOWS_8_1;
case 0x000A0000: // Major 10 Minor 0
return DRIVER_OS_WINDOWS_10;
default: