From da55336659b79cc157d04fcbedeb02905f7c6760 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Mon, 19 Oct 2009 19:28:32 +0000 Subject: [PATCH] update libxslt headers as well svn path=/trunk/; revision=43622 --- .../include/reactos/libs/libxslt/extensions.h | 92 ++++++++++--------- .../include/reactos/libs/libxslt/libxslt.h | 2 +- .../include/reactos/libs/libxslt/xsltconfig.h | 21 ++++- .../include/reactos/libs/libxslt/xsltlocale.h | 57 ++++++++++++ 4 files changed, 124 insertions(+), 48 deletions(-) create mode 100644 reactos/include/reactos/libs/libxslt/xsltlocale.h diff --git a/reactos/include/reactos/libs/libxslt/extensions.h b/reactos/include/reactos/libs/libxslt/extensions.h index 30b7d4c1cab..900779c34c0 100644 --- a/reactos/include/reactos/libs/libxslt/extensions.h +++ b/reactos/include/reactos/libs/libxslt/extensions.h @@ -23,6 +23,16 @@ extern "C" { * Extension Modules API. */ +/** + * xsltInitGlobals: + * + * Initialize the global variables for extensions + * + */ + +XSLTPUBFUN void XSLTCALL + xsltInitGlobals (void); + /** * xsltStyleExtInitFunction: * @ctxt: an XSLT stylesheet @@ -86,11 +96,11 @@ XSLTPUBFUN int XSLTCALL XSLTPUBFUN int XSLTCALL xsltUnregisterExtModule (const xmlChar * URI); -XSLTPUBFUN void * XSLTCALL +XSLTPUBFUN void * XSLTCALL xsltGetExtData (xsltTransformContextPtr ctxt, const xmlChar *URI); -XSLTPUBFUN void * XSLTCALL +XSLTPUBFUN void * XSLTCALL xsltStyleGetExtData (xsltStylesheetPtr style, const xmlChar *URI); #ifdef XSLT_REFACTORED @@ -99,33 +109,29 @@ XSLTPUBFUN void * XSLTCALL xsltStylesheetPtr style, const xmlChar * URI); #endif -XSLTPUBFUN void XSLTCALL - xsltShutdownCtxtExts (xsltTransformContextPtr ctxt); +XSLTPUBFUN void XSLTCALL + xsltShutdownCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL - xsltShutdownExts (xsltStylesheetPtr style); +XSLTPUBFUN void XSLTCALL + xsltShutdownExts (xsltStylesheetPtr style); -XSLTPUBFUN xsltTransformContextPtr XSLTCALL - xsltXPathGetTransformContext +XSLTPUBFUN xsltTransformContextPtr XSLTCALL + xsltXPathGetTransformContext (xmlXPathParserContextPtr ctxt); /* * extension functions */ -XSLTPUBFUN int XSLTCALL - xsltRegisterExtModuleFunction +XSLTPUBFUN int XSLTCALL + xsltRegisterExtModuleFunction (const xmlChar *name, const xmlChar *URI, xmlXPathFunction function); -XSLTPUBFUN xmlXPathFunction XSLTCALL - xsltExtFunctionLookup (xsltTransformContextPtr ctxt, - const xmlChar *name, - const xmlChar *URI); XSLTPUBFUN xmlXPathFunction XSLTCALL xsltExtModuleFunctionLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleFunction +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleFunction (const xmlChar *name, const xmlChar *URI); @@ -133,7 +139,7 @@ XSLTPUBFUN int XSLTCALL * extension elements */ typedef xsltElemPreCompPtr (*xsltPreComputeFunction) - (xsltStylesheetPtr style, + (xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function); @@ -141,33 +147,33 @@ XSLTPUBFUN xsltElemPreCompPtr XSLTCALL xsltNewElemPreComp (xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltInitElemPreComp (xsltElemPreCompPtr comp, xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function, xsltElemPreCompDeallocator freeFunc); -XSLTPUBFUN int XSLTCALL - xsltRegisterExtModuleElement +XSLTPUBFUN int XSLTCALL + xsltRegisterExtModuleElement (const xmlChar *name, const xmlChar *URI, xsltPreComputeFunction precomp, xsltTransformFunction transform); -XSLTPUBFUN xsltTransformFunction XSLTCALL +XSLTPUBFUN xsltTransformFunction XSLTCALL xsltExtElementLookup (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN xsltTransformFunction XSLTCALL +XSLTPUBFUN xsltTransformFunction XSLTCALL xsltExtModuleElementLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN xsltPreComputeFunction XSLTCALL - xsltExtModuleElementPreComputeLookup +XSLTPUBFUN xsltPreComputeFunction XSLTCALL + xsltExtModuleElementPreComputeLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleElement +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleElement (const xmlChar *name, const xmlChar *URI); @@ -177,28 +183,28 @@ XSLTPUBFUN int XSLTCALL typedef void (*xsltTopLevelFunction) (xsltStylesheetPtr style, xmlNodePtr inst); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtModuleTopLevel (const xmlChar *name, const xmlChar *URI, xsltTopLevelFunction function); -XSLTPUBFUN xsltTopLevelFunction XSLTCALL - xsltExtModuleTopLevelLookup +XSLTPUBFUN xsltTopLevelFunction XSLTCALL + xsltExtModuleTopLevelLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleTopLevel +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleTopLevel (const xmlChar *name, const xmlChar *URI); /* These 2 functions are deprecated for use within modules. */ -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtFunction (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, xmlXPathFunction function); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtElement (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, @@ -209,24 +215,24 @@ XSLTPUBFUN int XSLTCALL * Those are used by the XSLT (pre)processor. */ -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtPrefix (xsltStylesheetPtr style, const xmlChar *prefix, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltCheckExtPrefix (xsltStylesheetPtr style, const xmlChar *URI); XSLTPUBFUN int XSLTCALL xsltCheckExtURI (xsltStylesheetPtr style, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltInitCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeExts (xsltStylesheetPtr style); -XSLTPUBFUN xsltElemPreCompPtr XSLTCALL +XSLTPUBFUN xsltElemPreCompPtr XSLTCALL xsltPreComputeExtModuleElement (xsltStylesheetPtr style, xmlNodePtr inst); @@ -235,16 +241,16 @@ XSLTPUBFUN xsltElemPreCompPtr XSLTCALL * Used by exslt initialisation */ -XSLTPUBFUN xmlHashTablePtr XSLTCALL - xsltGetExtInfo (xsltStylesheetPtr style, +XSLTPUBFUN xmlHashTablePtr XSLTCALL + xsltGetExtInfo (xsltStylesheetPtr style, const xmlChar *URI); /** * Test module http://xmlsoft.org/XSLT/ */ -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltRegisterTestModule (void); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltDebugDumpExtensions (FILE * output); diff --git a/reactos/include/reactos/libs/libxslt/libxslt.h b/reactos/include/reactos/libs/libxslt/libxslt.h index 903f900c828..2b9f52a9fd5 100644 --- a/reactos/include/reactos/libs/libxslt/libxslt.h +++ b/reactos/include/reactos/libs/libxslt/libxslt.h @@ -16,7 +16,7 @@ #include "config.h" #endif -#include "xsltconfig.h" +#include #include #if !defined LIBXSLT_PUBLIC diff --git a/reactos/include/reactos/libs/libxslt/xsltconfig.h b/reactos/include/reactos/libs/libxslt/xsltconfig.h index 94d43911877..db20ebd1275 100644 --- a/reactos/include/reactos/libs/libxslt/xsltconfig.h +++ b/reactos/include/reactos/libs/libxslt/xsltconfig.h @@ -20,28 +20,28 @@ extern "C" { * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.1.24" +#define LIBXSLT_DOTTED_VERSION "1.1.26" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXSLT_VERSION 10124 +#define LIBXSLT_VERSION 10126 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXSLT_VERSION_STRING "10124" +#define LIBXSLT_VERSION_STRING "10126" /** * LIBXSLT_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXSLT_VERSION_EXTRA "-CVS1070" +#define LIBXSLT_VERSION_EXTRA "-GITv1.1.26" /** * WITH_XSLT_DEBUG: @@ -123,6 +123,19 @@ extern "C" { #define LIBXSLT_DEFAULT_PLUGINS_PATH() "/usr/lib/libxslt-plugins" #endif +/** + * Locale support + */ +#if 1 +#ifndef XSLT_LOCALE_XLOCALE +#define XSLT_LOCALE_XLOCALE +#endif +#elif 0 +#ifndef XSLT_LOCALE_WINAPI +#define XSLT_LOCALE_WINAPI +#endif +#endif + /** * ATTRIBUTE_UNUSED: * diff --git a/reactos/include/reactos/libs/libxslt/xsltlocale.h b/reactos/include/reactos/libs/libxslt/xsltlocale.h new file mode 100644 index 00000000000..59343b0aa26 --- /dev/null +++ b/reactos/include/reactos/libs/libxslt/xsltlocale.h @@ -0,0 +1,57 @@ +/* + * Summary: Locale handling + * Description: Interfaces for locale handling. Needed for language dependent + * sorting. + * + * Copy: See Copyright for the status of this software. + * + * Author: Nick Wellnhofer + */ + +#ifndef __XML_XSLTLOCALE_H__ +#define __XML_XSLTLOCALE_H__ + +#include + +#ifdef XSLT_LOCALE_XLOCALE + +#include +#include + +#ifdef __GLIBC__ +/*locale_t is defined only if _GNU_SOURCE is defined*/ +typedef __locale_t xsltLocale; +#else +typedef locale_t xsltLocale; +#endif +typedef xmlChar xsltLocaleChar; + +#elif defined(XSLT_LOCALE_WINAPI) + +#include +#include + +typedef LCID xsltLocale; +typedef wchar_t xsltLocaleChar; + +#else + +/* + * XSLT_LOCALE_NONE: + * Macro indicating that locale are not supported + */ +#ifndef XSLT_LOCALE_NONE +#define XSLT_LOCALE_NONE +#endif + +typedef void *xsltLocale; +typedef xmlChar xsltLocaleChar; + +#endif + +xsltLocale xsltNewLocale(const xmlChar *langName); +void xsltFreeLocale(xsltLocale locale); +xsltLocaleChar *xsltStrxfrm(xsltLocale locale, const xmlChar *string); +int xsltLocaleStrcmp(xsltLocale locale, const xsltLocaleChar *str1, const xsltLocaleChar *str2); + +#endif /* __XML_XSLTLOCALE_H__ */