[PATCH 3/3] ddraw/tests: Skip caps test if certain caps not present.

Jeff Smith whydoubt at gmail.com
Mon Dec 16 18:35:13 CST 2019


Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
 dlls/ddraw/tests/ddraw1.c | 7 +++++++
 dlls/ddraw/tests/ddraw2.c | 7 +++++++
 dlls/ddraw/tests/ddraw4.c | 7 +++++++
 dlls/ddraw/tests/ddraw7.c | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index a03d0881c5..30069738b0 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -13018,6 +13018,13 @@ static void test_caps(void)
             "Got unexpected caps %#x, expected %#x.\n",
             hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
 
+    if (hal_caps.ddsCaps.dwCaps && (~hal_caps.ddsCaps.dwCaps & caps_always))
+    {
+        skip("Failed to find sufficient hardware caps, skipping test.\n");
+        IDirectDraw_Release(ddraw);
+        return;
+    }
+
     no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE);
     if (hal_caps.ddsCaps.dwCaps)
     {
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 688cb532bd..48c00e2220 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -13850,6 +13850,13 @@ static void test_caps(void)
             "Got unexpected caps %#x, expected %#x.\n",
             hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
 
+    if (hal_caps.ddsCaps.dwCaps && (~hal_caps.ddsCaps.dwCaps & caps_always))
+    {
+        skip("Failed to find sufficient hardware caps, skipping test.\n");
+        IDirectDraw_Release(ddraw);
+        return;
+    }
+
     no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE);
     if (hal_caps.ddsCaps.dwCaps)
     {
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 96d8e2a701..3c2143e5bf 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -16502,6 +16502,13 @@ static void test_caps(void)
             "Got unexpected caps %#x, expected %#x.\n",
             hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
 
+    if (hal_caps.ddsCaps.dwCaps && (~hal_caps.ddsCaps.dwCaps & caps_always))
+    {
+        skip("Failed to find sufficient hardware caps, skipping test.\n");
+        IDirectDraw_Release(ddraw);
+        return;
+    }
+
     no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE);
     if (hal_caps.ddsCaps.dwCaps)
     {
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 8044e49a60..2ca73d2d66 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -16476,6 +16476,13 @@ static void test_caps(void)
             "Got unexpected caps %#x, expected %#x.\n",
             hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
 
+    if (hal_caps.ddsCaps.dwCaps && (~hal_caps.ddsCaps.dwCaps & caps_always))
+    {
+        skip("Failed to find sufficient hardware caps, skipping test.\n");
+        IDirectDraw_Release(ddraw);
+        return;
+    }
+
     no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE);
     if (hal_caps.ddsCaps.dwCaps)
     {
-- 
2.23.0




More information about the wine-devel mailing list