Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 02/14: [NTOS] Fix NtContinue for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a007f5e4905ef276d4cc3… commit a007f5e4905ef276d4cc3b2fd42568064f0b537b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 21 17:18:15 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [NTOS] Fix NtContinue for x64 --- ntoskrnl/ke/except.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ntoskrnl/ke/except.c b/ntoskrnl/ke/except.c index 3b945633ca5..79062df1e8a 100644 --- a/ntoskrnl/ke/except.c +++ b/ntoskrnl/ke/except.c @@ -28,12 +28,16 @@ KiContinuePreviousModeUser(IN PCONTEXT Context, RtlCopyMemory(&LocalContext, Context, sizeof(CONTEXT)); Context = &LocalContext; +#ifdef _M_AMD64 + KiSetTrapContext(TrapFrame, &LocalContext, UserMode); +#else /* Convert the context into Exception/Trap Frames */ KeContextToTrapFrame(&LocalContext, ExceptionFrame, TrapFrame, LocalContext.ContextFlags, UserMode); +#endif } NTSTATUS @@ -62,12 +66,16 @@ KiContinue(IN PCONTEXT Context, } else { +#ifdef _M_AMD64 + KiSetTrapContext(TrapFrame, Context, KernelMode); +#else /* Convert the context into Exception/Trap Frames */ KeContextToTrapFrame(Context, ExceptionFrame, TrapFrame, Context->ContextFlags, KernelMode); +#endif } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

2 years, 1 month

[reactos] 01/14: [NTDLL_APITEST] Implement NtContinue test for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6744368755d3ae2ab0d2a… commit 6744368755d3ae2ab0d2af5bd3cbd27679b62e3e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 21 16:21:10 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [NTDLL_APITEST] Implement NtContinue test for x64 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 2 + modules/rostests/apitests/ntdll/NtContinue.c | 100 +++++++++++++++++---- modules/rostests/apitests/ntdll/amd64/NtContinue.S | 38 ++++++++ 3 files changed, 122 insertions(+), 18 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index c2ec474a5a0..2e38c4ec7b5 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -100,6 +100,8 @@ list(APPEND SOURCE if(ARCH STREQUAL "i386") add_asm_files(ntdll_apitest_asm i386/NtContinue.S) +elseif(ARCH STREQUAL "amd64") + add_asm_files(ntdll_apitest_asm amd64/NtContinue.S) endif() list(APPEND PCH_SKIP_SOURCE diff --git a/modules/rostests/apitests/ntdll/NtContinue.c b/modules/rostests/apitests/ntdll/NtContinue.c index 334c85056a2..f159c7bf3f7 100644 --- a/modules/rostests/apitests/ntdll/NtContinue.c +++ b/modules/rostests/apitests/ntdll/NtContinue.c @@ -10,6 +10,15 @@ #include <setjmp.h> #include <time.h> +#ifdef _MSC_VER +#pragma runtime_checks("s", off) +#endif + +#define ok_eq_print(value, expected, spec) ok((value) == (expected), #value " = " spec ", expected " spec "\n", value, expected) +#define ok_eq_hex(value, expected) ok_eq_print(value, expected, "%lx") +#define ok_eq_hex64(value, expected) ok_eq_print(value, expected, "%I64x") +#define ok_eq_xmm(value, expected) ok((value).Low == (expected).Low, #value " = %I64x'%08I64x, expected %I64x'%08I64x\n", (value).Low, (value).High, (expected).Low, (expected).High) + #ifdef _M_IX86 #define NTC_SEGMENT_BITS (0xFFFF) #define NTC_EFLAGS_BITS (0x3C0CD5) @@ -121,6 +130,51 @@ void check(CONTEXT * pContext) ok((pContext->SegSs & NTC_SEGMENT_BITS) == (continueContext.SegSs & NTC_SEGMENT_BITS), "SegSs: 0x%lx != 0x%lx\n", pContext->SegSs, continueContext.SegSs); +#else + ok_eq_hex64(pContext->ContextFlags, CONTEXT_FULL | CONTEXT_SEGMENTS); + ok_eq_hex(pContext->MxCsr, continueContext.MxCsr); + ok_eq_hex(pContext->SegCs, continueContext.SegCs); + ok_eq_hex(pContext->SegDs, 0x2B); + ok_eq_hex(pContext->SegEs, 0x2B); + ok_eq_hex(pContext->SegFs, 0x53); + ok_eq_hex(pContext->SegGs, 0x2B); + ok_eq_hex(pContext->SegSs, continueContext.SegSs); + ok_eq_hex(pContext->EFlags, (continueContext.EFlags & ~0x1C0000) | 0x202); + + ok_eq_hex64(pContext->Rax, continueContext.Rax); + ok_eq_hex64(pContext->Rdx, continueContext.Rdx); + ok_eq_hex64(pContext->Rbx, continueContext.Rbx); + ok_eq_hex64(pContext->Rsp, continueContext.Rsp); + ok_eq_hex64(pContext->Rbp, continueContext.Rbp); + ok_eq_hex64(pContext->Rsi, continueContext.Rsi); + ok_eq_hex64(pContext->Rdi, continueContext.Rdi); + ok_eq_hex64(pContext->R8, continueContext.R8); + ok_eq_hex64(pContext->R9, continueContext.R9); + ok_eq_hex64(pContext->R10, continueContext.R10); + ok_eq_hex64(pContext->R11, continueContext.R11); + ok_eq_hex64(pContext->R12, continueContext.R12); + ok_eq_hex64(pContext->R13, continueContext.R13); + ok_eq_hex64(pContext->R14, continueContext.R14); + ok_eq_hex64(pContext->R15, continueContext.R15); + ok_eq_xmm(pContext->Xmm0, continueContext.Xmm0); + ok_eq_xmm(pContext->Xmm1, continueContext.Xmm1); + ok_eq_xmm(pContext->Xmm2, continueContext.Xmm2); + ok_eq_xmm(pContext->Xmm3, continueContext.Xmm3); + ok_eq_xmm(pContext->Xmm4, continueContext.Xmm4); + ok_eq_xmm(pContext->Xmm5, continueContext.Xmm5); + ok_eq_xmm(pContext->Xmm6, continueContext.Xmm6); + ok_eq_xmm(pContext->Xmm7, continueContext.Xmm7); + ok_eq_xmm(pContext->Xmm8, continueContext.Xmm8); + ok_eq_xmm(pContext->Xmm9, continueContext.Xmm9); + ok_eq_xmm(pContext->Xmm10, continueContext.Xmm10); + ok_eq_xmm(pContext->Xmm11, continueContext.Xmm11); + ok_eq_xmm(pContext->Xmm12, continueContext.Xmm12); + ok_eq_xmm(pContext->Xmm13, continueContext.Xmm13); + ok_eq_xmm(pContext->Xmm14, continueContext.Xmm14); + ok_eq_xmm(pContext->Xmm15, continueContext.Xmm15); + + // Clear the frame register to prevent unwinding, which is broken + ((_JUMP_BUFFER*)&jmpbuf)->Frame = 0; #endif /* Return where we came from */ @@ -129,16 +183,16 @@ void check(CONTEXT * pContext) START_TEST(NtContinue) { -#ifdef __RUNTIME_CHECKS__ - skip("This test breaks MSVC runtime checks!\n"); - return; -#endif /* __RUNTIME_CHECKS__ */ initrand(); + RtlFillMemory(&continueContext, sizeof(continueContext), 0xBBBBBBBB); + /* First time */ if(setjmp(jmpbuf) == 0) { - CONTEXT bogus; + CONTEXT bogus[2]; + + RtlFillMemory(&bogus, sizeof(bogus), 0xCCCCCCCC); continueContext.ContextFlags = CONTEXT_FULL; GetThreadContext(GetCurrentThread(), &continueContext); @@ -167,28 +221,38 @@ START_TEST(NtContinue) /* Can't do a lot about segments */ #elif defined(_M_AMD64) - continueContext.ContextFlags = CONTEXT_FULL; + continueContext.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; /* Fill the integer registers with random values */ - continueContext.Rdi = randULONG64(); - continueContext.Rsi = randULONG64(); - continueContext.Rbx = randULONG64(); - continueContext.Rdx = randULONG64(); - continueContext.Rcx = randULONG64(); - continueContext.Rax = randULONG64(); - continueContext.Rbp = randULONG64(); + PULONG64 Registers = &continueContext.Rax; + for (ULONG i = 0; i < 16; i++) + { + Registers[i] = randULONG64(); + } + + /* Fill the XMM registers with random values */ + Registers = (PULONG64)&continueContext.Xmm0; + for (ULONG i = 0; i < 32; i++) + { + Registers[i] = randULONG64(); + } + + continueContext.Dr0 = randULONG64() & 0xFFFF; + continueContext.Dr1 = randULONG64() & 0xFFFF; + continueContext.Dr2 = randULONG64() & 0xFFFF; + continueContext.Dr3 = randULONG64() & 0xFFFF; + continueContext.Dr6 = randULONG64() & 0xFFFF; + continueContext.Dr7 = randULONG64() & 0xFFFF; /* Randomize all the allowed flags (determined experimentally with WinDbg) */ continueContext.EFlags = randULONG64() & 0x3C0CD5; /* Randomize the stack pointer as much as possible */ - continueContext.Rsp = (((ULONG_PTR)&bogus)) + - sizeof(bogus) - (randULONG() & 0xF) * 4; + continueContext.Rsp = (((ULONG_PTR)&bogus)) + (randULONG() & 0xF) * 16; + continueContext.Rsp = ALIGN_DOWN_BY(continueContext.Rsp, 16); /* continuePoint() is implemented in assembler */ - //continueContext.Rip = ((ULONG_PTR)continuePoint); - skip("NtContinue test does not yet work on x64."); - return; + continueContext.Rip = ((ULONG_PTR)continuePoint); #endif NtContinue(&continueContext, FALSE); diff --git a/modules/rostests/apitests/ntdll/amd64/NtContinue.S b/modules/rostests/apitests/ntdll/amd64/NtContinue.S new file mode 100644 index 00000000000..40304d94122 --- /dev/null +++ b/modules/rostests/apitests/ntdll/amd64/NtContinue.S @@ -0,0 +1,38 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Helper functions for NtContinue test + * COPYRIGHT: Copyright 2022 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <asm.inc> +#include <ksamd64.inc> + +.code64 + +EXTERN RtlCaptureContext:PROC +EXTERN check:PROC + +PUBLIC continuePoint +.PROC continuePoint + + // Allocate space for a CONTEXT structure + .ALLOCSTACK CONTEXT_FRAME_LENGTH + 8 + .ENDPROLOG + + // Capture the current CONTEXT + mov rcx, rsp + call RtlCaptureContext + + // Call the function that will compare the current context with the expected one + cld + mov rcx, rsp + call check + + // check() must not return + int 3 + +.ENDP + +// EOF +END

2 years, 1 month

[reactos] 01/01: [PSDK][NTOS:KD64] Turns out, that even Clang in MSVC mode needs the 64-bits pointer extension hack!

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7024d6c72f46d9125d7a… commit f7024d6c72f46d9125d7acfe23093dea4ffa3012 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 24 03:22:39 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 24 13:30:43 2022 +0100 [PSDK][NTOS:KD64] Turns out, that even Clang in MSVC mode needs the 64-bits pointer extension hack! Addendum to commit de81021ba. Otherwise, we get the following build error: \ntoskrnl\kd64\kddata.c(532,5): error: initializer element is not a compile-time constant PtrToUL64(RtlpBreakWithStatusInstruction), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \ntoskrnl\kd64\kddata.c(526,26): note: expanded from macro 'PtrToUL64' #define PtrToUL64(x) ((ULPTR64)(x)) ^~~~~~~~~~~~ --- ntoskrnl/kd64/kddata.c | 4 ++-- sdk/include/psdk/wdbgexts.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c index 7111d287d0a..dbe56351db1 100644 --- a/ntoskrnl/kd64/kddata.c +++ b/ntoskrnl/kd64/kddata.c @@ -519,8 +519,8 @@ DBGKD_GET_VERSION64 KdVersionBlock = C_ASSERT(sizeof(KDDEBUGGER_DATA64) >= 0x318); #endif -/* Minimal hackery for GCC, see commit b9cd3f2d9 (r25845) */ -#if defined(__GNUC__) && defined(_M_IX86) +#if !defined(_WIN64) && (defined(__GNUC__) || defined(__clang__)) +/* Minimal hackery for GCC/Clang, see commit b9cd3f2d9 (r25845) and de81021ba */ #define PtrToUL64(x) ((ULPTR64)(ULONG_PTR)(x)) #else #define PtrToUL64(x) ((ULPTR64)(x)) diff --git a/sdk/include/psdk/wdbgexts.h b/sdk/include/psdk/wdbgexts.h index d682814a7dc..bf8ff3d724e 100644 --- a/sdk/include/psdk/wdbgexts.h +++ b/sdk/include/psdk/wdbgexts.h @@ -175,7 +175,8 @@ typedef struct _DBGKD_DEBUG_DATA_HEADER64 } DBGKD_DEBUG_DATA_HEADER64, *PDBGKD_DEBUG_DATA_HEADER64; /* Self-documenting type: stores a pointer as a 64-bit quantity */ -#if defined(__GNUC__) && defined(_M_IX86) // See commit b9cd3f2d9 (r25845) +#if !defined(_WIN64) && (defined(__GNUC__) || defined(__clang__)) +/* Minimal hackery for GCC/Clang, see commit b9cd3f2d9 (r25845) and de81021ba */ typedef union _ULPTR64 { ULONG_PTR ptr;

2 years, 1 month

[reactos] 01/01: [NTGDI][FREETYPE] Simplify IntRequestFontSize and FONTGDI

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=375b02f337a25df36fb3b… commit 375b02f337a25df36fb3b088895fc279c0e352f4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 24 14:18:20 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 24 14:18:20 2022 +0900 [NTGDI][FREETYPE] Simplify IntRequestFontSize and FONTGDI FONTGDI.lfWidth and FONTGDI.EmHeight are not used. Simplify code without setting these members. CORE-11848 --- win32ss/gdi/eng/engobjects.h | 2 -- win32ss/gdi/ntgdi/freetype.c | 26 ++++++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/win32ss/gdi/eng/engobjects.h b/win32ss/gdi/eng/engobjects.h index 29f7f0f8709..81f2b586432 100644 --- a/win32ss/gdi/eng/engobjects.h +++ b/win32ss/gdi/eng/engobjects.h @@ -162,9 +162,7 @@ typedef struct _FONTGDI { LONG tmAscent; LONG tmDescent; LONG tmInternalLeading; - LONG EmHeight; LONG Magic; - LONG lfWidth; LONG lfHeight; } FONTGDI, *PFONTGDI; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index f8508852025..7d3e20555f3 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3503,14 +3503,7 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) TT_OS2 *pOS2; TT_HoriHeader *pHori; FT_WinFNT_HeaderRec WinFNT; - LONG Ascent, Descent, Sum, EmHeight64; - - if (FontGDI->Magic == FONTGDI_MAGIC && - FontGDI->lfHeight == lfHeight && - FontGDI->lfWidth == lfWidth) - { - return 0; /* Cached */ - } + LONG Ascent, Descent, Sum, EmHeight; lfWidth = abs(lfWidth); if (lfHeight == 0) @@ -3529,6 +3522,9 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) if (lfHeight == -1) lfHeight = -2; + if (FontGDI->Magic == FONTGDI_MAGIC && FontGDI->lfHeight == lfHeight) + return 0; /* Cached */ + ASSERT_FREETYPE_LOCK_HELD(); pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2); pHori = (TT_HoriHeader *)FT_Get_Sfnt_Table(face, FT_SFNT_HHEA); @@ -3547,11 +3543,7 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) FontGDI->tmAscent = WinFNT.ascent; FontGDI->tmDescent = FontGDI->tmHeight - FontGDI->tmAscent; FontGDI->tmInternalLeading = WinFNT.internal_leading; - FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading; - FontGDI->EmHeight = max(FontGDI->EmHeight, 1); - FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX); FontGDI->Magic = FONTGDI_MAGIC; - FontGDI->lfWidth = lfWidth; FontGDI->lfHeight = lfHeight; return 0; } @@ -3605,18 +3597,16 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) } #undef FM_SEL_USE_TYPO_METRICS - FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading; - FontGDI->EmHeight = max(FontGDI->EmHeight, 1); - FontGDI->EmHeight = min(FontGDI->EmHeight, USHORT_MAX); FontGDI->Magic = FONTGDI_MAGIC; - FontGDI->lfWidth = lfWidth; FontGDI->lfHeight = lfHeight; - EmHeight64 = (FontGDI->EmHeight << 6); + EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading; + EmHeight = max(EmHeight, 1); + EmHeight = min(EmHeight, USHORT_MAX); req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; req.width = 0; - req.height = EmHeight64; + req.height = (EmHeight << 6); req.horiResolution = 0; req.vertResolution = 0; return FT_Request_Size(face, &req);

2 years, 1 month

[reactos] 01/01: [NTGDI][FREETYPE] Formatting code; Follow up #4865 (a620c6f)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=476f94c0fe35700c5932b… commit 476f94c0fe35700c5932ba9764ef71f0dc66000a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 24 12:28:10 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 24 12:28:10 2022 +0900 [NTGDI][FREETYPE] Formatting code; Follow up #4865 (a620c6f) CORE-11848 --- win32ss/gdi/ntgdi/freetype.c | 70 +++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3f1b63d0d62..f8508852025 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5992,7 +5992,7 @@ IntExtTextOutW( FT_Vector delta; /* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) + if (Count > 0xFFFF || (Count > 0 && String == NULL)) { EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -6000,15 +6000,12 @@ IntExtTextOutW( if (PATH_IsPathOpen(dc->dclevel)) { - bResult = PATH_ExtTextOut(dc, - XStart, - YStart, - fuOptions, - (const RECTL *)lprc, - String, - Count, - (const INT *)Dx); - return bResult; + return PATH_ExtTextOut(dc, + XStart, YStart, + fuOptions, + lprc, + String, Count, + Dx); } DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); @@ -6030,7 +6027,9 @@ IntExtTextOutW( { Start.x = pdcattr->ptlCurrent.x; Start.y = pdcattr->ptlCurrent.y; - } else { + } + else + { Start.x = XStart; Start.y = YStart; } @@ -6060,7 +6059,7 @@ IntExtTextOutW( if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) { - IntUpdateBoundsRect(dc, &DestRect); + IntUpdateBoundsRect(dc, &DestRect); } if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) @@ -6069,18 +6068,17 @@ IntExtTextOutW( if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - IntEngBitBlt( - SurfObj, - NULL, - NULL, - (CLIPOBJ *)&dc->co, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &dc->eboBackground.BrushObject, - &BrushOrigin, - ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); + IntEngBitBlt(SurfObj, + NULL, + NULL, + (CLIPOBJ *)&dc->co, + NULL, + &DestRect, + &SourcePoint, + &SourcePoint, + &dc->eboBackground.BrushObject, + &BrushOrigin, + ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawEnd(dc->ppdev); @@ -6281,7 +6279,7 @@ IntExtTextOutW( HSourceGlyph = EngCreateBitmap(bitSize, realglyph->bitmap.pitch, BMF_8BPP, BMF_TOPDOWN, realglyph->bitmap.buffer); - if ( !HSourceGlyph ) + if (!HSourceGlyph) { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); bResult = FALSE; @@ -6289,8 +6287,9 @@ IntExtTextOutW( FT_Done_Glyph((FT_Glyph)realglyph); break; } + SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); - if ( !SourceGlyphSurf ) + if (!SourceGlyphSurf) { EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); @@ -6324,16 +6323,15 @@ IntExtTextOutW( if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - if (!IntEngMaskBlt( - SurfObj, - SourceGlyphSurf, - (CLIPOBJ *)&dc->co, - &exloRGB2Dst.xlo, - &exloDst2RGB.xlo, - &DestRect, - (PPOINTL)&MaskRect, - &dc->eboText.BrushObject, - &BrushOrigin)) + if (!IntEngMaskBlt(SurfObj, + SourceGlyphSurf, + (CLIPOBJ *)&dc->co, + &exloRGB2Dst.xlo, + &exloDst2RGB.xlo, + &DestRect, + (PPOINTL)&MaskRect, + &dc->eboText.BrushObject, + &BrushOrigin)) { DPRINT1("Failed to MaskBlt a glyph!\n"); }

2 years, 1 month

[reactos] 03/03: [LIBXML2] Update to version 2.10.0. CORE-17766

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=911153da108e4ff040bc3… commit 911153da108e4ff040bc330595b6358b086c7e0e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 20 10:17:45 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Nov 23 22:02:47 2022 -0500 [LIBXML2] Update to version 2.10.0. CORE-17766 --- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/libxml/SAX.h | 41 +- sdk/include/reactos/libs/libxml/SAX2.h | 12 +- sdk/include/reactos/libs/libxml/dict.h | 2 + sdk/include/reactos/libs/libxml/encoding.h | 23 +- sdk/include/reactos/libs/libxml/entities.h | 2 + sdk/include/reactos/libs/libxml/globals.h | 15 +- sdk/include/reactos/libs/libxml/nanoftp.h | 27 +- sdk/include/reactos/libs/libxml/parser.h | 7 +- sdk/include/reactos/libs/libxml/parserInternals.h | 12 + sdk/include/reactos/libs/libxml/relaxng.h | 1 + sdk/include/reactos/libs/libxml/schematron.h | 2 +- sdk/include/reactos/libs/libxml/threads.h | 2 + sdk/include/reactos/libs/libxml/tree.h | 9 +- sdk/include/reactos/libs/libxml/valid.h | 19 +- sdk/include/reactos/libs/libxml/xmlerror.h | 2 + sdk/include/reactos/libs/libxml/xmlmemory.h | 2 + sdk/include/reactos/libs/libxml/xmlschemastypes.h | 1 + sdk/include/reactos/libs/libxml/xmlversion.h | 50 +- sdk/include/reactos/libs/libxml/xmlversion.h.in | 36 +- sdk/include/reactos/libs/libxml/xpath.h | 11 + sdk/include/reactos/libs/libxml/xpointer.h | 23 + sdk/lib/3rdparty/libxml2/CMakeLists.txt | 1 - sdk/lib/3rdparty/libxml2/COPYING | 23 - sdk/lib/3rdparty/libxml2/DOCBparser.c | 305 - sdk/lib/3rdparty/libxml2/HTMLparser.c | 457 +- sdk/lib/3rdparty/libxml2/HTMLtree.c | 16 +- sdk/lib/3rdparty/libxml2/NEWS | 188 +- sdk/lib/3rdparty/libxml2/README.md | 5 + sdk/lib/3rdparty/libxml2/SAX.c | 49 - sdk/lib/3rdparty/libxml2/SAX2.c | 191 +- sdk/lib/3rdparty/libxml2/buf.c | 221 +- sdk/lib/3rdparty/libxml2/buf.h | 5 - sdk/lib/3rdparty/libxml2/c14n.c | 8 +- sdk/lib/3rdparty/libxml2/catalog.c | 20 +- sdk/lib/3rdparty/libxml2/chvalid.c | 2 - sdk/lib/3rdparty/libxml2/config.h | 83 +- sdk/lib/3rdparty/libxml2/debugXML.c | 27 +- sdk/lib/3rdparty/libxml2/dict.c | 42 +- sdk/lib/3rdparty/libxml2/elfgcchack.h | 17830 -------------------- sdk/lib/3rdparty/libxml2/encoding.c | 85 +- sdk/lib/3rdparty/libxml2/entities.c | 28 +- sdk/lib/3rdparty/libxml2/error.c | 2 - sdk/lib/3rdparty/libxml2/globals.c | 65 +- sdk/lib/3rdparty/libxml2/hash.c | 9 +- sdk/lib/3rdparty/libxml2/include/win32config.h | 109 +- sdk/lib/3rdparty/libxml2/include/wsockcompat.h | 4 - sdk/lib/3rdparty/libxml2/legacy.c | 5 +- sdk/lib/3rdparty/libxml2/libxml.h | 29 +- sdk/lib/3rdparty/libxml2/list.c | 2 - sdk/lib/3rdparty/libxml2/nanoftp.c | 16 +- sdk/lib/3rdparty/libxml2/nanohttp.c | 15 +- sdk/lib/3rdparty/libxml2/parser.c | 89 +- sdk/lib/3rdparty/libxml2/parserInternals.c | 219 +- sdk/lib/3rdparty/libxml2/pattern.c | 14 - sdk/lib/3rdparty/libxml2/relaxng.c | 9 +- sdk/lib/3rdparty/libxml2/schematron.c | 1325 +- sdk/lib/3rdparty/libxml2/threads.c | 48 +- sdk/lib/3rdparty/libxml2/tree.c | 241 +- sdk/lib/3rdparty/libxml2/trio.c | 3 - sdk/lib/3rdparty/libxml2/uri.c | 8 +- sdk/lib/3rdparty/libxml2/valid.c | 66 +- sdk/lib/3rdparty/libxml2/xinclude.c | 33 +- sdk/lib/3rdparty/libxml2/xlink.c | 18 - sdk/lib/3rdparty/libxml2/xmlIO.c | 80 +- sdk/lib/3rdparty/libxml2/xmlcatalog.c | 5 +- sdk/lib/3rdparty/libxml2/xmllint.c | 74 +- sdk/lib/3rdparty/libxml2/xmlmemory.c | 39 +- sdk/lib/3rdparty/libxml2/xmlmodule.c | 11 +- sdk/lib/3rdparty/libxml2/xmlreader.c | 210 +- sdk/lib/3rdparty/libxml2/xmlregexp.c | 79 +- sdk/lib/3rdparty/libxml2/xmlsave.c | 8 +- sdk/lib/3rdparty/libxml2/xmlschemas.c | 42 +- sdk/lib/3rdparty/libxml2/xmlschemastypes.c | 25 +- sdk/lib/3rdparty/libxml2/xmlstring.c | 10 +- sdk/lib/3rdparty/libxml2/xmlunicode.c | 62 +- sdk/lib/3rdparty/libxml2/xmlwriter.c | 6 +- sdk/lib/3rdparty/libxml2/xpath.c | 158 +- sdk/lib/3rdparty/libxml2/xpointer.c | 32 +- sdk/lib/3rdparty/libxml2/xzlib.c | 15 +- 80 files changed, 2344 insertions(+), 20728 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 6f56690318c..8b7b4e319ac 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -239,7 +239,7 @@ URL: https://github.com/win-iconv/win-iconv Title: LibXML Path: sdk/lib/3rdparty/libxml2 -Used Version: 2.9.14 +Used Version: 2.10.0 License: MIT (https://spdx.org/licenses/MIT.htmlf) URL: http://xmlsoft.org, ftp://xmlsoft.org/libxml2/ diff --git a/sdk/include/reactos/libs/libxml/SAX.h b/sdk/include/reactos/libs/libxml/SAX.h index 20093ceb685..fa50568f253 100644 --- a/sdk/include/reactos/libs/libxml/SAX.h +++ b/sdk/include/reactos/libs/libxml/SAX.h @@ -16,54 +16,67 @@ #include <stdlib.h> #include <libxml/xmlversion.h> #include <libxml/parser.h> -#include <libxml/xlink.h> #ifdef LIBXML_LEGACY_ENABLED #ifdef __cplusplus extern "C" { #endif +XML_DEPRECATED XMLPUBFUN const xmlChar * XMLCALL getPublicId (void *ctx); +XML_DEPRECATED XMLPUBFUN const xmlChar * XMLCALL getSystemId (void *ctx); +XML_DEPRECATED XMLPUBFUN void XMLCALL setDocumentLocator (void *ctx, xmlSAXLocatorPtr loc); +XML_DEPRECATED XMLPUBFUN int XMLCALL getLineNumber (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL getColumnNumber (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL isStandalone (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL hasInternalSubset (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL hasExternalSubset (void *ctx); +XML_DEPRECATED XMLPUBFUN void XMLCALL internalSubset (void *ctx, const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); +XML_DEPRECATED XMLPUBFUN void XMLCALL externalSubset (void *ctx, const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); +XML_DEPRECATED XMLPUBFUN xmlEntityPtr XMLCALL getEntity (void *ctx, const xmlChar *name); +XML_DEPRECATED XMLPUBFUN xmlEntityPtr XMLCALL getParameterEntity (void *ctx, const xmlChar *name); +XML_DEPRECATED XMLPUBFUN xmlParserInputPtr XMLCALL resolveEntity (void *ctx, const xmlChar *publicId, const xmlChar *systemId); +XML_DEPRECATED XMLPUBFUN void XMLCALL entityDecl (void *ctx, const xmlChar *name, @@ -71,6 +84,7 @@ XMLPUBFUN void XMLCALL const xmlChar *publicId, const xmlChar *systemId, xmlChar *content); +XML_DEPRECATED XMLPUBFUN void XMLCALL attributeDecl (void *ctx, const xmlChar *elem, @@ -79,16 +93,19 @@ XMLPUBFUN void XMLCALL int def, const xmlChar *defaultValue, xmlEnumerationPtr tree); +XML_DEPRECATED XMLPUBFUN void XMLCALL elementDecl (void *ctx, const xmlChar *name, int type, xmlElementContentPtr content); +XML_DEPRECATED XMLPUBFUN void XMLCALL notationDecl (void *ctx, const xmlChar *name, const xmlChar *publicId, const xmlChar *systemId); +XML_DEPRECATED XMLPUBFUN void XMLCALL unparsedEntityDecl (void *ctx, const xmlChar *name, @@ -96,72 +113,86 @@ XMLPUBFUN void XMLCALL const xmlChar *systemId, const xmlChar *notationName); +XML_DEPRECATED XMLPUBFUN void XMLCALL startDocument (void *ctx); +XML_DEPRECATED XMLPUBFUN void XMLCALL endDocument (void *ctx); +XML_DEPRECATED XMLPUBFUN void XMLCALL attribute (void *ctx, const xmlChar *fullname, const xmlChar *value); +XML_DEPRECATED XMLPUBFUN void XMLCALL startElement (void *ctx, const xmlChar *fullname, const xmlChar **atts); +XML_DEPRECATED XMLPUBFUN void XMLCALL endElement (void *ctx, const xmlChar *name); +XML_DEPRECATED XMLPUBFUN void XMLCALL reference (void *ctx, const xmlChar *name); +XML_DEPRECATED XMLPUBFUN void XMLCALL characters (void *ctx, const xmlChar *ch, int len); +XML_DEPRECATED XMLPUBFUN void XMLCALL ignorableWhitespace (void *ctx, const xmlChar *ch, int len); +XML_DEPRECATED XMLPUBFUN void XMLCALL processingInstruction (void *ctx, const xmlChar *target, const xmlChar *data); +XML_DEPRECATED XMLPUBFUN void XMLCALL globalNamespace (void *ctx, const xmlChar *href, const xmlChar *prefix); +XML_DEPRECATED XMLPUBFUN void XMLCALL setNamespace (void *ctx, const xmlChar *name); +XML_DEPRECATED XMLPUBFUN xmlNsPtr XMLCALL getNamespace (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL checkNamespace (void *ctx, xmlChar *nameSpace); +XML_DEPRECATED XMLPUBFUN void XMLCALL namespaceDecl (void *ctx, const xmlChar *href, const xmlChar *prefix); +XML_DEPRECATED XMLPUBFUN void XMLCALL comment (void *ctx, const xmlChar *value); +XML_DEPRECATED XMLPUBFUN void XMLCALL cdataBlock (void *ctx, const xmlChar *value, int len); #ifdef LIBXML_SAX1_ENABLED +XML_DEPRECATED XMLPUBFUN void XMLCALL initxmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr, int warning); #ifdef LIBXML_HTML_ENABLED +XML_DEPRECATED XMLPUBFUN void XMLCALL inithtmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr); #endif -#ifdef LIBXML_DOCB_ENABLED -XMLPUBFUN void XMLCALL - initdocbDefaultSAXHandler (xmlSAXHandlerV1 *hdlr); -#endif #endif /* LIBXML_SAX1_ENABLED */ #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/libxml/SAX2.h b/sdk/include/reactos/libs/libxml/SAX2.h index a55212eb554..8e9b0b95fe5 100644 --- a/sdk/include/reactos/libs/libxml/SAX2.h +++ b/sdk/include/reactos/libs/libxml/SAX2.h @@ -16,7 +16,6 @@ #include <stdlib.h> #include <libxml/xmlversion.h> #include <libxml/parser.h> -#include <libxml/xlink.h> #ifdef __cplusplus extern "C" { @@ -99,8 +98,7 @@ XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL xmlSAX2EndDocument (void *ctx); #if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \ - defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || \ - defined(LIBXML_LEGACY_ENABLED) + defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) XMLPUBFUN void XMLCALL xmlSAX2StartElement (void *ctx, const xmlChar *fullname, @@ -161,15 +159,11 @@ XMLPUBFUN void XMLCALL #ifdef LIBXML_HTML_ENABLED XMLPUBFUN void XMLCALL xmlSAX2InitHtmlDefaultSAXHandler(xmlSAXHandler *hdlr); +XML_DEPRECATED XMLPUBFUN void XMLCALL htmlDefaultSAXHandlerInit (void); #endif -#ifdef LIBXML_DOCB_ENABLED -XMLPUBFUN void XMLCALL - xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr); -XMLPUBFUN void XMLCALL - docbDefaultSAXHandlerInit (void); -#endif +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlDefaultSAXHandlerInit (void); #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/libxml/dict.h b/sdk/include/reactos/libs/libxml/dict.h index cf54af1f252..91f74d1b8ff 100644 --- a/sdk/include/reactos/libs/libxml/dict.h +++ b/sdk/include/reactos/libs/libxml/dict.h @@ -27,6 +27,7 @@ typedef xmlDict *xmlDictPtr; /* * Initializer */ +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlInitializeDict(void); /* @@ -70,6 +71,7 @@ XMLPUBFUN int XMLCALL /* * Cleanup function */ +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlDictCleanup (void); diff --git a/sdk/include/reactos/libs/libxml/encoding.h b/sdk/include/reactos/libs/libxml/encoding.h index c875af6fb7c..381e1886bf8 100644 --- a/sdk/include/reactos/libs/libxml/encoding.h +++ b/sdk/include/reactos/libs/libxml/encoding.h @@ -27,9 +27,7 @@ #ifdef LIBXML_ICONV_ENABLED #include <iconv.h> #endif -#ifdef LIBXML_ICU_ENABLED -#include <unicode/ucnv.h> -#endif + #ifdef __cplusplus extern "C" { #endif @@ -128,19 +126,6 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen, * Block defining the handlers for non UTF-8 encodings. * If iconv is supported, there are two extra fields. */ -#ifdef LIBXML_ICU_ENABLED -/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */ -#define ICU_PIVOT_BUF_SIZE 1024 -struct _uconv_t { - UConverter *uconv; /* for conversion between an encoding and UTF-16 */ - UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */ - UChar pivot_buf[ICU_PIVOT_BUF_SIZE]; - UChar *pivot_source; - UChar *pivot_target; -}; -typedef struct _uconv_t uconv_t; -#endif - typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler; typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr; struct _xmlCharEncodingHandler { @@ -152,8 +137,8 @@ struct _xmlCharEncodingHandler { iconv_t iconv_out; #endif /* LIBXML_ICONV_ENABLED */ #ifdef LIBXML_ICU_ENABLED - uconv_t *uconv_in; - uconv_t *uconv_out; + struct _uconv_t *uconv_in; + struct _uconv_t *uconv_out; #endif /* LIBXML_ICU_ENABLED */ }; @@ -168,8 +153,10 @@ extern "C" { /* * Interfaces for encoding handlers. */ +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlInitCharEncodingHandlers (void); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlCleanupCharEncodingHandlers (void); XMLPUBFUN void XMLCALL diff --git a/sdk/include/reactos/libs/libxml/entities.h b/sdk/include/reactos/libs/libxml/entities.h index 47b4573eba6..2b60d9e6228 100644 --- a/sdk/include/reactos/libs/libxml/entities.h +++ b/sdk/include/reactos/libs/libxml/entities.h @@ -75,6 +75,7 @@ typedef xmlEntitiesTable *xmlEntitiesTablePtr; */ #ifdef LIBXML_LEGACY_ENABLED +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlInitializePredefinedEntities (void); #endif /* LIBXML_LEGACY_ENABLED */ @@ -112,6 +113,7 @@ XMLPUBFUN xmlEntityPtr XMLCALL xmlGetParameterEntity (xmlDocPtr doc, const xmlChar *name); #ifdef LIBXML_LEGACY_ENABLED +XML_DEPRECATED XMLPUBFUN const xmlChar * XMLCALL xmlEncodeEntities (xmlDocPtr doc, const xmlChar *input); diff --git a/sdk/include/reactos/libs/libxml/globals.h b/sdk/include/reactos/libs/libxml/globals.h index 5e41b7bb5f8..d57ccb05415 100644 --- a/sdk/include/reactos/libs/libxml/globals.h +++ b/sdk/include/reactos/libs/libxml/globals.h @@ -24,7 +24,9 @@ extern "C" { #endif +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlInitGlobals(void); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlCleanupGlobals(void); /** @@ -67,7 +69,6 @@ XMLCALL xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc * compatibility support. */ -#undef docbDefaultSAXHandler #undef htmlDefaultSAXHandler #undef oldXMLWDcompatibility #undef xmlBufferAllocScheme @@ -124,7 +125,7 @@ struct _xmlGlobalState xmlSAXLocator xmlDefaultSAXLocator; xmlSAXHandlerV1 xmlDefaultSAXHandler; - xmlSAXHandlerV1 docbDefaultSAXHandler; + xmlSAXHandlerV1 docbDefaultSAXHandler; /* unused */ xmlSAXHandlerV1 htmlDefaultSAXHandler; xmlFreeFunc xmlFree; @@ -251,16 +252,6 @@ XMLPUBVAR xmlFreeFunc xmlFree; XMLPUBVAR xmlStrdupFunc xmlMemStrdup; #endif /* LIBXML_THREAD_ALLOC_ENABLED */ -#ifdef LIBXML_DOCB_ENABLED -XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __docbDefaultSAXHandler(void); -#ifdef LIBXML_THREAD_ENABLED -#define docbDefaultSAXHandler \ -(*(__docbDefaultSAXHandler())) -#else -XMLPUBVAR xmlSAXHandlerV1 docbDefaultSAXHandler; -#endif -#endif - #ifdef LIBXML_HTML_ENABLED XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void); #ifdef LIBXML_THREAD_ENABLED diff --git a/sdk/include/reactos/libs/libxml/nanoftp.h b/sdk/include/reactos/libs/libxml/nanoftp.h index 7335faf1075..f39bde5be07 100644 --- a/sdk/include/reactos/libs/libxml/nanoftp.h +++ b/sdk/include/reactos/libs/libxml/nanoftp.h @@ -1,7 +1,8 @@ /* * Summary: minimal FTP implementation * Description: minimal FTP implementation allowing to fetch resources - * like external subset. + * like external subset. This module is DEPRECATED, do not + * use any of its functions. * * Copy: See Copyright for the status of this software. * @@ -16,7 +17,7 @@ #ifdef LIBXML_FTP_ENABLED /* Needed for portability to Windows 64 bits */ -#if defined(_WIN32) && !defined(__CYGWIN__) +#if defined(_WIN32) #include <winsock2.h> #else /** @@ -78,40 +79,52 @@ typedef void (*ftpDataCallback) (void *userData, /* * Init */ +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlNanoFTPInit (void); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlNanoFTPCleanup (void); /* * Creating/freeing contexts. */ +XML_DEPRECATED XMLPUBFUN void * XMLCALL xmlNanoFTPNewCtxt (const char *URL); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlNanoFTPFreeCtxt (void * ctx); +XML_DEPRECATED XMLPUBFUN void * XMLCALL xmlNanoFTPConnectTo (const char *server, int port); /* * Opening/closing session connections. */ +XML_DEPRECATED XMLPUBFUN void * XMLCALL xmlNanoFTPOpen (const char *URL); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPConnect (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPClose (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPQuit (void *ctx); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlNanoFTPScanProxy (const char *URL); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlNanoFTPProxy (const char *host, int port, const char *user, const char *passwd, int type); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPUpdateURL (void *ctx, const char *URL); @@ -119,38 +132,48 @@ XMLPUBFUN int XMLCALL /* * Rather internal commands. */ +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPGetResponse (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPCheckResponse (void *ctx); /* * CD/DIR/GET handlers. */ +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPCwd (void *ctx, const char *directory); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPDele (void *ctx, const char *file); +XML_DEPRECATED XMLPUBFUN SOCKET XMLCALL xmlNanoFTPGetConnection (void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPCloseConnection(void *ctx); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPList (void *ctx, ftpListCallback callback, void *userData, const char *filename); +XML_DEPRECATED XMLPUBFUN SOCKET XMLCALL xmlNanoFTPGetSocket (void *ctx, const char *filename); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPGet (void *ctx, ftpDataCallback callback, void *userData, const char *filename); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlNanoFTPRead (void *ctx, void *dest, diff --git a/sdk/include/reactos/libs/libxml/parser.h b/sdk/include/reactos/libs/libxml/parser.h index 0ba1c387a97..82c61d67e92 100644 --- a/sdk/include/reactos/libs/libxml/parser.h +++ b/sdk/include/reactos/libs/libxml/parser.h @@ -10,8 +10,6 @@ #ifndef __XML_PARSER_H__ #define __XML_PARSER_H__ -#include <stdarg.h> - #include <libxml/xmlversion.h> #include <libxml/tree.h> #include <libxml/dict.h> @@ -192,7 +190,7 @@ struct _xmlParserCtxt { const xmlChar *version; /* the XML version string */ const xmlChar *encoding; /* the declared encoding, if any */ int standalone; /* standalone document */ - int html; /* an HTML(1)/Docbook(2) document + int html; /* an HTML(1) document * 3 is HTML after <head> * 10 is HTML after <body> */ @@ -996,13 +994,16 @@ XMLPUBFUN xmlParserCtxtPtr XMLCALL /* * Reading/setting optional parsing features. */ +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlGetFeaturesList (int *len, const char **result); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlGetFeature (xmlParserCtxtPtr ctxt, const char *name, void *result); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlSetFeature (xmlParserCtxtPtr ctxt, const char *name, diff --git a/sdk/include/reactos/libs/libxml/parserInternals.h b/sdk/include/reactos/libs/libxml/parserInternals.h index 1f26ce20810..656ee4625c3 100644 --- a/sdk/include/reactos/libs/libxml/parserInternals.h +++ b/sdk/include/reactos/libs/libxml/parserInternals.h @@ -339,6 +339,7 @@ XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL xmlSwitchToEncoding (xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlSwitchInputEncoding (xmlParserCtxtPtr ctxt, xmlParserInputPtr input, @@ -574,6 +575,7 @@ XMLPUBFUN void XMLCALL xmlParserInputShrink (xmlParserInputPtr in); /* * Actually comes from the HTML parser but launched from the init stuff. */ +XML_DEPRECATED XMLPUBFUN void XMLCALL htmlInitAutoClose (void); XMLPUBFUN htmlParserCtxtPtr XMLCALL htmlCreateFileParserCtxt(const char *filename, const char *encoding); @@ -597,25 +599,34 @@ typedef void (*xmlEntityReferenceFunc) (xmlEntityPtr ent, xmlNodePtr firstNode, xmlNodePtr lastNode); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlSetEntityReferenceFunc (xmlEntityReferenceFunc func); +XML_DEPRECATED XMLPUBFUN xmlChar * XMLCALL xmlParseQuotedString (xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlParseNamespace (xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN xmlChar * XMLCALL xmlNamespaceParseNSDef (xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN xmlChar * XMLCALL xmlScanName (xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN xmlChar * XMLCALL xmlNamespaceParseNCName (xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlParserHandleReference(xmlParserCtxtPtr ctxt); +XML_DEPRECATED XMLPUBFUN xmlChar * XMLCALL xmlNamespaceParseQName (xmlParserCtxtPtr ctxt, xmlChar **prefix); /** * Entities */ +XML_DEPRECATED XMLPUBFUN xmlChar * XMLCALL xmlDecodeEntities (xmlParserCtxtPtr ctxt, int len, @@ -623,6 +634,7 @@ XMLPUBFUN xmlChar * XMLCALL xmlChar end, xmlChar end2, xmlChar end3); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlHandleEntity (xmlParserCtxtPtr ctxt, xmlEntityPtr entity); diff --git a/sdk/include/reactos/libs/libxml/relaxng.h b/sdk/include/reactos/libs/libxml/relaxng.h index f269c9ec0db..6369785cef0 100644 --- a/sdk/include/reactos/libs/libxml/relaxng.h +++ b/sdk/include/reactos/libs/libxml/relaxng.h @@ -118,6 +118,7 @@ typedef enum { XMLPUBFUN int XMLCALL xmlRelaxNGInitTypes (void); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlRelaxNGCleanupTypes (void); diff --git a/sdk/include/reactos/libs/libxml/schematron.h b/sdk/include/reactos/libs/libxml/schematron.h index 364eaecde6b..c61e61b3cf5 100644 --- a/sdk/include/reactos/libs/libxml/schematron.h +++ b/sdk/include/reactos/libs/libxml/schematron.h @@ -1,5 +1,5 @@ /* - * Summary: XML Schemastron implementation + * Summary: XML Schematron implementation * Description: interface to the XML Schematron validity checking. * * Copy: See Copyright for the status of this software. diff --git a/sdk/include/reactos/libs/libxml/threads.h b/sdk/include/reactos/libs/libxml/threads.h index 9969ae7cfd0..6eedac1f374 100644 --- a/sdk/include/reactos/libs/libxml/threads.h +++ b/sdk/include/reactos/libs/libxml/threads.h @@ -57,6 +57,7 @@ XMLPUBFUN void XMLCALL /* * Library wide APIs. */ +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlInitThreads (void); XMLPUBFUN void XMLCALL @@ -67,6 +68,7 @@ XMLPUBFUN int XMLCALL xmlGetThreadId (void); XMLPUBFUN int XMLCALL xmlIsMainThread (void); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlCleanupThreads(void); XMLPUBFUN xmlGlobalStatePtr XMLCALL diff --git a/sdk/include/reactos/libs/libxml/tree.h b/sdk/include/reactos/libs/libxml/tree.h index 1e79be92ea9..98e208745a9 100644 --- a/sdk/include/reactos/libs/libxml/tree.h +++ b/sdk/include/reactos/libs/libxml/tree.h @@ -177,11 +177,11 @@ typedef enum { XML_NAMESPACE_DECL= 18, XML_XINCLUDE_START= 19, XML_XINCLUDE_END= 20 -#ifdef LIBXML_DOCB_ENABLED - ,XML_DOCB_DOCUMENT_NODE= 21 -#endif + /* XML_DOCB_DOCUMENT_NODE= 21 */ /* removed */ } xmlElementType; +/* For backward compatibility */ +#define XML_DOCB_DOCUMENT_NODE 21 /** * xmlNotation: @@ -659,7 +659,7 @@ struct _xmlDOMWrapCtxt { defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || \ defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || \ defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || \ - defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) + defined(LIBXML_LEGACY_ENABLED) XMLPUBFUN int XMLCALL xmlValidateNCName (const xmlChar *value, int space); @@ -763,6 +763,7 @@ XMLPUBFUN xmlDtdPtr XMLCALL XMLPUBFUN void XMLCALL xmlFreeDtd (xmlDtdPtr cur); #ifdef LIBXML_LEGACY_ENABLED +XML_DEPRECATED XMLPUBFUN xmlNsPtr XMLCALL xmlNewGlobalNs (xmlDocPtr doc, const xmlChar *href, diff --git a/sdk/include/reactos/libs/libxml/valid.h b/sdk/include/reactos/libs/libxml/valid.h index 2bc7b380c1e..3eaf84adcb4 100644 --- a/sdk/include/reactos/libs/libxml/valid.h +++ b/sdk/include/reactos/libs/libxml/valid.h @@ -60,17 +60,17 @@ typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx, #ifdef IN_LIBXML /** - * XML_CTXT_FINISH_DTD_0: + * XML_VCTXT_DTD_VALIDATED: * - * Special value for finishDtd field when embedded in an xmlParserCtxt + * Set after xmlValidateDtdFinal was called. */ -#define XML_CTXT_FINISH_DTD_0 0xabcd1234 +#define XML_VCTXT_DTD_VALIDATED (1u << 0) /** - * XML_CTXT_FINISH_DTD_1: + * XML_VCTXT_USE_PCTXT: * - * Special value for finishDtd field when embedded in an xmlParserCtxt + * Set if the validation context is part of a parser context. */ -#define XML_CTXT_FINISH_DTD_1 0xabcd1235 +#define XML_VCTXT_USE_PCTXT (1u << 1) #endif /* @@ -90,7 +90,7 @@ struct _xmlValidCtxt { int nodeMax; /* Max depth of the parsing stack */ xmlNodePtr *nodeTab; /* array of nodes */ - unsigned int finishDtd; /* finished validating the Dtd ? */ + unsigned int flags; /* internal flags */ xmlDocPtr doc; /* the document */ int valid; /* temporary validity check result */ @@ -283,20 +283,25 @@ XMLPUBFUN int XMLCALL xmlAttrPtr attr); /* IDREFs */ +XML_DEPRECATED XMLPUBFUN xmlRefPtr XMLCALL xmlAddRef (xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value, xmlAttrPtr attr); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlFreeRefTable (xmlRefTablePtr table); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlIsRef (xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr); +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlRemoveRef (xmlDocPtr doc, xmlAttrPtr attr); +XML_DEPRECATED XMLPUBFUN xmlListPtr XMLCALL xmlGetRefs (xmlDocPtr doc, const xmlChar *ID); diff --git a/sdk/include/reactos/libs/libxml/xmlerror.h b/sdk/include/reactos/libs/libxml/xmlerror.h index c1019971f24..ee95be9c9c2 100644 --- a/sdk/include/reactos/libs/libxml/xmlerror.h +++ b/sdk/include/reactos/libs/libxml/xmlerror.h @@ -209,6 +209,7 @@ typedef enum { XML_ERR_VERSION_MISMATCH, /* 109 */ XML_ERR_NAME_TOO_LONG, /* 110 */ XML_ERR_USER_STOP, /* 111 */ + XML_ERR_COMMENT_ABRUPTLY_ENDED, /* 112 */ XML_NS_ERR_XML_NAMESPACE = 200, XML_NS_ERR_UNDEFINED_NAMESPACE, /* 201 */ XML_NS_ERR_QNAME, /* 202 */ @@ -259,6 +260,7 @@ typedef enum { XML_DTD_DUP_TOKEN, /* 541 */ XML_HTML_STRUCURE_ERROR = 800, XML_HTML_UNKNOWN_TAG, /* 801 */ + XML_HTML_INCORRECTLY_OPENED_COMMENT, /* 802 */ XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000, XML_RNGP_ATTR_CONFLICT, /* 1001 */ XML_RNGP_ATTRIBUTE_CHILDREN, /* 1002 */ diff --git a/sdk/include/reactos/libs/libxml/xmlmemory.h b/sdk/include/reactos/libs/libxml/xmlmemory.h index 17e375a3c9a..ae2a4275a3b 100644 --- a/sdk/include/reactos/libs/libxml/xmlmemory.h +++ b/sdk/include/reactos/libs/libxml/xmlmemory.h @@ -126,12 +126,14 @@ XMLPUBFUN int XMLCALL /* * Initialization of the memory layer. */ +XML_DEPRECATED XMLPUBFUN int XMLCALL xmlInitMemory (void); /* * Cleanup of the memory layer. */ +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlCleanupMemory (void); /* diff --git a/sdk/include/reactos/libs/libxml/xmlschemastypes.h b/sdk/include/reactos/libs/libxml/xmlschemastypes.h index 35d48d414be..5d588f92ea3 100644 --- a/sdk/include/reactos/libs/libxml/xmlschemastypes.h +++ b/sdk/include/reactos/libs/libxml/xmlschemastypes.h @@ -32,6 +32,7 @@ typedef enum { XMLPUBFUN void XMLCALL xmlSchemaInitTypes (void); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlSchemaCleanupTypes (void); XMLPUBFUN xmlSchemaTypePtr XMLCALL diff --git a/sdk/include/reactos/libs/libxml/xmlversion.h b/sdk/include/reactos/libs/libxml/xmlversion.h index 9cd054df70e..ad9a2cb82b6 100644 --- a/sdk/include/reactos/libs/libxml/xmlversion.h +++ b/sdk/include/reactos/libs/libxml/xmlversion.h @@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.9.14" +#define LIBXML_DOTTED_VERSION "2.10.0" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 20914 +#define LIBXML_VERSION 21000 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "20914" +#define LIBXML_VERSION_STRING "21000" /** * LIBXML_VERSION_EXTRA: * * extra version information, used to show a git commit description */ -#define LIBXML_VERSION_EXTRA "-GITv2.9.13-22-g7846b0a67" +#define LIBXML_VERSION_EXTRA "-GITv2.9.13-209-gae383bdb7" /** * LIBXML_TEST_VERSION: @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20914); +#define LIBXML_TEST_VERSION xmlCheckVersion(21000); #ifndef VMS #if 0 @@ -171,7 +171,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the FTP support is configured in */ -#if 1 +#if 0 #define LIBXML_FTP_ENABLED #endif @@ -207,7 +207,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the deprecated APIs are compiled in for compatibility */ -#if 1 +#if 0 #define LIBXML_LEGACY_ENABLED #endif @@ -229,15 +229,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); #define LIBXML_CATALOG_ENABLED #endif -/** - * LIBXML_DOCB_ENABLED: - * - * Whether the SGML Docbook support is configured in - */ -#if 1 -#define LIBXML_DOCB_ENABLED -#endif - /** * LIBXML_XPATH_ENABLED: * @@ -256,6 +247,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); #define LIBXML_XPTR_ENABLED #endif +/** + * LIBXML_XPTR_LOCS_ENABLED: + * + * Whether support for XPointer locations is configured in + */ +#if 0 +#define LIBXML_XPTR_LOCS_ENABLED +#endif + /** * LIBXML_XINCLUDE_ENABLED: * @@ -456,6 +456,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); # define LIBXML_ATTR_FORMAT(fmt,args) #endif +#ifndef XML_DEPRECATED +# ifdef IN_LIBXML +# define XML_DEPRECATED +# else +/* Available since at least GCC 3.1 */ +# define XML_DEPRECATED __attribute__((deprecated)) +# endif +#endif + #else /* ! __GNUC__ */ /** * ATTRIBUTE_UNUSED: @@ -475,6 +484,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro used to indicate to GCC the parameter are printf like */ #define LIBXML_ATTR_FORMAT(fmt,args) +/** + * XML_DEPRECATED: + * + * Macro used to indicate that a function, variable, type or struct member + * is deprecated. + */ +#ifndef XML_DEPRECATED +#define XML_DEPRECATED +#endif #endif /* __GNUC__ */ #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/libxml/xmlversion.h.in b/sdk/include/reactos/libs/libxml/xmlversion.h.in index f9f79a2f2ac..bdebfe3b0c9 100644 --- a/sdk/include/reactos/libs/libxml/xmlversion.h.in +++ b/sdk/include/reactos/libs/libxml/xmlversion.h.in @@ -229,15 +229,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); #define LIBXML_CATALOG_ENABLED #endif -/** - * LIBXML_DOCB_ENABLED: - * - * Whether the SGML Docbook support is configured in - */ -#if @WITH_DOCB@ -#define LIBXML_DOCB_ENABLED -#endif - /** * LIBXML_XPATH_ENABLED: * @@ -256,6 +247,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); #define LIBXML_XPTR_ENABLED #endif +/** + * LIBXML_XPTR_LOCS_ENABLED: + * + * Whether support for XPointer locations is configured in + */ +#if @WITH_XPTR_LOCS@ +#define LIBXML_XPTR_LOCS_ENABLED +#endif + /** * LIBXML_XINCLUDE_ENABLED: * @@ -456,6 +456,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); # define LIBXML_ATTR_FORMAT(fmt,args) #endif +#ifndef XML_DEPRECATED +# ifdef IN_LIBXML +# define XML_DEPRECATED +# else +/* Available since at least GCC 3.1 */ +# define XML_DEPRECATED __attribute__((deprecated)) +# endif +#endif + #else /* ! __GNUC__ */ /** * ATTRIBUTE_UNUSED: @@ -475,6 +484,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro used to indicate to GCC the parameter are printf like */ #define LIBXML_ATTR_FORMAT(fmt,args) +/** + * XML_DEPRECATED: + * + * Macro used to indicate that a function, variable, type or struct member + * is deprecated. + */ +#ifndef XML_DEPRECATED +#define XML_DEPRECATED +#endif #endif /* __GNUC__ */ #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/libxml/xpath.h b/sdk/include/reactos/libs/libxml/xpath.h index 539593fa506..bfbc5d6d995 100644 --- a/sdk/include/reactos/libs/libxml/xpath.h +++ b/sdk/include/reactos/libs/libxml/xpath.h @@ -104,13 +104,23 @@ typedef enum { XPATH_BOOLEAN = 2, XPATH_NUMBER = 3, XPATH_STRING = 4, +#ifdef LIBXML_XPTR_LOCS_ENABLED XPATH_POINT = 5, XPATH_RANGE = 6, XPATH_LOCATIONSET = 7, +#endif XPATH_USERS = 8, XPATH_XSLT_TREE = 9 /* An XSLT value tree, non modifiable */ } xmlXPathObjectType; +#ifndef LIBXML_XPTR_LOCS_ENABLED +/** DOC_DISABLE */ +#define XPATH_POINT 5 +#define XPATH_RANGE 6 +#define XPATH_LOCATIONSET 7 +/** DOC_ENABLE */ +#endif + typedef struct _xmlXPathObject xmlXPathObject; typedef xmlXPathObject *xmlXPathObjectPtr; struct _xmlXPathObject { @@ -549,6 +559,7 @@ XMLPUBFUN void XMLCALL xmlXPathFreeCompExpr (xmlXPathCompExprPtr comp); #endif /* LIBXML_XPATH_ENABLED */ #if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPathInit (void); XMLPUBFUN int XMLCALL diff --git a/sdk/include/reactos/libs/libxml/xpointer.h b/sdk/include/reactos/libs/libxml/xpointer.h index b99112b87a1..ca7bdbe085f 100644 --- a/sdk/include/reactos/libs/libxml/xpointer.h +++ b/sdk/include/reactos/libs/libxml/xpointer.h @@ -28,6 +28,7 @@ extern "C" { #endif +#ifdef LIBXML_XPTR_LOCS_ENABLED /* * A Location Set */ @@ -43,51 +44,68 @@ struct _xmlLocationSet { * Handling of location sets. */ +XML_DEPRECATED XMLPUBFUN xmlLocationSetPtr XMLCALL xmlXPtrLocationSetCreate (xmlXPathObjectPtr val); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPtrFreeLocationSet (xmlLocationSetPtr obj); +XML_DEPRECATED XMLPUBFUN xmlLocationSetPtr XMLCALL xmlXPtrLocationSetMerge (xmlLocationSetPtr val1, xmlLocationSetPtr val2); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewRange (xmlNodePtr start, int startindex, xmlNodePtr end, int endindex); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewRangePoints (xmlXPathObjectPtr start, xmlXPathObjectPtr end); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewRangeNodePoint (xmlNodePtr start, xmlXPathObjectPtr end); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewRangePointNode (xmlXPathObjectPtr start, xmlNodePtr end); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewRangeNodes (xmlNodePtr start, xmlNodePtr end); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewLocationSetNodes (xmlNodePtr start, xmlNodePtr end); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewLocationSetNodeSet(xmlNodeSetPtr set); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewRangeNodeObject (xmlNodePtr start, xmlXPathObjectPtr end); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrNewCollapsedRange (xmlNodePtr start); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPtrLocationSetAdd (xmlLocationSetPtr cur, xmlXPathObjectPtr val); +XML_DEPRECATED XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrWrapLocationSet (xmlLocationSetPtr val); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPtrLocationSetDel (xmlLocationSetPtr cur, xmlXPathObjectPtr val); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPtrLocationSetRemove (xmlLocationSetPtr cur, int val); +#endif /* LIBXML_XPTR_LOCS_ENABLED */ /* * Functions. @@ -99,13 +117,18 @@ XMLPUBFUN xmlXPathContextPtr XMLCALL XMLPUBFUN xmlXPathObjectPtr XMLCALL xmlXPtrEval (const xmlChar *str, xmlXPathContextPtr ctx); +#ifdef LIBXML_XPTR_LOCS_ENABLED +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPtrRangeToFunction (xmlXPathParserContextPtr ctxt, int nargs); +XML_DEPRECATED XMLPUBFUN xmlNodePtr XMLCALL xmlXPtrBuildNodeList (xmlXPathObjectPtr obj); +XML_DEPRECATED XMLPUBFUN void XMLCALL xmlXPtrEvalRangePredicate (xmlXPathParserContextPtr ctxt); +#endif /* LIBXML_XPTR_LOCS_ENABLED */ #ifdef __cplusplus } #endif diff --git a/sdk/lib/3rdparty/libxml2/CMakeLists.txt b/sdk/lib/3rdparty/libxml2/CMakeLists.txt index e56e434d3e8..ba32c6a732a 100644 --- a/sdk/lib/3rdparty/libxml2/CMakeLists.txt +++ b/sdk/lib/3rdparty/libxml2/CMakeLists.txt @@ -23,7 +23,6 @@ list(APPEND SOURCE chvalid.c debugXML.c dict.c - DOCBparser.c encoding.c entities.c error.c diff --git a/sdk/lib/3rdparty/libxml2/COPYING b/sdk/lib/3rdparty/libxml2/COPYING deleted file mode 100644 index d61318502ca..00000000000 --- a/sdk/lib/3rdparty/libxml2/COPYING +++ /dev/null @@ -1,23 +0,0 @@ -Except where otherwise noted in the source code (e.g. the files hash.c, -list.c and the trio files, which are covered by a similar licence but -with different Copyright notices) all the files are: - - Copyright (C) 1998-2012 Daniel Veillard. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/sdk/lib/3rdparty/libxml2/DOCBparser.c b/sdk/lib/3rdparty/libxml2/DOCBparser.c deleted file mode 100644 index f12511b9e8a..00000000000 --- a/sdk/lib/3rdparty/libxml2/DOCBparser.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * DOCBparser.c : an attempt to parse SGML Docbook documents - * - * This is deprecated !!! - * Code removed with release 2.6.0 it was broken. - * The doc are expect to be migrated to XML DocBook - * - * See Copyright for the status of this software. - * - * daniel(a)veillard.com - */ - -#define IN_LIBXML -#include "libxml.h" -#ifdef LIBXML_DOCB_ENABLED - -#include <libxml/xmlerror.h> -#include <libxml/DOCBparser.h> - -/** - * docbEncodeEntities: - * @out: a pointer to an array of bytes to store the result - * @outlen: the length of @out - * @in: a pointer to an array of UTF-8 chars - * @inlen: the length of @in - * @quoteChar: the quote character to escape (' or ") or zero. - * - * Take a block of UTF-8 chars in and try to convert it to an ASCII - * plus SGML entities block of chars out. - * - * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise - * The value of @inlen after return is the number of octets consumed - * as the return value is positive, else unpredictable. - * The value of @outlen after return is the number of octets consumed. - */ -int -docbEncodeEntities(unsigned char *out ATTRIBUTE_UNUSED, - int *outlen ATTRIBUTE_UNUSED, - const unsigned char *in ATTRIBUTE_UNUSED, - int *inlen ATTRIBUTE_UNUSED, - int quoteChar ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbEncodeEntities() deprecated function reached\n"); - deprecated = 1; - } - return(-1); -} - -/** - * docbParseDocument: - * @ctxt: an SGML parser context - * - * parse an SGML document (and build a tree if using the standard SAX - * interface). - * - * Returns 0, -1 in case of error. the parser context is augmented - * as a result of the parsing. - */ - -int -docbParseDocument(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbParseDocument() deprecated function reached\n"); - deprecated = 1; - } - return (xmlParseDocument(ctxt)); -} - -/** - * docbFreeParserCtxt: - * @ctxt: an SGML parser context - * - * Free all the memory used by a parser context. However the parsed - * document in ctxt->myDoc is not freed. - */ - -void -docbFreeParserCtxt(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbFreeParserCtxt() deprecated function reached\n"); - deprecated = 1; - } - xmlFreeParserCtxt(ctxt); -} - -/** - * docbParseChunk: - * @ctxt: an XML parser context - * @chunk: an char array - * @size: the size in byte of the chunk - * @terminate: last chunk indicator - * - * Parse a Chunk of memory - * - * Returns zero if no error, the xmlParserErrors otherwise. - */ -int -docbParseChunk(docbParserCtxtPtr ctxt ATTRIBUTE_UNUSED, - const char *chunk ATTRIBUTE_UNUSED, - int size ATTRIBUTE_UNUSED, - int terminate ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbParseChunk() deprecated function reached\n"); - deprecated = 1; - } - - return (xmlParseChunk(ctxt, chunk, size, terminate)); -} - -/** - * docbCreatePushParserCtxt: - * @sax: a SAX handler - * @user_data: The user data returned on SAX callbacks - * @chunk: a pointer to an array of chars - * @size: number of chars in the array - * @filename: an optional file name or URI - * @enc: an optional encoding - * - * Create a parser context for using the DocBook SGML parser in push mode - * To allow content encoding detection, @size should be >= 4 - * The value of @filename is used for fetching external entities - * and error/warning reports. - * - * Returns the new parser context or NULL - */ -docbParserCtxtPtr -docbCreatePushParserCtxt(docbSAXHandlerPtr sax ATTRIBUTE_UNUSED, - void *user_data ATTRIBUTE_UNUSED, - const char *chunk ATTRIBUTE_UNUSED, - int size ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, - xmlCharEncoding enc ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbParseChunk() deprecated function reached\n"); - deprecated = 1; - } - - return(xmlCreatePushParserCtxt(sax, user_data, chunk, size, filename)); -} - -/** - * docbSAXParseDoc: - * @cur: a pointer to an array of xmlChar - * @encoding: a free form C string describing the SGML document encoding, or NULL - * @sax: the SAX handler block - * @userData: if using SAX, this pointer will be provided on callbacks. - * - * parse an SGML in-memory document and build a tree. - * It use the given SAX function block to handle the parsing callback. - * If sax is NULL, fallback to the default DOM tree building routines. - * - * Returns the resulting document tree - */ - -docbDocPtr -docbSAXParseDoc(xmlChar * cur ATTRIBUTE_UNUSED, - const char *encoding ATTRIBUTE_UNUSED, - docbSAXHandlerPtr sax ATTRIBUTE_UNUSED, - void *userData ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbParseChunk() deprecated function reached\n"); - deprecated = 1; - } - - return (xmlSAXParseMemoryWithData(sax, (const char *)cur, - xmlStrlen((const xmlChar *) cur), 0, userData)); -} - -/** - * docbParseDoc: - * @cur: a pointer to an array of xmlChar - * @encoding: a free form C string describing the SGML document encoding, or NULL - * - * parse an SGML in-memory document and build a tree. - * - * Returns the resulting document tree - */ - -docbDocPtr -docbParseDoc(xmlChar * cur ATTRIBUTE_UNUSED, - const char *encoding ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbParseChunk() deprecated function reached\n"); - deprecated = 1; - } - - return (xmlParseDoc(cur)); -} - - -/** - * docbCreateFileParserCtxt: - * @filename: the filename - * @encoding: the SGML document encoding, or NULL - * - * Create a parser context for a file content. - * Automatic support for ZLIB/Compress compressed document is provided - * by default if found at compile-time. - * - * Returns the new parser context or NULL - */ -docbParserCtxtPtr -docbCreateFileParserCtxt(const char *filename ATTRIBUTE_UNUSED, - const char *encoding ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbCreateFileParserCtxt() deprecated function reached\n"); - deprecated = 1; - } - - return (xmlCreateFileParserCtxt(filename)); -} - -/** - * docbSAXParseFile: - * @filename: the filename - * @encoding: a free form C string describing the SGML document encoding, or NULL - * @sax: the SAX handler block - * @userData: if using SAX, this pointer will be provided on callbacks. - * - * parse an SGML file and build a tree. Automatic support for ZLIB/Compress - * compressed document is provided by default if found at compile-time. - * It use the given SAX function block to handle the parsing callback. - * If sax is NULL, fallback to the default DOM tree building routines. - * - * Returns the resulting document tree - */ - -docbDocPtr -docbSAXParseFile(const char *filename ATTRIBUTE_UNUSED, - const char *encoding ATTRIBUTE_UNUSED, - docbSAXHandlerPtr sax ATTRIBUTE_UNUSED, - void *userData ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbSAXParseFile() deprecated function reached\n"); - deprecated = 1; - } - - return (xmlSAXParseFileWithData(sax, filename, 0, userData)); -} - -/** - * docbParseFile: - * @filename: the filename - * @encoding: a free form C string describing document encoding, or NULL - * - * parse a Docbook SGML file and build a tree. Automatic support for - * ZLIB/Compress compressed document is provided by default if found - * at compile-time. - * - * Returns the resulting document tree - */ - -docbDocPtr -docbParseFile(const char *filename ATTRIBUTE_UNUSED, - const char *encoding ATTRIBUTE_UNUSED) -{ - static int deprecated = 0; - - if (!deprecated) { - xmlGenericError(xmlGenericErrorContext, - "docbParseFile() deprecated function reached\n"); - deprecated = 1; - } - - return (xmlParseFile(filename)); -} -#define bottom_DOCBparser -#include "elfgcchack.h" -#endif /* LIBXML_DOCB_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/HTMLparser.c b/sdk/lib/3rdparty/libxml2/HTMLparser.c index e720bb2013d..abc4e90575c 100644 --- a/sdk/lib/3rdparty/libxml2/HTMLparser.c +++ b/sdk/lib/3rdparty/libxml2/HTMLparser.c @@ -11,24 +11,8 @@ #ifdef LIBXML_HTML_ENABLED #include <string.h> -#ifdef HAVE_CTYPE_H #include <ctype.h> -#endif -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef LIBXML_ZLIB_ENABLED -#include <zlib.h> -#endif #include <libxml/xmlmemory.h> #include <libxml/tree.h> @@ -1411,6 +1395,9 @@ static const elementPriority htmlEndPriority[] = { /** * htmlInitAutoClose: * + * DEPRECATED: This function will be made private. Call xmlInitParser to + * initialize the library. + * * This is a no-op now. */ void @@ -2558,6 +2545,21 @@ htmlNewDoc(const xmlChar *URI, const xmlChar *ExternalID) { static const xmlChar * htmlParseNameComplex(xmlParserCtxtPtr ctxt); +static void +htmlSkipBogusComment(htmlParserCtxtPtr ctxt) { + int c; + + htmlParseErr(ctxt, XML_HTML_INCORRECTLY_OPENED_COMMENT, + "Incorrectly opened comment\n", NULL, NULL); + + do { + c = CUR; + if (c == 0) + break; + NEXT; + } while (c != '>'); +} + /** * htmlParseHTMLName: * @ctxt: an HTML parser context @@ -3488,10 +3490,20 @@ htmlParseComment(htmlParserCtxtPtr ctxt) { q = CUR_CHAR(ql); if (q == 0) goto unfinished; + if (q == '>') { + htmlParseErr(ctxt, XML_ERR_COMMENT_ABRUPTLY_ENDED, "Comment abruptly ended", NULL, NULL); + cur = '>'; + goto finished; + } NEXTL(ql); r = CUR_CHAR(rl); if (r == 0) goto unfinished; + if (q == '-' && r == '>') { + htmlParseErr(ctxt, XML_ERR_COMMENT_ABRUPTLY_ENDED, "Comment abruptly ended", NULL, NULL); + cur = '>'; + goto finished; + } NEXTL(rl); cur = CUR_CHAR(l); while ((cur != 0) && @@ -3539,6 +3551,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) { cur = next; l = nl; } +finished: buf[len] = 0; if (cur == '>') { NEXT; @@ -4380,72 +4393,74 @@ htmlParseContent(htmlParserCtxtPtr ctxt) { * Handle SCRIPT/STYLE separately */ htmlParseScript(ctxt); - } else { - /* - * Sometimes DOCTYPE arrives in the middle of the document - */ - if ((CUR == '<') && (NXT(1) == '!') && - (UPP(2) == 'D') && (UPP(3) == 'O') && - (UPP(4) == 'C') && (UPP(5) == 'T') && - (UPP(6) == 'Y') && (UPP(7) == 'P') && - (UPP(8) == 'E')) { - htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, - "Misplaced DOCTYPE declaration\n", - BAD_CAST "DOCTYPE" , NULL); - htmlParseDocTypeDecl(ctxt); - } + } - /* - * First case : a comment - */ - if ((CUR == '<') && (NXT(1) == '!') && - (NXT(2) == '-') && (NXT(3) == '-')) { - htmlParseComment(ctxt); - } + else if ((CUR == '<') && (NXT(1) == '!')) { + /* + * Sometimes DOCTYPE arrives in the middle of the document + */ + if ((UPP(2) == 'D') && (UPP(3) == 'O') && + (UPP(4) == 'C') && (UPP(5) == 'T') && + (UPP(6) == 'Y') && (UPP(7) == 'P') && + (UPP(8) == 'E')) { + htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, + "Misplaced DOCTYPE declaration\n", + BAD_CAST "DOCTYPE" , NULL); + htmlParseDocTypeDecl(ctxt); + } + /* + * First case : a comment + */ + else if ((NXT(2) == '-') && (NXT(3) == '-')) { + htmlParseComment(ctxt); + } + else { + htmlSkipBogusComment(ctxt); + } + } - /* - * Second case : a Processing Instruction. - */ - else if ((CUR == '<') && (NXT(1) == '?')) { - htmlParsePI(ctxt); - } + /* + * Second case : a Processing Instruction. + */ + else if ((CUR == '<') && (NXT(1) == '?')) { + htmlParsePI(ctxt); + } - /* - * Third case : a sub-element. - */ - else if ((CUR == '<') && IS_ASCII_LETTER(NXT(1))) { - htmlParseElement(ctxt); - } - else if (CUR == '<') { - if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && - (ctxt->sax->characters != NULL)) - ctxt->sax->characters(ctxt->userData, BAD_CAST "<", 1); - NEXT; - } + /* + * Third case : a sub-element. + */ + else if ((CUR == '<') && IS_ASCII_LETTER(NXT(1))) { + htmlParseElement(ctxt); + } + else if (CUR == '<') { + if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && + (ctxt->sax->characters != NULL)) + ctxt->sax->characters(ctxt->userData, BAD_CAST "<", 1); + NEXT; + } - /* - * Fourth case : a reference. If if has not been resolved, - * parsing returns it's Name, create the node - */ - else if (CUR == '&') { - htmlParseReference(ctxt); - } + /* + * Fourth case : a reference. If if has not been resolved, + * parsing returns it's Name, create the node + */ + else if (CUR == '&') { + htmlParseReference(ctxt); + } - /* - * Fifth case : end of the resource - */ - else if (CUR == 0) { - htmlAutoCloseOnEnd(ctxt); - break; - } + /* + * Fifth case : end of the resource + */ + else if (CUR == 0) { + htmlAutoCloseOnEnd(ctxt); + break; + } - /* - * Last case, text. Note that References are handled directly. - */ - else { - htmlParseCharData(ctxt); - } - } + /* + * Last case, text. Note that References are handled directly. + */ + else { + htmlParseCharData(ctxt); + } GROW; } if (currentNode != NULL) xmlFree(currentNode); @@ -4785,76 +4800,78 @@ htmlParseContentInternal(htmlParserCtxtPtr ctxt) { * Handle SCRIPT/STYLE separately */ htmlParseScript(ctxt); - } else { - /* - * Sometimes DOCTYPE arrives in the middle of the document - */ - if ((CUR == '<') && (NXT(1) == '!') && - (UPP(2) == 'D') && (UPP(3) == 'O') && - (UPP(4) == 'C') && (UPP(5) == 'T') && - (UPP(6) == 'Y') && (UPP(7) == 'P') && - (UPP(8) == 'E')) { - htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, - "Misplaced DOCTYPE declaration\n", - BAD_CAST "DOCTYPE" , NULL); - htmlParseDocTypeDecl(ctxt); - } + } - /* - * First case : a comment - */ - if ((CUR == '<') && (NXT(1) == '!') && - (NXT(2) == '-') && (NXT(3) == '-')) { - htmlParseComment(ctxt); - } + else if ((CUR == '<') && (NXT(1) == '!')) { + /* + * Sometimes DOCTYPE arrives in the middle of the document + */ + if ((UPP(2) == 'D') && (UPP(3) == 'O') && + (UPP(4) == 'C') && (UPP(5) == 'T') && + (UPP(6) == 'Y') && (UPP(7) == 'P') && + (UPP(8) == 'E')) { + htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, + "Misplaced DOCTYPE declaration\n", + BAD_CAST "DOCTYPE" , NULL); + htmlParseDocTypeDecl(ctxt); + } + /* + * First case : a comment + */ + else if ((NXT(2) == '-') && (NXT(3) == '-')) { + htmlParseComment(ctxt); + } + else { + htmlSkipBogusComment(ctxt); + } + } - /* - * Second case : a Processing Instruction. - */ - else if ((CUR == '<') && (NXT(1) == '?')) { - htmlParsePI(ctxt); - } + /* + * Second case : a Processing Instruction. + */ + else if ((CUR == '<') && (NXT(1) == '?')) { + htmlParsePI(ctxt); + } - /* - * Third case : a sub-element. - */ - else if ((CUR == '<') && IS_ASCII_LETTER(NXT(1))) { - htmlParseElementInternal(ctxt); - if (currentNode != NULL) xmlFree(currentNode); + /* + * Third case : a sub-element. + */ + else if ((CUR == '<') && IS_ASCII_LETTER(NXT(1))) { + htmlParseElementInternal(ctxt); + if (currentNode != NULL) xmlFree(currentNode); - currentNode = xmlStrdup(ctxt->name); - depth = ctxt->nameNr; - } - else if (CUR == '<') { - if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && - (ctxt->sax->characters != NULL)) - ctxt->sax->characters(ctxt->userData, BAD_CAST "<", 1); - NEXT; - } + currentNode = xmlStrdup(ctxt->name); + depth = ctxt->nameNr; + } + else if (CUR == '<') { + if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && + (ctxt->sax->characters != NULL)) + ctxt->sax->characters(ctxt->userData, BAD_CAST "<", 1); + NEXT; + } - /* - * Fourth case : a reference. If if has not been resolved, - * parsing returns it's Name, create the node - */ - else if (CUR == '&') { - htmlParseReference(ctxt); - } + /* + * Fourth case : a reference. If if has not been resolved, + * parsing returns it's Name, create the node + */ + else if (CUR == '&') { + htmlParseReference(ctxt); + } - /* - * Fifth case : end of the resource - */ - else if (CUR == 0) { - htmlAutoCloseOnEnd(ctxt); - break; - } + /* + * Fifth case : end of the resource + */ + else if (CUR == 0) { + htmlAutoCloseOnEnd(ctxt); + break; + } - /* - * Last case, text. Note that References are handled directly. - */ - else { - htmlParseCharData(ctxt); - } - } + /* + * Last case, text. Note that References are handled directly. + */ + else { + htmlParseCharData(ctxt); + } GROW; } if (currentNode != NULL) xmlFree(currentNode); @@ -5111,7 +5128,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt) ctxt->linenumbers = xmlLineNumbersDefaultValue; ctxt->keepBlanks = xmlKeepBlanksDefaultValue; ctxt->html = 1; - ctxt->vctxt.finishDtd = XML_CTXT_FINISH_DTD_0; + ctxt->vctxt.flags = XML_VCTXT_USE_PCTXT; ctxt->vctxt.userData = ctxt; ctxt->vctxt.error = xmlParserValidityError; ctxt->vctxt.warning = xmlParserValidityWarning; @@ -5951,93 +5968,97 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { #endif break; } - } else { - /* - * Sometimes DOCTYPE arrives in the middle of the document - */ - if ((cur == '<') && (next == '!') && - (UPP(2) == 'D') && (UPP(3) == 'O') && - (UPP(4) == 'C') && (UPP(5) == 'T') && - (UPP(6) == 'Y') && (UPP(7) == 'P') && - (UPP(8) == 'E')) { - if ((!terminate) && - (htmlParseLookupSequence(ctxt, '>', 0, 0, 1) < 0)) - goto done; - htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, - "Misplaced DOCTYPE declaration\n", - BAD_CAST "DOCTYPE" , NULL); - htmlParseDocTypeDecl(ctxt); - } else if ((cur == '<') && (next == '!') && - (in->cur[2] == '-') && (in->cur[3] == '-')) { - if ((!terminate) && (htmlParseLookupCommentEnd(ctxt) < 0)) - goto done; + } else if ((cur == '<') && (next == '!')) { + /* + * Sometimes DOCTYPE arrives in the middle of the document + */ + if ((UPP(2) == 'D') && (UPP(3) == 'O') && + (UPP(4) == 'C') && (UPP(5) == 'T') && + (UPP(6) == 'Y') && (UPP(7) == 'P') && + (UPP(8) == 'E')) { + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0, 1) < 0)) + goto done; + htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR, + "Misplaced DOCTYPE declaration\n", + BAD_CAST "DOCTYPE" , NULL); + htmlParseDocTypeDecl(ctxt); + } else if ((in->cur[2] == '-') && (in->cur[3] == '-')) { + if ((!terminate) && + (htmlParseLookupCommentEnd(ctxt) < 0)) + goto done; #ifdef DEBUG_PUSH - xmlGenericError(xmlGenericErrorContext, - "HPP: Parsing Comment\n"); + xmlGenericError(xmlGenericErrorContext, + "HPP: Parsing Comment\n"); #endif - htmlParseComment(ctxt); - ctxt->instate = XML_PARSER_CONTENT; - } else if ((cur == '<') && (next == '?')) { - if ((!terminate) && - (htmlParseLookupSequence(ctxt, '>', 0, 0, 0) < 0)) - goto done; + htmlParseComment(ctxt); + ctxt->instate = XML_PARSER_CONTENT; + } else { + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0, 0) < 0)) + goto done; + htmlSkipBogusComment(ctxt); + } + } else if ((cur == '<') && (next == '?')) { + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '>', 0, 0, 0) < 0)) + goto done; #ifdef DEBUG_PUSH - xmlGenericError(xmlGenericErrorContext, - "HPP: Parsing PI\n"); + xmlGenericError(xmlGenericErrorContext, + "HPP: Parsing PI\n"); #endif - htmlParsePI(ctxt); - ctxt->instate = XML_PARSER_CONTENT; - } else if ((cur == '<') && (next == '!') && (avail < 4)) { - goto done; - } else if ((cur == '<') && (next == '/')) { - ctxt->instate = XML_PARSER_END_TAG; - ctxt->checkIndex = 0; + htmlParsePI(ctxt); + ctxt->instate = XML_PARSER_CONTENT; + } else if ((cur == '<') && (next == '!') && (avail < 4)) { + goto done; + } else if ((cur == '<') && (next == '/')) { + ctxt->instate = XML_PARSER_END_TAG; + ctxt->checkIndex = 0; #ifdef DEBUG_PUSH - xmlGenericError(xmlGenericErrorContext, - "HPP: entering END_TAG\n"); + xmlGenericError(xmlGenericErrorContext, + "HPP: entering END_TAG\n"); #endif - break; - } else if ((cur == '<') && IS_ASCII_LETTER(next)) { - if ((!terminate) && (next == 0)) - goto done; - ctxt->instate = XML_PARSER_START_TAG; - ctxt->checkIndex = 0; + break; + } else if ((cur == '<') && IS_ASCII_LETTER(next)) { + if ((!terminate) && (next == 0)) + goto done; + ctxt->instate = XML_PARSER_START_TAG; + ctxt->checkIndex = 0; #ifdef DEBUG_PUSH - xmlGenericError(xmlGenericErrorContext, - "HPP: entering START_TAG\n"); + xmlGenericError(xmlGenericErrorContext, + "HPP: entering START_TAG\n"); #endif - break; - } else if (cur == '<') { - if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && - (ctxt->sax->characters != NULL)) - ctxt->sax->characters(ctxt->userData, - BAD_CAST "<", 1); - NEXT; - } else { - /* - * check that the text sequence is complete - * before handing out the data to the parser - * to avoid problems with erroneous end of - * data detection. - */ - if ((!terminate) && - (htmlParseLookupSequence(ctxt, '<', 0, 0, 0) < 0)) - goto done; - ctxt->checkIndex = 0; + break; + } else if (cur == '<') { + if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && + (ctxt->sax->characters != NULL)) + ctxt->sax->characters(ctxt->userData, + BAD_CAST "<", 1); + NEXT; + } else { + /* + * check that the text sequence is complete + * before handing out the data to the parser + * to avoid problems with erroneous end of + * data detection. + */ + if ((!terminate) && + (htmlParseLookupSequence(ctxt, '<', 0, 0, 0) < 0)) + goto done; + ctxt->checkIndex = 0; #ifdef DEBUG_PUSH - xmlGenericError(xmlGenericErrorContext, - "HPP: Parsing char data\n"); + xmlGenericError(xmlGenericErrorContext, + "HPP: Parsing char data\n"); #endif - while ((ctxt->instate != XML_PARSER_EOF) && - (cur != '<') && (in->cur < in->end)) { - if (cur == '&') { - htmlParseReference(ctxt); - } else { - htmlParseCharData(ctxt); - } - cur = in->cur[0]; + while ((ctxt->instate != XML_PARSER_EOF) && + (cur != '<') && (in->cur < in->end)) { + if (cur == '&') { + htmlParseReference(ctxt); + } else { + htmlParseCharData(ctxt); } - } + cur = in->cur[0]; + } } break; @@ -6745,6 +6766,8 @@ htmlCtxtReset(htmlParserCtxtPtr ctxt) ctxt->nameNr = 0; ctxt->name = NULL; + ctxt->nsNr = 0; + DICT_FREE(ctxt->version); ctxt->version = NULL; DICT_FREE(ctxt->encoding); @@ -7278,6 +7301,4 @@ htmlCtxtReadIO(htmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, return (htmlDoRead(ctxt, URL, encoding, options, 1)); } -#define bottom_HTMLparser -#include "elfgcchack.h" #endif /* LIBXML_HTML_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/HTMLtree.c b/sdk/lib/3rdparty/libxml2/HTMLtree.c index 7a2b8558389..3dd78a91eba 100644 --- a/sdk/lib/3rdparty/libxml2/HTMLtree.c +++ b/sdk/lib/3rdparty/libxml2/HTMLtree.c @@ -12,13 +12,8 @@ #ifdef LIBXML_HTML_ENABLED #include <string.h> /* for memset() only ! */ - -#ifdef HAVE_CTYPE_H #include <ctype.h> -#endif -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif #include <libxml/xmlmemory.h> #include <libxml/HTMLparser.h> @@ -304,7 +299,7 @@ create: * output as <option selected>, as per XSLT 1.0 16.2 "HTML Output Method" * */ -static const char* htmlBooleanAttrs[] = { +static const char* const htmlBooleanAttrs[] = { "checked", "compact", "declare", "defer", "disabled", "ismap", "multiple", "nohref", "noresize", "noshade", "nowrap", "readonly", "selected", NULL @@ -992,7 +987,14 @@ void htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *encoding ATTRIBUTE_UNUSED, int format) { + int type = 0; + if (cur) { + type = cur->type; + cur->type = XML_HTML_DOCUMENT_NODE; + } htmlNodeDumpFormatOutput(buf, cur, (xmlNodePtr) cur, NULL, format); + if (cur) + cur->type = (xmlElementType) type; } /** @@ -1195,6 +1197,4 @@ htmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) { #endif /* LIBXML_OUTPUT_ENABLED */ -#define bottom_HTMLtree -#include "elfgcchack.h" #endif /* LIBXML_HTML_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/NEWS b/sdk/lib/3rdparty/libxml2/NEWS index c33d32a1727..0a3dd6b03bf 100644 --- a/sdk/lib/3rdparty/libxml2/NEWS +++ b/sdk/lib/3rdparty/libxml2/NEWS @@ -1,5 +1,191 @@ +NEWS file for libxml2 + +v2.10.0: Aug 17 2022 + +### Security + +- [CVE-2022-2309] Reset nsNr in xmlCtxtReset +- Reserve byte for NUL terminator and report errors consistently in xmlBuf and + xmlBuffer (David Kilzer) +- Fix missing NUL terminators in xmlBuf and xmlBuffer functions (David Kilzer) +- Fix integer overflow in xmlBufferDump() (David Kilzer) +- xmlBufAvail() should return length without including a byte for NUL + terminator (David Kilzer) +- Fix ownership of xmlNodePtr & xmlAttrPtr fields in xmlSetTreeDoc() (David + Kilzer) +- Use xmlNewDocText in xmlXIncludeCopyRange +- Fix use-after-free bugs when calling xmlTextReaderClose() before + xmlFreeTextReader() on post-validating parser (David Kilzer) +- Use UPDATE_COMPAT() consistently in buf.c (David Kilzer) +- fix: xmlXPathParserContext could be double-delete in OOM case. (jinsub ahn) + +### Removals and deprecations + +- Disable XPointer location support by default +- Remove outdated xml2Conf.sh +- Deprecate module init and cleanup functions +- Remove obsolete XML Software Autoupdate (XSA) file +- Remove DOCBparser +- Remove obsolete Python test framework +- Remove broken VxWorks support +- Remove broken Mac OS 9 support +- Remove broken bakefile support +- Remove broken Visual Studio 2010 support +- Remove broken Windows CE support +- Deprecate IDREF-related functions in valid.h +- Deprecate legacy functions +- Disable legacy support by default +- Deprecate all functions in nanoftp.h +- Disable FTP support by default +- Add XML_DEPRECATED macro +- Remove elfgcchack.h + +### Regressions + +- Skip incorrectly opened HTML comments +- Restore behavior of htmlDocContentDumpFormatOutput() (David Kilzer) + +### Bug fixes + +- Fix memory leak with invalid XSD +- Make XPath depth check work with recursive invocations +- Fix memory leak in xmlLoadEntityContent error path +- Avoid double-free if malloc fails in inputPush +- Properly fold whitespace around the QName value when validating an XSD + schema. (Damjan Jovanovic) +- Add whitespace folding for some atomic data types that it's missing on. + (Damjan Jovanovic) +- Don't add IDs containing unexpanded entity references + +### Improvements + +- Avoid calling xmlSetTreeDoc +- Simplify xmlFreeNode +- Don't reset nsDef when changing node content +- Fix unintended fall-through in xmlNodeAddContentLen +- Remove unused xmlBuf functions (David Kilzer) +- Implement xpath1() XPointer scheme +- Add configuration flag for XPointer locations support +- Fix compiler warnings in Python code +- Mark more static data as `const` (David Kilzer) +- Make xmlStaticCopyNode non-recursive +- Clean up encoding switching code +- Simplify recursive pthread mutex +- Use non-recursive mutex in dict.c +- Fix parser progress checks +- Avoid arithmetic on freed pointers +- Improve buffer allocation scheme +- Remove unneeded #includes +- Add support for some non-standard escapes in regular expressions. (Damjan + Jovanovic) +- htmlParseComment: handle abruptly-closed comments (Mike Dalessio) +- Add let variable tag support (Oliver Diehl) +- Add value-of tag support (Oliver Diehl) +- Remove useless call to xmlRelaxNGCleanupTypes +- Don't include ICU headers in public headers +- Update `xmlStrlen()` to use POSIX / ISO C `strlen()` (Mike Dalessio) +- Fix unused variable warnings with disabled features +- Only warn on invalid redeclarations of predefined entities +- Remove unneeded code in xmlreader.c +- Rework validation context flags + +### Portability + +- Use NAN/INFINITY if available to init XPath NaN/Inf (Sergey Kosukhin) +- Fix Python tests on macOS +- Fix xmlCleanupThreads on Windows +- Fix reinitialization of library on Windows +- Don't mix declarations and code in runtest.c +- Use portable python shebangs (David Seifert) +- Use critical sections as mutex on Windows +- Don't set HAVE_WIN32_THREADS in win32config.h +- Use stdint.h with newer MSVC +- Remove cruft from win32config.h +- Remove isinf/isnan emulation in win32config.h +- Always fopen files with "rb" +- Remove __DJGPP__ checks +- Remove useless __CYGWIN__ checks + +### Build system + +- Don't autogenerate doc/examples/Makefile.am +- cmake: Install libxml.m4 on UNIX-like platforms (Daniel E) +- cmake: Use symbol versioning on UNIX-like platforms (Daniel E) +- Port genUnicode.py to Python 3 +- Port gentest.py to Python 3 +- cmake: Fix build without thread support +- cmake: Install documentation in CMAKE_INSTALL_DOCDIR +- cmake: Remove non needed files in docs dir (Daniel E) +- configure: move XML_PRIVATE_LIBS after WIN32_EXTRA_LIBADD is set + (Christopher Degawa) +- Move local Autoconf macros into m4 directory +- Use XML_PRIVATE_LIBS in libxml2_la_LIBADD +- Update libxml-2.0-uninstalled.pc.in +- Remove LIBS from XML_PRIVATE_LIBS +- Add WIN32_EXTRA_LIBADD to XML_PRIVATE_LIBS +- Don't overlink executables +- cmake: Adjust paths for UNIX or UNIX-like target systems (Daniel Engberg) +- build: Make use of variables in libxml's pkg-config file (Daniel Engberg) +- Avoid obsolescent `test -a` constructs (David Seifert) +- Move AM_MAINTAINER_MODE to AM section +- configure.ac: make AM_SILENT_RULES([yes]) unconditional (David Seifert) +- Streamline documentation installation +- Don't try to recreate COPYING symlink +- Detect libm using libtool's macros (David Seifert) +- configure.ac: disable static libraries by default (David Seifert) +- python/Makefile.am: nest python docs in $(docdir) (David Seifert) +- python/Makefile.am: rely on global AM_INIT_AUTOMAKE (David Seifert) +- Makefile.am: install examples more idiomatically (David Seifert) +- configure.ac: remove useless AC_SUBST (David Seifert) +- Respect `--sysconfdir` in source files (David Seifert) +- Ignore configure backup file created by recent autoreconf too (Vadim Zeitlin) +- Only install *.html and *.c example files +- Remove --with-html-dir option +- Rework documentation build system +- Remove old website +- Use AM_PATH_PYTHON/PKG_CHECK_MODULES for python bindings (David Seifert) +- Update genChRanges.py +- Update build_glob.py +- Remove ICONV_CONST test +- Remove obsolete AC_HEADER checks +- Don't check for standard C89 library functions +- Don't check for standard C89 headers +- Remove special configuration for certain maintainers + +### Test suite, CI + +- Disable network in API tests +- testapi: remove leading slash from "/missing.xml" (Mike Gilbert) +- Build Autotools CI tests out of source tree (VPATH) +- Add --with-minimum build to CI tests +- Fix warnings when testing --with-minimum build +- cmake: Run all tests when threads are disabled +- Also build CI tests with -Werror +- Move doc/examples tests to new test suite +- Simplify 'make check' targets +- Fix schemas and relaxng tests +- Remove unused result files +- Allow missing result files in runtest +- Move regexp tests to runtest +- Move SVG tests to runtest.c +- Move testModule to new test suite +- Move testThreads to new test suite +- Remove major parts of old test suite +- Make testchar return an error on failure (Tony Tascioglu) +- Add CI job for static build +- python/tests: open() relative to test scripts (David Seifert) +- Port some test scripts to Python 3 + +### Documentation + +- Improve documentation of tree manipulation API +- Update xml2-config man page +- Consolidate man pages +- Rename xmlcatalog_man.xml +- Make examples a standalone HTML page +- Fix documentation in entities.c +- Add note about optimization flags - NEWS file for libxml2 v2.9.14: May 02 2022: - Security: diff --git a/sdk/lib/3rdparty/libxml2/README.md b/sdk/lib/3rdparty/libxml2/README.md index ce83d6201fc..ad423e686f9 100644 --- a/sdk/lib/3rdparty/libxml2/README.md +++ b/sdk/lib/3rdparty/libxml2/README.md @@ -44,6 +44,11 @@ configure and build the library: ./configure [possible options] make +Note that by default, no optimization options are used. You have to +enable them manually, for example with: + + CFLAGS='-O2 -fno-semantic-interposition' ./configure + Now you can run the test suite with: make check diff --git a/sdk/lib/3rdparty/libxml2/SAX.c b/sdk/lib/3rdparty/libxml2/SAX.c index 292af57e97b..d8e972b84c2 100644 --- a/sdk/lib/3rdparty/libxml2/SAX.c +++ b/sdk/lib/3rdparty/libxml2/SAX.c @@ -126,55 +126,6 @@ inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) #endif /* LIBXML_HTML_ENABLED */ -#ifdef LIBXML_DOCB_ENABLED -/** - * initdocbDefaultSAXHandler: - * @hdlr: the SAX handler - * - * Initialize the default DocBook SAX version 1 handler - * DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks - */ -void -initdocbDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) -{ - if(hdlr->initialized == 1) - return; - - hdlr->internalSubset = xmlSAX2InternalSubset; - hdlr->externalSubset = NULL; - hdlr->isStandalone = xmlSAX2IsStandalone; - hdlr->hasInternalSubset = xmlSAX2HasInternalSubset; - hdlr->hasExternalSubset = xmlSAX2HasExternalSubset; - hdlr->resolveEntity = xmlSAX2ResolveEntity; - hdlr->getEntity = xmlSAX2GetEntity; - hdlr->getParameterEntity = NULL; - hdlr->entityDecl = xmlSAX2EntityDecl; - hdlr->attributeDecl = NULL; - hdlr->elementDecl = NULL; - hdlr->notationDecl = NULL; - hdlr->unparsedEntityDecl = NULL; - hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; - hdlr->startDocument = xmlSAX2StartDocument; - hdlr->endDocument = xmlSAX2EndDocument; - hdlr->startElement = xmlSAX2StartElement; - hdlr->endElement = xmlSAX2EndElement; - hdlr->reference = xmlSAX2Reference; - hdlr->characters = xmlSAX2Characters; - hdlr->cdataBlock = NULL; - hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace; - hdlr->processingInstruction = NULL; - hdlr->comment = xmlSAX2Comment; - hdlr->warning = xmlParserWarning; - hdlr->error = xmlParserError; - hdlr->fatalError = xmlParserError; - - hdlr->initialized = 1; -} - -#endif /* LIBXML_DOCB_ENABLED */ - #endif /* LIBXML_SAX1_ENABLED */ -#define bottom_SAX -#include "elfgcchack.h" #endif /* LIBXML_LEGACY_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/SAX2.c b/sdk/lib/3rdparty/libxml2/SAX2.c index 031924652a4..ec89046b1d6 100644 --- a/sdk/lib/3rdparty/libxml2/SAX2.c +++ b/sdk/lib/3rdparty/libxml2/SAX2.c @@ -180,31 +180,6 @@ xmlWarnMsg(xmlParserCtxtPtr ctxt, xmlParserErrors error, NULL, 0, 0, msg, str1); } -/** - * xmlNsErrMsg: - * @ctxt: an XML parser context - * @error: the error number - * @msg: the error message - * @str1: an error string - * @str2: an error string - * - * Handle a namespace error - */ -static void LIBXML_ATTR_FORMAT(3,0) -xmlNsErrMsg(xmlParserCtxtPtr ctxt, xmlParserErrors error, - const char *msg, const xmlChar *str1, const xmlChar *str2) -{ - if ((ctxt != NULL) && (ctxt->disableSAX != 0) && - (ctxt->instate == XML_PARSER_EOF)) - return; - if (ctxt != NULL) - ctxt->errNo = error; - __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_NAMESPACE, error, - XML_ERR_ERROR, NULL, 0, - (const char *) str1, (const char *) str2, - NULL, 0, 0, msg, str1, str2); -} - /** * xmlNsWarnMsg: * @ctxt: an XML parser context @@ -709,6 +684,9 @@ xmlSAX2AttributeDecl(void *ctx, const xmlChar *elem, const xmlChar *fullname, xmlAttributePtr attr; xmlChar *name = NULL, *prefix = NULL; + /* Avoid unused variable warning if features are disabled. */ + (void) attr; + if ((ctxt == NULL) || (ctxt->myDoc == NULL)) return; @@ -776,6 +754,9 @@ xmlSAX2ElementDecl(void *ctx, const xmlChar * name, int type, xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlElementPtr elem = NULL; + /* Avoid unused variable warning if features are disabled. */ + (void) elem; + if ((ctxt == NULL) || (ctxt->myDoc == NULL)) return; @@ -822,6 +803,9 @@ xmlSAX2NotationDecl(void *ctx, const xmlChar *name, xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlNotationPtr nota = NULL; + /* Avoid unused variable warning if features are disabled. */ + (void) nota; + if ((ctxt == NULL) || (ctxt->myDoc == NULL)) return; @@ -1050,7 +1034,32 @@ xmlSAX2EndDocument(void *ctx) } } -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +/** + * xmlNsErrMsg: + * @ctxt: an XML parser context + * @error: the error number + * @msg: the error message + * @str1: an error string + * @str2: an error string + * + * Handle a namespace error + */ +static void LIBXML_ATTR_FORMAT(3,0) +xmlNsErrMsg(xmlParserCtxtPtr ctxt, xmlParserErrors error, + const char *msg, const xmlChar *str1, const xmlChar *str2) +{ + if ((ctxt != NULL) && (ctxt->disableSAX != 0) && + (ctxt->instate == XML_PARSER_EOF)) + return; + if (ctxt != NULL) + ctxt->errNo = error; + __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_NAMESPACE, error, + XML_ERR_ERROR, NULL, 0, + (const char *) str1, (const char *) str2, + NULL, 0, 0, msg, str1, str2); +} + /** * xmlSAX2AttributeInternal: * @ctx: the user data (XML parser context) @@ -1144,6 +1153,9 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname, xmlNsPtr nsret; xmlChar *val; + /* Avoid unused variable warning if features are disabled. */ + (void) nsret; + if (!ctxt->replaceEntities) { ctxt->depth++; val = xmlStringDecodeEntities(ctxt, value, XML_SUBSTITUTE_REF, @@ -1206,6 +1218,9 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname, xmlNsPtr nsret; xmlChar *val; + /* Avoid unused variable warning if features are disabled. */ + (void) nsret; + if (!ctxt->replaceEntities) { ctxt->depth++; val = xmlStringDecodeEntities(ctxt, value, XML_SUBSTITUTE_REF, @@ -1368,7 +1383,12 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname, #endif /* LIBXML_VALID_ENABLED */ if (((ctxt->loadsubset & XML_SKIP_IDS) == 0) && (((ctxt->replaceEntities == 0) && (ctxt->external != 2)) || - ((ctxt->replaceEntities != 0) && (ctxt->inSubset == 0)))) { + ((ctxt->replaceEntities != 0) && (ctxt->inSubset == 0))) && + /* Don't create IDs containing entity references */ + (ret->children != NULL) && + (ret->children->type == XML_TEXT_NODE) && + (ret->children->next == NULL)) { + xmlChar *content = ret->children->content; /* * when validating, the ID registration is done at the attribute * validation level. Otherwise we have to do specific handling here. @@ -1379,16 +1399,16 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname, * * Open issue: normalization of the value. */ - if (xmlValidateNCName(value, 1) != 0) { + if (xmlValidateNCName(content, 1) != 0) { xmlErrValid(ctxt, XML_DTD_XMLID_VALUE, "xml:id : attribute value %s is not an NCName\n", - (const char *) value, NULL); + (const char *) content, NULL); } - xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret); + xmlAddID(&ctxt->vctxt, ctxt->myDoc, content, ret); } else if (xmlIsID(ctxt->myDoc, ctxt->node, ret)) - xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret); + xmlAddID(&ctxt->vctxt, ctxt->myDoc, content, ret); else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret)) - xmlAddRef(&ctxt->vctxt, ctxt->myDoc, value, ret); + xmlAddRef(&ctxt->vctxt, ctxt->myDoc, content, ret); } error: @@ -1747,7 +1767,8 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts) * If it's the Document root, finish the DTD validation and * check the document root element for validity */ - if ((ctxt->validate) && (ctxt->vctxt.finishDtd == XML_CTXT_FINISH_DTD_0)) { + if ((ctxt->validate) && + ((ctxt->vctxt.flags & XML_VCTXT_DTD_VALIDATED) == 0)) { int chk; chk = xmlValidateDtdFinal(&ctxt->vctxt, ctxt->myDoc); @@ -1756,7 +1777,7 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts) if (chk < 0) ctxt->wellFormed = 0; ctxt->valid &= xmlValidateRoot(&ctxt->vctxt, ctxt->myDoc); - ctxt->vctxt.finishDtd = XML_CTXT_FINISH_DTD_1; + ctxt->vctxt.flags |= XML_VCTXT_DTD_VALIDATED; } #endif /* LIBXML_VALID_ENABLED */ @@ -2120,7 +2141,12 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt, #endif /* LIBXML_VALID_ENABLED */ if (((ctxt->loadsubset & XML_SKIP_IDS) == 0) && (((ctxt->replaceEntities == 0) && (ctxt->external != 2)) || - ((ctxt->replaceEntities != 0) && (ctxt->inSubset == 0)))) { + ((ctxt->replaceEntities != 0) && (ctxt->inSubset == 0))) && + /* Don't create IDs containing entity references */ + (ret->children != NULL) && + (ret->children->type == XML_TEXT_NODE) && + (ret->children->next == NULL)) { + xmlChar *content = ret->children->content; /* * when validating, the ID registration is done at the attribute * validation level. Otherwise we have to do specific handling here. @@ -2133,27 +2159,20 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt, * * Open issue: normalization of the value. */ - if (dup == NULL) - dup = xmlStrndup(value, valueend - value); -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) #ifdef LIBXML_VALID_ENABLED - if (xmlValidateNCName(dup, 1) != 0) { + if (xmlValidateNCName(content, 1) != 0) { xmlErrValid(ctxt, XML_DTD_XMLID_VALUE, "xml:id : attribute value %s is not an NCName\n", - (const char *) dup, NULL); + (const char *) content, NULL); } #endif #endif - xmlAddID(&ctxt->vctxt, ctxt->myDoc, dup, ret); + xmlAddID(&ctxt->vctxt, ctxt->myDoc, content, ret); } else if (xmlIsID(ctxt->myDoc, ctxt->node, ret)) { - /* might be worth duplicate entry points and not copy */ - if (dup == NULL) - dup = xmlStrndup(value, valueend - value); - xmlAddID(&ctxt->vctxt, ctxt->myDoc, dup, ret); + xmlAddID(&ctxt->vctxt, ctxt->myDoc, content, ret); } else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret)) { - if (dup == NULL) - dup = xmlStrndup(value, valueend - value); - xmlAddRef(&ctxt->vctxt, ctxt->myDoc, dup, ret); + xmlAddRef(&ctxt->vctxt, ctxt->myDoc, content, ret); } } if (dup != NULL) @@ -2405,7 +2424,8 @@ xmlSAX2StartElementNs(void *ctx, * If it's the Document root, finish the DTD validation and * check the document root element for validity */ - if ((ctxt->validate) && (ctxt->vctxt.finishDtd == XML_CTXT_FINISH_DTD_0)) { + if ((ctxt->validate) && + ((ctxt->vctxt.flags & XML_VCTXT_DTD_VALIDATED) == 0)) { int chk; chk = xmlValidateDtdFinal(&ctxt->vctxt, ctxt->myDoc); @@ -2414,7 +2434,7 @@ xmlSAX2StartElementNs(void *ctx, if (chk < 0) ctxt->wellFormed = 0; ctxt->valid &= xmlValidateRoot(&ctxt->vctxt, ctxt->myDoc); - ctxt->vctxt.finishDtd = XML_CTXT_FINISH_DTD_1; + ctxt->vctxt.flags |= XML_VCTXT_DTD_VALIDATED; } #endif /* LIBXML_VALID_ENABLED */ } @@ -2613,9 +2633,10 @@ xmlSAX2Text(xmlParserCtxtPtr ctxt, const xmlChar *ch, int len, } } else { /* Mixed content, first time */ - if (type == XML_TEXT_NODE) + if (type == XML_TEXT_NODE) { lastChild = xmlSAX2TextNode(ctxt, ch, len); - else + lastChild->doc = ctxt->myDoc; + } else lastChild = xmlNewCDataBlock(ctxt->myDoc, ch, len); if (lastChild != NULL) { xmlAddChild(ctxt->node, lastChild); @@ -2908,6 +2929,9 @@ xmlSAX2InitDefaultSAXHandler(xmlSAXHandler *hdlr, int warning) /** * xmlDefaultSAXHandlerInit: * + * DEPRECATED: This function will be made private. Call xmlInitParser to + * initialize the library. + * * Initialize the default SAX2 handler */ void @@ -2966,6 +2990,9 @@ xmlSAX2InitHtmlDefaultSAXHandler(xmlSAXHandler *hdlr) /** * htmlDefaultSAXHandlerInit: * + * DEPRECATED: This function will be made private. Call xmlInitParser to + * initialize the library. + * * Initialize the default SAX handler */ void @@ -2975,63 +3002,3 @@ htmlDefaultSAXHandlerInit(void) } #endif /* LIBXML_HTML_ENABLED */ - -#ifdef LIBXML_DOCB_ENABLED - -/** - * xmlSAX2InitDocbDefaultSAXHandler: - * @hdlr: the SAX handler - * - * Initialize the default DocBook SAX2 handler - */ -void -xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr) -{ - if ((hdlr == NULL) || (hdlr->initialized != 0)) - return; - - hdlr->internalSubset = xmlSAX2InternalSubset; - hdlr->externalSubset = NULL; - hdlr->isStandalone = xmlSAX2IsStandalone; - hdlr->hasInternalSubset = xmlSAX2HasInternalSubset; - hdlr->hasExternalSubset = xmlSAX2HasExternalSubset; - hdlr->resolveEntity = xmlSAX2ResolveEntity; - hdlr->getEntity = xmlSAX2GetEntity; - hdlr->getParameterEntity = NULL; - hdlr->entityDecl = xmlSAX2EntityDecl; - hdlr->attributeDecl = NULL; - hdlr->elementDecl = NULL; - hdlr->notationDecl = NULL; - hdlr->unparsedEntityDecl = NULL; - hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; - hdlr->startDocument = xmlSAX2StartDocument; - hdlr->endDocument = xmlSAX2EndDocument; - hdlr->startElement = xmlSAX2StartElement; - hdlr->endElement = xmlSAX2EndElement; - hdlr->reference = xmlSAX2Reference; - hdlr->characters = xmlSAX2Characters; - hdlr->cdataBlock = NULL; - hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace; - hdlr->processingInstruction = NULL; - hdlr->comment = xmlSAX2Comment; - hdlr->warning = xmlParserWarning; - hdlr->error = xmlParserError; - hdlr->fatalError = xmlParserError; - - hdlr->initialized = 1; -} - -/** - * docbDefaultSAXHandlerInit: - * - * Initialize the default SAX handler - */ -void -docbDefaultSAXHandlerInit(void) -{ - xmlSAX2InitDocbDefaultSAXHandler((xmlSAXHandlerPtr) &docbDefaultSAXHandler); -} - -#endif /* LIBXML_DOCB_ENABLED */ -#define bottom_SAX2 -#include "elfgcchack.h" diff --git a/sdk/lib/3rdparty/libxml2/buf.c b/sdk/lib/3rdparty/libxml2/buf.c index 40a5ee068b1..6749d975717 100644 --- a/sdk/lib/3rdparty/libxml2/buf.c +++ b/sdk/lib/3rdparty/libxml2/buf.c @@ -17,12 +17,8 @@ #include <string.h> /* for memset() only ! */ #include <limits.h> -#ifdef HAVE_CTYPE_H #include <ctype.h> -#endif -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif #include <libxml/tree.h> #include <libxml/globals.h> @@ -131,12 +127,11 @@ xmlBufCreate(void) { xmlBufMemoryError(NULL, "creating buffer"); return(NULL); } - ret->compat_use = 0; ret->use = 0; ret->error = 0; ret->buffer = NULL; ret->size = xmlDefaultBufferSize; - ret->compat_size = xmlDefaultBufferSize; + UPDATE_COMPAT(ret); ret->alloc = xmlBufferAllocScheme; ret->content = (xmlChar *) xmlMallocAtomic(ret->size * sizeof(xmlChar)); if (ret->content == NULL) { @@ -167,13 +162,12 @@ xmlBufCreateSize(size_t size) { xmlBufMemoryError(NULL, "creating buffer"); return(NULL); } - ret->compat_use = 0; ret->use = 0; ret->error = 0; ret->buffer = NULL; ret->alloc = xmlBufferAllocScheme; ret->size = (size ? size + 1 : 0); /* +1 for ending null */ - ret->compat_size = (ret->size > INT_MAX ? INT_MAX : ret->size); + UPDATE_COMPAT(ret); if (ret->size){ ret->content = (xmlChar *) xmlMallocAtomic(ret->size * sizeof(xmlChar)); if (ret->content == NULL) { @@ -215,8 +209,7 @@ xmlBufDetach(xmlBufPtr buf) { buf->content = NULL; buf->size = 0; buf->use = 0; - buf->compat_use = 0; - buf->compat_size = 0; + UPDATE_COMPAT(buf); return ret; } @@ -245,15 +238,9 @@ xmlBufCreateStatic(void *mem, size_t size) { xmlBufMemoryError(NULL, "creating buffer"); return(NULL); } - if (size < INT_MAX) { - ret->compat_use = size; - ret->compat_size = size; - } else { - ret->compat_use = INT_MAX; - ret->compat_size = INT_MAX; - } ret->use = size; ret->size = size; + UPDATE_COMPAT(ret); ret->alloc = XML_BUFFER_ALLOC_IMMUTABLE; ret->content = (xmlChar *) mem; ret->error = 0; @@ -449,9 +436,11 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0); if (len < buf->size - buf->use) - return(buf->size - buf->use); - if (len > SIZE_MAX - buf->use) + return(buf->size - buf->use - 1); + if (len >= SIZE_MAX - buf->use) { + xmlBufMemoryError(buf, "growing buffer past SIZE_MAX"); return(0); + } if (buf->size > (size_t) len) { size = buf->size > SIZE_MAX / 2 ? SIZE_MAX : buf->size * 2; @@ -464,7 +453,7 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { /* * Used to provide parsing limits */ - if ((buf->use + len >= XML_MAX_TEXT_LENGTH) || + if ((buf->use + len + 1 >= XML_MAX_TEXT_LENGTH) || (buf->size >= XML_MAX_TEXT_LENGTH)) { xmlBufMemoryError(buf, "buffer error: text too long\n"); return(0); @@ -492,7 +481,7 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { } buf->size = size; UPDATE_COMPAT(buf) - return(buf->size - buf->use); + return(buf->size - buf->use - 1); } /** @@ -518,24 +507,6 @@ xmlBufGrow(xmlBufPtr buf, int len) { return((int) ret); } -/** - * xmlBufInflate: - * @buf: the buffer - * @len: the minimum extra free size to allocate - * - * Grow the available space of an XML buffer, adding at least @len bytes - * - * Returns 0 if successful or -1 in case of error - */ -int -xmlBufInflate(xmlBufPtr buf, size_t len) { - if (buf == NULL) return(-1); - xmlBufGrowInternal(buf, len + buf->size); - if (buf->error) - return(-1); - return(0); -} - /** * xmlBufDump: * @file: the file output @@ -622,34 +593,9 @@ xmlBufAddLen(xmlBufPtr buf, size_t len) { if ((buf == NULL) || (buf->error)) return(-1); CHECK_COMPAT(buf) - if (len > (buf->size - buf->use)) + if (len >= (buf->size - buf->use)) return(-1); buf->use += len; - UPDATE_COMPAT(buf) - if (buf->size > buf->use) - buf->content[buf->use] = 0; - else - return(-1); - return(0); -} - -/** - * xmlBufErase: - * @buf: the buffer - * @len: the size to erase at the end - * - * Sometime data need to be erased at the end of the buffer - * - * Returns -1 in case of error and 0 otherwise - */ -int -xmlBufErase(xmlBufPtr buf, size_t len) { - if ((buf == NULL) || (buf->error)) - return(-1); - CHECK_COMPAT(buf) - if (len > buf->use) - return(-1); - buf->use -= len; buf->content[buf->use] = 0; UPDATE_COMPAT(buf) return(0); @@ -698,10 +644,11 @@ xmlBufUse(const xmlBufPtr buf) * @buf: the buffer * * Function to find how much free space is allocated but not - * used in the buffer. It does not account for the terminating zero - * usually needed + * used in the buffer. It reserves one byte for the NUL + * terminator character that is usually needed, so there is + * no need to subtract 1 from the result anymore. * - * Returns the amount or 0 if none or an error occurred + * Returns the amount, or 0 if none or if an error occurred. */ size_t @@ -711,7 +658,7 @@ xmlBufAvail(const xmlBufPtr buf) return 0; CHECK_COMPAT(buf) - return(buf->size - buf->use); + return((buf->size > buf->use) ? (buf->size - buf->use - 1) : 0); } /** @@ -829,6 +776,8 @@ xmlBufResize(xmlBufPtr buf, size_t size) } else { if (buf->content == NULL) { rebuf = (xmlChar *) xmlMallocAtomic(newSize); + buf->use = 0; + rebuf[buf->use] = 0; } else if (buf->size - buf->use < 100) { rebuf = (xmlChar *) xmlRealloc(buf->content, newSize); } else { @@ -892,9 +841,12 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) { if (len < 0) return -1; if (len == 0) return 0; + /* Note that both buf->size and buf->use can be zero here. */ if ((size_t) len >= buf->size - buf->use) { - if ((size_t) len >= SIZE_MAX - buf->use) + if ((size_t) len >= SIZE_MAX - buf->use) { + xmlBufMemoryError(buf, "growing buffer past SIZE_MAX"); return(-1); + } needSize = buf->use + len + 1; if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { /* @@ -918,87 +870,6 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) { return 0; } -/** - * xmlBufAddHead: - * @buf: the buffer - * @str: the #xmlChar string - * @len: the number of #xmlChar to add - * - * Add a string range to the beginning of an XML buffer. - * if len == -1, the length of @str is recomputed. - * - * Returns 0 successful, a positive error code number otherwise - * and -1 in case of internal or API error. - */ -int -xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) { - unsigned int needSize; - - if ((buf == NULL) || (buf->error)) - return(-1); - CHECK_COMPAT(buf) - if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return -1; - if (str == NULL) { -#ifdef DEBUG_BUFFER - xmlGenericError(xmlGenericErrorContext, - "xmlBufAddHead: str == NULL\n"); -#endif - return -1; - } - if (len < -1) { -#ifdef DEBUG_BUFFER - xmlGenericError(xmlGenericErrorContext, - "xmlBufAddHead: len < 0\n"); -#endif - return -1; - } - if (len == 0) return 0; - - if (len < 0) - len = xmlStrlen(str); - - if (len <= 0) return -1; - - if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) { - size_t start_buf = buf->content - buf->contentIO; - - if (start_buf > (unsigned int) len) { - /* - * We can add it in the space previously shrunk - */ - buf->content -= len; - memmove(&buf->content[0], str, len); - buf->use += len; - buf->size += len; - UPDATE_COMPAT(buf) - return(0); - } - } - needSize = buf->use + len + 2; - if (needSize > buf->size){ - if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { - /* - * Used to provide parsing limits - */ - if (needSize >= XML_MAX_TEXT_LENGTH) { - xmlBufMemoryError(buf, "buffer error: text too long\n"); - return(-1); - } - } - if (!xmlBufResize(buf, needSize)){ - xmlBufMemoryError(buf, "growing buffer"); - return XML_ERR_NO_MEMORY; - } - } - - memmove(&buf->content[len], &buf->content[0], buf->use); - memmove(&buf->content[0], str, len); - buf->use += len; - buf->content[buf->use] = 0; - UPDATE_COMPAT(buf) - return 0; -} - /** * xmlBufCat: * @buf: the buffer to add to @@ -1034,49 +905,6 @@ xmlBufCCat(xmlBufPtr buf, const char *str) { return xmlBufCat(buf, (const xmlChar *) str); } -/** - * xmlBufWriteCHAR: - * @buf: the XML buffer - * @string: the string to add - * - * routine which manages and grows an output buffer. This one adds - * xmlChars at the end of the buffer. - * - * Returns 0 if successful, a positive error code number otherwise - * and -1 in case of internal or API error. - */ -int -xmlBufWriteCHAR(xmlBufPtr buf, const xmlChar *string) { - if ((buf == NULL) || (buf->error)) - return(-1); - CHECK_COMPAT(buf) - if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) - return(-1); - return(xmlBufCat(buf, string)); -} - -/** - * xmlBufWriteChar: - * @buf: the XML buffer output - * @string: the string to add - * - * routine which manage and grows an output buffer. This one add - * C chars at the end of the array. - * - * Returns 0 if successful, a positive error code number otherwise - * and -1 in case of internal or API error. - */ -int -xmlBufWriteChar(xmlBufPtr buf, const char *string) { - if ((buf == NULL) || (buf->error)) - return(-1); - CHECK_COMPAT(buf) - if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) - return(-1); - return(xmlBufCCat(buf, string)); -} - - /** * xmlBufWriteQuotedString: * @buf: the XML buffer output @@ -1159,8 +987,7 @@ xmlBufFromBuffer(xmlBufferPtr buffer) { } ret->use = buffer->use; ret->size = buffer->size; - ret->compat_use = buffer->use; - ret->compat_size = buffer->size; + UPDATE_COMPAT(ret); ret->error = 0; ret->buffer = buffer; ret->alloc = buffer->alloc; @@ -1329,5 +1156,3 @@ xmlBufSetInputBaseCur(xmlBufPtr buf, xmlParserInputPtr input, return(0); } -#define bottom_buf -#include "elfgcchack.h" diff --git a/sdk/lib/3rdparty/libxml2/buf.h b/sdk/lib/3rdparty/libxml2/buf.h index ebdc9781213..b7bcf61fe2e 100644 --- a/sdk/lib/3rdparty/libxml2/buf.h +++ b/sdk/lib/3rdparty/libxml2/buf.h @@ -32,15 +32,11 @@ void xmlBufEmpty(xmlBufPtr buf); /* size_t xmlBufShrink(xmlBufPtr buf, size_t len); */ int xmlBufGrow(xmlBufPtr buf, int len); -int xmlBufInflate(xmlBufPtr buf, size_t len); int xmlBufResize(xmlBufPtr buf, size_t len); int xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len); -int xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len); int xmlBufCat(xmlBufPtr buf, const xmlChar *str); int xmlBufCCat(xmlBufPtr buf, const char *str); -int xmlBufWriteCHAR(xmlBufPtr buf, const xmlChar *string); -int xmlBufWriteChar(xmlBufPtr buf, const char *string); int xmlBufWriteQuotedString(xmlBufPtr buf, const xmlChar *string); size_t xmlBufAvail(const xmlBufPtr buf); @@ -48,7 +44,6 @@ size_t xmlBufLength(const xmlBufPtr buf); /* size_t xmlBufUse(const xmlBufPtr buf); */ int xmlBufIsEmpty(const xmlBufPtr buf); int xmlBufAddLen(xmlBufPtr buf, size_t len); -int xmlBufErase(xmlBufPtr buf, size_t len); /* const xmlChar * xmlBufContent(const xmlBuf *buf); */ /* const xmlChar * xmlBufEnd(xmlBufPtr buf); */ diff --git a/sdk/lib/3rdparty/libxml2/c14n.c b/sdk/lib/3rdparty/libxml2/c14n.c index 3efcd92eefa..d55729ccc59 100644 --- a/sdk/lib/3rdparty/libxml2/c14n.c +++ b/sdk/lib/3rdparty/libxml2/c14n.c @@ -14,9 +14,7 @@ #ifdef LIBXML_C14N_ENABLED #ifdef LIBXML_OUTPUT_ENABLED -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif #include <string.h> #include <libxml/tree.h> @@ -1659,9 +1657,6 @@ xmlC14NProcessNode(xmlC14NCtxPtr ctx, xmlNodePtr cur) break; case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: /* should be processed as document? */ -#ifdef LIBXML_DOCB_ENABLED - case XML_DOCB_DOCUMENT_NODE: /* should be processed as document? */ -#endif #ifdef LIBXML_HTML_ENABLED case XML_HTML_DOCUMENT_NODE: /* should be processed as document? */ #endif @@ -2229,6 +2224,5 @@ xmlC11NNormalizeString(const xmlChar * input, return (buffer); } #endif /* LIBXML_OUTPUT_ENABLED */ -#define bottom_c14n -#include "elfgcchack.h" + #endif /* LIBXML_C14N_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/catalog.c b/sdk/lib/3rdparty/libxml2/catalog.c index e071b4939fc..b7837e3da75 100644 --- a/sdk/lib/3rdparty/libxml2/catalog.c +++ b/sdk/lib/3rdparty/libxml2/catalog.c @@ -16,6 +16,8 @@ #include "libxml.h" #ifdef LIBXML_CATALOG_ENABLED +#include <stdlib.h> +#include <string.h> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -28,10 +30,6 @@ #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#include <string.h> #include <libxml/xmlmemory.h> #include <libxml/hash.h> #include <libxml/uri.h> @@ -70,26 +68,20 @@ #define XML_URN_PUBID "urn:publicid:" #define XML_CATAL_BREAK ((xmlChar *) -1) #ifndef XML_XML_DEFAULT_CATALOG -#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" +#define XML_XML_DEFAULT_CATALOG "file://" SYSCONFDIR "/xml/catalog" #endif #ifndef XML_SGML_DEFAULT_CATALOG -#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" +#define XML_SGML_DEFAULT_CATALOG "file://" SYSCONFDIR "/sgml/catalog" #endif #if defined(_WIN32) && defined(_MSC_VER) #undef XML_XML_DEFAULT_CATALOG -static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog"; -#if defined(_WIN32_WCE) -/* Windows CE don't have a A variant */ -#define GetModuleHandleA GetModuleHandle -#define GetModuleFileNameA GetModuleFileName -#else +static char XML_XML_DEFAULT_CATALOG[256] = "file://" SYSCONFDIR "/xml/catalog"; #if !defined(_WINDOWS_) void* __stdcall GetModuleHandleA(const char*); unsigned long __stdcall GetModuleFileNameA(void*, char*, unsigned long); #endif #endif -#endif static xmlChar *xmlCatalogNormalizePublic(const xmlChar *pubID); static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename); @@ -3825,6 +3817,4 @@ xmlCatalogGetPublic(const xmlChar *pubID) { return(NULL); } -#define bottom_catalog -#include "elfgcchack.h" #endif /* LIBXML_CATALOG_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/chvalid.c b/sdk/lib/3rdparty/libxml2/chvalid.c index 06e8db06422..f4fa44acbb8 100644 --- a/sdk/lib/3rdparty/libxml2/chvalid.c +++ b/sdk/lib/3rdparty/libxml2/chvalid.c @@ -332,5 +332,3 @@ xmlIsPubidChar(unsigned int ch) { return(xmlIsPubidCharQ(ch)); } -#define bottom_chvalid -#include "elfgcchack.h" diff --git a/sdk/lib/3rdparty/libxml2/config.h b/sdk/lib/3rdparty/libxml2/config.h index 596556c11d3..613a0f4c4e7 100644 --- a/sdk/lib/3rdparty/libxml2/config.h +++ b/sdk/lib/3rdparty/libxml2/config.h @@ -19,13 +19,6 @@ /* Whether struct sockaddr::__ss_family exists */ /* #undef HAVE_BROKEN_SS_FAMILY */ -/* Define to 1 if you have the <ctype.h> header file. */ -#define HAVE_CTYPE_H 1 - -/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - /* Define to 1 if you have the <dlfcn.h> header file. */ /* #undef HAVE_DLFCN_H */ @@ -35,18 +28,9 @@ /* Define to 1 if you have the <dl.h> header file. */ /* #undef HAVE_DL_H */ -/* Define to 1 if you have the <errno.h> header file. */ -#define HAVE_ERRNO_H 1 - /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 -/* Define to 1 if you have the <float.h> header file. */ -#define HAVE_FLOAT_H 1 - -/* Define to 1 if you have the `fprintf' function. */ -#define HAVE_FPRINTF 1 - /* Define to 1 if you have the `ftime' function. */ #define HAVE_FTIME 1 @@ -68,21 +52,9 @@ /* Define if readline library is there (-lreadline) */ /* #undef HAVE_LIBREADLINE */ -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the `localtime' function. */ -#define HAVE_LOCALTIME 1 - /* Define to 1 if you have the <lzma.h> header file. */ /* #undef HAVE_LZMA_H */ -/* Define to 1 if you have the <malloc.h> header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the <math.h> header file. */ -#define HAVE_MATH_H 1 - /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -97,9 +69,6 @@ # undef /**/ HAVE_MMAP #endif -/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - /* Define to 1 if you have the <netdb.h> header file. */ /* #undef HAVE_NETDB_H */ @@ -109,18 +78,12 @@ /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */ -/* Define to 1 if you have the `printf' function. */ -#define HAVE_PRINTF 1 - /* Define if <pthread.h> is there */ /* #undef HAVE_PTHREAD_H */ /* Define to 1 if you have the `putenv' function. */ /* #undef HAVE_PUTENV */ -/* Define to 1 if you have the `rand' function. */ -#define HAVE_RAND 1 - /* Define to 1 if you have the `rand_r' function. */ /* #undef HAVE_RAND_R */ @@ -130,56 +93,27 @@ /* Have shl_load based dso */ /* #undef HAVE_SHLLOAD */ -/* Define to 1 if you have the `signal' function. */ -#define HAVE_SIGNAL 1 - -/* Define to 1 if you have the <signal.h> header file. */ -#define HAVE_SIGNAL_H 1 - /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 -/* Define to 1 if you have the `sprintf' function. */ -#define HAVE_SPRINTF 1 - -/* Define to 1 if you have the `srand' function. */ -#define HAVE_SRAND 1 - -/* Define to 1 if you have the `sscanf' function. */ -#define HAVE_SSCANF 1 - /* Define to 1 if you have the `stat' function. */ #define HAVE_STAT 1 -/* Define to 1 if you have the <stdarg.h> header file. */ -#define HAVE_STDARG_H 1 - /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strftime' function. */ -#define HAVE_STRFTIME 1 - /* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - /* Define to 1 if you have the <sys/mman.h> header file. */ /* #undef HAVE_SYS_MMAN_H */ -/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - /* Define to 1 if you have the <sys/select.h> header file. */ /* #undef HAVE_SYS_SELECT_H */ @@ -198,36 +132,21 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define to 1 if you have the `time' function. */ -#define HAVE_TIME 1 - -/* Define to 1 if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 /* Whether va_copy() is available */ #define HAVE_VA_COPY 1 -/* Define to 1 if you have the `vfprintf' function. */ -#define HAVE_VFPRINTF 1 - /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 -/* Define to 1 if you have the `vsprintf' function. */ -#define HAVE_VSPRINTF 1 - /* Define to 1 if you have the <zlib.h> header file. */ #define HAVE_ZLIB_H 1 /* Whether __va_copy() is available */ #define HAVE___VA_COPY 1 -/* Define as const if the declaration of iconv() needs const. */ -/* #undef ICONV_CONST */ - /* Define to the sub-directory where libtool stores uninstalled libraries. */ /* #undef LT_OBJDIR */ @@ -265,7 +184,7 @@ /* #undef VA_LIST_IS_ARRAY */ /* Version number of package */ -#define VERSION "2.9.14" +#define VERSION "2.10.0" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T int diff --git a/sdk/lib/3rdparty/libxml2/debugXML.c b/sdk/lib/3rdparty/libxml2/debugXML.c index 7a2ca47d225..f451c9d5c41 100644 --- a/sdk/lib/3rdparty/libxml2/debugXML.c +++ b/sdk/lib/3rdparty/libxml2/debugXML.c @@ -12,12 +12,8 @@ #ifdef LIBXML_DEBUG_ENABLED #include <string.h> -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif -#ifdef HAVE_STRING_H -#include <string.h> -#endif + #include <libxml/xmlmemory.h> #include <libxml/tree.h> #include <libxml/parser.h> @@ -409,9 +405,6 @@ xmlCtxtGenericNodeCheck(xmlDebugCtxtPtr ctxt, xmlNodePtr node) { case XML_NAMESPACE_DECL: case XML_XINCLUDE_START: case XML_XINCLUDE_END: -#ifdef LIBXML_DOCB_ENABLED - case XML_DOCB_DOCUMENT_NODE: -#endif case XML_DOCUMENT_NODE: case XML_HTML_DOCUMENT_NODE: break; @@ -1615,9 +1608,6 @@ xmlLsCountNode(xmlNodePtr node) { break; case XML_DOCUMENT_NODE: case XML_HTML_DOCUMENT_NODE: -#ifdef LIBXML_DOCB_ENABLED - case XML_DOCB_DOCUMENT_NODE: -#endif list = ((xmlDocPtr) node)->children; break; case XML_ATTRIBUTE_NODE: @@ -1850,6 +1840,7 @@ xmlShellPrintXPathError(int errorType, const char *arg) xmlGenericError(xmlGenericErrorContext, "%s is a string\n", arg); break; +#ifdef LIBXML_XPTR_LOCS_ENABLED case XPATH_POINT: xmlGenericError(xmlGenericErrorContext, "%s is a point\n", arg); @@ -1862,6 +1853,7 @@ xmlShellPrintXPathError(int errorType, const char *arg) xmlGenericError(xmlGenericErrorContext, "%s is a range\n", arg); break; +#endif /* LIBXML_XPTR_LOCS_ENABLED */ case XPATH_USERS: xmlGenericError(xmlGenericErrorContext, "%s is user-defined\n", arg); @@ -3008,6 +3000,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a string\n", arg); break; +#ifdef LIBXML_XPTR_LOCS_ENABLED case XPATH_POINT: xmlGenericError(xmlGenericErrorContext, "%s is a point\n", arg); @@ -3020,6 +3013,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a range\n", arg); break; +#endif /* LIBXML_XPTR_LOCS_ENABLED */ case XPATH_USERS: xmlGenericError(xmlGenericErrorContext, "%s is user-defined\n", arg); @@ -3125,6 +3119,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a string\n", arg); break; +#ifdef LIBXML_XPTR_LOCS_ENABLED case XPATH_POINT: xmlGenericError(xmlGenericErrorContext, "%s is a point\n", arg); @@ -3137,6 +3132,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a range\n", arg); break; +#endif /* LIBXML_XPTR_LOCS_ENABLED */ case XPATH_USERS: xmlGenericError(xmlGenericErrorContext, "%s is user-defined\n", arg); @@ -3202,6 +3198,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a string\n", arg); break; +#ifdef LIBXML_XPTR_LOCS_ENABLED case XPATH_POINT: xmlGenericError(xmlGenericErrorContext, "%s is a point\n", arg); @@ -3214,6 +3211,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a range\n", arg); break; +#endif /* LIBXML_XPTR_LOCS_ENABLED */ case XPATH_USERS: xmlGenericError(xmlGenericErrorContext, "%s is user-defined\n", arg); @@ -3287,6 +3285,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a string\n", arg); break; +#ifdef LIBXML_XPTR_LOCS_ENABLED case XPATH_POINT: xmlGenericError(xmlGenericErrorContext, "%s is a point\n", arg); @@ -3299,6 +3298,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a range\n", arg); break; +#endif /* LIBXML_XPTR_LOCS_ENABLED */ case XPATH_USERS: xmlGenericError(xmlGenericErrorContext, "%s is user-defined\n", arg); @@ -3365,6 +3365,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a string\n", arg); break; +#ifdef LIBXML_XPTR_LOCS_ENABLED case XPATH_POINT: xmlGenericError(xmlGenericErrorContext, "%s is a point\n", arg); @@ -3377,6 +3378,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, xmlGenericError(xmlGenericErrorContext, "%s is a range\n", arg); break; +#endif /* LIBXML_XPTR_LOCS_ENABLED */ case XPATH_USERS: xmlGenericError(xmlGenericErrorContext, "%s is user-defined\n", arg); @@ -3418,6 +3420,5 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input, } #endif /* LIBXML_XPATH_ENABLED */ -#define bottom_debugXML -#include "elfgcchack.h" + #endif /* LIBXML_DEBUG_ENABLED */ diff --git a/sdk/lib/3rdparty/libxml2/dict.c b/sdk/lib/3rdparty/libxml2/dict.c index 90e4d81403c..c29d2af77a7 100644 --- a/sdk/lib/3rdparty/libxml2/dict.c +++ b/sdk/lib/3rdparty/libxml2/dict.c @@ -20,12 +20,8 @@ #include "libxml.h" #include <limits.h> -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif -#ifdef HAVE_TIME_H #include <time.h> -#endif /* * Following http://www.ocert.org/advisories/ocert-2011-003.html @@ -38,8 +34,7 @@ * list we will use the BigKey algo as soon as the hash size grows * over MIN_DICT_SIZE so this actually works */ -#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) && \ - !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) +#if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) #define DICT_RANDOMIZATION #endif @@ -132,7 +127,7 @@ struct _xmlDict { * A mutex for modifying the reference counter for shared * dictionaries. */ -static xmlRMutexPtr xmlDictMutex = NULL; +static xmlMutexPtr xmlDictMutex = NULL; /* * Whether the dictionary mutex was initialized. @@ -151,8 +146,10 @@ static unsigned int rand_seed = 0; /** * xmlInitializeDict: * + * DEPRECATED: This function will be made private. Call xmlInitParser to + * initialize the library. + * * Do the dictionary mutex initialization. - * this function is deprecated * * Returns 0 if initialization was already done, and 1 if that * call led to the initialization @@ -177,9 +174,9 @@ int __xmlInitializeDict(void) { if (xmlDictInitialized) return(1); - if ((xmlDictMutex = xmlNewRMutex()) == NULL) + if ((xmlDictMutex = xmlNewMutex()) == NULL) return(0); - xmlRMutexLock(xmlDictMutex); + xmlMutexLock(xmlDictMutex); #ifdef DICT_RANDOMIZATION #ifdef HAVE_RAND_R @@ -190,7 +187,7 @@ int __xmlInitializeDict(void) { #endif #endif xmlDictInitialized = 1; - xmlRMutexUnlock(xmlDictMutex); + xmlMutexUnlock(xmlDictMutex); return(1); } @@ -201,13 +198,13 @@ int __xmlRandom(void) { if (xmlDictInitialized == 0) __xmlInitializeDict(); - xmlRMutexLock(xmlDictMutex); + xmlMutexLock(xmlDictMutex); #ifdef HAVE_RAND_R ret = rand_r(& rand_seed); #else ret = rand(); #endif - xmlRMutexUnlock(xmlDictMutex); + xmlMutexUnlock(xmlDictMutex); return(ret); } #endif @@ -215,6 +212,11 @@ int __xmlRandom(void) { /** * xmlDictCleanup: * + * DEPRECATED: This function will be made private. Call xmlCleanupParser + * to free global state but see the warnings there. xmlCleanupParser + * should be only called once at program exit. In most cases, you don't + * have call cleanup functions at all. + * * Free the dictionary mutex. Do not call unless sure the library * is not in use anymore ! */ @@ -223,7 +225,7 @@ xmlDictCleanup(void) { if (!xmlDictInitialized) return; - xmlFreeRMutex(xmlDictMutex); + xmlFreeMutex(xmlDictMutex); xmlDictInitialized = 0; } @@ -648,9 +650,9 @@ xmlDictReference(xmlDictPtr dict) { return(-1); if (dict == NULL) return -1; - xmlRMutexLock(xmlDictMutex); + xmlMutexLock(xmlDictMutex); dict->ref_counter++; - xmlRMutexUnlock(xmlDictMutex); + xmlMutexUnlock(xmlDictMutex); return(0); } @@ -812,14 +814,14 @@ xmlDictFree(xmlDictPtr dict) { return; /* decrement the counter, it may be shared by a parser and docs */ - xmlRMutexLock(xmlDictMutex); + xmlMutexLock(xmlDictMutex); dict->ref_counter--; if (dict->ref_counter > 0) { - xmlRMutexUnlock(xmlDictMutex); + xmlMutexUnlock(xmlDictMutex); return; } - xmlRMutexUnlock(xmlDictMutex); + xmlMutexUnlock(xmlDictMutex); if (dict->subdict != NULL) { xmlDictFree(dict->subdict); @@ -1294,5 +1296,3 @@ xmlDictGetUsage(xmlDictPtr dict) { return(limit); } -#define bottom_dict -#include "elfgcchack.h" diff --git a/sdk/lib/3rdparty/libxml2/elfgcchack.h b/sdk/lib/3rdparty/libxml2/elfgcchack.h deleted file mode 100644 index 301daf303ec..00000000000 --- a/sdk/lib/3rdparty/libxml2/elfgcchack.h +++ /dev/null @@ -1,17830 +0,0 @@ -/* - * elfgcchack.h: hack by Arjan van de Ven <arjanv(a)redhat.com> to speed - * up the code when using gcc for call within the library. - * - * Based on the analysis http://people.redhat.com/drepper/dsohowto.pdf - * from Ulrich drepper. Rewritten to be generated from the XML description - * file for libxml2 API - * autogenerated with xsltproc doc/elfgcchack.xsl doc/libxml2-api.xml - */ - -#ifdef IN_LIBXML -#ifdef __GNUC__ -#ifdef PIC -#ifdef __linux__ -#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) - -#include "libxml/c14n.h" -#include "libxml/catalog.h" -#include "libxml/chvalid.h" -#include "libxml/debugXML.h" -#include "libxml/dict.h" -#include "libxml/DOCBparser.h" -#include "libxml/encoding.h" -#include "libxml/entities.h" -#include "libxml/globals.h" -#include "libxml/hash.h" -#include "libxml/HTMLparser.h" -#include "libxml/HTMLtree.h" -#include "libxml/list.h" -#include "libxml/nanoftp.h" -#include "libxml/nanohttp.h" -#include "libxml/parser.h" -#include "libxml/parserInternals.h" -#include "libxml/pattern.h" -#include "libxml/relaxng.h" -#include "libxml/SAX2.h" -#include "libxml/SAX.h" -#include "libxml/schemasInternals.h" -#include "libxml/schematron.h" -#include "libxml/threads.h" -#include "libxml/tree.h" -#include "libxml/uri.h" -#include "libxml/valid.h" -#include "libxml/xinclude.h" -#include "libxml/xlink.h" -#include "libxml/xmlautomata.h" -#include "libxml/xmlerror.h" -#include "libxml/xmlexports.h" -#include "libxml/xmlIO.h" -#include "libxml/xmlmemory.h" -#include "libxml/xmlreader.h" -#include "libxml/xmlregexp.h" -#include "libxml/xmlsave.h" -#include "libxml/xmlschemas.h" -#include "libxml/xmlschemastypes.h" -#include "libxml/xmlstring.h" -#include "libxml/xmlunicode.h" -#include "libxml/xmlversion.h" -#include "libxml/xmlwriter.h" -#include "libxml/xpath.h" -#include "libxml/xpathInternals.h" -#include "libxml/xpointer.h" -#include "libxml/xmlmodule.h" - -/* special hot spot not exported ones */ - -#ifdef bottom_globals -#undef __xmlGenericError -extern __typeof (__xmlGenericError) __xmlGenericError __attribute((alias("__xmlGenericError__internal_alias"))); -#else -#ifndef __xmlGenericError -extern __typeof (__xmlGenericError) __xmlGenericError__internal_alias __attribute((visibility("hidden"))); -#define __xmlGenericError __xmlGenericError__internal_alias -#endif -#endif - -#ifdef bottom_globals -#undef __xmlGenericErrorContext -extern __typeof (__xmlGenericErrorContext) __xmlGenericErrorContext __attribute((alias("__xmlGenericErrorContext__internal_alias"))); -#else -#ifndef __xmlGenericErrorContext -extern __typeof (__xmlGenericErrorContext) __xmlGenericErrorContext__internal_alias __attribute((visibility("hidden"))); -#define __xmlGenericErrorContext __xmlGenericErrorContext__internal_alias -#endif -#endif - -/* list generated from libxml2-api.xml */ -#if defined(LIBXML_DOCB_ENABLED) -#ifdef bottom_DOCBparser -#undef docbCreatePushParserCtxt -extern __typeof (docbCreatePushParserCtxt) docbCreatePushParserCtxt __attribute((alias("docbCreatePushParserCtxt__internal_alias"))); -#else -#ifndef docbCreatePushParserCtxt -extern __typeof (docbCreatePushParserCtxt) docbCreatePushParserCtxt__internal_alias __attribute((visibility("hidden"))); -#define docbCreatePushParserCtxt docbCreatePushParserCtxt__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlAttrAllowed -extern __typeof (htmlAttrAllowed) htmlAttrAllowed __attribute((alias("htmlAttrAllowed__internal_alias"))); -#else -#ifndef htmlAttrAllowed -extern __typeof (htmlAttrAllowed) htmlAttrAllowed__internal_alias __attribute((visibility("hidden"))); -#define htmlAttrAllowed htmlAttrAllowed__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlAutoCloseTag -extern __typeof (htmlAutoCloseTag) htmlAutoCloseTag __attribute((alias("htmlAutoCloseTag__internal_alias"))); -#else -#ifndef htmlAutoCloseTag -extern __typeof (htmlAutoCloseTag) htmlAutoCloseTag__internal_alias __attribute((visibility("hidden"))); -#define htmlAutoCloseTag htmlAutoCloseTag__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCreateFileParserCtxt -extern __typeof (htmlCreateFileParserCtxt) htmlCreateFileParserCtxt __attribute((alias("htmlCreateFileParserCtxt__internal_alias"))); -#else -#ifndef htmlCreateFileParserCtxt -extern __typeof (htmlCreateFileParserCtxt) htmlCreateFileParserCtxt__internal_alias __attribute((visibility("hidden"))); -#define htmlCreateFileParserCtxt htmlCreateFileParserCtxt__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCreateMemoryParserCtxt -extern __typeof (htmlCreateMemoryParserCtxt) htmlCreateMemoryParserCtxt __attribute((alias("htmlCreateMemoryParserCtxt__internal_alias"))); -#else -#ifndef htmlCreateMemoryParserCtxt -extern __typeof (htmlCreateMemoryParserCtxt) htmlCreateMemoryParserCtxt__internal_alias __attribute((visibility("hidden"))); -#define htmlCreateMemoryParserCtxt htmlCreateMemoryParserCtxt__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCreatePushParserCtxt -extern __typeof (htmlCreatePushParserCtxt) htmlCreatePushParserCtxt __attribute((alias("htmlCreatePushParserCtxt__internal_alias"))); -#else -#ifndef htmlCreatePushParserCtxt -extern __typeof (htmlCreatePushParserCtxt) htmlCreatePushParserCtxt__internal_alias __attribute((visibility("hidden"))); -#define htmlCreatePushParserCtxt htmlCreatePushParserCtxt__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtReadDoc -extern __typeof (htmlCtxtReadDoc) htmlCtxtReadDoc __attribute((alias("htmlCtxtReadDoc__internal_alias"))); -#else -#ifndef htmlCtxtReadDoc -extern __typeof (htmlCtxtReadDoc) htmlCtxtReadDoc__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtReadDoc htmlCtxtReadDoc__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtReadFd -extern __typeof (htmlCtxtReadFd) htmlCtxtReadFd __attribute((alias("htmlCtxtReadFd__internal_alias"))); -#else -#ifndef htmlCtxtReadFd -extern __typeof (htmlCtxtReadFd) htmlCtxtReadFd__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtReadFd htmlCtxtReadFd__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtReadFile -extern __typeof (htmlCtxtReadFile) htmlCtxtReadFile __attribute((alias("htmlCtxtReadFile__internal_alias"))); -#else -#ifndef htmlCtxtReadFile -extern __typeof (htmlCtxtReadFile) htmlCtxtReadFile__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtReadFile htmlCtxtReadFile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtReadIO -extern __typeof (htmlCtxtReadIO) htmlCtxtReadIO __attribute((alias("htmlCtxtReadIO__internal_alias"))); -#else -#ifndef htmlCtxtReadIO -extern __typeof (htmlCtxtReadIO) htmlCtxtReadIO__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtReadIO htmlCtxtReadIO__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtReadMemory -extern __typeof (htmlCtxtReadMemory) htmlCtxtReadMemory __attribute((alias("htmlCtxtReadMemory__internal_alias"))); -#else -#ifndef htmlCtxtReadMemory -extern __typeof (htmlCtxtReadMemory) htmlCtxtReadMemory__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtReadMemory htmlCtxtReadMemory__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtReset -extern __typeof (htmlCtxtReset) htmlCtxtReset __attribute((alias("htmlCtxtReset__internal_alias"))); -#else -#ifndef htmlCtxtReset -extern __typeof (htmlCtxtReset) htmlCtxtReset__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtReset htmlCtxtReset__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlCtxtUseOptions -extern __typeof (htmlCtxtUseOptions) htmlCtxtUseOptions __attribute((alias("htmlCtxtUseOptions__internal_alias"))); -#else -#ifndef htmlCtxtUseOptions -extern __typeof (htmlCtxtUseOptions) htmlCtxtUseOptions__internal_alias __attribute((visibility("hidden"))); -#define htmlCtxtUseOptions htmlCtxtUseOptions__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_SAX2 -#undef htmlDefaultSAXHandlerInit -extern __typeof (htmlDefaultSAXHandlerInit) htmlDefaultSAXHandlerInit __attribute((alias("htmlDefaultSAXHandlerInit__internal_alias"))); -#else -#ifndef htmlDefaultSAXHandlerInit -extern __typeof (htmlDefaultSAXHandlerInit) htmlDefaultSAXHandlerInit__internal_alias __attribute((visibility("hidden"))); -#define htmlDefaultSAXHandlerInit htmlDefaultSAXHandlerInit__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlDocContentDumpFormatOutput -extern __typeof (htmlDocContentDumpFormatOutput) htmlDocContentDumpFormatOutput __attribute((alias("htmlDocContentDumpFormatOutput__internal_alias"))); -#else -#ifndef htmlDocContentDumpFormatOutput -extern __typeof (htmlDocContentDumpFormatOutput) htmlDocContentDumpFormatOutput__internal_alias __attribute((visibility("hidden"))); -#define htmlDocContentDumpFormatOutput htmlDocContentDumpFormatOutput__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlDocContentDumpOutput -extern __typeof (htmlDocContentDumpOutput) htmlDocContentDumpOutput __attribute((alias("htmlDocContentDumpOutput__internal_alias"))); -#else -#ifndef htmlDocContentDumpOutput -extern __typeof (htmlDocContentDumpOutput) htmlDocContentDumpOutput__internal_alias __attribute((visibility("hidden"))); -#define htmlDocContentDumpOutput htmlDocContentDumpOutput__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlDocDump -extern __typeof (htmlDocDump) htmlDocDump __attribute((alias("htmlDocDump__internal_alias"))); -#else -#ifndef htmlDocDump -extern __typeof (htmlDocDump) htmlDocDump__internal_alias __attribute((visibility("hidden"))); -#define htmlDocDump htmlDocDump__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlDocDumpMemory -extern __typeof (htmlDocDumpMemory) htmlDocDumpMemory __attribute((alias("htmlDocDumpMemory__internal_alias"))); -#else -#ifndef htmlDocDumpMemory -extern __typeof (htmlDocDumpMemory) htmlDocDumpMemory__internal_alias __attribute((visibility("hidden"))); -#define htmlDocDumpMemory htmlDocDumpMemory__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlDocDumpMemoryFormat -extern __typeof (htmlDocDumpMemoryFormat) htmlDocDumpMemoryFormat __attribute((alias("htmlDocDumpMemoryFormat__internal_alias"))); -#else -#ifndef htmlDocDumpMemoryFormat -extern __typeof (htmlDocDumpMemoryFormat) htmlDocDumpMemoryFormat__internal_alias __attribute((visibility("hidden"))); -#define htmlDocDumpMemoryFormat htmlDocDumpMemoryFormat__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlElementAllowedHere -extern __typeof (htmlElementAllowedHere) htmlElementAllowedHere __attribute((alias("htmlElementAllowedHere__internal_alias"))); -#else -#ifndef htmlElementAllowedHere -extern __typeof (htmlElementAllowedHere) htmlElementAllowedHere__internal_alias __attribute((visibility("hidden"))); -#define htmlElementAllowedHere htmlElementAllowedHere__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlElementStatusHere -extern __typeof (htmlElementStatusHere) htmlElementStatusHere __attribute((alias("htmlElementStatusHere__internal_alias"))); -#else -#ifndef htmlElementStatusHere -extern __typeof (htmlElementStatusHere) htmlElementStatusHere__internal_alias __attribute((visibility("hidden"))); -#define htmlElementStatusHere htmlElementStatusHere__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlEncodeEntities -extern __typeof (htmlEncodeEntities) htmlEncodeEntities __attribute((alias("htmlEncodeEntities__internal_alias"))); -#else -#ifndef htmlEncodeEntities -extern __typeof (htmlEncodeEntities) htmlEncodeEntities__internal_alias __attribute((visibility("hidden"))); -#define htmlEncodeEntities htmlEncodeEntities__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlEntityLookup -extern __typeof (htmlEntityLookup) htmlEntityLookup __attribute((alias("htmlEntityLookup__internal_alias"))); -#else -#ifndef htmlEntityLookup -extern __typeof (htmlEntityLookup) htmlEntityLookup__internal_alias __attribute((visibility("hidden"))); -#define htmlEntityLookup htmlEntityLookup__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlEntityValueLookup -extern __typeof (htmlEntityValueLookup) htmlEntityValueLookup __attribute((alias("htmlEntityValueLookup__internal_alias"))); -#else -#ifndef htmlEntityValueLookup -extern __typeof (htmlEntityValueLookup) htmlEntityValueLookup__internal_alias __attribute((visibility("hidden"))); -#define htmlEntityValueLookup htmlEntityValueLookup__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlFreeParserCtxt -extern __typeof (htmlFreeParserCtxt) htmlFreeParserCtxt __attribute((alias("htmlFreeParserCtxt__internal_alias"))); -#else -#ifndef htmlFreeParserCtxt -extern __typeof (htmlFreeParserCtxt) htmlFreeParserCtxt__internal_alias __attribute((visibility("hidden"))); -#define htmlFreeParserCtxt htmlFreeParserCtxt__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlGetMetaEncoding -extern __typeof (htmlGetMetaEncoding) htmlGetMetaEncoding __attribute((alias("htmlGetMetaEncoding__internal_alias"))); -#else -#ifndef htmlGetMetaEncoding -extern __typeof (htmlGetMetaEncoding) htmlGetMetaEncoding__internal_alias __attribute((visibility("hidden"))); -#define htmlGetMetaEncoding htmlGetMetaEncoding__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlHandleOmittedElem -extern __typeof (htmlHandleOmittedElem) htmlHandleOmittedElem __attribute((alias("htmlHandleOmittedElem__internal_alias"))); -#else -#ifndef htmlHandleOmittedElem -extern __typeof (htmlHandleOmittedElem) htmlHandleOmittedElem__internal_alias __attribute((visibility("hidden"))); -#define htmlHandleOmittedElem htmlHandleOmittedElem__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlInitAutoClose -extern __typeof (htmlInitAutoClose) htmlInitAutoClose __attribute((alias("htmlInitAutoClose__internal_alias"))); -#else -#ifndef htmlInitAutoClose -extern __typeof (htmlInitAutoClose) htmlInitAutoClose__internal_alias __attribute((visibility("hidden"))); -#define htmlInitAutoClose htmlInitAutoClose__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlIsAutoClosed -extern __typeof (htmlIsAutoClosed) htmlIsAutoClosed __attribute((alias("htmlIsAutoClosed__internal_alias"))); -#else -#ifndef htmlIsAutoClosed -extern __typeof (htmlIsAutoClosed) htmlIsAutoClosed__internal_alias __attribute((visibility("hidden"))); -#define htmlIsAutoClosed htmlIsAutoClosed__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlIsBooleanAttr -extern __typeof (htmlIsBooleanAttr) htmlIsBooleanAttr __attribute((alias("htmlIsBooleanAttr__internal_alias"))); -#else -#ifndef htmlIsBooleanAttr -extern __typeof (htmlIsBooleanAttr) htmlIsBooleanAttr__internal_alias __attribute((visibility("hidden"))); -#define htmlIsBooleanAttr htmlIsBooleanAttr__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlIsScriptAttribute -extern __typeof (htmlIsScriptAttribute) htmlIsScriptAttribute __attribute((alias("htmlIsScriptAttribute__internal_alias"))); -#else -#ifndef htmlIsScriptAttribute -extern __typeof (htmlIsScriptAttribute) htmlIsScriptAttribute__internal_alias __attribute((visibility("hidden"))); -#define htmlIsScriptAttribute htmlIsScriptAttribute__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlNewDoc -extern __typeof (htmlNewDoc) htmlNewDoc __attribute((alias("htmlNewDoc__internal_alias"))); -#else -#ifndef htmlNewDoc -extern __typeof (htmlNewDoc) htmlNewDoc__internal_alias __attribute((visibility("hidden"))); -#define htmlNewDoc htmlNewDoc__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlNewDocNoDtD -extern __typeof (htmlNewDocNoDtD) htmlNewDocNoDtD __attribute((alias("htmlNewDocNoDtD__internal_alias"))); -#else -#ifndef htmlNewDocNoDtD -extern __typeof (htmlNewDocNoDtD) htmlNewDocNoDtD__internal_alias __attribute((visibility("hidden"))); -#define htmlNewDocNoDtD htmlNewDocNoDtD__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlNewParserCtxt -extern __typeof (htmlNewParserCtxt) htmlNewParserCtxt __attribute((alias("htmlNewParserCtxt__internal_alias"))); -#else -#ifndef htmlNewParserCtxt -extern __typeof (htmlNewParserCtxt) htmlNewParserCtxt__internal_alias __attribute((visibility("hidden"))); -#define htmlNewParserCtxt htmlNewParserCtxt__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlNodeDump -extern __typeof (htmlNodeDump) htmlNodeDump __attribute((alias("htmlNodeDump__internal_alias"))); -#else -#ifndef htmlNodeDump -extern __typeof (htmlNodeDump) htmlNodeDump__internal_alias __attribute((visibility("hidden"))); -#define htmlNodeDump htmlNodeDump__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlNodeDumpFile -extern __typeof (htmlNodeDumpFile) htmlNodeDumpFile __attribute((alias("htmlNodeDumpFile__internal_alias"))); -#else -#ifndef htmlNodeDumpFile -extern __typeof (htmlNodeDumpFile) htmlNodeDumpFile__internal_alias __attribute((visibility("hidden"))); -#define htmlNodeDumpFile htmlNodeDumpFile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlNodeDumpFileFormat -extern __typeof (htmlNodeDumpFileFormat) htmlNodeDumpFileFormat __attribute((alias("htmlNodeDumpFileFormat__internal_alias"))); -#else -#ifndef htmlNodeDumpFileFormat -extern __typeof (htmlNodeDumpFileFormat) htmlNodeDumpFileFormat__internal_alias __attribute((visibility("hidden"))); -#define htmlNodeDumpFileFormat htmlNodeDumpFileFormat__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlNodeDumpFormatOutput -extern __typeof (htmlNodeDumpFormatOutput) htmlNodeDumpFormatOutput __attribute((alias("htmlNodeDumpFormatOutput__internal_alias"))); -#else -#ifndef htmlNodeDumpFormatOutput -extern __typeof (htmlNodeDumpFormatOutput) htmlNodeDumpFormatOutput__internal_alias __attribute((visibility("hidden"))); -#define htmlNodeDumpFormatOutput htmlNodeDumpFormatOutput__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlNodeDumpOutput -extern __typeof (htmlNodeDumpOutput) htmlNodeDumpOutput __attribute((alias("htmlNodeDumpOutput__internal_alias"))); -#else -#ifndef htmlNodeDumpOutput -extern __typeof (htmlNodeDumpOutput) htmlNodeDumpOutput__internal_alias __attribute((visibility("hidden"))); -#define htmlNodeDumpOutput htmlNodeDumpOutput__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlNodeStatus -extern __typeof (htmlNodeStatus) htmlNodeStatus __attribute((alias("htmlNodeStatus__internal_alias"))); -#else -#ifndef htmlNodeStatus -extern __typeof (htmlNodeStatus) htmlNodeStatus__internal_alias __attribute((visibility("hidden"))); -#define htmlNodeStatus htmlNodeStatus__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseCharRef -extern __typeof (htmlParseCharRef) htmlParseCharRef __attribute((alias("htmlParseCharRef__internal_alias"))); -#else -#ifndef htmlParseCharRef -extern __typeof (htmlParseCharRef) htmlParseCharRef__internal_alias __attribute((visibility("hidden"))); -#define htmlParseCharRef htmlParseCharRef__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_PUSH_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseChunk -extern __typeof (htmlParseChunk) htmlParseChunk __attribute((alias("htmlParseChunk__internal_alias"))); -#else -#ifndef htmlParseChunk -extern __typeof (htmlParseChunk) htmlParseChunk__internal_alias __attribute((visibility("hidden"))); -#define htmlParseChunk htmlParseChunk__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseDoc -extern __typeof (htmlParseDoc) htmlParseDoc __attribute((alias("htmlParseDoc__internal_alias"))); -#else -#ifndef htmlParseDoc -extern __typeof (htmlParseDoc) htmlParseDoc__internal_alias __attribute((visibility("hidden"))); -#define htmlParseDoc htmlParseDoc__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseDocument -extern __typeof (htmlParseDocument) htmlParseDocument __attribute((alias("htmlParseDocument__internal_alias"))); -#else -#ifndef htmlParseDocument -extern __typeof (htmlParseDocument) htmlParseDocument__internal_alias __attribute((visibility("hidden"))); -#define htmlParseDocument htmlParseDocument__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseElement -extern __typeof (htmlParseElement) htmlParseElement __attribute((alias("htmlParseElement__internal_alias"))); -#else -#ifndef htmlParseElement -extern __typeof (htmlParseElement) htmlParseElement__internal_alias __attribute((visibility("hidden"))); -#define htmlParseElement htmlParseElement__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseEntityRef -extern __typeof (htmlParseEntityRef) htmlParseEntityRef __attribute((alias("htmlParseEntityRef__internal_alias"))); -#else -#ifndef htmlParseEntityRef -extern __typeof (htmlParseEntityRef) htmlParseEntityRef__internal_alias __attribute((visibility("hidden"))); -#define htmlParseEntityRef htmlParseEntityRef__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlParseFile -extern __typeof (htmlParseFile) htmlParseFile __attribute((alias("htmlParseFile__internal_alias"))); -#else -#ifndef htmlParseFile -extern __typeof (htmlParseFile) htmlParseFile__internal_alias __attribute((visibility("hidden"))); -#define htmlParseFile htmlParseFile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlReadDoc -extern __typeof (htmlReadDoc) htmlReadDoc __attribute((alias("htmlReadDoc__internal_alias"))); -#else -#ifndef htmlReadDoc -extern __typeof (htmlReadDoc) htmlReadDoc__internal_alias __attribute((visibility("hidden"))); -#define htmlReadDoc htmlReadDoc__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlReadFd -extern __typeof (htmlReadFd) htmlReadFd __attribute((alias("htmlReadFd__internal_alias"))); -#else -#ifndef htmlReadFd -extern __typeof (htmlReadFd) htmlReadFd__internal_alias __attribute((visibility("hidden"))); -#define htmlReadFd htmlReadFd__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlReadFile -extern __typeof (htmlReadFile) htmlReadFile __attribute((alias("htmlReadFile__internal_alias"))); -#else -#ifndef htmlReadFile -extern __typeof (htmlReadFile) htmlReadFile__internal_alias __attribute((visibility("hidden"))); -#define htmlReadFile htmlReadFile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlReadIO -extern __typeof (htmlReadIO) htmlReadIO __attribute((alias("htmlReadIO__internal_alias"))); -#else -#ifndef htmlReadIO -extern __typeof (htmlReadIO) htmlReadIO__internal_alias __attribute((visibility("hidden"))); -#define htmlReadIO htmlReadIO__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlReadMemory -extern __typeof (htmlReadMemory) htmlReadMemory __attribute((alias("htmlReadMemory__internal_alias"))); -#else -#ifndef htmlReadMemory -extern __typeof (htmlReadMemory) htmlReadMemory__internal_alias __attribute((visibility("hidden"))); -#define htmlReadMemory htmlReadMemory__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlSAXParseDoc -extern __typeof (htmlSAXParseDoc) htmlSAXParseDoc __attribute((alias("htmlSAXParseDoc__internal_alias"))); -#else -#ifndef htmlSAXParseDoc -extern __typeof (htmlSAXParseDoc) htmlSAXParseDoc__internal_alias __attribute((visibility("hidden"))); -#define htmlSAXParseDoc htmlSAXParseDoc__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlSAXParseFile -extern __typeof (htmlSAXParseFile) htmlSAXParseFile __attribute((alias("htmlSAXParseFile__internal_alias"))); -#else -#ifndef htmlSAXParseFile -extern __typeof (htmlSAXParseFile) htmlSAXParseFile__internal_alias __attribute((visibility("hidden"))); -#define htmlSAXParseFile htmlSAXParseFile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlSaveFile -extern __typeof (htmlSaveFile) htmlSaveFile __attribute((alias("htmlSaveFile__internal_alias"))); -#else -#ifndef htmlSaveFile -extern __typeof (htmlSaveFile) htmlSaveFile__internal_alias __attribute((visibility("hidden"))); -#define htmlSaveFile htmlSaveFile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlSaveFileEnc -extern __typeof (htmlSaveFileEnc) htmlSaveFileEnc __attribute((alias("htmlSaveFileEnc__internal_alias"))); -#else -#ifndef htmlSaveFileEnc -extern __typeof (htmlSaveFileEnc) htmlSaveFileEnc__internal_alias __attribute((visibility("hidden"))); -#define htmlSaveFileEnc htmlSaveFileEnc__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlSaveFileFormat -extern __typeof (htmlSaveFileFormat) htmlSaveFileFormat __attribute((alias("htmlSaveFileFormat__internal_alias"))); -#else -#ifndef htmlSaveFileFormat -extern __typeof (htmlSaveFileFormat) htmlSaveFileFormat__internal_alias __attribute((visibility("hidden"))); -#define htmlSaveFileFormat htmlSaveFileFormat__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLtree -#undef htmlSetMetaEncoding -extern __typeof (htmlSetMetaEncoding) htmlSetMetaEncoding __attribute((alias("htmlSetMetaEncoding__internal_alias"))); -#else -#ifndef htmlSetMetaEncoding -extern __typeof (htmlSetMetaEncoding) htmlSetMetaEncoding__internal_alias __attribute((visibility("hidden"))); -#define htmlSetMetaEncoding htmlSetMetaEncoding__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_HTML_ENABLED) -#ifdef bottom_HTMLparser -#undef htmlTagLookup -extern __typeof (htmlTagLookup) htmlTagLookup __attribute((alias("htmlTagLookup__internal_alias"))); -#else -#ifndef htmlTagLookup -extern __typeof (htmlTagLookup) htmlTagLookup__internal_alias __attribute((visibility("hidden"))); -#define htmlTagLookup htmlTagLookup__internal_alias -#endif -#endif -#endif - -#ifdef bottom_parser -#undef inputPop -extern __typeof (inputPop) inputPop __attribute((alias("inputPop__internal_alias"))); -#else -#ifndef inputPop -extern __typeof (inputPop) inputPop__internal_alias __attribute((visibility("hidden"))); -#define inputPop inputPop__internal_alias -#endif -#endif - -#ifdef bottom_parser -#undef inputPush -extern __typeof (inputPush) inputPush __attribute((alias("inputPush__internal_alias"))); -#else -#ifndef inputPush -extern __typeof (inputPush) inputPush__internal_alias __attribute((visibility("hidden"))); -#define inputPush inputPush__internal_alias -#endif -#endif - -#ifdef bottom_parser -#undef namePop -extern __typeof (namePop) namePop __attribute((alias("namePop__internal_alias"))); -#else -#ifndef namePop -extern __typeof (namePop) namePop__internal_alias __attribute((visibility("hidden"))); -#define namePop namePop__internal_alias -#endif -#endif - -#ifdef bottom_parser -#undef namePush -extern __typeof (namePush) namePush __attribute((alias("namePush__internal_alias"))); -#else -#ifndef namePush -extern __typeof (namePush) namePush__internal_alias __attribute((visibility("hidden"))); -#define namePush namePush__internal_alias -#endif -#endif - -#ifdef bottom_parser -#undef nodePop -extern __typeof (nodePop) nodePop __attribute((alias("nodePop__internal_alias"))); -#else -#ifndef nodePop -extern __typeof (nodePop) nodePop__internal_alias __attribute((visibility("hidden"))); -#define nodePop nodePop__internal_alias -#endif -#endif - -#ifdef bottom_parser -#undef nodePush -extern __typeof (nodePush) nodePush __attribute((alias("nodePush__internal_alias"))); -#else -#ifndef nodePush -extern __typeof (nodePush) nodePush__internal_alias __attribute((visibility("hidden"))); -#define nodePush nodePush__internal_alias -#endif -#endif - -#if defined(LIBXML_XPATH_ENABLED) -#ifdef bottom_xpath -#undef valuePop -extern __typeof (valuePop) valuePop __attribute((alias("valuePop__internal_alias"))); -#else -#ifndef valuePop -extern __typeof (valuePop) valuePop__internal_alias __attribute((visibility("hidden"))); -#define valuePop valuePop__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_XPATH_ENABLED) -#ifdef bottom_xpath -#undef valuePush -extern __typeof (valuePush) valuePush __attribute((alias("valuePush__internal_alias"))); -#else -#ifndef valuePush -extern __typeof (valuePush) valuePush__internal_alias __attribute((visibility("hidden"))); -#define valuePush valuePush__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogAdd -extern __typeof (xmlACatalogAdd) xmlACatalogAdd __attribute((alias("xmlACatalogAdd__internal_alias"))); -#else -#ifndef xmlACatalogAdd -extern __typeof (xmlACatalogAdd) xmlACatalogAdd__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogAdd xmlACatalogAdd__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogDump -extern __typeof (xmlACatalogDump) xmlACatalogDump __attribute((alias("xmlACatalogDump__internal_alias"))); -#else -#ifndef xmlACatalogDump -extern __typeof (xmlACatalogDump) xmlACatalogDump__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogDump xmlACatalogDump__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogRemove -extern __typeof (xmlACatalogRemove) xmlACatalogRemove __attribute((alias("xmlACatalogRemove__internal_alias"))); -#else -#ifndef xmlACatalogRemove -extern __typeof (xmlACatalogRemove) xmlACatalogRemove__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogRemove xmlACatalogRemove__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogResolve -extern __typeof (xmlACatalogResolve) xmlACatalogResolve __attribute((alias("xmlACatalogResolve__internal_alias"))); -#else -#ifndef xmlACatalogResolve -extern __typeof (xmlACatalogResolve) xmlACatalogResolve__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogResolve xmlACatalogResolve__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogResolvePublic -extern __typeof (xmlACatalogResolvePublic) xmlACatalogResolvePublic __attribute((alias("xmlACatalogResolvePublic__internal_alias"))); -#else -#ifndef xmlACatalogResolvePublic -extern __typeof (xmlACatalogResolvePublic) xmlACatalogResolvePublic__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogResolvePublic xmlACatalogResolvePublic__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogResolveSystem -extern __typeof (xmlACatalogResolveSystem) xmlACatalogResolveSystem __attribute((alias("xmlACatalogResolveSystem__internal_alias"))); -#else -#ifndef xmlACatalogResolveSystem -extern __typeof (xmlACatalogResolveSystem) xmlACatalogResolveSystem__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogResolveSystem xmlACatalogResolveSystem__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_CATALOG_ENABLED) -#ifdef bottom_catalog -#undef xmlACatalogResolveURI -extern __typeof (xmlACatalogResolveURI) xmlACatalogResolveURI __attribute((alias("xmlACatalogResolveURI__internal_alias"))); -#else -#ifndef xmlACatalogResolveURI -extern __typeof (xmlACatalogResolveURI) xmlACatalogResolveURI__internal_alias __attribute((visibility("hidden"))); -#define xmlACatalogResolveURI xmlACatalogResolveURI__internal_alias -#endif -#endif -#endif - -#ifdef bottom_valid -#undef xmlAddAttributeDecl -extern __typeof (xmlAddAttributeDecl) xmlAddAttributeDecl __attribute((alias("xmlAddAttributeDecl__internal_alias"))); -#else -#ifndef xmlAddAttributeDecl -extern __typeof (xmlAddAttributeDecl) xmlAddAttributeDecl__internal_alias __attribute((visibility("hidden"))); -#define xmlAddAttributeDecl xmlAddAttributeDecl__internal_alias -#endif -#endif - -#ifdef bottom_tree -#undef xmlAddChild -extern __typeof (xmlAddChild) xmlAddChild __attribute((alias("xmlAddChild__internal_alias"))); -#else -#ifndef xmlAddChild -extern __typeof (xmlAddChild) xmlAddChild__internal_alias __attribute((visibility("hidden"))); -#define xmlAddChild xmlAddChild__internal_alias -#endif -#endif - -#ifdef bottom_tree -#undef xmlAddChildList -extern __typeof (xmlAddChildList) xmlAddChildList __attribute((alias("xmlAddChildList__internal_alias"))); -#else -#ifndef xmlAddChildList -extern __typeof (xmlAddChildList) xmlAddChildList__internal_alias __attribute((visibility("hidden"))); -#define xmlAddChildList xmlAddChildList__internal_alias -#endif -#endif - -#ifdef bottom_entities -#undef xmlAddDocEntity -extern __typeof (xmlAddDocEntity) xmlAddDocEntity __attribute((alias("xmlAddDocEntity__internal_alias"))); -#else -#ifndef xmlAddDocEntity -extern __typeof (xmlAddDocEntity) xmlAddDocEntity__internal_alias __attribute((visibility("hidden"))); -#define xmlAddDocEntity xmlAddDocEntity__internal_alias -#endif -#endif - -#ifdef bottom_entities -#undef xmlAddDtdEntity -extern __typeof (xmlAddDtdEntity) xmlAddDtdEntity __attribute((alias("xmlAddDtdEntity__internal_alias"))); -#else -#ifndef xmlAddDtdEntity -extern __typeof (xmlAddDtdEntity) xmlAddDtdEntity__internal_alias __attribute((visibility("hidden"))); -#define xmlAddDtdEntity xmlAddDtdEntity__internal_alias -#endif -#endif - -#ifdef bottom_valid -#undef xmlAddElementDecl -extern __typeof (xmlAddElementDecl) xmlAddElementDecl __attribute((alias("xmlAddElementDecl__internal_alias"))); -#else -#ifndef xmlAddElementDecl -extern __typeof (xmlAddElementDecl) xmlAddElementDecl__internal_alias __attribute((visibility("hidden"))); -#define xmlAddElementDecl xmlAddElementDecl__internal_alias -#endif -#endif - -#ifdef bottom_encoding -#undef xmlAddEncodingAlias -extern __typeof (xmlAddEncodingAlias) xmlAddEncodingAlias __attribute((alias("xmlAddEncodingAlias__internal_alias"))); -#else -#ifndef xmlAddEncodingAlias -extern __typeof (xmlAddEncodingAlias) xmlAddEncodingAlias__internal_alias __attribute((visibility("hidden"))); -#define xmlAddEncodingAlias xmlAddEncodingAlias__internal_alias -#endif -#endif - -#ifdef bottom_valid -#undef xmlAddID -extern __typeof (xmlAddID) xmlAddID __attribute((alias("xmlAddID__internal_alias"))); -#else -#ifndef xmlAddID -extern __typeof (xmlAddID) xmlAddID__internal_alias __attribute((visibility("hidden"))); -#define xmlAddID xmlAddID__internal_alias -#endif -#endif - -#ifdef bottom_tree -#undef xmlAddNextSibling -extern __typeof (xmlAddNextSibling) xmlAddNextSibling __attribute((alias("xmlAddNextSibling__internal_alias"))); -#else -#ifndef xmlAddNextSibling -extern __typeof (xmlAddNextSibling) xmlAddNextSibling__internal_alias __attribute((visibility("hidden"))); -#define xmlAddNextSibling xmlAddNextSibling__internal_alias -#endif -#endif - -#ifdef bottom_valid -#undef xmlAddNotationDecl -extern __typeof (xmlAddNotationDecl) xmlAddNotationDecl __attribute((alias("xmlAddNotationDecl__internal_alias"))); -#else -#ifndef xmlAddNotationDecl -extern __typeof (xmlAddNotationDecl) xmlAddNotationDecl__internal_alias __attribute((visibility("hidden"))); -#define xmlAddNotationDecl xmlAddNotationDecl__internal_alias -#endif -#endif - -#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) -#ifdef bottom_tree -#undef xmlAddPrevSibling -extern __typeof (xmlAddPrevSibling) xmlAddPrevSibling __attribute((alias("xmlAddPrevSibling__internal_alias"))); -#else -#ifndef xmlAddPrevSibling -extern __typeof (xmlAddPrevSibling) xmlAddPrevSibling__internal_alias __attribute((visibility("hidden"))); -#define xmlAddPrevSibling xmlAddPrevSibling__internal_alias -#endif -#endif -#endif - -#ifdef bottom_valid -#undef xmlAddRef -extern __typeof (xmlAddRef) xmlAddRef __attribute((alias("xmlAddRef__internal_alias"))); -#else -#ifndef xmlAddRef -extern __typeof (xmlAddRef) xmlAddRef__internal_alias __attribute((visibility("hidden"))); -#define xmlAddRef xmlAddRef__internal_alias -#endif -#endif - -#ifdef bottom_tree -#undef xmlAddSibling -extern __typeof (xmlAddSibling) xmlAddSibling __attribute((alias("xmlAddSibling__internal_alias"))); -#else -#ifndef xmlAddSibling -extern __typeof (xmlAddSibling) xmlAddSibling__internal_alias __attribute((visibility("hidden"))); -#define xmlAddSibling xmlAddSibling__internal_alias -#endif -#endif - -#if defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_xmlIO -#undef xmlAllocOutputBuffer -extern __typeof (xmlAllocOutputBuffer) xmlAllocOutputBuffer __attribute((alias("xmlAllocOutputBuffer__internal_alias"))); -#else -#ifndef xmlAllocOutputBuffer -extern __typeof (xmlAllocOutputBuffer) xmlAllocOutputBuffer__internal_alias __attribute((visibility("hidden"))); -#define xmlAllocOutputBuffer xmlAllocOutputBuffer__internal_alias -#endif -#endif -#endif - -#ifdef bottom_xmlIO -#undef xmlAllocParserInputBuffer -extern __typeof (xmlAllocParserInputBuffer) xmlAllocParserInputBuffer __attribute((alias("xmlAllocParserInputBuffer__internal_alias"))); -#else -#ifndef xmlAllocParserInputBuffer -extern __typeof (xmlAllocParserInputBuffer) xmlAllocParserInputBuffer__internal_alias __attribute((visibility("hidden"))); -#define xmlAllocParserInputBuffer xmlAllocParserInputBuffer__internal_alias -#endif -#endif - -#if defined(LIBXML_OUTPUT_ENABLED) -#ifdef bottom_xmlsave -#undef xmlAttrSerializeTxtContent -extern __typeof (xmlAttrSerializeTxtContent) xmlAttrSerializeTxtContent __attribute((alias("xmlAttrSerializeTxtContent__internal_alias"))); -#else -#ifndef xmlAttrSerializeTxtContent -extern __typeof (xmlAttrSerializeTxtContent) xmlAttrSerializeTxtContent__internal_alias __attribute((visibility("hidden"))); -#define xmlAttrSerializeTxtContent xmlAttrSerializeTxtContent__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataCompile -extern __typeof (xmlAutomataCompile) xmlAutomataCompile __attribute((alias("xmlAutomataCompile__internal_alias"))); -#else -#ifndef xmlAutomataCompile -extern __typeof (xmlAutomataCompile) xmlAutomataCompile__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataCompile xmlAutomataCompile__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataGetInitState -extern __typeof (xmlAutomataGetInitState) xmlAutomataGetInitState __attribute((alias("xmlAutomataGetInitState__internal_alias"))); -#else -#ifndef xmlAutomataGetInitState -extern __typeof (xmlAutomataGetInitState) xmlAutomataGetInitState__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataGetInitState xmlAutomataGetInitState__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataIsDeterminist -extern __typeof (xmlAutomataIsDeterminist) xmlAutomataIsDeterminist __attribute((alias("xmlAutomataIsDeterminist__internal_alias"))); -#else -#ifndef xmlAutomataIsDeterminist -extern __typeof (xmlAutomataIsDeterminist) xmlAutomataIsDeterminist__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataIsDeterminist xmlAutomataIsDeterminist__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataNewAllTrans -extern __typeof (xmlAutomataNewAllTrans) xmlAutomataNewAllTrans __attribute((alias("xmlAutomataNewAllTrans__internal_alias"))); -#else -#ifndef xmlAutomataNewAllTrans -extern __typeof (xmlAutomataNewAllTrans) xmlAutomataNewAllTrans__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataNewAllTrans xmlAutomataNewAllTrans__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataNewCountTrans -extern __typeof (xmlAutomataNewCountTrans) xmlAutomataNewCountTrans __attribute((alias("xmlAutomataNewCountTrans__internal_alias"))); -#else -#ifndef xmlAutomataNewCountTrans -extern __typeof (xmlAutomataNewCountTrans) xmlAutomataNewCountTrans__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataNewCountTrans xmlAutomataNewCountTrans__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataNewCountTrans2 -extern __typeof (xmlAutomataNewCountTrans2) xmlAutomataNewCountTrans2 __attribute((alias("xmlAutomataNewCountTrans2__internal_alias"))); -#else -#ifndef xmlAutomataNewCountTrans2 -extern __typeof (xmlAutomataNewCountTrans2) xmlAutomataNewCountTrans2__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataNewCountTrans2 xmlAutomataNewCountTrans2__internal_alias -#endif -#endif -#endif - -#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED) -#ifdef bottom_xmlregexp -#undef xmlAutomataNewCountedTrans -extern __typeof (xmlAutomataNewCountedTrans) xmlAutomataNewCountedTrans __attribute((alias("xmlAutomataNewCountedTrans__internal_alias"))); -#else -#ifndef xmlAutomataNewCountedTrans -extern __typeof (xmlAutomataNewCountedTrans) xmlAutomataNewCountedTrans__internal_alias __attribute((visibility("hidden"))); -#define xmlAutomataNewCountedTrans xmlAutomataNewCountedTrans__internal_alias -#endif ... 23900 lines suppressed ...

2 years, 1 month

[reactos] 02/03: [MSXML3][MSXML3_WINETEST] Partial sync to Wine to enable libxml2 update. CORE-17766

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=608bbe1136df255e67a49… commit 608bbe1136df255e67a493ab794c9a2903d6df62 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 20 10:03:50 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Nov 23 22:02:47 2022 -0500 [MSXML3][MSXML3_WINETEST] Partial sync to Wine to enable libxml2 update. CORE-17766 xml2: Import upstream release 2.10.0. wine commit id 015491ab32742ace5218d37b1149c58803858214 by Alexandre Julliard <julliard(a)winehq.org> Note: Upstream msxml3_test has switched away from WINE_NO_LONG_TYPES, so I've kept the old printf format specifiers for now. Once we do a full sync, we can get rid of __ROS_LONG64__ for this test and use them unmodified. --- dll/win32/msxml3/main.c | 2 -- modules/rostests/winetests/msxml3/schema.c | 45 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dll/win32/msxml3/main.c b/dll/win32/msxml3/main.c index fb94bb2de06..9c66c7282c6 100644 --- a/dll/win32/msxml3/main.c +++ b/dll/win32/msxml3/main.c @@ -380,8 +380,6 @@ static void init_char_encoders(void) }; int i; - xmlInitCharEncodingHandlers(); - for (i = 0; i < ARRAY_SIZE(encoder); i++) { if (!xmlFindCharEncodingHandler(encoder[i].encoding)) diff --git a/modules/rostests/winetests/msxml3/schema.c b/modules/rostests/winetests/msxml3/schema.c index c7796e768d8..bf2922f09c3 100644 --- a/modules/rostests/winetests/msxml3/schema.c +++ b/modules/rostests/winetests/msxml3/schema.c @@ -1132,27 +1132,28 @@ static void test_regex(void) struct regex_test { const WCHAR *regex; const WCHAR *input; - BOOL todo; }; struct regex_test tests[] = { - { L"\\!", L"!", TRUE }, - { L"\\\"", L"\"", TRUE }, - { L"\\#", L"#", TRUE }, - { L"\\$", L"$", TRUE }, - { L"\\%", L"%", TRUE }, - { L"\\,", L",", TRUE }, - { L"\\/", L"/", TRUE }, - { L"\\:", L":", TRUE }, - { L"\\;", L";", TRUE }, - { L"\\=", L"=", TRUE }, - { L"\\>", L">", TRUE }, - { L"\\@", L"@", TRUE }, - { L"\\`", L"`", TRUE }, - { L"\\~", L"~", TRUE }, - { L"\\uCAFE", L"\xCAFE", TRUE }, + { L"\\!", L"!" }, + { L"\\\"", L"\"" }, + { L"\\#", L"#" }, + { L"\\$", L"$" }, + { L"\\%", L"%" }, + { L"\\,", L"," }, + { L"\\/", L"/" }, + { L"\\:", L":" }, + { L"\\;", L";" }, + { L"\\=", L"=" }, + { L"\\>", L">" }, + { L"\\@", L"@" }, + { L"\\`", L"`" }, + { L"\\~", L"~" }, + { L"\\uCAFE", L"\xCAFE" }, /* non-BMP character in surrogate pairs: */ - { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + { L"\\uD83D\\uDE00", L"\xD83D\xDE00" }, + /* "x{,2}" is non-standard and only works on libxml2 <= v2.9.10 */ + { L"x{0,2}", L"x" } }; int i; @@ -1173,15 +1174,13 @@ static void test_regex(void) if (doc60 && schema60 && cache60) { HRESULT hr = validate_regex_document(doc60, schema60, cache60, tests[i].regex, tests[i].input); - todo_wine_if(tests[i].todo) - ok(hr == S_OK, "got 0x%08x for version 60 regex %s input %s\n", - hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + ok(hr == S_OK, "got 0x%08x for for version 60 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); if (doc40 && schema40 && cache40) { hr = validate_regex_document(doc40, schema40, cache40, tests[i].regex, tests[i].input); - todo_wine_if(tests[i].todo) - ok(hr == S_OK, "got 0x%08x for version 40 regex %s input %s\n", - hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + ok(hr == S_OK, "got 0x%08x version 40 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); } } else

2 years, 1 month

[reactos] 01/03: [LIBXSLT] Update to version 1.1.36. CORE-17766

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21ab4d93c7322ef08d6dc… commit 21ab4d93c7322ef08d6dce6eb1833a514f0947fa Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 20 09:49:42 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Nov 23 22:02:43 2022 -0500 [LIBXSLT] Update to version 1.1.36. CORE-17766 This version was released after libxml2 2.10.0, but it removes usage of some now-deprecated functions that would break the build. --- dll/3rdparty/libxslt/ChangeLog | 7683 ------------------------ dll/3rdparty/libxslt/Makefile.am | 24 +- dll/3rdparty/libxslt/NEWS | 70 +- dll/3rdparty/libxslt/README | 2 - dll/3rdparty/libxslt/functions.c | 36 +- dll/3rdparty/libxslt/precomp.h | 17 - dll/3rdparty/libxslt/security.c | 6 +- dll/3rdparty/libxslt/transform.c | 1 - dll/3rdparty/libxslt/variables.c | 13 +- dll/3rdparty/libxslt/win32config.h | 78 - dll/3rdparty/libxslt/xsltconfig.h.in | 3 +- dll/3rdparty/libxslt/xsltutils.c | 2 +- dll/3rdparty/libxslt/xsltwin32config.h | 105 - dll/3rdparty/libxslt/xsltwin32config.h.in | 105 - media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/libxslt/libxslt.h | 2 +- sdk/include/reactos/libs/libxslt/xsltconfig.h | 9 +- sdk/include/reactos/libs/libxslt/xsltexports.h | 146 +- sdk/include/reactos/libs/libxslt/xsltlocale.h | 2 +- sdk/include/reactos/libs/libxslt/xsltutils.h | 3 - 20 files changed, 137 insertions(+), 8172 deletions(-) diff --git a/dll/3rdparty/libxslt/ChangeLog b/dll/3rdparty/libxslt/ChangeLog deleted file mode 100644 index c4a442141a8..00000000000 --- a/dll/3rdparty/libxslt/ChangeLog +++ /dev/null @@ -1,7683 +0,0 @@ -Fri Jul 24 10:16:24 CEST 2009 Daniel Veillard <veillard(a)redhat.com> - - * libxslt/attributes.c: fix an IDness issue when building the tree - -Tue May 12 09:03:46 CEST 2009 Daniel Veillard <veillard(a)redhat.com> - - * configure.in: adapt the extra version detection code to git - * libxslt.doap: adding RDF dope file - -Fri Jan 23 19:02:28 PST 2009 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: Fixed indexing error reported by - Ron Burk on the mailing list. - -Fri Nov 14 15:06:55 CET 2008 Daniel Veillard <veillard(a)redhat.com> - - * python/Makefile.am libxslt/Makefile.am configure.in - libexslt/Makefile.am: applied patch from Roumen Petrov for - mingw cross compilation problems raised by Rich Jones - -Tue Oct 28 11:55:27 CET 2008 Daniel Veillard <veillard(a)redhat.com> - - * configure.in Makefile.am: patch from Richard Jones to build - shared libs with MinGW cross-compiler - -Tue Oct 7 18:16:08 CEST 2008 Daniel Veillard <veillard(a)redhat.com> - - * libxslt/pattern.c: prevent some unchecked pointer accesses, patch - by Jake Goulding - -Wed Aug 6 20:10:08 HKT 2008 William Brack <wbrack(a)mmm.com.hk> - - * Minor cleanup of "typo" and some compilation warnings: - tests/namespaces/tst7.xsl: fixed typo detected by new libxml2 code - libxslt/keys.c, libxslt/xsltlocale.c, libexslt/date.c: trivial - changes for gcc warnings. - -Fri Aug 1 10:16:48 CEST 2008 Daniel Veillard <veillard(a)redhat.com> - - * libxslt/xsltconfig.h.in libxslt/xslt.c libxslt/extensions.c - libxslt/xsltlocale.c libxslt/preproc.c libxslt/xsltutils.c - libxslt/xsltlocale.h libxslt/win32config.h configure.in - config.h.in win32/configure.js: big patch from Roumen Petrov - finishing xsl:sort lang support with many portability issues - fixed and feedback from Nick Wellnhofer and Rob Richards - -Fri Aug 1 07:54:02 CEST 2008 Daniel Veillard <veillard(a)redhat.com> - - * libexslt/crypto.c: fix for CVE-2008-2935 libexslt RC4 - encryption/decryption functions - -Mon Jul 28 14:46:27 CEST 2008 Daniel Veillard <veillard(a)redhat.com> - - * configure.in: fix my static linking setup on x86_64 - -Sun Jul 27 13:52:10 CEST 2008 Daniel Veillard <veillard(a)redhat.com> - - * libxslt/xslt.c: avoid a quadratic behaviour when hitting duplicates - exclude-result-prefixes declarations, should fix #544906 - -Sat Jul 26 12:43:18 PST 2008 William Brack <wbrack(a)mmm.com.hk> - - *configure.in: fixed option --with-debugger with patch from - Arun Ragnavan #544829 - -Sat Jul 12 16:36:58 PST 2008 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/math.c: fixed incorrect argument popping in - exsltMathAtan2Function #541965 - -Thu Jul 10 10:04:28 PST 2008 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/functions.c: patch from Ron Burk to fix problem - with string check for element-available and - function-available #530891. - -Tue Jun 24 23:55:48 PST 2008 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/attrvt.c: added code to handle literal within an - AVT #539741. - * tests/docs/Makefile.am tests/docs/bug-168.xsl - * tests/general/Makefile.am tests/general/bug-168.* add a - test for this bug to the regression suite. - -Fri Jun 13 10:58:52 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/libxslt.h libexslt/libexslt.h libexslt/exslt.h: patch - from Roumen Petrov fixing include path when compiling outside - source tree - -Thu Jun 12 11:23:23 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltconfig.h.in libxslt/xsltlocale.h configure.in - config.h.in win32/configure.js: patch from Nick Wellnhofer and - Roumen Petrov to fix some portability problems on the previous - xsl:sort locale patch - -Tue Jun 3 18:26:26 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt/extra.c libxslt/Makefile.am libxslt/preproc.c - libxslt/xsltInternals.h libxslt/xsltlocale.c libxslt/xsltlocale.h - libxslt/xsltutils.c win32/Makefile.mingw win32/Makefile.msvc: patch - from Nick Wellnhofer adding xsl:sort lang support using the locale - support from the C library. - -Tue Jun 3 18:14:55 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.h: as Ralf Junker pointed out - xsltExtFunctionLookup was defined but never implemented, removing it - -Tue May 13 17:51:05 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: release of 1.1.24 - * python/generator.py: syntactic cleanup (Martin) - -Tue May 13 16:32:22 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c libxslt/extensions.c libxslt/extensions.h: - fix the processing of top level elements of stylesheets which - are not in the XSLT namespace and are not an extension either - should fix #529223 - * tests/docs/Makefile.am tests/docs/bug-167.xml - tests/general/Makefile.am tests/general/bug-167.*: add the - test to the regression suite - -Fri May 9 14:30:35 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/documents.c libxslt/keys.c libxslt/xsltInternals.h - libxslt/transform.c libxslt/pattern.c: fix the key initialization - problem introduced when tracking Josef Urban problem from 22 Dec - 2007, this should also handle the problem of recursive keys - definitions should fix #531873. - * tests/docs/bug-166.xml tests/docs/Makefile.am - tests/general/Makefile.am tests/general/bug-166.xsl - tests/general/bug-166.out: add the regression tests when a key - computation depends on another one. - -Mon Apr 21 16:16:29 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: update the man page based on - Vincent Lefevre suggestion. - -Mon Apr 14 11:19:14 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixes #527297 general patter comps fix and cleanup - * libxslt/xsltInternals.h libxslt/pattern.h: other cleanups - -Tue Apr 8 19:15:19 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: release of 1.1.23 - -Tue Apr 8 18:52:36 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: new version of patch from Peter Pawlowski - -Tue Apr 8 10:19:01 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py: fix an infinite loop bug - -Thu Apr 3 09:32:49 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.c: avoid a scary realloc() loop should fix #520383 - -Thu Apr 3 07:32:36 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: applied patch from Peter Pawlowski fixing - a timezone offset problem, fixes #521680 - * libxslt/namespaces.c: a bit of space/tabs cleanup - -Thu Apr 3 06:25:02 CEST 2008 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.xml doc/xsltproc.1 doc/xsltproc.html: small fix to - man page synopsis, should fix #525822 - -Sat Mar 15 11:13:18 HKT 2008 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/functions.c: fixed minor error reported on the mailing - list by Mark Howe, which caused a segfault if func:result was - postitioned as top-level element. - -Thu Mar 13 09:33:21 CET 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/win32config.h: patch from Rob Richards for VS 2008 - * python/types.c: fix a problem with namespace nodes coming from - XPath nodesets. - -Mon Mar 3 09:39:31 CET 2008 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.xml doc/xsltproc.1: fix maxdepth default value - documentation fixes #519921. - -Sat Feb 16 01:24:58 HKT 2008 William Brack <wbrack(a)mmm.com.hk> - - *libxslt/extensions.c: fixed minor error bug #516483 - *tests/exslt/common - deleted node-set.9 regression test, - because it relied upon an external web import. - -Tue Feb 5 08:53:30 CET 2008 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: applied documentation patch from Jason Viers - for xsltParseStylesheetDoc - -Tue Feb 5 08:36:53 CET 2008 Daniel Veillard <daniel(a)veillard.com> - - * python/tests/pyxsltproc.py: applied a portability patch from - Stephane Bidoul - -Thu Jan 24 16:24:05 CET 2008 Daniel Veillard <daniel(a)veillard.com> - - * doc/xslt.html doc/docbook.html: fix links for Cygwin DocBook - setup as suggested by Philippe Bourcier - -Sun Dec 23 16:40:38 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/keys.c, libxslt/pattern.c, libxslt/xsltInternals.h: - fixed a problem on superfluous re-generation of keys reported - on the mailing list by Josef Urban. - -Thu Nov 29 11:43:14 CET 2007 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: avoid a problem in configure if an old gcrypt - version is installed, patch from Brent Cowgill, fixes #500390 - -Tue Nov 13 13:08:08 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/common.c, libexslt/dynamic.c: After discussion on - Bugzilla with Peter Pawlowski, added same code for preventing - deletion of function result during garbage collection (see - bug #495995). - -Mon Nov 12 13:53:58 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: Added code to mark the results of - str:tokenize and str:split as "function result" to avoid - garbage-collecting them during global variable initialisation. - Should fix bug #495995. - -Wed Oct 24 17:41:08 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * python/libxslt.c: changed iterator argument for Py_Dict_Next - from int to ssize_t (seems Python docs are incorrect) to fix - x86_64 bug #489854. - -Wed Oct 10 16:33:09 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c tests/exslt/date/datetime.1.out - tests/exslt/date/date.1.out tests/exslt/date/date.1.xml: - applied patch from Maurice van der Pot to fix EXSLT - week-in-year extenson which was not conforming to the definition. - This also changes the output of the tests a bit. Should fix #452876 - -Thu Aug 30 08:18:08 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * python/libxslt.c: applied patch from Daniel Gryniewicz to - fix a segfault caused by a parameter array not being preset - to zero. - -Thu Aug 23 17:18:03 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: preparing release of 1.1.22 - -Thu Aug 23 15:39:18 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: applied patch from Rob Richards to fix a - stylesheet compilation error handling problem #382570 - -Thu Aug 23 15:22:55 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/security.c: applied patch from Roland Schwarz and Rob - Richards to fix the security file checks on Windows, should - close #464432 - -Thu Aug 23 21:15:28 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * tests/general/bug-165.[xsl,out,err], tests/docs/bug-165.xml, - tests/general/Makefile.am, tests/docs/Makefile.am: - added regression test for bug #469410 - -Thu Aug 23 14:13:02 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: patch from Drazen Kacar to add a --encoding - option fixes #443868 - * doc/xsltproc.xml doc/xsltproc.1: augment and regenerate man page. - -Thu Aug 23 11:47:20 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: apply patch from Bj�rn Wiberg fixing build on AIX - and closing bug #332173 - -Fri Aug 3 15:49:26 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * win32/Makefile.msvc win32/configure.js: apply patch from - Rob Richards to improve build with VS2005 - -Thu Jul 26 12:43:38 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xslt.c: Removed the exclude-result-prefix change of - 31 May 2007. Fixes bug #459713. - -Sat Jun 16 07:42:18 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: Fixed problem with RVT cleanup related - to some exslt functions (reported on the list by Marc Adkins). - -Wed Jun 13 13:27:48 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * tests/exslt/common/node-set.9.[xml,xsl,out], - tests/exslt/common/Makefile.am: added test case for bug #413451 - -Tue Jun 12 18:43:05 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in doc/*: preparing release of 1.1.21 - -Thu May 31 12:38:08 PDT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xslt.c: fixed obscure namespace problem related to - exclude-result-prefix - -Mon May 7 00:14:28 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed minor compilation warning; no change - to logic. - -Sun May 6 23:42:38 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/math.c: fixed two memory leaks, one in exsltMathConstant - and one in exsltMathConstantFunction (bug #436324) - -Fri May 4 15:51:58 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed xpath context housekeeping problem - on processing "choose" (bug 435479). - -Thu Apr 26 11:10:18 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed (another) problem with cached - RVT's (from re-opened #378766). - -Tue Mar 27 16:50:52 CEST 2007 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.c: apply patch fron Shaun McCance to hook - xsl:message construct to the new per-xsltTransformCtxt error - callback if set up. - * Makefile.am: do not package svn files in releases - -Fri Mar 2 18:45:48 HKT 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltconfig.h.in: added setting of TRIO_REPLACE_STDIO - when TRIO routines are required. - * libxslt/namespaces.c, libxslt/xsltutils.c: enhanced handling - of stdio.h vs. trio.h when trio routines are required (now - use XSLT_NEED_TRIO) (bug #412787) - -Sun Feb 18 09:00:08 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * python/libxsl.py: fixed tab/space inconsistency with patch - provided by Andreas Hanke (bug #409193) - -Thu Feb 15 14:03:18 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * doc/xslt.html: Changed all - references to CVS to be SVN; changed corresponding links. - * doc/*html: regenerated the documentation for above - -Wed Feb 14 01:21:38 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: Fixed problem with namespace on compound - predicate (bug #407731) - -Wed Jan 24 11:05:28 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: added check for memory allocation error - (bug #400242); fixed "type-punned pointer" warnings. - * libxslt/xsltutils.c: added checks for memory allocation error - (bug #400242) - * restored NEWS, doc/EXSLT/downloads.html which mysteriously - disappeared from svn - -Wed Jan 17 14:20:18 CET 2007 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: preparing release of 1.1.20 - * libexslt/crypto.c: small patch for missing includes on some BSD, - fixes #397373 - * configure.in: replace == by = in test, raised by Roland Illig, - should fix #397371 - -Sun Jan 14 18:45:08 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/functions.c: fixed two problems related to checking - of fragments, related to python htmlCtxtReadFile problem - reported on mailing list by Nic Ferrier. - -Fri Jan 12 23:24:08 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/extensions.c: reverted last change, fixed some - comments. Note that in it's current state the 'plugin' - implementation will fail if called from a program - compiled as static! - -Fri Jan 12 15:40:08 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * configure.in: fixed problem with DV/WMB testing env. - * regenerated docs; doc/APIchunk1[012].html added to SVN - * libxslt/extensions.c: fixed problem with plugin loading; - removed testplugin.c from SVN (current version kept as - tests/plugin/testplugin.c) - -Thu Jan 11 11:08:18 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: enhanced to ignore empty text node - in xsltDefaultProcessOneNode (avoid calling xsltCopyText) - (bug #354900) - * xsltproc/xsltproc.c: added check for output file problem, - yielding new error code 11 (Mike Hommey). - * doc/xsltproc.html, doc/xsltproc.xml: added documentation - for above, regenerated docs (doc/xsltproc.1) - -Wed Jan 10 19:13:08 PST 2007 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: added new function 'replace' from Joel - Reed. - * tests/exslt/Makefile.am, replace.1.xml, replace.1.xsl, - replace.1.out: added new test case for above. - * libxslt.spec.in: trivial change from 'Gnome' to 'GNOME' - * configure.in: trivial change for flags on my compilations - * libxslt/documents.c, libxslt/documents.h, libxslt/keys.c, - libxslt/keys.h, libxslt/variables.c, libxslt/templates.c, - libxslt/transform.c, libxslt/variables.c, libxslt/xslt.c, - libxslt/xsltutils.c: fixed some documentation/comments and - compilation warnings - no change to logic. - * re-generated the documentation. - -Wed Jan 3 16:46:05 CET 2007 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: adapt the extra versioning code to SVN - -Fri Dec 22 09:12:08 PST 2006 William Brack <wbrack(a)mmm.com.hk> - - * python/libxslt.c: applied patch supplied by Kjartan Maraas - (bug #388567). - -Mon Dec 11 14:38:22 PST 2006 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/functions.c: further enhancement to the original - fix for bug #381319 (which was not correct). - * tests/exslt/functions: minor enhancement to function.9.xsl; - function.10.[xsl,xml,out] added to regression tests to check - recursive calls. - -Mon Dec 11 12:13:14 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * configure python/generator.py python/libxsl.py - python/libxslt-python-api.xml python/libxslt.c - python/tests/2stage.py python/tests/loader.py: applied patch from - Nic James Ferrier to make stylesheets comparable and to add - transformContext handling - -Sat Dec 9 15:22:34 PST 2006 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/functions.c: changed handling of function params - to fix bug #381319 - * libxslt/transform.[ch]: exposed xsltLocalVariablePush and - xsltLocalVariablePop as global entries so that they could - be used from within libexslt/functions.c - * tests/exslt/functions/function.9.[xsl,xml,out] added to - regression tests - -Tue Dec 5 10:45:04 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: applied patch from Marcus Meissner removing - a strict aliasing problem should fix #317921 - -Fri Dec 1 23:02:27 HKT 2006 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed problem with housekeeping of - localRVTBase, bug #378766 - -Wed Nov 29 16:06:43 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in doc//*: preparing release of libxslt-1.1.19 - -Sat Nov 25 11:48:28 HKT 2006 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/variables.c: fixed problem with cached RVT's, - bug #378766 - -Thu Nov 23 17:49:31 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: applied patch from Mike Hommey about saving - the current in-scope namespace list when calling a template, fixes - bug #377579 - -Thu Nov 23 15:36:28 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: fix a python detection problem pointed out by - Joseph Sacco, fixes bug #376391 - -Fri Nov 17 09:53:08 HKT 2006 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed problem with entity handling - within xsltCopyAttrListNoOverwrite (#352907) - * tests/general/bug-164.xsl, tests/general/bug-164.out, - tests/docs/bug-164.oxml: added a regression test for this - -Thu Oct 26 15:31:01 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in doc//*: preparing release of libxslt-1.1.18, - this bumps libxml2 requirement to 1.6.27 - * libexslt/date.c libxslt/namespaces.h libxslt/xslt.c - libxslt/xsltInternals.h: cosmetic cleanups to restore the - API extraction - -Thu Oct 26 10:36:43 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * doc//*: removed all remaining references to the old Wiki - -Thu Oct 12 23:12:24 HKT 2006 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: fixed end-of-month problem in exsltDateCurrent - (#359246) - -Thu Oct 12 14:39:37 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c: applied patch from Mike Hommey fixing 2 - erroneous xmlFree() and adding a message on an unsupported feature - -Wed Oct 11 23:16:10 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt-python-api.xml: applied fix for accessor functions - of a stylesheet returning pointers to immutable strings, patch - from #320540 - * xsltproc/xsltproc.c: fix the xinclude on stylehseet problem - by adding a new parameter to xsltproc names --xincludestyle - -Wed Oct 11 22:27:37 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: apply patch from Gary Coady to compile when - libxml2 has no xinclude support #319886 - * docs/*: renamed Gnome to GNOME fixes #352159 - -Wed Oct 11 21:37:27 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/Makefile.am: a missing DESTDIR - * python/Makefile.am: fix reference to build paths in python module - * libexslt/exsltconfig.h.in libxslt/xsltconfig.h.in: fix the header - comments on version values, the 3 are patches from Peter - Breitenlohner and should fix #340995 - -Wed Oct 11 11:16:34 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/security.c: applied cleanup patch from Mikhail Zabaluev - which should finish fixing #337486 - -Wed Oct 11 09:55:06 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/security.c: applied fix from Shane Corgatelli to pass - the full URL when checking security access for network URLs, - should fix bug #359366 - -Mon Aug 21 10:46:25 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * doc/xslt.html python/tests/pyxsltproc.py xsltproc/xsltproc.c: - applied patch from Daniel Leidert to fix some typo - * xsltproc.xml xsltproc.1: applied another patch from Daniel Leidert - and regenerated - -Wed Aug 16 17:39:04 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: --xinclude should also force XInclude - processing on the stylesheets themselves, raised by Daniel Leidert - -Thu Aug 10 15:54:02 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/transform.c libxslt/variables.c - libxslt/xsltInternals.h: Fixed restoring the context doc - for XPath in xsltForEach(). Eliminated the use of @tmpDoc - of the transformation context. - -Thu Aug 10 13:40:35 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/preproc.c: Added missing QName-validation of some - attributes of XSLT-elements. This fixes bug #304921, reported - by Frans Englich. - -Thu Aug 10 13:27:48 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/transform.c: As suggested by Bill, I changed - xsltShallowCopyNsNode() to return an xmlNsPtr instead of - an int. The fix of bug #350085 is OK; i.e. the removal - of the call to xsltFreeRVTs() in - xsltApplyStylesheetInternal(). I think I tried to clear - the transformation context as much as possible, in case - it is reused; Daniel informed me on the list that reusing - the context is not intended, so no need anymore to try - to free the fragments immediately after the transformation. - -Wed Aug 9 13:22:13 PDT 2006 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: Fixed problem with cleanup of RVT's, should - clear bug350085; cleaned up most warnings (still a problem in - xsltShallowCopyNsNode) - * trivial warning cleanup in libxslt/[extensions.c, namespaces.c, - xslt.c and xsltInternals.h] and libexslt/functions.c - -Fri Aug 4 14:50:41 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py: fixed the conversion of long parameters - -Wed Jul 19 15:06:39 EDT 2006 Daniel Veillard <daniel(a)veillard.com> - - * python/types.c: fix float and boolean XPath conversions - * libxslt/xsltutils.c: try to fix Stephane Bidoul attempt - at setting XInclude support. - -Mon Jul 17 11:15:23 PDT 2006 William Brack <wbrack(a)mmm.com.hk> - - * Updated tests affected by recent library changes - - tests/general/bug-1-.out, tests/general/bug-24-.out, - tests/keys/month.out : (<t></t> now becomes <t/>); - tests/general/bug-41-.xsl and tests/general/bug-43.xsl : - call-template and apply-template, where the template has - no parameter but one is supplied (var should not be affected) - tests/general/bug-145.err : changed error text - -Fri Jul 14 18:16:59 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c libxslt/documents.c - libxslt/functions.c libxslt/keys.c libxslt/namespaces.c - libxslt/pattern.c libxslt/preproc.c libxslt/templates.c - libxslt/templates.h libxslt/transform.c - libxslt/variables.c libxslt/xslt.c - libxslt/xsltInternals.h libxslt/xsltutils.c - libxslt/xsltutils.h libexslt/common.c libexslt/dynamic.c - libexslt/functions.c libexslt/strings.c: - Committing again, since I forgot to switch from win to linux - linebreaks in the files. - -Fri Jul 14 17:55:42 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c libxslt/documents.c - libxslt/functions.c libxslt/keys.c libxslt/namespaces.c - libxslt/pattern.c libxslt/preproc.c libxslt/templates.c - libxslt/templates.h libxslt/transform.c libxslt/variables.c - libxslt/xslt.c libxslt/xsltInternals.h libxslt/xsltutils.c - libxslt/xsltutils.h libexslt/common.c libexslt/dynamic.c - libexslt/functions.c libexslt/strings.c: - Refactored xsltValueOf(). Changed to use xmlXPathCastToString() - directly, rather than creating an intermediate object with - xmlXPathConvertString(). This now does not add a text-node to - the result if the string is empty (this has impact on - serialization, since an empty text-node is serialized as - <foo></foo>, and now it will be serialized as <foo/>). - Refactored other functions in transform.c: - Mostly code cleanup/restructuring. Minimized number of - function variables for instruction which eat up function stack - memory when recursing templates (xsltIf(), xsltChoose(), - xsltApplyTemplates(), xsltCallTemplate()). - Changed XSLT tests to use xmlXPathCompiledEvalToBoolean(). - Implemented redefinition checks at compilation-time and - eliminating them at transformation time in the refactored code - paths. - Introduced the field @currentTemplateRule on xsltTransformContext to - reflect the "Current Template Rule" as defined by the spec. - NOTE that ctxt->currentTemplateRule and ctxt->templ is not the - same; the former is the "Current Template Rule" as defined by the - XSLT spec, the latter is simply the template struct being - currently processed by Libxslt. - Added XML_COMMENT_NODE and XML_CDATA_SECTION_NODE to the macro - IS_XSLT_REAL_NODE. - Misc code cleanup/restructuring and everything else I already forgot. - Refactored lifetime of temporary result tree fragments. - Substituted all calls to the now deprecated xsltRegisterTmpRVT() - for the new xsltRegisterLocalRVT(). - Fragments of xsl:variable and xsl:param are freed when the - variable/pram is freed. - Fragments created when evaluating a "select" of xsl:varible and - xsl:param are also bound to the lifetime of the var/param. - EXSLT's func:function now uses the following functions to let take - care the transformation's garbage collector of returned tree - fragments: - xsltExtensionInstructionResultRegister(), - xsltExtensionInstructionResultFinalize() - Fixes: - #339222 - xsl:param at invalid position inside an xsl:template is - not catched - #346015 - Non-declared caller-parameters are accepted - #160400 - Compiles invalid XSLT; unbound variable accepted - #308441 - namespaced parameters become unregistered - #307103 - problem with proximity position in predicates of match - patterns - #328218 - problem with exsl:node-set() when converting strings - to node sets - #318088 - infinite recursion detection - #321505 - Multiple contiguous CDATA in output - #334493 - "--param" option does not have root context - #114377 - weird func:result/xsl:variable/exsl:node-set interaction - #150309 - Regression caused by fix for 142768 - -Wed Jun 21 15:13:27 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tests/docs/bug-54.xml tests/general/bug-54.out - tests/general/bug-99.out tests/general/bug-136.out - tests/REC/test-7.1.3.xsl tests/REC/test-7.1.4.xsl - tests/REC/test-7.3.xsl tests/REC/test-7.4.xsl: - Fixed incorrect regression tests/results. - -Mon Jun 19 13:33:50 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c libxslt/attrvt.c libxslt/namespaces.c - libxslt/namespaces.h libxslt/preproc.c libxslt/templates.c - libxslt/transform.c libxslt/variables.c libxslt/xslt.c - libxslt/xsltInternals.h libxslt/xsltutils.c: - Merged all the namespace lookup/create/disable functions - into xsltGetSpecialNamespace(). Changed xsltGetNamespace() - and xsltGetPlainNamespace() to call xsltGetSpecialNamespace(), - but kept the ns-aliasing mechanism; the ns-aliasing needs - to be removed when we move to the refactored code, which - applies ns-alias only at compilaton time. - Refactored xsltElementComp() (preproc.c); enhanced error reports. - Fixed: if the "namespace" attribute was not given, then this - performed incorrectly only a lookup for a default namespace; - i.e., without taking any prefix on the "name" attribute into - account. - Refactored xsltElement() (transform.c); enhanced error reports. - Refactored xsltAttributeComp() (preproc.c). Added namespace - lookup as in xsltElementComp(). Enhanced error reports. - Refactored xsltAttribute() (transform.c); enhanced error reports. - xsltCopyTreeInternal(): eliminated the need to call xmlGetNsList() - for every element in the tree; this needs to be done only for - the top-most elements. For subsequent elements reconcile only - the ns-declarations. Disallowed setting of ns-declarations if - children have been already added to an element. - Removed ns-aliasing code where necessary. - xsltCopyProp(): disallowed setting of attribute nodes if - children have been already added to an element. - xsltCopy(): removed the incorrect skipping of attributes in the - XSLT namespace. Removed the incorrect ns-aliasing for attributes. - Changed to use the introduced function xsltShallowCopyAttr(). - xsltShallowCopyAttr(): Centralized all attribute-copy related - code in this function. It will now be called by - xsltCopyTreeInternal(), xsltCopyOf() and xsltCopy(). - xsltCopyAttrListNoOverwrite(): Renamed. Refactored. Optimized to - use xsltGetSpecialNamespace() and xmlNewDocProp(). - Further substitution of various scattered namespace-lookup - related code for the use of xsltGetSpecialNamespace(). - xsltAttrTemplateProcess(): Refactored. Removed the incorrect - processing of attribute-sets. Attribute sets need to be applied - before adding any normal attribute of the literal result element; - this is now done in xsltAttrListTemplateProcess(). Fixed to - ensure that the ns-prefix of the overwriting attribute is used. - xsltAttrListTemplateProcess(): Refactored. Moved semantics from - xsltAttrTemplateProcess() over to this function in order to - optimize processing of multiple attributes. This does not call - xsltAttrTemplateProcess() anymore. - Fixed: do not exclude the XSLT namespace after ns-aliasing have - beed applied. - The IFDEFed-out refactored code fixes the following issues: - - #313711: namespace collision with namespace-alias (reported - by by Oleg Paraschenko) - - #338214: Incorrect scope for exclude-result-prefixes - - #341392: Excluding namespace declarations of literal result - elements. - - #341325: Namespace aliasing and resulting namespace prefixes - Already enabled fixes: - - #344183: xsl:copy misses to copy attributes in the XSLT namespace - - #341463: Namespace-alias using #default for result-prefix with no - default namespace in scope - - #313890: namespace collision with xsl:element and xsl:attribute, - reported by Oleg Paraschenko - - #344176: xsl:copy misses to set an element's namespace-URI in - some cases - - #305739: the "name" QName of xsl:element is incorrectly always - resolved to the default namespace - -Mon Jun 12 16:34:15 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: more info about --output - from Daniel Leidert c.f. #344654 - -Tue Jun 6 17:16:33 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt.spec.in doc//*: preparing release of 1.1.17 - -Tue Jun 6 11:44:34 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c: Eliminated a tiny difference wrt to - the old behaviour in the naming of newly generated ns-decls - in xsltAttributeInternal(). - -Thu Jun 1 15:06:31 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: fix a problem in Python detection - -Thu Jun 1 13:58:19 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c libxslt/variables.c - libxslt/transform.c libxslt/xslt.c: - Next step in the refactored code: enhanced xsl:attribute; - enhanced xsltCopyProp. - Added the creation of an XPath cache in - xsltNewTransformContext(). - -Wed May 31 22:32:44 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/transform.c: Fixed a difference in processing of - xsl:value-of and xsl:text wrt to merging of strings of - output-escaped text-nodes. This difference made the - optimized string-merging mechanism run out of sync, which - led to segfaults in subsequent string reallocations. See - bug #343411, reported by Grzegorz Kaczor. - * xslt.c: Added check for ctxt->internalized when we parse - xsl:text and internalize the strings. - -Mon May 22 10:32:57 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c libxslt/documents.c - libxslt/extensions.c libxslt/keys.c libxslt/pattern.c - libxslt/preproc.c libxslt/templates.c - libxslt/transform.c libxslt/variables.c - libxslt/xslt.c libxslt/xsltInternals.h: - Next tiny step of refactoring - mostly bug fixes and - cosmetic changes. - Changes outside of the refactored code: - 1) Optimized xsl:attribute if the content consists of - just 1 text node. - 2) Optimized computation of xsl:key. The keys will now be - computed for a specific document not until the first call - of a key() function; here only the keys with the specific - name used by key() are computed. This means that this - now avoids computation of all keys for all loaded - input documents (even if no key() was called on them). - One exception is the scenario where a key() is used in - a template's match pattern; in this case all keys are - computed for a document if there's a chance that - a "keyed" template could match a node (this could still - be optimized a bit). - -Mon May 15 22:32:13 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/namespaces.c libxslt/attributes.c: - Fixed bug #302020, reported by Thomas Blatter. - -Fri May 12 23:23:06 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/documents.c libxslt/namespaces.c - libxslt/preproc.c libxslt/transform.c - libxslt/xslt.c libxslt/xsltInternals.h libxslt/xsltutils.c: - Next step of refactoring. For more details see bug #341588. - I applied the suggestion of Jerome Pesenti to the refactored - (still IDFEDed out with XSLT_REFACTORED) code: The XPath - compilation context (accessible via the compilation context) - is now reused for compilation of expressions at - compilation-time; this should reduce compilation time to 50% - for avarage stylesheets. - -Thu May 11 22:12:22 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/extensions.c: Changed a comment to indicate that a - specific bug was already fixed. - -Fri May 5 23:10:47 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/xsltInternals.h libxslt/attributes.c - libxslt/documents.c libxslt/extensions.c - libxslt/extensions.h libxslt/functions.c - libxslt/imports.c libxslt/keys.c libxslt/preproc.c - libxslt/transform.c libxslt/variables.c libxslt/xslt.c - libxslt/xsltutils.c libxslt/xsltutils.h libexslt/functions.c: - Next step of refactoring (plus some bug-fixes). - For more details see #340780. - -Fri May 5 14:31:53 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tests/exslt/common/node-set.5.out - tests/exslt/sets/difference.1.out - tests/exslt/functions/function.6.out: Reverting the - changes; I'll rather change the processing stylesheet - documents in a way that they will produce the same results - for broken and stricter whitespace-stripping. - -Thu May 4 22:55:26 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tests/exslt/common/node-set.5.out - tests/exslt/sets/difference.1.out - tests/exslt/functions/function.6.out: Changed regression test - results (bug #340684). Those will now produce regression - errors; so we need to fix the processor. - -Mon May 1 17:39:27 EDT 2006 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS doc//*: preparing release of 1.1.16, updated and - regenerated the docs. - -Tue Apr 25 15:02:42 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: applied patch from Joseph Sacco changing slightly - the python detection scheme should fix bug #338527 - -Wed Apr 12 13:35:45 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/attributes.c libxslt/preproc.c libxslt/transform.c - libxslt/variables.c libxslt/xslt.c libxslt/xsltInternals.h - libxslt/xsltutils.c libxslt/xsltutils.h: - Refactored the internal structures into specialized - structures and adjusted the code to work with those new - structures. I didn't yet (we should in the future) - renamed any fields of the old structures in order to avoid - changing too much code. - Introduced the internal structure xsltCompilerCtxt to be - used for storage and control of the compilation. - Optimized the way lists of in-scope namespaces are created - and stored; this will now only generate a new list if - really needed, i.e. if we encounter a ns-decl. - All this changes here are IFDEFed out with XSLT_REFACTORED. - -Thu Apr 6 10:16:59 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: applied man page improvement - from Daniel Leidert - -Thu Mar 30 17:23:52 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * tests/general/bug-36-inc.xsl tests/general/bug-37-inc.xsl - tests/general/bug-65-inc.xsl tests/general/bug-100.xsl - tests/REC/test-15-1.xsl tests/REC/test-7.1.1-3.xsl - tests/namespaces/extra2.xsl tests/extensions/module.xsl - tests/plugins/plugin.xsl python/tests/extelem.py - python/tests/extfunc.py: Fixed regression tests wrt - usage of the attributes "exclude-result-prefixes" - and "extension-element-prefixes". test-7.1.1-3.xsl fails - now, since the code still does not exclude ns-decls - correctly. - -Thu Mar 30 17:11:53 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> - - * libxslt/xslt.c libxslt/xsltutils.c libxslt/preproc.c - libxslt/namespaces.c libxslt/imports.c - libxslt/attributes.c: Eliminated usage of xsltGetNsProp() in cases - where an attribute with a specific namespace is requested. - xsltGetNsProp() uses xmlGetProp() which is not namespace aware - and thus will return the first attribute with the requested - name but of arbitrary namespace. - Changed retrieval of the attributes "exclude-result-prefixes" - and "extension-element-prefixes", which are expected to be in - no namespace on XSLT elements and in the XSLT namespace on - literal result elements or extension elements. - Additional change: for XSLT elements the attribute - "exclude-result-prefixes" is only allowed on xsl:stylesheet - and xsl:transform. This attribute was previously processed on - all XSLT elements. - -Wed Mar 29 12:16:41 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: Charles Hardin pointed an OOM condition where - a NULL pointer could be dereferenced, closes #336394 - -Fri Mar 10 12:49:18 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/crypto.c libexslt/date.c libexslt/saxon.c - libxslt/attributes.c libxslt/imports.c libxslt/pattern.c - libxslt/preproc.c libxslt/transform.c libxslt/variables.c - libxslt/xslt.c libxslt/xsltutils.c: various assorted small cleanups - based on the Coverity reports - -Wed Feb 22 16:09:10 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * python/types.c: Nic Ferrier found debug statement left in the - XPath conversion code - -Tue Feb 21 20:21:07 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: new update from Daniel Leidert - -Tue Feb 21 17:59:11 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c libxslt/xslt.c libxslt/xslt.h - libxslt/xsltInternals.h: applied patch from Christopher R. Palmer - to avoid a race condition in xsltInit() - -Sun Feb 19 22:40:58 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: improvement of the man page - by Daniel Leidert, c.f. #331779 - -Sat Feb 11 13:10:01 CET 2006 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.c: fix xsltSaveResultToString comment - * libxslt/transform.c: detect loops when computing variables, should - fix bug #330772 - * doc/xsltproc.xml doc/xsltproc.1: fix typo in man page - * tests/namespaces/tst7.out tests/general/bug-152.out: small output - changes due to libxml2 xhtml meta handling modification - -Mon Nov 21 12:22:21 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: Albert Chin found another signed/unsigned problem - in the date and time code raised on IRIX 6.5 - -Mon Nov 21 12:08:05 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/crypto.c: patch from Albert Chin needed for HP-UX - which doesn't have <sys/select.h> - -Mon Nov 21 12:05:41 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: Albert Chin posted a patch to fix a problem on - Solaris with dates, extended bitfield size too to match libxml2 - code from xmlschemastypes.c - -Wed Nov 16 12:47:25 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/functions.c: fix an problem raised by Ralf Junker in the - use of xmlHashScanFull() fixes bug #321582 - -Sun Nov 6 19:22:45 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attrvt.c: added a missing parameter to a debug function - -Tue Oct 4 20:37:09 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: applied fix to date:week-in-year posted to - the mailing list by Thomas Broyer - * tests/exslt/date/date.1.out, tests/exslt/date/datetime.1.out: - updated to reflect above fix - -Sun Oct 2 11:52:44 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt/Makefile.am libxslt/xsltconfig.h.in - libxslt.spec.in tests/plugins/Makefile.am xslt-config.in: applied - patch from Joel Reed to ease plugin integration - -Thu Sep 22 21:51:22 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: fixed problem in internal XPath compilation - of patterns including variables, fixes #316861 - -Wed Sep 14 14:30:03 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: removed a superfluous second sorting of - the node set on xsl:copy-of, fixes #316288 - * libxslt/xsltutils.c: marked xsltDocumentSortFunction as slow, - obsolete and deprecated :-) - -Sat Sep 10 14:35:06 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: check environment for PYTHON, fixes #315367 - -Mon Sep 5 00:44:24 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS doc/*: preparing release 1.1.15 - * libxslt/pattern.c libxslt/xsltutils.c: a bit more cleanup - -Mon Sep 5 00:07:40 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed #303289 variable in match are forbidden - * tests/general/bug-89.xsl: had to fix that test which was doing this - * tests/general/bug-142.out tests/general/bug-152.out - tests/namespaces/tst7.out: small output change on libxml2-2.6.21 - new way of serializing encoding meta in HTML - -Wed Aug 31 13:49:51 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed #314936 a dictionnary issue on text - node merging, which probably fixed #311267 too. - -Thu Aug 25 13:29:20 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: libxslt should deallocate directly text node content - use xmlSetNodeContent(..., NULL) - -Fri Aug 12 12:17:10 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/general/bug-163.*, tests/general/Makefile.am, - tests/docs/bug-163.*, tests/docs/Makefile.am: check fix for - #310692 - -Tue Aug 9 22:13:18 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/plugins/Makefile.am: try to get rid of complaints from - jhbuild newbies. - -Sun Aug 7 16:04:47 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.c: fixed a bug when size of xmlXPathContext - changes, uses the libxml2 alloc and dealloc functions instead. - -Tue Jul 13 22:41:03 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: added check in xsltCopyText to assure - content is in dictionary before doing a straight copy of - content (bug 302821) - -Tue Jul 13 16:16:31 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed to set current default value for - XInclude when creating new TransformContext - * libxslt/xslt.c: minor change for per-mille - -Sun Jul 10 16:17:53 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltwin32config.h*: try to avoid generating conflicts - * libexslt/dynamic.c: applied patch from Mark Vakoc to implement - dyn:map - * configure.in tests/exslt/Makefile.am tests/exslt/dynamic/*: - added test for dyn:map to the regression suite - -Sat Jul 2 02:32:24 PDT 2005 <wbrack(a)mmm.com.hk> - - * libxslt/numbers.c: further fixes for bug 309209, changing - behaviour of format-number. - * libxslt/xslt.c: changed definition of per-mille character from - '?' to Unicode #2030 (UTF-8 '‰') (ref XSLT spec 12.3) - -2005-06-30 Federico Mena Quintero <federico(a)ximian.com> - - * libxslt/xsltwin32config.h: Added this file back. We'll have to - figure out a way to make jhbuild not get CVS conflicts with it. - -Thu Jun 30 14:09:55 PDT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/numbers.c: fixed bug in negative prefix (bug 309209) - -2005-06-17 Federico Mena Quintero <federico(a)ximian.com> - - * libxslt/xsltwin32config.h: Removed from CVS; this is a generated - file anyway and it breaks jhbuild all the time. - -Sat May 7 11:28:41 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/libexslt.3: applied patch from Jonathan Wakely to fix - the namespace name for the EXSLT date and time functions in the man - page. - -Wed Apr 6 23:58:12 CEST 2005 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libexslt/exslt.c libexslt/libexslt.h: Windows build cleanups, - removed obsolete checks - * libxslt/libxslt.h libxslt/win32config.h libxslt/xsltutils.h: - Windows build cleanups, removed obsolete checks - * win32/configure.js: removed obsolete copy operations - * win32/Makefile.*: make install cleanup - * xsltproc/xsltproc.c: Windows build cleanup, removed obsolete - macro definitions - * .cvsignore: added Eclipse project files - -Sat Apr 2 13:34:11 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS doc/*: preparing release of 1.1.14, updated docs - and rebuilt. - -Thu Mar 31 23:50:43 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/docbook/result/fo/gdp-handbook.fo tests/general/bug-105.out - tests/general/bug-142.out: updated the result of some tests - following the change to serailization in libxml2. - -Thu Mar 31 11:54:31 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed bug #171488 with cascading select in - patterns. - * tests/general/bug-161.*, tests/general/Makefile.am, - tests/docs/bug-161.*, tests/docs/Makefile.am: added test provided - by Ben Ko - -Thu Mar 31 00:28:38 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/plugins/Makefile.am: fixed build outside of source tree - bug #172155 thanks to patch from Mike Castle - -Wed Mar 30 14:09:19 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: fixed the xinclude problem with document() - as in bug #171893 - * configure.in tests/Makefile.am tests/xinclude/*: added a new - xinclude directory with the test for this problem - -Wed Mar 30 11:59:06 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed bug 169718 with ancestors in patterns - similar to same bug fixed in libxml2 - * tests/general/bug-160.*, tests/general/Makefile.am, - tests/docs/bug-160.*, tests/docs/Makefile.am: added test provided - by Aaron Kaplan - -Tue Mar 29 22:35:14 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/general/bug-159.*, tests/general/Makefile.am, - tests/docs/bug-159.*, tests/docs/Makefile.am: added test for - bug #168196 fixed in libxml2 - -Tue Mar 29 21:06:11 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: working around Mark Vakoc' reported bug related - to mode internaing - * xsltproc/xsltproc.c: adding a --nodict mode to check problems with - document without a dictionnary. - * tests/REC/Makefile.am tests/general/Makefile.am: testing without - dictionnary - -Tue Mar 29 15:37:13 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: fix bug #165201 when calling xsltInit() multiple - times. - -Tue Mar 29 15:13:59 CEST 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c libxslt/xslt.c libxslt/xsltInternals.h: - added DTD like checking when compiling stylesheets, closes - bug #160402 and a long term TODO - * tests/general/bug-89.xsl: thos spotted a misconstruct of one - of the test cases where <xsl:when> was not within <xsl:choose> - -Mon Mar 21 20:56:43 MST 2005 John Fleck (jfleck(a)inkstain.net) - - * doc/xsltproc.xml, xsltproc.html, xsltproc.1: - update documentation to reflect addition of --nodtdattr - command line flag. Bug #171098 - -Wed Mar 16 17:19:24 HKT 2005 William Brack (wbrack(a)mmm.com.hk) - - * libxslt/xslt.c: fixed problem with text node on stylesheet - document without a dictionary (bug 170533) - -Sun Mar 13 20:08:34 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in doc/*: preparing 1.1.13, updated and rebuilt - the docs. - * tests/plugins/Makefile.am xsltproc/Makefile.am: trying to fix - some build problems. - * libxslt.spec.in: adding a build require and a require for - libgcrypt-devel, c.f. Red Hat bug #133211 - * libxslt/xsltInternals.h: as for libxml2, XML_CAST_FPTR was wrong. - -Wed Feb 23 19:25:13 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: fixed a problem with '//' and - namespaces (bug 168208) - -Mon Feb 14 23:10:21 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/namespaces.c: fixed a problem with - exclude-result-prefixes (bug 165560) - -Mon Feb 14 12:51:07 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: added a cretion of ctxt->globalVars in - xsltProcessUserParamInternal if missing. - -Wed Feb 9 21:58:56 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am doc/libxslt-api.xml doc/libxslt-refs.xml - doc/EXSLT/libexslt-api.xml: applied patch for make wiki from - Joel Reed and rebuild - * tests/plugins/Makefile.am: fix from Joel Reed for make dist - -Sun Jan 30 20:01:21 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/plugins/testplugin.c win32/Makefile.msvc win32/configure.js: - applied plugin patch for Windows by Joel Reed - -Fri Jan 28 01:00:56 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * win32/configure.js: Makefile fixes for Widows from Joel Reed - -Sat Jan 22 22:14:26 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c libxslt/preproc.c libxslt/templates.c - libxslt/xslt.c libxslt/xsltInternals.h: chasing xmlStrEqual - calls and removed them when comparing mode and modeURI for - templates by interning those strings when compiling the - stylesheets. - -Sat Jan 22 19:17:13 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: small fix for local setup - * libxslt/transform.c libxslt/variables.c : speeding up some - variable lookup. In the process dug out something nasty about - ctxt->dict creation and key initialization order. - -Sat Jan 22 16:28:27 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/templates.c libxslt/transform.c libxslt/xslt.c - libxslt/xsltInternals.h: when copying text nodes in elements - or attributes to the output, if interning, then reuse the strings - directly without copying them in the output tree if dicts are - shared between the context and the output docs. Less allocations - smaller output document and no copying involved anymore. - -Sat Jan 22 11:24:43 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: internalize all text node content from - stylesheet documents with the stylesheet dictionnary - -Fri Jan 21 12:04:18 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * tests/plugins/Makefile.am: Applied patch 11 (with small - modification) from Joel - -Thu Jan 20 21:05:27 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/plugins/Makefile.am tests/plugins/testplugin.c: applied - patch 10 from Joel Reed - -Wed Jan 19 10:08:55 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltwin32config.h, libxslt/xsltwin32config.h.in: - fixed a small error in LIBXSLT_VERSION_EXTRA pointed out - by Michael.Hewarth on the mailing list - -Wed Jan 19 13:58:16 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: patch #9 from Joel Reed - -Wed Jan 19 10:21:37 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: fixed problem with parserOptions not being - set before loading a new document (bug 164530) - -Mon Jan 17 16:50:02 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt/Makefile.am libxslt/xsltwin32config.h - tests/Makefile.am tests/plugins/Makefile.am - tests/plugins/testplugin.c: applied another patch from Joel Reed - still failing here but looking better - -Sun Jan 16 00:09:11 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: applied another patch from Joel Reed - -Sat Jan 15 13:54:28 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * tests/plugins/plugin.* tests/Makefile.am libxslt/extensions.c - libxslt/Makefile.am configure.in: Applied another patch from - Joel Reed, fixed a segfault and changed the configure code - a bit to work in my debug environment. - -Tue Jan 11 10:50:33 HKT 2005 William Brack <wbrack(a)mmm.com.hk> - - * configure.in: added python2.4 to the list of accepted - versions (bug 163274) - -Sun Jan 9 17:04:23 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: oops previous patch could break build - -Sun Jan 9 16:41:59 CET 2005 Daniel Veillard <daniel(a)veillard.com> - - * configure.in win32/configure.js libxslt/extensions.c - libxslt/xsltconfig.h.in libxslt/xsltwin32config.h.in: - integrated the module patch from Joel Reed with just a couple - of changes and cleanup. - -Tue Dec 27 17:50:10 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: fixed a problem with the expression - "*//name" (bug 162265), also a small problem with the '|' - operator. - -Thu Dec 23 16:04:47 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c, libxslt/templates.c: fixed a couple of - spots where out-of-memory errors were not detected in time - (bug #153660 on OSF/1) - -Thu Dec 2 21:10:31 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - *doc/xslt.html, doc/downloads.html: changed the download link - on the web page for cvs snapshot - -Wed Dec 1 22:37:55 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/extensions.c, libxslt/functions.c, libxslt/numbers.c, - libxslt/pattern.c, libxslt/transform.c, libxslt/xslt.c, - libxslt/xsltInternals.h: minor changes to get rid of gcc - warnings, especially on 64-bit system. Implemented - XML_CAST_FPTR macro to cast between function pointer <-> - object pointer while avoiding gcc warnings (a hack). - No change to the logic. - -Wed Dec 1 10:47:15 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/security.c xsltproc/xsltproc.c: applied patch from - Aleksey Gurtovoy moving some stat() definition for Windows - to the right place. - -Wed Dec 1 14:30:22 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xslt.c: applied patch from Mark Vakoc fixing bug with - namespace URI on template names. - * tests/namespaces/tst9*, tests/namespaces/Makefile.am: added - test case for this - -Tue Nov 30 10:53:18 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: more on RVT's in XPath predicates, this - time for bug 159726. Cleaned up the logic a little, hopefully - now covers all setting of XSLT_RUNTIME_EXTRA. - * tests/general/bug-158.xsl: corrected a typo - -Thu Nov 25 22:24:03 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/variables.c, libxslt/xsltInternals.h: backed out the - last change and re-did it the "right way" (bug 158372). - * tests/general/bug-158.*, tests/general/Makefile.am, - tests/docs/bug-158.*, tests/general/Makefile.am: added test - case for this bug - -Wed Nov 24 10:51:51 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/variables.c, libxslt/xsltInternals.h: enhanced the - evaluation of global variables to take account of possible - changes to the current document (bug 158372). - -Mon Nov 22 08:10:18 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: small change to previous fix for bug 153137, - fixes bug 158840. - * tests/general/bug-157.*, tests/general/Makefile.am, - tests/docs/bug-157.*, tests/docs/Makefile.am: added test for this - -Sun Nov 21 09:42:22 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: enhanced code to assure the "current - template rule" is not changed by xsl:call-template (bug 157859). - * tests/general/bug-156.*, tests/general/Makefile.am, - tests/docs/bug-156.*, tests/docs/Makefile.am: added a test case - -Mon Nov 8 11:41:32 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: fixed problem with day-of-week-in-month - (bug 157592) with patch from Sal Paradise - * tests/exslt/date/datetime.1.out: corrected expected output - after above fix - -Mon Nov 1 15:57:24 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * tests/general/bug-155.*, tests/general/Makefile.am, - tests/docs/bug-155*, tests/docs/Makefile.am: added a test case - provided by Markus Bertheau breaking on libxml2-2.6.15 - -Fri Oct 29 17:03:26 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS doc/*: preparing release of libxslt-1.1.12 - * libexslt/crypto.c: mini change to avoid breaking apibuild.py - * libxslt/templates.c: small fix, first step in adressing #153660 - -Fri Oct 29 14:18:35 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: indicate - means stdin closing - #156626 - -Wed Oct 27 17:00:54 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: another dictionnary/string interning fix - -Wed Oct 27 00:00:07 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fix to force string interning on generated - documents - -Sat Oct 23 09:36:12 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/crypto.c, libexslt/functions.c, libxslt/keys.c, - libxslt/numbers.c, libxslt/pattern.c, libxslt/transform.c, - libxslt/variables.c: changed some variable names for warning - cleanup when -ansi flag is not present. - * libxslt/namespaces.c: fixed potential NULL pointer reference - pointed out by Dennis Dams (bug 156187) - -Mon Oct 18 17:04:27 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in doc/Makefile.am: fix for RedHat bug #136072 - to include EXSLT doc in libxslt package. - -Thu Oct 14 22:43:22 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * configure.in, config.h.in, libexslt/date.c: changed date.c to use - gmtime_r if available (bug 129983) - * libexslt/functions.c: fixed a namespace problem concerning a - function with a namespace-qualified name (bug 155197) - -Tue Oct 12 03:54:44 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c: fixed a bug in namespace lookup exhibited - by the recent namespace tests in libxml2 - -Thu Oct 7 16:15:15 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed a problem of tree structure raised - by the new libxml2 tree checking code. - -Thu Sep 30 11:28:03 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: fixed problem with negative periods - (bug 154021) - * tests/exslt/date/sum.2.out: changed expected output, now - agrees with comments in sum.2.xml test data file - -Thu Sep 30 08:19:28 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/templates.c: patch from Mark Vakoc about an incorrect - attribute document pointer. - -Thu Sep 30 08:13:57 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * doc/tutorial2/libxslt_pipes.*: updated the tutorial from Panagiotis - Louridas - -Thu Sep 30 00:10:09 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: release of 1.1.11, rebuilt the docs - -Wed Sep 29 15:42:33 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: try to fix #153137 but without a test case - it's shooting in the dark. - -Tue Sep 28 16:20:48 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * doc/tutorial2/libxslt_pipes.*: New tutorial from Panagiotis Louridas - * libxslt.spec.in doc/Makefile.am: integrated the tutorial in the - distribution - -Sat Sep 25 21:38:57 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c libxslt/variables.c: fixed 2 leaks with - namespaced variable names. - * tests/general/bug-154.*, tests/general/Makefile.am, - tests/docs/bug-154*, tests/docs/Makefile.am: added test case - for above - -Fri Sep 24 18:13:45 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am: add missing variable - * libxslt/transform.c: fixed some error callback data - * tests/exslt/date/Makefile.am tests/exslt/date/sum*: added new - date:sum testing from Derek Poon - -Fri Sep 24 09:17:22 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: fixed problem with empty sets, etc. - (see discussion on mailing list) - -Sat Sep 18 17:08:31 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: fixed problem with timezone offset - (bug 153000) - * tests/exslt/date/add.1.out: changed regression test output, - which was apparently incorrect for above case - -Sat Sep 18 00:04:02 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: re-arranged sequence of setting up - namespaces within xsltCopyTree (see the list thread - http://mail.gnome.org/archives/xml/2004-September/msg00072.html) - * tests/general/bug-104.out: slight change to expected output - due to above fix - -Fri Sep 17 23:15:33 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: enhanced validation of date-time to catch - bit-field overflow (bug 152836) - * tests/exslt/date/date.2.*, tests/exslt/time.2.*: added test - cases for above - -Tue Sep 7 18:04:55 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/numbers.c: further refinement to UTF8 pattern - separator (bug 151975) - -Tue Sep 7 00:14:12 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/numbers.c: fixed problem with UTF8 pattern - separator (bug 151975) - -Mon Sep 6 14:27:38 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/imports.c, libxslt/xslt.c, libxslt/xsltInternals.h: - fixed 2 problems with xsl:include (bug #151795) - -Tue Aug 31 15:45:42 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in doc/*: Release of libxslt-1.1.10 - -Tue Aug 31 11:41:11 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: added missing descriptions - for --path as well as --load-trace, fixes Red Hat bug #106545 - -Fri Aug 27 20:52:52 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/keys.c: fixed small problem with key initialisation - disturbing the transformation context (bug 151201). - * tests/general/bug-153.*, tests/general/Makefile.am, - tests/docs/bug-153*, tests/docs/Makefile.am: added test case - for above - -Tue Aug 24 16:40:51 CEST 2004 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/configure.js: added support for version extra - -Mon Aug 23 16:53:02 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c libxslt/imports.c libxslt/xslt.c: fixing - compilation problems on Solaris #150844 - -Sun Aug 22 17:19:49 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS doc/*: preparing release of 1.1.9 - -Sat Aug 21 22:08:14 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: Further enhancement for keys on exslt:node-sets. - Corrects a rather serious timing problem (bug 150741) - * tests/exslt/common/node-set.8.*: added regression test for this - -Fri Aug 20 18:53:50 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am configure.in: a bit of cleanup and a extra variable for - CVS dist - -Fri Aug 20 11:30:19 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/imports.c: fix a 64bit bug reported by Andreas Schwab - -Wed Aug 18 14:27:18 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * configure.in libxslt/xsltconfig.h.in libxslt/xslt.c - libxslt/xsltwin32config.* libexslt/exsltconfig.h.in - libexslt/exslt.c: added some code to include the CVS - ChangeLog version in the version strings available for - printing (e.g. by xsltproc) - -Wed Aug 18 00:22:00 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: implemented --nodtdattr to avoid defaulting - DTD attributes, RFE 150311 . Also cleanup the code from all - libxml2 pre 2.6.0 specific code since we are using - LIBXML_REQUIRED_VERSION=2.6.8 in configure.in - -Tue Aug 17 01:01:22 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/documents.c libxslt/documents.h libxslt/imports.c - libxslt/xslt.c libxslt/xsltutils.c: Implemented a hook to - provide document loading as suggested by David Hyatt for - Safari - -Mon Aug 16 12:53:55 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: added a call to xmlXPathOrderDocElems - in xmlNewTransformContext for the principal document (bug 133289) - -Sat Aug 14 21:49:48 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/namespaces.[ch], transform.c, xslt.c, xsltInternals.h: - fixed handling of #default in namespace-alias for default - namespace (bug 149659) - * tests/namespaces/tst7.* tst8.*: added regression tests for above - -Fri Aug 6 11:05:31 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: added date:sum routine supplied by Joel - Reed - -Wed Aug 4 00:04:13 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * doc/downloads.html doc/xslt.html: fixed a couple of problems - reported by Oliver Stoeneberg - -Mon Aug 2 08:48:03 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/documents.c, libxslt/functions.c, libxslt/transform.c, - libxslt/variables.c: added code to assure keys are generated - when needed for node-sets (bug 148773) - * tests/exslt/common/node-set.7.* - added test case for above. - -Mon Jul 26 17:03:22 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: fixed str:tokenize for case when 2nd - argument is an empty string (should produce a token for - each char in the string). Reported on the mailing list by - Peter Pawlowski. - -Fri Jul 23 21:55:14 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - * libxslt/imports.c: further enhancement for template priorities - on imported stylesheets (better fix for bug 141279, fixes - bug 148246). - -Fri Jul 16 12:14:57 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libexslt/crypto.c libexslt/exslt.[ch] - libexslt/exsltconfig.h.in win32/configure.js: apply patch from - Rob Richards to add a normal --with-crypto configure option. - -Tue Jul 13 22:57:43 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/functions.c: added some logic to xsltKeyFunction - to set the transform context doc ptr when the xpath context - doc is different (bug 147445) - * tests/exslt/common/Makefile.am, tests/exslt/common/node-set.5* - and tests/exslt/common/node-set.6*: added regression tests - for bug 145547 (UNION and FILTER for RVT's) - -Mon Jul 12 08:28:07 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * python/libxslt-python-api.xml: fixed type for doctypeSystem - and doctypePublic (problem reported on the list by Sitsofe - Wheeler) - * doc/libxslt-api.xml: updated database. - -Sun Jul 11 22:46:31 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: small change to key handling for RVT, needed - because of enhancement to libxml2 xpath. - -Fri Jul 9 02:51:38 PDT 2004 Daniel Veillard <daniel(a)veillard.com> - - * python/libxsl.py: fixes Python on 64bits box problem. - -Tue Jul 6 18:43:37 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in: better python dependancy Red hat bug #126364 - by Robert Scheck - -Tue Jul 6 21:35:44 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * tests/namespaces/Makefile.am: added extra2.err, tst5.xml, - tst5.xsl and tst.out to EXTRA_DIST - -Mon Jul 5 21:48:13 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: releasing 1.1.8 - -Sun Jul 4 24:18:12 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * xsltproc/Makefile.am: changed the sequence of LD_ADDS and - LIBGCRYPT_LIBS on xsltproc_LDADD. Previously this was - causing the wrong libs to be linked when using the configure - option --with-libxml-libs-prefix, or --with-libxml-src (nasty) - -Sun Jul 4 21:42:48 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/Makefile.am: implemented change from Joel Reed for - automake-1.4 compatibility. - * libexslt/crypto.c: reformatted source to remove an overly - generous supply of tabs. Added a #include for sys/select to - fix a compilation error caused by the gcrypt include file's - usage of 'fd_set'. Made some minor changes to fix - some warning messages (no change to the logic). - * configure.in, config.h.in: added test for presence of - sys/select.h. - Added test for libgcrypt version > 1.1.41 (bug 145245) - -Sat Jul 3 17:52:27 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/xslt.html, doc/extensions.html: corrected the URI for libxslt - namespace, also a small enhancement of the surrounding text on - extension functions. (bug 145250) - -Fri Jul 2 15:51:49 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: convenience change - * python/libxsl.py python/libxslt-python-api.xml python/libxslt.c: - try to avoid calling libxml2 cleanup function directly but go - though the python wrapper of libxml2 for memory debug accounting. - -Fri Jul 2 16:24:12 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/keys.c: added namespace setup before calling XPath - to evaluate key (Bug 143520) - -Thu Jul 1 10:07:55 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: added coding to xsltCopyTree to copy - namespaces (bug 139578). - * tests/general/bug-128.out: changed to reflect above fix - * libxslt/xslt.c: minor change to an error message - -Wed Jun 30 18:41:20 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * win32/Makefile.msvc win32/Makefile.mingw libexslt/Makefile.am - libexslt/exslt.c libexslt/exslt.h config.h.in configure.in - libexslt/crypto.c: applied patch from Joel Reed to get EXSLT - crypto extensions based on libgcrypt if found at configure time. - * tests/namespaces/Makefile.am: fixed a small breakage - -Wed Jun 30 12:28:34 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/namespaces: some enhancement for fixing bug 142768 - * tests/namespaces/Makefile.am, tests/namespaces/tst6*: - added regression test for this bug - -Tue Jun 29 09:23:03 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am examples/xsltICUSort.c: seems I never commited to CVS - the example from Richard Jinks - -Wed Jun 9 16:33:56 CEST 2004 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/configure.js win32/Makefile.* minor changes for the new - layout of the Windows binary package - -Wed May 26 10:51:22 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/search.php.inc, doc/search/php: enhanced to remove - forcing module names to lower case, and to fix problem - with links between pages in libxml2 directory. - -Mon May 24 12:46:10 HKT 2004 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/makefile.msvc, win32/configure.js: included the cruntime - option, contributed by Oliver Stoeneberg - -Mon May 24 08:37:22 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.c: fixed bug in error message printing - for undefined namespace (bug 143004) - -Mon May 17 23:08:42 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * NEWS doc/*: updated for 1.1.7 - -Mon May 17 06:14:09 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: release of libxslt-1.1.7 - -Sun May 16 23:08:05 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * tests/general/bug-151*, tests/docs/bug-151.xml, - tests/general/Makefile.am, tests/docs/Makefile.am: added - regression test for old bug #127877 - -Sun May 16 20:48:35 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing bug #135542 about the DOCTYPE name - being generated when the root element is namespaced - * tests/general/bug-151*, tests/docs/bug-151.xml, - tests/general/Makefile.am, tests/docs/Makefile.am: added - regression test for bug #135542 - -Sun May 16 19:39:44 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c libxslt/namespaces.h libxslt/templates.c - libxslt/transform.c: fixing bug #134500 on namespace lookup for - attribute which sometimes lead to default namespace - * tests/general/bug-150*, tests/docs/bug-150.xml, - tests/general/Makefile.am, tests/docs/Makefile.am: added - regression test for bug #134500 - -Sun May 16 18:09:36 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.h: fixing a small portability problem on Solaris - for the declaration of localtime_r bug #140468 - -Sun May 16 16:36:38 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.m4: applied patch from Edward Rudd to fix the problems - raised in bug #142429 - -Sun May 16 11:01:52 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: fixed a weird namespace bug #141532 - * tests/docs/Makefile.am tests/docs/bug-14[89].xml - tests/general/Makefile.am tests/docs/bug-14[89]*: added tests - to the regression for bug #141532 - -Sun May 2 23:47:43 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/imports.c: added comments and function header, - improved logic of routine just added. - * tests/general/bug-147*, tests/docs/bug-147.xml, - tests/general/Makefile.am, tests/docs/Makefile.am: added - regression test for bug 141279 - -Sun May 2 12:47:32 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/imports.c: enhanced normalization of comp steps - when an imported stylesheet has it's own imports - (bug 141279) - -Sat May 1 10:35:03 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: added code to recognize - disable-output-escaping on certain text nodes (bug 140755) - * tests/general/bug-100.out: regenerated to account for change - from next ChangeLog entry (bug 140558) - -Wed Apr 28 18:17:24 PDT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.c: suppressed any automatic linefeed after - a comment following the document root element (bug 140558) - -Thu Apr 22 08:38:35 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fix a problem where we updated an - ELEMENT node psvi field as if it was a DOCUMENT one, leading - to a subtle crash later, valgrind rules. - -The Apr 20 00:22:37 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: fixed bug in UTF8 string tokenize - kindly reported by Vasily Tchekalkin - -Mon Apr 19 00:39:18 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: preparing release 1.1.6 - * libxslt.spec.in: keep the ChangeLog compressed - -Mon Apr 5 15:23:53 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: fixed a stupid cut'npaste bug #139132 - * tests/docs/Makefile.am tests/docs/bug-146.xml - tests/general/Makefile.am tests/docs/bug-146*: added test - to the regression for bug #139132 - -2004-04-02 10:17:23 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/keys.c: applied patch from Mark Vakoc to fix problem - with key matching attribute node. - -2004-04-01 Johan Dahlin <johan(a)gnome.org> - - * python/.cvsignore: Add generated files, to make cvs silent. - - * .cvsignore: Add missing libexslt.pc and stamp-h1 - -Tue Mar 23 13:13:56 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: prepare release of 1.1.5, made a hard dependancy - to libxml2 2.6.8 due to the dictionnary reference counting change - * doc/*: updated and rebuilt the doc. - * tests/namespaces/Makefile.am: fixed a build problem (tst5 ?) - -Mon Mar 22 20:25:41 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltconfig.h.in: small fix for OpenVMS - * libxslt/documents.c: fixed a leak associated to the change - in reference counting when running the XML parser and using - the document() function. - -Wed Mar 17 18:49:55 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * xsltproc/xsltproc.c: added check for state XSLT_STATE_STOPPED - when output file is used (bug 137341) - -Tue Mar 16 08:55:18 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.c: corrected my error from bug 135938 - pointed out on the mailing list by Mark Vakoc. - * libxslt/transform.c: enhanced the error message for - call-template when namespace is present. - * tests/general/bug-145.err: regenerated for new message - -Fri Mar 12 13:07:03 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/namespaces.c: added additional check to prevent - superfluous namespace href's being generated on elements - (bug 136914) - * tests/namespaces/Makefile.am, tests/namespaces/tst5.x[ms]l: - added new test for bug 136914 - * tests/namespaces, tests/extensions/ tests/reports: fixed - error in "enhanced" Makefile.am, removed superfluous .err files - from cvs - -Wed Mar 10 19:27:39 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/search.php.incl: minor addition for later version of php - requiring $HTTP_GET_VARS. - doc/*: rebuilt the docs - -Wed Mar 10 17:14:13 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: modified the 'tokenize' routine to work with - UTF8 chars in both string and tokens (Bug 136183) - -Tue Mar 9 23:44:31 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/attrvt.c: added coding to allow growing the - AVT structure when a large number of segments are present - (bug 136624) - * libxslt/keys.c: fixed a compilation warning (no logic change) - -Sat Mar 6 23:42:47 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * tests/docbook/Makefile.am: small fix to typo - -Sat Mar 6 23:05:11 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * Makefile.am, tests/Makefile.am, tests/REC/Makefile.am, - tests/REC1/Makefile.am, tests/REC2/Makefile.am, - tests/XSLTMark/Makefile.am, tests/docbook/Makefile.am, - tests/exslt/common/Makefile.am, tests/exslt/date/Makefile.am, - tests/exslt/functions/Makefile.am, tests/exslt/math/Makefile.am, - tests/exslt/sets/Makefile.am, tests/exslt/strings/Makefile.am, - tests/extensions/Makefile.am, tests/general/Makefile.am, - tests/keys/Makefile.am, tests/multiple/Makefile.am, - tests/namespaces/Makefile.am, tests/numbers/Makefile.am, - tests/reports/Makefile.am, test/xmlspec/Makefile.am, - tests/general/bug-60.err, tests/docbook/result/html/gdp-handbook.err, - tests/REC/test-2.5-1.err: - Major enhancement to "make tests". All but Python tests - cleaned up to produce minimum summary output if no problems. - * tests/general/bug-145.xsl, tests/general/bug-145.err, - tests/docs/Makefile.am, tests/docs/bug-145.xml: - Added test case for bugzilla bug 135938 - -Thu Mar 4 23:02:18 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.h, libxslt/xsltutils.c, libxslt/preproc.c: - fixed problem with dictionary handling (bug 135938). - * doc/EXSLT/*: fixed a few more "href_base" files. - -Wed Mar 3 21:33:33 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/*, doc/html/*, doc/EXSLT/*: rebuilt the docs to fix - the "href_base" problem. - -Fri Feb 27 01:04:47 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * configure.in, config.h.in: added test for localtime_r - * libexslt/date.c: added usage of localtime_r if present on - system (bug 129983, suggested by Vasily Tchekalkin) - -Thu Feb 26 16:59:45 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c libxslt/pattern.c: removed the last use - of _private that time in the input document, use the psvi - field again, this may be interesting if XSLT2 support gets - in but since this is very unlikely ... - -Thu Feb 26 16:04:28 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c libxslt/variables.c: use the psvi field - of teh document used for RVT instead of _private. - -Thu Feb 26 15:17:52 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attrvt.c libxslt/templates.c: use the psvi field of - the attribute instead of the _private one to compile AVT infos - -Thu Feb 26 14:53:16 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-144.xml - tests/general/Makefile.am tests/docs/bug-144*: added test - similar to 143 but checking for AVT in local variables. - -Thu Feb 26 13:16:33 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attrvt.c libxslt/variables.c: fixed a regression for - AVT found in global variable content. - * tests/docs/Makefile.am tests/docs/bug-143.xml - tests/general/Makefile.am tests/docs/bug-143*: added test - to the regression suite. - -Wed Feb 25 16:35:01 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c libxslt/keys.h libxslt/preproc.c - libxslt/transform.c libxslt/variables.c libxslt/xsltutils.c: - First step toward _private cleanup: use the psvi field to store - the precompilation information in the stylesheet nodes. - -Wed Feb 25 14:24:34 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: trying to use the fact that names comes - from a dictionnary when looking up for variables. - * tests/documents/Makefile.am: try to fix an error reported on - the list. - -Wed Feb 25 17:02:22 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * tests/general/Makefile.am, tests/general/bug-142.xsl, - tests/general/bug-142.out, tests/docs/Makefile.am, - tests/general/bug-142.xml: added test for language - attribute which previously triggered a memory leak - (from list report by Mike Hommey) - -Mon Feb 23 18:01:44 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in doc/*: preparing release 1.1.4, updated and - regenerated the documentation - -Tue Feb 24 00:37:28 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.c, libxslt/templates.c, libxslt/preproc.c: - minor changes to eliminate compilation warnings. No change - to logic. - -Sun Feb 22 23:59:12 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/exsltexports.h libxslt/xsltexports.h: patches from - Mikhail S Grushinskiy to compile on Mingw - -Sat Feb 21 16:47:04 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * win32/Makefile.msvc: patch from Mark Vadoc for attrvt.c - -Wed Feb 18 13:32:55 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: applied patch from Steve Little to - display the extension modules. - -Wed Feb 18 11:40:23 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: trying to fix an extension regression pointed - out on the list. - -Tue Feb 17 12:20:26 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: try to fix the problem with yelp - and dictionnaries - -Tue Feb 17 11:29:15 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/templates.c: applied patch from #134588 provided by - Mariano Su�rez-Alvarez, attribute text node without doc. - -Mon Feb 16 15:55:57 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * configure.in, doc/*: updated and rebuilt the documentation - preparing release of 1.1.3 - * libxslt/attrvt.c libxslt/xsltInternals.h: cleanup - -2004-02-15 Tomasz Kłoczko <kloczek(a)pld.org.pl> - - * libxslt.m4: small fix: added missing [] quotation macro name - defined in AC_DEFUN(). Fix is neccessary for aclocal from automake - 1.8.x and is backward compatible with older auto tools. - -Sun Feb 15 23:01:09 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attrvt.c libxslt/templates.c: removed the two last - known bug with the new code, was overoptimizing a bit... - -Sun Feb 15 19:57:20 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attrvt.c: found the memory leak shown in DocBook, - mostly an error handling some ATV coupled with doctionnaries - reference counting. - * libxslt/documents.c libxslt/transform.c libxslt/variables.c - libxslt/xslt.c: added a bit of debug to be able to trace - dictionnaries. - -Fri Feb 13 16:59:46 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attrvt.c libxslt/Makefile.am: added new code to handle - attribute value templates - * libxslt/*.c libxslt/*.h: also a lot of work to reuse the - dictionaries at the stylesheet and transformation level. - * configure.in: this relies on a recent version of libxml2 - with the sub dictionnary catalog. - -Sun Feb 8 16:53:14 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: added check for "?>" in PI content - (Bug 133726) - -Sat Jan 31 02:43:45 PST 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/namespaces.c: fixed problem with attribute - namespace (Bug 132953) - -Thu Jan 29 14:47:22 PST 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: added check for "--" or ending '-' - in xsl:comment (Bug 132742) - -Thu Jan 29 14:08:31 PST 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c, libxslt/attributes.c: added - validation of QName for xsl:element and xsl:attribute - (Bug 132531) - -Fri Jan 23 18:52:22 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: changed priority of template patterns - starting with '//' from 0.0 to 0.5 (Bug 131705) - -Thu Jan 22 18:42:03 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: applied patch from Stefan Kost to fix - behaviour on unknown element from the XSLT namespace. - * python/generator.py: applied patch from Stephane bidoul - to export enums in the bindings. - -Thu Jan 22 10:35:14 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * tests/general/Makefile.am, tests/general/bug-141.out, - tests/general/bug-141.xsl, tests/docs/Makefile.am, - tests/general/bug-141.xml: added test case for - Bug 13971 (libxml2 xpath.c bug, but tested here) - -Fri Jan 16 22:15:34 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.c: added a newline for any comment before - the root element (Bug 130433) - * libxslt/xslt.c: fixed problem with cdata-section-elements when - default namespace is changed (Bug 130793) - * tests/extensions/module.out, tests/general/bug-100.out: adjusted - for newline after comment change above. - * tests/general/Makefile.am, tests/general/bug-140.xsl, - tests/general/Makefile.am, tests/docs/bug-140.xml: added test for - cdata-section-elements problem. - -Wed Jan 14 16:44:58 CET 2004 Daniel Veillard <daniel(a)veillard.com> - - * python/libxsl.py: applied shared lib loading patch for OS X from - Gianni Ceccarelli - -Wed Jan 14 14:28:02 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/math.c, libexslt/common.c: fixed problem, - reported on the list by Markus Bayerlein, concerning - math functions on nodesets generated with - exslt:node-set - * tests/exslt/math/max.3.xsl, tests/exslt/math/max.3.xml, - tests/exslt/math/max.3.out, tests/exslt/math/Makefile.am: - added test case for above. - -Tue Jan 13 00:33:50 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: changed to assure comment which - preceeds root node is output after DTD (Bug 130433) - * test/exslt/common/node-set.4.*: added test case for - Bug 130922 - -Mon Jan 12 12:51:45 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/site.xsl: Changed logo spacing to avoid stacking - * doc/*: rebuilt web pages - -Sun Jan 11 20:10:09 MST 2004 John Fleck <jfleck(a)inkstain.net> - - * doc/site.xsl - * doc/w3c.png - * doc/* - Test William's new site.xsl improvements by adding the - W3C logo icon, rebuild docs, and presto! It shows up - everywhere! - -Mon Jan 10 08:33:18 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: Refined wrapper code with large - test case submitted by Norm Walsh. (Bug 130922) - -Sun Jan 10 23:33:21 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: Added coding to create a xsltDocument - wrapper for an RVT, in order to produce the applicable - keys (Bug 130922) - -Sat Jan 9 17:04:38 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/search.xml, doc/search.templ, doc/Makefile.am, - doc/search.php.inc: Added new facility to "autogen" - the search script. Fixed a few more problems with - the API page generation. - * doc/site.xsl, doc/api.xsl, doc/newapi.xsl: integrated - the autogeneration of the php script. Note that from - this point doc/search.php will be include in the - generic "Rebuilt docs". - * doc/*: api docs rebuilt. - -Fri Jan 8 08:32:55 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/site.xsl, doc/api.xsl, doc/newapi.xsl, doc/search.php: - Further cleanup, fully implemented common routine for - "generic page" within the docs. - * doc/*: api docs rebuilt with enhanced scripts. - -Thu Jan 8 06:45:04 MST 2004 John Fleck <jfleck(a)inkstain.net> - - * doc/xslt.html, doc/bugs.html - made link to bugzilla more useful - -Wed Jan 7 20:12:14 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * doc/api.xsl, doc/site.xsl, doc/search.php: a little - cleanup of scripts, assuring page tables are consistent. - * doc/*: api docs rebuilt with enhanced scripts. - -Tue Jan 6 23:38:47 HKT 2004 William Brack <wbrack(a)mmm.com.hk> - - * configure.in: fixed Bug130593. - * doc/apibuild.py: fixed a couple of sequence problems on - references within APIxxx.html files, rebuild doc/* (and NEWS) - -Sun Jan 4 19:06:59 MST 2004 John Fleck <jfleck(a)inkstain.net> - - * doc/newapi.xsl: change background color of function - declaration to improve readability - * doc/*: rebuild docs with new stylesheet - -Fri Jan 2 21:42:49 MST 2004 John Fleck <jfleck(a)inkstain.net> - - * libxslt/transform.c: fix bad doc comment formatting on - xsltDebugSetDefaultTrace and xsltDebugGetDefaultTrace - * doc/*: rebuild docs - -Wed Dec 24 15:15:52 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: prepared release of libxslt-1.1.2 - * libxslt.spec.in doc/Makefile.am: some tweaking following the - new EXSLT docs. - -Mon Dec 22 20:33:08 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxlst/numbers.c: fixed xsl:number level="any" for Bug - 129057 - -Sun Dec 21 21:38:11 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/numbers.c: added namespace comparison for - xsl:number count function (Bug 129057) - -Sun Dec 21 13:56:48 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-139.xml - tests/general/Makefile.am tests/general/bug-139*: added - test for entities parsing (Bug #129489) - -Sun Dec 21 20:33:27 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * tests/docs/Makefile.am tests/docs/bug-138.xml - tests/general/Makefile.am tests/general/bug-138*: added - test for namespace problem (Bug #129624) - -Sun Dec 21 13:17:05 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc.c: fixed #129327 make sure parser flags get transmitted to - the transformation context - * libxslt/documents.c libxslt/transform.c libxslt/xsltInternals.h - libxslt/xsltutils.c libxslt/xsltutils.h: add a new call - xsltSetCtxtParseOptions() to update parsing options in document() - -Sun Dec 21 12:51:12 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: fixed second problem on #122483, namespace - definitions must be propagated to keys. - * tests/docs/Makefile.am tests/docs/bug-137.xml - tests/general/Makefile.am tests/docs/bug-137*: added test - to the regression for bug #122483 - -Sun Dec 21 12:08:45 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: added the cast needed to fix #129188 warning - -Sat Dec 20 23:37:31 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/transform.c: fixed Bug 129624 (erroneous output - of namespaces) - -Sat Dec 20 16:22:11 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c: fixed several routines to assure empty - string returned (rather than a string object with a null - string pointer) (Bug 129561) - -Mon Dec 16 00:30:47 PST 2003 William Brack <wbrack(a)mmm.com.hk> - - * doc/Makefile.am doc/site.xsl doc/api.xsl doc/newapi.xsl - doc/xslt.html doc/apibuild.py doc/EXSLT doc/EXSLT/exslt.html: - enhanced documentation to include exslt; rebuilt docs - -Mon Dec 15 20:33:52 MST 2003 John Fleck <jfleck(a)inkstain.net> - - * libxslt/xsltutils.h - * doc/* - document XSLT_TRACE macro (sort of) and rebuild docs - -Thu Dec 11 19:50:41 CET 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/Makefile.mingw win32/configure.js: tried to fix mingw - build, no success, it still works halfway. - -Thu Dec 11 16:33:41 CET 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/Makefile.* win32/configure.js libxslt/xsltexports.h - libexslt/exsltexports.h libxslt/win32config.h: msvc and - mingw compilation fixes. - -Wed Dec 10 20:37:46 MST 2003 John Fleck <jfleck(a)inkstain.net> - - * doc/xslt.html docs.html - remove reference to gtk-doc - -Wed Dec 10 17:20:27 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS doc/*: updated the docs, made release 1.1.1 - -Wed Dec 10 16:13:38 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: upp'ed the dependancy to libxml2-2.6.3 - * libxslt/documents.c xsltproc/xsltproc.c: fixed #127473 - by using the new XInclude APIs provided by 2.6.3... - -Mon Dec 8 23:34:32 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c, libxslt/xslt.c: modified to assure - XML_CDATA_SECTION_NODE's do not have xmlStringTextNoenc - set into node name. This modification arises from - bug #128520, and avoids unnecessary work in libxml2. - -Mon Dec 1 16:41:27 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/*.h *.h.in: updated the metadata information in the headers - * doc/* doc/html/*: regenerated the docs. - -Sun Nov 30 23:25:22 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * doc/Makefile.am: small further enhancement to makefile - * doc/APIchunk[127].html, doc/libxslt-api.xml, doc/libxslt-refs.xml, - doc/html/libxslt-transform.html: updated to reflect last change - to transform.c - -Sun Nov 30 22:44:07 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * doc/newapi.xsl, doc/api.xsl, doc/apibuild.py, doc/site.xsl, - Makefile.am: adapted the libxml files for libxslt. - * doc/API*.html, doc/html/*.html, doc/libxslt-api.xml, - doc/libexslt-api.xml, doc/libxslt-refs.xml, - win32/libxslt.def.src, win32/libexslt.def.src: regenerated - the docs. - -Sun Nov 30 18:48:27 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: change initialisation of external functions - to take place in xsltNewTransformContext instead of in - xsltApplyStylesheetInternal. This fixes bug 122483, and should - also fix problem reported on the mailing list on today's date. - -Wed Nov 26 09:49:11 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/imports.c, libxslt/xsltInternals.h: Changed to - detect recursion in xslt:include (bug #127687). - * tests/XSLTMark/reverser.out, - * test/docbook/result/xhtml/gdp-handbook.xhtml: results changed - because of fix of bug #127877 in libxml2 (quotes in text) - -Mon Nov 24 07:32:38 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xslt.c, libxslt/imports.c, libxslt/parserInternals.h: - Changed to detect recursion in xslt:import (bug #127687). - * doc/libxslt-api.xml, python/libxsltclass.txt: regenerated to - include change to xsltParseStylesheetImportedDoc parameters for - above. - -Sat Nov 22 13:04:59 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c libxslt/templates.c libxslt/transform.c - libxslt/variables.c libxslt/xsltInternals.h libxslt/xsltutils.h: - Applied patch from Mark Vadoc adding flexible trace debugging - support to the library. - -Sat Nov 22 00:53:47 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c: fixed bug #127561 (xsl:element with a - 'computed' namespace attribute) - * tests/docs/Makefile.am tests/docs/bug-136.xml - tests/general/Makefile.am tests/docs/bug-136*: added tests - to the regression for bug #127561 - -Fri Nov 21 18:17:32 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/keys.c: small further enhancement, bug #127450 - -Thu Nov 20 17:26:57 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: another problem reported by Oleg Paraschenko - on the same code in #127450 - * tests/docs/Makefile.am tests/docs/bug-135.xml - tests/general/Makefile.am tests/docs/bug-135*: added tests - to the regression suite for bug #127450. - -Thu Nov 20 10:59:48 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: fixed an error from #120684 patch raised in - #127450 - * tests/docs/Makefile.am tests/docs/bug-134.xml - tests/general/Makefile.am tests/docs/bug-134*: added tests - to the regression suite for bug #127450. - -Thu Nov 20 00:22:14 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: fixed a bug in the keys selector parsing - #120684 when | is in a predicate or a string. - * tests/docs/Makefile.am tests/docs/bug-133.xml - tests/general/Makefile.am tests/docs/bug-133*: added tests - to the regression suite for bug #120684. - * Makefile.am: don't package cvs temp files - * doc/apibuild.py: update from libxml2 one - -Tue Nov 18 13:42:12 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/strings.c: fixed entity problem in exslt:tokenize - uncovered by newapi.xsl - * libxslt/transform.c,libxslt/pattern.c,libxslt/keys.c: changed - to use IS_BLANK_CH for char compares (fixes warnings) - -Fri Nov 14 23:59:08 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c: applied fix from Bjorn Reese to close - number formatting bug #126994 - -Fri Nov 14 18:44:50 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am configure.in libexslt.pc.in libxslt.spec.in: adding - libexslt.pc support - -Thu Nov 13 11:54:36 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c libxslt/documents.c libxslt/transform.c - libxslt/variables.c libxslt/xsltInternals.h: applied Mark Vakoc - patch to moves the control of the XSLT debugger into the transform - context. - -Tue Nov 12 18:17:24 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/functions.c: applied patch for param visibility from - Shaun McCance. Changed variable scoping in accordance with - Shaun's suggestions. This fixed problem reported on the list - by Bernd Lang - * tests/exslt/functions/function.8.[xml,xsl,out], Makefile.am: - regression test for above - -Sat Nov 8 13:27:12 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/libexslt.3: applied improvement patch from Jonathan Wakely - describing the entry points. - -Wed Nov 6 17:27:23 CET 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/configure.js: fixed #122146 - -Wed Nov 5 12:25:34 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/multiple/Makefile.am: applied last fix from #125614 - -Tue Nov 4 19:08:53 PST 2003 William Brack <wbrack(a)mmm.com.hk> - - Minor enhancements to eliminate compile/test warnings - * libxslt/xsltconfig.h.in, libexstl/exsltconfig.h.in: - changed macro ATTRIBUTE_UNUSED for gcc so that, if undefined, - it's defined as __attribute__((unused)) - * python/libxslt.c: fixed ATTRIBUTE_UNUSED to appear after - variable declaration - * libxslt/preproc.c: minor change to get rid of unused var/code - -Tue Nov 4 14:21:06 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/* NEWS: preparing release 1.1.0 - -Tue Nov 4 14:04:58 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c: fixing the Document element precompilation - to avoid the problem raised in #125614 - -Tue Nov 4 01:08:17 PST 2003 William Brack <wbrack(a)mmm.com.hk> - - * tests/multiple/out/letter*.orig: updated to reflect change - to HTML output in libxml2 (formatting of <p>, bug #125093) - -Sun Nov 2 09:07:32 PST 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xslt.c: fixed bug #124286 - detect invalid name on - template - -Sun Nov 2 10:51:58 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am configure.in libxslt.spec.in doc/libxslt-api.xml - libxslt/xslt.h libxslt/xsltwin32config.h: some cleanup and trial - for the upcoming 1.1.0 release - * breakpoint/*: this release removes the deprecated breakpoint library - -Sat Nov 1 17:04:27 PST 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/transform.c, tests/general/bug-119.out: fixed - bug #125502 and corrected expected test output - * tests/general/bug-79.out: fixed broken test (bug #123328) - * libxslt/pattern.c, libexslt/functions.c: minor change to - eliminate compilation warning - -Sat Nov 1 22:36:30 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/REC/test-5.2-17.xsl tests/REC/test-5.2-18.xsl: fixing two - broken tests (revealed by #125502) - -Sat Nov 1 07:41:06 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: fix bug #125265 about entities breaking - exsl:tokenize and exsl:split - * tests/exslt/strings/split.1.* tests/exslt/strings/tokenize.1.*: - augmented the reression tests with the example from the bug report. - -Fri Oct 31 20:26:04 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c: fix bug #120828 make sure that xsl:sort is - empty. - -Fri Oct 31 15:53:45 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/documents.c libxslt/imports.c libxslt/xslt.c libxslt/xslt.h - xsltproc/xsltproc.c: switch to use xmlReadfile instead of - xmlParseFile, this avoid relying on global parser options, far - far cleaner. - * tests/XSLTMark/xslbench1.out tests/general/bug-90.out: fixes a - slightly corrected output for CDATA and STYLE element save. - -Tue Oct 28 15:30:54 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in python/Makefile.am python/tests/Makefile.am: applied - patch from Roumen Petrov for bug #124539 when building outside the - source directory - * libxslt/xsltutils.c: fixed the way to grab the line number from - the document, use the predefiend libxml2 API which mate it work - with both 2.5.x and 2.6.x - -Mon Oct 27 08:57:43 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xslt.c: put in #undef for IS_BLANK macros to fix - problem reported on the mailing list by Justin Fletcher - -Fri Oct 24 00:49:05 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt.spec.in: doing some testing and raising - the build requirement to 2.5.10 - * libexslt/Makefile.am configure.in: applied patch from Graham Wilson - for linking the exslt lib with the lib being build instead of the - installed one - -Thu Oct 23 15:48:39 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: Fixed problem with cascaded predicates - (more of bug 119946) - -Thu Oct 23 15:37:26 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * restored earliest portion of ChangeLog (was corrupted) - -Wed Oct 22 13:07:50 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.[ch]: applied patch from Kasimier Buchcik - for xsltGetDebuggerStatus and xsltSetDebuggerStatus - * doc/libxslt-api.xml: regenerated the API - -Sun Oct 19 23:32:23 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: bump the libxml2 require to 2.6.0 which - should ship for good real soon... - * doc/Makefile.am: fix installation of HTML pages - * doc/libxslt-api.xml: rebuilt - * libxslt/xsltexports.h: cleanup - * python/generator.py: ATTRIBUTE_UNUSED is after the parameter - * xsltproc/xsltproc.c: applied Crutcher Dunnavant --load-trace patch 2 - -Fri Oct 17 18:25:42 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/attributes.c: fixed bug 123822 - -Fri Oct 17 12:40:37 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/pattern.c: fixed bug 119946 - * configure.in: enhanced for better devel (me) testing - -Wed Oct 15 17:30:43 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: applied a small patch from Troels Walsted Hansen - for python libxml2 detection. - -Sat Sep 27 18:42:57 PDT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/numbers.c, libxslt/extensions.c, libexslt/date.c, - python/libxslt.c, xsltproc/xsltproc.c: minor cleanup for - various compilation warnings (AIX as well as gcc) - -Sat Sep 27 17:29:43 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/saxon.c: applied patch from Brett Kail to implement - saxon:line-number() - -Thu Sep 25 11:46:40 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.h libxslt/extra.h: fix some header paths - as pointed by Steve Ball - -Wed Sep 24 23:31:45 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: applied patch from Karl Eichwalder - apparently the xmlFree was introducting a memory error - on x86_64, though not reproduced. - * libxslt/transform.c: patch from Shaun McCance fixing a comment. - -Thu Sep 18 11:32:20 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt.c: don't output errors to stdout by default - use stderr instead. - -Thu Sep 18 11:28:43 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c libxslt/numbers.c: small fixes w.r.t. - IS_XSLT_REAL_NODE change - * python/Makefile.am Makefile.am: some makefile "distclean" - target improvement from Graham Wilson - * xsltproc/xsltproc.c: small fix from Alexey Efimov for options - display. - -Mon Sep 15 07:41:14 PDT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.h: Added XML_PI_NODE to the macro - IS_XSLT_REAL_NODE, fixed bug 120644. - -Sat Sep 13 02:04:13 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c doc/xsltproc.1 doc/xsltproc.xml - libxslt/xsltutils.h: removing the DocBook SGML support - -Fri Sep 12 13:52:07 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing release libxslt-1.0.33 - * doc/*: updated and rebuilt the docs - * doc/apibuild.py: small fixes for new tokens - -Wed Sep 10 23:32:42 PDT 2003 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: enhanced previous fix to bug #120684, using - excellent suggestion by Daniel - * attributes.c: fixed bug #119583, merging attribute sets - from imported stylesheets. - * tests/docs/Makefile.am tests/docs/bug-131.xml - tests/general/Makefile.am tests/docs/bug-131*: added tests - to the regression suite for bug #120684. - -Sat Sep 6 09:57:03 PDT 2003 William Brack <wbrack(a)mmm.com.hk> - - * pattern.c pattern.h imports.c: fixed bug 119946, caused by - incorrect creation of "extra" variables when compiling - templates on imported stylesheets. - * tests/docs/Makefile.am tests/docs/bug-130.xml tests/docs/bug-130.doc - tests/general/Makefile.am test/docs/bug-130*: added tests - to the regression suite for this bug. - - -Wed Sep 3 15:33:40 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/xmlspec/*.html: tyny change HTML -> html DOCTYPE due to - a libxml2 change - -Tue Sep 2 18:22:46 PDT 2003 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: fixing bug #120684 on crash caused by text between - apply-templates - -Tue Sep 2 16:05:37 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/xsltexports.h libexslt/exsltexports.h: defined additional - macros which affect exports and added mingw section - -Mon Sep 1 23:02:12 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/function.c: patch from Mark Vadoc to allow compiling - against libxml2 without XPointer supoort. - -Fri Aug 29 12:28:12 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing the bug #120971 on cdata-section-elements - with namespaced names reported by Steve Hay - * tests/docs/Makefile.am tests/docs/bug-129.* - tests/general/Makefile.am tests/general/bug-129*: added the - test to the regression suite for this bug. - -Thu Aug 28 18:30:11 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/xsltexports.h libexslt/exsltexports.h: fixed typos reported by - Mark Vakoc - -Wed Aug 27 12:07:13 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/*.h: realigned parameters after taint - -Wed Aug 27 09:59:54 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/xsltexports.h libexslt/exsltexports.h: fixed defs for - Borland compiler, as reported by Eric Zurcher - -Mon Aug 25 13:39:40 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/Makefile.am libexslt/Makefile.am: add the new header so they - get included in the distrib - -Mon Aug 25 11:56:02 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/*.h libexslt/*.h: exportability taint of the headers. - * libxslt/xsltexports.h libexslt/exsltexports.h: new files, - contain the export defs. - -Tue Aug 19 00:38:46 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/Makefile.am libxslt/libxslt.h libxslt/numbersInternals.h - libexslt/*.c configure.in: applied patch from Mikhail Grushinskiy - for compilation with MingW compiler on Windows. - -Mon Aug 18 14:42:12 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * keys.c: enhanced xsltInitCtxtKey to take care of multiple - instances of a key with the same namespace:name, reported - on the mailing list by Ian Young. Added regression test - (bug-128). - -Thu Aug 15 13:00:02 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * variables.c: fixed bug 119699 (missing error on shadowed - variable) - * autogen.sh: removed dependency on automake-1.4, updated - links for fetching auto* tools - * doc/Makefile.am: added check for automatic regeneration of - win32/*.def.src when api xml files are updated. - -Thu Aug 14 23:15:14 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: fixed bug 114563 (params not passed when - default template processed) - -Thu Aug 14 22:04:37 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * xslt.c: fixed bug 119862 (missing param on ns error print) - -Sun Aug 10 00:21:48 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * News configure.in: preparing libxslt-1.0.32 release - * doc/* : updated the doc and rebuilt - -Thu Aug 7 21:02:07 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * breakpoint/Makefile.am: removed ref to libxslt.la - * numbers.c transform.c python/libxml_wrap.h python/types.c - xlstproc/xsltproc.c: Minor cleanup of warning errors - -Mon Aug 4 22:43:05 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/libxslt-api.xml doc/* doc/html/*: revuilt the API and docs - -Sun Aug 3 21:34:44 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-127.* - tests/general/Makefile.am tests/general/bug-127*: added the - test from bug #118763 to the regression suite. - -Sun Aug 3 17:40:13 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: minor change, avoid wasting CPU cycles - -Sun Aug 3 21:05:07 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - Minor cleanup of regression test general/bug-125 - -Sun Aug 3 19:46:42 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - Fixed bug 116517 - handling of '{' and '}' - * templates.c: added checks for escaping and balancing of - curly brackets - * tests/general/Makefile.am tests/docs/Makefile.am: - Added test case (bug-126) to regression suite. - -Sun Aug 3 15:50:51 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - Fixed bug 117552 - sort with multiple keys - * xsltutils.c: enhanced treatment of NaN when multiple sort - keys are specified. - * tests/general/Makefile.am tests/docs/Makefile.am: - Added test case (bug-125) to regression suite. - -Sat Aug 2 09:55:38 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - Fixing bug 118561 (IRIX MIPSPro compiler warnings) - * transform.c, variables.c, xslt.c, xsltutils.c: - removed some unused variables - -Thu Jul 31 20:33:12 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - Fixing bug 118558 (Solaris 8 compiler warnings) - * xslt.c: minor re-ordering of code - * functions.c: added an explicit cast - * number.c: added include for string.h - * security.c: added an explicit cast - -Tue Jul 29 12:43:17 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libexslt/date.c test/exslt/data/seconds.1 : changed sign - of date:seconds as previously posted to the mailing list - * numbers.c: extensive modification to cater for UTF8 within - the various routines. - -Thu Jul 24 19:38:56 IST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: applied patch from Shaun McCance to fix bug - #117616 about EXST str:tokenize. - * tests/exslt/strings/Makefile.am tests/exslt/strings/tokenize.3.*: - added the test in the regression suite. - -Wed Jul 23 21:57:39 IST 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: applying a patch based on #117377 - for --path option. - -Mon Jul 21 20:28:11 IST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: allow strip-space to support full namespaces - using prefix:* , should fix #114287 - * tests/docs/Makefile.am tests/docs/bug-124.* - tests/general/Makefile.am tests/general/bug-124*: added a - test to the regression suite for this bug. - -Mon Jul 21 20:09:57 IST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/tramsform.c: make xsl:copy on attribute a copy in case - the attribute was already defined, should fix bug #113812 - * tests/docs/Makefile.am tests/docs/bug-123.* - tests/general/Makefile.am tests/general/bug-123*: added the - test to the regression suite. - -Fri Jul 18 13:13:52 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: applied patch from Shaun McCance to implement - exslt:split c.f. #117752 - * tests/exslt/strings/Makefile.am tests/exslt/strings/split.1.*: - added the test to the regression suite. - -Thu Jul 17 10:35:22 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c: quick fix for an HP-UX compilation problem, - might require more attention could be an Unicode support breakage. - -Wed Jul 16 10:46:35 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c libxslt/transform.c libxslt/transform.h - libxslt/xsltInternals.h: optimize text node coalescing by - caching info about the last text node generated and doing - fast alloc/copy of the text. Should fix #115273 - -Mon Jul 14 13:00:00 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * fixed bug 113520, incorrect result for date:seconds - with change to type casting in libexslt/date.c - -Sat Jul 12 20:35:28 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * fixed bug 114764: trouble with globals and RVT's - with minor changes in variables.c and transform.c - so that any global instantiated with an RVT gets - uninitialized when the RVT is destroyed. - -Thu Jul 10 15:47:33 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: simple cast missing Peter Breitenlohner - * breakpoint/Makefile.am: added deps to libxslt - * tests/exslt/common/Makefile.am: integrated William Brack test - in the regression suite - -Wed Jul 9 21:27:43 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * fixed bug 114812, trouble with imported exslt functions - added lookup function in libxslt/extension.c - enhanced exsltInitFunc in libexslt/functions.c to take - better care of imports - -Wed Jul 9 12:19:34 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py python/libxslt-python-api.xml python/libxslt.c - python/libxslt_wrap.h python/libxsltclass.txt: patch from - Sean Treadway, adding Python bindings for extension element and - some bindings cleanups. - * python/tests/Makefile.am python/tests/extelem.py: also add an - example/test. - -Tue Jul 8 12:20:11 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * python/libxml_wrap.h: applied patch from #116943 which should - fix the xsltSaveResultToFile python binding. - -Mon Jul 7 11:03:18 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * INSTALL: removed an old reference to libxml2 >= 2.2.12 - -Sun Jul 6 23:57:35 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: releasing 1.0.31 - * doc/*: update and rebuild of the docs - -Sun Jul 6 18:31:56 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing bug #115913 for xsl:copy with namespace - nodes. - * tests/docs/Makefile.am tests/docs/bug-122.* - tests/general/Makefile.am tests/general/bug-122*: added the - test to the regression suite. - -Sun Jul 6 18:09:13 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c: fix bug #115778 for attribute value template - on xsl:sort order - -Sun Jul 6 17:22:35 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/documents.c libxslt/transform.c: applied patch from - Keith Isdale to desactivate node numbering when running under - the debugger. - -Sun Jul 6 00:00:31 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/security.c: fix the write checking code when - the output filename does not parse as an URL bug #115402 - -Sun Jun 22 19:38:04 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/Makefile.am: Albert Chin pointed out that trio.h and - triodef.h were missing from the distribution - -Fri Jun 13 16:53:33 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in libexslt/Makefile.am libexslt/libexslt.3 - libxslt/Makefile.am libxslt/libxslt.3: Moved the man pages - to section 3 - * libexslt/sets.c: applied patch from Peter Breitenlohner - * doc/*: rebuilt the docs - * tests/docbook/result//* tests/xmlspec/*.html: changes in - generattion of " as " in element content. - -Sun Jun 08 22:57:13 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/transform.c: changed xsltChoose to ignore whitespace - which is a sibling of xsl:when - -Sat May 31 17:18:21 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/xslt.c: fixed a possible crash when the document - wasn't a proper stylesheet. - -Tue May 20 12:14:12 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: fixes a 64bits cleanliness issue #113318 - -Sat May 17 13:25:32 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/defgen.xsl: new file, generates the export sources. - * win32/*.def.src: these are now autogenerated, changes to these - will not be logged anymore. - -Fri May 16 13:22:31 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-121.* - tests/general/Makefile.am tests/general/bug-121*: added the - example for bug #112904 in the regression tests, the bug fix is - actually in libxml2 - -Thu May 15 16:26:34 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: fixing portability bug #113002 on HP-UX - * configure.in libxslt.spec.in python/Makefile.am: cleanup - of --with-python like for libxml2 - -Thu May 15 11:45:00 HKT 2003 William Brack <wbrack(a)mmm.com.hk> - - * libxslt/xsltutils.c: fixing bug #112995, a problem with - NaN within the sort element. Also added regression test. - -Tue May 13 18:22:38 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am: fixing bug #112803 , make sure to avoid - network accesses when building - -Sat May 10 14:19:14 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed a segfault introduced with the RVT - handling change, bug #112703 . - -Sat May 10 13:05:21 EDT 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: make sure stylesheet compilation errors - forces a NULL stylesheet, fixes #112270 - -Sun May 4 17:41:23 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * NEWS configure.in : preparing release 1.0.30 - * doc/apibuild.py: backported a patch from libxml2 - * doc/*: updated and rebuilt the docs - -Wed Apr 30 22:44:49 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c libxslt/variables.c libxslt/xsltInternals.h: - cleaning up Result Value Tree handling - * libexslt/functions.c libexslt/strings.c: fixed a pair of - implementations. - * tests/exslt/strings/Makefile.am tests/exslt/strings/tokenize.2.*: - added Mark Vakoc test combining for-each and exslt:tokenize - -Wed Apr 30 15:23:33 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing bug #111755 when a template is - applied to an attribute - * tests/docs/Makefile.am tests/docs/bug-119.* - tests/general/Makefile.am tests/general/bug-119*: added the - example in the regression tests for that bug. - -Tue Apr 29 15:18:31 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am doc/libxslt.xml: upgraded to the XML/XSLT toolchain - for the HTML generation fixing #111799 - * doc/html/*.html doc/html/*.png: associated update - -Sun Apr 27 18:00:12 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/variables.c: removed premature call to xsltFreeStackElem - * win32/libxslty.def.src: added more exports - -Sun Apr 27 12:46:31 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * NEWS doc/*.xsl doc/*.html: updated the web site, made the - transition to XHTML1 added validity checking to the makefile rules. - -Sat Apr 26 14:00:58 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py: fixed a problem in the generator where - the way functions are remapped as methods on classes was - not symetric and dependant on python internal hash order, - as reported by St�phane Bidoul - * libexslt/strings.c: attempt at fixing an object type pbm - * libxslt/triodef.h: update for OpenVMS from libxml2 - -Fri Apr 25 15:26:26 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am doc/xsltproc.1 doc/xsltproc.xml: automated the - generation of the man page - -Wed Apr 23 23:27:44 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/sets.c: fixed a bug introduced in the last commit - * libxslt/transform.c: tried to fix #111437 - * tests/docbook/result/xtchunk/html/*.orig - tests/multiple/out/*.orig: side effect of #111437 change. - -Wed Apr 23 22:41:08 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: applied last patch for #110023 from - Mark Vakoc - * libexslt/sets.c: fixed a memory leak when mixing one of the - EXSLT set functions and a Result Value Tree - * TODO: there are other bugs around in libexslt/sets.c in conjunction - with Result Value Tree - -Wed Apr 23 17:00:16 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: patch from Vasily Tchekalkin fixing - bug #111420 about double initialization of extension contexts - -Wed Apr 23 14:25:46 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fix bug #110577 namespace in copy-of - don't obbey the same rules as for literal reusl elements. - * tests/docs/Makefile.am tests/docs/bug-118.* - tests/general/Makefile.am tests/general/bug-118*: added the - example in the regression tests for that bug. - * libxslt/variables.c: fixed a bug introduced in fixing #110020 - * tests/docs/Makefile.am tests/docs/bug-11[67].* - tests/general/Makefile.am tests/general/bug-11[67]*: added 2 - regression tests one still exposing a mem leak (Mark Vadoc). - -Tue Apr 22 16:01:25 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fix a memory related segfault on a - pattern compilation error #110189 - -Tue Apr 22 15:45:25 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: fixing bug #110020 on global parameter - and variables mismatch - * tests/reports/Makefile.am tests/reports/cmdlineparams.*: added - the test to the regression suite - -Mon Apr 21 12:22:31 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/math.c: applied patch from Charles Bozeman fixing - the math power function where args were inverted #110996 - * tests/exslt/math/Makefile.am tests/exslt/math/power.1.*: - added the test to the regraession for #110996 - * libexslt/sets.c: avoid a problem with nodesets. - -Wed Apr 14 18:10:21 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/win32config.h: added HAVE_MATH_H - -Wed Apr 13 14:04:15 CEST 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * win32/Makefile.msvc: fixed compilation with thread-enabled - libxml - -Wed Apr 9 22:02:17 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: applied patch from Mark Vakoc fixing a problem - with RTF in libexslt - -Mon Apr 7 14:39:01 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c libxslt/templates.c libxslt/transform.c - libxslt/variables.c: Fixes bug #110023 reported by Mark Vakoc and - other places where ctxt->document pointer may be used without - checking it agaisnt NULL. - * tests/docs/Makefile.am tests/docs/bug-115.* - tests/general/Makefile.am tests/general/bug-115*: added the - example in the regression tests for that bug. - * libxslt/trio.h libxslt/triodef.h: update of Trio from Bjorn Reese - -Tue Apr 1 13:39:26 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in NEWS: preparing 1.0.29 release - * libxslt/documents.c: generate the document order for document() - loaded resources. - * doc/*: updated and regenerated the docs - -Tue Apr 1 11:28:01 CEST 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed a namespace redundancy problem - in xsl:element - * tests/docs/Makefile.am tests/docs/bug-114.* - tests/general/Makefile.am tests/general/bug-114*: added an - example in the regression tests for that bug. - -Fri Mar 28 12:19:35 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * python/libxsl.py: fix bug #109395 as pointed out by Ben Phillips - and avoid some warnings when loading the python modules on non - Linux platforms. - * libxslt/transform.c: fix a bug introduced in the document lookup - and exhibited by the keys test. - -Wed Mar 26 22:41:00 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-113.* - tests/general/Makefile.am tests/general/bug-113*: added an - example in the regression tests for bug #109160 fixed in libxml2 - -Wed Mar 26 21:43:30 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in python/Makefile.am python/libxslt.c libxslt/xsltutils.c - libxslt/trio.h libxslt/triodef.h: portability fixes from Albert Chin - * python/libxslt.py: avoid RTLD_GLOBAL detection warning too - -Wed Mar 26 19:08:55 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: forgot to make one change related to - Result Value Tree change, pointed out by Sebastian Rahtz - * tests/docs/Makefile.am tests/docs/bug-112.* - tests/general/Makefile.am tests/general/bug-112*: added an - example in the regression tests that bug - -Wed Mar 26 01:38:38 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: second part of the patch fixing #108905 - performances problems, ask for computation of document order on - the document transformed and avoid inefficiencies building large - nodesets of unique nodes. - * configure.in: fix a trouble with libtool in my debug environment. - -Mon Mar 24 22:30:00 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c libxslt/transform.c libxslt/variables.c: - Result Value Tree are now generated with a document root node - not an element, it's quite cleaner. - * configure.in libxslt.spec.in NEWS: But this requires libxml2-2.5.5 - also prepared for libxslt-1.0.28 release - * doc/*: updated and regenerated the docs - -Mon Mar 24 15:01:07 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c libxslt/transform.c libxslt/variables.c: - Finally fixed bug #75813, processing or Result Value Tree - converted into node-sets should be a bit more sensible now. - * tests/exslt/common/node-set.2.out: the associated fix in libxml2 - fixes this regression test, there is 4 nodes, not 3 - * tests/docs/Makefile.am tests/docs/bug-111.* - tests/general/Makefile.am tests/general/bug-111*: added an - example in the regression tests for bug #75813 - -Sun Mar 23 13:09:17 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-110.* - tests/general/Makefile.am tests/general/bug-110*: added an - example in the regression tests for bug #108976 which is - fixed in libxml2 - -Sat Mar 22 12:35:47 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-109.xml - tests/general/Makefile.am tests/general/bug-109*: added an - example in the regression tests for the invalid bug #108716 - -Sat Mar 22 12:01:24 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: fixed bug #108633 reported by - Jerome Pesenti about recursive global variables/param detections - * tests/reports/Makefile.am tests/reports/rec*: added regression - tests for the checking of recusion in global/local param/variables. - -Fri Mar 7 16:08:24 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c: valgrind pointed out an uninitialized - variable use in format-number() - -Fri Mar 7 15:27:56 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-108.xml - tests/general/Makefile.am tests/general/bug-108*: added an - example in the regression tests bug #107804 fixed in libxml2 - -Wed Mar 5 12:47:31 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed bug #107591 node() in pattern - matches should catch comments and PIs - * tests/docs/Makefile.am tests/docs/bug-107.xml - tests/general/Makefile.am tests/general/bug-107*: added an - example in the regression tests for this case - -Wed Feb 26 16:49:17 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-106.xml - tests/general/Makefile.am tests/general/bug-106*: added the next - example for bug #106788 from James Clark in the regression tests, - the bug fix is actually in libxml2 - -Tue Feb 25 16:19:45 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/Makefile.am xsltproc/Makefile.am: some cleanup - for Python checks, makefile cleanup, and convenience changes - -Mon Feb 24 23:49:01 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: had to comment out Igor last change - since it made libxslt-1.0.27 depends on libxml2 newly - API extension which hasn't propagated yet :-( - -Mon Feb 24 22:21:09 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing release 1.0.27 - * doc/*: updated and rebuilt the docs - -Mon Feb 24 19:43:15 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c: fixed #106554 for spurious xmlns:nsX="" - generation - -Sun Feb 23 14:52:57 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-105.xml - tests/general/Makefile.am tests/general/bug-105*: added the - example for bug #106788 from James Clark in the regression tests, - the bug fix is actually in libxml2 - -Sun Feb 23 14:25:13 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c libxslt/transform.c: fixed bug #106789 from - James Clark and a bit of cleanup - * tests/docs/Makefile.am tests/docs/bug-104.xml - tests/general/Makefile.am tests/general/bug-104*: added the - example in the regression tests for this case - -Fri Feb 21 17:07:59 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in: fixed RH#84801 wrong prereqs in the spec file - -Wed Feb 19 18:51:06 CET 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * libxslt/functions.c libxslt/xslt.c: fixed bug 106251 - -Wed Feb 19 15:52:33 CET 2003 Igor Zlatkovic <igor(a)zlatkovic.com> - - * xsltproc/xsltproc.c: obsoleted xmlNormalizeWindowsPath - * win32/configure.js: included handling of the trio option - -Mon Feb 10 17:34:32 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/*: preparing release 1.0.26 - -Fri Feb 7 15:47:20 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c: fixing another bug in document(), bug #105450 - * tests/documents/test_bad.result: Slight change to the output - -Fri Feb 7 15:34:24 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c: fixing a segfault in document(), bug #105418 - * tests/documents/Makefile.am tests/documents/test_bad: add the - specific test as suggested by Jean T Anderson - -Fri Feb 7 14:18:40 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c libxslt/keys.c libxslt/pattern.c - libxslt/preproc.c libxslt/transform.c libxslt/variables.c - libxslt/xslt.c: tried to fix 105387 and all similar cases - in the library sources. - -Wed Feb 5 16:04:10 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/* configure.in: preparing for release of 1.0.25 - -Wed Feb 5 00:07:43 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: fixed bug #99623 - -Tue Feb 4 22:10:17 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing bug #105116 sometimes one need - to generate a default namespace reset xmlns="" in the output - * tests/docs/Makefile.am tests/docs/bug-103.xml - tests/general/Makefile.am tests/general/bug-103*: added the - example in the regression tests for this case - -Tue Feb 4 18:39:35 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c libxslt/transform.c: changed the way the - root element of value tree are handled to fix bug #104123 - -Tue Feb 4 18:15:01 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * README: change of policy w.r.t. mails - * configure.in: small cleanup - * libxslt/transform.c libxslt/xslt.c libxslt/variables.c: fixed - a couple of bugs raised by Eric van der Vlist in #104114 - * tests/exslt/*/*.out: slight change to the tests - -Tue Feb 4 17:18:54 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.1 doc/xsltproc.xml: fixing bug #104096, put - emphasis on the fact that --docbook should not be used - for XML. - -Wed Jan 22 16:43:49 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt.c: fixed a couple of return error #104150 - reported by Peter O'Shea - -Fri Jan 17 17:43:43 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: fixed a double free of stylesheet - when applied to a standalone stylesheet - -Tue Jan 14 16:22:48 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing release 2.0.24 - * libxslt.spec.in: small update - * doc/*: updated the news, rebuilt the APIs descriptions - -Tue Jan 14 14:23:47 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c: fixed #101502 by applying and cleaning up - the associated patch from Daniel Stodden. - * tests/documents/Makefile.am tests/documents/fragment*: added a - specific test. - -Mon Jan 13 23:25:59 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c libxslt/transform.c: fixing bug #101602 - for extension modules init and shutdown callbacks, check that - they are now called when needed. - * python/libxsl.py python/libxslt-python-api.xml python/libxslt.c: - started adding the extension module support at the Python level. - Still a strange bug to hunt down left. - -Sun Jan 12 23:56:18 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c libxslt/xsltInternals.h libxslt/imports.c - libxslt/xslt.c: fixed bug #101003 on attribute-sets value - computation in the presence of imports - * tests/docs/Makefile.am tests/docs/bug-102.xml - tests/general/Makefile.am tests/general/bug-102*: added an - example in the regression tests for this case - -Fri Jan 10 10:34:23 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: final touch to #102800 fix - -Thu Jan 9 18:17:40 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: tried to fix #102800 for good. Reenabled - memory debug checking which got deactivated at some point ?!? - * libexslt/date.c libxslt/attributes.c: fixing some memory leaks - * libxslt/xsltutils.c: very small change on HTML indentation handling - -Thu Jan 9 14:28:19 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * tests/REC/test-8-1.xsl tests/REC/test-9.1-2.xsl - tests/general/bug-83.xsl tests/multiple/dict.xsl: added some - exclude-result-prefixes to avoid extra namespace declaration being - dumped following the fix for #102920 in libxml2 - -Wed Jan 8 12:33:47 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed a problem related to directory - checking and creation raised by Craig Goss - -Thu Jan 2 23:23:30 CET 2003 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: applied patch from J�rg Walter to provide - URI escaping and unescaping functions. - -Thu Dec 26 15:43:31 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/strings.c: Alexey Efimov found a typo bug in - exsltStrPaddingFunction() - -Mon Dec 23 15:43:59 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt.c: patch from St�phane Bidoul for Python 2.1 - -Sun Dec 22 22:54:04 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * vms/build_xslt.com libxslt/xsltconfig.h.in libxslt/xsltutils.c: - applied patch from Craig A. Berry for the VMS port. - -Wed Dec 18 15:41:21 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltInternals.h: increase the max number of cascaded - sort operations. - * AUTHORS doc/* win32/*: updated Igor's mail and the Web page for - the Windows binaries. - -Mon Dec 16 19:31:16 CET 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/libxslt.def.src: added more exports for Stephane Bidoul - -Fri Dec 13 14:50:12 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/apibuild.py doc/libexslt-api.xml doc/libxslt-api.xml: updated - the apibuilder script, regenerated the APIs - -Fri Dec 13 11:59:07 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c: numbering should not traverse XInclude - nodes left in the tree. Closes bug #101114 raised by - Bernd Kuemmerlen - -Thu Dec 12 01:17:09 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/apibuild.py: fixed a bug in merging public info from - C modules. - * win32/Makefile.msvc win32/configure.js: patch from Mark Vakoc - the iconv option to configure.js didn't work, and - added zlib option needed when linking xsltproc statically - -Wed Dec 11 19:18:45 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am doc/apibuild.py doc/libexslt-api.xml: added - the generation of libexslt-api.xml - * libexslt/exslt.h: small cleanup. - -Wed Dec 11 18:45:09 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am doc/apibuild.py doc/libxslt-api.xml: - copied over the apibuild.py from libxml2, adapted a bit and - regenerated the API description in XML. Todo: libexslt-api.xml - * libxslt/attributes.c libxslt/documents.c libxslt/extensions.c - libxslt/imports.c libxslt/numbers.c libxslt/numbersInternals.h - libxslt/pattern.c libxslt/preproc.c libxslt/security.c - libxslt/templates.c libxslt/transform.c libxslt/transform.h - libxslt/variables.c libxslt/xslt.c libxslt/xsltInternals.h - libxslt/xsltutils.c libxslt/xsltutils.h: cleanup based on the - report from the scripts. - * libxslt.spec.in: make sure libxslt-api.xml ends up in the devel - package - -Thu Dec 5 18:05:44 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: xsl:element generated superfluous xmlns - declarations, closes bug #99905 - * tests/docs/Makefile.am tests/docs/bug-101.xml - tests/general/Makefile.am tests/general/bug-101.*: added the - example in the regression tests for this case - -Wed Dec 4 18:12:24 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: Matt Sergeant reported a bug when having comments - within an <xsl:text> - -Mon Dec 2 17:19:38 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: applied patch from Josh Parsons fixing bug - #100056 - * tests/docs/Makefile.am tests/docs/bug-100.xml - tests/general/Makefile.am tests/general/bug-100.*: added the - example in the regression tests for this case - * tests/docs/Makefile.am tests/docs/bug-99.xml - tests/general/Makefile.am tests/general/bug-99.*: this test - covers an xsl:attribute namespace bug that Norm pointed out. - -Thu Nov 28 17:52:21 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltInternals.h libxslt/xsltutils.c libxslt/xsltutils.h - win32/libxslt.def.src: applied another patch from Richard Jinks - for the export of teh sorting routine and allowing per context - sort. - -Wed Nov 27 13:33:26 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c libxslt/xsltInternals.h libxslt/xsltutils.c - libxslt/xsltutils.h: Applied patch from Richard Jinks to allow - redefining the sorting routine, plus a bit of tweaking of the - interfaces. - -Tue Nov 26 16:02:38 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am doc/parsedecl.py: fixed the API generation - scripts. - * doc/libxslt-api.xml doc/libxslt-refs.xml: regenerated - * doc/html/*.html: updated too - * python/libxsltclass.txt: updated too - -Tue Nov 26 15:17:13 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.c libxslt/xsltutils.h: added the function - xsltGetProfileInformation() to retrieve profiling information - from an XSLT transformation context. It returns it as an XML - tree. Provided by Michael Rothwell this closes RFE #99527 - -Tue Nov 26 14:40:45 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/imports.c: apply patch from Daniel Stodden, a bug - in xsltFindElemSpaceHandling() missing imported information - * tests/REC/stand-2.7-1.stand.out: this change slightly the result - of this test. - -Mon Nov 25 17:33:48 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c: fix for namespace generation on - attributes created with xsl:attribute - -Mon Nov 25 17:30:02 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in configure.in: add a line in %changelog for releases - -Mon Nov 25 14:57:53 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.h: Kir Kolyshkin pointed out it lacked - xsltInternals.h reference. - -Sun Nov 24 15:49:58 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/tests/*.py: enable libxml2 memory debug before - loading libxslt since libxslt initialization now includes - EXSLT registration which initialize the libxml2 library and - allocate memory - -Sun Nov 24 13:58:48 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxsl.py: updated with new version from St�phane Bidoul - -Sat Nov 23 22:49:08 CET 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/libxslt.def.src: exported new functions - -Sat Nov 23 14:46:06 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: patch from Charles Bozeman fixing a memory - leak in exsltDateDurationFunction pointed out by Bernard Brinkhus - * python/tests/exslt.py: trouble with mem debug in that specific - test... - -Sat Nov 23 12:33:58 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltInternals.h: Alexey Efimov reported a portability - problem when compiling on HP-UX - -Sat Nov 23 12:23:32 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py python/libxslt.c: fixes for compiling - without config.h - -Thu Nov 21 18:51:29 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed bug #99168 select evaluating to - a node list check - -Thu Nov 21 15:12:33 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/documents/result.xhtml: the XHTML1 serialization change - to libxml2 modifies slightly the result of that test. - -Mon Nov 18 11:38:46 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: the python bindings requires libxml2 >= 2.4.25 - for the regexp stuff. - -Mon Nov 18 10:09:06 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: similar patch to #98825 for --with-python - -Sun Nov 17 22:06:59 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: fix bug #98793 on clash of imported global - variables. - * tests/reports/tst-1.err: this changes the output of that test - -Sun Nov 17 18:12:20 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.23 - * doc/*: rebuilding the docs - -Sat Nov 16 23:23:41 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt.c: make sure to register EXSLT for the bindings - * python/tests/Makefile.am python/tests/exslt.py: add a specific test - * xsltproc/xsltproc.c: minor cleanup - -Fri Nov 15 12:35:57 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am python/tests/Makefile.am: trying to fix #98518 - when building outside of the source tree - -Thu Nov 14 21:39:37 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py: xpathObjectRet() pertains to the libxml2 - module, add the namespace. - -Thu Nov 14 18:48:00 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libxslt/win32config.h: cleanup - * win32/Makefile.mingw: new file, integrated mingw in JScript configure - * win32/Makefile.msvc: modified to allow mingw coexistence - * win32/configure.js: integrated mingw - * win32/Readme.txt: cleanup - * xsltproc/xsltproc.c: allowed stdarg for mingw - -Thu Nov 14 07:22:23 MST 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.1 - * doc/xsltproc.html - ran stylesheets to update man page - and html with Daniel's fix to #95510 - -Thu Nov 14 15:10:13 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: applied patch from Brian McCauley fixing #95493 - * doc/xsltproc.xml: fixing #95510 missing description of --writesubtree - * README: fix the bug page URL - -Thu Nov 14 10:03:12 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c: make sure the fixup for key() reported - by John Escott actually works. - * tests/docs/Makefile.am tests/docs/bug-98.xml - tests/general/Makefile.am tests/general/bug-98.*: added the - example in the regression tests for this case - -Wed Nov 13 10:35:46 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixes bug #97969 for @*[...] patterns - * tests/docs/Makefile.am tests/docs/bug-97.xml - tests/general/Makefile.am tests/general/bug-97.*: added the - example in the regression tests for this case - -Tue Nov 12 22:35:47 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixes bug #97950 for cdata-section-elements - checks in recursive copies. - * tests/docs/Makefile.am tests/docs/bug-96.xml - tests/general/Makefile.am tests/general/bug-96.*: added the - example in the regression tests for this case - -Tue Nov 12 19:31:49 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c: autoconvert key() first arg to string, - reported by John Escott - -Tue Nov 12 13:40:47 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: corner case handling of copying a CDATA node. - -Fri Nov 8 18:12:46 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libxslt/win32config.h: retired xmlwin32version.h - -Fri Nov 8 17:09:14 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am libxslt.m4 libxslt.spec.in: integrated libxslt.m4 - written by Thomas Schraitle (RFE #96485) - -Thu Nov 7 11:18:42 MST 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.xml - * doc/xsltproc.1 - clarifying --catalog option and xsltproc's use of - XML_CATALOG_FILES and /etc/xml/catalog. fixes - http://bugzilla.gnome.org/show_bug.cgi?id=97891 - -Mon Nov 4 06:55:36 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: remove the use of snprintf, and use - libxml2 string API instead. - * configure.in libxslt/xsltconfig.h.in libxslt/xsltutils.c: - try to cope with architecture lacking some of the string functions, - reuse the trio ones compiled in libxml2 , should close #97113 - -Wed Oct 23 17:06:24 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am libxslt.spec.in doc/Makefile.am: cleaned up - the spec file and associated changes in the Makefiles. - -Tue Oct 22 21:02:37 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: Forgot to check a pointer, fixes bug #96495 - -Tue Oct 22 20:53:10 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.h: fixed include c.f. bug #96487 - * config.h.in: Red Hat 8.0 induced change - -Mon Oct 21 20:56:31 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c libxslt/numbersInternals.h libxslt/xsltutils.[ch]: - fixed bug #78501 when using a non ascii character for the - number formatting grouping separator. - * tests/docs/Makefile.am tests/docs/bug-95.xml - tests/general/Makefile.am tests/general/bug-95.*: added the - example in the regression tests for this case - * libxslt/attributes.c: cleaning up a problem introduced in last - patch - -Mon Oct 21 09:31:55 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libxslt/attributes.c: fixed minor typo in a call to - xmlHasNsProp - -Sun Oct 20 23:20:37 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/types.c: fixed bugs when passing result value tree - to Python functions. - -Sun Oct 20 15:23:28 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libxslt/win32config.h: mapped vsnprintf to _vsnprintf for the - MS runtime - * xsltproc/xsltproc.c: mapped snprintf to _snprintf for the MS - runtime - -Fri Oct 18 13:40:12 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.22 - * doc/*: upated and rebuilt the docs - -Thu Oct 17 16:32:44 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: fixed bug #86421 - * tests/docs/Makefile.am tests/docs/bug-94.xml - tests/general/Makefile.am tests/general/bug-94.*: added the - example in the regression tests for this case - -Thu Oct 17 15:50:04 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc: added and tested the --path option to close #79638 - -Thu Oct 17 15:25:46 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c: fixing bug #95826 the attribute was reset - with the inherited stylesheet value. - * tests/docs/Makefile.am tests/docs/bug-93.xml - tests/general/Makefile.am tests/general/bug-93-inc.* - tests/general/bug-93.*: added the example in the regression - tests for this case - -Tue Oct 15 18:02:37 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltInternals.h libxslt/xsltutils.[ch]: added the - possibility to register a transformation context specific - error handler, with xsltSetTransformErrorFunc() and provided - a new routine xsltTransformError() to handle contextual errors, - this should fix #94435 - * libxslt/*.c: modified all the code to use the context specific - error handling, as a result xsltPrintErrorContext() is not called - anymore except internally from xsltTransformError() - -Tue Oct 15 14:52:23 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: closing #94933, any error will make - the transformation abort with no result. - * tests/reports/tst-1.err tests/reports/tst-1.out - tests/reports/undefvar.err: this changed the regression tests - output. - * tests/exslt/date/difference.1.out tests/exslt/date/seconds.1.out: - updated the result accordingly to the fixes done last month. - * libxslt/namespaces.c: make sure to avoid duplicate namespace - declarations in the result trees. May fix #93692 but it's unclear. - -Tue Oct 15 12:45:42 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: added a --path option to provide the - enhancement requested by #79638, first cut at it, untested - yet. - -Tue Oct 15 13:02:40 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xslt.c: seems the media-type attribute wasn't - always correctly handled - -Mon Oct 14 09:27:01 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: added URI escaping in case the resource - target computation of exslt:element failed. Should fix #81837 - -Tue Oct 15 12:42:25 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * README: updated the contact information - -Tue Oct 15 11:40:19 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed the behaviour of node() patter which - didn't patch the one defined in XPath :-( . Closes bug #95793 - * tests/docs/Makefile.am tests/docs/bug-92.xml - tests/general/Makefile.am tests/general/bug-92.*: added the - example in the regression tests for this case - -Mon Oct 14 12:29:53 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libxslt/win32config.h: remapped mkdir to _mkdir for MS runtime - * win32/Makefile.msvc: added security.c to the build - * win32/libxslt.def.src: exported functions from security.c - -Thu Oct 10 18:41:56 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: added another option --writesubtree to allow - documents to be written only to a given subtree. - -Thu Oct 10 17:16:52 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/security.[ch] libxslt/Makefile.am: new module with - runtime security checks, it will also check and do directory - creation when allowed - * libxslt/documents.c libxslt/imports.c libxslt/transform.c - libxslt/xslt.c libxslt/xsltInternals.h: plug-in the new - security infrastructure probes at file reading or file creation - * xsltproc/xsltproc.c: plugged the security module there too, - added the new options --nowrite and --nomkdir - * doc/*: updated the man page and regenerated. - -Wed Oct 9 18:37:56 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/*: updated the doc XSLT to add the search, added the search - page, fixed a link problem raised by Yves Pratter, regenerated - -Wed Oct 9 14:27:17 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/index.py: the indexer version of the XSLT part of the - xmlsoft site + archives - -Sun Sep 29 20:02:25 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/Makefile.msvc: introduced double-run compilation. - * win32/configure.js: introduced double-run compilation. - -Thu Sep 26 20:08:50 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.21 - * doc/* : updated and regenerated the docs and web pages - -Wed Sep 25 11:16:06 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed a disable output escaping bug for - HTML output introduced in 1.0.20 and raised by Mario Weilguni - * tests/docs/Makefile.am tests/docs/bug-91.xml - tests/general/Makefile.am tests/general/bug-91.*: added the - example in the regression tests for this case - -Tue Sep 24 20:33:08 MDT 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xlst.html: changing link on ftp.gnome.org - -Mon Sep 23 10:14:38 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am: set-up DIST_SUBDIRS to avoid the same problem Jacob - reported for libxml2 - -Fri Sep 20 14:06:45 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am configure.in: trying to fix the same problem as - #88412 by bypassing all the python subdir if python ain't detected - -Fri Sep 20 10:55:03 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/templates.c: fixed a problem reported by Mark Vakoc - -Wed Sep 18 15:46:50 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libexslt/date.c: fixed the embedded '-' in the duration format - function - * tests/.../difference.1.xml: added test cases which illustrated - the above bug - -Tue Sep 17 18:01:22 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libexslt/date.c: fixed date:difference() bugs, removed all - type conversion warnings. - * libxslt/xsltutils.c: removed unused local variable. - -Sat Sep 14 16:17:51 MDT 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.html: - oops, forgot to update the html version of the man page - -Sat Sep 14 16:10:21 MDT 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.xml - * doc/xsltproc.1 - * doc/xsltproc2.html - Fixing erroneous mention of old --warnnet option (thanks to Jean - T. Anderson for pointing this out) - -Tue Sep 10 21:05:28 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/configure.js: added more readme info for the binary - package. - -Mon Sep 9 14:07:06 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed a bug in match="node()" reported by - Ben Ko - -Mon Sep 9 14:06:25 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in: fixes libary path for x86_64 AMD - -Thu Sep 5 10:07:13 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am: applied patch from Christophe Merlet to - reestablish DESTDIR - -Thu Aug 29 21:26:30 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: re-applied the patch from Nathan Myers about - a possible memory leak in case of error - -Wed Aug 28 13:44:54 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/Libxslt-Logo-180x168.gif doc/Libxslt-Logo-90x34.gif: - nice logos generated by Marc Liyanage - * doc/site.xsl *.html: changed the stylesheet to show the new - logo and regenerated the pages - -Sun Aug 25 17:01:40 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt-python-api.xml python/libxslt.c - python/libxsltclass.txt python/tests/basic.py: applied a patch - from Ralf Mattes providing style.saveResultToString() - -Fri Aug 23 13:53:50 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing release 1.0.20 - * doc/*: updated and regenerated the docs - -Wed Aug 21 21:27:29 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/templates.c: fixed a bug w.r.t. namespace context when - doing the evaluation of attribute value templates - * libxslt.spec.in python/Makefile.am: fixed some troubles - with "make rpm" - -Wed Aug 21 18:59:28 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt.c: fixed the parameter order when calling - Python based extensions. - -Wed Aug 21 13:48:07 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c libxslt/xslt.c: fixed bug #89258 and a bit of - cleanup. - * tests/docs/Makefile.am tests/docs/bug-90.xml - tests/general/Makefile.am tests/general/bug-90.*: added the - example in the regression tests for this case - -Tue Aug 20 16:40:48 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/Makefile.msvc: added the prefix location to the include - and lib search path. - -Mon Aug 19 15:03:11 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: found and fixed the small <xsl:choose> - bug which was giving troubles to DocBook users (the test expression - of <when> was evaluated in the namespace context of <choose> !) - -2002-08-18 Havoc Pennington <hp(a)pobox.com> - - * autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with - both automake 1.6 and 1.4 installed get the right automake. Means - compilation from CVS will now require the latest automake 1.4 - release, or manually creating symlinks called "automake-1.4" and - "aclocal-1.4" - -Wed Aug 14 18:54:19 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in python/Makefile.am: AMD x86-64 induced changes from - Frederic Crozat - -Wed Aug 14 13:35:04 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.c: recovering to the old (somewhat) broken - implementation of document('') when there is no base for the - source document or it can't be realoaded (e.g. when the sytlesheet - was loaded from a memory string). Matt Sergeant insisted on this - one :-) - -Tue Aug 13 11:21:44 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: applied another patch from Nathan Myers about - a possible memory leak in case of error - -Mon Aug 12 23:12:59 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: applied a patch from Nathan Myers about - an erroneous free in case of error - -Thu Aug 1 14:29:11 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: upon suggestion of Marc-Andre Lemburg, make - the misdetection of libxml2 python bindings a warning only - -Sun Jul 21 19:10:00 HKT 2002 William Brack <wbrack(a)mmm.com.hk> - - * xsltInternals.h/xslt.c/transform.c and pattern.c: fixed - a bug reported by Gero Meissner (87230) - * fixed a problem compiling python directory when multiple - 'make' jobs were executed (python/Makefile.am) - -Wed Jul 17 19:58:36 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c: fixed a bug reported by Keith Isdale - at the xsltdbg interface when encountering an empty attribute - set. - -Wed Jul 17 19:51:47 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/* : the change in HTML meta encoding tag serialization - affected some of the results - -Thu Jul 11 22:04:30 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am: adding doc/xsltproc.xml to the tarball - to fix Red Hat bug #68614 - -Wed Jul 10 21:28:11 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/Makefile.msvc: Made the copy *.pdb in install succeed even - if there is no *.pdb - -Sat Jul 6 22:00:08 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.19 - * doc/* : rebuilt the docs - -Sat Jul 6 17:51:14 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed bug #83749 about namespace generated - being invalid when they are inherited from the context. - -Fri Jul 5 22:27:47 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed bug #86753 on multiple identical - attributes being generated, oops ... - * tests/docs/Makefile.am tests/docs/bug-89.xml - tests/general/Makefile.am tests/general/bug-89.*: added an - example in the regression tests for this case - -Fri Jul 5 18:28:08 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c libxslt/transform.c: fixed bug #87279 - * tests/docs/Makefile.am tests/docs/bug-88.xml - tests/general/Makefile.am tests/general/bug-88.*: added an - example in the regression tests for this case - -Fri Jul 5 16:30:02 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c libxslt/xsltutils.c: applied a patch from - Ken Neighbors to implement/fix sorting orders - * tests/docbook/result/*/gdp-handbook.* - tests/docbook/result/xtchunk/html/*.orig - tests/general/bug-12-.out tests/general/bug-63.out: - cleaned up the result of "make tests" following some changes - in namespace axis order and serialization rules in libxml2 - -Thu Jul 4 16:53:00 HKT 2002 William Brack <wbrack(a)mmm.com.hk> - - * transform.c further enhancement for bug 84902 (another - path), also cleaned up code slightly - -Wed Jul 3 00:50:00 HKT 2002 William Brack <wbrack(a)mmm.com.hk> - - * transform.c: fixed bug 84902 - message with terminate=yes - caused segfault - -Tue Jul 2 00:02:53 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-87.xml - tests/general/Makefile.am tests/general/bug-87.*: added a - example in the regression tests for a case where the XML - default namespace was missing from the namespace axis - * xsltproc/xsltproc.c: added the information that parameter - strings are expected to be UTF8 - * libxslt/attributes.c: fixes on attribute group implementation - -Sat Jun 29 21:12:14 MDT 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.xml, doc/xsltproc.html/, doc/xsltproc.1 - updating docs to add reference to UTF-8 requirement for - stringparam command line option - -Wed Jun 19 13:43:00 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/documents.c libxslt/functions.c libxslt/xsltInternals.h: - fixed document('') as pointed by Eric van der Vlist - * tests/docs/Makefile.am tests/docs/bug-86.xml - tests/general/Makefile.am tests/general/bug-86.*: added the - specific example in the regression tests - -Sat Jun 15 15:44:58 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c libxslt/numbersInternals.h: applied a - patch from Ken Neighbors fixing some format-number inconsistencies - * tests/numbers/format-number.out tests/numbers/format-number.xml - tests/numbers/format-number.xsl: the patch also included - updates to the regression tests - -Mon Jun 10 14:55:31 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c: patch from Richard Jinks t correct a bug in - xsl:number level="multiple" - * tests/docs/Makefile.am tests/docs/bug-84.xml - tests/general/Makefile.am tests/general/bug-84.*: added a - specific example in the regression tests - -Fri May 31 09:33:09 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/dynamic.c: turned a function static - * libxslt/win32config.h: applied patch from Mark Vadoc - -Thu May 30 23:35:47 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * win32/Makefile.msvc libexslt/Makefile.am libexslt/date.c - libexslt/dynamic.c libexslt/exslt.c libexslt/exslt.h: applied - a patch from Mark Vakoc to implement the EXSLT - object dyn:evaluate(string) extension function, and a small fix - to date.c - -Mon May 27 23:24:57 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.18 - * doc/*: recompiled the API and web site - -Mon May 27 19:14:46 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c libxslt/transform.c: fix bug #81099 about - duplicated namespace declarations, this might not be as generic as - it should but works well for DocBook stylesheets - -Sat May 25 12:07:45 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.pc.in: fix bug #82970 - -Fri May 24 15:02:50 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxslt-python-api.xml python/libxslt.c - python/libxsltclass.txt : tried to fix #79105 by providing a - specific error registering routine. - -Thu May 23 17:28:35 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltutils.[ch] : applied patch from Morus Walter - adding xsltSaveResultToString() - * doc/APIfiles.html doc/APIfunctions.html doc/libxslt-api.xml - doc/libxslt-decl.txt doc/libxslt-refs.xml: this increased the - API with the new function. - -Wed May 22 11:50:36 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/function.c: applied a patch from Richard Jinks - to avoid a crash in element-available() - -Tue May 21 19:38:20 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in: applied patch from Geert Kloosterman to - not miss gif and .png files in the RPM documentation - -Tue May 21 08:43:11 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/libexslt.4: Applied patch for the EXSLT man page - from Charles Bozeman - -Sat May 18 10:01:38 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/libexslt.4 libxslt/libxslt.4 libxslt/keys.c - libxslt/xsltconfig.h.in: applied a man page patch from - Christian Cornelssen and fixed a couple of issues he raised. - -Thu May 16 19:38:24 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: moved the extension dump out of the loop - -Thu May 16 19:31:35 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.[ch] xsltproc/xsltproc.c win32/libxslt.def.src: - Applied Mark Vakoc patch to show registered extensions in xsltproc - * doc/*: rebuilt the API, docs and website - * python/libxsltclass.txt: this added an entry point - -Wed May 15 00:20:10 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libxslt/xslt.c: xsl:include crash fix - * libxslt/imports.c: xsl:include crash fix - * libxslt/imports.h: xsl:include crash fix - -Wed May 9 01:39:14 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libexslt/exslt.h: fixed a typo _cplusplus -> __cplusplus - -Thu May 2 11:08:22 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c libxslt/xsltutils.c doc/xsltproc.xml: - fixed some return code problems raised by Thomas Mauch - -Tue Apr 30 18:06:14 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: don't allow adding an attribute to - a document node - -Mon Apr 29 19:00:22 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt/xsltwin32config.h: preparing 1.0.17 - * doc/*: rebuilt the docs. - -Mon Apr 29 17:22:08 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: better attempt to fix the problem in - xsltProcessUserParamInternal reported by Babak Vahedipour-Kunze - -Sun Apr 28 17:53:23 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/dsp/*.dsp: Removed obsolete macros - * win32/dsp/*.def: Updated export definitions - -Sun Apr 28 17:47:17 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/variables.c: tried to fix a problem in - xsltProcessUserParamInternal reported by Babak Vahedipour-Kunze - -Fri Apr 26 08:15:30 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: applied another patch from Charles Bozeman to - enhance date/duration support - * tests/exslt/date: added the associated set of regression tests - -Thu Apr 25 08:18:57 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: applied a patch from Charles Bozeman to add - duration routines to the date exslt extensions. - -Thu Apr 18 22:56:06 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/exslt.h: extern "C" { missing by Mark Vakoc - -Tue Apr 17 23:16:54 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * libexslt/date.c: fixed type inconsistencies, double->int - and unsigned/signed mismatch warnings eliminated - -Tue Apr 16 19:40:21 CEST 2002 Igor Zlatkovic <igor(a)stud.fh-frankfurt.de> - - * win32/Makefile.msvc: XSLT debugger support fix - * win32/configure.js: XSLT debugger support fix - * libxslt/xsltconfig.h.in: XSLT debugger support fix - -Mon Apr 15 19:27:31 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.16 - * doc/*: updated and rebuilt the docs - -Mon Apr 15 17:27:51 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c: removed a warning - * libxslt/transform.c libxslt/transform.h win32/libxslt.def.src: - added xsltRunStylesheetUser() API needed to fix #78546 - * xsltproc/xsltproc.c: second part of the fix #78546 - -Mon Apr 15 15:57:28 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am: fixing the equivalent of #75779 - -Mon Apr 15 14:00:12 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: fixed bug #78735 - * configure.in tests/Makefile.am tests/keys/*: - added the tests in a separate directory - -Mon Apr 15 00:01:07 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-83.xml - tests/general/Makefile.am tests/general/bug-83.*: added a - specific example for bug #78662 in the regression tests - * tests/docbook/: this also changed a couple of DocBook results - -Sun Apr 14 15:32:23 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: trying to kill #77827 IEEE conformance on alphas - * libxslt/imports.c libxslt/transform.c libxslt/xslt.c: fixing - bug #78211 - * tests/docs/Makefile.am tests/docs/bug-82.xml - tests/general/Makefile.am tests/general/bug-82.*: added a - specific example for bug #78211 in the regression tests - -Wed Apr 10 20:35:54 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: applied patch from Mark Vakoc - -Fri Mar 29 18:28:23 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-81.xml - tests/general/Makefile.am tests/general/bug-81.*: added a - specific example for bug #76927 in the regression tests - -Wed Mar 27 10:03:11 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * AUTHORS HACKING: Added Igor Zlatkovic as official maintainer - * python/Makefile.am python/tests/Makefile.am: Albert Chin pointed - that $(datadir) should be used for docs - -Mon Mar 25 17:56:44 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.15 - * doc/*: updated and rebuilt - -Mon Mar 25 17:11:42 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c libxslt/attributes.h libxslt/pattern.c - libxslt/xslt.c: Fix bug #76043 about cascading attribute sets - * tests/docs/Makefile.am tests/docs/bug-80.xml - tests/general/Makefile.am tests/general/bug-80.*: added a - specific example for bug #76043 in the regression tests - -Fri Mar 22 19:26:47 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: Fixing bug #75902 error with @foo[..] - steps which were not compiled - * tests/docs/Makefile.am tests/docs/bug-79.xml - tests/general/Makefile.am tests/general/bug-79.*: added a - specific example for bug #75902 in the regression tests - -Fri Mar 22 16:13:22 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: Fixing bug #75777 error with namespaced - attribute match rules evaluation - * tests/docs/Makefile.am tests/docs/bug-78.xml - tests/general/Makefile.am tests/general/bug-78.*: added a - specific example for bug #75777 in the regression tests - -Thu Mar 21 17:19:56 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: found another stupid bug by step by - step processing of the code - * libxslt/pattern.c: idem, except that once stupid mistake - ELEM vs NODE forced the templates to be stored in a list - instead of a hash table, fixing this stupidity should - again lead to a substantive improvement of processing speed. - Like divide by 2 processing time for DocBook stylesheets. - -Thu Mar 21 00:25:12 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing bug #75603 - * tests/docs/Makefile.am tests/docs/bug-77.xml - tests/general/Makefile.am tests/general/bug-77.*: added a - specific example for bug #75603 in the regression tests - -Wed Mar 20 17:49:43 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am: Art Haas pointed a stupid error - -Tue Mar 19 19:42:01 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am tests/Makefile.am tests/*/Makefile.am - tests/*/*/Makefile.am : added "make valgrind" targets - to run the test suite under the debugger control - * transform.c: valgrind spotted 2 bugs, one related to - the ordering of the deallocation of the data associated to - a transofrmation, the second in xsltCopyTree when the new - node may have been coalesced with an adjacent text node. - The regression tests now pass cleanly under testgrind. - -Mon Mar 18 21:33:38 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am: fixed a stupid bug - -Mon Mar 18 20:45:27 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: preparing 1.0.14 - * doc/*: updated rebuilt - * libxslt/*.c libexslt/*.c libxslt/libxslt.h libexslt/libexslt.h: - implemented the IN_LIBXSLT and IN_LIBEXSLT mechanism discussed - with the Windows maintainers - -Mon Mar 18 16:22:46 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am python/generator.py python/libxslt.c - python/types.c python/tests/Makefile.am: applied the same kind of - fixes to the Python Makefiels than to libxml2 ones. Updates - and cleanups too. - -Sat Mar 16 23:48:21 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/common.c libxslt/pattern.c libxslt/transform.c - libxslt/variables.c: chaing result tree values which may - be deallocated and must not be kept in the template - pattern lookup cache. Thanks to Valgrin to allow finding - the real problem in bug #74857 - -Wed Mar 13 15:17:51 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/*.h doc/* python/*: applied another cleanup comment - diff from Heiko W. Rupp, regenerated the API and python - -Wed Mar 13 13:41:19 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-76.xml - tests/general/Makefile.am tests/general/bug-76.*: added a - home brewed test for path computation elmininating duplicate - in result sets. - -Sat Mar 9 11:53:39 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/Makefile.am: fixed a build problem in some environements - -2002-03-08 jacob berkman <jacob(a)ximian.com> - - * python/Makefile.am (libxsltmodule_la_SOURCES): remove $(srcdir) - as make will automatically look there for these files - -Fri Mar 8 17:44:31 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt/xsltwin32config.h: preparing release - 1.0.13 - * doc/*: updated and rebuilt the docs - * python/libxslt.c: fixed a possible reentrancy problem - -Fri Mar 8 14:51:59 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: Fixes the problems exposed by #73880 - those ought to be computed at stylesheet compile time, not - at run-time, and the computation was wrong. - * libxslt/transform.c: get rid of fake nodes coming from node-set - transformations. At least if they are still produced they will - become easy to spot as resulting document won't be well-formed. - -Thu Mar 7 17:01:21 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/extensions.c: fixed bug #73791 related to extension - function declared in included stylesheets - * tests/exslt/functions/function.7.*: added specific test - -Thu Mar 7 15:20:32 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-75.xml - tests/general/Makefile.am tests/general/bug-75.*: added a - specific example for bug #72150 in the regression tests - -Thu Mar 7 15:17:21 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in xsltproc/xsltproc.c: fixed bug #71488 in a - similar way as #71457 - -Thu Mar 7 09:41:59 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/xmlspec/REC-xml-20001006*.html tests/XSLTMark/xslbench1.out: - some HTML meta encoding fixups resulting from fix in libxml2 - -Mon Mar 4 18:09:48 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/namespaces.c tests/general/bug-63.out: small fixups - related to the XPath changes in fixing #61290 - -Mon Mar 4 12:57:21 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed bug #73363, bad tokenization of - pattern - -Mon Mar 4 12:01:34 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/date.c: patch from Charles Bozeman for the exslt date - extension - * configure.in tests/exslt/Makefile.am tests/exslt/date/*: added - the associated regression test provided by Charles - -Fri Mar 1 10:17:26 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/preproc.c: Fixed #73088 with the associated patch - -Fri Mar 1 10:14:07 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: similar to #72663 and #72658, don't memdump - unless compiled explicitely with memory debugging switched on - * TODO: refreshed a bit - -Fri Feb 22 23:44:57 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/generator.py python/libxslt.c: changes for the 'usual' - setup.py to allow building a libxml2-python - module based on the same code. The initialization is however - different the 2 .so files fo libxml2 and libxslt are identical and - they entry point initialize both libraries. this is done to avoid - some possible nasty problem since the Python don't merge the maps - of all shared modules. - * python/libxsl.py: attempt to cope with the shared library loading - problem when both modules are not merged. - -Thu Feb 21 12:59:59 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/site.xml doc/xslt.html doc/python.html doc/*.html: added - documentation for the wrappers and python modules. - -Wed Feb 13 14:22:22 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-74.xml - tests/general/Makefile.am tests/general/bug-74.*: added a - specific example for bug #71342 in the regression tests - * tests/docbook/result/xhtml/gdp-handbook.xhtml: fixing - #71342 changed one attribute serialization. - -Tue Feb 12 15:08:38 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am: trying to fix #71270 - -Mon Feb 11 19:40:34 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/*.py: removed tab used spaces - * configure.in libxslt/xsltwin32config.h: preparing 1.0.12 - * doc/news.html doc/xslt.html: rebuild/updated - -Mon Feb 11 16:34:37 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-73.xml - tests/general/Makefile.am tests/general/bug-73.*: added a - specific example for bug #71181 in the regression tests - -Mon Feb 11 16:22:36 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed bug #71181 p/text() would not - work. A bit of cleanup. - -Mon Feb 11 15:01:42 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xslt-config: fixing Red Hat bug #59508 - -Mon Feb 11 14:27:25 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-72.xml - tests/general/Makefile.am tests/general/bug-72.*: added a - specific example for bug #58444 in the regression tests - -Mon Feb 11 14:13:07 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixed bug #58444, was quite simpler - than expected. - -Mon Feb 11 13:27:42 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/xsltInternals.h libxslt/pattern.c: expected to have - closed bug #70131, still wondering about the position() when - the node is selected. - -Mon Feb 11 10:45:27 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * tests/docs/Makefile.am tests/docs/bug-71.xml - tests/general/Makefile.am tests/general/bug-71.*: added a - specific example for Norm's bug in the regression tests - -Sun Feb 10 22:08:51 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/attributes.c: fixed a bug reported by Norm - -Sun Feb 10 20:25:28 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxml.c : fixed a small warning. - * doc/libxslt-api.xml doc/libxslt-decl.txt doc/libxslt-refs.xml - python/libxsltclass.txt: rebuilt the APIs - -Sun Feb 10 20:16:15 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/imports.c libxslt/numbers.c libxslt/pattern.c - libxslt/pattern.h libxslt/transform.c libxslt/xslt.c - libxslt/xsltInternals.h: adding extra run-time information - to make the stylesheet really read-only at run-time. - -Sun Feb 10 16:21:09 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: fixing bug #70281 - -Sun Feb 10 15:10:56 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c: trying to fix #68759 - -Sat Feb 9 23:17:53 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/Makefile.am: seems some version of automake didn't - generate the dependancies right as Jacob found out. Add - an extra dependancy rule. - -Sat Feb 9 19:04:01 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in libxslt.spec.in python/Makefile.am python/generator.py - python/libxsl.py python/libxslt.c python/tests/Makefile.am: - Fixed the python Makefiles, corrected a bug showing up on ia64, - changed the name of the python internal module too - -Fri Feb 8 17:01:10 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * Copyright Makefile.am configure.in libxslt.spec.in: change the - Licence to MIT Licence and release of 1.0.11 - * doc/FAQ.html doc/intro.html doc/libxslt-decl.txt doc/news.html - doc/xslt.html: updates of the docs accordingly - * libxslt/xsltwin32config.h: numbering - * python/generator.py python/libxml_wrap.h python/libxsltclass.txt - python/libxslt-python-api.xml: cleanup the dependancies with - libxml2 - * python/tests/extfunc.py: updated examples. - -Thu Feb 7 23:21:18 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/libxslt-api.xml doc/libxslt-decl.txt doc/libxslt-refs.xml - doc/parsedecl.py: fixup the script and rebuid the API - * libxslt/extensions.h: cleanup - * python/generator.py python/libxslt-python-api.xml python/libxslt.c - python/libxsltclass.txt: provided accessors for a lot of the - tructures involved in the transformation. Stylesheet and - transformation python object don't free automatically the - encapsulated object when deallocated. - * python/tests/Makefile.am python/tests/basic.py - python/tests/extfunc.py python/tests/pyxsltproc.py: - updated the examples - -Thu Feb 7 17:59:27 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: small fix - * Makefile.am: cleanup - * python/tests/Makefile.am: avoid a problem with $(TESTS) - * python/generator.py python/libxml_wrap.h python/libxsl.py - python/libxslt.c python/libxsltclass.txt: augmented the - wrappers - * python/tests/pyxsltproc.py: rewrote xsltproc on top of the - libxslt-python API to get an estimate of what is missing - -Wed Feb 6 23:34:10 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxsl.py python/libxslt-python-api.xml python/libxslt.c - python/libxsltclass.txt: added libxslt_xsltCleanup() added parameters - to libxslt_xsltApplyStylesheet() removed the memleaks left and - fixed an import order. - * python/tests/basic.py python/tests/extfunc.py: updated the tests - -Wed Feb 6 19:46:09 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * python/libxlst.c python/libxslt-python-api.xml - python/libxsltclass.txt: plugged the extension of the engine - with python defined functions - * python/tests/Makefile.am python/tests/extfunc.py: added a - basic test, still a memleak, cleanup function needed. - -Wed Feb 6 13:49:55 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.spec.in python/Makefile.am python/libxsl.py: the - spec file will now build libxslt-python, fought with shared - and other crazyness, seems to work now :-) - * doc/libxslt-api.xml: regenerated - -Wed Feb 6 11:29:31 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am configure.in tests/Makefile.am tests/*/Makefile.am - tests/*/*/Makefile.am: refactored make tests, make all now don't - run the test suite - * python/Makefile.am: added tests - * python/tests/basic.py python/tests/Makefile.am: added the first - basic test, memory debug included - -Wed Feb 6 00:20:57 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in python/Makefile.am: attempst to tweak to get - full memory debug... - * python/generator.py python/libxsl.py python/libxslt-python-api.xml - python/libxslt.c python/libxslt_wrap.h python/libxsltclass.txt: - the basic API starts to work - * python/tests/test.*: first basic test - * libxslt/xsltutils.c: fixed a comment - -Tue Feb 5 17:35:00 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in doc/Makefile.am: do not install outside of prefix, - make sure the API get shipped. - -Mon Feb 4 19:47:32 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.[ch] doc/libxslt-api.xml doc/libxslt-refs.xml: - reactivated xsltMatchPattern() since this is really something - one may want to have access to in an extension function. - * Makefile.am configure.in python/Makefile.am python/generator.py - python/libxml_wrap.h python/libxsl.py python/libxslt-python-api.xml - python/libxslt.c python/libxslt_wrap.h python/libxsltclass.txt - python/types.c: started working on the python bindings, borrowed - most of the work done for libxml2, most of the generator code - is similar. Commit at the point where this compiles cleanly and - "import libxslt" doesn't yield any missing entry point. - -Wed Jan 30 12:46:41 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: patch from Charles Bozeman to support - child::* patterns. - -Wed Jan 30 12:35:28 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/keys.c: Bob Stayton pointed out a problem when - using unions in key match patterns. - * tests/docs/Makefile.am tests/docs/bug-70.xml - tests/general/Makefile.am tests/general/bug-70.*: added a - specific example in the regression tests - -Sun Jan 27 13:54:10 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c: avoid a problem with Sun's Workshop CC, - closes bug #69809 submitted by Michael Kroell - -Fri Jan 25 15:31:23 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: added links to the Web site from usage() - -Wed Jan 23 23:13:37 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/API*.html doc/parsedecl.py doc/*.xsl parsedecl.py: generated - an index based on comments content similar to libxml2 one - The code need more specific comments. - * doc/*: rebuilt the web site with the new references - -Mon Jan 21 09:53:45 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.h: roll back the change after more analysis - proper fix is to restore the definition of xmlXPathFuncLookupFunc - int libxml2 - -Mon Jan 21 09:41:10 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/functions.h: fixed a proble after some cleanup of libxml2 - includes. - -Sun Jan 20 14:33:33 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: Fixed RH bug #58124 due to an off-by-one - error when parsing -o arguments. - -Sun Jan 20 14:15:55 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/xsltproc.xml libxslt/xsltutils.c xsltproc/xsltproc.c: - Fixed RH bug #57496, xsltproc was not returning error - code on internal runtime errors. Should return 9 now. - -Fri Jan 18 09:43:16 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/math.c: Charlie Bozeman provided the implementation - for the EXSLT math other functions - -Thu Jan 17 23:41:53 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libexslt/Makefile.am: jacob berkman pointed out that the - Cygwin patch forgot to add libexslt.h to the tarball - -Thu Jan 17 23:39:00 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/pattern.c: fixed I18N problemes in the template parser - pointed out by Xavier Cazin - * tests/docs/Makefile.am tests/docs/bug-69.xml - tests/general/Makefile.am tests/general/bug-69.*: added a - specific example in the regression tests - -Thu Jan 17 10:40:03 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * Makefile.am libexslt/common.c libexslt/date.c libexslt/exslt.c - libexslt/exslt.h libexslt/exsltconfig.h.in libexslt/functions.c - libexslt/libexslt.h libexslt/math.c libexslt/saxon.c - libexslt/sets.c libexslt/strings.c libxslt/libxslt.h - libxslt/xslt.h libxslt/xsltconfig.h.in libxslt/xsltutils.c - xsltproc/xsltproc.c: applied Robert Collins patch for - Cygwin support - -Thu Jan 17 10:34:39 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/Makefile.am configure.in: ugly way to keep - the memory debugging active on my devel workstation - by bypassing libtool completely - -Tue Jan 15 12:00:18 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/templates.c: fixed bug #68751 - * tests/docs/Makefile.am tests/docs/bug-68.xml - tests/general/Makefile.am tests/general/bug-68.*: added a - specific example in the regression tests - -Tue Jan 15 10:40:41 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/transform.c xsltproc/xsltproc.c: fixed a couple of - small problems raised by Justin Fletcher - -Mon Jan 14 18:35:18 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: releasing 1.0.10 - * doc/*: updating the docs for the release. - * libxslt/namespaces.c libxslt/pattern.c libxslt/transform.c: - seems I inadvertantly commited previously stuff from a failed - attempt at fixing namespace nodes parents. - -Mon Jan 14 12:20:33 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * libxslt/numbers.c: the xsl:number implementation incorrectly - cached the format string in some case. Fixes bug #65391 - -Mon Jan 14 10:35:27 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * configure.in: fixed a couple of cut and paste errors in the - math functions detection - * libxslt.spec.in: added missing file entry for libxslt.pc - -Tue Jan 8 21:04:17 MST 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.xml, doc/xsltproc.1, doc/xsltproc.html - update xsltproc man page to add --stringparam option - -Tue Jan 8 17:21:02 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: added the --stringparam option - * xsltproc/xsltproc.c: applied John Fleck's patch to correct - the --novalid behaviour. - -Tue Jan 8 13:51:08 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/site.xsl doc/*.html: added a DocBook section docbook.html - -Tue Jan 8 12:51:15 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * doc/*.html: updated gdome2 homepage - -Sat Jan 5 19:32:17 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * win32/dsp: Windows/MSVC project files update from Igor Zlatkovic - -Fri Jan 4 22:13:40 MST 2002 John Fleck <jfleck(a)inkstain.net> - - * doc/xsltproc.xml, xsltproc.1 - updating man page to reflect - increased number of parameteres, changed license, cleaned up some - places where it looked junky because of stylesheet issues - -Fri Jan 4 15:50:25 CET 2002 Daniel Veillard <daniel(a)veillard.com> - - * xsltproc/xsltproc.c: increased the max number of parameters - -Thu Dec 20 14:54:27 CET 2001 Daniel Veillard <daniel(a)veillard.com> - - * libxslt.pc.in configure.in: added pkg-config file from Rodrigo Moya - ... 3663 lines suppressed ...

2 years, 1 month

[reactos] 01/01: [NTGDI][FREETYPE] Simplify font rendering (#4865)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a620c6f82ef0c785e7012… commit a620c6f82ef0c785e701245ee789fa44523ecbb4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 24 11:51:04 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 24 11:51:04 2022 +0900 [NTGDI][FREETYPE] Simplify font rendering (#4865) - Add ftGdiGetRealGlyph and ftGdiGetTextWidth helper functions. - Optimize font rendering. CORE-11848 --- win32ss/gdi/ntgdi/freetype.c | 721 +++++++++++++++++-------------------------- 1 file changed, 275 insertions(+), 446 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index a98b4556646..3f1b63d0d62 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4241,6 +4241,62 @@ ftGdiGetGlyphOutline( return needed; } +FT_BitmapGlyph +APIENTRY +ftGdiGetRealGlyph( + FT_Face face, + INT glyph_index, + LONG lfHeight, + FT_Render_Mode RenderMode, + PMATRIX pmxWorldToDevice, + BOOL EmuBold, + BOOL EmuItalic) +{ + INT error; + FT_GlyphSlot glyph; + FT_BitmapGlyph realglyph; + + if (EmuBold || EmuItalic) + { + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); + } + else + { + realglyph = ftGdiGlyphCacheGet(face, glyph_index, lfHeight, + RenderMode, pmxWorldToDevice); + if (realglyph) + return realglyph; + + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + } + + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); + return NULL; + } + + glyph = face->glyph; + if (EmuBold || EmuItalic) + { + if (EmuBold) + FT_GlyphSlot_Embolden(glyph); + if (EmuItalic) + FT_GlyphSlot_Oblique(glyph); + realglyph = ftGdiGlyphSet(face, glyph, RenderMode); + } + else + { + realglyph = ftGdiGlyphCacheSet(face, glyph_index, lfHeight, + pmxWorldToDevice, glyph, RenderMode); + } + + if (!realglyph) + DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); + + return realglyph; +} + BOOL FASTCALL TextIntGetTextExtentPoint(PDC dc, @@ -4255,16 +4311,13 @@ TextIntGetTextExtentPoint(PDC dc, { PFONTGDI FontGDI; FT_Face face; - FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; - INT error, glyph_index, i, previous; + INT glyph_index, i, previous; ULONGLONG TotalWidth64 = 0; - BOOL use_kerning; FT_Render_Mode RenderMode; - BOOLEAN Render; PMATRIX pmxWorldToDevice; LOGFONTW *plf; - BOOL EmuBold, EmuItalic; + BOOL use_kerning, EmuBold, EmuItalic; LONG ascender, descender; FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -4283,8 +4336,7 @@ TextIntGetTextExtentPoint(PDC dc, EmuBold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); - Render = IntIsFontRenderingEnabled(); - if (Render) + if (IntIsFontRenderingEnabled()) RenderMode = IntGetFontRenderMode(plf); else RenderMode = FT_RENDER_MODE_MONO; @@ -4300,49 +4352,10 @@ TextIntGetTextExtentPoint(PDC dc, { glyph_index = get_glyph_index_flagged(face, *String, GTEF_INDICES, fl); - if (EmuBold || EmuItalic) - realglyph = NULL; - else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, - RenderMode, pmxWorldToDevice); - - if (EmuBold || EmuItalic || !realglyph) - { - if (EmuItalic) - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); - else - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); - break; - } - - glyph = face->glyph; - if (EmuBold || EmuItalic) - { - if (EmuBold) - FT_GlyphSlot_Embolden(glyph); - if (EmuItalic) - FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(face, glyph, RenderMode); - } - else - { - realglyph = ftGdiGlyphCacheSet(face, - glyph_index, - plf->lfHeight, - pmxWorldToDevice, - glyph, - RenderMode); - } - - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - break; - } - } + realglyph = ftGdiGetRealGlyph(face, glyph_index, plf->lfHeight, RenderMode, + pmxWorldToDevice, EmuBold, EmuItalic); + if (!realglyph) + break; /* Retrieve kerning distance */ if (use_kerning && previous && glyph_index) @@ -5880,6 +5893,59 @@ ScaleLong(LONG lValue, PFLOATOBJ pef) return lValue; } +/* Calculate width of the text. */ +BOOL +APIENTRY +ftGdiGetTextWidth( + LONGLONG *pTextWidth64, + LPCWSTR String, + INT Count, + FT_Face face, + LONG lfHeight, + UINT fuOptions, + FT_Render_Mode RenderMode, + PMATRIX pmxWorldToDevice, + BOOL EmuBold, + BOOL EmuItalic) +{ + LONGLONG TextLeft64 = 0; + INT glyph_index; + FT_BitmapGlyph realglyph; + BOOL use_kerning = FT_HAS_KERNING(face); + ULONG previous = 0; + FT_Vector delta; + + ASSERT_FREETYPE_LOCK_HELD(); + + while (Count-- > 0) + { + glyph_index = get_glyph_index_flagged(face, *String, ETO_GLYPH_INDEX, fuOptions); + + realglyph = ftGdiGetRealGlyph(face, glyph_index, lfHeight, RenderMode, + pmxWorldToDevice, EmuBold, EmuItalic); + if (!realglyph) + return FALSE; + + /* Retrieve kerning distance */ + if (use_kerning && previous && glyph_index) + { + FT_Get_Kerning(face, previous, glyph_index, 0, &delta); + TextLeft64 += delta.x; + } + + TextLeft64 += realglyph->root.advance.x >> 10; + + if (EmuBold || EmuItalic) + FT_Done_Glyph((FT_Glyph)realglyph); + + previous = glyph_index; + String++; + } + + *pTextWidth64 = TextLeft64; + return TRUE; +} + BOOL APIENTRY IntExtTextOutW( @@ -5900,37 +5966,30 @@ IntExtTextOutW( */ PDC_ATTR pdcattr; - SURFOBJ *SurfObj; - SURFACE *psurf = NULL; - int error, glyph_index, i; + SURFOBJ *SurfObj, *SourceGlyphSurf; + SURFACE *psurf; + INT glyph_index, i, yoff; FT_Face face; - FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; - LONGLONG TextLeft, RealXStart; - ULONG TextTop, previous, BackgroundLeft; - FT_Bool use_kerning; + LONGLONG TextLeft64, RealXStart64, TextWidth64; + ULONG TextTop, previous; RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; HBITMAP HSourceGlyph; - SURFOBJ *SourceGlyphSurf; SIZEL bitSize; - INT yoff; FONTOBJ *FontObj; PFONTGDI FontGDI; - PTEXTOBJ TextObj = NULL; + PTEXTOBJ TextObj; EXLATEOBJ exloRGB2Dst, exloDst2RGB; FT_Render_Mode RenderMode; - BOOLEAN Render; POINT Start; - BOOL DoBreak = FALSE; USHORT DxShift; PMATRIX pmxWorldToDevice; - LONG fixAscender, fixDescender; + LONG lfHeight, fixAscender, fixDescender; FLOATOBJ Scale; LOGFONTW *plf; - BOOL EmuBold, EmuItalic; - int thickness; - BOOL bResult; + BOOL use_kerning, EmuBold, EmuItalic, bResult, DoBreak; + FT_Vector delta; /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) @@ -5939,8 +5998,6 @@ IntExtTextOutW( return FALSE; } - Render = IntIsFontRenderingEnabled(); - if (PATH_IsPathOpen(dc->dclevel)) { bResult = PATH_ExtTextOut(dc, @@ -5963,13 +6020,12 @@ IntExtTextOutW( goto Cleanup; } - pdcattr = dc->pdcattr; - if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) { IntLPtoDP(dc, (POINT *)lprc, 2); } + pdcattr = dc->pdcattr; if (pdcattr->flTextAlign & TA_UPDATECP) { Start.x = pdcattr->ptlCurrent.x; @@ -5980,7 +6036,7 @@ IntExtTextOutW( } IntLPtoDP(dc, &Start, 1); - RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; + RealXStart64 = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; YStart = Start.y + dc->ptlDCOrig.y; SourcePoint.x = 0; @@ -5990,12 +6046,12 @@ IntExtTextOutW( BrushOrigin.x = 0; BrushOrigin.y = 0; - if ((fuOptions & ETO_OPAQUE) && lprc) + psurf = dc->dclevel.pSurface; + SurfObj = &psurf->SurfObj; + + if (lprc && (fuOptions & ETO_OPAQUE)) { - DestRect.left = lprc->left; - DestRect.top = lprc->top; - DestRect.right = lprc->right; - DestRect.bottom = lprc->bottom; + RtlCopyMemory(&DestRect, lprc, sizeof(DestRect)); DestRect.left += dc->ptlDCOrig.x; DestRect.top += dc->ptlDCOrig.y; @@ -6009,12 +6065,12 @@ IntExtTextOutW( if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) DC_vUpdateBackgroundBrush(dc); + if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - psurf = dc->dclevel.pSurface; IntEngBitBlt( - &psurf->SurfObj, + SurfObj, NULL, NULL, (CLIPOBJ *)&dc->co, @@ -6055,10 +6111,11 @@ IntExtTextOutW( face = FontGDI->SharedFace->Face; plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; + lfHeight = plf->lfHeight; EmuBold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); - if (Render) + if (IntIsFontRenderingEnabled()) RenderMode = IntGetFontRenderMode(plf); else RenderMode = FT_RENDER_MODE_MONO; @@ -6071,7 +6128,7 @@ IntExtTextOutW( } /* NOTE: Don't trust face->size->metrics.ascender and descender values. */ - if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) + if (pdcattr->iGraphicsMode == GM_ADVANCED) { pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtSetCoordinateTransform(face, pmxWorldToDevice); @@ -6101,244 +6158,64 @@ IntExtTextOutW( #undef VALIGN_MASK use_kerning = FT_HAS_KERNING(face); - previous = 0; - /* - * Process the horizontal alignment and modify XStart accordingly. - */ - DxShift = (fuOptions & ETO_PDY) ? 1 : 0; - if (pdcattr->flTextAlign & (TA_RIGHT | TA_CENTER)) + /* Calculate the text width if necessary */ + if ((fuOptions & ETO_OPAQUE) || (pdcattr->flTextAlign & (TA_CENTER | TA_RIGHT))) { - ULONGLONG TextWidth = 0; - LPCWSTR TempText = String; - int iStart; - - /* - * Calculate width of the text. - */ - - if (NULL != Dx) - { - iStart = Count < 2 ? 0 : Count - 2; - TextWidth = Count < 2 ? 0 : (Dx[(Count-2)<<DxShift] << 6); - } - else + if (!ftGdiGetTextWidth(&TextWidth64, + String, Count, + face, + lfHeight, + fuOptions, + RenderMode, + pmxWorldToDevice, + EmuBold, EmuItalic)) { - iStart = 0; - } - TempText = String + iStart; - - for (i = iStart; i < Count; i++) - { - glyph_index = get_glyph_index_flagged(face, *TempText, ETO_GLYPH_INDEX, fuOptions); - - if (EmuBold || EmuItalic) - realglyph = NULL; - else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, - RenderMode, pmxWorldToDevice); - if (!realglyph) - { - if (EmuItalic) - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); - else - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); - } - - glyph = face->glyph; - if (EmuBold || EmuItalic) - { - if (EmuBold) - FT_GlyphSlot_Embolden(glyph); - if (EmuItalic) - FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(face, glyph, RenderMode); - } - else - { - realglyph = ftGdiGlyphCacheSet(face, - glyph_index, - plf->lfHeight, - pmxWorldToDevice, - glyph, - RenderMode); - } - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType(); - bResult = FALSE; - goto Cleanup; - } - - } - /* Retrieve kerning distance */ - if (use_kerning && previous && glyph_index) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextWidth += delta.x; - } - - TextWidth += realglyph->root.advance.x >> 10; - - if (EmuBold || EmuItalic) - { - FT_Done_Glyph((FT_Glyph)realglyph); - realglyph = NULL; - } - - previous = glyph_index; - TempText++; + IntUnLockFreeType(); + bResult = FALSE; + goto Cleanup; } - previous = 0; - + /* Adjust the horizontal position by horizontal alignment */ if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) - { - RealXStart -= TextWidth / 2; - } - else - { - RealXStart -= TextWidth; - } - } - - psurf = dc->dclevel.pSurface; - SurfObj = &psurf->SurfObj ; - - if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) - DC_vUpdateBackgroundBrush(dc) ; - - if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) - DC_vUpdateTextBrush(dc) ; - - if (!face->units_per_EM) - { - thickness = 1; - } - else - { - thickness = face->underline_thickness * - face->size->metrics.y_ppem / face->units_per_EM; - if (thickness <= 0) - thickness = 1; - } + RealXStart64 -= TextWidth64 / 2; + else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT) + RealXStart64 -= TextWidth64; - if ((fuOptions & ETO_OPAQUE) && plf->lfItalic) - { - /* Draw background */ - TextLeft = RealXStart; - TextTop = YStart; - BackgroundLeft = (RealXStart + 32) >> 6; - for (i = 0; i < Count; ++i) + /* Fill background */ + if (fuOptions & ETO_OPAQUE) { - glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); + DestRect.left = (RealXStart64 + 32) >> 6; + DestRect.right = (RealXStart64 + TextWidth64 + 32) >> 6; + DestRect.top = YStart; + DestRect.bottom = YStart + ((fixAscender + fixDescender) >> 6); - if (EmuItalic) - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); - else - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType(); - bResult = FALSE; - goto Cleanup; - } + if (dc->fs & (DC_ACCUM_APP | DC_ACCUM_WMGR)) + IntUpdateBoundsRect(dc, &DestRect); - glyph = face->glyph; - if (EmuBold) - FT_GlyphSlot_Embolden(glyph); - if (EmuItalic) - FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(face, glyph, RenderMode); - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType(); - bResult = FALSE; - goto Cleanup; - } + if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) + DC_vUpdateBackgroundBrush(dc); - /* retrieve kerning distance and move pen position */ - if (use_kerning && previous && glyph_index && NULL == Dx) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextLeft += delta.x; - } - DPRINT("TextLeft: %I64d\n", TextLeft); - DPRINT("TextTop: %lu\n", TextTop); - DPRINT("Advance: %d\n", realglyph->root.advance.x); - - DestRect.left = BackgroundLeft; - DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6); - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) - { - IntUpdateBoundsRect(dc, &DestRect); - } - IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - (CLIPOBJ *)&dc->co, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &dc->eboBackground.BrushObject, - &BrushOrigin, - ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - MouseSafetyOnDrawEnd(dc->ppdev); - BackgroundLeft = DestRect.right; - - DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; - DestRect.right = DestRect.left + realglyph->bitmap.width; - DestRect.top = TextTop + yoff - realglyph->top; - DestRect.bottom = DestRect.top + realglyph->bitmap.rows; - - bitSize.cx = realglyph->bitmap.width; - bitSize.cy = realglyph->bitmap.rows; - MaskRect.right = realglyph->bitmap.width; - MaskRect.bottom = realglyph->bitmap.rows; - - if (NULL == Dx) - { - TextLeft += realglyph->root.advance.x >> 10; - DPRINT("New TextLeft: %I64d\n", TextLeft); - } - else - { - // FIXME this should probably be a matrix transform with TextTop as well. - Scale = pdcattr->mxWorldToDevice.efM11; - if (FLOATOBJ_Equal0(&Scale)) - FLOATOBJ_Set1(&Scale); - - /* do the shift before multiplying to preserve precision */ - FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); - TextLeft += FLOATOBJ_GetLong(&Scale); - DPRINT("New TextLeft2: %I64d\n", TextLeft); - } - - if (DxShift) + if (dc->dctype == DCTYPE_DIRECT) { - TextTop -= Dx[2 * i + 1] << 6; + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, + DestRect.right, DestRect.bottom); } - previous = glyph_index; + IntEngBitBlt(SurfObj, + NULL, + NULL, + (CLIPOBJ *)&dc->co, + NULL, + &DestRect, + &SourcePoint, + &SourcePoint, + &dc->eboBackground.BrushObject, + &BrushOrigin, + ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - if (EmuBold || EmuItalic) - { - FT_Done_Glyph((FT_Glyph)realglyph); - realglyph = NULL; - } + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); } } @@ -6348,114 +6225,51 @@ IntExtTextOutW( /* Assume success */ bResult = TRUE; + if (pdcattr->ulDirty_ & DIRTY_TEXT) + DC_vUpdateTextBrush(dc); + /* * The main rendering loop. */ - TextLeft = RealXStart; + TextLeft64 = RealXStart64; TextTop = YStart; - BackgroundLeft = (RealXStart + 32) >> 6; + DxShift = (fuOptions & ETO_PDY) ? 1 : 0; + previous = 0; + DoBreak = FALSE; for (i = 0; i < Count; ++i) { - glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); + glyph_index = get_glyph_index_flagged(face, *String++, ETO_GLYPH_INDEX, fuOptions); - if (EmuBold || EmuItalic) - realglyph = NULL; - else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, - RenderMode, pmxWorldToDevice); + realglyph = ftGdiGetRealGlyph(face, glyph_index, lfHeight, RenderMode, + pmxWorldToDevice, EmuBold, EmuItalic); if (!realglyph) { - if (EmuItalic) - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); - else - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); - bResult = FALSE; - break; - } - - glyph = face->glyph; - if (EmuBold || EmuItalic) - { - if (EmuBold) - FT_GlyphSlot_Embolden(glyph); - if (EmuItalic) - FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(face, glyph, RenderMode); - } - else - { - realglyph = ftGdiGlyphCacheSet(face, - glyph_index, - plf->lfHeight, - pmxWorldToDevice, - glyph, - RenderMode); - } - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - bResult = FALSE; - break; - } + bResult = FALSE; + break; } /* retrieve kerning distance and move pen position */ if (use_kerning && previous && glyph_index && NULL == Dx) { - FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextLeft += delta.x; + TextLeft64 += delta.x; } - DPRINT("TextLeft: %I64d\n", TextLeft); + + DPRINT("TextLeft64: %I64d\n", TextLeft64); DPRINT("TextTop: %lu\n", TextTop); DPRINT("Advance: %d\n", realglyph->root.advance.x); - if ((fuOptions & ETO_OPAQUE) && !plf->lfItalic) - { - DestRect.left = BackgroundLeft; - DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6); - - if (dc->dctype == DCTYPE_DIRECT) - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - - if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) - { - IntUpdateBoundsRect(dc, &DestRect); - } - IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - (CLIPOBJ *)&dc->co, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &dc->eboBackground.BrushObject, - &BrushOrigin, - ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); - - if (dc->dctype == DCTYPE_DIRECT) - MouseSafetyOnDrawEnd(dc->ppdev); - - BackgroundLeft = DestRect.right; - } - - DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; - DestRect.right = DestRect.left + realglyph->bitmap.width; - DestRect.top = TextTop + yoff - realglyph->top; - DestRect.bottom = DestRect.top + realglyph->bitmap.rows; - bitSize.cx = realglyph->bitmap.width; bitSize.cy = realglyph->bitmap.rows; + MaskRect.right = realglyph->bitmap.width; MaskRect.bottom = realglyph->bitmap.rows; + DestRect.left = ((TextLeft64 + 32) >> 6) + realglyph->left; + DestRect.right = DestRect.left + bitSize.cx; + DestRect.top = TextTop + yoff - realglyph->top; + DestRect.bottom = DestRect.top + bitSize.cy; + /* Check if the bitmap has any pixels */ if ((bitSize.cx != 0) && (bitSize.cy != 0)) { @@ -6470,8 +6284,9 @@ IntExtTextOutW( if ( !HSourceGlyph ) { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); - // FT_Done_Glyph(realglyph); bResult = FALSE; + if (EmuBold || EmuItalic) + FT_Done_Glyph((FT_Glyph)realglyph); break; } SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); @@ -6480,6 +6295,8 @@ IntExtTextOutW( EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); bResult = FALSE; + if (EmuBold || EmuItalic) + FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6487,19 +6304,21 @@ IntExtTextOutW( * Use the font data as a mask to paint onto the DCs surface using a * brush. */ - if (lprc && (fuOptions & ETO_CLIPPED) && - DestRect.right >= lprc->right + dc->ptlDCOrig.x) + if (lprc && (fuOptions & ETO_CLIPPED)) { // We do the check '>=' instead of '>' to possibly save an iteration // through this loop, since it's breaking after the drawing is done, // and x is always incremented. - DestRect.right = lprc->right + dc->ptlDCOrig.x; - DoBreak = TRUE; - } - if (lprc && (fuOptions & ETO_CLIPPED) && - DestRect.bottom >= lprc->bottom + dc->ptlDCOrig.y) - { - DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; + if (DestRect.right >= lprc->right + dc->ptlDCOrig.x) + { + DestRect.right = lprc->right + dc->ptlDCOrig.x; + DoBreak = TRUE; + } + + if (DestRect.bottom >= lprc->bottom + dc->ptlDCOrig.y) + { + DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; + } } if (dc->dctype == DCTYPE_DIRECT) @@ -6528,55 +6347,15 @@ IntExtTextOutW( if (DoBreak) { + if (EmuBold || EmuItalic) + FT_Done_Glyph((FT_Glyph)realglyph); break; } - if (plf->lfUnderline) - { - int i, position; - if (!face->units_per_EM) - { - position = 0; - } - else - { - position = face->underline_position * - face->size->metrics.y_ppem / face->units_per_EM; - } - for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) - { - EngLineTo(SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - (TextLeft >> 6), - TextTop + yoff - position + i, - ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6), - TextTop + yoff - position + i, - NULL, - ROP2_TO_MIX(R2_COPYPEN)); - } - } - if (plf->lfStrikeOut) - { - int i; - for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) - { - EngLineTo(SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - (TextLeft >> 6), - TextTop + yoff - (fixAscender >> 6) / 3 + i, - ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6), - TextTop + yoff - (fixAscender >> 6) / 3 + i, - NULL, - ROP2_TO_MIX(R2_COPYPEN)); - } - } - if (NULL == Dx) { - TextLeft += realglyph->root.advance.x >> 10; - DPRINT("New TextLeft: %I64d\n", TextLeft); + TextLeft64 += realglyph->root.advance.x >> 10; + DPRINT("New TextLeft64: %I64d\n", TextLeft64); } else { @@ -6587,8 +6366,8 @@ IntExtTextOutW( /* do the shift before multiplying to preserve precision */ FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); - TextLeft += FLOATOBJ_GetLong(&Scale); - DPRINT("New TextLeft2: %I64d\n", TextLeft); + TextLeft64 += FLOATOBJ_GetLong(&Scale); + DPRINT("New TextLeft64 2: %I64d\n", TextLeft64); } if (DxShift) @@ -6601,12 +6380,63 @@ IntExtTextOutW( if (EmuBold || EmuItalic) { FT_Done_Glyph((FT_Glyph)realglyph); - realglyph = NULL; } } - if (pdcattr->flTextAlign & TA_UPDATECP) { + if (pdcattr->flTextAlign & TA_UPDATECP) pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; + + if (plf->lfUnderline || plf->lfStrikeOut) /* Underline or strike-out? */ + { + /* Calculate the position and the thickness */ + INT i, underline_position, thickness; + + if (!face->units_per_EM) + { + underline_position = 0; + thickness = 1; + } + else + { + underline_position = + face->underline_position * face->size->metrics.y_ppem / face->units_per_EM; + thickness = + face->underline_thickness * face->size->metrics.y_ppem / face->units_per_EM; + if (thickness <= 0) + thickness = 1; + } + + if (plf->lfUnderline) /* Draw underline */ + { + for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) + { + EngLineTo(SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + (RealXStart64 + 32) >> 6, + TextTop + yoff - underline_position + i, + (TextLeft64 + 32) >> 6, + TextTop + yoff - underline_position + i, + NULL, + ROP2_TO_MIX(R2_COPYPEN)); + } + } + + if (plf->lfStrikeOut) /* Draw strike-out */ + { + for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) + { + EngLineTo(SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + (RealXStart64 + 32) >> 6, + TextTop + yoff - (fixAscender >> 6) / 3 + i, + (TextLeft64 + 32) >> 6, + TextTop + yoff - (fixAscender >> 6) / 3 + i, + NULL, + ROP2_TO_MIX(R2_COPYPEN)); + } + } } IntUnLockFreeType(); @@ -6615,7 +6445,6 @@ IntExtTextOutW( EXLATEOBJ_vCleanup(&exloDst2RGB); Cleanup: - DC_vFinishBlit(dc, NULL); if (TextObj != NULL)

2 years, 1 month

[reactos] 01/01: [NTOS:KD] Rename the private acquire/release lock functions to fix GCC compilation.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=968b264300e25dbf3efa9… commit 968b264300e25dbf3efa978682b4655d105718bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 24 01:44:03 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 24 01:44:14 2022 +0100 [NTOS:KD] Rename the private acquire/release lock functions to fix GCC compilation. If you ask why there are two sets of functions that do the same, it's because this file (and the kdmain.c) will very soon some day be moved to a transport dll, outside the kernel, and it will need these functions. --- ntoskrnl/kd/kdio.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 8c0ca1825ad..3f39e20c173 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -69,7 +69,8 @@ static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; KIRQL NTAPI -KdpAcquireLock(IN PKSPIN_LOCK SpinLock) +KdbpAcquireLock( + _In_ PKSPIN_LOCK SpinLock) { KIRQL OldIrql; @@ -95,8 +96,9 @@ KdpAcquireLock(IN PKSPIN_LOCK SpinLock) VOID NTAPI -KdpReleaseLock(IN PKSPIN_LOCK SpinLock, - IN KIRQL OldIrql) +KdbpReleaseLock( + _In_ PKSPIN_LOCK SpinLock, + _In_ KIRQL OldIrql) { /* Release the spinlock */ KiReleaseSpinLock(SpinLock); @@ -169,7 +171,7 @@ KdpPrintToLogFile(PCHAR String, if (KdpDebugBuffer == NULL) return; /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdpAcquireLock(&KdpDebugLogSpinLock); + OldIrql = KdbpAcquireLock(&KdpDebugLogSpinLock); beg = KdpCurrentPosition; num = KdpFreeBytes; @@ -198,7 +200,7 @@ KdpPrintToLogFile(PCHAR String, { DoReinit = TRUE; } - KdpReleaseLock(&KdpDebugLogSpinLock, OldIrql); + KdbpReleaseLock(&KdpDebugLogSpinLock, OldIrql); if (DoReinit) { @@ -322,7 +324,7 @@ KdpSerialPrint(PCHAR String, KIRQL OldIrql; /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdpAcquireLock(&KdpSerialSpinLock); + OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); /* Output the string */ while (pch < String + Length && *pch) @@ -336,7 +338,7 @@ KdpSerialPrint(PCHAR String, } /* Release the spinlock */ - KdpReleaseLock(&KdpSerialSpinLock, OldIrql); + KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); } VOID @@ -471,7 +473,7 @@ KdpScreenPrint(PCHAR String, return; /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdpAcquireLock(&KdpDmesgLogSpinLock); + OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); * set num to min(KdpDmesgFreeBytes, Length). @@ -497,7 +499,7 @@ KdpScreenPrint(PCHAR String, } /* Release the spinlock */ - KdpReleaseLock(&KdpDmesgLogSpinLock, OldIrql); + KdbpReleaseLock(&KdpDmesgLogSpinLock, OldIrql); /* Optional step(?): find out a way to notify about buffer exhaustion, * and possibly fall into kbd to use dmesg command: user will read @@ -738,7 +740,7 @@ KdReceivePacket( // TODO: Use an improved KdbpReadCommand() function for our purposes. /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdpAcquireLock(&KdpSerialSpinLock); + OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) KbdDisableMouse(); @@ -795,13 +797,13 @@ KdReceivePacket( /* Write it back and print it to the log */ *(PCHAR)(ResponseString.Buffer + i) = Response; - KdpReleaseLock(&KdpSerialSpinLock, OldIrql); + KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); KdpPrintString(&StringChar); - OldIrql = KdpAcquireLock(&KdpSerialSpinLock); + OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); } /* Release the spinlock */ - KdpReleaseLock(&KdpSerialSpinLock, OldIrql); + KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); /* Print a new line */ *StringChar.Buffer = '\n';

2 years, 1 month

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022