[PATCH 4/5] d3d9: Don't return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface().

Henri Verbeet hverbeet at codeweavers.com
Sun Apr 1 06:12:04 CDT 2012


---
 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;
 }
-- 
1.7.3.4




More information about the wine-patches mailing list