From c84b8dbd3e5006a6cb2d2ca076bb0eab18bf710d Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 27 Jan 2011 00:21:38 +0100 Subject: [PATCH] d3dx9_36: COM cleanup for the ID3DXInclude iface. --- dlls/d3dx9_36/shader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 41feecf0c0c..b8a6909c8df 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,