Module: wine Branch: master Commit: 8e9fabfa872dddf2a8a0b8782638bbea39adfe3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9fabfa872dddf2a8a0b87826...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Sat Aug 27 17:42:33 2011 +0100
d3dx9_36: Fix a logical operator typo.
---
dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 82e3612..fea7f1e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -328,7 +328,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, TRACE("(%p, %p, %p, %p, %d, %p, %d, %x, %p)\n", pDestSurface, pDestPalette, pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo);
- if (!pDestSurface || !pSrcData | !SrcDataSize) + if (!pDestSurface || !pSrcData || !SrcDataSize) return D3DERR_INVALIDCALL;
hr = D3DXGetImageInfoFromFileInMemory(pSrcData, SrcDataSize, &imginfo);