Piotr Caban : msxml3: Accept S_FALSE as a valid callback result when msxml6 is used.
Alexandre Julliard
julliard at winehq.org
Tue Oct 25 13:50:27 CDT 2011
Module: wine
Branch: master
Commit: 2b671cad9637b8151bdf2c532cb9c9273e0bdf04
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b671cad9637b8151bdf2c532cb9c9273e0bdf04
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Oct 24 20:08:55 2011 +0200
msxml3: Accept S_FALSE as a valid callback result when msxml6 is used.
---
dlls/msxml3/saxreader.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index e43afce..344393a 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -1170,7 +1170,7 @@ static void libxmlStartDocument(void *ctx)
else
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);
}
@@ -1201,7 +1201,7 @@ static void libxmlEndDocument(void *ctx)
else
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);
}
}
@@ -1248,7 +1248,7 @@ static void libxmlStartElementNS(
Prefix, SysStringLen(Prefix),
Uri, SysStringLen(Uri));
- if(hr != S_OK)
+ if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
{
format_error_message_from_id(This, hr);
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);
}
@@ -1320,7 +1320,7 @@ static void libxmlEndElementNS(
LocalName, SysStringLen(LocalName),
QName, SysStringLen(QName));
- if(hr != S_OK)
+ if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
{
format_error_message_from_id(This, hr);
return;
@@ -1339,7 +1339,7 @@ static void libxmlEndElementNS(
This->saxreader->contentHandler,
Prefix, SysStringLen(Prefix));
- if(hr != S_OK)
+ if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
{
format_error_message_from_id(This, hr);
return;
@@ -1404,7 +1404,7 @@ static void libxmlCharacters(
This->saxreader->contentHandler,
Chars, SysStringLen(Chars));
- if(hr != S_OK)
+ if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK)
{
format_error_message_from_id(This, hr);
return;
More information about the wine-cvs
mailing list