Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXBaseEffectImpl_QueryInterface ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2b1da8c77f4cb2509876281e2bf7a361d6c865f1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2b1da8c77f4cb2509876281e2b...

Author: Henri Verbeet 
Date:   Thu Apr 12 22:49:06 2012 +0200

d3dx9: Don't return a pointer to the implementation in ID3DXBaseEffectImpl_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 c76bdef..b8509b1 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1116,15 +1116,13 @@ static inline struct ID3DXBaseEffectImpl *impl_from_ID3DXBaseEffect(ID3DXBaseEff
 /*** IUnknown methods ***/
 static HRESULT WINAPI ID3DXBaseEffectImpl_QueryInterface(ID3DXBaseEffect *iface, REFIID riid, void **object)
 {
-    struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
-
-    TRACE("iface %p, riid %s, object %p\n", This, debugstr_guid(riid), object);
+    TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);

if (IsEqualGUID(riid, &IID_IUnknown) ||
         IsEqualGUID(riid, &IID_ID3DXBaseEffect))
     {
-        This->ID3DXBaseEffect_iface.lpVtbl->AddRef(iface);
-        *object = This;
+        iface->lpVtbl->AddRef(iface);
+        *object = iface;
         return S_OK;
     }