Skip to content

Commit 53b0daa

Browse files
jfreillyjfreilly
committed
Fix bug in DeflaterOutputStream were occasionally encrypted data would be corrupted.
Tidy up more summary comments. Move to Sandcastle Help File builder for documentation.
1 parent 60087ad commit 53b0daa

22 files changed

+229
-145
lines changed

‎SharpZipLib.shfb‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<project schemaVersion="1.4.0.2">
2+
<assemblies>
3+
<assembly assemblyPath=".\current\net-11\ICSharpCode.SharpZipLib.dll" xmlCommentsPath=".\current\net-11\ICSharpCode.SharpZipLib.xml" commentsOnly="False" />
4+
</assemblies>
5+
<namespaceSummaries>
6+
<namespaceSummaryItem name="" isDocumented="False" />
7+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib" isDocumented="True">The root namespace for this library.</namespaceSummaryItem>
8+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.BZip2" isDocumented="True">BZip2 compression handling</namespaceSummaryItem>
9+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Checksums" isDocumented="True">Checksum Handling</namespaceSummaryItem>
10+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Core" isDocumented="True">Core Utilities</namespaceSummaryItem>
11+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Encryption" isDocumented="True">Encryption handling</namespaceSummaryItem>
12+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.GZip" isDocumented="True">GZip compression handling</namespaceSummaryItem>
13+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Tar" isDocumented="True">Tape Archive handling</namespaceSummaryItem>
14+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Zip" isDocumented="True">ZIP archive handling</namespaceSummaryItem>
15+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Zip.Compression" isDocumented="True">Zip Compression handling</namespaceSummaryItem>
16+
<namespaceSummaryItem name="ICSharpCode.SharpZipLib.Zip.Compression.Streams" isDocumented="True">Zip compression streams.</namespaceSummaryItem>
17+
</namespaceSummaries>
18+
<ProjectSummary>Welcom to the #Zip compression library!</ProjectSummary>
19+
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace</MissingTags>
20+
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
21+
<HtmlHelp1xCompilerPath path="" />
22+
<HtmlHelp2xCompilerPath path="" />
23+
<OutputPath>C:\Common\User\John\Development\SharpZip\SharpZipLib\trunk\SharpZipLib\current\doc\</OutputPath>
24+
<SandcastlePath path="" />
25+
<WorkingPath path="" />
26+
<CleanIntermediates>True</CleanIntermediates>
27+
<HelpFileFormat>HtmlHelp1x</HelpFileFormat>
28+
<PurgeDuplicateTopics>True</PurgeDuplicateTopics>
29+
<CppCommentsFixup>False</CppCommentsFixup>
30+
<FrameworkVersion>2.0.50727</FrameworkVersion>
31+
<BinaryTOC>True</BinaryTOC>
32+
<IncludeFavorites>False</IncludeFavorites>
33+
<Preliminary>False</Preliminary>
34+
<RootNamespaceContainer>False</RootNamespaceContainer>
35+
<RootNamespaceTitle />
36+
<HelpTitle>ICSharpCode.SharpZipLib Compression Library</HelpTitle>
37+
<HtmlHelpName>SharpZipLib</HtmlHelpName>
38+
<Language>en-US</Language>
39+
<CopyrightHref />
40+
<CopyrightText />
41+
<FeedbackEMailAddress />
42+
<HeaderText />
43+
<FooterText />
44+
<ProjectLinkType>Local</ProjectLinkType>
45+
<SdkLinkType>Msdn</SdkLinkType>
46+
<PresentationStyle>Prototype</PresentationStyle>
47+
<NamingMethod>Guid</NamingMethod>
48+
<SyntaxFilters>Standard</SyntaxFilters>
49+
<ContentPlacement>AboveNamespaces</ContentPlacement>
50+
</project>

‎SharpZlib.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<property name="debug" value="False"/>
3131
<property name="optimize" value="True"/>
3232
<property name="checked" value="False" />
33-
<property name="version" value="0.85.3"/>
33+
<property name="version" value="0.85.4"/>
3434

3535
<property name="build.output.dir" value="bin" overwrite="False" />
3636
<property name="sharpziplib.name" value="ICSharpCode.SharpZipLib" />

‎mkDistribution.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@echo "mkDistribution v1.2"
1+
@echo "mkDistribution v1.3"
22

