Skip to content

W
wine-winehq
Commit c84b8dbd authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

d3dx9_36: COM cleanup for the ID3DXInclude iface.

parent b88e09e2
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
dlls/d3dx9_36/shader.c
View file @ c84b8dbd
...@@ -266,7 +266,7 @@ static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { ...@@ -266,7 +266,7 @@ static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = {
}; };
struct D3DXIncludeImpl { struct D3DXIncludeImpl {
const ID3DXIncludeVtbl *lpVtbl; ID3DXInclude ID3DXInclude_iface;
}; };
HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
...@@ -310,8 +310,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, ...@@ -310,8 +310,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
if(!include) if(!include)
{ {
includefromfile.lpVtbl = &D3DXInclude_Vtbl; includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl;
include = (LPD3DXINCLUDE)&includefromfile; include = &includefromfile.ID3DXInclude_iface;
} }
hr = D3DXAssembleShader(buffer, len, defines, include, flags, hr = D3DXAssembleShader(buffer, len, defines, include, flags,
...@@ -433,8 +433,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, ...@@ -433,8 +433,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename,
if (!include) if (!include)
{ {
includefromfile.lpVtbl = &D3DXInclude_Vtbl; includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl;
include = (LPD3DXINCLUDE)&includefromfile; include = &includefromfile.ID3DXInclude_iface;
} }
filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL);
...@@ -557,8 +557,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename, ...@@ -557,8 +557,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
if (!include) if (!include)
{ {
includefromfile.lpVtbl = &D3DXInclude_Vtbl; includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl;
include = (LPD3DXINCLUDE)&includefromfile; include = &includefromfile.ID3DXInclude_iface;
} }
hr = D3DPreprocess(buffer, len, NULL, hr = D3DPreprocess(buffer, len, NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment