Commit cce5ac1d authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

oledb32: Silence interfaces for IDataSourceLocator QI.

parent 4ee4d4e2
...@@ -78,6 +78,21 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID ...@@ -78,6 +78,21 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID
TRACE("IID_IRunnableObject returning NULL\n"); TRACE("IID_IRunnableObject returning NULL\n");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
else if (IsEqualIID(riid, &IID_IProvideClassInfo))
{
TRACE("IID_IProvideClassInfo returning NULL\n");
return E_NOINTERFACE;
}
else if (IsEqualIID(riid, &IID_IMarshal))
{
TRACE("IID_IMarshal returning NULL\n");
return E_NOINTERFACE;
}
else if (IsEqualIID(riid, &IID_IRpcOptions))
{
TRACE("IID_IRpcOptions returning NULL\n");
return E_NOINTERFACE;
}
if(*ppvoid) if(*ppvoid)
{ {
......
...@@ -886,6 +886,9 @@ static void test_dslocator(void) ...@@ -886,6 +886,9 @@ static void test_dslocator(void)
{ {
IDataInitialize *datainit, *datainit2; IDataInitialize *datainit, *datainit2;
IRunnableObject *runable; IRunnableObject *runable;
IProvideClassInfo *info;
IMarshal *marshal;
IRpcOptions *opts;
COMPATIBLE_LONG hwnd = 0; COMPATIBLE_LONG hwnd = 0;
if (0) /* Crashes under Window 7 */ if (0) /* Crashes under Window 7 */
...@@ -928,6 +931,15 @@ static void test_dslocator(void) ...@@ -928,6 +931,15 @@ static void test_dslocator(void)
hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRunnableObject, (void **)&runable); hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRunnableObject, (void **)&runable);
ok(hr == E_NOINTERFACE, "got %08x\n", hr); ok(hr == E_NOINTERFACE, "got %08x\n", hr);
hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IMarshal, (void **)&marshal);
ok(hr == E_NOINTERFACE, "got %08x\n", hr);
hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IProvideClassInfo, (void **)&info);
ok(hr == E_NOINTERFACE, "got %08x\n", hr);
hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRpcOptions, (void **)&opts);
ok(hr == E_NOINTERFACE, "got %08x\n", hr);
IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit2);
IDataInitialize_Release(datainit); IDataInitialize_Release(datainit);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment