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

msxml3/schema: Properly handle schema_cache_add() from a URL.

Browse Source
This commit is contained in:
Adam Martinson 2010-11-24 13:53:38 -06:00 committed by Alexandre Julliard
parent 54d949fbe8
commit 10e2d26e3f
1 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
dlls/msxml3/schema.c
View File

@ -818,38 +818,6 @@ static BOOL link_datatypes(xmlDocPtr schema)
return TRUE; return TRUE;
} }
static cache_entry* cache_entry_from_url(char const* url, xmlChar const* nsURI)
{
cache_entry* entry = heap_alloc(sizeof(cache_entry));
xmlSchemaParserCtxtPtr spctx = xmlSchemaNewParserCtxt(url);
entry->type = SCHEMA_TYPE_XSD;
entry->ref = 0;
if (spctx)
{
if((entry->schema = Schema_parse(spctx)))
{
/* TODO: if the nsURI is different from the default xmlns or targetNamespace,
* do we need to do something special here? */
xmldoc_init(entry->schema->doc, &CLSID_DOMDocument40);
entry->doc = entry->schema->doc;
xmldoc_add_ref(entry->doc);
}
else
{
heap_free(entry);
entry = NULL;
}
xmlSchemaFreeParserCtxt(spctx);
}
else
{
FIXME("schema for nsURI %s not found\n", wine_dbgstr_a(url));
heap_free(entry);
entry = NULL;
}
return entry;
}
static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI) static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI)
{ {
cache_entry* entry = heap_alloc(sizeof(cache_entry)); cache_entry* entry = heap_alloc(sizeof(cache_entry));
@ -914,6 +882,55 @@ static cache_entry* cache_entry_from_xdr_doc(xmlDocPtr doc, xmlChar const* nsURI
return entry; return entry;
} }
static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI)
{
cache_entry* entry;
IXMLDOMDocument3* domdoc = NULL;
xmlDocPtr doc = NULL;
HRESULT hr = DOMDocument_create(&CLSID_DOMDocument, NULL, (void**)&domdoc);
VARIANT_BOOL b = VARIANT_FALSE;
SCHEMA_TYPE type = SCHEMA_TYPE_INVALID;
if (hr != S_OK)
{
FIXME("failed to create domdoc\n");
return NULL;
}
assert(domdoc != NULL);
assert(V_VT(&url) == VT_BSTR);
hr = IXMLDOMDocument3_load(domdoc, url, &b);
if (hr != S_OK)
{
ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr);
if (b != VARIANT_TRUE)
{
FIXME("Failed to load doc at %s\n", wine_dbgstr_w(V_BSTR(&url)));
IXMLDOMDocument3_Release(domdoc);
return NULL;
}
}
doc = xmlNodePtr_from_domnode((IXMLDOMNode*)domdoc, XML_DOCUMENT_NODE)->doc;
type = schema_type_from_xmlDocPtr(doc);
switch (type)
{
case SCHEMA_TYPE_XSD:
entry = cache_entry_from_xsd_doc(doc, nsURI);
break;
case SCHEMA_TYPE_XDR:
entry = cache_entry_from_xdr_doc(doc, nsURI);
break;
case SCHEMA_TYPE_INVALID:
entry = NULL;
FIXME("invalid schema\n");
break;
}
IXMLDOMDocument3_Release(domdoc);
return entry;
}
static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* iface, static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* iface,
REFIID riid, void** ppvObject) REFIID riid, void** ppvObject)
{ {
@ -1056,9 +1073,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri
case VT_BSTR: case VT_BSTR:
{ {
xmlChar* url = xmlChar_from_wchar(V_BSTR(&var)); cache_entry* entry = cache_entry_from_url(var, name);
cache_entry* entry = cache_entry_from_url((char const*)url, name);
heap_free(url);
if (entry) if (entry)
{ {