diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index b528e2cc9f3..c6ce5b5043f 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -262,19 +262,19 @@ static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8
 static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(IDirect3DDevice8 *iface, REFIID riid,
         void **ppobj)
 {
-    IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface);
-
     TRACE("iface %p, riid %s, object %p.\n",
             iface, debugstr_guid(riid), ppobj);
 
-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IDirect3DDevice8)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DDevice8)
+            || 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;
 }