Module: wine Branch: master Commit: f074c0e162b8fac52238895ad54e8f9b65c79628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f074c0e162b8fac52238895ad… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 31 21:37:46 2007 +0000 ddraw: Remove unneeded casts. --- dlls/ddraw/device.c | 12 ++++++------ dlls/ddraw/viewport.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fa471ef..135d6e9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1350,8 +1350,8 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - This->Handles[(DWORD) *D3DMatHandle - 1].ptr = Matrix; - This->Handles[(DWORD) *D3DMatHandle - 1].type = DDrawHandle_Matrix; + This->Handles[*D3DMatHandle - 1].ptr = Matrix; + This->Handles[*D3DMatHandle - 1].type = DDrawHandle_Matrix; TRACE(" returning matrix handle %d\n", *D3DMatHandle); LeaveCriticalSection(&ddraw_cs); @@ -1382,7 +1382,7 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface, D3DMATRIX *D3DMatrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); - TRACE("(%p)->(%08x,%p)\n", This, (DWORD) D3DMatHandle, D3DMatrix); + TRACE("(%p)->(%08x,%p)\n", This, D3DMatHandle, D3DMatrix); if( (!D3DMatHandle) || (!D3DMatrix) ) return DDERR_INVALIDPARAMS; @@ -1451,7 +1451,7 @@ IDirect3DDeviceImpl_1_GetMatrix(IDirect3DDevice *iface, D3DMATRIX *D3DMatrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); - TRACE("(%p)->(%08x,%p)\n", This, (DWORD) D3DMatHandle, D3DMatrix); + TRACE("(%p)->(%08x,%p)\n", This, D3DMatHandle, D3DMatrix); if(!D3DMatrix) return DDERR_INVALIDPARAMS; @@ -1499,7 +1499,7 @@ IDirect3DDeviceImpl_1_DeleteMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE D3DMatHandle) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice, iface); - TRACE("(%p)->(%08x)\n", This, (DWORD) D3DMatHandle); + TRACE("(%p)->(%08x)\n", This, D3DMatHandle); if(!D3DMatHandle) return DDERR_INVALIDPARAMS; @@ -4589,7 +4589,7 @@ IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); HRESULT hr; - TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay\n", This, Count, Rects, Flags, (DWORD) Color, Z, Stencil); + TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay\n", This, Count, Rects, Flags, Color, Z, Stencil); /* Note; D3DRECT is compatible with WINED3DRECT */ EnterCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e5fb45b..302555d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -515,7 +515,7 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, D3DMATERIALHANDLE hMat) { ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); - TRACE("(%p)->(%d)\n", This, (DWORD) hMat); + TRACE("(%p)->(%d)\n", This, hMat); EnterCriticalSection(&ddraw_cs); if(hMat && hMat > This->ddraw->d3ddevice->numHandles)