diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 67d28b2fa15..235b8e7c0b3 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, - LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; + LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; }; #undef INTERFACE @@ -386,6 +386,116 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, LPD3DXEFFECTCOMPILER* compiler, LPD3DXBUFFER* parse_errors); +HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromFileEx WINELIB_NAME_AW(D3DXCreateEffectFromFileEx) + +HRESULT WINAPI D3DXCreateEffectFromFileA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromFileW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromFile WINELIB_NAME_AW(D3DXCreateEffectFromFile) + +HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromResourceEx WINELIB_NAME_AW(D3DXCreateEffectFromResourceEx) + +HRESULT WINAPI D3DXCreateEffectFromResourceA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromResourceW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource) + +HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +#define D3DXCreateEffectCompilerFromFile WINELIB_NAME_AW(D3DXCreateEffectCompilerFromFile) + +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +#define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource) + #ifdef __cplusplus } #endif