Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 13665: rm expat.h
by mf＠svn.reactos.com 20 Feb '05

20 Feb '05

rm expat.h Deleted: trunk/reactos/subsys/system/explorer/utility/expat.h _____ Deleted: trunk/reactos/subsys/system/explorer/utility/expat.h --- trunk/reactos/subsys/system/explorer/utility/expat.h 2005-02-20 10:12:49 UTC (rev 13664) +++ trunk/reactos/subsys/system/explorer/utility/expat.h 2005-02-20 10:20:15 UTC (rev 13665) @@ -1,1081 +0,0 @@ -/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - See the file COPYING for copying permission. -*/ - -#ifndef XmlParse_INCLUDED -#define XmlParse_INCLUDED 1 - -#ifdef __VMS -/* 0 1 2 3 0 1 2 3 - 1234567890123456789012345678901 1234567890123456789012345678901 */ -#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler -#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler -#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler -#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg -#endif - -#include <stdlib.h> - -#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 - -#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) -#define XML_FALSE ((XML_Bool) 0) - -/* The XML_Status enum gives the possible return values for several - API functions. The preprocessor #defines are included so this - stanza can be added to code that still needs to support older - versions of Expat 1.95.x: - - #ifndef XML_STATUS_OK - #define XML_STATUS_OK 1 - #define XML_STATUS_ERROR 0 - #endif - - Otherwise, the #define hackery is quite ugly and would have been - dropped. -*/ -enum XML_Status { - XML_STATUS_ERROR = 0, -#define XML_STATUS_ERROR XML_STATUS_ERROR - XML_STATUS_OK = 1, -#define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2, -#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED -}; - -enum XML_Error { - XML_ERROR_NONE, - XML_ERROR_NO_MEMORY, - XML_ERROR_SYNTAX, - XML_ERROR_NO_ELEMENTS, - XML_ERROR_INVALID_TOKEN, - XML_ERROR_UNCLOSED_TOKEN, - XML_ERROR_PARTIAL_CHAR, - XML_ERROR_TAG_MISMATCH, - XML_ERROR_DUPLICATE_ATTRIBUTE, - XML_ERROR_JUNK_AFTER_DOC_ELEMENT, - XML_ERROR_PARAM_ENTITY_REF, - XML_ERROR_UNDEFINED_ENTITY, - XML_ERROR_RECURSIVE_ENTITY_REF, - XML_ERROR_ASYNC_ENTITY, - XML_ERROR_BAD_CHAR_REF, - XML_ERROR_BINARY_ENTITY_REF, - XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, - XML_ERROR_MISPLACED_XML_PI, - XML_ERROR_UNKNOWN_ENCODING, - XML_ERROR_INCORRECT_ENCODING, - XML_ERROR_UNCLOSED_CDATA_SECTION, - XML_ERROR_EXTERNAL_ENTITY_HANDLING, - XML_ERROR_NOT_STANDALONE, - XML_ERROR_UNEXPECTED_STATE, - XML_ERROR_ENTITY_DECLARED_IN_PE, - XML_ERROR_FEATURE_REQUIRES_XML_DTD, - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, - XML_ERROR_UNBOUND_PREFIX, - XML_ERROR_SUSPENDED, - XML_ERROR_NOT_SUSPENDED, - XML_ERROR_ABORTED, - XML_ERROR_FINISHED, - XML_ERROR_SUSPEND_PE -}; - -enum XML_Content_Type { - XML_CTYPE_EMPTY = 1, - XML_CTYPE_ANY, - XML_CTYPE_MIXED, - XML_CTYPE_NAME, - XML_CTYPE_CHOICE, - XML_CTYPE_SEQ -}; - -enum XML_Content_Quant { - XML_CQUANT_NONE, - XML_CQUANT_OPT, - XML_CQUANT_REP, - XML_CQUANT_PLUS -}; - -/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be - XML_CQUANT_NONE, and the other fields will be zero or NULL. - If type == XML_CTYPE_MIXED, then quant will be NONE or REP and - numchildren will contain number of elements that may be mixed in - and children point to an array of XML_Content cells that will be - all of XML_CTYPE_NAME type with no quantification. - - If type == XML_CTYPE_NAME, then the name points to the name, and - the numchildren field will be zero and children will be NULL. The - quant fields indicates any quantifiers placed on the name. - - CHOICE and SEQ will have name NULL, the number of children in - numchildren and children will point, recursively, to an array - of XML_Content cells. - - The EMPTY, ANY, and MIXED types will only occur at top level. -*/ - -typedef struct XML_cp XML_Content; - -struct XML_cp { - enum XML_Content_Type type; - enum XML_Content_Quant quant; - XML_Char * name; - unsigned int numchildren; - XML_Content * children; -}; - - -/* This is called for an element declaration. See above for - description of the model argument. It's the caller's responsibility - to free model when finished with it. -*/ -typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData, - const XML_Char *name, - XML_Content *model); - -XMLPARSEAPI(void) -XML_SetElementDeclHandler(XML_Parser parser, - XML_ElementDeclHandler eldecl); - -/* The Attlist declaration handler is called for *each* attribute. So - a single Attlist declaration with multiple attributes declared will - generate multiple calls to this handler. The "default" parameter - may be NULL in the case of the "#IMPLIED" or "#REQUIRED" - keyword. The "isrequired" parameter will be true and the default - value will be NULL in the case of "#REQUIRED". If "isrequired" is - true and default is non-NULL, then this is a "#FIXED" default. -*/ -typedef void (XMLCALL *XML_AttlistDeclHandler) ( - void *userData, - const XML_Char *elname, - const XML_Char *attname, - const XML_Char *att_type, - const XML_Char *dflt, - int isrequired); - -XMLPARSEAPI(void) -XML_SetAttlistDeclHandler(XML_Parser parser, - XML_AttlistDeclHandler attdecl); - -/* The XML declaration handler is called for *both* XML declarations - and text declarations. The way to distinguish is that the version - parameter will be NULL for text declarations. The encoding - parameter may be NULL for XML declarations. The standalone - parameter will be -1, 0, or 1 indicating respectively that there - was no standalone parameter in the declaration, that it was given - as no, or that it was given as yes. -*/ -typedef void (XMLCALL *XML_XmlDeclHandler) (void *userData, - const XML_Char *version, - const XML_Char *encoding, - int standalone); - -XMLPARSEAPI(void) -XML_SetXmlDeclHandler(XML_Parser parser, - XML_XmlDeclHandler xmldecl); - - -typedef struct { - void *(XMLCALL *malloc_fcn)(size_t size); - void *(XMLCALL *realloc_fcn)(void *ptr, size_t size); - void (XMLCALL *free_fcn)(void *ptr); -} XML_Memory_Handling_Suite; - -/* Constructs a new parser; encoding is the encoding specified by the - external protocol or NULL if there is none specified. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate(const XML_Char *encoding); - -/* Constructs a new parser and namespace processor. Element type - names and attribute names that belong to a namespace will be - expanded; unprefixed attribute names are never expanded; unprefixed - element type names are expanded only if there is a default - namespace. The expanded name is the concatenation of the namespace - 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. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); - - -/* Constructs a new parser using the memory management suite referred to - by memsuite. If memsuite is NULL, then use the standard library memory - suite. If namespaceSeparator is non-NULL it creates a parser with - namespace processing as described above. The character pointed at - will serve as the namespace separator. - - All further memory operations used for the created parser will come from - the given suite. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate_MM(const XML_Char *encoding, - const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); - -/* Prepare a parser object to be re-used. This is particularly - valuable when memory allocation overhead is disproportionatly high, - such as when a large number of small documnents need to be parsed. - All handlers are cleared from the parser, except for the - unknownEncodingHandler. The parser's external state is re-initialized - except for the values of ns and ns_triplets. - - Added in Expat 1.95.3. -*/ -XMLPARSEAPI(XML_Bool) -XML_ParserReset(XML_Parser parser, const XML_Char *encoding); - -/* atts is array of name/value pairs, terminated by 0; - names and values are 0 terminated. -*/ -typedef void (XMLCALL *XML_StartElementHandler) (void *userData, - const XML_Char *name, - const XML_Char **atts); - -typedef void (XMLCALL *XML_EndElementHandler) (void *userData, - const XML_Char *name); - - -/* s is not 0 terminated. */ -typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData, - const XML_Char *s, - int len); - -/* target and data are 0 terminated */ -typedef void (XMLCALL *XML_ProcessingInstructionHandler) ( - void *userData, - const XML_Char *target, - const XML_Char *data); - -/* data is 0 terminated */ -typedef void (XMLCALL *XML_CommentHandler) (void *userData, - const XML_Char *data); - -typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData); -typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData); - -/* This is called for any characters in the XML document for which - there is no applicable handler. This includes both characters that - are part of markup which is of a kind that is not reported - (comments, markup declarations), or characters that are part of a - construct which could be reported but for which no handler has been - supplied. The characters are passed exactly as they were in the XML - document except that they will be encoded in UTF-8 or UTF-16. - Line boundaries are not normalized. Note that a byte order mark - character is not passed to the default handler. There are no - guarantees about how characters are divided between calls to the - default handler: for example, a comment might be split between - multiple calls. -*/ -typedef void (XMLCALL *XML_DefaultHandler) (void *userData, - const XML_Char *s, - int len); - -/* This is called for the start of the DOCTYPE declaration, before - any DTD or internal subset is parsed. -*/ -typedef void (XMLCALL *XML_StartDoctypeDeclHandler) ( - void *userData, - const XML_Char *doctypeName, - const XML_Char *sysid, - const XML_Char *pubid, - int has_internal_subset); - -/* This is called for the start of the DOCTYPE declaration when the - closing > is encountered, but after processing any external - subset. -*/ -typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData); - -/* This is called for entity declarations. The is_parameter_entity - argument will be non-zero if the entity is a parameter entity, zero - otherwise. - - For internal entities (<!ENTITY foo "bar">), value will - be non-NULL and systemId, publicID, and notationName will be NULL. - The value string is NOT nul-terminated; the length is provided in - the value_length argument. Since it is legal to have zero-length - values, do not use this argument to test for internal entities. - - For external entities, value will be NULL and systemId will be - non-NULL. The publicId argument will be NULL unless a public - identifier was provided. The notationName argument will have a - non-NULL value only for unparsed entity declarations. - - Note that is_parameter_entity can't be changed to XML_Bool, since - that would break binary compatibility. -*/ -typedef void (XMLCALL *XML_EntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity, - const XML_Char *value, - int value_length, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -XMLPARSEAPI(void) -XML_SetEntityDeclHandler(XML_Parser parser, - XML_EntityDeclHandler handler); - -/* OBSOLETE -- OBSOLETE -- OBSOLETE - This handler has been superceded by the EntityDeclHandler above. - It is provided here for backward compatibility. - - This is called for a declaration of an unparsed (NDATA) entity. - The base argument is whatever was set by XML_SetBase. The - entityName, systemId and notationName arguments will never be - NULL. The other arguments may be. -*/ -typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -/* This is called for a declaration of notation. The base argument is - whatever was set by XML_SetBase. The notationName will never be - NULL. The other arguments can be. -*/ -typedef void (XMLCALL *XML_NotationDeclHandler) ( - void *userData, - const XML_Char *notationName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* When namespace processing is enabled, these are called once for - each namespace declaration. The call to the start and end element - handlers occur between the calls to the start and end namespace - declaration handlers. For an xmlns attribute, prefix will be - NULL. For an xmlns="" attribute, uri will be NULL. -*/ -typedef void (XMLCALL *XML_StartNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix, - const XML_Char *uri); - -typedef void (XMLCALL *XML_EndNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix); - -/* This is called if the document is not standalone, that is, it has an - external subset or a reference to a parameter entity, but does not - have standalone="yes". If this handler returns XML_STATUS_ERROR, - then processing will not continue, and the parser will return a - XML_ERROR_NOT_STANDALONE error. - If parameter entity parsing is enabled, then in addition to the - conditions above this handler will only be called if the referenced - entity was actually read. -*/ -typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData); - -/* This is called for a reference to an external parsed general - entity. The referenced entity is not automatically parsed. The - application can parse it immediately or later using - XML_ExternalEntityParserCreate. - - The parser argument is the parser parsing the entity containing the - reference; it can be passed as the parser argument to - XML_ExternalEntityParserCreate. The systemId argument is the - system identifier as specified in the entity declaration; it will - not be NULL. - - The base argument is the system identifier that should be used as - the base for resolving systemId if systemId was relative; this is - set by XML_SetBase; it may be NULL. - - The publicId argument is the public identifier as specified in the - entity declaration, or NULL if none was specified; the whitespace - in the public identifier will have been normalized as required by - the XML spec. - - The context argument specifies the parsing context in the format - expected by the context argument to XML_ExternalEntityParserCreate; - context is valid only until the handler returns, so if the - referenced entity is to be parsed later, it must be copied. - context is NULL only when the entity is a parameter entity. - - The handler should return XML_STATUS_ERROR if processing should not - continue because of a fatal error in the handling of the external - entity. In this case the calling parser will return an - XML_ERROR_EXTERNAL_ENTITY_HANDLING error. - - Note that unlike other handlers the first argument is the parser, - not userData. -*/ -typedef int (XMLCALL *XML_ExternalEntityRefHandler) ( - XML_Parser parser, - const XML_Char *context, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* This is called in two situations: - 1) An entity reference is encountered for which no declaration - has been read *and* this is not an error. - 2) An internal entity reference is read, but not expanded, because - XML_SetDefaultHandler has been called. - Note: skipped parameter entities in declarations and skipped general - entities in attribute values cannot be reported, because - the event would be out of sync with the reporting of the - declarations or attribute values -*/ -typedef void (XMLCALL *XML_SkippedEntityHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity); - -/* This structure is filled in by the XML_UnknownEncodingHandler to - provide information to the parser about encodings that are unknown - to the parser. - - The map[b] member gives information about byte sequences whose - first byte is b. - - If map[b] is c where c is >= 0, then b by itself encodes the - Unicode scalar value c. - - If map[b] is -1, then the byte sequence is malformed. - - If map[b] is -n, where n >= 2, then b is the first byte of an - n-byte sequence that encodes a single Unicode scalar value. - - The data member will be passed as the first argument to the convert - function. - - The convert function is used to convert multibyte sequences; s will - point to a n-byte sequence where map[(unsigned char)*s] == -n. The - convert function must return the Unicode scalar value represented - by this byte sequence or -1 if the byte sequence is malformed. - - The convert function may be NULL if the encoding is a single-byte - encoding, that is if map[b] >= -1 for all bytes b. - - When the parser is finished with the encoding, then if release is - not NULL, it will call release passing it the data member; once - release has been called, the convert function will not be called - again. - - Expat places certain restrictions on the encodings that are supported - using this mechanism. - - 1. Every ASCII character that can appear in a well-formed XML document, - other than the characters - - $@\^`{}~ - - must be represented by a single byte, and that byte must be the - same byte that represents that character in ASCII. - - 2. No character may require more than 4 bytes to encode. - - 3. All characters encoded must have Unicode scalar values <= - 0xFFFF, (i.e., characters that would be encoded by surrogates in - UTF-16 are not allowed). Note that this restriction doesn't - apply to the built-in support for UTF-8 and UTF-16. - - 4. No Unicode character may be encoded by more than one distinct - sequence of bytes. -*/ -typedef struct { - int map[256]; - void *data; - int (XMLCALL *convert)(void *data, const char *s); - void (XMLCALL *release)(void *data); -} XML_Encoding; - -/* This is called for an encoding that is unknown to the parser. - - The encodingHandlerData argument is that which was passed as the - second argument to XML_SetUnknownEncodingHandler. - - The name argument gives the name of the encoding as specified in - the encoding declaration. - - If the callback can provide information about the encoding, it must - fill in the XML_Encoding structure, and return XML_STATUS_OK. - Otherwise it must return XML_STATUS_ERROR. - - If info does not describe a suitable encoding, then the parser will - return an XML_UNKNOWN_ENCODING error. -*/ -typedef int (XMLCALL *XML_UnknownEncodingHandler) ( - void *encodingHandlerData, - const XML_Char *name, - XML_Encoding *info); - -XMLPARSEAPI(void) -XML_SetElementHandler(XML_Parser parser, - XML_StartElementHandler start, - XML_EndElementHandler end); - -XMLPARSEAPI(void) -XML_SetStartElementHandler(XML_Parser parser, - XML_StartElementHandler handler); - -XMLPARSEAPI(void) -XML_SetEndElementHandler(XML_Parser parser, - XML_EndElementHandler handler); - -XMLPARSEAPI(void) -XML_SetCharacterDataHandler(XML_Parser parser, - XML_CharacterDataHandler handler); - -XMLPARSEAPI(void) -XML_SetProcessingInstructionHandler(XML_Parser parser, - XML_ProcessingInstructionHandler handler); -XMLPARSEAPI(void) -XML_SetCommentHandler(XML_Parser parser, - XML_CommentHandler handler); - -XMLPARSEAPI(void) -XML_SetCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start, - XML_EndCdataSectionHandler end); - -XMLPARSEAPI(void) -XML_SetStartCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start); - -XMLPARSEAPI(void) -XML_SetEndCdataSectionHandler(XML_Parser parser, - XML_EndCdataSectionHandler end); - -/* This sets the default handler and also inhibits expansion of - internal entities. These entity references will be passed to the - default handler, or to the skipped entity handler, if one is set. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandler(XML_Parser parser, - XML_DefaultHandler handler); - -/* This sets the default handler but does not inhibit expansion of - internal entities. The entity reference will not be passed to the - default handler. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandlerExpand(XML_Parser parser, - XML_DefaultHandler handler); - -XMLPARSEAPI(void) -XML_SetDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndDoctypeDeclHandler(XML_Parser parser, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetUnparsedEntityDeclHandler(XML_Parser parser, - XML_UnparsedEntityDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNotationDeclHandler(XML_Parser parser, - XML_NotationDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndNamespaceDeclHandler(XML_Parser parser, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetNotStandaloneHandler(XML_Parser parser, - XML_NotStandaloneHandler handler); - -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandler(XML_Parser parser, - XML_ExternalEntityRefHandler handler); - -/* If a non-NULL value for arg is specified here, then it will be - passed as the first argument to the external entity ref handler - instead of the parser object. -*/ -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandlerArg(XML_Parser parser, - void *arg); - -XMLPARSEAPI(void) -XML_SetSkippedEntityHandler(XML_Parser parser, - XML_SkippedEntityHandler handler); - -XMLPARSEAPI(void) -XML_SetUnknownEncodingHandler(XML_Parser parser, - XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - -/* This can be called within a handler for a start element, end - element, processing instruction or character data. It causes the - corresponding markup to be passed to the default handler. -*/ -XMLPARSEAPI(void) -XML_DefaultCurrent(XML_Parser parser); - -/* If do_nst is non-zero, and namespace processing is in effect, and - a name has a prefix (i.e. an explicit namespace qualifier) then - that name is returned as a triplet in a single string separated by - the separator character specified when the parser was created: URI - + sep + local_name + sep + prefix. - - If do_nst is zero, then namespace information is returned in the - default manner (URI + sep + local_name) whether or not the name - has a prefix. - - Note: Calling XML_SetReturnNSTriplet after XML_Parse or - XML_ParseBuffer has no effect. -*/ - -XMLPARSEAPI(void) -XML_SetReturnNSTriplet(XML_Parser parser, int do_nst); - -/* This value is passed as the userData argument to callbacks. */ -XMLPARSEAPI(void) -XML_SetUserData(XML_Parser parser, void *userData); - -/* Returns the last value set by XML_SetUserData or NULL. */ -#define XML_GetUserData(parser) (*(void **)(parser)) - -/* This is equivalent to supplying an encoding argument to - XML_ParserCreate. On success XML_SetEncoding returns non-zero, - zero otherwise. - Note: Calling XML_SetEncoding after XML_Parse or XML_ParseBuffer - has no effect and returns XML_STATUS_ERROR. -*/ -XMLPARSEAPI(enum XML_Status) -XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); - -/* If this function is called, then the parser will be passed as the - first argument to callbacks instead of userData. The userData will - still be accessible using XML_GetUserData. -*/ -XMLPARSEAPI(void) -XML_UseParserAsHandlerArg(XML_Parser parser); - -/* If useDTD == XML_TRUE is passed to this function, then the parser - will assume that there is an external subset, even if none is - 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: 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 - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING. - Note: If the document does not have a DOCTYPE declaration at all, - then startDoctypeDeclHandler and endDoctypeDeclHandler will not - be called, despite an external subset being parsed. - Note: If XML_DTD is not defined when Expat is compiled, returns - XML_ERROR_FEATURE_REQUIRES_XML_DTD. -*/ -XMLPARSEAPI(enum XML_Error) -XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD); - - -/* Sets the base to be used for resolving relative URIs in system - identifiers in declarations. Resolving relative identifiers is - left to the application: this value will be passed through as the - base argument to the XML_ExternalEntityRefHandler, - XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base - argument will be copied. Returns XML_STATUS_ERROR if out of memory, - XML_STATUS_OK otherwise. -*/ -XMLPARSEAPI(enum XML_Status) -XML_SetBase(XML_Parser parser, const XML_Char *base); - -XMLPARSEAPI(const XML_Char *) -XML_GetBase(XML_Parser parser); - -/* Returns the number of the attribute/value pairs passed in last call - to the XML_StartElementHandler that were specified in the start-tag - rather than defaulted. Each attribute/value pair counts as 2; thus - this correspondds to an index into the atts array passed to the - XML_StartElementHandler. -*/ -XMLPARSEAPI(int) -XML_GetSpecifiedAttributeCount(XML_Parser parser); - -/* Returns the index of the ID attribute passed in the last call to - XML_StartElementHandler, or -1 if there is no ID attribute. Each - attribute/value pair counts as 2; thus this correspondds to an - index into the atts array passed to the XML_StartElementHandler. -*/ -XMLPARSEAPI(int) -XML_GetIdAttributeIndex(XML_Parser parser); - -/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is - detected. The last call to XML_Parse must have isFinal true; len - may be zero for this call (or any other). - - Though the return values for these functions has always been - described as a Boolean value, the implementation, at least for the - 1.95.x series, has always returned exactly one of the XML_Status - values. -*/ -XMLPARSEAPI(enum XML_Status) -XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); - -XMLPARSEAPI(void *) -XML_GetBuffer(XML_Parser parser, int len); - -XMLPARSEAPI(enum XML_Status) -XML_ParseBuffer(XML_Parser parser, int len, int isFinal); - -/* Stops parsing, causing XML_Parse() or XML_ParseBuffer() to return. - Must be called from within a call-back handler, except when aborting - (resumable = 0) an already suspended parser. Some call-backs may - still follow because they would otherwise get lost. Examples: - - endElementHandler() for empty elements when stopped in - startElementHandler(), - - endNameSpaceDeclHandler() when stopped in endElementHandler(), - and possibly others. - - Can be called from most handlers, including DTD related call-backs, - except when parsing an external parameter entity and resumable != 0. - Returns XML_STATUS_OK when successful, XML_STATUS_ERROR otherwise. - Possible error codes: - - XML_ERROR_SUSPENDED: when suspending an already suspended parser. - - XML_ERROR_FINISHED: when the parser has already finished. - - XML_ERROR_SUSPEND_PE: when suspending while parsing an external PE. - - When resumable != 0 (true) then parsing is suspended, that is, - XML_Parse() and XML_ParseBuffer() return XML_STATUS_SUSPENDED. - Otherwise, parsing is aborted, that is, XML_Parse() and XML_ParseBuffer() - return XML_STATUS_ERROR with error code XML_ERROR_ABORTED. - - *Note*: - This will be applied to the current parser instance only, that is, if - there is a parent parser then it will continue parsing when the - externalEntityRefHandler() returns. It is up to the implementation of - the externalEntityRefHandler() to call XML_StopParser() on the parent - parser (recursively), if one wants to stop parsing altogether. - - When suspended, parsing can be resumed by calling XML_ResumeParser(). -*/ -XMLPARSEAPI(enum XML_Status) -XML_StopParser(XML_Parser parser, XML_Bool resumable); - -/* Resumes parsing after it has been suspended with XML_StopParser(). - Must not be called from within a handler call-back. Returns same - status codes as XML_Parse() or XML_ParseBuffer(). - Additional error code XML_ERROR_NOT_SUSPENDED possible. - - *Note*: - This must be called on the most deeply nested child parser instance - first, and on its parent parser only after the child parser has finished, - to be applied recursively until the document entity's parser is restarted. - That is, the parent parser will not resume by itself and it is up to the - application to call XML_ResumeParser() on it at the appropriate moment. -*/ -XMLPARSEAPI(enum XML_Status) -XML_ResumeParser(XML_Parser parser); - -enum XML_Parsing { - XML_INITIALIZED, - XML_PARSING, - XML_FINISHED, - XML_SUSPENDED -}; - -typedef struct { - enum XML_Parsing parsing; - XML_Bool finalBuffer; -} XML_ParsingStatus; - -/* Returns status of parser with respect to being initialized, parsing, - finished, or suspended and processing the final buffer. - XXX XML_Parse() and XML_ParseBuffer() should return XML_ParsingStatus, - XXX with XML_FINISHED_OK or XML_FINISHED_ERROR replacing XML_FINISHED -*/ -XMLPARSEAPI(void) -XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status); - -/* Creates an XML_Parser object that can parse an external general - entity; context is a '\0'-terminated string specifying the parse - context; encoding is a '\0'-terminated string giving the name of - the externally specified encoding, or NULL if there is no - externally specified encoding. The context string consists of a - sequence of tokens separated by formfeeds (\f); a token consisting - of a name specifies that the general entity of the name is open; a - token of the form prefix=uri specifies the namespace for a - particular prefix; a token of the form =uri specifies the default - namespace. This can be called at any point after the first call to - an ExternalEntityRefHandler so longer as the parser has not yet - been freed. The new parser is completely independent and may - safely be used in a separate thread. The handlers and userData are - initialized from the parser argument. Returns NULL if out of memory. - Otherwise returns a new XML_Parser object. -*/ -XMLPARSEAPI(XML_Parser) -XML_ExternalEntityParserCreate(XML_Parser parser, - const XML_Char *context, - const XML_Char *encoding); - -enum XML_ParamEntityParsing { - XML_PARAM_ENTITY_PARSING_NEVER, - XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE, - XML_PARAM_ENTITY_PARSING_ALWAYS -}; - -/* Controls parsing of parameter entities (including the external DTD - subset). If parsing of parameter entities is enabled, then - references to external parameter entities (including the external - DTD subset) will be passed to the handler set with - XML_SetExternalEntityRefHandler. The context passed will be 0. - - Unlike external general entities, external parameter entities can - only be parsed synchronously. If the external parameter entity is - to be parsed, it must be parsed during the call to the external - entity ref handler: the complete sequence of - XML_ExternalEntityParserCreate, XML_Parse/XML_ParseBuffer and - XML_ParserFree calls must be made during this call. After - XML_ExternalEntityParserCreate has been called to create the parser - for the external parameter entity (context must be 0 for this - call), it is illegal to make any calls on the old parser until - XML_ParserFree has been called on the newly created parser. - If the library has been compiled without support for parameter - entity parsing (ie without XML_DTD being defined), then - XML_SetParamEntityParsing will return 0 if parsing of parameter - entities is requested; otherwise it will return non-zero. - Note: If XML_SetParamEntityParsing is called after XML_Parse or - XML_ParseBuffer, then it has no effect and will always return 0. -*/ -XMLPARSEAPI(int) -XML_SetParamEntityParsing(XML_Parser parser, - enum XML_ParamEntityParsing parsing); - -/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then - XML_GetErrorCode returns information about the error. -*/ -XMLPARSEAPI(enum XML_Error) -XML_GetErrorCode(XML_Parser parser); - -/* These functions return information about the current parse - location. They may be called from any callback called to report - some parse event; in this case the location is the location of the - first of the sequence of characters that generated the event. When - called from callbacks generated by declarations in the document - prologue, the location identified isn't as neatly defined, but will - be within the relevant markup. When called outside of the callback - functions, the position indicated will be just past the last parse - event (regardless of whether there was an associated callback). - - They may also be called after returning from a call to XML_Parse - or XML_ParseBuffer. If the return value is XML_STATUS_ERROR then - the location is the location of the character at which the error - was detected; otherwise the location is the location of the last - parse event, as described above. -*/ -XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser); -XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser); -XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser); - -/* Return the number of bytes in the current event. - Returns 0 if the event is in an internal entity. -*/ -XMLPARSEAPI(int) -XML_GetCurrentByteCount(XML_Parser parser); - -/* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets - the integer pointed to by offset to the offset within this buffer - of the current parse position, and sets the integer pointed to by size - to the size of this buffer (the number of input bytes). Otherwise - returns a NULL pointer. Also returns a NULL pointer if a parse isn't - active. - - NOTE: The character pointer returned should not be used outside - the handler that makes the call. [truncated at 1000 lines; 86 more skipped]

