Sven Baars : ddraw/tests: Fix some test failures on 64-bit Windows.
Alexandre Julliard
julliard at winehq.org
Fri Oct 18 14:01:16 CDT 2019
Module: wine
Branch: master
Commit: 79c5d8af2277cf05b059b25e42dacc7c995e0685
URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c5d8af2277cf05b059b25e42dacc7c995e0685
Author: Sven Baars <sven.wine at gmail.com>
Date: Sat Oct 5 11:25:21 2019 +0200
ddraw/tests: Fix some test failures on 64-bit Windows.
Signed-off-by: Sven Baars <sven.wine 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 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index a23e76e1f7..64c03c87d0 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -12998,7 +12998,7 @@ static void test_caps(void)
}
hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw, NULL);
- ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr);
+ ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
{
memset(&hal_caps, 0, sizeof(hal_caps));
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 2156bd5849..bf0cfef0b1 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -13878,7 +13878,7 @@ static void test_caps(void)
}
hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw1, NULL);
- ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr);
+ ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
{
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw);
More information about the wine-cvs
mailing list