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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9d5413012862a3f4c008d911f36d4fff57859c9d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9d5413012862a3f4c008d911f3...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Apr  2 22:42:23 2012 +0200

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

---

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

diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
index 349f790..e7df0e1 100644
--- a/dlls/d3d9/cubetexture.c
+++ b/dlls/d3d9/cubetexture.c
@@ -34,20 +34,20 @@ static inline IDirect3DCubeTexture9Impl *impl_from_IDirect3DCubeTexture9(IDirect
 static HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(IDirect3DCubeTexture9 *iface,
         REFIID riid, void **ppobj)
 {
-    IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(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_IDirect3DCubeTexture9)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture9)
+            || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)
+            || IsEqualGUID(riid, &IID_IDirect3DResource9)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IDirect3DCubeTexture9_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;
 }