Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXInclude iface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c84b8dbd3e5006a6cb2d2ca076bb0eab18bf710d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c84b8dbd3e5006a6cb2d2ca076...

Author: Michael Stefaniuc 
Date:   Thu Jan 27 00:21:38 2011 +0100

d3dx9_36: COM cleanup for the ID3DXInclude iface.

---

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,