[PATCH] ddraw/tests: Mark GetDC() failures on VMware as broken.
Henri Verbeet
hverbeet at codeweavers.com
Tue Jan 2 09:28:12 CST 2018
From: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/tests/ddraw1.c | 2 +-
dlls/ddraw/tests/ddraw2.c | 2 +-
dlls/ddraw/tests/ddraw4.c | 2 +-
dlls/ddraw/tests/ddraw7.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 2c4410af783..52c5e858f91 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -9071,7 +9071,7 @@ static void test_getdc(void)
dc = (void *)0x1234;
hr = IDirectDrawSurface_GetDC(surface, &dc);
if (test_data[i].getdc_supported)
- ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result),
+ ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result || ddraw_is_vmware(ddraw)),
"Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
else
ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 89d0d7e4be3..e87244bb143 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -10205,7 +10205,7 @@ static void test_getdc(void)
dc = (void *)0x1234;
hr = IDirectDrawSurface_GetDC(surface, &dc);
if (test_data[i].getdc_supported)
- ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result),
+ ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result || ddraw_is_vmware(ddraw)),
"Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
else
ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index fa1178d0361..b280628f567 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -11767,7 +11767,7 @@ static void test_getdc(void)
dc = (void *)0x1234;
hr = IDirectDrawSurface4_GetDC(surface, &dc);
if (test_data[i].getdc_supported)
- ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result),
+ ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result),
"Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
else
ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index fdfac696cfc..846a83de08e 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11718,7 +11718,7 @@ static void test_getdc(void)
dc = (void *)0x1234;
hr = IDirectDrawSurface7_GetDC(surface, &dc);
if (test_data[i].getdc_supported)
- ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result),
+ ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result),
"Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
else
ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);
--
2.11.0
More information about the wine-devel
mailing list