ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml6: Added support for CLSID_XMLSchemaCache60 in XMLSchemaCache60::QueryInterface. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-03-16 17:07:36 +01:00 committed by Alexandre Julliard
parent 8c810372bc
commit 0df7cb2f19
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/msxml3/schema.c
View File

@ -1105,6 +1105,18 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac
{
*ppvObject = iface;
}
else if(This->version == MSXML6 && IsEqualIID(riid, &CLSID_XMLSchemaCache60))
{
/*
* Version 6 can be queried for an interface with IID equal to CLSID.
* There is no public interface with that IID and returned pointer
* is equal to returned IXMLDOMSchemaCollection2 iface. We assume
* that it's just another way for querying IXMLDOMSchemaCollection2
* interface. Office 2013 ClickToRun installer uses this.
*/
WARN("riid CLSID_XMLSchemaCache60, returning IXMLDOMSchemaCollection2 interface.\n");
*ppvObject = iface;
}
else if (dispex_query_interface(&This->dispex, riid, ppvObject))
{
return *ppvObject ? S_OK : E_NOINTERFACE;

19
dlls/msxml3/tests/schema.c
View File

@ -1649,6 +1649,24 @@ static void test_remove(void)
free_bstrs();
}
static void test_ifaces(void)
{
IXMLDOMSchemaCollection2 *cache;
IUnknown *unk;
HRESULT hr;
cache = create_cache_version(60, &IID_IXMLDOMSchemaCollection2);
if (!cache) return;
/* CLSID_XMLSchemaCache60 is returned as an interface (the same as IXMLDOMSchemaCollection2). */
hr = IXMLDOMSchemaCollection2_QueryInterface(cache, &CLSID_XMLSchemaCache60, (void**)&unk);
ok (hr == S_OK, "Could not get CLSID_XMLSchemaCache60 iface: %08x\n", hr);
ok (unk == (IUnknown*)cache, "unk != cache\n");
IUnknown_Release(unk);
IXMLDOMSchemaCollection2_Release(cache);
}
START_TEST(schema)
{
HRESULT r;
@ -1666,6 +1684,7 @@ START_TEST(schema)
test_dispex();
test_get();
test_remove();
test_ifaces();
CoUninitialize();
}