msxml3: Accept S_FALSE as a valid callback result when msxml6 is used.
This commit is contained in:
parent
e84c41028b
commit
2b671cad96
|
@ -1170,7 +1170,7 @@ static void libxmlStartDocument(void *ctx)
|
||||||
else
|
else
|
||||||
hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler);
|
hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler);
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1201,7 +1201,7 @@ static void libxmlEndDocument(void *ctx)
|
||||||
else
|
else
|
||||||
hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler);
|
hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler);
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1248,7 +1248,7 @@ static void libxmlStartElementNS(
|
||||||
Prefix, SysStringLen(Prefix),
|
Prefix, SysStringLen(Prefix),
|
||||||
Uri, SysStringLen(Uri));
|
Uri, SysStringLen(Uri));
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
{
|
{
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
return;
|
return;
|
||||||
|
@ -1274,7 +1274,7 @@ static void libxmlStartElementNS(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1320,7 +1320,7 @@ static void libxmlEndElementNS(
|
||||||
LocalName, SysStringLen(LocalName),
|
LocalName, SysStringLen(LocalName),
|
||||||
QName, SysStringLen(QName));
|
QName, SysStringLen(QName));
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
{
|
{
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
return;
|
return;
|
||||||
|
@ -1339,7 +1339,7 @@ static void libxmlEndElementNS(
|
||||||
This->saxreader->contentHandler,
|
This->saxreader->contentHandler,
|
||||||
Prefix, SysStringLen(Prefix));
|
Prefix, SysStringLen(Prefix));
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
{
|
{
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
return;
|
return;
|
||||||
|
@ -1404,7 +1404,7 @@ static void libxmlCharacters(
|
||||||
This->saxreader->contentHandler,
|
This->saxreader->contentHandler,
|
||||||
Chars, SysStringLen(Chars));
|
Chars, SysStringLen(Chars));
|
||||||
|
|
||||||
if(hr != S_OK)
|
if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
|
||||||
{
|
{
|
||||||
format_error_message_from_id(This, hr);
|
format_error_message_from_id(This, hr);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue