Nikolay Sivov : riched20: Return proper interface pointers.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Thu Feb  9 16:17:15 2017 +0300

riched20: Return proper interface pointers.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/riched20/clipboard.c    | 4 ++--
 dlls/riched20/tests/txtsrv.c | 2 +-
 dlls/riched20/txthost.c      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c
index d4560db..578fb02 100644
--- a/dlls/riched20/clipboard.c
+++ b/dlls/riched20/clipboard.c
@@ -66,7 +66,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII
 
     if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) {
         IEnumFORMATETC_AddRef(iface);
-        *ppvObj = This;
+        *ppvObj = &This->IEnumFORMATETC_iface;
         return S_OK;
     }
     *ppvObj = NULL;
@@ -183,7 +183,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r
 
     if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) {
         IDataObject_AddRef(iface);
-        *ppvObj = This;
+        *ppvObj = &This->IDataObject_iface;
         return S_OK;
     }
     *ppvObj = NULL;
diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c
index 4be3106..73ca7cd 100644
--- a/dlls/riched20/tests/txtsrv.c
+++ b/dlls/riched20/tests/txtsrv.c
@@ -99,7 +99,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface,
     ITextHostTestImpl *This = impl_from_ITextHost(iface);
 
     if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) {
-        *ppvObject = This;
+        *ppvObject = &This->ITextHost_iface;
         ITextHost_AddRef((ITextHost *)*ppvObject);
         return S_OK;
     }
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index b99c933..0e51ecf 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -76,7 +76,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, REFIID riid
     ITextHostImpl *This = impl_from_ITextHost(iface);
 
     if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) {
-        *ppvObject = This;
+        *ppvObject = &This->ITextHost_iface;
         ITextHost_AddRef((ITextHost *)*ppvObject);
         return S_OK;
     }