Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSXML3] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=67092
This commit is contained in:
Amine Khaldi 2015-04-08 17:15:30 +00:00
parent a7321a085f
commit 78e4e49279
6 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/msxml3/doctype.c
View file

@ -134,8 +134,8 @@ static HRESULT WINAPI domdoctype_get_nodeName(
BSTR* p )
{
domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
FIXME("(%p)->(%p): stub\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return node_get_nodeName(&This->node, p);
}
static HRESULT WINAPI domdoctype_get_nodeValue(
@ -468,8 +468,8 @@ static HRESULT WINAPI domdoctype_get_name(
BSTR *p)
{
domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
FIXME("(%p)->(%p): stub\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return node_get_nodeName(&This->node, p);
}
static HRESULT WINAPI domdoctype_get_entities(

26
reactos/dll/win32/msxml3/node.c
View file

@ -458,15 +458,19 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT
xmlnode *before_node_obj = get_node_obj(before);
IXMLDOMNode_Release(before);
if(!before_node_obj) return E_FAIL;
}
/* unlink from current parent first */
if(node_obj->parent)
{
hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL);
if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node);
}
/* unlink from current parent first */
if(node_obj->parent)
{
hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL);
if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node);
}
doc = node_obj->node->doc;
doc = node_obj->node->doc;
if(before)
{
xmlnode *before_node_obj = get_node_obj(before);
/* refs count including subtree */
if (doc != before_node_obj->node->doc)
@ -479,14 +483,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT
}
else
{
/* unlink from current parent first */
if(node_obj->parent)
{
hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL);
if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node);
}
doc = node_obj->node->doc;
if (doc != This->node->doc)
refcount = xmlnode_get_inst_cnt(node_obj);

4
reactos/dll/win32/msxml3/pi.c
View file

@ -665,7 +665,9 @@ static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR
static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item)
{
FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item );
return E_NOTIMPL;
if (item)
*item = NULL;
return S_FALSE;
}
static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem)

6
reactos/dll/win32/msxml3/xdr.c
View file

@ -35,7 +35,6 @@
static const xmlChar DT_prefix[] = "dt";
static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes";
static const xmlChar XDR_prefix[] = "xdr";
static const xmlChar XDR_href[] = "urn:schemas-microsoft-com:xml-data";
static const xmlChar XSD_prefix[] = "xsd";
static const xmlChar XSD_href[] = "http://www.w3.org/2001/XMLSchema";
@ -48,7 +47,6 @@ static const xmlChar xs_attribute[] = "attribute";
static const xmlChar xs_AttributeType[] = "AttributeType";
static const xmlChar xs_base[] = "base";
static const xmlChar xs_choice[] = "choice";
static const xmlChar xs_complexContent[] = "complexContent";
static const xmlChar xs_complexType[] = "complexType";
static const xmlChar xs_content[] = "content";
static const xmlChar xs_datatype[] = "datatype";
@ -58,7 +56,6 @@ static const xmlChar xs_documentation[] = "documentation";
static const xmlChar xs_element[] = "element";
static const xmlChar xs_ElementType[] = "ElementType";
static const xmlChar xs_eltOnly[] = "eltOnly";
static const xmlChar xs_empty[] = "empty";
static const xmlChar xs_enumeration[] = "enumeration";
static const xmlChar xs_extension[] = "extension";
static const xmlChar xs_group[] = "group";
@ -72,7 +69,6 @@ static const xmlChar xs_model[] = "model";
static const xmlChar xs_name[] = "name";
static const xmlChar xs_namespace[] = "namespace";
static const xmlChar xs_no[] = "no";
static const xmlChar xs_one[] = "one";
static const xmlChar xs_open[] = "open";
static const xmlChar xs_optional[] = "optional";
static const xmlChar xs_order[] = "order";
@ -81,7 +77,6 @@ static const xmlChar xs_ref[] = "ref";
static const xmlChar xs_required[] = "required";
static const xmlChar xs_restriction[] = "restriction";
static const xmlChar xs_schema[] = "schema";
static const xmlChar xs_Schema[] = "Schema";
static const xmlChar xs_seq[] = "seq";
static const xmlChar xs_sequence[] = "sequence";
static const xmlChar xs_simpleContent[] = "simpleContent";
@ -96,7 +91,6 @@ static const xmlChar xs_use[] = "use";
static const xmlChar xs_value[] = "value";
static const xmlChar xs_values[] = "values";
static const xmlChar xs_xsd_string[] = "xsd:string";
static const xmlChar xs_yes[] = "yes";
typedef enum _CONTENT_TYPE
{

2
reactos/dll/win32/msxml3/xslpattern.y
View file

@ -70,7 +70,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons
%start XSLPattern
%pure_parser
%pure-parser
%parse-param {parser_param* p}
%parse-param {void* scanner}
%lex-param {yyscan_t* scanner}

2
reactos/media/doc/README.WINE
View file

@ -140,7 +140,7 @@ reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37
reactos/dll/win32/msvidc32 # Synced to Wine-1.7.27
reactos/dll/win32/msxml # Synced to Wine-1.7.27
reactos/dll/win32/msxml2 # Synced to Wine-1.7.27
reactos/dll/win32/msxml3 # Synced to Wine-1.7.27
reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.37
reactos/dll/win32/msxml4 # Synced to Wine-1.7.27
reactos/dll/win32/msxml6 # Synced to Wine-1.7.27
reactos/dll/win32/nddeapi # Synced to Wine-1.7.27