From kwaclaw@users.sourceforge.net Tue Oct 1 17:58:56 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Tue, 01 Oct 2002 09:58:56 -0700 Subject: [Expat-checkins] expat/lib xmlparse.c,1.89,1.90 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv2397 Modified Files: xmlparse.c Log Message: Applied fix for bug #616863. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- xmlparse.c 30 Sep 2002 12:11:26 -0000 1.89 +++ xmlparse.c 1 Oct 2002 16:58:54 -0000 1.90 @@ -109,7 +109,7 @@ size_t size; size_t used; size_t usedLim; - XML_Memory_Handling_Suite *mem; + const XML_Memory_Handling_Suite *mem; } HASH_TABLE; typedef struct { @@ -209,7 +209,7 @@ const XML_Char *end; XML_Char *ptr; [...1589 lines suppressed...] - const XML_Char *name = poolStoreString(&dtd.pool, enc, ptr, end); + DTD * const dtd = _dtd; /* save one level of indirection */ + const XML_Char *name = poolStoreString(&dtd->pool, enc, ptr, end); ELEMENT_TYPE *ret; if (!name) return NULL; - ret = (ELEMENT_TYPE *) lookup(&dtd.elementTypes, name, sizeof(ELEMENT_TYPE)); + ret = (ELEMENT_TYPE *) lookup(&dtd->elementTypes, name, sizeof(ELEMENT_TYPE)); if (!ret) return NULL; if (ret->name != name) - poolDiscard(&dtd.pool); + poolDiscard(&dtd->pool); else { - poolFinish(&dtd.pool); + poolFinish(&dtd->pool); if (!setElementTypePrefix(parser, ret)) return NULL; } From kwaclaw@users.sourceforge.net Thu Oct 3 20:41:29 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Thu, 03 Oct 2002 12:41:29 -0700 Subject: [Expat-checkins] expat/lib xmlparse.c,1.90,1.91 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv24406 Modified Files: xmlparse.c Log Message: Applied patch #618199. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- xmlparse.c 1 Oct 2002 16:58:54 -0000 1.90 +++ xmlparse.c 3 Oct 2002 19:41:26 -0000 1.91 @@ -1710,11 +1710,17 @@ char *temp = REALLOC(tag->buf, bufSize); if (temp == NULL) return XML_FALSE; - /* if tag->name.str points to tag->buf (i.e. when namespace + /* if tag->name.str points to tag->buf (only when namespace processing is off) then we have to update it */ if (tag->name.str == (XML_Char *)tag->buf) tag->name.str = (XML_Char *)temp; + /* if tag->name.localPart is set (when namespace processing is on) + then update it as well, since it will always point into tag-buf + */ + if (tag->name.localPart) + tag->name.localPart = (XML_Char *)temp + (tag->name.localPart - + (XML_Char *)tag->buf); tag->buf = temp; tag->bufEnd = temp + bufSize; rawNameBuf = temp + nameLen; From fdrake@users.sourceforge.net Mon Oct 7 21:25:27 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Mon, 07 Oct 2002 13:25:27 -0700 Subject: [Expat-checkins] expat Changes,1.29,1.30 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv18805 Modified Files: Changes Log Message: Start making notes about changes. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Changes 19 Sep 2002 20:19:31 -0000 1.29 +++ Changes 7 Oct 2002 20:25:24 -0000 1.30 @@ -1,3 +1,6 @@ +Release 1.95.6 + - Fixed a variety of bugs: see SF issues 615606, 616863, 618199. + Release 1.95.5 Fri Sep 6 2002 - Added XML_UseForeignDTD() for improved SAX2 support. - Added XML_GetFeatureList(). From fdrake@users.sourceforge.net Mon Oct 7 21:26:40 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Mon, 07 Oct 2002 13:26:40 -0700 Subject: [Expat-checkins] expat/lib expat.h,1.41,1.42 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv19137/lib Modified Files: expat.h Log Message: Bump version numbers. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- expat.h 5 Sep 2002 01:48:25 -0000 1.41 +++ expat.h 7 Oct 2002 20:26:31 -0000 1.42 @@ -900,7 +900,7 @@ */ #define XML_MAJOR_VERSION 1 #define XML_MINOR_VERSION 95 -#define XML_MICRO_VERSION 5 +#define XML_MICRO_VERSION 6 #ifdef __cplusplus } From fdrake@users.sourceforge.net Mon Oct 7 21:27:08 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Mon, 07 Oct 2002 13:27:08 -0700 Subject: [Expat-checkins] expat README,1.21,1.22 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv19137 Modified Files: README Log Message: Bump version numbers. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- README 5 Sep 2002 03:34:47 -0000 1.21 +++ README 7 Oct 2002 20:26:26 -0000 1.22 @@ -1,5 +1,5 @@ - Expat, Release 1.95.5 + Expat, Release 1.95.6 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 From fdrake@users.sourceforge.net Tue Oct 8 15:02:05 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 08 Oct 2002 07:02:05 -0700 Subject: [Expat-checkins] expat/doc reference.html,1.33,1.34 Message-ID: Update of /cvsroot/expat/expat/doc In directory usw-pr-cvs1:/tmp/cvs-serv28169 Modified Files: reference.html Log Message: Add omitted period. Index: reference.html =================================================================== RCS file: /cvsroot/expat/expat/doc/reference.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- reference.html 5 Sep 2002 01:48:24 -0000 1.33 +++ reference.html 8 Oct 2002 14:02:02 -0000 1.34 @@ -1137,7 +1137,7 @@ XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end) -

