[1/2] d3dx9/tests: Fix a failure on 64 bits.

Matteo Bruni matteo.mystral at gmail.com
Fri Oct 8 09:32:50 CDT 2010


-------------- next part --------------
From c6b3021ad835c1e69863a8f4bb263a9eb758cafa Mon Sep 17 00:00:00 2001
From: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri, 1 Oct 2010 23:50:55 +0200
Subject: d3dx9/tests: Fix a failure on 64 bits.

---
 dlls/d3dx9_36/tests/shader.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
index 6bf0de3..e79cb0c 100644
--- a/dlls/d3dx9_36/tests/shader.c
+++ b/dlls/d3dx9_36/tests/shader.c
@@ -131,7 +131,9 @@ static void test_get_shader_constant_table_ex(void)
 
     /* With invalid CTAB data */
     hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table);
-    ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA);
+    /* Native on 64 bit doesn't check for invalid data */
+    ok(hr == D3DXERR_INVALIDDATA || (hr == D3D_OK && sizeof(DWORD) != sizeof(DWORD_PTR)),
+       "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA);
     if (constant_table) ID3DXConstantTable_Release(constant_table);
 
     hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table);
-- 
1.7.2.2


More information about the wine-patches mailing list