[PATCH 3/8] d3dx9_36: COM cleanup for the ID3DXInclude iface.
Michael Stefaniuc
mstefani at redhat.de
Wed Jan 26 17:21:38 CST 2011
---
dlls/d3dx9_36/shader.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 41feecf..b8a6909 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -266,7 +266,7 @@ static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = {
};
struct D3DXIncludeImpl {
- const ID3DXIncludeVtbl *lpVtbl;
+ ID3DXInclude ID3DXInclude_iface;
};
HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
@@ -310,8 +310,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
if(!include)
{
- includefromfile.lpVtbl = &D3DXInclude_Vtbl;
- include = (LPD3DXINCLUDE)&includefromfile;
+ includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl;
+ include = &includefromfile.ID3DXInclude_iface;
}
hr = D3DXAssembleShader(buffer, len, defines, include, flags,
@@ -433,8 +433,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename,
if (!include)
{
- includefromfile.lpVtbl = &D3DXInclude_Vtbl;
- include = (LPD3DXINCLUDE)&includefromfile;
+ includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl;
+ include = &includefromfile.ID3DXInclude_iface;
}
filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL);
@@ -557,8 +557,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
if (!include)
{
- includefromfile.lpVtbl = &D3DXInclude_Vtbl;
- include = (LPD3DXINCLUDE)&includefromfile;
+ includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl;
+ include = &includefromfile.ID3DXInclude_iface;
}
hr = D3DPreprocess(buffer, len, NULL,
--
1.7.3.5
More information about the wine-patches
mailing list