[PATCH 1/5] d3dx9: Avoid LPD3DXINCLUDE.
Henri Verbeet
hverbeet at codeweavers.com
Sat Nov 24 10:17:05 CST 2012
---
dlls/d3dx9_36/effect.c | 27 +++++++---------
dlls/d3dx9_36/shader.c | 81 +++++++++++-----------------------------------
include/d3dx9effect.h | 45 +++++++-------------------
include/d3dx9shader.h | 83 ++++++++++++-----------------------------------
4 files changed, 65 insertions(+), 171 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index f49d5c3..48bd266 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5871,13 +5871,8 @@ err_out:
return hr;
}
-HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
- UINT srcdatalen,
- CONST D3DXMACRO *defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXEFFECTCOMPILER *compiler,
- LPD3DXBUFFER *parse_errors)
+HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **compiler, ID3DXBuffer **parse_errors)
{
struct ID3DXEffectCompilerImpl *object;
HRESULT hr;
@@ -6137,8 +6132,8 @@ HRESULT WINAPI D3DXCreateEffectFromResourceA(struct IDirect3DDevice9 *device, HM
return D3DXCreateEffectFromResourceExA(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors);
}
-HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include,
- DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
+HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
{
LPVOID buffer;
HRESULT ret;
@@ -6160,8 +6155,8 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACR
return ret;
}
-HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include,
- DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
+HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(const char *srcfile, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
{
LPWSTR srcfileW;
HRESULT ret;
@@ -6182,8 +6177,9 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO
return ret;
}
-HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, LPCSTR srcresource, const D3DXMACRO *defines,
- LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
+HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const char *srcresource,
+ const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
+ ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
{
HRSRC resinfo;
@@ -6208,8 +6204,9 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, LPCSTR s
return D3DXERR_INVALIDDATA;
}
-HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, LPCWSTR srcresource, const D3DXMACRO *defines,
- LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
+HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,
+ const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
+ ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
{
HRSRC resinfo;
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index a64559f..9137a98 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -185,13 +185,8 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO
return S_FALSE;
}
-HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
- UINT data_len,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
/* Forward to d3dcompiler: the parameter types aren't really different,
the actual data types are equivalent */
@@ -276,12 +271,8 @@ struct D3DXIncludeImpl {
ID3DXInclude ID3DXInclude_iface;
};
-HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
LPWSTR filename_w = NULL;
DWORD len;
@@ -300,12 +291,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
return ret;
}
-HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
void *buffer;
DWORD len;
@@ -328,13 +315,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
return hr;
}
-HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module,
- LPCSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
HRSRC res;
LPCSTR buffer;
@@ -348,13 +330,8 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module,
shader, error_messages);
}
-HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module,
- LPCWSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
HRSRC res;
LPCSTR buffer;
@@ -479,12 +456,8 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
flags, shader, error_messages, constant_table);
}
-HRESULT WINAPI D3DXPreprocessShader(LPCSTR data,
- UINT data_len,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
TRACE("Forward to D3DPreprocess\n");
return D3DPreprocess(data, data_len, NULL,
@@ -492,11 +465,8 @@ HRESULT WINAPI D3DXPreprocessShader(LPCSTR data,
(ID3DBlob **)shader, (ID3DBlob **)error_messages);
}
-HRESULT WINAPI D3DXPreprocessShaderFromFileA(LPCSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
WCHAR *filename_w = NULL;
DWORD len;
@@ -515,11 +485,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(LPCSTR filename,
return ret;
}
-HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
void *buffer;
DWORD len;
@@ -544,12 +511,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
return hr;
}
-HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module,
- LPCSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
HRSRC res;
const char *buffer;
@@ -563,12 +526,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module,
shader, error_messages);
}
-HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module,
- LPCWSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages)
+HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{
HRSRC res;
const char *buffer;
diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
index 949adb9..74b80e1 100644
--- a/include/d3dx9effect.h
+++ b/include/d3dx9effect.h
@@ -370,13 +370,8 @@ HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *src
HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
-HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
- UINT srcdatalen,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXEFFECTCOMPILER* compiler,
- LPD3DXBUFFER* parse_errors);
+HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **compiler, ID3DXBuffer **parse_errors);
HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
@@ -411,34 +406,18 @@ HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HM
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
#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);
+HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(const char *srcfile, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
+HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **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);
+HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const char *srcresource,
+ const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
+ ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
+HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,
+ const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
+ ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
#define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource)
#ifdef __cplusplus
diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
index 53c2133..0b30519 100644
--- a/include/d3dx9shader.h
+++ b/include/d3dx9shader.h
@@ -270,43 +270,20 @@ const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device);
HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size);
HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count);
-HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
-HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
+HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
+HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
#define D3DXAssembleShaderFromFile WINELIB_NAME_AW(D3DXAssembleShaderFromFile)
-HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module,
- LPCSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
-HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module,
- LPCWSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
+HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
+HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
#define D3DXAssembleShaderFromResource WINELIB_NAME_AW(D3DXAssembleShaderFromResource)
-HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
- UINT data_len,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- DWORD flags,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
+HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines,
+ ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
HRESULT WINAPI D3DXCompileShader(const char *src_data, UINT data_len, const D3DXMACRO *defines,
ID3DXInclude *include, const char *function_name, const char *profile, DWORD flags,
@@ -328,37 +305,19 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table);
#define D3DXCompileShaderFromResource WINELIB_NAME_AW(D3DXCompileShaderFromResource)
-HRESULT WINAPI D3DXPreprocessShader(LPCSTR data,
- UINT data_len,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
-
-HRESULT WINAPI D3DXPreprocessShaderFromFileA(LPCSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
-HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
+HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
+
+HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
+HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
#define D3DXPreprocessShaderFromFile WINELIB_NAME_AW(D3DXPreprocessShaderFromFile)
-HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module,
- LPCSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
-HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module,
- LPCWSTR resource,
- CONST D3DXMACRO* defines,
- LPD3DXINCLUDE include,
- LPD3DXBUFFER* shader,
- LPD3DXBUFFER* error_messages);
+HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
+HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
+ ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
#define D3DXPreprocessShaderFromResource WINELIB_NAME_AW(D3DXPreprocessShaderFromResource)
HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, ID3DXConstantTable **constant_table);
--
1.7.8.6
More information about the wine-patches
mailing list