Sets both namespace declaration handlers with a single call

+

Sets both namespace declaration handlers with a single call.

From fdrake@users.sourceforge.net Tue Oct 8 18:04:58 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 08 Oct 2002 10:04:58 -0700 Subject: [Expat-checkins] expat/tests runtests.c,1.35,1.36 Message-ID: Update of /cvsroot/expat/expat/tests In directory usw-pr-cvs1:/tmp/cvs-serv11082/tests Modified Files: runtests.c Log Message: SF bug #620343: segfault: bad API/callback interaction The start-namespace-decl callback can set the start-element callback to NULL, but Expat tried to call it anyway. Index: runtests.c =================================================================== RCS file: /cvsroot/expat/expat/tests/runtests.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- runtests.c 30 Aug 2002 22:05:55 -0000 1.35 +++ runtests.c 8 Oct 2002 17:04:55 -0000 1.36 @@ -790,6 +790,41 @@ } END_TEST + +/* Regression test for SF bug #620343. */ +static void +start_element_fail(void *userData, + const XML_Char *name, const XML_Char **atts) +{ + /* We should never get here. */ + fail("should never reach start_element_fail()"); +} + +static void +start_ns_clearing_start_element(void *userData, + const XML_Char *prefix, + const XML_Char *uri) +{ + XML_SetStartElementHandler((XML_Parser) userData, NULL); +} + +START_TEST(test_start_ns_clears_start_element) +{ + /* This needs to use separate start/end tags; using the empty tag + syntax doesn't cause the problematic path through Expat to be + taken. + */ + char *text = ""; + + XML_SetStartElementHandler(parser, start_element_fail); + XML_SetStartNamespaceDeclHandler(parser, start_ns_clearing_start_element); + XML_UseParserAsHandlerArg(parser); + if (XML_Parse(parser, text, strlen(text), 1) == XML_STATUS_ERROR) + xml_failure(parser); +} +END_TEST + + static Suite * make_basic_suite(void) { @@ -835,6 +870,7 @@ tcase_add_test(tc_namespace, test_return_ns_triplet); tcase_add_test(tc_namespace, test_ns_tagname_overwrite); tcase_add_test(tc_namespace, test_ns_tagname_overwrite_triplet); + tcase_add_test(tc_namespace, test_start_ns_clears_start_element); return s; } From fdrake@users.sourceforge.net Tue Oct 8 18:04:57 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 08 Oct 2002 10:04:57 -0700 Subject: [Expat-checkins] expat/lib xmlparse.c,1.91,1.92 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv11082/lib Modified Files: xmlparse.c Log Message: SF bug #620343: segfault: bad API/callback interaction The start-namespace-decl callback can set the start-element callback to NULL, but Expat tried to call it anyway. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- xmlparse.c 3 Oct 2002 19:41:26 -0000 1.91 +++ xmlparse.c 8 Oct 2002 17:04:55 -0000 1.92 @@ -2075,8 +2075,9 @@ result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings)); if (result) return result; - startElementHandler(handlerArg, tag->name.str, - (const XML_Char **)atts); + if (startElementHandler) + startElementHandler(handlerArg, tag->name.str, + (const XML_Char **)atts); } else if (defaultHandler) reportDefault(parser, enc, s, next); From kwaclaw@users.sourceforge.net Wed Oct 9 14:21:47 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Wed, 09 Oct 2002 06:21:47 -0700 Subject: [Expat-checkins] expat/lib xmlparse.c,1.92,1.93 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv1031 Modified Files: xmlparse.c Log Message: Applied patch for bug # 620106. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- xmlparse.c 8 Oct 2002 17:04:55 -0000 1.92 +++ xmlparse.c 9 Oct 2002 13:21:45 -0000 1.93 @@ -617,7 +617,16 @@ #define paramEntityParsing (parser->m_paramEntityParsing) #endif /* XML_DTD */ -#define parsing (processor != prologInitProcessor) +#define parsing \ + (parentParser \ + ? \ + (isParamEntity \ + ? \ + (processor != externalParEntInitProcessor) \ + : \ + (processor != externalEntityInitProcessor)) \ + : \ + (processor != prologInitProcessor)) XML_Parser XML_ParserCreate(const XML_Char *encodingName) From kwaclaw@users.sourceforge.net Thu Oct 17 17:45:52 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Thu, 17 Oct 2002 09:45:52 -0700 Subject: [Expat-checkins] expat/doc reference.html,1.34,1.35 Message-ID: Update of /cvsroot/expat/expat/doc In directory usw-pr-cvs1:/tmp/cvs-serv3890 Modified Files: reference.html Log Message: Improved documentation of XML_ExternalEntityRefHandler. Index: reference.html =================================================================== RCS file: /cvsroot/expat/expat/doc/reference.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- reference.html 8 Oct 2002 14:02:02 -0000 1.34 +++ reference.html 17 Oct 2002 16:45:49 -0000 1.35 @@ -1000,6 +1000,12 @@ is in effect. (See XML_SetParamEntityParsing.)

