Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
6d20b3f9
Commit
6d20b3f9
authored
Oct 13, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 13, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Don't use xmlnode's IXMLDOMNode iface in replaceChild implementations.
parent
91acf625
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
59 additions
and
23 deletions
+59
-23
attribute.c
dlls/msxml3/attribute.c
+4
-1
cdata.c
dlls/msxml3/cdata.c
+4
-1
comment.c
dlls/msxml3/comment.c
+4
-1
docfrag.c
dlls/msxml3/docfrag.c
+5
-1
domdoc.c
dlls/msxml3/domdoc.c
+4
-1
element.c
dlls/msxml3/element.c
+4
-1
entityref.c
dlls/msxml3/entityref.c
+4
-1
msxml_private.h
dlls/msxml3/msxml_private.h
+1
-0
node.c
dlls/msxml3/node.c
+21
-14
pi.c
dlls/msxml3/pi.c
+4
-1
text.c
dlls/msxml3/text.c
+4
-1
No files found.
dlls/msxml3/attribute.c
View file @
6d20b3f9
...
...
@@ -318,7 +318,10 @@ static HRESULT WINAPI domattr_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
domattr
*
This
=
impl_from_IXMLDOMAttribute
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p) needs tests
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
domattr_removeChild
(
...
...
dlls/msxml3/cdata.c
View file @
6d20b3f9
...
...
@@ -329,7 +329,10 @@ static HRESULT WINAPI domcdata_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
domcdata
*
This
=
impl_from_IXMLDOMCDATASection
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p) needs tests
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
domcdata_removeChild
(
...
...
dlls/msxml3/comment.c
View file @
6d20b3f9
...
...
@@ -322,7 +322,10 @@ static HRESULT WINAPI domcomment_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
domcomment
*
This
=
impl_from_IXMLDOMComment
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p) needs tests
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
domcomment_removeChild
(
...
...
dlls/msxml3/docfrag.c
View file @
6d20b3f9
...
...
@@ -325,7 +325,11 @@ static HRESULT WINAPI domfrag_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
domfrag
*
This
=
impl_from_IXMLDOMDocumentFragment
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
TRACE
(
"(%p)->(%p %p %p)
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
/* TODO: test */
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
domfrag_removeChild
(
...
...
dlls/msxml3/domdoc.c
View file @
6d20b3f9
...
...
@@ -1029,7 +1029,10 @@ static HRESULT WINAPI domdoc_replaceChild(
IXMLDOMNode
**
outOldChild
)
{
domdoc
*
This
=
impl_from_IXMLDOMDocument3
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newChild
,
oldChild
,
outOldChild
);
TRACE
(
"(%p)->(%p %p %p)
\n
"
,
This
,
newChild
,
oldChild
,
outOldChild
);
return
node_replace_child
(
&
This
->
node
,
newChild
,
oldChild
,
outOldChild
);
}
...
...
dlls/msxml3/element.c
View file @
6d20b3f9
...
...
@@ -334,7 +334,10 @@ static HRESULT WINAPI domelem_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
domelem
*
This
=
impl_from_IXMLDOMElement
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
TRACE
(
"(%p)->(%p %p %p)
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
domelem_removeChild
(
...
...
dlls/msxml3/entityref.c
View file @
6d20b3f9
...
...
@@ -320,7 +320,10 @@ static HRESULT WINAPI entityref_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
entityref
*
This
=
impl_from_IXMLDOMEntityReference
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p) needs test
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
entityref_removeChild
(
...
...
dlls/msxml3/msxml_private.h
View file @
6d20b3f9
...
...
@@ -169,6 +169,7 @@ extern HRESULT node_get_last_child(xmlnode*,IXMLDOMNode**);
extern
HRESULT
node_get_previous_sibling
(
xmlnode
*
,
IXMLDOMNode
**
);
extern
HRESULT
node_get_next_sibling
(
xmlnode
*
,
IXMLDOMNode
**
);
extern
HRESULT
node_insert_before
(
xmlnode
*
,
IXMLDOMNode
*
,
const
VARIANT
*
,
IXMLDOMNode
**
);
extern
HRESULT
node_replace_child
(
xmlnode
*
,
IXMLDOMNode
*
,
IXMLDOMNode
*
,
IXMLDOMNode
**
);
extern
HRESULT
DOMDocument_create_from_xmldoc
(
xmlDocPtr
xmldoc
,
IXMLDOMDocument3
**
document
);
...
...
dlls/msxml3/node.c
View file @
6d20b3f9
...
...
@@ -450,26 +450,20 @@ static HRESULT WINAPI xmlnode_insertBefore(
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
xmlnode_replaceChild
(
IXMLDOMNode
*
iface
,
IXMLDOMNode
*
newChild
,
IXMLDOMNode
*
oldChild
,
IXMLDOMNode
**
outOldChild
)
HRESULT
node_replace_child
(
xmlnode
*
This
,
IXMLDOMNode
*
newChild
,
IXMLDOMNode
*
oldChild
,
IXMLDOMNode
**
ret
)
{
xmlnode
*
This
=
impl_from_IXMLDOMNode
(
iface
);
xmlnode
*
old_child
,
*
new_child
;
xmlDocPtr
leaving_doc
;
xmlNode
*
my_ancestor
;
TRACE
(
"(%p)->(%p %p %p)
\n
"
,
This
,
newChild
,
oldChild
,
outOldChild
);
/* Do not believe any documentation telling that newChild == NULL
means removal. It does certainly *not* apply to msxml3! */
if
(
!
newChild
||
!
oldChild
)
return
E_INVALIDARG
;
if
(
outOldChild
)
*
outOldChild
=
NULL
;
if
(
ret
)
*
ret
=
NULL
;
old_child
=
get_node_obj
(
oldChild
);
if
(
!
old_child
)
{
...
...
@@ -479,7 +473,7 @@ static HRESULT WINAPI xmlnode_replaceChild(
if
(
old_child
->
node
->
parent
!=
This
->
node
)
{
WARN
(
"childNode %p is not a child of %p
\n
"
,
oldChild
,
iface
);
WARN
(
"childNode %p is not a child of %p
\n
"
,
oldChild
,
This
);
return
E_INVALIDARG
;
}
...
...
@@ -511,15 +505,25 @@ static HRESULT WINAPI xmlnode_replaceChild(
xmldoc_add_orphan
(
old_child
->
node
->
doc
,
old_child
->
node
);
if
(
outOldChild
)
if
(
ret
)
{
IXMLDOMNode_AddRef
(
oldChild
);
*
outOldChild
=
oldChild
;
*
ret
=
oldChild
;
}
return
S_OK
;
}
static
HRESULT
WINAPI
xmlnode_replaceChild
(
IXMLDOMNode
*
iface
,
IXMLDOMNode
*
newChild
,
IXMLDOMNode
*
oldChild
,
IXMLDOMNode
**
outOldChild
)
{
ERR
(
"Should not be called
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
xmlnode_removeChild
(
IXMLDOMNode
*
iface
,
IXMLDOMNode
*
childNode
,
...
...
@@ -1852,7 +1856,10 @@ static HRESULT WINAPI unknode_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
unknode
*
This
=
impl_from_unkIXMLDOMNode
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p)
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
unknode_removeChild
(
...
...
dlls/msxml3/pi.c
View file @
6d20b3f9
...
...
@@ -336,7 +336,10 @@ static HRESULT WINAPI dom_pi_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
dom_pi
*
This
=
impl_from_IXMLDOMProcessingInstruction
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p) needs test
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
dom_pi_removeChild
(
...
...
dlls/msxml3/text.c
View file @
6d20b3f9
...
...
@@ -335,7 +335,10 @@ static HRESULT WINAPI domtext_replaceChild(
IXMLDOMNode
**
outOldNode
)
{
domtext
*
This
=
impl_from_IXMLDOMText
(
iface
);
return
IXMLDOMNode_replaceChild
(
IXMLDOMNode_from_impl
(
&
This
->
node
),
newNode
,
oldNode
,
outOldNode
);
FIXME
(
"(%p)->(%p %p %p) needs test
\n
"
,
This
,
newNode
,
oldNode
,
outOldNode
);
return
node_replace_child
(
&
This
->
node
,
newNode
,
oldNode
,
outOldNode
);
}
static
HRESULT
WINAPI
domtext_removeChild
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment