ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Simplify D3DXCreateEffectFromResourceExA().

This commit is contained in:
Henri Verbeet 2013-08-23 10:18:17 +02:00 committed by Alexandre Julliard
parent b4d6f90f20
commit f60b28138e
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/d3dx9_36/effect.c
View File

@ -5601,29 +5601,25 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device,
DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
HRSRC resinfo; HRSRC resinfo;
void *buffer;
DWORD size;
TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(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_a(srcresource), defines, include, debugstr_a(skipconstants),
flags, pool, effect, compilationerrors);
if (!device) if (!device)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); if (!(resinfo = FindResourceA(srcmodule, srcresource, (const char *)RT_RCDATA)))
return D3DXERR_INVALIDDATA;
if (resinfo) if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size)))
{ return D3DXERR_INVALIDDATA;
LPVOID buffer;
HRESULT ret;
DWORD size;
ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); return D3DXCreateEffectEx(device, buffer, size, defines, include,
skipconstants, flags, pool, effect, compilationerrors);
if (FAILED(ret))
return D3DXERR_INVALIDDATA;
return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors);
}
return D3DXERR_INVALIDDATA;
} }
HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HMODULE srcmodule, HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HMODULE srcmodule,