mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-16 15:01:15 +02:00
Zip changes from 1.3.5
This commit is contained in:
Guenter Obiltschnig
parent
c93c16008b
commit
f2ca58ff73
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/Makefile#2 $
|
||||
# $Id: //poco/Main/Zip/Makefile#6 $
|
||||
#
|
||||
# Makefile for Poco Zip
|
||||
#
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Zip.vmsbuild
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/Zip.vmsbuild#1 $
|
||||
# $Id: //poco/Main/Zip/Zip.vmsbuild#3 $
|
||||
#
|
||||
LIB=PocoZip
|
||||
Decompress
|
||||
|
||||
@ -12,16 +12,26 @@ Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
debug_shared = debug_shared
|
||||
release_shared = release_shared
|
||||
debug_static = debug_static
|
||||
release_static = release_static
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared.ActiveCfg = debug_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared.Build.0 = debug_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared.ActiveCfg = release_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared.Build.0 = release_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static.ActiveCfg = debug_static|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static.Build.0 = debug_static|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static.ActiveCfg = release_static|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static.Build.0 = release_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared.ActiveCfg = debug_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared.Build.0 = debug_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared.ActiveCfg = release_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared.Build.0 = release_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static.ActiveCfg = debug_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static.Build.0 = debug_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static.ActiveCfg = release_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static.Build.0 = release_static|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
||||
@ -138,6 +138,109 @@
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="debug_static|Win32"
|
||||
OutputDirectory="obj\debug_static"
|
||||
IntermediateDirectory="obj\debug_static"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".\include;..\Foundation\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Zip_EXPORTS;POCO_STATIC"
|
||||
StringPooling="TRUE"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="TRUE"
|
||||
TreatWChar_tAsBuiltInType="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=""
|
||||
OutputFile="..\lib\PocoZipmtd.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="release_static|Win32"
|
||||
OutputDirectory="obj\release_static"
|
||||
IntermediateDirectory="obj\release_static"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="1"
|
||||
EnableIntrinsicFunctions="TRUE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
OptimizeForProcessor="3"
|
||||
AdditionalIncludeDirectories=".\include;..\Foundation\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;Zip_EXPORTS;POCO_STATIC"
|
||||
GeneratePreprocessedFile="0"
|
||||
KeepComments="FALSE"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="FALSE"
|
||||
TreatWChar_tAsBuiltInType="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="0"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=""
|
||||
OutputFile="..\lib\PocoZipmt.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
||||
@ -11,16 +11,26 @@ Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
debug_shared|Win32 = debug_shared|Win32
|
||||
release_shared|Win32 = release_shared|Win32
|
||||
debug_static|Win32 = debug_static|Win32
|
||||
release_static|Win32 = release_static|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_shared|Win32.Build.0 = debug_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.ActiveCfg = release_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_shared|Win32.Build.0 = release_shared|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static|Win32.ActiveCfg = debug_static|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.debug_static|Win32.Build.0 = debug_static|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static|Win32.ActiveCfg = release_static|Win32
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}.release_static|Win32.Build.0 = release_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_shared|Win32.Build.0 = debug_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.ActiveCfg = release_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_shared|Win32.Build.0 = release_shared|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static|Win32.ActiveCfg = debug_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.debug_static|Win32.Build.0 = debug_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static|Win32.ActiveCfg = release_static|Win32
|
||||
{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}.release_static|Win32.Build.0 = release_static|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -199,6 +199,154 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="release_static|Win32"
|
||||
OutputDirectory="obj\release_static"
|
||||
IntermediateDirectory="obj\release_static"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="1"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories=".\include;..\Foundation\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;Zip_EXPORTS;POCO_STATIC"
|
||||
GeneratePreprocessedFile="0"
|
||||
KeepComments="false"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="false"
|
||||
TreatWChar_tAsBuiltInType="true"
|
||||
ForceConformanceInForLoopScope="true"
|
||||
RuntimeTypeInfo="true"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="0"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=""
|
||||
OutputFile="..\lib\PocoZipmt.lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="debug_static|Win32"
|
||||
OutputDirectory="obj\debug_static"
|
||||
IntermediateDirectory="obj\debug_static"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".\include;..\Foundation\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Zip_EXPORTS;POCO_STATIC"
|
||||
StringPooling="true"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="true"
|
||||
TreatWChar_tAsBuiltInType="true"
|
||||
ForceConformanceInForLoopScope="true"
|
||||
RuntimeTypeInfo="true"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=""
|
||||
OutputFile="..\lib\PocoZipmtd.lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual Studio 2008
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Zip_vs90.vcproj", "{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Zip_VS90.vcproj", "{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS90.vcproj", "{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} = {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}
|
||||
EndProjectSection
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Version="9,00"
|
||||
Name="Zip"
|
||||
ProjectGUID="{4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61}"
|
||||
RootNamespace="Zip"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
@ -76,6 +77,8 @@
|
||||
ProgramDatabaseFile="..\bin\PocoZipd.pdb"
|
||||
SubSystem="1"
|
||||
OptimizeForWindows98="0"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
ImportLibrary="..\lib\PocoZipd.lib"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
@ -97,9 +100,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
@ -171,6 +171,8 @@
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
OptimizeForWindows98="0"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
ImportLibrary="..\lib\PocoZip.lib"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
@ -192,9 +194,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Add.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Add.h#1 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Add.h#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// AutoDetectStream.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/AutoDetectStream.h#4 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/AutoDetectStream.h#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Compress.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Compress.h#4 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Compress.h#6 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -43,6 +43,8 @@
|
||||
#include "Poco/Zip/Zip.h"
|
||||
#include "Poco/Zip/ZipArchive.h"
|
||||
#include "Poco/FIFOEvent.h"
|
||||
#include <istream>
|
||||
#include <ostream>
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Decompress.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Decompress.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Decompress.h#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -42,7 +42,7 @@
|
||||
|
||||
#include "Poco/Zip/Zip.h"
|
||||
#include "Poco/Zip/ParseCallback.h"
|
||||
#include "Poco/Zip/ZipLocalFileHeader.h"
|
||||
#include "Poco/Zip/ZipArchive.h"
|
||||
#include "Poco/Path.h"
|
||||
#include "Poco/FIFOEvent.h"
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Delete.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Delete.h#1 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Delete.h#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Keep.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Keep.h#1 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Keep.h#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ParseCallback.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ParseCallback.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ParseCallback.h#3 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// PartialStream.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/PartialStream.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/PartialStream.h#7 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Rename.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Rename.h#1 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Rename.h#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Replace.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Replace.h#1 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Replace.h#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// SkipCallback.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/SkipCallback.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/SkipCallback.h#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Zip.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/Zip.h#4 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/Zip.h#5 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipArchive.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipArchive.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipArchive.h#7 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -44,7 +44,7 @@
|
||||
#include "Poco/Zip/ZipLocalFileHeader.h"
|
||||
#include "Poco/Zip/ZipFileInfo.h"
|
||||
#include "Poco/Zip/ZipArchiveInfo.h"
|
||||
#include <iostream>
|
||||
#include <istream>
|
||||
#include <map>
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipArchiveInfo.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipArchiveInfo.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipArchiveInfo.h#6 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipCommon.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipCommon.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipCommon.h#10 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipDataInfo.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipDataInfo.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipDataInfo.h#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipException.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipException.h#4 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipException.h#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipLocalFileHeader.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipLocalFileHeader.h#4 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipLocalFileHeader.h#10 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -45,7 +45,7 @@
|
||||
#include "Poco/Zip/ZipCommon.h"
|
||||
#include "Poco/DateTime.h"
|
||||
#include "Poco/Path.h"
|
||||
#include <iostream>
|
||||
#include <istream>
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipManipulator.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipManipulator.h#2 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipManipulator.h#3 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipOperation.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipOperation.h#1 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipOperation.h#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipStream.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipStream.h#3 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipStream.h#9 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipUtil.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/include/Poco/Zip/ZipUtil.h#4 $
|
||||
// $Id: //poco/Main/Zip/include/Poco/Zip/ZipUtil.h#7 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -44,6 +44,7 @@
|
||||
#include "Poco/Zip/ZipCommon.h"
|
||||
#include "Poco/DateTime.h"
|
||||
#include "Poco/Path.h"
|
||||
#include <istream>
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/samples/Makefile#1 $
|
||||
# $Id: //poco/Main/Zip/samples/Makefile#1 $
|
||||
#
|
||||
# Makefile for Poco Util Samples
|
||||
#
|
||||
|
||||
@ -10,27 +10,17 @@ EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
debug_shared = debug_shared
|
||||
debug_static = debug_static
|
||||
release_shared = release_shared
|
||||
release_static = release_static
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.debug_shared.ActiveCfg = debug_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.debug_shared.Build.0 = debug_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.debug_static.ActiveCfg = debug_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.debug_static.Build.0 = debug_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.release_shared.ActiveCfg = release_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.release_shared.Build.0 = release_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.release_static.ActiveCfg = release_shared|Win32
|
||||
{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}.release_static.Build.0 = release_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.debug_shared.ActiveCfg = debug_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.debug_shared.Build.0 = debug_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.debug_static.ActiveCfg = debug_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.debug_static.Build.0 = debug_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.release_shared.ActiveCfg = release_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.release_shared.Build.0 = release_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.release_static.ActiveCfg = release_shared|Win32
|
||||
{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}.release_static.Build.0 = release_shared|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/samples/unzip/Makefile#1 $
|
||||
# $Id: //poco/Main/Zip/samples/unzip/Makefile#1 $
|
||||
#
|
||||
# Makefile for Poco SampleServer
|
||||
#
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// unzip.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/samples/unzip/src/unzip.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/samples/unzip/src/unzip.cpp#3 $
|
||||
//
|
||||
// This sample demonstrates the Decompress class.
|
||||
//
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Version="9,00"
|
||||
Name="unzip"
|
||||
ProjectGUID="{0CFFC7B0-04F4-4A60-B6E4-84D78EDA2C73}"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
@ -73,6 +74,8 @@
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="bin/unzipd.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
@ -93,9 +96,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
@ -164,6 +164,8 @@
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
@ -184,9 +186,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/samples/zip/Makefile#1 $
|
||||
# $Id: //poco/Main/Zip/samples/zip/Makefile#1 $
|
||||
#
|
||||
# Makefile for Poco SampleApp
|
||||
#
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// zip.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/samples/zip/src/zip.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/samples/zip/src/zip.cpp#4 $
|
||||
//
|
||||
// This sample demonstrates the Compress class.
|
||||
//
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Version="9,00"
|
||||
Name="zip"
|
||||
ProjectGUID="{73408DCF-2E65-47AF-BF38-7466DAB8D5CB}"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
@ -73,6 +74,8 @@
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="bin/zipd.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
@ -93,9 +96,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
@ -164,6 +164,8 @@
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
@ -184,9 +186,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Add.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/Add.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/src/Add.cpp#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// AutoDetectStream.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/AutoDetectStream.cpp#4 $
|
||||
// $Id: //poco/Main/Zip/src/AutoDetectStream.cpp#6 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -314,9 +314,7 @@ ZipArchive Compress::close()
|
||||
std::string centr(central.createHeader());
|
||||
_out.write(centr.c_str(), static_cast<std::streamsize>(centr.size()));
|
||||
_out.flush();
|
||||
// SunPro C++ fix
|
||||
std::pair<UInt16, ZipArchiveInfo> par(0, central);
|
||||
_dirs.insert(par);
|
||||
_dirs.insert(std::make_pair(0, central));
|
||||
return ZipArchive(_files, _infos, _dirs);
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Decompress.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/Decompress.cpp#4 $
|
||||
// $Id: //poco/Main/Zip/src/Decompress.cpp#6 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -58,6 +58,7 @@ Decompress::Decompress(std::istream& in, const Poco::Path& outputDir, bool flatt
|
||||
_mapping()
|
||||
{
|
||||
_outDir.makeAbsolute();
|
||||
_outDir.makeDirectory();
|
||||
poco_assert (_in.good());
|
||||
Poco::File tmp(_outDir);
|
||||
if (!tmp.exists())
|
||||
@ -95,7 +96,7 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
|
||||
std::string dirName = hdr.getFileName();
|
||||
if (dirName.find(ZipCommon::ILLEGAL_PATH) != std::string::npos)
|
||||
throw ZipException("Illegal entry name " + dirName + " containing " + ZipCommon::ILLEGAL_PATH);
|
||||
Poco::Path dir(dirName);
|
||||
Poco::Path dir(_outDir, dirName);
|
||||
dir.makeDirectory();
|
||||
Poco::File aFile(dir);
|
||||
aFile.createDirectories();
|
||||
@ -128,7 +129,7 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
|
||||
std::ofstream out(dest.toString().c_str(), std::ios::binary);
|
||||
if (!out)
|
||||
{
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp(hdr, "Failed to open output stream " + dest.toString());
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp = std::make_pair(hdr, "Failed to open output stream " + dest.toString());
|
||||
EError.notify(this, tmp);
|
||||
return false;
|
||||
}
|
||||
@ -138,7 +139,7 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
|
||||
Poco::File aFile(file);
|
||||
if (!aFile.exists() || !aFile.isFile())
|
||||
{
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp(hdr, "Failed to create output stream " + dest.toString());
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp = std::make_pair(hdr, "Failed to create output stream " + dest.toString());
|
||||
EError.notify(this, tmp);
|
||||
return false;
|
||||
}
|
||||
@ -147,7 +148,7 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
|
||||
{
|
||||
if (!_keepIncompleteFiles)
|
||||
aFile.remove();
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp(hdr, "CRC mismatch. Corrupt file: " + dest.toString());
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp = std::make_pair(hdr, "CRC mismatch. Corrupt file: " + dest.toString());
|
||||
EError.notify(this, tmp);
|
||||
return false;
|
||||
}
|
||||
@ -158,23 +159,23 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
|
||||
{
|
||||
if (!_keepIncompleteFiles)
|
||||
aFile.remove();
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp(hdr, "Filesizes do not match. Corrupt file: " + dest.toString());
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp = std::make_pair(hdr, "Filesizes do not match. Corrupt file: " + dest.toString());
|
||||
EError.notify(this, tmp);
|
||||
return false;
|
||||
}
|
||||
|
||||
std::pair<const ZipLocalFileHeader, const Poco::Path> tmp(hdr, file);
|
||||
std::pair<const ZipLocalFileHeader, const Poco::Path> tmp = std::make_pair(hdr, file);
|
||||
EOk.notify(this, tmp);
|
||||
}
|
||||
catch (Poco::Exception& e)
|
||||
{
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp(hdr, "Exception: " + e.displayText());
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp = std::make_pair(hdr, std::string("Exception: " + e.displayText()));
|
||||
EError.notify(this, tmp);
|
||||
return false;
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp(hdr, "Unknown Exception");
|
||||
std::pair<const ZipLocalFileHeader, const std::string> tmp = std::make_pair(hdr, std::string("Unknown Exception"));
|
||||
EError.notify(this, tmp);
|
||||
return false;
|
||||
}
|
||||
@ -185,9 +186,7 @@ bool Decompress::handleZipEntry(std::istream& zipStream, const ZipLocalFileHeade
|
||||
|
||||
void Decompress::onOk(const void*, std::pair<const ZipLocalFileHeader, const Poco::Path>& val)
|
||||
{
|
||||
// std::pair<std::string,Poco::Path> par(val.first.getFileName(), val.second);
|
||||
ZipMapping::value_type p(val.first.getFileName(), val.second);
|
||||
_mapping.insert(p);
|
||||
_mapping.insert(std::make_pair(val.first.getFileName(), val.second));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Delete.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/Delete.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/src/Delete.cpp#2 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
@ -49,14 +49,7 @@ Delete::Delete(const ZipLocalFileHeader& hdr):
|
||||
|
||||
void Delete::execute(Compress& c, std::istream& input)
|
||||
{
|
||||
// due to absolute positioning in compress we don't need to do this
|
||||
/*
|
||||
input.seekg(_hdr.getEndPos(), std::ios_base::beg);
|
||||
if (_hdr.searchCRCAndSizesAfterData())
|
||||
{
|
||||
ZipDataInfo info(in, false);
|
||||
}
|
||||
*/
|
||||
// due to absolute positioning in compress we don't need to do anything
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Keep.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/Keep.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/src/Keep.cpp#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ParseCallback.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ParseCallback.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/src/ParseCallback.cpp#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// PartialStream.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/PartialStream.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/src/PartialStream.cpp#8 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Rename.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/Rename.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/src/Rename.cpp#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Replace.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/Replace.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/src/Replace.cpp#2 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
@ -49,7 +49,6 @@ Replace::Replace(const ZipLocalFileHeader& hdr, const std::string& localPath):
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Replace::execute(Compress& c, std::istream& input)
|
||||
{
|
||||
_del.execute(c, input);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// SkipCallback.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/SkipCallback.cpp#4 $
|
||||
// $Id: //poco/Main/Zip/src/SkipCallback.cpp#5 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipArchive.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipArchive.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/src/ZipArchive.cpp#8 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
@ -114,7 +114,6 @@ void ZipArchive::parse(std::istream& in, ParseCallback& pc)
|
||||
else
|
||||
throw Poco::IllegalStateException("Garbage after directory header");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipArchiveInfo.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipArchiveInfo.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/src/ZipArchiveInfo.cpp#7 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipCommon.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipCommon.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/src/ZipCommon.cpp#3 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipDataInfo.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipDataInfo.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/src/ZipDataInfo.cpp#5 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipException.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipException.cpp#4 $
|
||||
// $Id: //poco/Main/Zip/src/ZipException.cpp#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipLocalFileHeader.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipLocalFileHeader.cpp#4 $
|
||||
// $Id: //poco/Main/Zip/src/ZipLocalFileHeader.cpp#9 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipManipulator.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipManipulator.cpp#2 $
|
||||
// $Id: //poco/Main/Zip/src/ZipManipulator.cpp#4 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
@ -59,7 +59,7 @@ ZipManipulator::ZipManipulator(const std::string& zipFile, bool backupOriginalFi
|
||||
_changes(),
|
||||
_in(0)
|
||||
{
|
||||
std::ifstream in(zipFile.c_str());
|
||||
std::ifstream in(zipFile.c_str(), std::ios::binary);
|
||||
_in = new ZipArchive(in);
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipOperation.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipOperation.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/src/ZipOperation.cpp#1 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Manipulation
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipUtil.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/src/ZipUtil.cpp#4 $
|
||||
// $Id: //poco/Main/Zip/src/ZipUtil.cpp#8 $
|
||||
//
|
||||
// Library: Zip
|
||||
// Package: Zip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Makefile
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/testsuite/Makefile#1 $
|
||||
# $Id: //poco/Main/Zip/testsuite/Makefile#5 $
|
||||
#
|
||||
# Makefile for Poco Zip testsuite
|
||||
#
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# TestSuite.vmsbuild
|
||||
#
|
||||
# $Id: //poco/1.3/Zip/testsuite/TestSuite.vmsbuild#1 $
|
||||
# $Id: //poco/Main/Zip/testsuite/TestSuite.vmsbuild#1 $
|
||||
#
|
||||
EXE=TestRunner
|
||||
ZipTestSuite
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Net\include"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -37,7 +37,7 @@
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib PocoFoundationd.lib PocoZipd.lib PocoNetd.lib"
|
||||
AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib PocoFoundationd.lib PocoZipd.lib"
|
||||
OutputFile="bin/TestSuited.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
@ -81,7 +81,7 @@
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
OptimizeForWindowsApplication="TRUE"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Net\include"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -97,7 +97,7 @@
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnit.lib WinTestRunner.lib PocoFoundation.lib PocoZip.lib PocoNet.lib"
|
||||
AdditionalDependencies="CppUnit.lib WinTestRunner.lib PocoFoundation.lib PocoZip.lib"
|
||||
OutputFile="bin/TestSuite.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
@ -128,6 +128,124 @@
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="debug_static|Win32"
|
||||
OutputDirectory="obj\debug_static"
|
||||
IntermediateDirectory="obj\debug_static"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="2"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;winmm.lib"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="TRUE"
|
||||
TreatWChar_tAsBuiltInType="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="4"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib PocoFoundationmtd.lib PocoZipmtd.lib winmm.lib ..\..\CppUnit\WinTestRunner\obj\debug_static\WinTestRunner.res"
|
||||
OutputFile="bin/TestSuitemtd.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="bin/TestSuitemtd.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="release_static|Win32"
|
||||
OutputDirectory="obj\release_static"
|
||||
IntermediateDirectory="obj\release_static"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="2"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="1"
|
||||
EnableIntrinsicFunctions="TRUE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="TRUE"
|
||||
OptimizeForWindowsApplication="TRUE"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;winmm.lib"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="FALSE"
|
||||
TreatWChar_tAsBuiltInType="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib PocoFoundationmt.lib PocoZipmt.lib winmm.lib ..\..\CppUnit\WinTestRunner\obj\release_static\WinTestRunner.res"
|
||||
OutputFile="bin/TestSuitemt.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
GenerateDebugInformation="FALSE"
|
||||
ProgramDatabaseFile=""
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Net\include"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -65,7 +65,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib PocoFoundationd.lib PocoZipd.lib PocoNetd.lib"
|
||||
AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib PocoFoundationd.lib PocoZipd.lib"
|
||||
OutputFile="bin/TestSuited.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
@ -129,7 +129,7 @@
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Net\include"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -153,7 +153,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnit.lib WinTestRunner.lib PocoFoundation.lib PocoZip.lib PocoNet.lib"
|
||||
AdditionalDependencies="CppUnit.lib WinTestRunner.lib PocoFoundation.lib PocoZip.lib"
|
||||
OutputFile="bin/TestSuite.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
@ -189,6 +189,183 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="release_static|Win32"
|
||||
OutputDirectory="obj\release_static"
|
||||
IntermediateDirectory="obj\release_static"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="2"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="1"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="false"
|
||||
TreatWChar_tAsBuiltInType="true"
|
||||
ForceConformanceInForLoopScope="true"
|
||||
RuntimeTypeInfo="true"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib PocoFoundationmt.lib PocoZipmt.lib winmm.lib ..\..\CppUnit\WinTestRunner\obj\release_static\WinTestRunner.res"
|
||||
OutputFile="bin/TestSuitemt.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
GenerateDebugInformation="false"
|
||||
ProgramDatabaseFile=""
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="debug_static|Win32"
|
||||
OutputDirectory="obj\debug_static"
|
||||
IntermediateDirectory="obj\debug_static"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="2"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\include;..\..\Foundation\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="true"
|
||||
TreatWChar_tAsBuiltInType="true"
|
||||
ForceConformanceInForLoopScope="true"
|
||||
RuntimeTypeInfo="true"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="4"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib PocoFoundationmtd.lib PocoZipmtd.lib winmm.lib ..\..\CppUnit\WinTestRunner\obj\debug_static\WinTestRunner.res"
|
||||
OutputFile="bin/TestSuitemtd.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\lib"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="bin/TestSuitemtd.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Version="9,00"
|
||||
Name="TestSuite"
|
||||
ProjectGUID="{9665FC3C-DB71-4C6C-AAEE-AAFD73CB31E7}"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
@ -72,6 +73,8 @@
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="bin/TestSuited.pdb"
|
||||
SubSystem="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
@ -92,9 +95,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
@ -162,6 +162,8 @@
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
@ -182,9 +184,6 @@
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
//
|
||||
// CompressTest.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/CompressTest.cpp#5 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/CompressTest.cpp#9 $
|
||||
//
|
||||
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
|
||||
// and Contributors.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// CompressTest.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/CompressTest.h#4 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/CompressTest.h#5 $
|
||||
//
|
||||
// Definition of the CompressTest class.
|
||||
//
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Driver.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/Driver.cpp#2 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/Driver.cpp#3 $
|
||||
//
|
||||
// Console-based test driver for Poco Zip.
|
||||
//
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// PartialStreamTest.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/PartialStreamTest.cpp#3 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/PartialStreamTest.cpp#4 $
|
||||
//
|
||||
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
|
||||
// and Contributors.
|
||||
@ -61,7 +61,7 @@ void PartialStreamTest::testReading()
|
||||
char buf[124];
|
||||
in.read(buf, 124);
|
||||
std::string res(buf, in.gcount());
|
||||
poco_assert (res == result);
|
||||
assert (res == result);
|
||||
}
|
||||
|
||||
|
||||
@ -74,11 +74,11 @@ void PartialStreamTest::testWriting()
|
||||
std::ostringstream ostr;
|
||||
PartialOutputStream out(ostr, prefix.size(), postfix.size());
|
||||
out.write(result.c_str(), static_cast<std::streamsize>(result.length()));
|
||||
poco_assert (out.good());
|
||||
assert (out.good());
|
||||
out.close();
|
||||
std::string res (ostr.str());
|
||||
poco_assert (out.bytesWritten() == message.size());
|
||||
poco_assert (message == res);
|
||||
assert (out.bytesWritten() == message.size());
|
||||
assert (message == res);
|
||||
}
|
||||
|
||||
|
||||
@ -91,11 +91,11 @@ void PartialStreamTest::testWritingZero()
|
||||
std::ostringstream ostr;
|
||||
PartialOutputStream out(ostr, prefix.size(), postfix.size());
|
||||
out.write(result.c_str(), static_cast<std::streamsize>(result.length()));
|
||||
poco_assert (out.good());
|
||||
assert (out.good());
|
||||
out.close();
|
||||
std::string res (ostr.str());
|
||||
poco_assert (out.bytesWritten() == message.size());
|
||||
poco_assert (message == res);
|
||||
assert (out.bytesWritten() == message.size());
|
||||
assert (message == res);
|
||||
}
|
||||
|
||||
|
||||
@ -108,11 +108,11 @@ void PartialStreamTest::testWritingOne()
|
||||
std::ostringstream ostr;
|
||||
PartialOutputStream out(ostr, prefix.size(), postfix.size());
|
||||
out.write(result.c_str(), static_cast<std::streamsize>(result.length()));
|
||||
poco_assert (out.good());
|
||||
assert (out.good());
|
||||
out.close();
|
||||
std::string res (ostr.str());
|
||||
poco_assert (out.bytesWritten() == message.size());
|
||||
poco_assert (message == res);
|
||||
assert (out.bytesWritten() == message.size());
|
||||
assert (message == res);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// PartialStreamTest.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/PartialStreamTest.h#3 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/PartialStreamTest.h#4 $
|
||||
//
|
||||
// Definition of the PartialStreamTest class.
|
||||
//
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// WinDriver.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/WinDriver.cpp#2 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/WinDriver.cpp#3 $
|
||||
//
|
||||
// Windows test driver for Poco Zip.
|
||||
//
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipTest.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/ZipTest.cpp#6 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/ZipTest.cpp#13 $
|
||||
//
|
||||
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
|
||||
// and Contributors.
|
||||
@ -36,21 +36,12 @@
|
||||
#include "Poco/Zip/ZipArchive.h"
|
||||
#include "Poco/Zip/ZipStream.h"
|
||||
#include "Poco/Zip/Decompress.h"
|
||||
#include "Poco/Zip/ZipCommon.h"
|
||||
#include "Poco/StreamCopier.h"
|
||||
#include "Poco/File.h"
|
||||
#include "Poco/URI.h"
|
||||
#include "Poco/Path.h"
|
||||
#include "Poco/Delegate.h"
|
||||
#include "Poco/Net/HTTPClientSession.h"
|
||||
#include "Poco/Net/HTTPRequest.h"
|
||||
#include "Poco/Net/HTTPResponse.h"
|
||||
#include "Poco/Net/HTTPServer.h"
|
||||
#include "Poco/Net/HTTPServerParams.h"
|
||||
#include "Poco/Net/AbstractHTTPRequestHandler.h"
|
||||
#include "Poco/Net/HTTPRequestHandlerFactory.h"
|
||||
#include "Poco/Net/HTTPServerRequest.h"
|
||||
#include "Poco/Net/HTTPServerResponse.h"
|
||||
#include "Poco/Net/ServerSocket.h"
|
||||
#include "Poco/StreamCopier.h"
|
||||
#include "CppUnit/TestCaller.h"
|
||||
#include "CppUnit/TestSuite.h"
|
||||
@ -59,46 +50,8 @@
|
||||
|
||||
|
||||
using namespace Poco::Zip;
|
||||
using namespace Poco::Net;
|
||||
|
||||
|
||||
|
||||
namespace
|
||||
{
|
||||
class ZipFileRequestHandler: public HTTPRequestHandler
|
||||
{
|
||||
public:
|
||||
ZipFileRequestHandler()
|
||||
{
|
||||
}
|
||||
|
||||
void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
|
||||
{
|
||||
response.setChunkedTransferEncoding(true);
|
||||
std::string testFile = ZipTest::getTestFile("test.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
|
||||
response.setContentType("application/zip");
|
||||
|
||||
std::ostream& ostr = response.send();
|
||||
Poco::StreamCopier::copyStream(inp, ostr);
|
||||
}
|
||||
};
|
||||
|
||||
class RequestHandlerFactory: public HTTPRequestHandlerFactory
|
||||
{
|
||||
public:
|
||||
HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request)
|
||||
{
|
||||
if (request.getURI() == "/test.zip")
|
||||
return new ZipFileRequestHandler;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
ZipTest::ZipTest(const std::string& name): CppUnit::TestCase(name)
|
||||
{
|
||||
}
|
||||
@ -113,17 +66,17 @@ void ZipTest::testSkipSingleFile()
|
||||
{
|
||||
std::string testFile = getTestFile("test.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
assert (inp.good());
|
||||
SkipCallback skip;
|
||||
ZipLocalFileHeader hdr(inp, false, skip);
|
||||
poco_assert (ZipCommon::HS_FAT == hdr.getHostSystem());
|
||||
assert (ZipCommon::HS_FAT == hdr.getHostSystem());
|
||||
int major = hdr.getMajorVersionNumber();
|
||||
int minor = hdr.getMinorVersionNumber();
|
||||
poco_assert (major <= 2);
|
||||
assert (major <= 2);
|
||||
std::size_t hdrSize = hdr.getHeaderSize();
|
||||
poco_assert (hdrSize > 30);
|
||||
assert (hdrSize > 30);
|
||||
ZipCommon::CompressionMethod cm = hdr.getCompressionMethod();
|
||||
poco_assert (!hdr.isEncrypted());
|
||||
assert (!hdr.isEncrypted());
|
||||
Poco::DateTime aDate = hdr.lastModifiedAt();
|
||||
Poco::UInt32 cS = hdr.getCompressedSize();
|
||||
Poco::UInt32 uS = hdr.getUncompressedSize();
|
||||
@ -135,36 +88,36 @@ void ZipTest::testDecompressSingleFile()
|
||||
{
|
||||
std::string testFile = getTestFile("test.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
assert (inp.good());
|
||||
ZipArchive arch(inp);
|
||||
ZipArchive::FileHeaders::const_iterator it = arch.findHeader("Zip_VS71.vcproj");
|
||||
poco_assert (it != arch.headerEnd());
|
||||
ZipArchive::FileHeaders::const_iterator it = arch.findHeader("testfile.txt");
|
||||
assert (it != arch.headerEnd());
|
||||
ZipInputStream zipin (inp, it->second);
|
||||
std::ostringstream out(std::ios::binary);
|
||||
Poco::StreamCopier::copyStream(zipin, out);
|
||||
poco_assert(!out.str().empty());
|
||||
assert(!out.str().empty());
|
||||
}
|
||||
|
||||
|
||||
void ZipTest::testCrcAndSizeAfterData()
|
||||
{
|
||||
std::string testFile = getTestFile("java.zip");
|
||||
std::string testFile = getTestFile("data.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
assert (inp.good());
|
||||
Decompress dec(inp, Poco::Path());
|
||||
dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
dec.decompressAllFiles();
|
||||
dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
poco_assert (_errCnt == 0);
|
||||
poco_assert (!dec.mapping().empty());
|
||||
assert (_errCnt == 0);
|
||||
assert (!dec.mapping().empty());
|
||||
}
|
||||
|
||||
|
||||
void ZipTest::testCrcAndSizeAfterDataWithArchive()
|
||||
{
|
||||
std::string testFile = getTestFile("java.zip");
|
||||
std::string testFile = getTestFile("data.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
assert (inp.good());
|
||||
Poco::Zip::ZipArchive zip(inp);
|
||||
inp.clear();
|
||||
inp.seekg(0);
|
||||
@ -207,13 +160,13 @@ void ZipTest::testDecompress()
|
||||
{
|
||||
std::string testFile = getTestFile("test.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
assert (inp.good());
|
||||
Decompress dec(inp, Poco::Path());
|
||||
dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
dec.decompressAllFiles();
|
||||
dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
poco_assert (_errCnt == 0);
|
||||
poco_assert (!dec.mapping().empty());
|
||||
assert (_errCnt == 0);
|
||||
assert (!dec.mapping().empty());
|
||||
}
|
||||
|
||||
|
||||
@ -221,36 +174,13 @@ void ZipTest::testDecompressFlat()
|
||||
{
|
||||
std::string testFile = getTestFile("test.zip");
|
||||
std::ifstream inp(testFile.c_str(), std::ios::binary);
|
||||
poco_assert (inp);
|
||||
assert (inp.good());
|
||||
Decompress dec(inp, Poco::Path(), true);
|
||||
dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
dec.decompressAllFiles();
|
||||
dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
poco_assert (_errCnt == 0);
|
||||
poco_assert (!dec.mapping().empty());
|
||||
}
|
||||
|
||||
|
||||
void ZipTest::decompressDirectlyFromNet()
|
||||
{
|
||||
ServerSocket svs(22222);
|
||||
HTTPServerParams* pParams = new HTTPServerParams;
|
||||
pParams->setKeepAlive(true);
|
||||
HTTPServer srv(new RequestHandlerFactory, svs, pParams);
|
||||
srv.start();
|
||||
Poco::URI uri("http://localhost:22222/test.zip");
|
||||
|
||||
HTTPClientSession session("localhost", 22222);
|
||||
HTTPRequest req(HTTPRequest::HTTP_GET, "/test.zip", HTTPMessage::HTTP_1_1);
|
||||
session.sendRequest(req);
|
||||
HTTPResponse res;
|
||||
std::istream& rs = session.receiveResponse(res);
|
||||
Decompress dec(rs, Poco::Path());
|
||||
dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
dec.decompressAllFiles();
|
||||
dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
|
||||
poco_assert (_errCnt == 0);
|
||||
poco_assert (!dec.mapping().empty());
|
||||
assert (_errCnt == 0);
|
||||
assert (!dec.mapping().empty());
|
||||
}
|
||||
|
||||
|
||||
@ -279,7 +209,6 @@ CppUnit::Test* ZipTest::suite()
|
||||
CppUnit_addTest(pSuite, ZipTest, testDecompressSingleFile);
|
||||
CppUnit_addTest(pSuite, ZipTest, testDecompress);
|
||||
CppUnit_addTest(pSuite, ZipTest, testDecompressFlat);
|
||||
CppUnit_addTest(pSuite, ZipTest, decompressDirectlyFromNet);
|
||||
CppUnit_addTest(pSuite, ZipTest, testCrcAndSizeAfterData);
|
||||
CppUnit_addTest(pSuite, ZipTest, testCrcAndSizeAfterDataWithArchive);
|
||||
return pSuite;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipTest.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/ZipTest.h#5 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/ZipTest.h#8 $
|
||||
//
|
||||
// Definition of the ZipTest class.
|
||||
//
|
||||
@ -50,7 +50,6 @@ public:
|
||||
void testSkipSingleFile();
|
||||
void testDecompressSingleFile();
|
||||
void testDecompress();
|
||||
void decompressDirectlyFromNet();
|
||||
void testCrcAndSizeAfterData();
|
||||
void testCrcAndSizeAfterDataWithArchive();
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipTestSuite.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/ZipTestSuite.cpp#1 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/ZipTestSuite.cpp#3 $
|
||||
//
|
||||
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
|
||||
// and Contributors.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ZipTestSuite.h
|
||||
//
|
||||
// $Id: //poco/1.3/Zip/testsuite/src/ZipTestSuite.h#1 $
|
||||
// $Id: //poco/Main/Zip/testsuite/src/ZipTestSuite.h#2 $
|
||||
//
|
||||
// Definition of the ZipTestSuite class.
|
||||
//
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user