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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Mar 30 01:08:37 2012 +0200

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

---

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

diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c
index b9bff96..7a13848 100644
--- a/dlls/d3d9/swapchain.c
+++ b/dlls/d3d9/swapchain.c
@@ -28,18 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 /* IDirect3DSwapChain IUnknown parts follow: */
 static HRESULT WINAPI IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN9 iface, REFIID riid, LPVOID* ppobj)
 {
-    IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface;
-
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
 
-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IDirect3DSwapChain9_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;
 }