1 0

[mf] 13664: update to Expat 2.0 pre-release
by mf＠svn.reactos.com 20 Feb '05

20 Feb '05

update to Expat 2.0 pre-release Modified: trunk/reactos/lib/expat/Changes Modified: trunk/reactos/lib/expat/MANIFEST Modified: trunk/reactos/lib/expat/Makefile Modified: trunk/reactos/lib/expat/Makefile.in Modified: trunk/reactos/lib/expat/README Modified: trunk/reactos/lib/expat/configure.in Modified: trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4 Modified: trunk/reactos/lib/expat/conftools/mkinstalldirs Modified: trunk/reactos/lib/expat/doc/reference.html Modified: trunk/reactos/lib/expat/doc/style.css Modified: trunk/reactos/lib/expat/examples/elements.c Modified: trunk/reactos/lib/expat/examples/elements.dsp Added: trunk/reactos/lib/expat/examples/elements.vcproj Modified: trunk/reactos/lib/expat/examples/outline.dsp Added: trunk/reactos/lib/expat/examples/outline.vcproj Added: trunk/reactos/lib/expat/examples/poem.xml Modified: trunk/reactos/lib/expat/expat.dsw Modified: trunk/reactos/lib/expat/expat.spec Modified: trunk/reactos/lib/expat/gennmtab/gennmtab.dsp Modified: trunk/reactos/lib/expat/lib/expat.dsp Modified: trunk/reactos/lib/expat/lib/expat.h Added: trunk/reactos/lib/expat/lib/expat_external.h Modified: trunk/reactos/lib/expat/lib/expat_static.dsp Modified: trunk/reactos/lib/expat/lib/expatw.dsp Modified: trunk/reactos/lib/expat/lib/expatw_static.dsp Modified: trunk/reactos/lib/expat/lib/internal.h Modified: trunk/reactos/lib/expat/lib/libexpat.def Modified: trunk/reactos/lib/expat/lib/libexpatw.def Modified: trunk/reactos/lib/expat/lib/winconfig.h Modified: trunk/reactos/lib/expat/lib/xmlparse.c Modified: trunk/reactos/lib/expat/lib/xmlrole.c Modified: trunk/reactos/lib/expat/lib/xmltok.c Modified: trunk/reactos/lib/expat/lib/xmltok.h Modified: trunk/reactos/lib/expat/lib/xmltok_ns.c Modified: trunk/reactos/lib/expat/make-release.sh Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.dsp Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.dsw Modified: trunk/reactos/lib/expat/tests/chardata.c Modified: trunk/reactos/lib/expat/tests/chardata.h Added: trunk/reactos/lib/expat/tests/minicheck.c Added: trunk/reactos/lib/expat/tests/minicheck.h Modified: trunk/reactos/lib/expat/tests/runtests.c Added: trunk/reactos/lib/expat/tests/runtestspp.cpp Modified: trunk/reactos/lib/expat/tests/xmltest.sh Modified: trunk/reactos/lib/expat/win32/README.txt Modified: trunk/reactos/lib/expat/win32/expat.iss Modified: trunk/reactos/lib/expat/xmlwf/readfilemap.c Modified: trunk/reactos/lib/expat/xmlwf/xmlfile.c Modified: trunk/reactos/lib/expat/xmlwf/xmlwf.c Modified: trunk/reactos/lib/expat/xmlwf/xmlwf.dsp Added: trunk/reactos/lib/expat/xmlwf/xmlwf.vcproj Property changes on: trunk/reactos/lib/expat/COPYING ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/Changes --- trunk/reactos/lib/expat/Changes 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/Changes 2005-02-20 10:12:49 UTC (rev 13664) @@ -1,3 +1,20 @@ +Release 1.95.9 TBD + - We no longer use the "check" library for C unit testing; we + always use the (partial) internal implementation of the API. + - Report XML_NS setting via XML_GetFeatureList(). + - Fixed headers for use from C++. + - Updated to use libtool 1.5.10 (the most recent). + +Release 1.95.8 Fri Jul 23 2004 + - Major new feature: suspend/resume. Handlers can now request + that a parse be suspended for later resumption or aborted + altogether. See "Temporarily Stopping Parsing" in the + documentation for more details. + - Some mostly minor bug fixes, but compilation should no + longer generate warnings on most platforms. SF issues + include: 827319, 840173, 846309, 888329, 896188, 923913, + 928113, 961698, 985192. + Release 1.95.7 Mon Oct 20 2003 - Fixed enum XML_Status issue (reported on SourceForge many times), so compilers that are properly picky will be happy. Property changes on: trunk/reactos/lib/expat/Changes ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/MANIFEST --- trunk/reactos/lib/expat/MANIFEST 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/MANIFEST 2005-02-20 10:12:49 UTC (rev 13664) @@ -1,13 +1,5 @@ -Changes -COPYING -MANIFEST -Makefile.in -README -configure -configure.in -expat_config.h.in -expat.dsw bcb5/README.txt +bcb5/all_projects.bpg bcb5/elements.bpf bcb5/elements.bpr bcb5/elements.mak @@ -33,37 +25,53 @@ bcb5/xmlwf.bpf bcb5/xmlwf.bpr bcb5/xmlwf.mak +doc/expat.png +doc/reference.html +doc/style.css +doc/valid-xhtml10.png +doc/xmlwf.1 +doc/xmlwf.sgml +COPYING +Changes +MANIFEST +Makefile.in +README +configure +configure.in +expat_config.h.in +expat.dsw conftools/PrintPath conftools/ac_c_bigendian_cross.m4 conftools/config.guess conftools/config.sub conftools/expat.m4 +conftools/get-version.sh conftools/install-sh conftools/libtool.m4 conftools/ltmain.sh conftools/mkinstalldirs -doc/reference.html -doc/style.css -doc/valid-xhtml10.png -doc/xmlwf.1 -doc/xmlwf.sgml examples/elements.c examples/elements.dsp examples/outline.c examples/outline.dsp +lib/Makefile.MPW lib/ascii.h lib/asciitab.h lib/expat.dsp lib/expat.h +lib/expat_external.h +lib/expat_static.dsp lib/expatw.dsp -lib/expat_static.dsp lib/expatw_static.dsp lib/iasciitab.h lib/internal.h lib/latin1tab.h +lib/libexpat.def lib/libexpatw.def +lib/macconfig.h lib/nametab.h lib/utf8tab.h +lib/winconfig.h lib/xmlparse.c lib/xmlrole.c lib/xmlrole.h @@ -72,17 +80,24 @@ lib/xmltok_impl.c lib/xmltok_impl.h lib/xmltok_ns.c -lib/winconfig.h +tests/benchmark/README.txt +tests/benchmark/benchmark.c +tests/benchmark/benchmark.dsp +tests/benchmark/benchmark.dsw tests/README.txt tests/chardata.c tests/chardata.h +tests/minicheck.c +tests/minicheck.h tests/runtests.c +tests/runtestspp.cpp tests/xmltest.sh +vms/README.vms vms/descrip.mms vms/expat_config.h -vms/README.vms +win32/MANIFEST.txt +win32/README.txt win32/expat.iss -win32/MANIFEST.txt xmlwf/codepage.c xmlwf/codepage.h xmlwf/ct.c Property changes on: trunk/reactos/lib/expat/MANIFEST ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/Makefile --- trunk/reactos/lib/expat/Makefile 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/Makefile 2005-02-20 10:12:49 UTC (rev 13664) @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile 13593 2005-02-16 14:01:34Z weiden $ PATH_TO_TOP = ../.. Property changes on: trunk/reactos/lib/expat/Makefile ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/Makefile.in --- trunk/reactos/lib/expat/Makefile.in 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/Makefile.in 2005-02-20 10:12:49 UTC (rev 13664) @@ -41,9 +41,12 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs MANFILE = $(srcdir)/doc/xmlwf.1 -APIHEADER = $(srcdir)/lib/expat.h +APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h LIBRARY = libexpat.la +ifndef INSTALL_ROOT +INSTALL_ROOT=$(DESTDIR) +endif default: buildlib xmlwf/xmlwf @@ -55,7 +58,8 @@ cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs - cd tests && rm -rf .libs runtests runtests.o chardata.o + cd tests && rm -rf .libs runtests runtests.o runtestspp runtestspp.o + cd tests && rm -f chardata.o minicheck.o rm -rf .libs libexpat.la rm -f examples/core tests/core xmlwf/core @@ -69,26 +73,28 @@ rm -f expat_config.h.in configure rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4 -check: tests/runtests +check: tests/runtests tests/runtestspp tests/runtests + tests/runtestspp install: xmlwf/xmlwf installlib - $(mkinstalldirs) $(bindir) $(man1dir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf - $(INSTALL_DATA) $(MANFILE) $(man1dir) + $(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf + $(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir) installlib: $(LIBRARY) $(APIHEADER) - $(mkinstalldirs) $(libdir) $(includedir) - $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY) - $(INSTALL_DATA) $(APIHEADER) $(includedir) + $(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir) + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY) + for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done uninstall: uninstalllib - $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf - rm -f $(man1dir)/xmlwf.1 + $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf + rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1 uninstalllib: - $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) - rm -f $(includedir)/$(APIHEADER) + $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY) + rm -f $(INSTALL_ROOT)$(includedir)/expat.h + rm -f $(INSTALL_ROOT)$(includedir)/expat_external.h # for VPATH builds (invoked by configure) mkdir-init: @@ -108,25 +114,27 @@ ### autoconf this? LTFLAGS = --silent -COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES) +COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS) +CXXCOMPILE = $(CXX) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS) LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@ LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@ +LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@ LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo $(LIBRARY): $(LIB_OBJS) $(LINK_LIB) $(LIB_OBJS) lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \ - $(top_builddir)/expat_config.h lib/internal.h + $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \ - $(top_builddir)/expat_config.h lib/internal.h + $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \ lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \ lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \ - $(top_builddir)/expat_config.h + $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP@.o @@ -146,9 +154,13 @@ $(LINK_EXE) $< $(LIBRARY) tests/chardata.o: tests/chardata.c tests/chardata.h +tests/minicheck.o: tests/minicheck.c tests/minicheck.h tests/runtests.o: tests/runtests.c tests/chardata.h -tests/runtests: tests/runtests.o tests/chardata.o $(LIBRARY) - $(LINK_EXE) $^ -lcheck +tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY) + $(LINK_EXE) $^ +tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h +tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY) + $(LINK_CXX_EXE) $^ tests/xmlts.zip: wget --output-document=tests/xmlts.zip \ Property changes on: trunk/reactos/lib/expat/Makefile.in ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/README --- trunk/reactos/lib/expat/README 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/README 2005-02-20 10:12:49 UTC (rev 13664) @@ -1,5 +1,5 @@ - Expat, Release 1.95.7 + Expat, Release 1.95.8 This is Expat, a C library for parsing XML, written by James Clark. Expat is a stream-oriented XML parser. This means that you register @@ -92,13 +92,6 @@ PATH=/usr/ccs/bin:$PATH make -The unit and regression tests for Expat require the "check" library on -Unix; more information is available at http://check.sourceforge.net/, -and downloadable packages are available from the library's project -page on SourceForge: http://sourceforge.net/projects/check/. You do -not need to install the check library to build and use Expat, only to -build and run Expat's test suite. - When using Expat with a project using autoconf for configuration, you can use the probing macro in conftools/expat.m4 to determine how to include Expat. See the comments at the top of that file for more @@ -116,4 +109,4 @@ place on expat-discuss(a)mail.libexpat.org. Archives of this list and other Expat-related lists may be found at: - http://mail.libexpat.org/mailman-21/listinfo/ + http://mail.libexpat.org/mailman/listinfo/ Property changes on: trunk/reactos/lib/expat/README ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/README.txt ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/all_projects.bpg ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/elements.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/elements.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/elements.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expat.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expat.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expat.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expat_static.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expat_static.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expat_static.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expatw.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expatw.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expatw.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expatw_static.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expatw_static.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/expatw_static.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/libexpat_mtd.def ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/libexpatw_mtd.def ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/makefile.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/outline.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/outline.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/outline.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/setup.bat ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/xmlwf.bpf ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/xmlwf.bpr ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/bcb5/xmlwf.mak ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/buildconf.sh ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/configure.in --- trunk/reactos/lib/expat/configure.in 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/configure.in 2005-02-20 10:12:49 UTC (rev 13664) @@ -103,9 +103,38 @@ fi AC_SUBST(FILEMAP) -dnl Only needed for regression tests: -AC_CHECK_HEADERS(check.h) +dnl Needed for the test support code; this was found at +dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html +# AC_CPP_FUNC +# ------------------ # +# Checks to see if ANSI C99 CPP variable __func__ works. +# If not, perhaps __FUNCTION__ works instead. +# If not, we'll just define __func__ to "". +AC_DEFUN([AC_CPP_FUNC], +[AC_REQUIRE([AC_PROG_CC_STDC])dnl +AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], +[[char *foo = __func__;]])], + [ac_cv_cpp_func=yes], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], +[[char *foo = __FUNCTION__;]])], + [ac_cv_cpp_func=__FUNCTION__], + [ac_cv_cpp_func=no])])]) +if test $ac_cv_cpp_func = __FUNCTION__; then + AC_DEFINE(__func__,__FUNCTION__, + [Define to __FUNCTION__ or "" if `__func__' does not conform to +ANSI C.]) +elif test $ac_cv_cpp_func = no; then + AC_DEFINE(__func__,"", + [Define to __FUNCTION__ or "" if `__func__' does not conform to +ANSI C.]) +fi +])# AC_CPP_FUNC + +AC_CPP_FUNC + + dnl Some basic configuration: AC_DEFINE([XML_NS], 1, [Define to make XML Namespaces functionality available.]) Property changes on: trunk/reactos/lib/expat/configure.in ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/conftools/PrintPath ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4 --- trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4 2005-02-20 10:12:49 UTC (rev 13664) @@ -7,7 +7,7 @@ dnl the binary it will be grep'ed for some symbols that will look dnl different for different endianess of the binary. dnl -dnl @version $Id$ +dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2001/10/01 20:03:13 fdrake Exp $ dnl @author Guido Draheim <guidod(a)gmx.de> dnl AC_DEFUN([AC_C_BIGENDIAN_CROSS], Property changes on: trunk/reactos/lib/expat/conftools/ac_c_bigendian_cross.m4 ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/conftools/config.guess ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/conftools/config.sub ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/conftools/expat.m4 ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/conftools/get-version.sh ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/conftools/install-sh ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/conftools/mkinstalldirs --- trunk/reactos/lib/expat/conftools/mkinstalldirs 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/conftools/mkinstalldirs 2005-02-20 10:12:49 UTC (rev 13664) @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id$ +# $Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp $ errstatus=0 Property changes on: trunk/reactos/lib/expat/conftools/mkinstalldirs ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/doc/reference.html --- trunk/reactos/lib/expat/doc/reference.html 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/doc/reference.html 2005-02-20 10:12:49 UTC (rev 13664) @@ -19,7 +19,7 @@ <td class="banner"><h1>The Expat XML Parser</h1></td> </tr> <tr> - <td class="releaseno">Release 1.95.7</td> + <td class="releaseno">Release 1.95.8</td> <td></td> </tr> </table> @@ -72,6 +72,9 @@ <li><a href="#XML_Parse">XML_Parse</a></li> <li><a href="#XML_ParseBuffer">XML_ParseBuffer</a></li> <li><a href="#XML_GetBuffer">XML_GetBuffer</a></li> + <li><a href="#XML_StopParser">XML_StopParser</a></li> + <li><a href="#XML_ResumeParser">XML_ResumeParser</a></li> + <li><a href="#XML_GetParsingStatus">XML_GetParsingStatus</a></li> </ul> </li> <li><a href="#setting">Handler Setting Functions</a> @@ -317,12 +320,12 @@ <dl class="cpp-symbols"> <dt>XML_DTD</dt> <dd>Include support for using and reporting DTD-based content. If -this is defined, default attribute values from the DTD are reported -and attribute value normalization occurs based on the type of -attributes. Callbacks can be registered which report information from -the DTD (including content models and attribute definitions) only if -this is defined. Without this, Expat has a smaller memory footprint -and can be faster.</dd> +this is defined, default attribute values from an external DTD subset +are reported and attribute value normalization occurs based on the +type of attributes defined in the external subset. Without +this, Expat has a smaller memory footprint and can be faster, but will +not load external entities or process conditional sections. This does +not affect the set of functions available in the API.</dd> <dt>XML_NS</dt> <dd>When defined, support for the <cite><a href= @@ -345,10 +348,11 @@ <dd>The number of input bytes of markup context which the parser will ensure are available for reporting via <code><a href= "#XML_GetInputContext" >XML_GetInputContext</a></code>. This is -normally set to 1024. If this is not defined, the input context will -not be available and <code><a href= "#XML_GetInputContext" ->XML_GetInputContext</a></code> will always report NULL. Without -this, Expat has a smaller memory footprint and can be faster.</dd> +normally set to 1024, and must be set to a positive interger. If this +is not defined, the input context will not be available and <code><a +href= "#XML_GetInputContext" >XML_GetInputContext</a></code> will +always report NULL. Without this, Expat has a smaller memory +footprint and can be faster.</dd> <dt>XML_STATIC</dt> <dd>On Windows, this should be set if Expat is going to be linked @@ -415,7 +419,7 @@ void *) to data with further internal structure. In order to free the memory associated with this object you must call <code><a href= "#XML_ParserFree" >XML_ParserFree</a></code>. Note that if you have -provided any <a href="userdata">user data</a> that gets stored in the +provided any <a href="#userdata">user data</a> that gets stored in the parser, then your application is responsible for freeing it prior to calling <code>XML_ParserFree</code>.</p> @@ -509,7 +513,7 @@ data is passed; it will have the type <code>XML_Parser</code> if the parser itself is passed. When the parser is passed, the user data may be retrieved using <code><a href="#XML_GetUserData" ->XML_GetUserData</code></a>.</p> +>XML_GetUserData</a></code>.</p> <p>One common case where multiple calls to a single handler may need to communicate using an application data structure is the case when @@ -587,12 +591,12 @@ separator character (which is the 2nd argument to <code><a href= "#XML_ParserCreateNS" >XML_ParserCreateNS</a></code>), and the local name (i.e. the part after the colon). Names with undeclared prefixes -are passed through to the handlers unchanged, with the prefix and -colon still attached. Unprefixed attribute names are never expanded, +are not well-formed when namespace processing is enabled, and will +trigger an error. Unprefixed attribute names are never expanded, and unprefixed element names are only expanded when they are in the scope of a default namespace.</p> -<p>However if <code><a href= "XML_SetReturnNSTriplet" +<p>However if <code><a href= "#XML_SetReturnNSTriplet" >XML_SetReturnNSTriplet</a></code> has been called with a non-zero <code>do_nst</code> parameter, then the expanded form for names with an explicit prefix is a concatenation of: URI, separator, local name, @@ -602,7 +606,7 @@ for the end of a scope of a declaration with the <code><a href= "#XML_SetNamespaceDeclHandler" >XML_SetNamespaceDeclHandler</a></code> function. The StartNamespaceDeclHandler is called prior to the start -tag handler and the EndNamespaceDeclHandler is called before the +tag handler and the EndNamespaceDeclHandler is called after the corresponding end tag that ends the namespace's scope. The namespace start handler gets passed the prefix and URI for the namespace. For a default namespace declaration (xmlns='...'), the prefix will be null. @@ -727,6 +731,149 @@ <p>In order to read an external DTD, you also have to set an external entity reference handler as described above.</p> +<h3 id="stop-resume">Temporarily Stopping Parsing</h3> + +<p>Expat 1.95.8 introduces a new feature: its now possible to stop +parsing temporarily from within a handler function, even if more data +has already been passed into the parser. Applications for this +include</p> + +<ul> + <li>Supporting the <a href= "http://www.w3.org/TR/xinclude/" + >XInclude</a> specification.</li> + + <li>Delaying further processing until additional information is + available from some other source.</li> + + <li>Adjusting processor load as task priorities shift within an + application.</li> + + <li>Stopping parsing completely (simply free or reset the parser + instead of resuming in the outer parsing loop). This can be useful + if a application-domain error is found in the XML being parsed or if + the result of the parse is determined not to be useful after + all.</li> +</ul> + +<p>To take advantage of this feature, the main parsing loop of an +application needs to support this specifically. It cannot be +supported with a parsing loop compatible with Expat 1.95.7 or +earlier (though existing loops will continue to work without +supporting the stop/resume feature).</p> + +<p>An application that uses this feature for a single parser will have +the rough structure (in pseudo-code):</p> + +<pre class="pseudocode"> +fd = open_input() +p = create_parser() + +if parse_xml(p, fd) { + /* suspended */ + + int suspended = 1; + + while (suspended) { + do_something_else() + if ready_to_resume() { + suspended = continue_parsing(p, fd); + } + } +} +</pre> + +<p>An application that may resume any of several parsers based on +input (either from the XML being parsed or some other source) will +certainly have more interesting control structures.</p> + +<p>This C function could be used for the <code>parse_xml</code> +function mentioned in the pseudo-code above:</p> + +<pre class="eg"> +#define BUFF_SIZE 10240 + +/* Parse a document from the open file descriptor 'fd' until the parse + is complete (the document has been completely parsed, or there's + been an error), or the parse is stopped. Return non-zero when + the parse is merely suspended. +*/ +int +parse_xml(XML_Parser p, int fd) +{ + for (;;) { + int last_chunk; + int bytes_read; + enum XML_Status status; + + void *buff = XML_GetBuffer(p, BUFF_SIZE); + if (buff == NULL) { + /* handle error... */ + return 0; + } + bytes_read = read(fd, buff, BUFF_SIZE); + if (bytes_read < 0) { + /* handle error... */ + return 0; + } + status = XML_ParseBuffer(p, bytes_read, bytes_read == 0); + switch (status) { + case XML_STATUS_ERROR: + /* handle error... */ + return 0; + case XML_STATUS_SUSPENDED: + return 1; + } + if (bytes_read == 0) + return 0; + } +} +</pre> + +<p>The corresponding <code>continue_parsing</code> function is +somewhat simpler, since it only need deal with the return code from +<code><a href= "#XML_ResumeParser">XML_ResumeParser</a></code>; it can +delegate the input handling to the <code>parse_xml</code> +function:</p> + +<pre class="eg"> +/* Continue parsing a document which had been suspended. The 'p' and + 'fd' arguments are the same as passed to parse_xml(). Return + non-zero when the parse is suspended. +*/ +int +continue_parsing(XML_Parser p, int fd) +{ + enum XML_Status status = XML_ResumeParser(p); + switch (status) { + case XML_STATUS_ERROR: + /* handle error... */ + return 0; + case XML_ERROR_NOT_SUSPENDED: + /* handle error... */ + return 0;. + case XML_STATUS_SUSPENDED: + return 1; + } + return parse_xml(p, fd); +} +</pre> + +<p>Now that we've seen what a mess the top-level parsing loop can +become, what have we gained? Very simply, we can now use the <code><a +href= "#XML_StopParser" >XML_StopParser</a></code> function to stop +parsing, without having to go to great lengths to avoid additional +processing that we're expecting to ignore. As a bonus, we get to stop +parsing <em>temporarily</em>, and come back to it when we're +ready.</p> + +<p>To stop parsing from a handler function, use the <code><a href= +"#XML_StopParser" >XML_StopParser</a></code> function. This function +takes two arguments; the parser being stopped and a flag indicating +whether the parse can be resumed in the future.</p> + + + + <hr />  @@ -761,7 +908,11 @@ expanded element names and attribute names are returned as a concatenation of the namespace URI, <em>sep</em>, and the local part of the name. This means that you should pick a character for <em>sep</em> that can't be -part of a legal URI.</div> +part of a legal URI. There is a special case when <em>sep</em> is the null +character <code>'\0'</code>: the namespace URI and the local part will be +concatenated without any separator - this is intended to support RDF processors. +It is a programming error to use the null separator with +<a href= "#XML_SetReturnNSTriplet">namespace triplets</a>.</div> <pre class="fcndec" id="XML_ParserCreate_MM"> XML_Parser XMLCALL @@ -818,8 +969,10 @@ <div class="fcndef"> Clean up the memory structures maintained by the parser so that it may be used again. After this has been called, <code>parser</code> is -ready to start parsing a new document. This function may not be used -on a parser created using <code><a href= +ready to start parsing a new document. All handlers are cleared from +the parser, except for the unknownEncodingHandler. The parser's external +state is re-initialized except for the values of ns and ns_triplets. +This function may not be used on a parser created using <code><a href= "#XML_ExternalEntityParserCreate" >XML_ExternalEntityParserCreate</a ></code>; it will return <code>XML_FALSE</code> in that case. Returns <code>XML_TRUE</code> on success. Your application is responsible for @@ -915,6 +1068,125 @@ </pre> </div> +<pre class="fcndec" id="XML_StopParser"> +enum XML_Status XMLCALL +XML_StopParser(XML_Parser p, + XML_Bool resumable); +</pre> +<div class="fcndef"> + +<p>Stops parsing, causing <code><a href= "#XML_Parse" +>XML_Parse</a></code> or <code><a href= "#XML_ParseBuffer" +>XML_ParseBuffer</a></code> to return. Must be called from within a +call-back handler, except when aborting (when <code>resumable</code> +is <code>XML_FALSE</code>) an already suspended parser. Some +call-backs may still follow because they would otherwise get +lost, including +<ul> + <li> the end element handler for empty elements when stopped in the + start element handler,</li> + <li> end namespace declaration handler when stopped in the end + element handler,</li> +</ul> +and possibly others.</p> + +<p>This can be called from most handlers, including DTD related +call-backs, except when parsing an external parameter entity and +<code>resumable</code> is <code>XML_TRUE</code>. Returns +<code>XML_STATUS_OK</code> when successful, +<code>XML_STATUS_ERROR</code> otherwise. The possible error codes +are:</p> +<dl> + <dt><code>XML_ERROR_SUSPENDED</code></dt> + <dd>when suspending an already suspended parser.</dd> + <dt><code>XML_ERROR_FINISHED</code></dt> + <dd>when the parser has already finished.</dd> + <dt><code>XML_ERROR_SUSPEND_PE</code></dt> + <dd>when suspending while parsing an external PE.</dd> +</dl> + +<p>Since the stop/resume feature requires application support in the +outer parsing loop, it is an error to call this function for a parser +not being handled appropriately; see <a href= "#stop-resume" +>Temporarily Stopping Parsing</a> for more information.</p> + +<p>When <code>resumable</code> is <code>XML_TRUE</code> then parsing +is <em>suspended</em>, that is, <code><a href= "#XML_Parse" +>XML_Parse</a></code> and <code><a href= "#XML_ParseBuffer" +>XML_ParseBuffer</a></code> return <code>XML_STATUS_SUSPENDED</code>. +Otherwise, parsing is <em>aborted</em>, that is, <code><a href= +"#XML_Parse" >XML_Parse</a></code> and <code><a href= +"#XML_ParseBuffer" >XML_ParseBuffer</a></code> return +<code>XML_STATUS_ERROR</code> with error code +<code>XML_ERROR_ABORTED</code>.</p> + +<p><strong>Note:</strong> +This will be applied to the current parser instance only, that is, if +there is a parent parser then it will continue parsing when the +external entity reference handler returns. It is up to the +implementation of that handler to call <code><a href= +"#XML_StopParser" >XML_StopParser</a></code> on the parent parser +(recursively), if one wants to stop parsing altogether.</p> + +<p>When suspended, parsing can be resumed by calling <code><a href= +"#XML_ResumeParser" >XML_ResumeParser</a></code>.</p> + +<p>New in Expat 1.95.8.</p> +</div> + +<pre class="fcndec" id="XML_ResumeParser"> +enum XML_Status XMLCALL +XML_ResumeParser(XML_Parser p); +</pre> +<div class="fcndef"> +<p>Resumes parsing after it has been suspended with <code><a href= +"#XML_StopParser" >XML_StopParser</a></code>. Must not be called from +within a handler call-back. Returns same status codes as <code><a +href= "#XML_Parse">XML_Parse</a></code> or <code><a href= +"#XML_ParseBuffer" >XML_ParseBuffer</a></code>. An additional error +code, <code>XML_ERROR_NOT_SUSPENDED</code>, will be returned if the +parser was not currently suspended.</p> + +<p><strong>Note:</strong> +This must be called on the most deeply nested child parser instance +first, and on its parent parser only after the child parser has +finished, to be applied recursively until the document entity's parser +is restarted. That is, the parent parser will not resume by itself +and it is up to the application to call <code><a href= +"#XML_ResumeParser" >XML_ResumeParser</a></code> on it at the +appropriate moment.</p> + +<p>New in Expat 1.95.8.</p> +</div> + +<pre class="fcndec" id="XML_GetParsingStatus"> +void XMLCALL +XML_GetParsingStatus(XML_Parser p, + XML_ParsingStatus *status); +</pre> +<pre class="signature"> +enum XML_Parsing { + XML_INITIALIZED, + XML_PARSING, + XML_FINISHED, + XML_SUSPENDED +}; + +typedef struct { + enum XML_Parsing parsing; + XML_Bool finalBuffer; +} XML_ParsingStatus; +</pre> +<div class="fcndef"> +<p>Returns status of parser with respect to being initialized, +parsing, finished, or suspended, and whether the final buffer is being +processed. The <code>status</code> parameter <em>must not</em> be +NULL.</p> + +<p>New in Expat 1.95.8.</p> +</div> + + <h3><a name="setting">Handler Setting</a></h3> <p>Although handlers are typically set prior to parsing and left alone, an @@ -1252,8 +1524,8 @@ "#XML_ParseBuffer" >XML_ParseBuffer</a></code> have been called on the given parser.</p> <p>If the handler knows how to deal with an encoding with the given name, it should fill in the <code>info</code> data -structure and return <code>XML_STATUS_ERROR</code>. Otherwise it -should return <code>XML_STATUS_OK</code>. The handler will be called +structure and return <code>XML_STATUS_OK</code>. Otherwise it +should return <code>XML_STATUS_ERROR</code>. The handler will be called at most once per parsed (external) entity. The optional application data pointer <code>encodingHandlerData</code> will be passed back to the handler.</p> @@ -1685,6 +1957,9 @@ <p>Only a limited amount of context is kept, so if the event triggering a call spans over a very large amount of input, the actual parse position may be before the beginning of the buffer.</p> + +<p>If <code>XML_CONTEXT_BYTES</code> is not defined, this will always +return NULL.</p> </div> <h3><a name="miscellaneous">Miscellaneous functions</a></h3> @@ -1837,6 +2112,11 @@ DTD support, it returns <code>XML_ERROR_FEATURE_REQUIRES_XML_DTD</code>. Otherwise, it returns <code>XML_ERROR_NONE</code>.</p> + +<p><b>Note:</b> For the purpose of checking WFC: Entity Declared, passing +<code>useDTD == XML_TRUE</code> will make the parser behave as if +the document had a DTD with an external subset. This holds true even if +the external entity reference handler returns without action.</p> </div> <pre class="fcndec" id="XML_SetReturnNSTriplet"> Property changes on: trunk/reactos/lib/expat/doc/reference.html ___________________________________________________________________ Name: svn:keywords - author date id revision _____ Modified: trunk/reactos/lib/expat/doc/style.css --- trunk/reactos/lib/expat/doc/style.css 2005-02-20 02:32:23 UTC (rev 13663) +++ trunk/reactos/lib/expat/doc/style.css 2005-02-20 10:12:49 UTC (rev 13664) @@ -49,6 +49,17 @@ margin-right: 10%; } +.pseudocode { + padding-left: 1em; + padding-top: .5em; + padding-bottom: .5em; + border: solid thin; + margin: 1em 0; + background-color: rgb(250,220,180); + margin-left: 2em; + margin-right: 10%; +} + .handler { width: 100%; border-top-width: thin; Property changes on: trunk/reactos/lib/expat/doc/style.css ___________________________________________________________________ Name: svn:keywords - author date id revision Property changes on: trunk/reactos/lib/expat/doc/xmlwf.1 ___________________________________________________________________ [truncated at 1000 lines; 6007 more skipped]

