Rico Schüller : d3dx9: Remove some checks for defines argument in D3DXCreateEffect* functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b7b9db00e336ce2b945c7049c672f54d70948a0b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b7b9db00e336ce2b945c7049c6...

Author: Rico Schüller 
Date:   Tue May 17 10:15:52 2011 +0200

d3dx9: Remove some checks for defines argument in D3DXCreateEffect* functions.

---

dlls/d3dx9_36/effect.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 4332386..f0c44e1 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -4554,7 +4554,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR src

TRACE("(%s): relay\n", debugstr_w(srcfile));

-    if (!device || !srcfile || !defines)
+    if (!device || !srcfile)
         return D3DERR_INVALIDCALL;

ret = map_view_of_file(srcfile, &buffer, &size);
@@ -4578,7 +4578,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf

TRACE("(void): relay\n");

-    if (!srcfile || !defines)
+    if (!srcfile)
         return D3DERR_INVALIDCALL;

len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0);
@@ -4615,7 +4615,7 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, HMODULE

TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource));

-    if (!device || !defines)
+    if (!device)
         return D3DERR_INVALIDCALL;

resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA);
@@ -4645,7 +4645,7 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HMODULE

TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource));

-    if (!device || !defines)
+    if (!device)
         return D3DERR_INVALIDCALL;

resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA);
@@ -4692,7 +4692,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACR

TRACE("(%s): relay\n", debugstr_w(srcfile));

-    if (!srcfile || !defines)
+    if (!srcfile)
         return D3DERR_INVALIDCALL;

ret = map_view_of_file(srcfile, &buffer, &size);
@@ -4715,7 +4715,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO

TRACE("(void): relay\n");

-    if (!srcfile || !defines)
+    if (!srcfile)
         return D3DERR_INVALIDCALL;

len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0);