Rico Schüller : d3dx9: Implement ID3DXEffect:: GetStateManager().
Alexandre Julliard
julliard at winehq.org
Wed May 11 13:02:58 CDT 2011
Module: wine
Branch: master
Commit: 72d3ee3ab606bbc7ff22567697c567e675c1573b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d3ee3ab606bbc7ff22567697c567e675c1573b
Author: Rico Schüller <kgbricola at web.de>
Date: Wed May 11 16:47:06 2011 +0200
d3dx9: Implement ID3DXEffect::GetStateManager().
---
dlls/d3dx9_36/effect.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index f513a90..d8877c0 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2445,13 +2445,22 @@ 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, LPD3DXEFFECTSTATEMANAGER *manager)
{
struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
- FIXME("(%p)->(%p): stub\n", This, manager);
+ TRACE("iface %p, manager %p\n", This, manager);
- return E_NOTIMPL;
+ if (!manager)
+ {
+ WARN("Invalid argument supplied.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
+ if (This->manager) IUnknown_AddRef(This->manager);
+ *manager = This->manager;
+
+ return D3D_OK;
}
static HRESULT WINAPI ID3DXEffectImpl_BeginParameterBlock(ID3DXEffect* iface)
More information about the wine-cvs
mailing list