Module: wine Branch: master Commit: 77c8a1594d1e87bc9aa0b43e910429cad9cda6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c8a1594d1e87bc9aa0b43e91...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Tue Dec 4 21:45:09 2007 +0000
d3d9: Remove unneeded casts.
---
dlls/d3d9/device.c | 10 +++++----- dlls/d3d9/volume.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f4024a2..6308eb5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -205,7 +205,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC }
EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_SetCursorProperties(This->WineD3DDevice, XHotSpot, YHotSpot, (IWineD3DSurface*)pSurface->wineD3DSurface); + hr = IWineD3DDevice_SetCursorProperties(This->WineD3DDevice, XHotSpot, YHotSpot, pSurface->wineD3DSurface); LeaveCriticalSection(&d3d9_cs); return hr; } @@ -294,7 +294,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9 ifa TRACE("(%p) Relay\n", This);
EnterCriticalSection(&d3d9_cs); - rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); + rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); IWineD3DSurface_Release(retSurface); @@ -538,7 +538,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9 i TRACE("(%p) Relay\n" , This);
EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? (IWineD3DSurface*)pSurface->wineD3DSurface : NULL); + hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? pSurface->wineD3DSurface : NULL); LeaveCriticalSection(&d3d9_cs); return hr; } @@ -847,7 +847,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9 iface, }
EnterCriticalSection(&d3d9_cs); - rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); + rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); IWineD3DBaseTexture_Release(retTexture); @@ -1221,7 +1221,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9 iface, U }
EnterCriticalSection(&d3d9_cs); - rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, (IWineD3DVertexBuffer **)&retStream, OffsetInBytes, pStride); + rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, &retStream, OffsetInBytes, pStride); if (rc == D3D_OK && NULL != retStream) { IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); IWineD3DVertexBuffer_Release(retStream); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 1a6f32d..2af611d 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -205,7 +205,7 @@ HRESULT WINAPI D3D9CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT HeapFree(GetProcessHeap(), 0, object); *ppVolume = NULL; } else { - *ppVolume = (IWineD3DVolume *)object->wineD3DVolume; + *ppVolume = object->wineD3DVolume; object->container = pSuperior; object->forwardReference = pSuperior; }