marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Avoid LPD3DXEFFECTSTATEMANAGER.

oldstable
Henri Verbeet 2012-11-29 22:44:43 +01:00 committed by Alexandre Julliard
parent 8678e890e6
commit c109249445
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3dx9_36/effect.c
View File

@ -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);

4
dlls/d3dx9_36/tests/effect.c
View File

@ -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);

4
include/d3dx9effect.h
View File

@ -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;