33
if exist current (
44
rmdir /s /q current
@@ -18,7 +18,6 @@ nant -t:net-1.1 -D:build.output.dir=current\net-11 -buildfile:sharpZLib.build bu
1818
mkdir current\net-20
1919
nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:sharpZLib.build build
2020

21-
@echo todo generate documentation and the rest of the distribution image.
2221

2322
mkdir current\doc
2423
copy doc\readme.rtf current\doc
@@ -28,8 +27,9 @@ copy SharpZipLib.chm current\doc
2827
copy installGAC.bat current
2928
copy uninstallGAC.bat current
3029

30+
"c:\Program Files\EWSoftware\Sandcastle Help File Builder\SandcastleBuilderConsole.exe" .\SharpZipLib.shfb
31+
3132
samples\cs\bin\sz -rc current\SharpZipLib.zip current\*.dll
3233

3334
@echo TODO Compress source to SharpZipLib_SourceSamples.zip
34-
@echo TODO Build CHM file
35-
@echo TODO Build Bin Zip files
35+
@echo TODO Build Bin Zip files

‎samples/cs/CreateZipFile/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

13-
[assembly: AssemblyVersion("0.85.3.365")]
13+
[assembly: AssemblyVersion("0.85.4.369")]
1414

1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]

‎samples/cs/FastZip/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// You can specify all values by your own or you can build default build and revision
2424
// numbers with the '*' character (the default):
2525

26-
[assembly: AssemblyVersion("0.85.3.365")]
26+
[assembly: AssemblyVersion("0.85.4.369")]
2727

2828
// The following attributes specify the key for the sign of your assembly. See the
2929
// .NET Framework documentation for more information about signing.

‎samples/cs/minibzip2/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

13-
[assembly: AssemblyVersion("0.85.3.365")]
13+
[assembly: AssemblyVersion("0.85.4.369")]
1414

1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]

‎samples/cs/minigzip/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

13-
[assembly: AssemblyVersion("0.85.3.365")]
13+
[assembly: AssemblyVersion("0.85.4.369")]
1414

1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]

‎samples/cs/sz/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// You can specify all values by your own or you can build default build and revision
2424
// numbers with the '*' character (the default):
2525

26-
[assembly: AssemblyVersion("0.85.3.365")]
26+
[assembly: AssemblyVersion("0.85.4.369")]
2727

2828
// The following attributes specify the key for the sign of your assembly. See the
2929
// .NET Framework documentation for more information about signing.

‎samples/cs/sz/sz.cs‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,26 @@ bool SetArgs(string[] args) {
315315
System.Console.WriteLine("Invalid extractdir " + args[argIndex]);
316316
}
317317
break;
318+
319+
case "-zip64":
320+
if ( optArg.Length > 0 )
321+
{
322+
switch ( optArg )
323+
{
324+
case "on":
325+
useZip64_ = UseZip64.On;
326+
break;
327+
328+
case "off":
329+
useZip64_ = UseZip64.Off;
330+
break;
331+
332+
case "auto":
333+
useZip64_ = UseZip64.Dynamic;
334+
break;
335+
}
336+
}
337+
break;
318338

319339
case "-encoding":
320340
if (optArg.Length > 0) {
@@ -971,7 +991,8 @@ void Create(ArrayList fileSpecs)
971991
if (password != null && password.Length > 0) {
972992
outputStream.Password = password;
973993
}
974-
994+
995+
outputStream.UseZip64 = useZip64_;
975996
outputStream.SetLevel(compressionLevel);
976997
foreach(string spec in fileSpecs) {
977998
string fileName = Path.GetFileName(spec);
@@ -1299,6 +1320,11 @@ public static void Main(string[] args) {
12991320
}
13001321

13011322
#region Instance Fields
1323+
/// <summary>
1324+
/// The Zip64 extension use to apply.
1325+
/// </summary>
1326+
UseZip64 useZip64_ = UseZip64.Off;
1327+
13021328
/// <summary>
13031329
/// Has user already seen help output?
13041330
/// </summary>

‎samples/cs/tar/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// You can specify all values by your own or you can build default build and revision
2424
// numbers with the '*' character (the default):
2525

26-
[assembly: AssemblyVersion("0.85.3.365")]
26+
[assembly: AssemblyVersion("0.85.4.369")]
2727

2828
// The following attributes specify the key for the sign of your assembly. See the
2929
// .NET Framework documentation for more information about signing.

0 commit comments

Comments
 (0)