From 68ab4001fa2750892961e146b447541b48c3df11 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Mon, 21 Feb 2005 20:40:30 +0000 Subject: [PATCH] update Expat and XMLStorage files svn path=/trunk/; revision=13707 --- reactos/subsys/system/ibrowser/favorites.cpp | 6 +- .../subsys/system/ibrowser/utility/expat.h | 122 ++++-------------- .../system/ibrowser/utility/expat_external.h | 101 +++++++++++++++ .../system/ibrowser/utility/xmlstorage.cpp | 13 +- .../system/ibrowser/utility/xmlstorage.h | 55 ++++---- 5 files changed, 177 insertions(+), 120 deletions(-) create mode 100644 reactos/subsys/system/ibrowser/utility/expat_external.h diff --git a/reactos/subsys/system/ibrowser/favorites.cpp b/reactos/subsys/system/ibrowser/favorites.cpp index 0da5cc365e2..3d673e62981 100644 --- a/reactos/subsys/system/ibrowser/favorites.cpp +++ b/reactos/subsys/system/ibrowser/favorites.cpp @@ -457,9 +457,11 @@ void Favorites::write(LPCTSTR path) const super::write(pos); pos.back(); - xbel.write(path, XMLNode::FORMAT_SMART, XMLHeader("1.0", "UTF-8", "")); + " \"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd\">"; + + xbel.write(path); } diff --git a/reactos/subsys/system/ibrowser/utility/expat.h b/reactos/subsys/system/ibrowser/utility/expat.h index b34f94ea8dd..ac1053f692f 100644 --- a/reactos/subsys/system/ibrowser/utility/expat.h +++ b/reactos/subsys/system/ibrowser/utility/expat.h @@ -2,8 +2,8 @@ See the file COPYING for copying permission. */ -#ifndef XmlParse_INCLUDED -#define XmlParse_INCLUDED 1 +#ifndef Expat_INCLUDED +#define Expat_INCLUDED 1 #ifdef __VMS /* 0 1 2 3 0 1 2 3 @@ -15,98 +15,15 @@ #endif #include - -#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) -#define XML_USE_MSC_EXTENSIONS 1 -#endif - -/* Expat tries very hard to make the API boundary very specifically - defined. There are two macros defined to control this boundary; - each of these can be defined before including this header to - achieve some different behavior, but doing so it not recommended or - tested frequently. - - XMLCALL - The calling convention to use for all calls across the - "library boundary." This will default to cdecl, and - try really hard to tell the compiler that's what we - want. - - XMLIMPORT - Whatever magic is needed to note that a function is - to be imported from a dynamically loaded library - (.dll, .so, or .sl, depending on your platform). - - The XMLCALL macro was added in Expat 1.95.7. The only one which is - expected to be directly useful in client code is XMLCALL. - - Note that on at least some Unix versions, the Expat library must be - compiled with the cdecl calling convention as the default since - system headers may assume the cdecl convention. -*/ -#ifndef XMLCALL -#if defined(XML_USE_MSC_EXTENSIONS) -#define XMLCALL __cdecl -#elif defined(__GNUC__) && defined(__i386) -//MF#define XMLCALL __attribute__((cdecl)) -#define XMLCALL//MF -#else -/* For any platform which uses this definition and supports more than - one calling convention, we need to extend this definition to - declare the convention used on that platform, if it's possible to - do so. - - If this is the case for your platform, please file a bug report - with information on how to identify your platform via the C - pre-processor and how to specify the same calling convention as the - platform's malloc() implementation. -*/ -#define XMLCALL -#endif -#endif /* not defined XMLCALL */ - - -#if !defined(XML_STATIC) && !defined(XMLIMPORT) -#ifndef XML_BUILDING_EXPAT -/* using Expat from an application */ - -#ifdef XML_USE_MSC_EXTENSIONS -#define XMLIMPORT __declspec(dllimport) -#endif - -#endif -#endif /* not defined XML_STATIC */ - -/* If we didn't define it above, define it away: */ -#ifndef XMLIMPORT -#define XMLIMPORT -#endif - - -#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL +#include "expat_external.h" #ifdef __cplusplus extern "C" { #endif -#ifdef XML_UNICODE_WCHAR_T -#define XML_UNICODE -#endif - struct XML_ParserStruct; typedef struct XML_ParserStruct *XML_Parser; -#ifdef XML_UNICODE /* Information is UTF-16 encoded. */ -#ifdef XML_UNICODE_WCHAR_T -typedef wchar_t XML_Char; -typedef wchar_t XML_LChar; -#else -typedef unsigned short XML_Char; -typedef char XML_LChar; -#endif /* XML_UNICODE_WCHAR_T */ -#else /* Information is UTF-8 encoded. */ -typedef char XML_Char; -typedef char XML_LChar; -#endif /* XML_UNICODE */ - /* Should this be defined using stdbool.h when C99 is available? */ typedef unsigned char XML_Bool; #define XML_TRUE ((XML_Bool) 1) @@ -130,7 +47,7 @@ enum XML_Status { #define XML_STATUS_ERROR XML_STATUS_ERROR XML_STATUS_OK = 1, #define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2, + XML_STATUS_SUSPENDED = 2 #define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED }; @@ -162,12 +79,23 @@ enum XML_Error { XML_ERROR_ENTITY_DECLARED_IN_PE, XML_ERROR_FEATURE_REQUIRES_XML_DTD, XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, + /* Added in 1.95.7. */ XML_ERROR_UNBOUND_PREFIX, + /* Added in 1.95.8. */ + XML_ERROR_UNDECLARING_PREFIX, + XML_ERROR_INCOMPLETE_PE, + XML_ERROR_XML_DECL, + XML_ERROR_TEXT_DECL, + XML_ERROR_PUBLICID, XML_ERROR_SUSPENDED, XML_ERROR_NOT_SUSPENDED, XML_ERROR_ABORTED, XML_ERROR_FINISHED, - XML_ERROR_SUSPEND_PE + XML_ERROR_SUSPEND_PE, + /* Added in 2.0. */ + XML_ERROR_RESERVED_PREFIX_XML, + XML_ERROR_RESERVED_PREFIX_XMLNS, + XML_ERROR_RESERVED_NAMESPACE_URI }; enum XML_Content_Type { @@ -266,9 +194,9 @@ XML_SetXmlDeclHandler(XML_Parser parser, typedef struct { - void *(XMLCALL *malloc_fcn)(size_t size); - void *(XMLCALL *realloc_fcn)(void *ptr, size_t size); - void (XMLCALL *free_fcn)(void *ptr); + void *(*malloc_fcn)(size_t size); + void *(*realloc_fcn)(void *ptr, size_t size); + void (*free_fcn)(void *ptr); } XML_Memory_Handling_Suite; /* Constructs a new parser; encoding is the encoding specified by the @@ -285,8 +213,8 @@ XML_ParserCreate(const XML_Char *encoding); URI, the namespace separator character, and the local part of the name. If the namespace separator is '\0' then the namespace URI and the local part will be concatenated without any separator. - When a namespace is not declared, the name and prefix will be - passed through without expansion. + It is a programming error to use the separator '\0' with namespace + triplets (see XML_SetReturnNSTriplet). */ XMLPARSEAPI(XML_Parser) XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); @@ -766,6 +694,9 @@ XML_UseParserAsHandlerArg(XML_Parser parser); specified in the document. In such a case the parser will call the externalEntityRefHandler with a value of NULL for the systemId argument (the publicId and context arguments will be NULL as well). + Note: For the purpose of checking WFC: Entity Declared, passing + useDTD == XML_TRUE will make the parser behave as if the document + had a DTD with an external subset. Note: If this function is called, then this must be done before the first call to XML_Parse or XML_ParseBuffer, since it will have no effect after that. Returns @@ -1051,7 +982,8 @@ enum XML_FeatureEnum { XML_FEATURE_CONTEXT_BYTES, XML_FEATURE_MIN_SIZE, XML_FEATURE_SIZEOF_XML_CHAR, - XML_FEATURE_SIZEOF_XML_LCHAR + XML_FEATURE_SIZEOF_XML_LCHAR, + XML_FEATURE_NS /* Additional features must be added to the end of this enum. */ }; @@ -1078,4 +1010,4 @@ XML_GetFeatureList(void); } #endif -#endif /* not XmlParse_INCLUDED */ +#endif /* not Expat_INCLUDED */ diff --git a/reactos/subsys/system/ibrowser/utility/expat_external.h b/reactos/subsys/system/ibrowser/utility/expat_external.h new file mode 100644 index 00000000000..7202e119a40 --- /dev/null +++ b/reactos/subsys/system/ibrowser/utility/expat_external.h @@ -0,0 +1,101 @@ +/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. +*/ + +#ifndef Expat_External_INCLUDED +#define Expat_External_INCLUDED 1 + +/* External API definitions */ + +#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) +#define XML_USE_MSC_EXTENSIONS 1 +#endif + +/* Expat tries very hard to make the API boundary very specifically + defined. There are two macros defined to control this boundary; + each of these can be defined before including this header to + achieve some different behavior, but doing so it not recommended or + tested frequently. + + XMLCALL - The calling convention to use for all calls across the + "library boundary." This will default to cdecl, and + try really hard to tell the compiler that's what we + want. + + XMLIMPORT - Whatever magic is needed to note that a function is + to be imported from a dynamically loaded library + (.dll, .so, or .sl, depending on your platform). + + The XMLCALL macro was added in Expat 1.95.7. The only one which is + expected to be directly useful in client code is XMLCALL. + + Note that on at least some Unix versions, the Expat library must be + compiled with the cdecl calling convention as the default since + system headers may assume the cdecl convention. +*/ +#ifndef XMLCALL +#if defined(XML_USE_MSC_EXTENSIONS) +#define XMLCALL __cdecl +#elif defined(__GNUC__) && defined(__i386) +#define XMLCALL __attribute__((cdecl)) +#else +/* For any platform which uses this definition and supports more than + one calling convention, we need to extend this definition to + declare the convention used on that platform, if it's possible to + do so. + + If this is the case for your platform, please file a bug report + with information on how to identify your platform via the C + pre-processor and how to specify the same calling convention as the + platform's malloc() implementation. +*/ +#define XMLCALL +#endif +#endif /* not defined XMLCALL */ + + +#if !defined(XML_STATIC) && !defined(XMLIMPORT) +#ifndef XML_BUILDING_EXPAT +/* using Expat from an application */ + +#ifdef XML_USE_MSC_EXTENSIONS +#define XMLIMPORT __declspec(dllimport) +#endif + +#endif +#endif /* not defined XML_STATIC */ + +/* If we didn't define it above, define it away: */ +#ifndef XMLIMPORT +#define XMLIMPORT +#endif + + +#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef XML_UNICODE_WCHAR_T +#define XML_UNICODE +#endif + +#ifdef XML_UNICODE /* Information is UTF-16 encoded. */ +#ifdef XML_UNICODE_WCHAR_T +typedef wchar_t XML_Char; +typedef wchar_t XML_LChar; +#else +typedef unsigned short XML_Char; +typedef char XML_LChar; +#endif /* XML_UNICODE_WCHAR_T */ +#else /* Information is UTF-8 encoded. */ +typedef char XML_Char; +typedef char XML_LChar; +#endif /* XML_UNICODE */ + +#ifdef __cplusplus +} +#endif + +#endif /* not Expat_External_INCLUDED */ diff --git a/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp b/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp index 51019f3ebab..2d87601498f 100644 --- a/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp +++ b/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp @@ -4,7 +4,7 @@ // // xmlstorage.cpp // - // Copyright (c) 2004, Martin Fuchs + // Copyright (c) 2004, 2005 Martin Fuchs // @@ -426,11 +426,22 @@ std::string XMLReaderBase::get_error_string() const case XML_ERROR_UNBOUND_PREFIX: return "XML_ERROR_UNBOUND_PREFIX"; // EXPAT version >= 1.95.8 #if XML_MAJOR_VERSION>1 || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION>95) || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION==95 && XML_MICRO_VERSION>7) + case XML_ERROR_UNDECLARING_PREFIX: return "XML_ERROR_UNDECLARING_PREFIX"; + case XML_ERROR_INCOMPLETE_PE: return "XML_ERROR_INCOMPLETE_PE"; + case XML_ERROR_XML_DECL: return "XML_ERROR_XML_DECL"; + case XML_ERROR_TEXT_DECL: return "XML_ERROR_TEXT_DECL"; + case XML_ERROR_PUBLICID: return "XML_ERROR_PUBLICID"; case XML_ERROR_SUSPENDED: return "XML_ERROR_SUSPENDED"; case XML_ERROR_NOT_SUSPENDED: return "XML_ERROR_NOT_SUSPENDED"; case XML_ERROR_ABORTED: return "XML_ERROR_ABORTED"; case XML_ERROR_FINISHED: return "XML_ERROR_FINISHED"; case XML_ERROR_SUSPEND_PE: return "XML_ERROR_SUSPEND_PE"; +//#endif +//#if XML_MAJOR_VERSION>=2 + /* Added in 2.0. */ + case XML_ERROR_RESERVED_PREFIX_XML: return "XML_ERROR_RESERVED_PREFIX_XML"; + case XML_ERROR_RESERVED_PREFIX_XMLNS: return "XML_ERROR_RESERVED_PREFIX_XMLNS"; + case XML_ERROR_RESERVED_NAMESPACE_URI: return "XML_ERROR_RESERVED_NAMESPACE_URI"; #endif } diff --git a/reactos/subsys/system/ibrowser/utility/xmlstorage.h b/reactos/subsys/system/ibrowser/utility/xmlstorage.h index 60b5fab1daf..8a0be9b2800 100644 --- a/reactos/subsys/system/ibrowser/utility/xmlstorage.h +++ b/reactos/subsys/system/ibrowser/utility/xmlstorage.h @@ -4,7 +4,7 @@ // // xmlstorage.h // - // Copyright (c) 2004, Martin Fuchs + // Copyright (c) 2004, 2005 Martin Fuchs // @@ -612,6 +612,23 @@ struct XMLNode : public XS_String return out; } +protected: + Children _children; + AttributeMap _attributes; + + std::string _leading; + std::string _content; + std::string _end_leading; + std::string _trailing; + + XMLNode* get_first_child() const + { + if (!_children.empty()) + return _children.front(); + else + return NULL; + } + XMLNode* find(const XS_String& name, int n=0) const { for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) @@ -670,23 +687,6 @@ struct XMLNode : public XS_String /// relative XPath create function XMLNode* create_relative(const char* path); -protected: - Children _children; - AttributeMap _attributes; - - std::string _leading; - std::string _content; - std::string _end_leading; - std::string _trailing; - - XMLNode* get_first_child() const - { - if (!_children.empty()) - return _children.front(); - else - return NULL; - } - void write_worker(std::ostream& out, int indent) const; void pretty_write_worker(std::ostream& out, int indent) const; void smart_write_worker(std::ostream& out, int indent) const; @@ -1533,6 +1533,8 @@ struct XMLReaderBase return out.str(); } + std::string get_instructions() const {return _instructions;} + XML_Error get_error_code() {return XML_GetErrorCode(_parser);} std::string get_error_string() const; @@ -1541,6 +1543,7 @@ protected: XML_Parser _parser; std::string _xml_version; std::string _encoding; + std::string _instructions; std::string _content; enum {TAG_NONE, TAG_START, TAG_END} _last_tag; @@ -1592,11 +1595,14 @@ struct XMLHeader if (!_doctype.empty()) out << _doctype << '\n'; + if (!_additional.empty()) + out << _additional << '\n'; } std::string _version; std::string _encoding; std::string _doctype; + std::string _additional; }; @@ -1640,6 +1646,8 @@ struct XMLDoc : public XMLNode { XML_Status status = reader.read(); + _header._additional = reader.get_instructions(); + if (status == XML_STATUS_ERROR) { std::ostringstream out; @@ -1656,6 +1664,8 @@ struct XMLDoc : public XMLNode { XML_Status status = reader.read(); + _header._additional = reader.get_instructions(); + if (status == XML_STATUS_ERROR) { std::ostringstream out; @@ -1669,9 +1679,9 @@ struct XMLDoc : public XMLNode } /// write XML stream preserving previous white space and comments - std::ostream& write(std::ostream& out, WRITE_MODE mode=FORMAT_SMART, const XMLHeader& header=XMLHeader()) const + std::ostream& write(std::ostream& out, WRITE_MODE mode=FORMAT_SMART) const { - header.print(out); + _header.print(out); if (!_children.empty()) _children.front()->write(out); @@ -1685,11 +1695,11 @@ struct XMLDoc : public XMLNode return write(out, FORMAT_PRETTY); } - void write(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART, const XMLHeader& header=XMLHeader()) const + void write(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART) const { tofstream out(path); - write(out, mode, header); + write(out, mode); } void write_formating(LPCTSTR path) const @@ -1699,6 +1709,7 @@ struct XMLDoc : public XMLNode write_formating(out); } + XMLHeader _header; XML_Error _last_error; std::string _last_error_msg; };