Author: akhaldi Date: Sun Jul 19 23:07:13 2015 New Revision: 68465
URL: http://svn.reactos.org/svn/reactos?rev=68465&view=rev Log: [MSXML3] Sync with Wine Staging 1.7.47. CORE-9924
Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/xslpattern.l trunk/reactos/dll/win32/msxml3/xslpattern.yy.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?r... ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -2120,7 +2120,13 @@ case 1: /* Only takes UTF-8 strings. * NOT NULL-terminated. */ - SafeArrayAccessData(psa, (void**)&str); + hr = SafeArrayAccessData(psa, (void**)&str); + if (FAILED(hr)) + { + This->error = hr; + WARN("failed to access array data, 0x%08x\n", hr); + break; + } SafeArrayGetUBound(psa, 1, &len);
if ((xmldoc = doparse(This, str, ++len, XML_CHAR_ENCODING_UTF8)))
Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -1598,7 +1598,29 @@
FIXME("(%p)->(%p)\n", This, domNodeType);
- *domNodeType = This->node.node->type; + switch (This->node.node->type) + { + case XML_ELEMENT_NODE: + case XML_ATTRIBUTE_NODE: + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_ENTITY_REF_NODE: + case XML_ENTITY_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_TYPE_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_NOTATION_NODE: + /* we only care about this set of types, libxml2 type values are + exactly what we need */ + *domNodeType = (DOMNodeType)This->node.node->type; + break; + default: + *domNodeType = NODE_INVALID; + break; + } + return S_OK; }
@@ -1997,9 +2019,11 @@ pUnk = create_doc_fragment( node ); break; case XML_DTD_NODE: + case XML_DOCUMENT_TYPE_NODE: pUnk = create_doc_type( node ); break; - default: { + case XML_ENTITY_NODE: + case XML_NOTATION_NODE: { unknode *new_node;
FIXME("only creating basic node for type %d\n", node->type); @@ -2012,7 +2036,11 @@ new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; - } + break; + } + default: + ERR("Called for unsupported node type %d\n", node->type); + return NULL; }
hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret);
Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader.... ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -646,7 +646,7 @@ { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, - NULL, hr, 0, msg, sizeof(msg), NULL)) + NULL, hr, 0, msg, sizeof(msg)/sizeof(msg[0]), NULL)) { FIXME("MSXML errors not yet supported.\n"); msg[0] = '\0';
Modified: trunk/reactos/dll/win32/msxml3/xslpattern.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpattern... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.l [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.l [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -152,6 +152,7 @@
%%
+xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p;
Modified: trunk/reactos/dll/win32/msxml3/xslpattern.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpattern... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -2211,6 +2211,7 @@
+xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -134,7 +134,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.37 reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.37
-
akhaldi＠svn.reactos.org