Adam Martinson : msxml3: Don' t cause an assert failure if the datatypes schema doesn't load.
Module: wine Branch: master Commit: 8371784ff65f594a8ab6a17c3f8e14f794d39333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8371784ff65f594a8ab6a17c3f... Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Jul 12 14:22:11 2011 -0500 msxml3: Don't cause an assert failure if the datatypes schema doesn't load. --- dlls/msxml3/schema.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index c8ce471..883ab07 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -35,6 +35,7 @@ # include <libxml/parser.h> # include <libxml/parserInternals.h> # include <libxml/xmlIO.h> +# include <libxml/xmlversion.h> #endif #include "windef.h" @@ -624,7 +625,15 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) case DT_UI8: case DT_URI: case DT_UUID: - assert(datatypes_schema != NULL); + if (!datatypes_schema) + { + ERR("failed to load schema for urn:schemas-microsoft-com:datatypes, " + "you're probably using an old version of libxml2: " LIBXML_DOTTED_VERSION "\n"); + + /* Hopefully they don't need much in the way of XDR datatypes support... */ + return S_OK; + } + if (content && xmlStrlen(content)) { tmp_doc = xmlNewDoc(NULL);
participants (1)
-
Alexandre Julliard