From 0ba1d1b2f61bea5daab9b1c7168b7758324c927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Wed, 2 Dec 2009 10:44:55 +0100 Subject: [PATCH 01/19] WineD3D: remove needless NULL checks (coverity) Source must be != NULL, otherwise ddraw.dll already throws an invalid read exception on both Windows and Wine. See the comment in dlls/ddraw/surface.c, IDirectDrawSurface7Impl_BltFast for details --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 221f16e..d75c5e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4053,7 +4053,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; TRACE("(%p)->(%d, %d, %p, %p, %08x\n", iface, dstx, dsty, Source, rsrc, trans); - if ( (This->Flags & SFLAG_LOCKED) || ((srcImpl != NULL) && (srcImpl->Flags & SFLAG_LOCKED))) + if ( (This->Flags & SFLAG_LOCKED) || (srcImpl->Flags & SFLAG_LOCKED)) { WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); return WINEDDERR_SURFACEBUSY; @@ -4061,14 +4061,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD if(myDevice->inScene && (iface == myDevice->stencilBufferTarget || - (Source && Source == myDevice->stencilBufferTarget))) { + (Source == myDevice->stencilBufferTarget))) { TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } /* Special cases for RenderTargets */ if( (This->resource.usage & WINED3DUSAGE_RENDERTARGET) || - ( srcImpl && (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) )) { + (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { RECT SrcRect, DstRect; DWORD Flags=0; -- 1.6.4.4