Alex Henrie : ddraw/tests: Mark GetDC() failures on VMware as broken.
Alexandre Julliard
julliard at winehq.org
Tue Jan 2 13:19:02 CST 2018
Module: wine
Branch: master
Commit: 9aeb3b98f85029824befb76486a61ab2952e1e12
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aeb3b98f85029824befb76486a61ab2952e1e12
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Tue Jan 2 16:28:12 2018 +0100
ddraw/tests: Mark GetDC() failures on VMware as broken.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 2c4410a..52c5e85 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 89d0d7e..e87244b 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 fa1178d..b280628 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 fdfac69..846a83d 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);
More information about the wine-cvs
mailing list