Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXEffectImpl_QueryInterface( ).
Alexandre Julliard
julliard at winehq.org
Thu Apr 12 15:23:11 CDT 2012
Module: wine
Branch: master
Commit: cdc2c53158a5d4c3dddbd602022d3a4bdd9f453a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc2c53158a5d4c3dddbd602022d3a4bdd9f453a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Apr 11 22:52:06 2012 +0200
d3dx9: Don't return a pointer to the implementation in ID3DXEffectImpl_QueryInterface().
---
dlls/d3dx9_36/effect.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 766f311..c76bdef 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2778,15 +2778,13 @@ static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface)
/*** IUnknown methods ***/
static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object)
{
- struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
-
- TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object);
+ TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_ID3DXEffect))
{
- This->ID3DXEffect_iface.lpVtbl->AddRef(iface);
- *object = This;
+ iface->lpVtbl->AddRef(iface);
+ *object = iface;
return S_OK;
}
More information about the wine-cvs
mailing list