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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun Mar 25 20:56:28 2012 +0200

d3d8: Don't return a pointer to the implementation in IDirect3D8Impl_QueryInterface().

---

 dlls/d3d8/directx.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 70b0c78..1debd8f 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -44,18 +44,18 @@ static inline IDirect3D8Impl *impl_from_IDirect3D8(IDirect3D8 *iface)
 
 static HRESULT WINAPI IDirect3D8Impl_QueryInterface(LPDIRECT3D8 iface, REFIID riid,LPVOID *ppobj)
 {
-    IDirect3D8Impl *This = impl_from_IDirect3D8(iface);
-
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
 
-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IDirect3D8)) {
+    if (IsEqualGUID(riid, &IID_IDirect3D8)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IUnknown_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;
 }