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
c4852be2
Commit
c4852be2
authored
Jun 20, 2010
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 21, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Don't force parser encoding when loading from file.
parent
a758a67a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
domdoc.c
dlls/msxml3/domdoc.c
+5
-5
node.c
dlls/msxml3/node.c
+1
-0
No files found.
dlls/msxml3/domdoc.c
View file @
c4852be2
...
...
@@ -141,14 +141,14 @@ static xmldoc_priv * create_priv(void)
return
priv
;
}
static
xmlDocPtr
doparse
(
char
*
ptr
,
int
len
)
static
xmlDocPtr
doparse
(
char
*
ptr
,
int
len
,
const
char
*
encoding
)
{
#ifdef HAVE_XMLREADMEMORY
/*
* use xmlReadMemory if possible so we can suppress
* writing errors to stderr
*/
return
xmlReadMemory
(
ptr
,
len
,
NULL
,
"UTF-8"
,
return
xmlReadMemory
(
ptr
,
len
,
NULL
,
encoding
,
XML_PARSE_NOERROR
|
XML_PARSE_NOWARNING
|
XML_PARSE_NOBLANKS
);
#else
return
xmlParseMemory
(
ptr
,
len
);
...
...
@@ -1447,7 +1447,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len)
domdoc
*
This
=
obj
;
xmlDocPtr
xmldoc
;
xmldoc
=
doparse
(
ptr
,
len
);
xmldoc
=
doparse
(
ptr
,
len
,
NULL
);
if
(
xmldoc
)
{
xmldoc
->
_private
=
create_priv
();
return
attach_xmldoc
(
&
This
->
node
,
xmldoc
);
...
...
@@ -1683,9 +1683,9 @@ static HRESULT WINAPI domdoc_loadXML(
{
*
isSuccessful
=
VARIANT_FALSE
;
if
(
bstrXML
&&
bstr_to_utf8
(
bstrXML
,
&
str
,
&
len
)
)
if
(
bstrXML
&&
bstr_to_utf8
(
bstrXML
,
&
str
,
&
len
)
)
{
xmldoc
=
doparse
(
str
,
len
);
xmldoc
=
doparse
(
str
,
len
,
"UTF-8"
);
heap_free
(
str
);
if
(
!
xmldoc
)
This
->
error
=
E_FAIL
;
...
...
dlls/msxml3/node.c
View file @
c4852be2
...
...
@@ -437,6 +437,7 @@ static HRESULT WINAPI xmlnode_get_firstChild(
IXMLDOMNode
**
firstChild
)
{
xmlnode
*
This
=
impl_from_IXMLDOMNode
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
firstChild
);
return
get_node
(
This
,
"firstChild"
,
This
->
node
->
children
,
firstChild
);
}
...
...
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