mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 08:37:16 +00:00
msxml3: Trace backend error even when user error handler is not set.
This commit is contained in:
parent
2329d2afdd
commit
b1aaa86e14
|
@ -1298,15 +1298,6 @@ static void libxmlFatalError(void *ctx, const char *msg, ...)
|
|||
DWORD len;
|
||||
va_list args;
|
||||
|
||||
if(!has_error_handler(This))
|
||||
{
|
||||
xmlStopParser(This->pParserCtxt);
|
||||
This->ret = E_FAIL;
|
||||
return;
|
||||
}
|
||||
|
||||
FIXME("Error handling is not compatible.\n");
|
||||
|
||||
va_start(args, msg);
|
||||
vsprintf(message, msg, args);
|
||||
va_end(args);
|
||||
|
@ -1319,6 +1310,16 @@ static void libxmlFatalError(void *ctx, const char *msg, ...)
|
|||
TRACE("fatal error for %p: %s\n", This, debugstr_w(error));
|
||||
}
|
||||
|
||||
if(!has_error_handler(This))
|
||||
{
|
||||
xmlStopParser(This->pParserCtxt);
|
||||
This->ret = E_FAIL;
|
||||
heap_free(error);
|
||||
return;
|
||||
}
|
||||
|
||||
FIXME("Error handling is not compatible.\n");
|
||||
|
||||
if(This->vbInterface)
|
||||
{
|
||||
BSTR bstrError = SysAllocString(error);
|
||||
|
@ -1788,7 +1789,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz
|
|||
locator->pParserCtxt->userData = locator;
|
||||
|
||||
This->isParsing = TRUE;
|
||||
if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL;
|
||||
if(xmlParseDocument(locator->pParserCtxt) == -1) hr = E_FAIL;
|
||||
else hr = locator->ret;
|
||||
This->isParsing = FALSE;
|
||||
|
||||
|
|
Loading…
Reference in a new issue