[10/10] d3dx9/tests: Mark broken behavior of the debug version of d3d9.
Józef Kucia
joseph.kucia at gmail.com
Fri May 18 08:50:17 CDT 2012
---
dlls/d3dx9_36/tests/surface.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
index f8a29c3..15336da 100644
--- a/dlls/d3dx9_36/tests/surface.c
+++ b/dlls/d3dx9_36/tests/surface.c
@@ -565,7 +565,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
SetRect(&destrect, 0, 0, 0, 0); /* left = right, top = bottom */
hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0);
- ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ /* fails when debug version of d3d9 is used */
+ ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK);
SetRect(&destrect, 257, 257, 257, 257); /* left = right, top = bottom, but invalid values */
hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0);
@@ -996,7 +997,8 @@ next_tests:
ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
SetRect(&rect, 0, 0, 0, 0);
hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect);
- ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK);
+ /* fails when debug version of d3d9 is used */
+ ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK);
DeleteFileA("saved_surface.bmp");
DeleteFileA("saved_surface.ppm");
--
1.7.8.6
More information about the wine-patches
mailing list