Nikolay Sivov : browseui: Return interface pointer from QI instead of impl pointer.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Mar 20 08:43:20 CDT 2015


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Mar 20 11:19:22 2015 +0300

browseui: Return interface pointer from QI instead of impl pointer.

---

 dlls/browseui/aclmulti.c           | 2 +-
 dlls/browseui/aclsource.c          | 2 +-
 dlls/browseui/browseui_main.c      | 2 +-
 dlls/browseui/compcatcachedaemon.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c
index bfb200c..e7edece 100644
--- a/dlls/browseui/aclmulti.c
+++ b/dlls/browseui/aclmulti.c
@@ -100,7 +100,7 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString))
     {
-        *ppvOut = This;
+        *ppvOut = &This->IEnumString_iface;
     }
     else if (IsEqualIID(iid, &IID_IACList))
     {
diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c
index 8b3530f..aa31d08 100644
--- a/dlls/browseui/aclsource.c
+++ b/dlls/browseui/aclsource.c
@@ -67,7 +67,7 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid,
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IACList2) ||
         IsEqualIID(iid, &IID_IACList))
     {
-        *ppvOut = This;
+        *ppvOut = &This->IACList2_iface;
     }
 
     if (*ppvOut)
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c
index f509ee5..1b3cecc 100644
--- a/dlls/browseui/browseui_main.c
+++ b/dlls/browseui/browseui_main.c
@@ -152,7 +152,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
     This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl;
     This->ref = 1;
     This->ctor = ctor;
-    *ppvOut = This;
+    *ppvOut = &This->IClassFactory_iface;
     TRACE("Created class factory %p\n", This);
     InterlockedIncrement(&BROWSEUI_refCount);
     return S_OK;
diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c
index a5addd2..5ed9f37 100644
--- a/dlls/browseui/compcatcachedaemon.c
+++ b/dlls/browseui/compcatcachedaemon.c
@@ -70,7 +70,7 @@ static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, RE
 
     if (IsEqualIID(iid, &IID_IRunnableTask) || IsEqualIID(iid, &IID_IUnknown))
     {
-        *ppvOut = This;
+        *ppvOut = &This->IRunnableTask_iface;
     }
 
     if (*ppvOut)




More information about the wine-cvs mailing list