+

The context parameter 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, which +is how one can differentiate between general and parameter entities.

The base parameter is the base to use for relative system identifiers. It is set by XML_SetBase and may be null. The From kwaclaw@users.sourceforge.net Thu Oct 17 17:47:47 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Thu, 17 Oct 2002 09:47:47 -0700 Subject: [Expat-checkins] expat/lib expat.h,1.42,1.43 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv4616 Modified Files: expat.h Log Message: Improved documentation of XML_ExternalEntityRefHandler. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- expat.h 7 Oct 2002 20:26:31 -0000 1.42 +++ expat.h 17 Oct 2002 16:47:45 -0000 1.43 @@ -399,6 +399,7 @@ 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 0 if processing should not continue because of a fatal error in the handling of the external entity. From fdrake@users.sourceforge.net Thu Oct 17 20:13:58 2002 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 17 Oct 2002 12:13:58 -0700 Subject: [Expat-checkins] expat/doc reference.html,1.35,1.36 Message-ID: Update of /cvsroot/expat/expat/doc In directory usw-pr-cvs1:/tmp/cvs-serv6695 Modified Files: reference.html Log Message: Adjust markup a bit, adding some internal hyperlinks. Index: reference.html =================================================================== RCS file: /cvsroot/expat/expat/doc/reference.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- reference.html 17 Oct 2002 16:45:49 -0000 1.35 +++ reference.html 17 Oct 2002 19:13:55 -0000 1.36 @@ -1000,18 +1000,21 @@ is in effect. (See XML_SetParamEntityParsing.)

-

The context parameter 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, which -is how one can differentiate between general and parameter entities.

+

The context parameter specifies the parsing context in +the format expected by the context argument to XML_ExternalEntityParserCreate. code 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, which is how one can +differentiate between general and parameter entities.

-

The base parameter is the base to use for relative system identifiers. -It is set by XML_SetBase and may be null. The -public id parameter is the public id given in the entity declaration and -may be null. The system id is the system identifier specified in the entity -declaration and is never null.

+

The base parameter is the base to use for relative +system identifiers. It is set by XML_SetBase and may be NULL. The +publicId parameter is the public id given in the entity +declaration and may be NULL. systemId is the system +identifier specified in the entity declaration and is never NULL.

