[PATCH 1/3] msado15: Silence some queried interfaces. - wine-devel

24 Jan 2020

Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com
---
 dlls/msado15/connection.c    | 10 ++++++++++
 dlls/msado15/tests/msado15.c |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c
index 73b225628c..b267fc08c0 100644
--- a/dlls/msado15/connection.c
+++ b/dlls/msado15/connection.c
@@ -81,6 +81,16 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid
     {
         *obj = &connection->ISupportErrorInfo_iface;
     }
+    else if(IsEqualGUID( riid, &IID_IMarshal ))
+    {
+        TRACE("IMarshal not supported\n");
+        return E_NOINTERFACE;
+    }
+    else if(IsEqualGUID( riid, &IID_IExternalConnection ))
+    {
+        TRACE("IExternalConnection not supported\n");
+        return E_NOINTERFACE;
+    }
     else
     {
         FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c
index afdf0dfb6a..17be9e4f14 100644
--- a/dlls/msado15/tests/msado15.c
+++ b/dlls/msado15/tests/msado15.c
@@ -660,6 +660,8 @@ static void test_Connection(void)
     _Connection *connection;
     IRunnableObject *runtime;
     ISupportErrorInfo *errorinfo;
+    IMarshal *marshal;
+    IExternalConnection *external;
     LONG state, timeout;
hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection);
@@ -672,6 +674,12 @@ static void test_Connection(void)
     ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n");
     ISupportErrorInfo_Release(errorinfo);
+    hr = _Connection_QueryInterface(connection, &IID_IMarshal, (void**)&marshal);
+    ok(hr == E_NOINTERFACE, "Unexpected IMarshal interface\n");
+
+    hr = _Connection_QueryInterface(connection, &IID_IExternalConnection, (void**)&external);
+    ok(hr == E_NOINTERFACE, "Unexpected IExternalConnection interface\n");
+
 if (0)   /* Crashes on windows */
 {
     hr = _Connection_get_State(connection, NULL);
-- 
2.24.1



    