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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8db93e2a551d973f79ece1faa9cea29e5caa3984
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8db93e2a551d973f79ece1faa9...

Author: Henri Verbeet 
Date:   Tue Mar 27 20:35:51 2012 +0200

d3d9: Don't return a pointer to the implementation in IDirect3DVolumeTexture9Impl_QueryInterface().

---

dlls/d3d9/volumetexture.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c
index d6d625b..03a467f 100644
--- a/dlls/d3d9/volumetexture.c
+++ b/dlls/d3d9/volumetexture.c
@@ -32,20 +32,20 @@ static inline IDirect3DVolumeTexture9Impl *impl_from_IDirect3DVolumeTexture9(IDi
 static HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(IDirect3DVolumeTexture9 *iface,
         REFIID riid, void **ppobj)
 {
-    IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface);
-
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);

-    if (IsEqualGUID(riid, &IID_IUnknown)
-    || IsEqualGUID(riid, &IID_IDirect3DResource9)
-    || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)
-    || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)
+            || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)
+            || IsEqualGUID(riid, &IID_IDirect3DResource9)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IDirect3DVolumeTexture9_AddRef(iface);
-        *ppobj = This;
+        *ppobj = iface;
         return S_OK;
     }

-    WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj);
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
     *ppobj = NULL;
     return E_NOINTERFACE;
 }