Henri Verbeet : d3dx9: Avoid LPD3DXEFFECTPOOL.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Nov 29 22:44:42 2012 +0100

d3dx9: Avoid LPD3DXEFFECTPOOL.

---

dlls/d3dx9_36/effect.c |    4 ++--
 include/d3dx9effect.h  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 48bd266..bb1e594 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3406,7 +3406,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND
 }

/*** ID3DXEffect methods ***/
-static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPOOL *pool)
+static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool)
 {
     struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);

@@ -5969,7 +5969,7 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl =
     ID3DXEffectPoolImpl_Release
 };

-HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool)
+HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool)
 {
     struct ID3DXEffectPoolImpl *object;

diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
index 74b80e1..7ff789d 100644
--- a/include/d3dx9effect.h
+++ b/include/d3dx9effect.h
@@ -258,7 +258,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
     STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE;
     STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE;
     /*** ID3DXEffect methods ***/
-    STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE;
+    STDMETHOD(GetPool)(THIS_ ID3DXEffectPool **pool) PURE;
     STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE technique) PURE;
     STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE;
     STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE technique) PURE;
@@ -363,7 +363,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
 extern "C" {
 #endif

-HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool);
+HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool);
 HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
         const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
         struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);