Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
004944c8
Commit
004944c8
authored
Feb 23, 2011
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 24, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Remove selectNodes() forward.
parent
a1c8f6df
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
27 additions
and
23 deletions
+27
-23
attribute.c
dlls/msxml3/attribute.c
+2
-1
cdata.c
dlls/msxml3/cdata.c
+2
-1
comment.c
dlls/msxml3/comment.c
+2
-1
docfrag.c
dlls/msxml3/docfrag.c
+2
-1
domdoc.c
dlls/msxml3/domdoc.c
+4
-3
element.c
dlls/msxml3/element.c
+2
-1
entityref.c
dlls/msxml3/entityref.c
+2
-1
msxml_private.h
dlls/msxml3/msxml_private.h
+1
-0
node.c
dlls/msxml3/node.c
+6
-12
pi.c
dlls/msxml3/pi.c
+2
-1
text.c
dlls/msxml3/text.c
+2
-1
No files found.
dlls/msxml3/attribute.c
View file @
004944c8
...
@@ -489,7 +489,8 @@ static HRESULT WINAPI domattr_selectNodes(
...
@@ -489,7 +489,8 @@ static HRESULT WINAPI domattr_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
domattr
*
This
=
impl_from_IXMLDOMAttribute
(
iface
);
domattr
*
This
=
impl_from_IXMLDOMAttribute
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
domattr_selectSingleNode
(
static
HRESULT
WINAPI
domattr_selectSingleNode
(
...
...
dlls/msxml3/cdata.c
View file @
004944c8
...
@@ -499,7 +499,8 @@ static HRESULT WINAPI domcdata_selectNodes(
...
@@ -499,7 +499,8 @@ static HRESULT WINAPI domcdata_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
domcdata
*
This
=
impl_from_IXMLDOMCDATASection
(
iface
);
domcdata
*
This
=
impl_from_IXMLDOMCDATASection
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
domcdata_selectSingleNode
(
static
HRESULT
WINAPI
domcdata_selectSingleNode
(
...
...
dlls/msxml3/comment.c
View file @
004944c8
...
@@ -492,7 +492,8 @@ static HRESULT WINAPI domcomment_selectNodes(
...
@@ -492,7 +492,8 @@ static HRESULT WINAPI domcomment_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
domcomment
*
This
=
impl_from_IXMLDOMComment
(
iface
);
domcomment
*
This
=
impl_from_IXMLDOMComment
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
domcomment_selectSingleNode
(
static
HRESULT
WINAPI
domcomment_selectSingleNode
(
...
...
dlls/msxml3/docfrag.c
View file @
004944c8
...
@@ -496,7 +496,8 @@ static HRESULT WINAPI domfrag_selectNodes(
...
@@ -496,7 +496,8 @@ static HRESULT WINAPI domfrag_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
domfrag
*
This
=
impl_from_IXMLDOMDocumentFragment
(
iface
);
domfrag
*
This
=
impl_from_IXMLDOMDocumentFragment
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
domfrag_selectSingleNode
(
static
HRESULT
WINAPI
domfrag_selectSingleNode
(
...
...
dlls/msxml3/domdoc.c
View file @
004944c8
...
@@ -1442,11 +1442,12 @@ static HRESULT WINAPI domdoc_transformNode(
...
@@ -1442,11 +1442,12 @@ static HRESULT WINAPI domdoc_transformNode(
static
HRESULT
WINAPI
domdoc_selectNodes
(
static
HRESULT
WINAPI
domdoc_selectNodes
(
IXMLDOMDocument3
*
iface
,
IXMLDOMDocument3
*
iface
,
BSTR
queryString
,
BSTR
p
,
IXMLDOMNodeList
**
resultList
)
IXMLDOMNodeList
**
outList
)
{
{
domdoc
*
This
=
impl_from_IXMLDOMDocument3
(
iface
);
domdoc
*
This
=
impl_from_IXMLDOMDocument3
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
queryString
,
resultList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
...
...
dlls/msxml3/element.c
View file @
004944c8
...
@@ -948,7 +948,8 @@ static HRESULT WINAPI domelem_selectNodes(
...
@@ -948,7 +948,8 @@ static HRESULT WINAPI domelem_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
domelem
*
This
=
impl_from_IXMLDOMElement
(
iface
);
domelem
*
This
=
impl_from_IXMLDOMElement
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
domelem_selectSingleNode
(
static
HRESULT
WINAPI
domelem_selectSingleNode
(
...
...
dlls/msxml3/entityref.c
View file @
004944c8
...
@@ -490,7 +490,8 @@ static HRESULT WINAPI entityref_selectNodes(
...
@@ -490,7 +490,8 @@ static HRESULT WINAPI entityref_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
entityref
*
This
=
impl_from_IXMLDOMEntityReference
(
iface
);
entityref
*
This
=
impl_from_IXMLDOMEntityReference
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
entityref_selectSingleNode
(
static
HRESULT
WINAPI
entityref_selectSingleNode
(
...
...
dlls/msxml3/msxml_private.h
View file @
004944c8
...
@@ -268,6 +268,7 @@ extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**);
...
@@ -268,6 +268,7 @@ extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**);
extern
HRESULT
node_has_childnodes
(
const
xmlnode
*
,
VARIANT_BOOL
*
);
extern
HRESULT
node_has_childnodes
(
const
xmlnode
*
,
VARIANT_BOOL
*
);
extern
HRESULT
node_get_owner_doc
(
const
xmlnode
*
,
IXMLDOMDocument
**
);
extern
HRESULT
node_get_owner_doc
(
const
xmlnode
*
,
IXMLDOMDocument
**
);
extern
HRESULT
node_get_text
(
const
xmlnode
*
,
BSTR
*
);
extern
HRESULT
node_get_text
(
const
xmlnode
*
,
BSTR
*
);
extern
HRESULT
node_select_nodes
(
const
xmlnode
*
,
BSTR
,
IXMLDOMNodeList
**
);
extern
HRESULT
get_domdoc_from_xmldoc
(
xmlDocPtr
xmldoc
,
IXMLDOMDocument3
**
document
);
extern
HRESULT
get_domdoc_from_xmldoc
(
xmlDocPtr
xmldoc
,
IXMLDOMDocument3
**
document
);
...
...
dlls/msxml3/node.c
View file @
004944c8
...
@@ -1032,21 +1032,15 @@ static HRESULT WINAPI xmlnode_transformNode(
...
@@ -1032,21 +1032,15 @@ static HRESULT WINAPI xmlnode_transformNode(
#endif
#endif
}
}
static
HRESULT
WINAPI
xmlnode_selectNodes
(
HRESULT
node_select_nodes
(
const
xmlnode
*
This
,
BSTR
query
,
IXMLDOMNodeList
**
nodes
)
IXMLDOMNode
*
iface
,
BSTR
queryString
,
IXMLDOMNodeList
**
resultList
)
{
{
xmlnode
*
This
=
impl_from_IXMLDOMNode
(
iface
);
xmlChar
*
str
;
xmlChar
*
str
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
queryString
),
resultList
)
;
if
(
!
query
||
!
nodes
)
return
E_INVALIDARG
;
if
(
!
queryString
||
!
resultList
)
return
E_INVALIDARG
;
str
=
xmlChar_from_wchar
(
query
);
hr
=
queryresult_create
(
This
->
node
,
str
,
nodes
);
str
=
xmlChar_from_wchar
(
queryString
);
hr
=
queryresult_create
(
This
->
node
,
str
,
resultList
);
heap_free
(
str
);
heap_free
(
str
);
return
hr
;
return
hr
;
...
@@ -1161,7 +1155,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
...
@@ -1161,7 +1155,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL
,
NULL
,
NULL
,
NULL
,
xmlnode_transformNode
,
xmlnode_transformNode
,
xmlnode_selectNodes
,
NULL
,
xmlnode_selectSingleNode
xmlnode_selectSingleNode
};
};
...
@@ -1632,7 +1626,7 @@ static HRESULT WINAPI unknode_selectNodes(
...
@@ -1632,7 +1626,7 @@ static HRESULT WINAPI unknode_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
unknode
*
This
=
unknode_from_IXMLDOMNode
(
iface
);
unknode
*
This
=
unknode_from_IXMLDOMNode
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
unknode_selectSingleNode
(
static
HRESULT
WINAPI
unknode_selectSingleNode
(
...
...
dlls/msxml3/pi.c
View file @
004944c8
...
@@ -507,7 +507,8 @@ static HRESULT WINAPI dom_pi_selectNodes(
...
@@ -507,7 +507,8 @@ static HRESULT WINAPI dom_pi_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
dom_pi
*
This
=
impl_from_IXMLDOMProcessingInstruction
(
iface
);
dom_pi
*
This
=
impl_from_IXMLDOMProcessingInstruction
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
dom_pi_selectSingleNode
(
static
HRESULT
WINAPI
dom_pi_selectSingleNode
(
...
...
dlls/msxml3/text.c
View file @
004944c8
...
@@ -577,7 +577,8 @@ static HRESULT WINAPI domtext_selectNodes(
...
@@ -577,7 +577,8 @@ static HRESULT WINAPI domtext_selectNodes(
BSTR
p
,
IXMLDOMNodeList
**
outList
)
BSTR
p
,
IXMLDOMNodeList
**
outList
)
{
{
domtext
*
This
=
impl_from_IXMLDOMText
(
iface
);
domtext
*
This
=
impl_from_IXMLDOMText
(
iface
);
return
IXMLDOMNode_selectNodes
(
&
This
->
node
.
IXMLDOMNode_iface
,
p
,
outList
);
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
p
),
outList
);
return
node_select_nodes
(
&
This
->
node
,
p
,
outList
);
}
}
static
HRESULT
WINAPI
domtext_selectSingleNode
(
static
HRESULT
WINAPI
domtext_selectSingleNode
(
...
...
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