Stefan Dösinger : wined3d: Remove needless NULL checks (coverity).
Alexandre Julliard
julliard at winehq.org
Thu Dec 3 10:29:53 CST 2009
Module: wine
Branch: master
Commit: 6a1933920767c953445b97216f7a27af4ea07924
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1933920767c953445b97216f7a27af4ea07924
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Dec 2 10:44:55 2009 +0100
wined3d: Remove needless NULL checks (coverity).
---
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;
More information about the wine-cvs
mailing list