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
cce65b70
Commit
cce65b70
authored
Feb 21, 2006
by
Huw Davies
Committed by
Alexandre Julliard
Feb 21, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Improve parse error handling a bit.
parent
7ee50b69
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
4 deletions
+31
-4
domdoc.c
dlls/msxml3/domdoc.c
+21
-2
parseerror.c
dlls/msxml3/parseerror.c
+10
-2
No files found.
dlls/msxml3/domdoc.c
View file @
cce65b70
...
...
@@ -168,6 +168,7 @@ typedef struct _domdoc
VARIANT_BOOL
async
;
IUnknown
*
node_unk
;
IXMLDOMNode
*
node
;
HRESULT
error
;
}
domdoc
;
LONG
xmldoc_add_ref
(
xmlDocPtr
doc
)
...
...
@@ -978,8 +979,13 @@ static HRESULT WINAPI domdoc_load(
return
S_FALSE
;
xmldoc
=
doread
(
filename
);
if
(
!
xmldoc
)
return
S_FALSE
;
if
(
!
xmldoc
)
{
This
->
error
=
E_FAIL
;
return
S_FALSE
;
}
This
->
error
=
S_OK
;
xmldoc
->
_private
=
0
;
attach_xmlnode
(
This
->
node
,
(
xmlNodePtr
)
xmldoc
);
...
...
@@ -1001,8 +1007,16 @@ static HRESULT WINAPI domdoc_get_parseError(
IXMLDOMDocument
*
iface
,
IXMLDOMParseError
**
errorObj
)
{
BSTR
error_string
=
NULL
;
static
const
WCHAR
err
[]
=
{
'e'
,
'r'
,
'r'
,
'o'
,
'r'
,
0
};
domdoc
*
This
=
impl_from_IXMLDOMDocument
(
iface
);
FIXME
(
"(%p)->(%p): creating a dummy parseError
\n
"
,
iface
,
errorObj
);
*
errorObj
=
create_parseError
(
0
,
NULL
,
NULL
,
NULL
,
0
,
0
,
0
);
if
(
This
->
error
)
error_string
=
SysAllocString
(
err
);
*
errorObj
=
create_parseError
(
This
->
error
,
NULL
,
error_string
,
NULL
,
0
,
0
,
0
);
if
(
!*
errorObj
)
return
E_OUTOFMEMORY
;
return
S_OK
;
}
...
...
@@ -1094,8 +1108,12 @@ static HRESULT WINAPI domdoc_loadXML(
xmldoc
=
doparse
(
str
,
len
);
HeapFree
(
GetProcessHeap
(),
0
,
str
);
if
(
!
xmldoc
)
{
This
->
error
=
E_FAIL
;
return
S_FALSE
;
}
This
->
error
=
S_OK
;
xmldoc
->
_private
=
0
;
attach_xmlnode
(
This
->
node
,
(
xmlNodePtr
)
xmldoc
);
...
...
@@ -1317,6 +1335,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj)
doc
->
lpVtbl
=
&
domdoc_vtbl
;
doc
->
ref
=
1
;
doc
->
async
=
0
;
doc
->
error
=
S_OK
;
doc
->
node_unk
=
create_basic_node
(
NULL
,
(
IUnknown
*
)
&
doc
->
lpVtbl
);
if
(
!
doc
->
node_unk
)
...
...
dlls/msxml3/parseerror.c
View file @
cce65b70
...
...
@@ -173,8 +173,16 @@ static HRESULT WINAPI parseError_get_reason(
IXMLDOMParseError
*
iface
,
BSTR
*
reason
)
{
FIXME
(
"
\n
"
);
return
E_NOTIMPL
;
parse_error_t
*
This
=
impl_from_IXMLDOMParseError
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
reason
);
if
(
!
This
->
reason
)
{
*
reason
=
NULL
;
return
S_FALSE
;
}
*
reason
=
SysAllocString
(
This
->
reason
);
return
S_OK
;
}
static
HRESULT
WINAPI
parseError_get_srcText
(
...
...
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