Module: wine Branch: master Commit: c109249445f2e45b918bf8c9fa565bf54cf8c023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c109249445f2e45b918bf8c9fa...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Nov 29 22:44:43 2012 +0100
d3dx9: Avoid LPD3DXEFFECTSTATEMANAGER.
---
dlls/d3dx9_36/effect.c | 4 ++-- dlls/d3dx9_36/tests/effect.c | 4 ++-- include/d3dx9effect.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bb1e594..ec14f98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3609,7 +3609,7 @@ static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) return E_NOTIMPL; }
-static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER manager) +static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
@@ -3623,7 +3623,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX return D3D_OK; }
-static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER *manager) +static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0f1cfea..8e12b74 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -140,7 +140,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ID3DXBaseEffect *base; ULONG count; IDirect3DDevice9 *device2; - LPD3DXEFFECTSTATEMANAGER manager = (LPD3DXEFFECTSTATEMANAGER)0xdeadbeef; + ID3DXEffectStateManager *manager = (ID3DXEffectStateManager *)0xdeadbeef; ID3DXEffectPool *pool = (ID3DXEffectPool *)0xdeadbeef, *pool2;
hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); @@ -169,7 +169,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(!manager, "GetStateManager failed, got %p\n", manager);
/* this works, but it is not recommended! */ - hr = effect->lpVtbl->SetStateManager(effect, (LPD3DXEFFECTSTATEMANAGER) device); + hr = effect->lpVtbl->SetStateManager(effect, (ID3DXEffectStateManager *)device); ok(hr == D3D_OK, "SetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr);
hr = effect->lpVtbl->GetStateManager(effect, &manager); diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 7ff789d..5a04092 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -272,8 +272,8 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE; - STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER manager) PURE; - STDMETHOD(GetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER* manager) PURE; + STDMETHOD(SetStateManager)(THIS_ ID3DXEffectStateManager *manager) PURE; + STDMETHOD(GetStateManager)(THIS_ ID3DXEffectStateManager **manager) PURE; STDMETHOD(BeginParameterBlock)(THIS) PURE; STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE; STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
-
Alexandre Julliard