There are a couple of ways in which this handler differs from others. First, this handler returns an integer. A non-zero value should be returned @@ -1021,8 +1024,8 @@

Second, instead of having userData as its first argument, it receives the parser that encountered the entity reference. This, along with the context -parameter, may be used as arguments to a call to -XML_ExternalEntityParserCreate. +parameter, may be used as arguments to a call to XML_ExternalEntityParserCreate. Using the returned parser, the body of the external entity can be recursively parsed.

From kwaclaw@users.sourceforge.net Mon Oct 21 22:19:43 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Mon, 21 Oct 2002 14:19:43 -0700 Subject: [Expat-checkins] expat/win32 README.txt,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv13961/win32 Added Files: README.txt Log Message: * Applied patch #620822 - Windows Dll build with DEF file * Changed macro for static linking from _STATIC to XML_STATIC and modified expat.h accordingly * Added ReadMe file to Win32 subdirectory documenting Windows builds * Changed static build settings to create libraries with names different from the Dll stub library libexpat(w).lib --- NEW FILE: README.txt --- Expat can be built on Windows in three ways: using MS Visual C++ 6, Borland C++ Builder 5 or Cygwin. * Cygwin: This follows the Unix build procedures. * C++ Builder 5: Possible with make files in the BCB5 subdirectory. Details can be found in the ReadMe file located there. * MS Visual C++ 6: Based on workspace (.dsw) and project files (.dsp) located in the lib subdirectory. * Special note about building static libraries under MS VC++: There are three possible configurations: using the single threaded or multithreaded run-time library, or using the multi-threaded run-time Dll. That is, one can build three different Expat libraries depending on the needs of the application. The libraries should be named like this: Single-theaded: libexpatML.lib Multi-threaded: libexpatMT.lib Multi-threaded Dll: libexpatMD.lib The suffixes conform to the compiler switch settings /ML, /MT and /MD for MS VC++. By default, the expat-static and expatw-static projects are set up to link against the multithreaded run-time library, so they will build libexpatMT.lib or libexpatwMT.lib files. To build the other versions of the static library, go to Project - Settings: - specify a different RTL linkage on the C/C++ tab under the category Code Generation. - then, on the Library tab, change the output file name accordingly, as described above An application linking to the static libraries must have the global macro XML_STATIC defined. From kwaclaw@users.sourceforge.net Mon Oct 21 22:19:43 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Mon, 21 Oct 2002 14:19:43 -0700 Subject: [Expat-checkins] expat/examples elements.dsp,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv13961/examples Modified Files: elements.dsp Log Message: * Applied patch #620822 - Windows Dll build with DEF file * Changed macro for static linking from _STATIC to XML_STATIC and modified expat.h accordingly * Added ReadMe file to Win32 subdirectory documenting Windows builds * Changed static build settings to create libraries with names different from the Dll stub library libexpat(w).lib Index: elements.dsp =================================================================== RCS file: /cvsroot/expat/expat/examples/elements.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- elements.dsp 23 Aug 2002 15:04:51 -0000 1.4 +++ elements.dsp 21 Oct 2002 21:19:41 -0000 1.5 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_STATIC" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "XML_STATIC" /FD /c # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -51,7 +51,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 odbccp32.lib libexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\lib\Release_static" +# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\lib\Release_static" !ELSEIF "$(CFG)" == "elements - Win32 Debug" @@ -67,7 +67,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm- /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_STATIC" /FR /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "XML_STATIC" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -75,7 +75,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 odbccp32.lib libexpat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\lib\Debug_static" +# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\lib\Debug_static" !ENDIF From kwaclaw@users.sourceforge.net Mon Oct 21 22:19:43 2002 From: kwaclaw@users.sourceforge.net (Karl Waclawek) Date: Mon, 21 Oct 2002 14:19:43 -0700 Subject: [Expat-checkins] expat/lib libexpat.def,NONE,1.1 libexpatw.def,NONE,1.1 expat.dsp,1.8,1.9 expat.h,1.43,1.44 expat_static.dsp,1.1,1.2 expatw.dsp,1.1,1.2 expatw_static.dsp,1.1,1.2 xmlparse.c,1.93,1.94 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv13961/lib Modified Files: expat.dsp expat.h expat_static.dsp expatw.dsp expatw_static.dsp xmlparse.c Added Files: libexpat.def libexpatw.def Log Message: * Applied patch #620822 - Windows Dll build with DEF file * Changed macro for static linking from _STATIC to XML_STATIC and modified expat.h accordingly * Added ReadMe file to Win32 subdirectory documenting Windows builds * Changed static build settings to create libraries with names different from the Dll stub library libexpat(w).lib --- NEW FILE: libexpat.def --- LIBRARY LIBEXPAT DESCRIPTION "Implements an XML parser." EXPORTS XML_DefaultCurrent @1 XML_ErrorString @2 XML_ExpatVersion @3 XML_ExpatVersionInfo @4 XML_ExternalEntityParserCreate @5 XML_GetBase @6 XML_GetBuffer @7 XML_GetCurrentByteCount @8 XML_GetCurrentByteIndex @9 XML_GetCurrentColumnNumber @10 XML_GetCurrentLineNumber @11 XML_GetErrorCode @12 XML_GetIdAttributeIndex @13 XML_GetInputContext @14 XML_GetSpecifiedAttributeCount @15 XML_Parse @16 XML_ParseBuffer @17 XML_ParserCreate @18 XML_ParserCreateNS @19 XML_ParserCreate_MM @20 XML_ParserFree @21 XML_SetAttlistDeclHandler @22 XML_SetBase @23 XML_SetCdataSectionHandler @24 XML_SetCharacterDataHandler @25 XML_SetCommentHandler @26 XML_SetDefaultHandler @27 XML_SetDefaultHandlerExpand @28 XML_SetDoctypeDeclHandler @29 XML_SetElementDeclHandler @30 XML_SetElementHandler @31 XML_SetEncoding @32 XML_SetEndCdataSectionHandler @33 XML_SetEndDoctypeDeclHandler @34 XML_SetEndElementHandler @35 XML_SetEndNamespaceDeclHandler @36 XML_SetEntityDeclHandler @37 XML_SetExternalEntityRefHandler @38 XML_SetExternalEntityRefHandlerArg @39 XML_SetNamespaceDeclHandler @40 XML_SetNotStandaloneHandler @41 XML_SetNotationDeclHandler @42 XML_SetParamEntityParsing @43 XML_SetProcessingInstructionHandler @44 XML_SetReturnNSTriplet @45 XML_SetStartCdataSectionHandler @46 XML_SetStartDoctypeDeclHandler @47 XML_SetStartElementHandler @48 XML_SetStartNamespaceDeclHandler @49 XML_SetUnknownEncodingHandler @50 XML_SetUnparsedEntityDeclHandler @51 XML_SetUserData @52 XML_SetXmlDeclHandler @53 XML_UseParserAsHandlerArg @54 XML_ParserReset @55 XML_SetSkippedEntityHandler @56 XML_GetFeatureList @57 XML_UseForeignDTD @58 --- NEW FILE: libexpatw.def --- LIBRARY LIBEXPATW DESCRIPTION "Implements an XML parser." EXPORTS XML_DefaultCurrent @1 XML_ErrorString @2 XML_ExpatVersion @3 XML_ExpatVersionInfo @4 XML_ExternalEntityParserCreate @5 XML_GetBase @6 XML_GetBuffer @7 XML_GetCurrentByteCount @8 XML_GetCurrentByteIndex @9 XML_GetCurrentColumnNumber @10 XML_GetCurrentLineNumber @11 XML_GetErrorCode @12 XML_GetIdAttributeIndex @13 XML_GetInputContext @14 XML_GetSpecifiedAttributeCount @15 XML_Parse @16 XML_ParseBuffer @17 XML_ParserCreate @18 XML_ParserCreateNS @19 XML_ParserCreate_MM @20 XML_ParserFree @21 XML_SetAttlistDeclHandler @22 XML_SetBase @23 XML_SetCdataSectionHandler @24 XML_SetCharacterDataHandler @25 XML_SetCommentHandler @26 XML_SetDefaultHandler @27 XML_SetDefaultHandlerExpand @28 XML_SetDoctypeDeclHandler @29 XML_SetElementDeclHandler @30 XML_SetElementHandler @31 XML_SetEncoding @32 XML_SetEndCdataSectionHandler @33 XML_SetEndDoctypeDeclHandler @34 XML_SetEndElementHandler @35 XML_SetEndNamespaceDeclHandler @36 XML_SetEntityDeclHandler @37 XML_SetExternalEntityRefHandler @38 XML_SetExternalEntityRefHandlerArg @39 XML_SetNamespaceDeclHandler @40 XML_SetNotStandaloneHandler @41 XML_SetNotationDeclHandler @42 XML_SetParamEntityParsing @43 XML_SetProcessingInstructionHandler @44 XML_SetReturnNSTriplet @45 XML_SetStartCdataSectionHandler @46 XML_SetStartDoctypeDeclHandler @47 XML_SetStartElementHandler @48 XML_SetStartNamespaceDeclHandler @49 XML_SetUnknownEncodingHandler @50 XML_SetUnparsedEntityDeclHandler @51 XML_SetUserData @52 XML_SetXmlDeclHandler @53 XML_UseParserAsHandlerArg @54 XML_ParserReset @55 XML_SetSkippedEntityHandler @56 XML_GetFeatureList @57 XML_UseForeignDTD @58 Index: expat.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- expat.dsp 31 May 2002 02:30:31 -0000 1.8 +++ expat.dsp 21 Oct 2002 21:19:41 -0000 1.9 @@ -92,6 +92,10 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=.\libexpat.def +# End Source File +# Begin Source File + SOURCE=.\xmlparse.c !IF "$(CFG)" == "expat - Win32 Release" Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- expat.h 17 Oct 2002 16:47:45 -0000 1.43 +++ expat.h 21 Oct 2002 21:19:41 -0000 1.44 @@ -18,7 +18,7 @@ #ifndef XMLPARSEAPI #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) -#ifdef _STATIC +#ifdef XML_STATIC #define XMLPARSEAPI(type) type __cdecl #else #define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl Index: expat_static.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expat_static.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- expat_static.dsp 23 Aug 2002 15:04:52 -0000 1.1 +++ expat_static.dsp 21 Oct 2002 21:19:41 -0000 1.2 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release_static\libexpat.lib" +# ADD LIB32 /nologo /out:"Release_static\libexpatMT.lib" !ELSEIF "$(CFG)" == "expat_static - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug_static\libexpat.lib" +# ADD LIB32 /nologo /out:"Debug_static\libexpatMT.lib" !ENDIF Index: expatw.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expatw.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- expatw.dsp 31 May 2002 03:12:47 -0000 1.1 +++ expatw.dsp 21 Oct 2002 21:19:41 -0000 1.2 @@ -93,6 +93,10 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=.\libexpatw.def +# End Source File +# Begin Source File + SOURCE=.\xmlparse.c !IF "$(CFG)" == "expatw - Win32 Release" Index: expatw_static.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expatw_static.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- expatw_static.dsp 23 Aug 2002 15:04:52 -0000 1.1 +++ expatw_static.dsp 21 Oct 2002 21:19:41 -0000 1.2 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release-w_static\libexpatw.lib" +# ADD LIB32 /nologo /out:"Release-w_static\libexpatwMT.lib" !ELSEIF "$(CFG)" == "expatw_static - Win32 Debug" @@ -64,8 +64,8 @@ # PROP Output_Dir "Debug-w_static" # PROP Intermediate_Dir "Debug-w_static" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm- /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILED_FROM_DSP" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILED_FROM_DSP" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x1009 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug-w_static\libexpat.lib" +# ADD LIB32 /nologo /out:"Debug-w_static\libexpatwMT.lib" !ENDIF Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- xmlparse.c 9 Oct 2002 13:21:45 -0000 1.93 +++ xmlparse.c 21 Oct 2002 21:19:41 -0000 1.94 @@ -8,11 +8,7 @@ #ifdef COMPILED_FROM_DSP #include "winconfig.h" -#ifdef _LIB #define XMLPARSEAPI(type) type __cdecl -#else -#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl -#endif #include "expat.h" #undef XMLPARSEAPI @@ -26,7 +22,7 @@ #include #ifdef __declspec -#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl +#define XMLPARSEAPI(type) type __cdecl #endif #include "expat.h"