From f47267ad55214784f9cb63f117283c87b6d64dbc Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Mon, 2 Apr 2012 22:42:22 +0200
Subject: [PATCH] d3d9: Don't return a pointer to the implementation in
 IDirect3DDevice9Impl_QueryInterface().

---
 dlls/d3d9/device.c | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index ab96d79009c..bec3c4b918c 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -186,38 +186,39 @@ static inline IDirect3DDevice9Impl *impl_from_IDirect3DDevice9Ex(IDirect3DDevice
     return CONTAINING_RECORD(iface, IDirect3DDevice9Impl, IDirect3DDevice9Ex_iface);
 }
 
-static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid,
-        void **ppobj)
+static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out)
 {
-    IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
-
-    TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
+    TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
 
-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IDirect3DDevice9)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DDevice9)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IDirect3DDevice9Ex_AddRef(iface);
-        *ppobj = This;
-        TRACE("Returning IDirect3DDevice9 interface at %p\n", *ppobj);
+        *out = iface;
         return S_OK;
-    } else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) {
+    }
+
+    if (IsEqualGUID(riid, &IID_IDirect3DDevice9Ex))
+    {
+        IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface);
+
         /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex.
          * It doesn't matter with which function the device was created. */
-
-        if (This->d3d_parent->extended)
+        if (!device->d3d_parent->extended)
         {
-            *ppobj = iface;
-            IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj);
-            TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj);
-            return S_OK;
-        } else {
-            WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n");
-            *ppobj = NULL;
+            WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n");
+            *out = NULL;
             return E_NOINTERFACE;
         }
+
+        IDirect3DDevice9Ex_AddRef(iface);
+        *out = iface;
+        return S_OK;
     }
 
-    WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj);
-    *ppobj = NULL;
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+    *out = NULL;
     return E_NOINTERFACE;
 }
 
-- 
2.11.4.GIT