vcl/inc/driverblocklist.hxx | 5 +----
vcl/qa/cppunit/blocklistparsertest.cxx | 14 ++++----------
vcl/qa/cppunit/test_blocklist_parse.xml | 16 ++++++++--------
vcl/qa/cppunit/test_blocklist_vulkan.xml | 2 +-
vcl/source/helper/driverblocklist.cxx | 12 ------------
5 files changed, 14 insertions(+), 35 deletions(-)
New commits:
commit 599dc2a504fde53a39599a39b1cc895edf06b300
Author: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Sun Dec 8 13:34:44 2024 +0200
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Sun Dec 8 14:58:47 2024 +0100
Remove Windows 7, 8 and 8.1 from driver blocklist code
Change-Id: If3138b9b603c21a9cc6fedc08a7db144fb9f00ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178077
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/vcl/inc/driverblocklist.hxx b/vcl/inc/driverblocklist.hxx
index f3fc81c6642d..4b3bc9cd502e 100644
--- a/vcl/inc/driverblocklist.hxx
+++ b/vcl/inc/driverblocklist.hxx
@@ -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,
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx
b/vcl/qa/cppunit/blocklistparsertest.cxx
index 1cef4dfbfbc7..d0592f33c975 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -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));
}
diff --git a/vcl/qa/cppunit/test_blocklist_parse.xml
b/vcl/qa/cppunit/test_blocklist_parse.xml
index 9a0f6acc574f..9f0fc496ef4c 100644
--- a/vcl/qa/cppunit/test_blocklist_parse.xml
+++ b/vcl/qa/cppunit/test_blocklist_parse.xml
@@ -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">
diff --git a/vcl/qa/cppunit/test_blocklist_vulkan.xml
b/vcl/qa/cppunit/test_blocklist_vulkan.xml
index 9542ee5f22a5..4503bfcfb28e 100644
--- a/vcl/qa/cppunit/test_blocklist_vulkan.xml
+++ b/vcl/qa/cppunit/test_blocklist_vulkan.xml
@@ -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
diff --git a/vcl/source/helper/driverblocklist.cxx
b/vcl/source/helper/driverblocklist.cxx
index bb87927c8763..03e3bc52e2af 100644
--- a/vcl/source/helper/driverblocklist.cxx
+++ b/vcl/source/helper/driverblocklist.cxx
@@ -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:
