[Wine-devel] Eter's patch is applied to winehq repo 10/01/10

[builder на builder.office.etersoft.ru]

New patches since last time:
commit a15301a0bcbaa6c654f0fa7e23b3ef121e428513
Author: Vitaly Perov <vitperov на etersoft.ru>

    shdocvw: Silence more invalid QueryInterface FIXMEs.

---

commit a15301a0bcbaa6c654f0fa7e23b3ef121e428513
Author: Vitaly Perov <vitperov на etersoft.ru>
Date:   Fri Oct 1 13:09:40 2010 +0400

    shdocvw: Silence more invalid QueryInterface FIXMEs.

diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index 04a0b8e..babfe11 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -2437,6 +2437,8 @@ static void test_QueryInterface(IUnknown *unk)
     IObjectWithSite *site = (void*)0xdeadbeef;
     IViewObjectEx *viewex = (void*)0xdeadbeef;
     IOleLink *link = (void*)0xdeadbeef;
+    IMarshal *marshal = (void*)0xdeadbeef;
+    IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef;
     HRESULT hres;
 
     hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa);
@@ -2471,6 +2473,14 @@ static void test_QueryInterface(IUnknown *unk)
     ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
     ok(link == NULL, "link=%p, expected NULL\n", link);
 
+    hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&marshal);
+    ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
+    ok(marshal == NULL, "marshal=%p, expected NULL\n", marshal);
+
+    hres = IUnknown_QueryInterface(unk, &IID_IStdMarshalInfo, (void**)&marshalinfo);
+    ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres);
+    ok(marshalinfo == NULL, "marshalinfo=%p, expected NULL\n", marshalinfo);
+
 }
 
 static void test_WebBrowser(BOOL do_download)
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 0c1bb12..ef46236 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -130,6 +130,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
     }else if(IsEqualGUID(&IID_IOleLink, riid)) {
         TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv);
         return E_NOINTERFACE;
+    }else if(IsEqualGUID(&IID_IMarshal, riid)) {
+        TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv);
+        return E_NOINTERFACE;
+    }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) {
+        TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv);
+        return E_NOINTERFACE;
     }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) {
         return S_OK;
     }