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
11d1ff15
Commit
11d1ff15
authored
Mar 16, 2011
by
Francois Gouget
Committed by
Alexandre Julliard
Mar 16, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Make element_get_dt() static and move it around to avoid a forward declaration.
parent
60b63fea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
47 deletions
+46
-47
element.c
dlls/msxml3/element.c
+46
-46
msxml_private.h
dlls/msxml3/msxml_private.h
+0
-1
No files found.
dlls/msxml3/element.c
View file @
11d1ff15
...
@@ -671,6 +671,52 @@ static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v)
...
@@ -671,6 +671,52 @@ static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v)
return
hr
;
return
hr
;
}
}
static
XDR_DT
element_get_dt
(
xmlNodePtr
node
)
{
XDR_DT
dt
=
DT_INVALID
;
TRACE
(
"(%p)
\n
"
,
node
);
if
(
node
->
type
!=
XML_ELEMENT_NODE
)
{
FIXME
(
"invalid element node
\n
"
);
return
dt
;
}
if
(
node
->
ns
&&
xmlStrEqual
(
node
->
ns
->
href
,
DT_nsURI
))
{
dt
=
str_to_dt
(
node
->
name
,
-
1
);
}
else
{
xmlChar
*
pVal
=
xmlGetNsProp
(
node
,
BAD_CAST
"dt"
,
DT_nsURI
);
if
(
pVal
)
{
dt
=
str_to_dt
(
pVal
,
-
1
);
xmlFree
(
pVal
);
}
else
if
(
node
->
doc
)
{
IXMLDOMDocument3
*
doc
=
(
IXMLDOMDocument3
*
)
create_domdoc
((
xmlNodePtr
)
node
->
doc
);
if
(
doc
)
{
VARIANT
v
;
VariantInit
(
&
v
);
if
(
IXMLDOMDocument3_get_schemas
(
doc
,
&
v
)
==
S_OK
&&
V_VT
(
&
v
)
==
VT_DISPATCH
)
{
dt
=
SchemaCache_get_node_dt
((
IXMLDOMSchemaCollection2
*
)
V_DISPATCH
(
&
v
),
node
);
}
VariantClear
(
&
v
);
IXMLDOMDocument3_Release
(
doc
);
}
}
}
TRACE
(
"=> dt:%s
\n
"
,
dt_to_str
(
dt
));
return
dt
;
}
static
HRESULT
WINAPI
domelem_get_nodeTypedValue
(
static
HRESULT
WINAPI
domelem_get_nodeTypedValue
(
IXMLDOMElement
*
iface
,
IXMLDOMElement
*
iface
,
VARIANT
*
var1
)
VARIANT
*
var1
)
...
@@ -730,52 +776,6 @@ static HRESULT WINAPI domelem_put_nodeTypedValue(
...
@@ -730,52 +776,6 @@ static HRESULT WINAPI domelem_put_nodeTypedValue(
return
hr
;
return
hr
;
}
}
XDR_DT
element_get_dt
(
xmlNodePtr
node
)
{
XDR_DT
dt
=
DT_INVALID
;
TRACE
(
"(%p)
\n
"
,
node
);
if
(
node
->
type
!=
XML_ELEMENT_NODE
)
{
FIXME
(
"invalid element node
\n
"
);
return
dt
;
}
if
(
node
->
ns
&&
xmlStrEqual
(
node
->
ns
->
href
,
DT_nsURI
))
{
dt
=
str_to_dt
(
node
->
name
,
-
1
);
}
else
{
xmlChar
*
pVal
=
xmlGetNsProp
(
node
,
BAD_CAST
"dt"
,
DT_nsURI
);
if
(
pVal
)
{
dt
=
str_to_dt
(
pVal
,
-
1
);
xmlFree
(
pVal
);
}
else
if
(
node
->
doc
)
{
IXMLDOMDocument3
*
doc
=
(
IXMLDOMDocument3
*
)
create_domdoc
((
xmlNodePtr
)
node
->
doc
);
if
(
doc
)
{
VARIANT
v
;
VariantInit
(
&
v
);
if
(
IXMLDOMDocument3_get_schemas
(
doc
,
&
v
)
==
S_OK
&&
V_VT
(
&
v
)
==
VT_DISPATCH
)
{
dt
=
SchemaCache_get_node_dt
((
IXMLDOMSchemaCollection2
*
)
V_DISPATCH
(
&
v
),
node
);
}
VariantClear
(
&
v
);
IXMLDOMDocument3_Release
(
doc
);
}
}
}
TRACE
(
"=> dt:%s
\n
"
,
dt_to_str
(
dt
));
return
dt
;
}
static
HRESULT
WINAPI
domelem_get_dataType
(
static
HRESULT
WINAPI
domelem_get_dataType
(
IXMLDOMElement
*
iface
,
IXMLDOMElement
*
iface
,
VARIANT
*
typename
)
VARIANT
*
typename
)
...
...
dlls/msxml3/msxml_private.h
View file @
11d1ff15
...
@@ -317,7 +317,6 @@ extern XDR_DT str_to_dt(xmlChar const* str, int len /* calculated if -1 */);
...
@@ -317,7 +317,6 @@ extern XDR_DT str_to_dt(xmlChar const* str, int len /* calculated if -1 */);
extern
XDR_DT
bstr_to_dt
(
OLECHAR
const
*
bstr
,
int
len
/* calculated if -1 */
);
extern
XDR_DT
bstr_to_dt
(
OLECHAR
const
*
bstr
,
int
len
/* calculated if -1 */
);
extern
xmlChar
const
*
dt_to_str
(
XDR_DT
dt
);
extern
xmlChar
const
*
dt_to_str
(
XDR_DT
dt
);
extern
OLECHAR
const
*
dt_to_bstr
(
XDR_DT
dt
);
extern
OLECHAR
const
*
dt_to_bstr
(
XDR_DT
dt
);
extern
XDR_DT
element_get_dt
(
xmlNodePtr
node
);
extern
HRESULT
dt_validate
(
XDR_DT
dt
,
xmlChar
const
*
content
);
extern
HRESULT
dt_validate
(
XDR_DT
dt
,
xmlChar
const
*
content
);
extern
BSTR
EnsureCorrectEOL
(
BSTR
);
extern
BSTR
EnsureCorrectEOL
(
BSTR
);
...
...
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