1 0

[tamlin] 13663: Make sure to actually include symbols that are needed! Thanks to Usurp.
by tamlin＠svn.reactos.com 20 Feb '05

20 Feb '05

Make sure to actually include symbols that are needed! Thanks to Usurp. Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-02-20 02:30:28 UTC (rev 13662) +++ trunk/reactos/subsys/smss/smss.h 2005-02-20 02:32:23 UTC (rev 13663) @@ -4,6 +4,7 @@ #define NTOS_MODE_USER #include <ntos.h> #include <sm/api.h> +#include <sm/helper.h> #define CHILD_CSRSS 0 #define CHILD_WINLOGON 1

1 0

[tamlin] 13662: Used, but never set include-guard macro fixed. Thanks to Usurp.
by tamlin＠svn.reactos.com 20 Feb '05

20 Feb '05

Used, but never set include-guard macro fixed. Thanks to Usurp. Modified: trunk/reactos/include/sm/helper.h _____ Modified: trunk/reactos/include/sm/helper.h --- trunk/reactos/include/sm/helper.h 2005-02-19 23:24:38 UTC (rev 13661) +++ trunk/reactos/include/sm/helper.h 2005-02-20 02:30:28 UTC (rev 13662) @@ -1,4 +1,5 @@ -#ifndef _SM_HELPER_H +#ifndef INCLUDE_SM_HELPER_H +#define INCLUDE_SM_HELPER_H /*** DATA TYPES ******************************************************/ @@ -43,4 +44,4 @@ IN PUNICODE_STRING Pgm ); -#endif /* ndef _SM_HELPER_H */ +#endif /* ndef INCLUDE_SM_HELPER_H */

1 0

[arty] 13661: Finish zeroing fields that need it.
by arty＠svn.reactos.com 19 Feb '05

19 Feb '05

Finish zeroing fields that need it. Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-02-19 23:12:32 UTC (rev 13660) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-02-19 23:24:38 UTC (rev 13661) @@ -122,6 +122,7 @@ so->so_error = 0; so->so_q = so->so_q0 = NULL; so->so_qlen = 0; + so->so_head = NULL; *aso = so; } return error; @@ -379,7 +380,6 @@ *newso = so; /*so->so_state &= ~SS_COMP;*/ - so->so_q = NULL; mnam.m_data = &sa; mnam.m_len = sizeof(sa); @@ -387,6 +387,9 @@ (void) soaccept(so, &mnam); so->so_state = SS_NBIO | SS_ISCONNECTED; + so->so_q = so->so_q0 = NULL; + so->so_qlen = 0; + so->so_head = 0; OS_DbgPrint(OSK_MID_TRACE,("error = %d\n", error)); if (name) {

1 0

[ros-diffs] [fireball] 13660: Make OHCI+Core drivers really working, they are basically working now. Next thing to do is to make them working better (e.g. having a thread infinitely looping to serve irqs/other stuff isn't a good solution for multitasking OS) - add interrupt handler, spinlocks wrappers, waits etc.
by fireball＠svn.reactos.com 19 Feb '05

19 Feb '05

Make OHCI+Core drivers really working, they are basically working now. Next thing to do is to make them working better (e.g. having a thread infinitely looping to serve irqs/other stuff isn't a good solution for multitasking OS) - add interrupt handler, spinlocks wrappers, waits etc. Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/core/makefile Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.c Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.def Modified: trunk/reactos/drivers/usb/cromwell/host/makefile Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-pci.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci.h Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c Added: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c --- trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -62,13 +62,16 @@ int STDCALL usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id) { struct hc_driver *driver; - unsigned long resource, len; + PHYSICAL_ADDRESS resource; + unsigned long len; void *base; struct usb_hcd *hcd; int retval, region; char buf [8]; //char *bufp = buf; + printk("usbcore: usb_hcd_pci_probe() called\n"); + if (usb_disabled()) return -ENODEV; @@ -103,7 +106,8 @@ } } else { // UHCI - resource = len = 0; + //resource = 0; + len = 0; for (region = 0; region < PCI_ROM_RESOURCE; region++) { if (!(pci_resource_flags (dev, region) & IORESOURCE_IO)) continue; @@ -118,7 +122,7 @@ dbg ("no i/o regions available"); return -EBUSY; } - base = (void *) resource; + base = NULL; //(void *) resource; // this isn't possible } // driver->start(), later on, will transfer device from @@ -165,7 +169,7 @@ if (request_irq (dev->irq, usb_hcd_irq, SA_SHIRQ, hcd->description, hcd) != 0) { dev_err (hcd->controller, - "request interrupt %s failed\n", bufp); + "request interrupt %s failed\n", buf); retval = -EBUSY; goto clean_3; } @@ -173,7 +177,7 @@ hcd->regs = base; hcd->region = region; - dev_info (hcd->controller, "irq %s, %s %p\n", bufp, + dev_info (hcd->controller, "irq %s, %s %p\n", buf, (driver->flags & HCD_MEMORY) ? "pci mem" : "io base", base); _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c --- trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -1148,8 +1148,13 @@ do { hub_events(); - wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); + //FIXME: Correct this + //wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); // interruptable_sleep_on analog - below + /*while (!list_empty(&hub_event_list)) { + interruptible_sleep_on(&khubd_wait); + }*/ + if (current->flags & PF_FREEZE) refrigerator(PF_IOTHREAD); _____ Modified: trunk/reactos/drivers/usb/cromwell/core/makefile --- trunk/reactos/drivers/usb/cromwell/core/makefile 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/core/makefile 2005-02-19 23:12:32 UTC (rev 13660) @@ -6,7 +6,7 @@ TARGET_DDKLIBS = ntoskrnl.a -TARGET_CFLAGS = -Wall -I$(PATH_TO_TOP)/ntoskrnl/include +TARGET_CFLAGS = -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -DDEBUG_MODE TARGET_OBJECTS = \ message.o hcd.o hcd-pci.o hub.o usb.o config.o urb.o \ _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c --- trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -1042,7 +1042,7 @@ "USB device %04x:%04x (%s)", vendor_id, product_id, mfgr_str); } - //usbprintk("USB connected: %s\n",dev->dev.name); + usbprintk("USB connected: %s\n",dev->dev.name); kfree(buf); } @@ -1227,6 +1227,7 @@ "usb-%s-%s interface %d", dev->bus->bus_name, dev->devpath, desc->bInterfaceNumber); + DPRINT1("usb_new_device: %s\n", interface->dev.name); } dev_dbg (&dev->dev, "%s - registering interface %s\n", __FUNCTION__, interface->dev.bus_id); device_add (&interface->dev); @@ -1510,7 +1511,7 @@ /* * Init */ -static int __init usb_init(void) +int STDCALL __init usb_init(void) { if (nousb) { info("USB support disabled\n"); @@ -1530,7 +1531,7 @@ /* * Cleanup */ -static void __exit usb_exit(void) +void STDCALL __exit usb_exit(void) { /* This will matter if shutdown/reboot does exitcalls. */ if (nousb) _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.c --- trunk/reactos/drivers/usb/cromwell/core/usbcore.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/core/usbcore.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -4,13 +4,60 @@ */ #include <ddk/ntddk.h> +#include <debug.h> +NTSTATUS AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo) +{ + DbgPrint("usbcore: AddDevice called\n"); + + /* we need to do kind of this stuff here (as usual) + PDEVICE_OBJECT fdo; + IoCreateDevice(..., &fdo); + pdx->LowerDeviceObject = + IoAttachDeviceToDeviceStack(fdo, pdo);*/ + return STATUS_SUCCESS; +} + +VOID DriverUnload(PDRIVER_OBJECT DriverObject) +{ + // nothing to do here yet +} + +// Dispatch PNP +NTSTATUS DispatchPnp(PDEVICE_OBJECT fdo, PIRP Irp) +{ + ULONG fcn; + PIO_STACK_LOCATION stack; + + stack = IoGetCurrentIrpStackLocation(Irp); + fcn = stack->MinorFunction; + DbgPrint("IRP_MJ_PNP, fcn=%d\n", fcn); + + if (fcn == IRP_MN_REMOVE_DEVICE) + { + IoDeleteDevice(fdo); + } + + return STATUS_SUCCESS; +} + +NTSTATUS DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) +{ + DbgPrint("IRP_MJ_POWER dispatch\n"); + return STATUS_SUCCESS; +} + /* * Standard DriverEntry method. */ NTSTATUS STDCALL -DriverEntry(IN PVOID Context1, IN PVOID Context2) +DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) { + DriverObject->DriverUnload = DriverUnload; + DriverObject->DriverExtension->AddDevice = AddDevice; + DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.def --- trunk/reactos/drivers/usb/cromwell/core/usbcore.def 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/core/usbcore.def 2005-02-19 23:12:32 UTC (rev 13660) @@ -2,6 +2,8 @@ ; Exports definition file for usbcore.sys ; EXPORTS +usb_init@0 +usb_exit@0 usb_init_urb@4 usb_alloc_urb@8 usb_free_urb@4 _____ Modified: trunk/reactos/drivers/usb/cromwell/host/makefile --- trunk/reactos/drivers/usb/cromwell/host/makefile 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/host/makefile 2005-02-19 23:12:32 UTC (rev 13660) @@ -6,7 +6,7 @@ TARGET_DDKLIBS = ntoskrnl.a usbcore.a -TARGET_CFLAGS = -Wall -I$(PATH_TO_TOP)/ntoskrnl/include +TARGET_CFLAGS = -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -DDEBUG_MODE TARGET_OBJECTS = \ ohci-hcd.o ohci_main.o ../sys/ros_wrapper.o ../sys/linuxwrapper.o _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c --- trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -471,7 +471,7 @@ /* a reset clears this */ writel ((u32) ohci->hcca_dma, &ohci->regs->hcca); -// usbprintk("HCCA: %p \n",ohci->regs->hcca); + usbprintk("HCCA: %p \n",ohci->regs->hcca); /* force default fmInterval (we won't adjust it); init thresholds * for last FS and LS packets, reserve 90% for periodic. _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-pci.c --- trunk/reactos/drivers/usb/cromwell/host/ohci-pci.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/host/ohci-pci.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -38,6 +38,8 @@ struct ohci_hcd *ohci = hcd_to_ohci (hcd); int ret; + DPRINT("ohci_pci_start()\n"); + if (hcd->pdev) { ohci->hcca = pci_alloc_consistent (hcd->pdev, sizeof *ohci->hcca, &ohci->hcca_dma); @@ -86,23 +88,27 @@ } - memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); + memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); if ((ret = ohci_mem_init (ohci)) < 0) { ohci_stop (hcd); return ret; } ohci->regs = hcd->regs; + DPRINT("Controller memory init done\n"); + if (hc_reset (ohci) < 0) { ohci_stop (hcd); return -ENODEV; } + DPRINT("Controller reset done\n"); if (hc_start (ohci) < 0) { ohci_err (ohci, "can't start\n"); ohci_stop (hcd); return -EBUSY; } + DPRINT("Controller start done\n"); #ifdef DEBUG ohci_dump (ohci, 1); @@ -352,7 +358,7 @@ /*---------------------------------------------------------------------- ---*/ -static const struct pci_device_id __devinitdata pci_ids [] = { { +const struct pci_device_id __devinitdata pci_ids [] = { { /* handle any USB OHCI controller */ .class = (PCI_CLASS_SERIAL_USB << 8) | 0x10, @@ -370,7 +376,7 @@ MODULE_DEVICE_TABLE (pci, pci_ids); /* pci driver glue; this is a "new style" PCI driver module */ -static struct pci_driver ohci_pci_driver = { +struct pci_driver ohci_pci_driver = { .name = (char *) hcd_name, .id_table = pci_ids, @@ -384,22 +390,23 @@ }; -static int __init ohci_hcd_pci_init (void) +int ohci_hcd_pci_init (void) { printk (KERN_DEBUG "%s: " DRIVER_INFO " (PCI)\n", hcd_name); if (usb_disabled()) return -ENODEV; - printk (KERN_DEBUG "%s: block sizes: ed %Zd td %Zd\n", hcd_name, - sizeof (struct ed), sizeof (struct td)); + // causes page fault in reactos + //printk (KERN_DEBUG "%s: block sizes: ed %Zd td %Zd\n", hcd_name, + // sizeof (struct ed), sizeof (struct td)); return pci_module_init (&ohci_pci_driver); } -module_init (ohci_hcd_pci_init); +/*module_init (ohci_hcd_pci_init);*/ /*---------------------------------------------------------------------- ---*/ -static void __exit ohci_hcd_pci_cleanup (void) +void ohci_hcd_pci_cleanup (void) { pci_unregister_driver (&ohci_pci_driver); } -module_exit (ohci_hcd_pci_cleanup); +/*module_exit (ohci_hcd_pci_cleanup);*/ _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci.h --- trunk/reactos/drivers/usb/cromwell/host/ohci.h 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/host/ohci.h 2005-02-19 23:12:32 UTC (rev 13660) @@ -240,11 +240,23 @@ #define OHCI_CTRL_RWE (1 << 10) /* remote wakeup enable */ /* pre-shifted values for HCFS */ -# define OHCI_USB_RESET (0 << 6) -# define OHCI_USB_RESUME (1 << 6) -# define OHCI_USB_OPER (2 << 6) -# define OHCI_USB_SUSPEND (3 << 6) +#define OHCI_USB_RESET (0 << 6) +#define OHCI_USB_RESUME (1 << 6) +#define OHCI_USB_OPER (2 << 6) +#define OHCI_USB_SUSPEND (3 << 6) +// HCFS itself +static char *hcfs2string (int state) +{ + switch (state) { + case OHCI_USB_RESET: return "reset"; + case OHCI_USB_RESUME: return "resume"; + case OHCI_USB_OPER: return "operational"; + case OHCI_USB_SUSPEND: return "suspend"; + } + return "?"; +} + /* * HcCommandStatus (cmdstatus) register masks */ _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -1,61 +1,295 @@ /* - ReactOS specific functions for ohci module + ReactOS specific functions for OHCI module by Aleksey Bragin (aleksey(a)reactos.com) + Some parts of code are inspired (or even just copied) from ReactOS Videoport driver */ #include <ddk/ntddk.h> #include <debug.h> +#include "../linux/linux_wrapper.h" +#include "ohci_main.h" -NTSTATUS AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo) +// declare basic init funcs +void init_wrapper(struct pci_dev *probe_dev); +int ohci_hcd_pci_init (void); +void ohci_hcd_pci_cleanup (void); +int STDCALL usb_init(void); +void STDCALL usb_exit(void); +extern struct pci_driver ohci_pci_driver; +extern const struct pci_device_id pci_ids[]; + + + +// This should be removed, but for testing purposes it's here +struct pci_dev *dev; +//struct pci_device_id *dev_id; + + +#define USB_OHCI_TAG TAG('u','s','b','o') + +NTSTATUS STDCALL AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo) { PDEVICE_OBJECT fdo; NTSTATUS Status; WCHAR DeviceBuffer[20]; UNICODE_STRING DeviceName; + POHCI_DRIVER_EXTENSION DriverExtension; + POHCI_DEVICE_EXTENSION DeviceExtension; + ULONG Size, DeviceNumber; - DbgPrint("ohci: AddDevice called\n"); + DPRINT1("ohci: AddDevice called\n"); + + // Allocate driver extension now + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + if (DriverExtension == NULL) + { + Status = IoAllocateDriverObjectExtension( + DriverObject, + DriverObject, + sizeof(OHCI_DRIVER_EXTENSION), + (PVOID *)&DriverExtension); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Allocating DriverObjectExtension failed.\n"); + return Status; + } + } - /* Create a unicode device name. */ - swprintf(DeviceBuffer, L"\\Device\\usbohci"); + // Create a unicode device name + DeviceNumber = 0; //TODO: Allocate new device number every time + swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); RtlInitUnicodeString(&DeviceName, DeviceBuffer); + Status = IoCreateDevice(DriverObject, + sizeof(OHCI_DEVICE_EXTENSION)/* + DriverExtension->InitializationData.HwDeviceExtensionSize*/, + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + &fdo); - Status = IoCreateDevice(DriverObject, 0, &DeviceName, FILE_DEVICE_VIDEO, 0, FALSE,&fdo); - if (!NT_SUCCESS(Status)) { DPRINT("IoCreateDevice call failed with status 0x%08x\n", Status); return Status; } + // zerofill device extension + DeviceExtension = (POHCI_DEVICE_EXTENSION)pdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(OHCI_DEVICE_EXTENSION)); + DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(fdo, pdo); + + fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + // Initialize device extension + DeviceExtension->DeviceNumber = DeviceNumber; + DeviceExtension->PhysicalDeviceObject = pdo; + DeviceExtension->FunctionalDeviceObject = fdo; + DeviceExtension->DriverExtension = DriverExtension; + + /* Get bus number from the upper level bus driver. */ + Size = sizeof(ULONG); + Status = IoGetDeviceProperty( + pdo, + DevicePropertyBusNumber, + Size, + &DeviceExtension->SystemIoBusNumber, + &Size); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Couldn't get an information from bus driver. Panic!!!\n"); + return Status; + } + + DPRINT("Done AddDevice\n"); return STATUS_SUCCESS; } -VOID DriverUnload(PDRIVER_OBJECT DriverObject) +VOID STDCALL DriverUnload(PDRIVER_OBJECT DriverObject) { - // nothing to do here yet + DPRINT1("DriverUnload()\n"); + + // Exit usb device + usb_exit(); + + // Remove device (ohci_pci_driver.remove) + ohci_pci_driver.remove(dev); + + ExFreePool(dev->slot_name); + ExFreePool(dev); + + // Perform some cleanup + ohci_hcd_pci_cleanup(); } -// Dispatch PNP -NTSTATUS DispatchPnp(PDEVICE_OBJECT fdo, PIRP Irp) +NTSTATUS InitLinuxWrapper(PDEVICE_OBJECT DeviceObject) { - ULONG fcn; - PIO_STACK_LOCATION stack; + NTSTATUS Status; + POHCI_DEVICE_EXTENSION DeviceExtension = (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // Fill generic linux structs + dev = ExAllocatePoolWithTag(PagedPool, sizeof(struct pci_dev), USB_OHCI_TAG); - stack = IoGetCurrentIrpStackLocation(Irp); - fcn = stack->MinorFunction; - DbgPrint("IRP_MJ_PNP, fcn=%d\n", fcn); + init_wrapper(dev); + dev->irq = DeviceExtension->InterruptLevel; + dev->dev_ext = (PVOID)DeviceExtension; + dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_OHCI_TAG); // 128 max len for slot name - if (fcn == IRP_MN_REMOVE_DEVICE) - { - IoDeleteDevice(fdo); - } + strcpy(dev->dev.name, "OpenHCI PCI-USB Controller"); + strcpy(dev->slot_name, "OHCD PCI Slot"); + // Init the OHCI HCD. Probe will be called automatically, but will fail because id=NULL + Status = ohci_hcd_pci_init(); + //FIXME: Check status returned value + + // Init core usb + usb_init(); + + // Probe device with real id now + ohci_pci_driver.probe(dev, pci_ids); + + DPRINT("InitLinuxWrapper() done\n"); + return STATUS_SUCCESS; } -NTSTATUS DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) +NTSTATUS STDCALL +OHCD_PnPStartDevice(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + PDRIVER_OBJECT DriverObject; + POHCI_DRIVER_EXTENSION DriverExtension; + POHCI_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST AllocatedResources; + + /* + * Get the initialization data we saved in VideoPortInitialize. + */ + DriverObject = DeviceObject->DriverObject; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + DeviceExtension = (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* + * Store some resources in the DeviceExtension. + */ + AllocatedResources = Stack->Parameters.StartDevice.AllocatedResources; + if (AllocatedResources != NULL) + { + CM_FULL_RESOURCE_DESCRIPTOR *FullList; + CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; + ULONG ResourceCount; + ULONG ResourceListSize; + + /* Save the resource list */ + ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; + ResourceListSize = + FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. + PartialDescriptors[ResourceCount]); + DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); + if (DeviceExtension->AllocatedResources == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(DeviceExtension->AllocatedResources, + AllocatedResources, + ResourceListSize); + + /* Get the interrupt level/vector - needed by HwFindAdapter sometimes */ + for (FullList = AllocatedResources->List; + FullList < AllocatedResources->List + AllocatedResources->Count; + FullList++) + { + /* FIXME: Is this ASSERT ok for resources from the PNP manager? */ + /*ASSERT(FullList->InterfaceType == PCIBus && + FullList->BusNumber == DeviceExtension->SystemIoBusNumber && + 1 == FullList->PartialResourceList.Version && + 1 == FullList->PartialResourceList.Revision);*/ + for (Descriptor = FullList->PartialResourceList.PartialDescriptors; + Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; + Descriptor++) + { + if (Descriptor->Type == CmResourceTypeInterrupt) + { + DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; + DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; + } + else if (Descriptor->Type == CmResourceTypeMemory) + { + DeviceExtension->BaseAddress = Descriptor->u.Memory.Start; + DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length; + } + } + } + } + DPRINT1("Interrupt level: 0x%x Interrupt Vector: 0x%x\n", + DeviceExtension->InterruptLevel, + DeviceExtension->InterruptVector); + + /* + * Init wrapper with this object + */ + return InitLinuxWrapper(DeviceObject); +} + +// Dispatch PNP +NTSTATUS STDCALL DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + //Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + //if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + + Status = OHCD_PnPStartDevice(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + + case IRP_MN_STOP_DEVICE: + //Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + //if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + Status = STATUS_SUCCESS; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + IoDeleteDevice(DeviceObject); // just delete device for now + break; + + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + Status = STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + default: + return STATUS_NOT_IMPLEMENTED; + break; + } + + return Status; +} + +NTSTATUS STDCALL DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) +{ DbgPrint("IRP_MJ_POWER dispatch\n"); return STATUS_SUCCESS; } _____ Added: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-02-19 23:12:32 UTC (rev 13660) @@ -0,0 +1,46 @@ +/* + * OHCI WDM/PNP driver + * + * Copyright (C) 2005 ReactOS Team + * + * Author: Aleksey Bragin (aleksey(a)reactos.com) + * + */ + +#ifndef OHCI_MAIN_H +#define OHCI_MAIN_H + +typedef struct _OHCI_DRIVER_EXTENSION +{ + //OHCI_HW_INITIALIZATION_DATA InitializationData; + PVOID HwContext; + //UNICODE_STRING RegistryPath; +} OHCI_DRIVER_EXTENSION, *POHCI_DRIVER_EXTENSION; + +typedef struct _OHCI_DEVICE_EXTENSTION +{ + ULONG DeviceNumber; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT FunctionalDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + //UNICODE_STRING RegistryPath; + PKINTERRUPT InterruptObject; + KSPIN_LOCK InterruptSpinLock; + PCM_RESOURCE_LIST AllocatedResources; + ULONG InterruptVector; + ULONG InterruptLevel; + PHYSICAL_ADDRESS BaseAddress; + ULONG BaseAddrLength; + ULONG AdapterInterfaceType; + ULONG SystemIoBusNumber; + ULONG SystemIoSlotNumber; + LIST_ENTRY AddressMappingListHead; + //KDPC DpcObject; + OHCI_DRIVER_EXTENSION *DriverExtension; + ULONG DeviceOpened; + //KMUTEX DeviceLock; + //CHAR MiniPortDeviceExtension[1]; +} OHCI_DEVICE_EXTENSION, *POHCI_DEVICE_EXTENSION; + + +#endif _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-02-19 23:12:32 UTC (rev 13660) @@ -205,6 +205,7 @@ int base[4]; int flags[4]; void * data; + void * dev_ext; // link to Windows DeviceExtension }; struct pci_bus { @@ -475,12 +476,19 @@ #define daemonize(a) do {} while(0) #define allow_signal(a) do {} while(0) #define wait_event_interruptible(x,y) do {} while(0) + +#define interruptible_sleep_on(a) my_interruptible_sleep_on(a) +void my_interruptible_sleep_on(int a); + #define flush_scheduled_work() do {} while(0) #define refrigerator(x) do {} while(0) #define signal_pending(x) 1 // fall through threads #define complete_and_exit(a,b) return 0 -#define kill_proc(a,b,c) 0 +//#define kill_proc(a,b,c) 0 +#define kill_proc(a,b,c) my_kill_proc(a, b, c); +int my_kill_proc(int pid, int signal, int unk); + #define yield() do {} while(0) #define cpu_relax() do {} while(0) @@ -528,7 +536,7 @@ /*---------------------------------------------------------------------- --*/ #ifdef DEBUG_MODE #define dev_printk(lvl,x,f,arg...) printk(f, ## arg) -#define dev_dbg(x,f,arg...) do {} while (0) //printk(f, ## arg) +#define dev_dbg(x,f,arg...) printk(f, ## arg) #define dev_info(x,f,arg...) printk(f,## arg) #define dev_warn(x,f,arg...) printk(f,## arg) #define dev_err(x,f,arg...) printk(f,## arg) @@ -681,7 +689,7 @@ } #define kernel_thread(a,b,c) my_kernel_thread(a,b,c) -int my_kernel_thread(int (*handler)(void*), void* parm, int flags); +int my_kernel_thread(int STDCALL (*handler)(void*), void* parm, int flags); /*---------------------------------------------------------------------- --*/ /* PCI, simple and inlined... */ @@ -714,7 +722,7 @@ void handle_irqs(int irq); void inc_jiffies(int); -void init_wrapper(void); +void init_wrapper(struct pci_dev *pci_dev); void do_all_timers(void); #define __KERNEL_DS 0x18 _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c --- trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -1,29 +1,45 @@ // PCI -> HAL interface // this file is part of linux_wrapper.h +//FIXME: Move this file, make its definitions more general +#include "../host/ohci_main.h" + /* Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory. Wake up the device if it was suspended. Beware, this function can fail. */ static int __inline__ pci_enable_device(struct pci_dev *dev) { + DPRINT1("pci_enable_device() called...\n"); return 0; } // Get physical address where resource x resides -static unsigned long __inline__ pci_resource_start (struct pci_dev *dev, int x) +static PHYSICAL_ADDRESS __inline__ pci_resource_start (struct pci_dev *dev, int x) { - // HalGetBusData... - // HalAssignSlotResources ? - return dev->base[x]; + POHCI_DEVICE_EXTENSION dev_ext = (POHCI_DEVICE_EXTENSION)dev->dev_ext; + DPRINT1("pci_resource_start() called, x=0x%x\n", x); + + //FIXME: Take x into account + return dev_ext->BaseAddress; + //return dev->base[x]; } // ??? -static unsigned long __inline__ pci_resource_len (struct pci_dev *dev, int x){return 0;} +static unsigned long __inline__ pci_resource_len (struct pci_dev *dev, int x) +{ + POHCI_DEVICE_EXTENSION ext = (POHCI_DEVICE_EXTENSION)dev->dev_ext; + DPRINT1("pci_resource_len() called, x=0x%x\n", x); + + //FIXME: Take x into account + return ext->BaseAddrLength; +} + // ??? static int __inline__ pci_resource_flags(struct pci_dev *dev, int x) { + DPRINT1("pci_resource_flags() called, x=0x%x\n"); return dev->flags[x]; } @@ -35,6 +51,7 @@ // Store pointer to data for this device static int __inline__ pci_set_drvdata(struct pci_dev *dev, void* d) { + DPRINT1("pci_set_drvdata() called...\n"); dev->data=(void*)d; return 0; } @@ -42,6 +59,7 @@ // Get pointer to previously saved data static void __inline__ *pci_get_drvdata(struct pci_dev *dev) { + DPRINT1("pci_get_drvdata() called...\n"); return dev->data; } @@ -59,16 +77,25 @@ n length of region name name of requester */ -static int __inline__ request_region(unsigned long addr, unsigned long len, const char * d){return 0;} +static int __inline__ request_region(PHYSICAL_ADDRESS addr, unsigned long len, const char * d) +{ + DPRINT1("request_region(): addr=0x%x, len=0x%x\n", addr, len); + return 0; +} /* Unmap I/O memory from kernel address space. Parameters: addr virtual start address + */ static int __inline__ iounmap(void* p) { + DPRINT1("iounmap(): p=0x%x. FIXME - how to obtain len of mapped region?\n", p); + + //MmUnnapIoSpace(p); + return 0; } @@ -79,7 +106,11 @@ start begin of region n length of region */ -static int __inline__ release_region(unsigned long addr, unsigned long len){return 0;} +static int __inline__ release_region(PHYSICAL_ADDRESS addr, unsigned long len) +{ + DPRINT1("release_region(): addr=0x%x, len=0x%x\n", addr, len); + return 0; +} /* Allocate I/O memory region. @@ -89,8 +120,9 @@ n length of region name name of requester */ -static int __inline__ request_mem_region(unsigned long addr, unsigned long len, const char * d) +static int __inline__ request_mem_region(PHYSICAL_ADDRESS addr, unsigned long len, const char * d) { + DPRINT1("request_mem_region(): addr=0x%x, len=0x%x\n", addr, len); return 1; } @@ -104,10 +136,12 @@ Returns: virtual start address of mapped range */ -static void __inline__ *ioremap_nocache(unsigned long addr, unsigned long len) +static void __inline__ *ioremap_nocache(PHYSICAL_ADDRESS addr, unsigned long len) { - // MmMapIoSpace ? - return (void*)addr; + // MmMapIoSpace with NoCache param + DPRINT1("ioremap_nocache(): addr=0x%x, len=0x%x\n", addr, len); + + return MmMapIoSpace(addr, len, MmNonCached); } /* @@ -117,7 +151,8 @@ start begin of region n length of region */ -static int __inline__ release_mem_region(unsigned long addr, unsigned long len) +static int __inline__ release_mem_region(PHYSICAL_ADDRESS addr, unsigned long len) { + DPRINT1("release_mem_region(): addr=0x%x, len=0x%x\n", addr, len); return 0; } _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h --- trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-02-19 23:12:32 UTC (rev 13660) @@ -8,4 +8,4 @@ #define PCI_CLASS_SERIAL_USB (PCI_CLASS_SERIAL_BUS_CTLR << 8 + PCI_SUBCLASS_SB_USB) -#endif \ No newline at end of file +#endif _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c --- trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-02-19 23:08:28 UTC (rev 13659) +++ trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-02-19 23:12:32 UTC (rev 13660) @@ -47,7 +47,7 @@ * Helper functions for top-level system */ /*---------------------------------------------------------------------- --*/ -void init_wrapper(void) +void init_wrapper(struct pci_dev *probe_dev) { int n; for(n=0;n<MAX_TIMERS;n++) @@ -58,7 +58,7 @@ my_jiffies=0; num_irqs=0; my_current=&act_cur; - pci_probe_dev=NULL; + pci_probe_dev=probe_dev; for(n=0;n<MAX_IRQS;n++) { @@ -108,12 +108,38 @@ } /*---------------------------------------------------------------------- --*/ // Purpose: Remember thread procedure and data in global var -int my_kernel_thread(int (*handler)(void*), void* parm, int flags) +// ReactOS Purpose: Create real kernel thread +int my_kernel_thread(int STDCALL (*handler)(void*), void* parm, int flags) { - thread_handler=handler; - thread_parm=parm; - return 42; // PID :-) + HANDLE hThread; + //thread_handler=handler; + //thread_parm=parm; + //return 42; // PID :-) + + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + PsCreateSystemThread(&hThread, + THREAD_ALL_ACCESS, + NULL, + NULL, + NULL, + (PKSTART_ROUTINE)handler, + parm); + + return (int)hThread; // FIXME: Correct? } + +// Kill the process [truncated at 1000 lines; 20 more skipped]

1 0

[gvg] 13659: SVN maintenance
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

SVN maintenance Property changes on: trunk/reactos/tools/wrc ___________________________________________________________________ Name: svn:ignore + *.o wrc.exe wrc Property changes on: trunk/reactos/tools/wrc/port ___________________________________________________________________ Name: svn:ignore + *.o Property changes on: trunk/reactos/tools/wrc/unicode ___________________________________________________________________ Name: svn:ignore + *.o Property changes on: trunk/reactos/tools/wrc/wpp ___________________________________________________________________ Name: svn:ignore + *.o

1 0

[ea] 13658: CSRSS: silenced debug messages.
by ea＠svn.reactos.com 19 Feb '05

19 Feb '05

CSRSS: silenced debug messages. Modified: trunk/reactos/subsys/csrss/init.c _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-02-19 23:06:59 UTC (rev 13657) +++ trunk/reactos/subsys/csrss/init.c 2005-02-19 23:07:22 UTC (rev 13658) @@ -22,7 +22,7 @@ #include "api.h" #include "csrplugin.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/

1 0

[fireball] 13657: Remove cromwell from default build for now (it can significantly slow down work without any usb devices really working)
by fireball＠svn.reactos.com 19 Feb '05

19 Feb '05

Remove cromwell from default build for now (it can significantly slow down work without any usb devices really working) Modified: trunk/reactos/drivers/usb/Makefile _____ Modified: trunk/reactos/drivers/usb/Makefile --- trunk/reactos/drivers/usb/Makefile 2005-02-19 23:05:09 UTC (rev 13656) +++ trunk/reactos/drivers/usb/Makefile 2005-02-19 23:06:59 UTC (rev 13657) @@ -6,7 +6,7 @@ include $(PATH_TO_TOP)/rules.mak -DRIVERS = usbport miniport/usbuhci miniport/usbehci miniport/usbohci usbhub usbd cromwell +DRIVERS = usbport miniport/usbuhci miniport/usbehci miniport/usbohci usbhub usbd all: $(DRIVERS)

1 0

[gvg] 13656: Don't use svn command line tool to get revision number
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

Don't use svn command line tool to get revision number XML code stolen from the xmlbuildsystem branch, we need to merge this when merging the xmlbuildsystem back into trunk Modified: trunk/reactos/tools/Makefile Added: trunk/reactos/tools/buildno/ Added: trunk/reactos/tools/buildno/Makefile Added: trunk/reactos/tools/buildno/XML.cpp Added: trunk/reactos/tools/buildno/XML.h Added: trunk/reactos/tools/buildno/buildno.cpp Added: trunk/reactos/tools/buildno/exception.cpp Added: trunk/reactos/tools/buildno/exception.h Added: trunk/reactos/tools/buildno/pch.h Added: trunk/reactos/tools/buildno/ssprintf.cpp Added: trunk/reactos/tools/buildno/ssprintf.h Deleted: trunk/reactos/tools/buildno.c _____ Modified: trunk/reactos/tools/Makefile --- trunk/reactos/tools/Makefile 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/Makefile 2005-02-19 23:05:09 UTC (rev 13656) @@ -5,7 +5,6 @@ CFLAGS += -Wall -Werror TOOLS = \ - buildno$(EXE_POSTFIX) \ regtests$(EXE_POSTFIX) \ rcopy$(EXE_POSTFIX) \ rdel$(EXE_POSTFIX) \ @@ -20,12 +19,8 @@ CLEAN_FILES = $(TOOLS) all: $(TOOLS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ - wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target + wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target buildno_target -buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h - @$(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c - @$(EXE_PREFIX)buildno$(EXE_POSTFIX) - regtests$(EXE_POSTFIX): regtests.c @$(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c @@ -133,11 +128,15 @@ wrc_target: $(MAKE) --silent -C wrc wrc$(EXE_POSTFIX) -.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target +buildno_target: + $(MAKE) --silent -C buildno buildno$(EXE_POSTFIX) +.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target buildno_target + ifeq ($(HOST),mingw32-linux) clean: + $(MAKE) --silent -C buildno clean $(MAKE) --silent -C wrc clean $(MAKE) --silent -C cabman clean $(MAKE) --silent -C cdmake clean @@ -148,12 +147,12 @@ $(MAKE) --silent -C winebuild clean $(MAKE) --silent -C bin2res clean $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean - @rm ../include/reactos/buildno.h @rm mkconfig @rm $(TOOLS) endif ifeq ($(HOST),mingw32-windows) clean: + $(MAKE) --silent -C buildno clean $(MAKE) --silent -C wrc clean $(MAKE) --silent -C cabman clean $(MAKE) --silent -C cdmake clean @@ -165,7 +164,6 @@ $(MAKE) --silent -C winebuild clean $(MAKE) --silent -C bin2res clean $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean - -@del ..\include\reactos\buildno.h -@del *$(EXE_POSTFIX) endif Property changes on: trunk/reactos/tools/buildno ___________________________________________________________________ Name: svn:ignore + *.o buildno buildno.exe _____ Added: trunk/reactos/tools/buildno/Makefile --- trunk/reactos/tools/buildno/Makefile 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/buildno/Makefile 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,42 @@ +PATH_TO_TOP = ../.. + +TARGET = buildno$(EXE_POSTFIX) + +all: $(TARGET) + +OBJECTS = buildno.o XML.o exception.o ssprintf.o + +CLEAN_FILES = *.o buildno$(EXE_POSTFIX) + +HOST_CXXFLAGS = -I$(PATH_TO_TOP)/include/reactos -g -Wall -Werror + +buildno.o: buildno.cpp $(PATH_TO_TOP)/include/reactos/version.h + $(HOST_CXX) $(HOST_CXXFLAGS) -o buildno.o -c buildno.cpp + +XML.o: XML.cpp + $(HOST_CXX) $(HOST_CXXFLAGS) -o XML.o -c XML.cpp + +exception.o: exception.cpp + $(HOST_CXX) $(HOST_CXXFLAGS) -o exception.o -c exception.cpp + +ssprintf.o: ssprintf.cpp + $(HOST_CXX) $(HOST_CXXFLAGS) -o ssprintf.o -c ssprintf.cpp + +buildno$(EXE_POSTFIX): $(OBJECTS) + $(HOST_CXX) -g $(OBJECTS) -o $(TARGET) + @$(EXE_PREFIX)buildno$(EXE_POSTFIX) + +ifeq ($(HOST),mingw32-linux) +clean: + -rm -f *.o $(TARGET) + -rm $(PATH_TO_TOP)/include/reactos/buildno.h +endif +ifneq ($(HOST),mingw32-linux) +clean: + -del *.o $(TARGET) + -del ..\..\include\reactos\buildno.h +endif + +.PHONY: clean + +include $(PATH_TO_TOP)/rules.mak Property changes on: trunk/reactos/tools/buildno/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/tools/buildno/XML.cpp --- trunk/reactos/tools/buildno/XML.cpp 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/buildno/XML.cpp 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,727 @@ +// XML.cpp + +#include "pch.h" + +#ifdef _MSC_VER +#define MAX_PATH _MAX_PATH +#endif + +#ifdef WIN32 +# include <direct.h> +# include <io.h> +#else +# include <sys/stat.h> +# define MAX_PATH PATH_MAX +#endif +#include <assert.h> + +#include "XML.h" +#include "exception.h" +#include "ssprintf.h" + +using std::string; +using std::vector; + +#ifdef WIN32 +#define getcwd _getcwd +#endif//WIN32 + +static const char* WS = " \t\r\n"; +static const char* WSEQ = " =\t\r\n"; + +string working_directory; + +class XMLInclude +{ +public: + XMLElement *e; + Path path; + + XMLInclude ( XMLElement* e_, const Path& path_ ) + : e(e_), path(path_) + { + } +}; + +class XMLIncludes : public vector<XMLInclude*> +{ +public: + ~XMLIncludes() + { + for ( size_t i = 0; i < this->size(); i++ ) + delete (*this)[i]; + } +}; + +void +InitWorkingDirectory() +{ + // store the current directory for path calculations + working_directory.resize ( _MAX_PATH ); + working_directory[0] = 0; + getcwd ( &working_directory[0], working_directory.size() ); + working_directory.resize ( strlen ( working_directory.c_str() ) ); +} + +#ifdef _MSC_VER +unsigned __int64 +#else +unsigned long long +#endif +filelen ( FILE* f ) +{ +#ifdef WIN32 + return _filelengthi64 ( _fileno(f) ); +#else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) + return 0; + return file_stat.st_size; +#endif +} + +Path::Path() +{ + if ( !working_directory.size() ) + InitWorkingDirectory(); + string s ( working_directory ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +Path::Path ( const Path& cwd, const string& file ) +{ + string s ( cwd.Fixup ( file, false ) ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +string +Path::Fixup ( const string& file, bool include_filename ) const +{ + if ( strchr ( "/\\", file[0] ) +#ifdef WIN32 + // this squirreliness is b/c win32 has drive letters and *nix doesn't... + || file[1] == ':' +#endif//WIN32 + ) + { + return file; + } + vector<string> pathtmp ( path ); + string tmp ( file ); + const char* prev = strtok ( &tmp[0], "/\\" ); + const char* p = strtok ( NULL, "/\\" ); + while ( p ) + { + if ( !strcmp ( prev, "." ) ) + ; // do nothing + else if ( !strcmp ( prev, ".." ) ) + { + // this squirreliness is b/c win32 has drive letters and *nix doesn't... +#ifdef WIN32 + if ( pathtmp.size() > 1 ) +#else + if ( pathtmp.size() ) +#endif + pathtmp.resize ( pathtmp.size() - 1 ); + } + else + pathtmp.push_back ( prev ); + prev = p; + p = strtok ( NULL, "/\\" ); + } + if ( include_filename ) + pathtmp.push_back ( prev ); + + // reuse tmp variable to return recombined path + tmp.resize(0); + for ( size_t i = 0; i < pathtmp.size(); i++ ) + { + // this squirreliness is b/c win32 has drive letters and *nix doesn't... +#ifdef WIN32 + if ( i ) tmp += "/"; +#else + tmp += "/"; +#endif + tmp += pathtmp[i]; + } + return tmp; +} + +/*static*/ string +Path::RelativeFromWorkingDirectory ( const string& path ) +{ + vector<string> vwork, vpath, vout; + Path::Split ( vwork, working_directory, true ); + Path::Split ( vpath, path, true ); +#ifdef WIN32 + // this squirreliness is b/c win32 has drive letters and *nix doesn't... + // not possible to do relative across different drive letters + if ( vwork[0] != vpath[0] ) + return path; +#endif + size_t i = 0; + while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] ) + ++i; + if ( i < vwork.size() ) + { + // path goes above our working directory, we will need some ..'s + for ( size_t j = 0; j < i; j++ ) + vout.push_back ( ".." ); + } + while ( i < vpath.size() ) + vout.push_back ( vpath[i++] ); + + // now merge vout into a string again + string out = "."; + for ( i = 0; i < vout.size(); i++ ) + { + out += "/" + vout[i]; + } + return out; +} + +/*static*/ void +Path::Split ( vector<string>& out, + const string& path, + bool include_last ) +{ + string s ( path ); + const char* prev = strtok ( &s[0], "/\\" ); + const char* p = strtok ( NULL, "/\\" ); + out.resize ( 0 ); + while ( p ) + { + out.push_back ( prev ); + prev = p; + p = strtok ( NULL, "/\\" ); + } + if ( include_last ) + out.push_back ( prev ); +} + +XMLFile::XMLFile() +{ +} + +void +XMLFile::close() +{ + _buf.resize(0); + _p = _end = NULL; +} + +bool +XMLFile::open(const string& filename_) +{ + close(); + FILE* f = fopen ( filename_.c_str(), "rb" ); + if ( !f ) + return false; + unsigned long len = (unsigned long)filelen(f); + _buf.resize ( len ); + fread ( &_buf[0], 1, len, f ); + fclose ( f ); + _p = _buf.c_str(); + _end = _p + len; + _filename = filename_; + next_token(); + return true; +} + +// next_token() moves the pointer to next token, which may be +// an xml element or a text element, basically it's a glorified +// skipspace, normally the user of this class won't need to call +// this function +void +XMLFile::next_token() +{ + _p += strspn ( _p, WS ); +} + +bool +XMLFile::next_is_text() +{ + return *_p != '<'; +} + +bool +XMLFile::more_tokens() +{ + return _p != _end; +} + +// get_token() is used to return a token, and move the pointer +// past the token +bool +XMLFile::get_token(string& token) +{ + const char* tokend; + if ( !strncmp ( _p, "" ); + if ( !tokend ) + tokend = _end; + else + tokend += 3; + } + else if ( !strncmp ( _p, "<?", 2 ) ) + { + tokend = strstr ( _p, "?>" ); + if ( !tokend ) + tokend = _end; + else + tokend += 2; + } + else if ( *_p == '<' ) + { + tokend = strchr ( _p, '>' ); + if ( !tokend ) + tokend = _end; + else + ++tokend; + } + else + { + tokend = strchr ( _p, '<' ); + if ( !tokend ) + tokend = _end; + while ( tokend > _p && isspace(tokend[-1]) ) + --tokend; + } + if ( tokend == _p ) + return false; + token = string ( _p, tokend-_p ); + _p = tokend; + next_token(); + return true; +} + +string +XMLFile::Location() const +{ + int line = 1; + const char* p = strchr ( _buf.c_str(), '\n' ); + while ( p && p < _p ) + { + ++line; + p = strchr ( p+1, '\n' ); + } + return ssprintf ( "%s(%i)",_filename.c_str(), line ); +} + +XMLAttribute::XMLAttribute() +{ +} + +XMLAttribute::XMLAttribute(const string& name_, + const string& value_) + : name(name_), value(value_) +{ +} + +XMLAttribute::XMLAttribute ( const XMLAttribute& src ) + : name(src.name), value(src.value) +{ + +} + +XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src ) +{ + name = src.name; + value = src.value; + return *this; +} + +XMLElement::XMLElement ( const string& location_ ) + : location(location_), + parentElement(NULL) +{ +} + +XMLElement::~XMLElement() +{ + size_t i; + for ( i = 0; i < attributes.size(); i++ ) + delete attributes[i]; + for ( i = 0; i < subElements.size(); i++ ) + delete subElements[i]; +} + +void +XMLElement::AddSubElement ( XMLElement* e ) +{ + subElements.push_back ( e ); + e->parentElement = this; +} + +// Parse() +// This function takes a single xml tag ( i.e. beginning with '<' and +// ending with '>', and parses out it's tag name and constituent +// attributes. +// Return Value: returns true if you need to look for a </tag> for +// the one it just parsed... +bool +XMLElement::Parse(const string& token, + bool& end_tag) +{ + const char* p = token.c_str(); + assert ( *p == '<' ); + ++p; + p += strspn ( p, WS ); + + // check if this is a comment + if ( !strncmp ( p, "!--", 3 ) ) + { + name = "!--"; + end_tag = false; + return false; // never look for end tag to a comment + } + + end_tag = ( *p == '/' ); + if ( end_tag ) + { + ++p; + p += strspn ( p, WS ); + } + const char* end = strpbrk ( p, WS ); + if ( !end ) + { + end = strpbrk ( p, "/>" ); + assert ( end ); + } + name = string ( p, end-p ); + p = end; + p += strspn ( p, WS ); + while ( *p != '>' && *p != '/' ) + { + end = strpbrk ( p, WSEQ ); + if ( !end ) + { + end = strpbrk ( p, "/>" ); + assert ( end ); + } + string attribute ( p, end-p ), value; + p = end; + p += strspn ( p, WS ); + if ( *p == '=' ) + { + ++p; + p += strspn ( p, WS ); + char quote = 0; + if ( strchr ( "\"'", *p ) ) + { + quote = *p++; + end = strchr ( p, quote ); + } + else + { + end = strpbrk ( p, WS ); + } + if ( !end ) + { + end = strchr ( p, '>' ); + assert(end); + if ( end[-1] == '/' ) + end--; + } + value = string ( p, end-p ); + p = end; + if ( quote && *p == quote ) + p++; + p += strspn ( p, WS ); + } + else if ( name[0] != '!' ) + { + throw XMLSyntaxErrorException ( location, + "attributes must have values" ); + } + attributes.push_back ( new XMLAttribute ( attribute, value ) ); + } + return !( *p == '/' ) && !end_tag; +} + +XMLAttribute* +XMLElement::GetAttribute ( const string& attribute, + bool required ) +{ + // this would be faster with a tree-based container, but our attribute + // lists are likely to stay so short as to not be an issue. + for ( size_t i = 0; i < attributes.size(); i++ ) + { + if ( attribute == attributes[i]->name ) + return attributes[i]; + } + if ( required ) + { + throw RequiredAttributeNotFoundException ( location, + attribute, + name ); + } + return NULL; +} + +const XMLAttribute* +XMLElement::GetAttribute ( const string& attribute, + bool required ) const +{ + // this would be faster with a tree-based container, but our attribute + // lists are likely to stay so short as to not be an issue. + for ( size_t i = 0; i < attributes.size(); i++ ) + { + if ( attribute == attributes[i]->name ) + return attributes[i]; + } + if ( required ) + { + throw RequiredAttributeNotFoundException ( location, + attribute, + name ); + } + return NULL; +} + +// XMLParse() +// This function reads a "token" from the file loaded in XMLFile +// if it finds a tag that is non-singular, it parses sub-elements and/or +// inner text into the XMLElement that it is building to return. +// Return Value: an XMLElement allocated via the new operator that contains +// it's parsed data. Keep calling this function until it returns NULL +// (no more data) +XMLElement* +XMLParse(XMLFile& f, + XMLIncludes* includes, + const Path& path, + bool* pend_tag = NULL ) +{ + string token; + if ( !f.get_token(token) ) + return NULL; + bool end_tag, is_include = false; + + while ( token[0] != '<' + || !strncmp ( token.c_str(), "<!--", 4 ) + || !strncmp ( token.c_str(), "<?", 2 ) ) + { + if ( token[0] != '<' ) + throw XMLSyntaxErrorException ( f.Location(), + "expecting xml tag, not '%s'", + token.c_str() ); + if ( !f.get_token(token) ) + return NULL; + } + + XMLElement* e = new XMLElement ( f.Location() ); + bool bNeedEnd = e->Parse ( token, end_tag ); + + if ( e->name == "xi:include" && includes ) + { + includes->push_back ( new XMLInclude ( e, path ) ); + is_include = true; + } + + if ( !bNeedEnd ) + { + if ( pend_tag ) + *pend_tag = end_tag; + else if ( end_tag ) + { + delete e; + throw XMLSyntaxErrorException ( f.Location(), + "end tag '%s' not expected", + token.c_str() ); + return NULL; + } + return e; + } + bool bThisMixingErrorReported = false; + while ( f.more_tokens() ) + { + if ( f.next_is_text() ) + { + if ( !f.get_token ( token ) || !token.size() ) + { + throw InvalidBuildFileException ( + f.Location(), + "internal tool error - get_token() failed when more_tokens() returned true" ); + break; + } + if ( e->subElements.size() && !bThisMixingErrorReported ) + { + throw XMLSyntaxErrorException ( f.Location(), + "mixing of inner text with sub elements" ); + bThisMixingErrorReported = true; + } + if ( strchr ( token.c_str(), '>' ) ) + { + throw XMLSyntaxErrorException ( f.Location(), + "invalid symbol '>'" ); + } + if ( e->value.size() ) + { + throw XMLSyntaxErrorException ( f.Location(), + "multiple instances of inner text" ); + e->value += " " + token; + } + else + e->value = token; + } + else + { + XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); + if ( !e2 ) + { + throw InvalidBuildFileException ( + e->location, + "end of file found looking for end tag" ); + break; + } + if ( end_tag ) + { + if ( e->name != e2->name ) + { + delete e2; + throw XMLSyntaxErrorException ( f.Location(), + "end tag name mismatch" ); + break; + } + delete e2; + break; + } + if ( e->value.size() && !bThisMixingErrorReported ) + { + throw XMLSyntaxErrorException ( f.Location(), + "mixing of inner text with sub elements" ); + bThisMixingErrorReported = true; + } + e->AddSubElement ( e2 ); + } + } + return e; +} + +void +XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) +{ + for ( ;; ) + { + XMLElement* e = XMLParse ( f, &includes, path ); + if ( !e ) + return; + head.AddSubElement ( e ); + } +} + +XMLElement* +XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes ) +{ + XMLAttribute* att; + att = e->GetAttribute("href",true); + assert(att); + + string file ( path.Fixup(att->value,true) ); + string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); + e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); + XMLFile fInc; + if ( !fInc.open ( file ) ) + { + // look for xi:fallback element + for ( size_t i = 0; i < e->subElements.size(); i++ ) + { + XMLElement* e2 = e->subElements[i]; + if ( e2->name == "xi:fallback" ) + { + // now look for xi:include below... + for ( i = 0; i < e2->subElements.size(); i++ ) + { + XMLElement* e3 = e2->subElements[i]; + if ( e3->name == "xi:include" ) + { + return XMLLoadInclude ( e3, path, includes ); + } + } + throw InvalidBuildFileException ( + e2->location, + "<xi:fallback> must have a <xi:include> sub-element" ); + return NULL; + } + } + return NULL; + } + else + { + XMLElement* new_e = new XMLElement ( e->location ); + new_e->name = "xi:included"; + Path path2 ( path, att->value ); + XMLReadFile ( fInc, *new_e, includes, path2 ); + return new_e; + } +} + +XMLElement* +XMLLoadFile ( const string& filename, const Path& path ) +{ + XMLIncludes includes; + XMLFile f; + + if ( !f.open ( filename ) ) + throw FileNotFoundException ( filename ); + + XMLElement* head = new XMLElement("(virtual)"); + + XMLReadFile ( f, *head, includes, path ); + + for ( size_t i = 0; i < includes.size(); i++ ) + { + XMLElement* e = includes[i]->e; + XMLElement* e2 = XMLLoadInclude ( includes[i]->e, includes[i]->path, includes ); + if ( !e2 ) + { + throw FileNotFoundException ( + ssprintf("%s (referenced from %s)", + e->GetAttribute("top_href",true)->value.c_str(), + f.Location().c_str() ) ); + } + XMLElement* parent = e->parentElement; + XMLElement** parent_container = NULL; + if ( !parent ) + { + delete e; + throw Exception ( "internal tool error: xi:include doesn't have a parent" ); + return NULL; + } + for ( size_t j = 0; j < parent->subElements.size(); j++ ) + { + if ( parent->subElements[j] == e ) + { + parent_container = &parent->subElements[j]; + break; + } + } + if ( !parent_container ) + { + delete e; + throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); + return NULL; + } + // replace inclusion tree with the imported tree + e2->parentElement = e->parentElement; + e2->name = e->name; + e2->attributes = e->attributes; + *parent_container = e2; + e->attributes.resize(0); + delete e; + } + return head; +} Property changes on: trunk/reactos/tools/buildno/XML.cpp ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/tools/buildno/XML.h --- trunk/reactos/tools/buildno/XML.h 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/buildno/XML.h 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,96 @@ +// XML.h + +#ifndef XML_H +#define XML_H + +#include "pch.h" + +void +InitWorkingDirectory(); + +#ifdef _MSC_VER +unsigned __int64 +#else +unsigned long long +#endif +filelen ( FILE* f ); + +class Path +{ + std::vector<std::string> path; +public: + Path(); // initializes path to getcwd(); + Path ( const Path& cwd, const std::string& filename ); + std::string Fixup ( const std::string& filename, bool include_filename ) const; + + static std::string RelativeFromWorkingDirectory ( const std::string& path ); + + static void Split ( std::vector<std::string>& out, + const std::string& path, + bool include_last ); +}; + +class XMLFile +{ + friend class XMLElement; +public: + XMLFile(); + void close(); + bool open(const std::string& filename); + void next_token(); + bool next_is_text(); + bool more_tokens(); + bool get_token(std::string& token); + const std::string& filename() { return _filename; } + std::string Location() const; + +private: + std::string _buf, _filename; + + const char *_p, *_end; +}; + + +class XMLAttribute +{ +public: + std::string name; + std::string value; + + XMLAttribute(); + XMLAttribute ( const std::string& name_, const std::string& value_ ); + XMLAttribute ( const XMLAttribute& ); + XMLAttribute& operator = ( const XMLAttribute& ); +}; + + +class XMLElement +{ +public: + std::string location; + std::string name; + std::vector<XMLAttribute*> attributes; + XMLElement* parentElement; + std::vector<XMLElement*> subElements; + std::string value; + + XMLElement ( const std::string& location_ ); + ~XMLElement(); + bool Parse(const std::string& token, + bool& end_tag); + void AddSubElement ( XMLElement* e ); + XMLAttribute* GetAttribute ( const std::string& attribute, + bool required); + const XMLAttribute* GetAttribute ( const std::string& attribute, + bool required) const; +}; + +XMLElement* +XMLLoadFile ( const std::string& filename, const Path& path ); + +/*XMLElement* +XMLParse(XMLFile& f, + const Path& path, + bool* pend_tag = NULL);*/ + +#endif//XML_H Property changes on: trunk/reactos/tools/buildno/XML.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/tools/buildno/buildno.cpp (from rev 13638, trunk/reactos/tools/buildno.c) --- trunk/reactos/tools/buildno.c 2005-02-18 22:46:49 UTC (rev 13638) +++ trunk/reactos/tools/buildno/buildno.cpp 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,369 @@ +/* $Id$ + * + * buildno - Generate the build number for ReactOS + * + * Copyright (c) 1999,2000 Emanuele Aliberti + * + * The build number is the day on which the build took + * place, as YYYYMMDD + * + * The build number is stored in the file + * <reactos/buildno.h> as a set of macros: + * + * KERNEL_VERSION_BUILD base 10 number + * KERNEL_VERSION_BUILD_STR C string + * KERNEL_VERSION_BUILD_RC RC string + * + * REVISIONS + * --------- + * 2000-01-22 (ea) + * Fixed bugs: tm_year is (current_year - 1900), + * tm_month is 0-11 not 1-12 and code ignored TZ. + * 2000-12-10 (ea) + * Added -p option to make it simply print the + * version number, but skip buildno.h generation. + */ +#include <stdio.h> [truncated at 1000 lines; 3031 more skipped]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs