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

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Sun Apr  1 13:12:04 2012 +0200

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

---

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

diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c
index 6ecf596..9123a1a 100644
--- a/dlls/d3d9/stateblock.c
+++ b/dlls/d3d9/stateblock.c
@@ -33,18 +33,18 @@ static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3D
 static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface,
         REFIID riid, void **ppobj)
 {
-    IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface);
-
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);

-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DStateBlock9)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IDirect3DStateBlock9_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;
 }