Jacek Caban : ieframe: Fixed invalid COM object usage.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Jul 20 15:25:00 2015 +0200

ieframe: Fixed invalid COM object usage.

---

dlls/ieframe/tests/webbrowser.c | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c
index a70428f..9ceed46 100644
--- a/dlls/ieframe/tests/webbrowser.c
+++ b/dlls/ieframe/tests/webbrowser.c
@@ -3842,43 +3842,24 @@ static void test_FileProtocol(void)
         DeleteFileA(file_path);
 }

-struct sink
-{
-    IAdviseSink IAdviseSink_iface;
-};
-
-static inline struct sink *impl_from_IAdviseSink(IAdviseSink *iface)
-{
-    return CONTAINING_RECORD(iface, struct sink, IAdviseSink_iface);
-}
-
 static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void **obj)
 {
-    struct sink *sink = impl_from_IAdviseSink(iface);
-
-    trace("%p, %p, %p\n", iface, riid, obj);
-
-    if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown))
-    {
-        *obj = &sink->IAdviseSink_iface;
-    }
-    else
-    {
-        return E_NOINTERFACE;
+    if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) {
+        *obj = iface;
+        return S_OK;
     }
-    IAdviseSink_AddRef(iface);
-    return S_OK;
+
+    ok(0, "unexpected call QI(%s)\n", wine_dbgstr_guid(riid));
+    return E_NOINTERFACE;
 }

static ULONG WINAPI sink_AddRef(IAdviseSink *iface)
 {
-    trace("%p\n", iface);
     return 2;
 }

static ULONG WINAPI sink_Release(IAdviseSink *iface)
 {
-    trace("%p\n", iface);
     return 1;
 }