Henri Verbeet : d3dx9: Simplify D3DXCreateEffectFromResourceExW().
Alexandre Julliard
julliard at winehq.org
Fri Aug 23 13:49:35 CDT 2013
Module: wine
Branch: master
Commit: 37d67eb629c1d0e7cc7cc698f4a909b4c8eda360
URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d67eb629c1d0e7cc7cc698f4a909b4c8eda360
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Aug 23 10:18:18 2013 +0200
d3dx9: Simplify D3DXCreateEffectFromResourceExW().
---
dlls/d3dx9_36/effect.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index c4d97a4..c349acf 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5571,29 +5571,25 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(struct IDirect3DDevice9 *device,
DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{
HRSRC resinfo;
+ void *buffer;
+ DWORD size;
- TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource));
+ TRACE("device %p, srcmodule %p, srcresource %s, defines %p, include %p, skipconstants %s, "
+ "flags %#x, pool %p, effect %p, compilationerrors %p.\n",
+ device, srcmodule, debugstr_w(srcresource), defines, include, debugstr_a(skipconstants),
+ flags, pool, effect, compilationerrors);
if (!device)
return D3DERR_INVALIDCALL;
- resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA);
-
- if (resinfo)
- {
- LPVOID buffer;
- HRESULT ret;
- DWORD size;
-
- ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size);
-
- if (FAILED(ret))
- return D3DXERR_INVALIDDATA;
+ if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA)))
+ return D3DXERR_INVALIDDATA;
- return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors);
- }
+ if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size)))
+ return D3DXERR_INVALIDDATA;
- return D3DXERR_INVALIDDATA;
+ return D3DXCreateEffectEx(device, buffer, size, defines, include,
+ skipconstants, flags, pool, effect, compilationerrors);
}
HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
More information about the wine-cvs
mailing list