Menu
▾
▴
[Jcl-checkins-diff] SF.net SVN: jcl:[2466] trunk/jcl
|
From: <ou...@us...> - 2008-09-12 00:01:42
|
Revision: 2466
http://jcl.svn.sourceforge.net/jcl/?rev=2466&view=rev
Author: outchy
Date: 2008-09-12 00:01:35 +0000 (Fri, 12 Sep 2008)
Log Message:
-----------
Fixed wrong parameter declaration of function inflate.
Added compilation option to statically link, late bind or statically bind to ZLib code.
Moved zlibh.pas from jcl/source/windows and jcl/source/unix to jcl/source/common by eliminating few differences.
Removed zlibh.pas from unit prototypes.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/lib/d10.net/common.exc
trunk/jcl/lib/d10.net/windows.exc
trunk/jcl/lib/d11.net/common.exc
trunk/jcl/lib/d11.net/windows.exc
trunk/jcl/lib/d9.net/common.exc
trunk/jcl/lib/d9.net/windows.exc
trunk/jcl/packages/c5/JclC50.bpk
trunk/jcl/packages/c5/JclC50.cpp
trunk/jcl/packages/c5/JclC50.dpk
trunk/jcl/packages/c6/Jcl.bpk
trunk/jcl/packages/c6/Jcl.dpk
trunk/jcl/packages/cs1/Jcl.dpk
trunk/jcl/packages/d10/Jcl.dpk
trunk/jcl/packages/d11/Jcl.dpk
trunk/jcl/packages/d11/Jcl.dproj
trunk/jcl/packages/d11/Jcl.res
trunk/jcl/packages/d12/Jcl.dpk
trunk/jcl/packages/d12/Jcl.dproj
trunk/jcl/packages/d5/JclD50.dpk
trunk/jcl/packages/d6/Jcl.dpk
trunk/jcl/packages/d7/Jcl.dpk
trunk/jcl/packages/d8/Jcl.dpk
trunk/jcl/packages/d9/Jcl.dpk
trunk/jcl/packages/k3/Jcl.bpk
trunk/jcl/packages/k3/Jcl.dpk
trunk/jcl/packages/xml/Jcl-R.xml
trunk/jcl/source/common/JclCompression.pas
trunk/jcl/source/include/jcl.inc
trunk/jcl/source/include/jcl.template.inc
trunk/jcl/source/prototypes/Makefile.mak
Added Paths:
-----------
trunk/jcl/source/common/zlibh.pas
Removed Paths:
-------------
trunk/jcl/source/prototypes/zlibh.pas
trunk/jcl/source/unix/zlibh.pas
trunk/jcl/source/windows/zlibh.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/install/JclInstall.pas 2008-09-12 00:01:35 UTC (rev 2466)
@@ -49,6 +49,7 @@
joJCLDefEDI,
joJCLDefPCRE,
joJCLDefBZip2,
+ joJCLDefZLib,
joJCLDefUnicode,
joJCLDefContainer,
joJCLDef7z,
@@ -72,6 +73,9 @@
joJCLDefBZip2StaticLink,
joJCLDefBZip2LinkDLL,
joJCLDefBZip2LinkOnRequest,
+ joJCLDefZLibStaticLink,
+ joJCLDefZLibLinkDLL,
+ joJCLDefZLibLinkOnRequest,
joJCLDefUnicodeSilentFailure,
joJCLDefUnicodeRawData,
joJCLDefUnicodeZLibData,
@@ -370,6 +374,11 @@
RsCaptionDefBZip2StaticLink = 'Static link to BZip2 code';
RsCaptionDefBZip2LinkDLL = 'Static bind to bzip2.dll';
RsCaptionDefBZip2LinkOnRequest = 'Late bind to bzip2.dll';
+ // ZLib options
+ RsCaptionDefZLib = 'ZLib options';
+ RsCaptionDefZLibStaticLink = 'Static link to ZLib code';
+ RsCaptionDefZLibLinkDLL = 'Static bind to zlib1.dll';
+ RsCaptionDefZLibLinkOnRequest = 'Late bind to zlib1.dll';
// Unicode options
RsCaptionDefUnicode = 'Unicode options';
RsCaptionDefUnicodeSilentFailure = 'Silent failure';
@@ -481,7 +490,12 @@
RsHintDefBZip2 = 'BZip2 specific options (bzip2.pas)';
RsHintDefBZip2StaticLink = 'Code from BZip2 is linked into JCL binaries';
RsHintDefBZip2LinkDLL = 'JCL binaries require bzip2.dll to be present';
- RsHintDefBZip2LinkOnRequest = 'JCL binaries require bzip2.dll when calling PCRE functions';
+ RsHintDefBZip2LinkOnRequest = 'JCL binaries require bzip2.dll when calling BZip2 functions';
+ // ZLib options
+ RsHintDefZLib = 'ZLib specific options (zlibh.pas)';
+ RsHintDefZLibStaticLink = 'Code from ZLib is linked into JCL binaries';
+ RsHintDefZLibLinkDLL = 'JCL binaries require zlib1.dll to be present';
+ RsHintDefZLibLinkOnRequest = 'JCL binaries require zlib1.dll when calling ZLib functions';
// Unicode options
RsHintDefUnicode = 'Unicode specific option (JclUnicode.pas)';
RsHintDefUnicodeSilentFailure = 'Insert a replacement character if sequence is corrupted rather than raising an exception';
@@ -594,6 +608,7 @@
(Id: -1; Caption: RsCaptionDefEDI; Hint: RsHintDefEDI), // joDefEDI
(Id: -1; Caption: RsCaptionDefPCRE; Hint: RsHintDefPCRE), // joDefPCRE
(Id: -1; Caption: RsCaptionDefBZip2; Hint: RsHintDefBZip2), // joDefBZip2
+ (Id: -1; Caption: RsCaptionDefZLib; Hint: RsHintDefZLib), // joDefZLib
(Id: -1; Caption: RsCaptionDefUnicode; Hint: RsHintDefUnicode), // joDefUnicode
(Id: -1; Caption: RsCaptionDefContainer; Hint: RsHintDefContainer), // joDefContainer
(Id: -1; Caption: RsCaptionDef7z; Hint: RsHintDef7z), // joDef7z
@@ -617,6 +632,9 @@
(Id: -1; Caption: RsCaptionDefBZip2StaticLink; Hint: RsHintDefBZip2StaticLink), // joDefBZip2StaticLink
(Id: -1; Caption: RsCaptionDefBZip2LinkDLL; Hint: RsHintDefBZip2LinkDLL), // joDefBZip2LinkDLL
(Id: -1; Caption: RsCaptionDefBZip2LinkOnRequest; Hint: RsHintDefBZip2LinkOnRequest), // joDefBZip2LinkOnRequest
+ (Id: -1; Caption: RsCaptionDefZLibStaticLink; Hint: RsHintDefZLibStaticLink), // joDefZLibStaticLink
+ (Id: -1; Caption: RsCaptionDefZLibLinkDLL; Hint: RsHintDefZLibLinkDLL), // joDefZLibLinkDLL
+ (Id: -1; Caption: RsCaptionDefZLibLinkOnRequest; Hint: RsHintDefZLibLinkOnRequest), // joDefZLibLinkOnRequest
(Id: -1; Caption: RsCaptionDefUnicodeSilentFailure; Hint: RsHintDefUnicodeSilentFailure), // joDefUnicodeSilentFailure
(Id: -1; Caption: RsCaptionDefUnicodeRawData; Hint: RsHintDefUnicodeRawData), // joDefUnicodeRawData
(Id: -1; Caption: RsCaptionDefUnicodeZLibData; Hint: RsHintDefUnicodeZLibData), // joDefUnicodeZLibData
@@ -1080,12 +1098,18 @@
AddOption(joJCLDefBZip2StaticLink, [goRadioButton, goChecked], joJCLDefBZip2);
AddOption(joJCLDefBZip2LinkOnRequest, [goRadioButton], joJCLDefBZip2);
AddOption(joJCLDefBZip2LinkDLL, [goRadioButton], joJCLDefBZip2);
- {$IFDEF MSWINDOWS}
+ // ZLib options
+ AddOption(joJCLDefZLib, [goChecked], Parent);
+ AddOption(joJCLDefZLibStaticLink, [goRadioButton, goChecked], joJCLDefZLib);
+ AddOption(joJCLDefZLibLinkOnRequest, [goRadioButton], joJCLDefZLib);
+ AddOption(joJCLDefZLibLinkDLL, [goRadioButton], joJCLDefZLib);
+ // Unicode options
AddOption(joJCLDefUnicode, [goChecked], Parent);
AddOption(joJCLDefUnicodeSilentFailure, [goChecked], joJCLDefUnicode);
AddOption(joJCLDefUnicodeRawData, [goRadioButton, goChecked], joJCLDefUnicode);
AddOption(joJCLDefUnicodeZLibData, [goRadioButton], joJCLDefUnicode);
AddOption(joJCLDefUnicodeBZip2Data, [goRadioButton], joJCLDefUnicode);
+ {$IFDEF MSWINDOWS}
// Sevenzip options
AddOption(joJCLDef7z, [goChecked], Parent);
//AddOption(joJCLDef7zStaticLink, [goRadioButton], joDef7z);
@@ -1555,7 +1579,8 @@
'DEBUG_NO_BINARY', 'DEBUG_NO_TD32', 'DEBUG_NO_MAP', 'DEBUG_NO_EXPORTS',
'DEBUG_NO_SYMBOLS', 'EDI_WEAK_PACKAGE_UNITS', 'PCRE_STATICLINK',
'PCRE_LINKDLL', 'PCRE_LINKONREQUEST', 'BZIP2_STATICLINK',
- 'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'UNICODE_SILENT_FAILURE',
+ 'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'ZLIB_STATICLINK',
+ 'ZLIB_LINKDLL', 'ZLIB_LINKONREQUEST', 'UNICODE_SILENT_FAILURE',
'UNICODE_RAW_DATA', 'UNICODE_ZLIB_DATA', 'UNICODE_BZIP2_DATA',
'CONTAINER_ANSISTR', 'CONTAINER_WIDESTR', 'CONTAINER_UNICODESTR',
'CONTAINER_NOSTR', {'7ZIP_STATICLINK',} '7ZIP_LINKDLL',
Modified: trunk/jcl/lib/d10.net/common.exc
===================================================================
--- trunk/jcl/lib/d10.net/common.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d10.net/common.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -20,4 +20,5 @@
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
-pcre.pas
\ No newline at end of file
+pcre.pas
+zlibh.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d10.net/windows.exc
===================================================================
--- trunk/jcl/lib/d10.net/windows.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d10.net/windows.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -32,5 +32,4 @@
MSHelpServices_TLB.pas
MSTask.pas
Sevenzip.pas
-Snmp.pas
-zlibh.pas
\ No newline at end of file
+Snmp.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d11.net/common.exc
===================================================================
--- trunk/jcl/lib/d11.net/common.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d11.net/common.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -20,4 +20,5 @@
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
-pcre.pas
\ No newline at end of file
+pcre.pas
+zlibh.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d11.net/windows.exc
===================================================================
--- trunk/jcl/lib/d11.net/windows.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d11.net/windows.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -32,5 +32,4 @@
MSHelpServices_TLB.pas
MSTask.pas
Sevenzip.pas
-Snmp.pas
-zlibh.pas
\ No newline at end of file
+Snmp.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d9.net/common.exc
===================================================================
--- trunk/jcl/lib/d9.net/common.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d9.net/common.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -21,3 +21,4 @@
JclUnitVersioningProviders.pas
JclWideStrings.pas
pcre.pas
+zlibh.pas
Modified: trunk/jcl/lib/d9.net/windows.exc
===================================================================
--- trunk/jcl/lib/d9.net/windows.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d9.net/windows.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -32,5 +32,4 @@
MSHelpServices_TLB.pas
MSTask.pas
Sevenzip.pas
-Snmp.pas
-zlibh.pas
\ No newline at end of file
+Snmp.pas
\ No newline at end of file
Modified: trunk/jcl/packages/c5/JclC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.bpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c5/JclC50.bpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:34 UTC
+ Last generated: 06-09-2008 16:39:07 UTC
*****************************************************************************
-->
<PROJECT>
@@ -59,6 +59,7 @@
..\..\lib\c5\JclValidation.obj
..\..\lib\c5\JclWideStrings.obj
..\..\lib\c5\pcre.obj
+ ..\..\lib\c5\zlibh.obj
..\..\lib\c5\Hardlinks.obj
..\..\lib\c5\JclAppInst.obj
..\..\lib\c5\JclCIL.obj
@@ -90,7 +91,6 @@
..\..\lib\c5\MSTask.obj
..\..\lib\c5\sevenzip.obj
..\..\lib\c5\Snmp.obj
- ..\..\lib\c5\zlibh.obj
"/>
<RESFILES value="JclC50.res"/>
<IDLFILES value=""/>
Modified: trunk/jcl/packages/c5/JclC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclC50.cpp 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c5/JclC50.cpp 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:35 UTC
+ Last generated: 06-09-2008 16:39:07 UTC
-----------------------------------------------------------------------------
*/
@@ -56,6 +56,7 @@
USEUNIT("..\..\source\common\JclValidation.pas");
USEUNIT("..\..\source\common\JclWideStrings.pas");
USEUNIT("..\..\source\common\pcre.pas");
+USEUNIT("..\..\source\common\zlibh.pas");
USEUNIT("..\..\source\windows\Hardlinks.pas");
USEUNIT("..\..\source\windows\JclAppInst.pas");
USEUNIT("..\..\source\windows\JclCIL.pas");
@@ -87,7 +88,6 @@
USEUNIT("..\..\source\windows\MSTask.pas");
USEUNIT("..\..\source\windows\sevenzip.pas");
USEUNIT("..\..\source\windows\Snmp.pas");
-USEUNIT("..\..\source\windows\zlibh.pas");
USEPACKAGE("vcl50.bpi");
//---------------------------------------------------------------------------
#pragma package(smart_init)
Modified: trunk/jcl/packages/c5/JclC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c5/JclC50.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:35 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
-----------------------------------------------------------------------------
}
@@ -84,6 +84,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -114,8 +115,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c6/Jcl.bpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:23 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
*****************************************************************************
-->
<PROJECT>
@@ -59,6 +59,7 @@
..\..\lib\c6\JclValidation.obj
..\..\lib\c6\JclWideStrings.obj
..\..\lib\c6\pcre.obj
+ ..\..\lib\c6\zlibh.obj
..\..\lib\c6\Hardlinks.obj
..\..\lib\c6\JclAppInst.obj
..\..\lib\c6\JclCIL.obj
@@ -90,7 +91,6 @@
..\..\lib\c6\MSTask.obj
..\..\lib\c6\sevenzip.obj
..\..\lib\c6\Snmp.obj
- ..\..\lib\c6\zlibh.obj
"/>
<RESFILES value="Jcl.res"/>
<IDLFILES value=""/>
@@ -187,6 +187,7 @@
<FILE FILENAME="..\..\source\common\JclValidation.pas" FORMNAME="" UNITNAME="JclValidation" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclWideStrings.pas" FORMNAME="" UNITNAME="JclWideStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\pcre.pas" FORMNAME="" UNITNAME="pcre" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\Hardlinks.pas" FORMNAME="" UNITNAME="Hardlinks" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclAppInst.pas" FORMNAME="" UNITNAME="JclAppInst" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclCIL.pas" FORMNAME="" UNITNAME="JclCIL" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -218,7 +219,6 @@
<FILE FILENAME="..\..\source\windows\MSTask.pas" FORMNAME="" UNITNAME="MSTask" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\sevenzip.pas" FORMNAME="" UNITNAME="sevenzip" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\Snmp.pas" FORMNAME="" UNITNAME="Snmp" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\windows\zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c6/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:25 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
-----------------------------------------------------------------------------
}
@@ -84,6 +84,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -114,7 +115,6 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/cs1/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:27 UTC
+ Last generated: 06-09-2008 16:39:10 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -115,8 +116,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d10/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d10/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:28 UTC
+ Last generated: 06-09-2008 16:39:11 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d11/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:29 UTC
+ Last generated: 11-09-2008 22:13:46 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d11/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11/Jcl.dproj 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d11/Jcl.dproj 2008-09-12 00:01:35 UTC (rev 2466)
@@ -131,6 +131,7 @@
<DCCReference Include="..\..\source\common\JclValidation.pas" />
<DCCReference Include="..\..\source\common\JclWideStrings.pas" />
<DCCReference Include="..\..\source\common\pcre.pas" />
+ <DCCReference Include="..\..\source\common\zlibh.pas" />
<DCCReference Include="..\..\source\windows\Hardlinks.pas" />
<DCCReference Include="..\..\source\windows\JclAppInst.pas" />
<DCCReference Include="..\..\source\windows\JclCIL.pas" />
@@ -166,6 +167,5 @@
<DCCReference Include="..\..\source\windows\MSTask.pas" />
<DCCReference Include="..\..\source\windows\sevenzip.pas" />
<DCCReference Include="..\..\source\windows\Snmp.pas" />
- <DCCReference Include="..\..\source\windows\zlibh.pas" />
</ItemGroup>
</Project>
Modified: trunk/jcl/packages/d12/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d12/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d12/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 14:25:18 UTC
+ Last generated: 11-09-2008 22:13:47 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d12/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d12/Jcl.dproj 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d12/Jcl.dproj 2008-09-12 00:01:35 UTC (rev 2466)
@@ -108,6 +108,7 @@
<DCCReference Include="..\..\source\common\JclValidation.pas" />
<DCCReference Include="..\..\source\common\JclWideStrings.pas" />
<DCCReference Include="..\..\source\common\pcre.pas" />
+ <DCCReference Include="..\..\source\common\zlibh.pas" />
<DCCReference Include="..\..\source\windows\Hardlinks.pas" />
<DCCReference Include="..\..\source\windows\JclAppInst.pas" />
<DCCReference Include="..\..\source\windows\JclCIL.pas" />
@@ -143,7 +144,6 @@
<DCCReference Include="..\..\source\windows\MSTask.pas" />
<DCCReference Include="..\..\source\windows\sevenzip.pas" />
<DCCReference Include="..\..\source\windows\Snmp.pas" />
- <DCCReference Include="..\..\source\windows\zlibh.pas" />
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d5/JclD50.dpk
===================================================================
--- trunk/jcl/packages/d5/JclD50.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d5/JclD50.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:36 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
-----------------------------------------------------------------------------
}
@@ -84,6 +84,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -118,8 +119,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d6/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d6/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:26 UTC
+ Last generated: 06-09-2008 16:39:09 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d7/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d7/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d7/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:26 UTC
+ Last generated: 06-09-2008 16:39:09 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d8/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d8/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d8/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:27 UTC
+ Last generated: 06-09-2008 16:39:09 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d9/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d9/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d9/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:28 UTC
+ Last generated: 06-09-2008 16:39:10 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/k3/Jcl.bpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.bpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/k3/Jcl.bpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -142,7 +142,7 @@
<FILE FILENAME="../../source/common/JclValidation.pas" FORMNAME="" UNITNAME="JclValidation" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclWideStrings.pas" FORMNAME="" UNITNAME="JclWideStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/pcre.pas" FORMNAME="" UNITNAME="pcre" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="../../source/unix/zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="../../source/common/zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
Modified: trunk/jcl/packages/k3/Jcl.dpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/k3/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:29 UTC
+ Last generated: 06-09-2008 16:39:11 UTC
-----------------------------------------------------------------------------
}
@@ -86,7 +86,7 @@
JclValidation in '../../source/common/JclValidation.pas' ,
JclWideStrings in '../../source/common/JclWideStrings.pas' ,
pcre in '../../source/common/pcre.pas' ,
- zlibh in '../../source/unix/zlibh.pas'
+ zlibh in '../../source/common/zlibh.pas'
;
end.
Modified: trunk/jcl/packages/xml/Jcl-R.xml
===================================================================
--- trunk/jcl/packages/xml/Jcl-R.xml 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/xml/Jcl-R.xml 2008-09-12 00:01:35 UTC (rev 2466)
@@ -63,6 +63,7 @@
<File Name="..\..\source\common\JclValidation.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclWideStrings.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\common\pcre.pas" Targets="JclDev" Formname="" Condition=""/>
+ <File Name="..\..\source\common\zlibh.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\Hardlinks.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclAppInst.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclCIL.pas" Targets="WinDev" Formname="" Condition=""/>
@@ -98,7 +99,5 @@
<File Name="..\..\source\windows\MSTask.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\sevenzip.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\Snmp.pas" Targets="WinDev" Formname="" Condition=""/>
- <File Name="..\..\source\windows\zlibh.pas" Targets="WinDev" Formname="" Condition=""/>
- <File Name="..\..\source\unix\zlibh.pas" Targets="Kylix" Formname="" Condition=""/>
</Contains>
</Package>
Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/source/common/JclCompression.pas 2008-09-12 00:01:35 UTC (rev 2466)
@@ -1877,6 +1877,8 @@
begin
inherited Create(Destination);
+ LoadZLib;
+
Assert(FBuffer <> nil);
Assert(FBufferSize > 0);
@@ -2038,6 +2040,8 @@
begin
inherited Create(Source, AOwnsStream);
+ LoadZLib;
+
// Initialize ZLib StreamRecord
with ZLibRecord do
begin
@@ -2132,6 +2136,8 @@
begin
inherited Create(Destination);
+ LoadZLib;
+
FFlags := [gfHeaderCRC16, gfExtraField, gfOriginalFileName, gfComment];
FAutoSetTime := True;
FFatSystem := gfsUnknown;
@@ -2367,6 +2373,8 @@
begin
inherited Create(Source, AOwnsStream);
+ LoadZLib;
+
FAutoCheckDataCRC32 := True;
FComputedDataCRC32 := crc32(0, nil, 0);
HeaderCRC := crc32(0, nil, 0);
Copied: trunk/jcl/source/common/zlibh.pas (from rev 2456, trunk/jcl/source/prototypes/zlibh.pas)
===================================================================
--- trunk/jcl/source/common/zlibh.pas (rev 0)
+++ trunk/jcl/source/common/zlibh.pas 2008-09-12 00:01:35 UTC (rev 2466)
@@ -0,0 +1,2357 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ zlib.h -- interface of the 'zlib' general purpose compression library }
+{ version 1.2.1, November 17th, 2003 }
+{ }
+{ Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler }
+{ }
+{ This software is provided 'as-is', without any express or implied warranty. In no event will }
+{ the authors be held liable for any damages arising from the use of this software. }
+{ }
+{ Permission is granted to anyone to use this software for any purpose, including commercial }
+{ applications, and to alter it and redistribute it freely, subject to the following restrictions: }
+{ }
+{ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the }
+{ original software. If you use this software in a product, an acknowledgment in the product }
+{ documentation would be appreciated but is not required. }
+{ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as }
+{ being the original software. }
+{ 3. This notice may not be removed or altered from any source distribution. }
+{ }
+{ Jean-loup Gailly Mark Adler }
+{ jl...@gz... ma...@al... }
+{ }
+{ The data format used by the zlib library is described by RFCs (Request for }
+{ Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt }
+{ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+{$IFDEF ZLIB_LINKDLL}
+{$HPPEMIT '#define ZLIB_DLL'}
+{$ELSE ~ZLIB_LINKDLL}
+{$HPPEMIT '#define ZEXPORT __fastcall'}
+{$ENDIF ~ZLIB_LINKDLL}
+
+{$IFDEF ZEXPORT_CDECL}
+{$HPPEMIT '#define ZEXPORT __cdecl'}
+{$ENDIF ZEXPORT_CDECL}
+
+{$HPPEMIT '#define ZEXPORTVA __cdecl'}
+
+{$HPPEMIT '#define __MACTYPES__'}
+{$HPPEMIT '#include <zutil.h>'}
+
+unit zlibh;
+
+{$I jcl.inc}
+
+interface
+
+{$IFDEF MSWINDOWS}
+uses
+ Windows;
+{$ENDIF MSWINDOWS}
+{$IFDEF HAS_UNIT_LIBC}
+uses
+ Libc;
+{$ELSE ~HAS_UNIT_LIBC}
+type
+{$IFDEF UNIX}
+ uLong = LongWord;
+ {$EXTERNALSYM uLong}
+ uInt = Cardinal;
+ {$EXTERNALSYM uInt}
+{$ENDIF UNIX}
+ uShort = Word;
+ {$EXTERNALSYM uShort}
+ size_t = Longint;
+ {$EXTERNALSYM size_t}
+{$ENDIF ~HAS_UNIT_LIBC}
+
+//-----------------------------------------------------------------------------
+// START of the contents of the converted ZCONF.H
+//-----------------------------------------------------------------------------
+{* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ *}
+
+type
+ {$EXTERNALSYM Bytef}
+ Bytef = Byte;
+ {$EXTERNALSYM PBytef}
+ PBytef = ^Bytef;
+ {$EXTERNALSYM UnsignedInt}
+ UnsignedInt = LongWord;
+ {$EXTERNALSYM uLongf}
+ uLongf = ULONG;
+ {$EXTERNALSYM PuLongf}
+ PuLongf = ^uLongf;
+
+{* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ *}
+
+const
+ {$EXTERNALSYM MAX_WBITS}
+ MAX_WBITS = 15; // 32K LZ77 window
+
+{* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*}
+
+ {* Type declarations *}
+
+{* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ *}
+
+{* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ *}
+
+{ $HPPEMIT '#define ZEXPORT __stdcall'} // OS: CHECKTHIS
+{ $HPPEMIT '#define ZEXPORTVA __cdecl'} // OS: CHECKTHIS
+
+// type
+// uInt = UINT; --> already defined in Windows.pas /* 16 bits or more
+// uLong = ULONG; --> already defined in Windows.pas /* 32 bits or more
+
+type
+ {$EXTERNALSYM voidpc}
+ voidpc = Pointer;
+ {$EXTERNALSYM voidpf}
+ voidpf = Pointer;
+ {$EXTERNALSYM voidp}
+ voidp = Pointer;
+ {$EXTERNALSYM z_off_t}
+ z_off_t = LongInt;
+
+const
+ {$EXTERNALSYM SEEK_SET}
+ SEEK_SET = 0; // Seek from beginning of file.
+ {$EXTERNALSYM SEEK_CUR}
+ SEEK_CUR = 1; // Seek from current position.
+ {$EXTERNALSYM SEEK_END}
+ SEEK_END = 2; // Set file pointer to EOF plus "offset"
+
+//-----------------------------------------------------------------------------
+// END of the contents of the converted ZCONF.H
+//-----------------------------------------------------------------------------
+
+const
+ {$EXTERNALSYM ZLIB_VERSION}
+ ZLIB_VERSION = '1.2.3';
+ {$EXTERNALSYM ZLIB_VERNUM}
+ ZLIB_VERNUM = $1230;
+
+{*
+ The 'zlib' compression library provides in-memory compression and
+ decompression functions, including integrity checks of the uncompressed
+ data. This version of the library supports only one compression method
+ (deflation) but other algorithms will be added later and will have the same
+ stream interface.
+
+ Compression can be done in a single step if the buffers are large
+ enough (for example if an input file is mmap'ed), or can be done by
+ repeated calls of the compression function. In the latter case, the
+ application must provide more input and/or consume the output
+ (providing more output space) before each call.
+
+ The compressed data format used by the in-memory functions is the zlib
+ format, which is a zlib wrapper documented in RFC 1950, wrapped around a
+ deflate stream, which is itself documented in RFC 1951.
+
+ The library also supports reading and writing files in gzip (.gz) format
+ with an interface similar to that of stdio using the functions that start
+ with "gz". The gzip format is different from the zlib format. gzip is a
+ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+ The zlib format was designed to be compact and fast for use in memory
+ and on communications channels. The gzip format was designed for single-
+ file compression on file systems, has a larger header than zlib to maintain
+ directory information, and uses a different, slower check method than zlib.
+
+ This library does not provide any functions to write gzip files in memory.
+ However such functions could be easily written using zlib's deflate function,
+ the documentation in the gzip RFC, and the examples in gzio.c.
+
+ The library does not install any signal handler. The decoder checks
+ the consistency of the compressed data, so the library should never
+ crash even in case of corrupted input.
+*}
+
+type
+ {$EXTERNALSYM alloc_func}
+ alloc_func = function(opaque:voidpf; items:uInt; size:uInt):voidpf;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+ {$EXTERNALSYM free_func}
+ free_func = procedure(opaque:voidpf; address:voidpf);
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+ TFNAllocFunc = alloc_func;
+ TFNFreeFunc = free_func;
+
+type
+ {$EXTERNALSYM internal_state}
+ internal_state = packed record end;
+ TInternalState = internal_state; // backward compatibility
+ PInternalState = ^internal_state; // backward compatibility
+
+type
+ {$EXTERNALSYM z_stream_s}
+ z_stream_s = packed record
+ next_in: PBytef; // next input byte
+ avail_in: uInt; // number of bytes available at next_in
+ total_in: uLong; // total nb of input bytes read so far
+
+ next_out: PBytef; // next output byte should be put there
+ avail_out:uInt; // remaining free space at next_out
+ total_out:uLong; // total nb of bytes output so far
+
+ msg: PAnsiChar; // last error message, NULL if no error
+ state:PInternalState; // not visible by applications
+
+ zalloc: TFNAllocFunc;// used to allocate the internal state
+ zfree: TFNFreeFunc; // used to free the internal state
+ opaque: voidpf; // private data object passed to zalloc and zfree
+
+ data_type: Integer; // best guess about the data type: ascii or binary
+ adler: uLong; // adler32 value of the uncompressed data
+ reserved: uLong; // reserved for future use
+ end;
+
+ {$EXTERNALSYM z_stream}
+ z_stream = z_stream_s;
+ {$EXTERNALSYM z_streamp}
+ z_streamp = ^z_stream_s;
+
+ TZStreamRec = z_stream_s;
+ PZStreamRec = ^z_stream_s;
+
+{*
+ The application must update next_in and avail_in when avail_in has
+ dropped to zero. It must update next_out and avail_out when avail_out
+ has dropped to zero. The application must initialize zalloc, zfree and
+ opaque before calling the init function. All other fields are set by the
+ compression library and must not be updated by the application.
+
+ The opaque value provided by the application will be passed as the first
+ parameter for calls of zalloc and zfree. This can be useful for custom
+ memory management. The compression library attaches no meaning to the
+ opaque value.
+
+ zalloc must return Z_NULL if there is not enough memory for the object.
+ If zlib is used in a multi-threaded application, zalloc and zfree must be
+ thread safe.
+
+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
+ exactly 65536 bytes, but will not be required to allocate more than this
+ if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+ pointers returned by zalloc for objects of exactly 65536 bytes *must*
+ have their offset normalized to zero. The default allocation function
+ provided by this library ensures this (see zutil.c). To reduce memory
+ requirements and avoid any allocation of 64K objects, at the expense of
+ compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+ The fields total_in and total_out can be used for statistics or
+ progress reports. After compression, total_in holds the total size of
+ the uncompressed data and may be saved for use in the decompressor
+ (particularly if the decompressor wants to decompress everything in
+ a single step).
+*}
+
+ {* constants *}
+
+const
+ {$EXTERNALSYM Z_NO_FLUSH}
+ Z_NO_FLUSH = 0;
+ {$EXTERNALSYM Z_PARTIAL_FLUSH}
+ Z_PARTIAL_FLUSH = 1; // will be removed, use Z_SYNC_FLUSH instead
+ {$EXTERNALSYM Z_SYNC_FLUSH}
+ Z_SYNC_FLUSH = 2;
+ {$EXTERNALSYM Z_FULL_FLUSH}
+ Z_FULL_FLUSH = 3;
+ {$EXTERNALSYM Z_FINISH}
+ Z_FINISH = 4;
+ {$EXTERNALSYM Z_BLOCK}
+ Z_BLOCK = 5;
+
+{* Allowed flush values; see deflate() and inflate() below for details *}
+
+ {$EXTERNALSYM Z_OK}
+ Z_OK = 0;
+ {$EXTERNALSYM Z_STREAM_END}
+ Z_STREAM_END = 1;
+ {$EXTERNALSYM Z_NEED_DICT}
+ Z_NEED_DICT = 2;
+ {$EXTERNALSYM Z_ERRNO}
+ Z_ERRNO = -1;
+ {$EXTERNALSYM Z_STREAM_ERROR}
+ Z_STREAM_ERROR = -2;
+ {$EXTERNALSYM Z_DATA_ERROR}
+ Z_DATA_ERROR = -3;
+ {$EXTERNALSYM Z_MEM_ERROR}
+ Z_MEM_ERROR = -4;
+ {$EXTERNALSYM Z_BUF_ERROR}
+ Z_BUF_ERROR = -5;
+ {$EXTERNALSYM Z_VERSION_ERROR}
+ Z_VERSION_ERROR = -6;
+{* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ *}
+
+ {$EXTERNALSYM Z_NO_COMPRESSION}
+ Z_NO_COMPRESSION = 0;
+ {$EXTERNALSYM Z_BEST_SPEED}
+ Z_BEST_SPEED = 1;
+ {$EXTERNALSYM Z_BEST_COMPRESSION}
+ Z_BEST_COMPRESSION = 9;
+ {$EXTERNALSYM Z_DEFAULT_COMPRESSION}
+ Z_DEFAULT_COMPRESSION = -1;
+
+{* compression levels *}
+
+ {$EXTERNALSYM Z_FILTERED}
+ Z_FILTERED = 1;
+ {$EXTERNALSYM Z_HUFFMAN_ONLY}
+ Z_HUFFMAN_ONLY = 2;
+ {$EXTERNALSYM Z_RLE}
+ Z_RLE = 3;
+ {$EXTERNALSYM Z_DEFAULT_STRATEGY}
+ Z_DEFAULT_STRATEGY = 0;
+{* compression strategy; see deflateInit2() below for details *}
+
+ {$EXTERNALSYM Z_BINARY}
+ Z_BINARY = 0;
+ {$EXTERNALSYM Z_ASCII}
+ Z_ASCII = 1;
+ {$EXTERNALSYM Z_UNKNOWN}
+ Z_UNKNOWN = 2;
+{* Possible values of the data_type field (though see inflate()) *}
+
+ {$EXTERNALSYM Z_DEFLATED}
+ Z_DEFLATED = 8;
+{* The deflate compression method (the only one supported in this version) *}
+
+ {$EXTERNALSYM Z_NULL}
+ Z_NULL = 0; {* for initializing zalloc, zfree, opaque *}
+
+{* for compatibility with versions < 1.0.2 *}
+
+ {* basic functions *}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM TzlibVersion}
+ TzlibVersion = function (): PAnsiChar;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM zlibVersion}
+ zlibVersion: TzlibVersion = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM zlibVersion}
+function zlibVersion(): PAnsiChar;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ If the first character differs, the library code actually used is
+ not compatible with the zlib.h header file used by the application.
+ This check is automatically made by deflateInit and inflateInit.
+ *}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM TdeflateInit_}
+ TdeflateInit_ = function (var strm:z_stream;
+ level: Integer;
+ {const} version: PAnsiChar;
+ stream_size: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM deflateInit_}
+ deflateInit_: TdeflateInit_ = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflateInit_}
+function deflateInit_(var strm:z_stream;
+ level: Integer;
+ {const} version: PAnsiChar;
+ stream_size: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflateInit}
+function deflateInit(var strm: TZStreamRec; level: Integer): Integer; // macro
+{*
+ Initializes the internal stream state for compression. The fields
+ zalloc, zfree and opaque must be initialized before by the caller.
+ If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+ use default allocation functions.
+
+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+ 1 gives best speed, 9 gives best compression, 0 gives no compression at
+ all (the input data is simply copied a block at a time).
+ Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+ compression (currently equivalent to level 6).
+
+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+ with the version assumed by the caller (ZLIB_VERSION).
+ msg is set to null if there is no error message. deflateInit does not
+ perform any compression: this will be done by deflate().
+*}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM Tdeflate}
+ Tdeflate = function (var strm: TZStreamRec; flush: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM deflate}
+ deflate: Tdeflate = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflate}
+function deflate(var strm: TZStreamRec; flush: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{*
+ deflate compresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce some
+ output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. deflate performs one or both of the
+ following actions:
+
+ - Compress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in and avail_in are updated and
+ processing will resume at this point for the next call of deflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. This action is forced if the parameter flush is non zero.
+ Forcing flush frequently degrades the compression ratio, so this parameter
+ should be set only when necessary (in interactive applications).
+ Some output may be provided even if flush is not set.
+
+ Before the call of deflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming
+ more output, and updating avail_in or avail_out accordingly; avail_out
+ should never be zero before the call. The application can consume the
+ compressed output when it wants, for example when the output buffer is full
+ (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+ and with zero avail_out, it must be called again after making room in the
+ output buffer because there might be more output pending.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+ flushed to the output buffer and the output is aligned on a byte boundary, so
+ that the decompressor can get all input data available so far. (In particular
+ avail_in is zero after the call if enough output space has been provided
+ before the call.) Flushing may degrade compression for some compression
+ algorithms and so it should be used only when necessary.
+
+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+ restart from this point if previous compressed data has been damaged or if
+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+ the compression.
+
+ If deflate returns with avail_out == 0, this function must be called again
+ with the same value of the flush parameter and more output space (updated
+ avail_out), until the flush is complete (deflate returns with non-zero
+ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+ avail_out is greater than six to avoid repeated flush markers due to
+ avail_out == 0 on return.
+
+ If the parameter flush is set to Z_FINISH, pending input is processed,
+ pending output is flushed and deflate returns with Z_STREAM_END if there
+ was enough output space; if deflate returns with Z_OK, this function must be
+ called again with Z_FINISH and more output space (updated avail_out) but no
+ more input data, until it returns with Z_STREAM_END or an error. After
+ deflate has returned Z_STREAM_END, the only possible operations on the
+ stream are deflateReset or deflateEnd.
+
+ Z_FINISH can be used immediately after deflateInit if all the compression
+ is to be done in a single step. In this case, avail_out must be at least
+ the value returned by deflateBound (see below). If deflate does not return
+ Z_STREAM_END, then it must be called again as described above.
+
+ deflate() sets strm->adler to the adler32 checksum of all input read
+ so far (that is, total_in bytes).
+
+ deflate() may update data_type if it can make a good guess about
+ the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+ binary. This field is only for information purposes and does not affect
+ the compression algorithm in any manner.
+
+ deflate() returns Z_OK if some progress has been made (more input
+ processed or more output produced), Z_STREAM_END if all input has been
+ consumed and all output has been produced (only when flush is set to
+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+ if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+ fatal, and deflate() can be called again with more input and more output
+ space to continue compressing.
+*}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM TdeflateEnd}
+ TdeflateEnd = function (var strm: TZStreamRec): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM deflateEnd}
+ deflateEnd: TdeflateEnd = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflateEnd}
+function deflateEnd(var strm: TZStreamRec): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any
+ pending output.
+
+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+ prematurely (some input or output was discarded). In the error case,
+ msg may be set but then points to ...
[truncated message content] |