Module: wine Branch: master Commit: 977308365dcd4331e75814c736941d51071f110a URL: http://source.winehq.org/git/wine.git/?a=commit;h=977308365dcd4331e75814c736...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Sep 20 15:50:47 2011 +0200
d3dx9_36: Remove casts to the type of the casted expression.
---
dlls/d3dx9_36/mesh.c | 4 ++-- dlls/d3dx9_36/tests/math.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 760931c..796e556 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1243,7 +1243,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag return E_NOTIMPL; }
- hr = iface->lpVtbl->LockIndexBuffer(iface, 0, (void**)&indices); + hr = iface->lpVtbl->LockIndexBuffer(iface, 0, &indices); if (FAILED(hr)) goto cleanup;
dword_indices = HeapAlloc(GetProcessHeap(), 0, This->numfaces * 3 * sizeof(DWORD)); @@ -3010,7 +3010,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, } d3dxmesh->lpVtbl->UnlockVertexBuffer(d3dxmesh);
- hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, (void**)&indices); + hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, &indices); if (FAILED(hr)) goto cleanup;
index_in_ptr = mesh_data.indices; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0ca6150..c26a523 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2268,7 +2268,7 @@ static void test_D3DXFloat_Array(void) out = D3DXFloat32To16Array(&half, &single, 0); ok(out == &half, "Got %p, expected %p.\n", out, &half);
- out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&half, 0); + out = D3DXFloat16To32Array(&single, &half, 0); ok(out == &single, "Got %p, expected %p.\n", out, &single);
for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++)