ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Improve parse error handling a bit.

This commit is contained in:
Huw Davies 2006-02-21 11:52:25 +00:00 committed by Alexandre Julliard
parent 7ee50b699d
commit cce65b70b7
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/msxml3/domdoc.c
View File

@ -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)

12
dlls/msxml3/parseerror.c
View File

@ -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(