From 3af74c5e5250b09bf453293214a3e3240e6a1140 Mon Sep 17 00:00:00 2001
From: Rob Shearman <rob@codeweavers.com>
Date: Wed, 25 Apr 2007 11:21:03 +0100
Subject: [PATCH] atl: Use the first entry in the object map in
 AtlInternalQueryInterface when IUnknown is requested.

---
 dlls/atl/atl_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index 69d62e70f67..a25f7472751 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -213,19 +213,19 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE
 {
     int i = 0;
     HRESULT rc = E_NOINTERFACE;
-    TRACE("(%p, %p, %p, %p)\n",this, pEntries, iid, ppvObject);
+    TRACE("(%p, %p, %s, %p)\n",this, pEntries, debugstr_guid(iid), ppvObject);
 
     if (IsEqualGUID(iid,&IID_IUnknown))
     {
         TRACE("Returning IUnknown\n");
-        *ppvObject = this;
-        IUnknown_AddRef((IUnknown*)this);
+        *ppvObject = ((LPSTR)this+pEntries[0].dw);
+        IUnknown_AddRef((IUnknown*)*ppvObject);
         return S_OK;
     }
 
     while (pEntries[i].pFunc != 0)
     {
-        TRACE("Trying entry %i (%p %i %p)\n",i,pEntries[i].piid,
+        TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid),
               pEntries[i].dw, pEntries[i].pFunc);
 
         if (pEntries[i].piid && IsEqualGUID(iid,pEntries[i].piid))