Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW().
Alexandre Julliard
julliard at winehq.org
Mon Aug 26 13:21:56 CDT 2013
Module: wine
Branch: master
Commit: 34c70247906ca8fe965ced1e02c72f519e73eb04
URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c70247906ca8fe965ced1e02c72f519e73eb04
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Aug 26 09:23:41 2013 +0200
d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW().
---
dlls/d3dx9_36/effect.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 2be1900..3c252e5 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5704,26 +5704,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC
ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
{
HRSRC resinfo;
+ void *buffer;
+ DWORD size;
- TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource));
-
- resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA);
-
- if (resinfo)
- {
- LPVOID buffer;
- HRESULT ret;
- DWORD size;
-
- ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size);
+ TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n",
+ srcmodule, debugstr_w(srcresource), defines, include, flags, effectcompiler, parseerrors);
- if (FAILED(ret))
- return D3DXERR_INVALIDDATA;
+ if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA)))
+ return D3DXERR_INVALIDDATA;
- return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors);
- }
+ if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size)))
+ return D3DXERR_INVALIDDATA;
- return D3DXERR_INVALIDDATA;
+ return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors);
}
HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly)
More information about the wine-cvs
mailing list