Module: wine Branch: master Commit: 28b9e1b947ae362825b5e3745bc67388f62d11db URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b9e1b947ae362825b5e3745b...
Author: André Hentschel nerv@dawncrow.de Date: Wed Jan 22 22:32:21 2014 +0100
d3dx9_36/tests: Avoid preprocessor checks to ensure it compiles.
---
dlls/d3dx9_36/tests/mesh.c | 7 ++++--- dlls/d3dx9_36/tests/shader.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 2eb2146..1c3748f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4070,14 +4070,15 @@ static void D3DXCreateTextTest(void) d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh);
-#if 0 +if (0) +{ /* too much detail requested, so will appear to hang */ trace("Waiting for D3DXCreateText to finish with deviation = FLT_MIN ...\n"); - hr = D3DXCreateText(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); + hr = D3DXCreateTextA(device, hdc, "wine", FLT_MIN, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); trace("D3DXCreateText finish with deviation = FLT_MIN\n"); -#endif +}
hr = D3DXCreateTextA(device, hdc, "wine", 0.001f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c0d5f00..4406cd1 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1564,11 +1564,12 @@ static void test_get_shader_samplers(void) UINT count = 2; HRESULT hr;
-#if 0 +if (0) +{ /* crashes if bytecode is NULL */ hr = D3DXGetShaderSamplers(NULL, NULL, &count); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); -#endif +}
hr = D3DXGetShaderSamplers(get_shader_samplers_blob, NULL, NULL); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK);