* contrib/hbziparch/_features.h
* contrib/hbziparch/_platform.h
* contrib/hbziparch/Aes.cpp
* contrib/hbziparch/Aes.h
* contrib/hbziparch/BaseLibCompressor.cpp
* contrib/hbziparch/BaseLibCompressor.h
* contrib/hbziparch/BytesWriter.h
* contrib/hbziparch/Bzip2Compressor.cpp
* contrib/hbziparch/Bzip2Compressor.h
* contrib/hbziparch/DeflateCompressor.cpp
* contrib/hbziparch/DeflateCompressor.h
* contrib/hbziparch/DirEnumerator.cpp
* contrib/hbziparch/DirEnumerator.h
* contrib/hbziparch/FileFilter.cpp
* contrib/hbziparch/FileFilter.h
* contrib/hbziparch/FileInfo.h
* contrib/hbziparch/Hmac.cpp
* contrib/hbziparch/Hmac.h
* contrib/hbziparch/RandomPool.cpp
* contrib/hbziparch/RandomPool.h
* contrib/hbziparch/Sha1.cpp
* contrib/hbziparch/Sha1.h
* contrib/hbziparch/std_mfc.h
* contrib/hbziparch/std_stl.h
* contrib/hbziparch/Wildcard.cpp
* contrib/hbziparch/Wildcard.h
* contrib/hbziparch/ZipAbstractFile.h
* contrib/hbziparch/ZipAesCryptograph.cpp
* contrib/hbziparch/ZipAesCryptograph.h
* contrib/hbziparch/ZipArchive.cpp
* contrib/hbziparch/ZipArchive.h
* contrib/hbziparch/ZipAutoBuffer.cpp
* contrib/hbziparch/ZipAutoBuffer.h
* contrib/hbziparch/ZipBaseException.h
* contrib/hbziparch/ZipCallback.h
* contrib/hbziparch/ZipCallbackProvider.h
* contrib/hbziparch/ZipCentralDir.cpp
* contrib/hbziparch/ZipCentralDir.h
* contrib/hbziparch/ZipCollections.h
* contrib/hbziparch/ZipCollections_mfc.h
* contrib/hbziparch/ZipCollections_stl.h
* contrib/hbziparch/ZipCompatibility.cpp
* contrib/hbziparch/ZipCompatibility.h
* contrib/hbziparch/ZipCompressor.cpp
* contrib/hbziparch/ZipCompressor.h
* contrib/hbziparch/ZipCrc32Cryptograph.cpp
* contrib/hbziparch/ZipCrc32Cryptograph.h
* contrib/hbziparch/ZipCryptograph.cpp
* contrib/hbziparch/ZipCryptograph.h
* contrib/hbziparch/ZipException.cpp
* contrib/hbziparch/ZipException.h
* contrib/hbziparch/ZipExtraData.cpp
* contrib/hbziparch/ZipExtraData.h
* contrib/hbziparch/ZipExtraField.cpp
* contrib/hbziparch/ZipExtraField.h
* contrib/hbziparch/ZipFile.h
* contrib/hbziparch/ZipFile_mfc.cpp
* contrib/hbziparch/ZipFile_mfc.h
* contrib/hbziparch/ZipFile_stl.cpp
* contrib/hbziparch/ZipFile_stl.h
* contrib/hbziparch/ZipFileHeader.cpp
* contrib/hbziparch/ZipFileHeader.h
* contrib/hbziparch/ZipFileMapping.h
* contrib/hbziparch/ZipFileMapping_lnx.h
* contrib/hbziparch/ZipFileMapping_win.h
* contrib/hbziparch/ZipMemFile.cpp
* contrib/hbziparch/ZipMemFile.h
* contrib/hbziparch/ZipMutex.h
* contrib/hbziparch/ZipMutex_lnx.h
* contrib/hbziparch/ZipMutex_win.h
* contrib/hbziparch/ZipPathComponent.h
* contrib/hbziparch/ZipPlatform.h
* contrib/hbziparch/ZipPlatformComm.cpp
* contrib/hbziparch/ZipStorage.cpp
* contrib/hbziparch/ZipStorage.h
* contrib/hbziparch/ZipString.h
* contrib/hbziparch/ZipString_mfc.h
* contrib/hbziparch/ZipString_stl.h
* contrib/hbziparch/ZipStringStoreSettings.h
+ ZipArchive lib update finished.
; Pass 2/2
; Please test.
105 lines
2.8 KiB
C++
105 lines
2.8 KiB
C++
////////////////////////////////////////////////////////////////////////////////
|
|
// This source file is part of the ZipArchive library source distribution and
|
|
// is Copyrighted 2000 - 2007 by Artpol Software - Tadeusz Dracz
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU General Public License
|
|
// as published by the Free Software Foundation; either version 2
|
|
// of the License, or (at your option) any later version.
|
|
//
|
|
// For the licensing details refer to the License.txt file.
|
|
//
|
|
// Web Site: http://www.artpol-software.com
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "stdafx.h"
|
|
#include "ZipCompressor.h"
|
|
#include "BytesWriter.h"
|
|
#include "DeflateCompressor.h"
|
|
|
|
using namespace ZipArchiveLib;
|
|
|
|
CZipCompressor* CZipCompressor::CreateCompressor(WORD uMethod, CZipStorage* pStorage)
|
|
{
|
|
if (uMethod == methodStore || uMethod == methodDeflate)
|
|
return new CDeflateCompressor(pStorage);
|
|
return NULL;
|
|
}
|
|
|
|
void CZipCompressor::UpdateFileCrc(const void *pBuffer, DWORD uSize)
|
|
{
|
|
m_pFile->m_uCrc32 = zarch_crc32(m_pFile->m_uCrc32, (zarch_Bytef*)pBuffer, uSize);
|
|
}
|
|
|
|
void CZipCompressor::UpdateCrc(const void *pBuffer, DWORD uSize)
|
|
{
|
|
m_uCrc32 = zarch_crc32(m_uCrc32, (zarch_Bytef*)pBuffer, uSize);
|
|
}
|
|
|
|
void CZipCompressor::UpdateOptions(const COptionsMap& optionsMap)
|
|
{
|
|
const COptions* pOptions = GetOptions();
|
|
if (pOptions == NULL)
|
|
return;
|
|
const COptions* pNewOptions = optionsMap.Get(pOptions->GetType());
|
|
if (pNewOptions != NULL)
|
|
UpdateOptions(pNewOptions);
|
|
}
|
|
|
|
void CZipCompressor::InitBuffer()
|
|
{
|
|
// This should be greated that 64k for deflate when creating offsets pairs is enabled
|
|
// otherwise deflate will not be able to write one block in one go and will never report
|
|
// a flushed block for low-compressable data
|
|
const COptions* pOptions = GetOptions();
|
|
DWORD bufferSize = 0;
|
|
if (pOptions != NULL)
|
|
bufferSize = pOptions->m_iBufferSize;
|
|
if (bufferSize == 0)
|
|
bufferSize = COptions::cDefaultBufferSize;
|
|
m_pBuffer.Allocate(bufferSize);
|
|
}
|
|
|
|
|
|
void CZipCompressor::COptionsMap::Set(const CZipCompressor::COptions* pOptions)
|
|
{
|
|
if (pOptions == NULL)
|
|
return;
|
|
int iType = pOptions->GetType();
|
|
Remove(iType);
|
|
SetAt(iType, pOptions->Clone());
|
|
}
|
|
|
|
CZipCompressor::COptions* CZipCompressor::COptionsMap::Get(int iType) const
|
|
{
|
|
COptions* pTemp = NULL;
|
|
if (Lookup(iType, pTemp))
|
|
return pTemp;
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
void CZipCompressor::COptionsMap::Remove(int iType)
|
|
{
|
|
COptions* pTemp = Get(iType);
|
|
if (pTemp != NULL)
|
|
{
|
|
delete pTemp;
|
|
RemoveKey(iType);
|
|
}
|
|
}
|
|
|
|
CZipCompressor::COptionsMap::~COptionsMap()
|
|
{
|
|
COptionsMap::iterator iter = GetStartPosition();
|
|
while (IteratorValid(iter))
|
|
{
|
|
COptions* pOptions = NULL;
|
|
int iType = 0;
|
|
GetNextAssoc(iter, iType, pOptions);
|
|
delete pOptions;
|
|
}
|
|
RemoveAll();
|
|
}
|
|
|