xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 15:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.63

Browse Source
This commit is contained in:
Igor Pavlov
2008-12-31 00:00:00 +00:00
committed by Kornel Lesiński
parent c1f1243a70
commit 3a524e5ba2
259 changed files with 2792 additions and 4855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
C/7zVersion.h
View File

@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 4
#define MY_VER_MINOR 62
#define MY_VER_MINOR 63
#define MY_VER_BUILD 0
#define MY_VERSION "4.62"
#define MY_DATE "2008-12-02"
#define MY_VERSION "4.63"
#define MY_DATE "2008-12-31"
#define MY_COPYRIGHT ": Igor Pavlov : Public domain"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE

60
C/Archive/7z/7zIn.c
View File

@@ -1,5 +1,5 @@
/* 7zIn.c -- 7z Input functions
2008-11-23 : Igor Pavlov : Public domain */
2008-12-31 : Igor Pavlov : Public domain */
#include "../../7zCrc.h"
#include "../../CpuArch.h"
@@ -9,6 +9,9 @@
#define RINOM(x) { if ((x) == 0) return SZ_ERROR_MEM; }
#define NUM_FOLDER_CODERS_MAX 32
#define NUM_CODER_STREAMS_MAX 32
void SzArEx_Init(CSzArEx *p)
{
SzAr_Init(&p->db);
@@ -409,15 +412,14 @@ static SRes SzReadSwitch(CSzData *sd)
static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
{
UInt32 numCoders;
UInt32 numBindPairs;
UInt32 numPackedStreams;
UInt32 i;
UInt32 numInStreams = 0;
UInt32 numOutStreams = 0;
UInt32 numCoders, numBindPairs, numPackStreams, i;
UInt32 numInStreams = 0, numOutStreams = 0;
RINOK(SzReadNumber32(sd, &numCoders));
if (numCoders > NUM_FOLDER_CODERS_MAX)
return SZ_ERROR_UNSUPPORTED;
folder->NumCoders = numCoders;
MY_ALLOC(CSzCoderInfo, folder->Coders, (size_t)numCoders, alloc);
for (i = 0; i < numCoders; i++)
@@ -443,6 +445,9 @@ static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
{
RINOK(SzReadNumber32(sd, &coder->NumInStreams));
RINOK(SzReadNumber32(sd, &coder->NumOutStreams));
if (coder->NumInStreams > NUM_CODER_STREAMS_MAX ||
coder->NumOutStreams > NUM_CODER_STREAMS_MAX)
return SZ_ERROR_UNSUPPORTED;
}
else
{
@@ -475,41 +480,40 @@ static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
RINOK(SzSkeepDataSize(sd, propertiesSize));
}
}
numInStreams += (UInt32)coder->NumInStreams;
numOutStreams += (UInt32)coder->NumOutStreams;
numInStreams += coder->NumInStreams;
numOutStreams += coder->NumOutStreams;
}
numBindPairs = numOutStreams - 1;
folder->NumBindPairs = numBindPairs;
if (numOutStreams == 0)
return SZ_ERROR_UNSUPPORTED;
folder->NumBindPairs = numBindPairs = numOutStreams - 1;
MY_ALLOC(CBindPair, folder->BindPairs, (size_t)numBindPairs, alloc);
for (i = 0; i < numBindPairs; i++)
{
CBindPair *bindPair = folder->BindPairs + i;
RINOK(SzReadNumber32(sd, &bindPair->InIndex));
RINOK(SzReadNumber32(sd, &bindPair->OutIndex));
CBindPair *bp = folder->BindPairs + i;
RINOK(SzReadNumber32(sd, &bp->InIndex));
RINOK(SzReadNumber32(sd, &bp->OutIndex));
}
numPackedStreams = numInStreams - (UInt32)numBindPairs;
if (numInStreams < numBindPairs)
return SZ_ERROR_UNSUPPORTED;
folder->NumPackStreams = numPackedStreams;
MY_ALLOC(UInt32, folder->PackStreams, (size_t)numPackedStreams, alloc);
folder->NumPackStreams = numPackStreams = numInStreams - numBindPairs;
MY_ALLOC(UInt32, folder->PackStreams, (size_t)numPackStreams, alloc);
if (numPackedStreams == 1)
if (numPackStreams == 1)
{
UInt32 j;
UInt32 pi = 0;
for (j = 0; j < numInStreams; j++)
if (SzFolder_FindBindPairForInStream(folder, j) < 0)
{
folder->PackStreams[pi++] = j;
for (i = 0; i < numInStreams ; i++)
if (SzFolder_FindBindPairForInStream(folder, i) < 0)
break;
}
if (i == numInStreams)
return SZ_ERROR_UNSUPPORTED;
folder->PackStreams[0] = i;
}
else
for (i = 0; i < numPackedStreams; i++)
for (i = 0; i < numPackStreams; i++)
{
RINOK(SzReadNumber32(sd, folder->PackStreams + i));
}

21
CPP/7zip/Archive/7z/7zDecode.cpp
View File

@@ -2,15 +2,12 @@
#include "StdAfx.h"
#include "7zDecode.h"
#include "../../IPassword.h"
#include "../../Common/LockedStream.h"
#include "../../Common/StreamObjects.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/FilterCoder.h"
#include "../../Common/LockedStream.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/StreamObjects.h"
#include "7zDecode.h"
namespace NArchive {
namespace N7z {
@@ -105,6 +102,8 @@ HRESULT CDecoder::Decode(
#endif
)
{
if (!folderInfo.CheckStructure())
return E_NOTIMPL;
#ifndef _NO_CRYPTO
passwordIsDefined = false;
#endif
@@ -229,13 +228,13 @@ HRESULT CDecoder::Decode(
decoder.QueryInterface(IID_ICompressSetDecoderProperties2, &setDecoderProperties);
if (setDecoderProperties)
{
const CByteBuffer &properties = coderInfo.Properties;
size_t size = properties.GetCapacity();
const CByteBuffer &props = coderInfo.Props;
size_t size = props.GetCapacity();
if (size > 0xFFFFFFFF)
return E_NOTIMPL;
if (size > 0)
{
RINOK(setDecoderProperties->SetDecoderProperties2((const Byte *)properties, (UInt32)size));
RINOK(setDecoderProperties->SetDecoderProperties2((const Byte *)props, (UInt32)size));
}
}
}

6
CPP/7zip/Archive/7z/7zEncode.cpp
View File

@@ -233,8 +233,8 @@ HRESULT CEncoder::Encode(
outStreamSpec->Init();
writeCoderProperties->WriteCoderProperties(outStream);
size_t size = outStreamSpec->GetSize();
encodingInfo.Properties.SetCapacity(size);
memmove(encodingInfo.Properties, outStreamSpec->GetBuffer(), size);
encodingInfo.Props.SetCapacity(size);
memmove(encodingInfo.Props, outStreamSpec->GetBuffer(), size);
}
}
@@ -278,7 +278,7 @@ HRESULT CEncoder::Encode(
folderItem.UnpackSizes.Add(streamSize);
}
for (i = numMethods - 1; i >= 0; i--)
folderItem.Coders[numMethods - 1 - i].Properties = _codersInfo[i].Properties;
folderItem.Coders[numMethods - 1 - i].Props = _codersInfo[i].Props;
return S_OK;
}

53
CPP/7zip/Archive/7z/7zHandler.cpp
View File

@@ -2,25 +2,29 @@
#include "StdAfx.h"
#include "7zHandler.h"
#include "7zProperties.h"
extern "C"
{
#include "../../../../C/CpuArch.h"
}
#include "../../../Common/IntToString.h"
#include "../../../Common/ComTry.h"
#include "../../../Windows/Defs.h"
#include "../../../Common/IntToString.h"
#ifdef COMPRESS_MT
#include "../../../Windows/System.h"
#endif
#include "../Common/ItemNameUtils.h"
#include "7zHandler.h"
#include "7zProperties.h"
#ifdef __7Z_SET_PROPERTIES
#ifdef EXTRACT_ONLY
#include "../Common/ParseProperties.h"
#endif
#endif
#ifdef COMPRESS_MT
#include "../../../Windows/System.h"
#endif
using namespace NWindows;
extern UString ConvertMethodIdToString(UInt64 id);
@@ -191,13 +195,6 @@ static inline UString GetHex2(Byte value)
static const UInt64 k_AES = 0x06F10701;
#ifndef _SFX
static inline UInt32 GetUInt32FromMemLE(const Byte *p)
{
return p[0] | (((UInt32)p[1]) << 8) | (((UInt32)p[2]) << 16) | (((UInt32)p[3]) << 24);
}
#endif
bool CHandler::IsEncrypted(UInt32 index2) const
{
CNum folderIndex = _db.FileIndexToFolderIndexMap[index2];
@@ -291,33 +288,31 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *va
methodsString += methodName;
if (coderInfo.MethodID == k_LZMA)
{
if (coderInfo.Properties.GetCapacity() >= 5)
if (coderInfo.Props.GetCapacity() >= 5)
{
methodsString += L":";
UInt32 dicSize = GetUInt32FromMemLE(
((const Byte *)coderInfo.Properties + 1));
UInt32 dicSize = GetUi32((const Byte *)coderInfo.Props + 1);
methodsString += GetStringForSizeValue(dicSize);
}
}
else if (coderInfo.MethodID == k_PPMD)
{
if (coderInfo.Properties.GetCapacity() >= 5)
if (coderInfo.Props.GetCapacity() >= 5)
{
Byte order = *(const Byte *)coderInfo.Properties;
Byte order = *(const Byte *)coderInfo.Props;
methodsString += L":o";
methodsString += ConvertUInt32ToString(order);
methodsString += L":mem";
UInt32 dicSize = GetUInt32FromMemLE(
((const Byte *)coderInfo.Properties + 1));
UInt32 dicSize = GetUi32((const Byte *)coderInfo.Props + 1);
methodsString += GetStringForSizeValue(dicSize);
}
}
else if (coderInfo.MethodID == k_AES)
{
if (coderInfo.Properties.GetCapacity() >= 1)
if (coderInfo.Props.GetCapacity() >= 1)
{
methodsString += L":";
const Byte *data = (const Byte *)coderInfo.Properties;
const Byte *data = (const Byte *)coderInfo.Props;
Byte firstByte = *data++;
UInt32 numCyclesPower = firstByte & 0x3F;
methodsString += ConvertUInt32ToString(numCyclesPower);
@@ -328,7 +323,7 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *va
return S_OK;
UInt32 saltSize = (firstByte >> 7) & 1;
UInt32 ivSize = (firstByte >> 6) & 1;
if (coderInfo.Properties.GetCapacity() >= 2)
if (coderInfo.Props.GetCapacity() >= 2)
{
Byte secondByte = *data++;
saltSize += (secondByte >> 4);
@@ -340,18 +335,18 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *va
}
else
{
if (coderInfo.Properties.GetCapacity() > 0)
if (coderInfo.Props.GetCapacity() > 0)
{
methodsString += L":[";
for (size_t bi = 0; bi < coderInfo.Properties.GetCapacity(); bi++)
for (size_t bi = 0; bi < coderInfo.Props.GetCapacity(); bi++)
{
if (bi > 5 && bi + 1 < coderInfo.Properties.GetCapacity())
if (bi > 5 && bi + 1 < coderInfo.Props.GetCapacity())
{
methodsString += L"..";
break;
}
else
methodsString += GetHex2(coderInfo.Properties[bi]);
methodsString += GetHex2(coderInfo.Props[bi]);
}
methodsString += L"]";
}

48
CPP/7zip/Archive/7z/7zHandlerOut.cpp
View File

@@ -2,20 +2,20 @@
#include "StdAfx.h"
#include "7zHandler.h"
#include "7zOut.h"
#include "7zUpdate.h"
#include "../../../Windows/PropVariant.h"
#include "../../../Common/ComTry.h"
#include "../../../Common/StringToInt.h"
#include "../../IPassword.h"
#include "../../ICoder.h"
#include "../Common/ItemNameUtils.h"
#include "../Common/ParseProperties.h"
#include "7zHandler.h"
#include "7zOut.h"
#include "7zUpdate.h"
using namespace NWindows;
namespace NArchive {
@@ -85,28 +85,28 @@ HRESULT CHandler::SetCompressionMethod(
COneMethodInfo oneMethodInfo;
oneMethodInfo.MethodName = kLZMAMethodName;
{
CProp property;
property.Id = NCoderPropID::kMatchFinder;
property.Value = kLzmaMatchFinderForHeaders;
oneMethodInfo.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kMatchFinder;
prop.Value = kLzmaMatchFinderForHeaders;
oneMethodInfo.Props.Add(prop);
}
{
CProp property;
property.Id = NCoderPropID::kAlgorithm;
property.Value = kAlgorithmForHeaders;
oneMethodInfo.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kAlgorithm;
prop.Value = kAlgorithmForHeaders;
oneMethodInfo.Props.Add(prop);
}
{
CProp property;
property.Id = NCoderPropID::kNumFastBytes;
property.Value = UInt32(kNumFastBytesForHeaders);
oneMethodInfo.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kNumFastBytes;
prop.Value = (UInt32)kNumFastBytesForHeaders;
oneMethodInfo.Props.Add(prop);
}
{
CProp property;
property.Id = NCoderPropID::kDictionarySize;
property.Value = UInt32(kDictionaryForHeaders);
oneMethodInfo.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kDictionarySize;
prop.Value = (UInt32)kDictionaryForHeaders;
oneMethodInfo.Props.Add(prop);
}
headerMethodInfoVector.Add(oneMethodInfo);
HRESULT res = SetCompressionMethod(headerMethod, headerMethodInfoVector
@@ -155,14 +155,14 @@ HRESULT CHandler::SetCompressionMethod(
EXTERNAL_CODECS_VARS
oneMethodInfo.MethodName, methodFull.Id, methodFull.NumInStreams, methodFull.NumOutStreams))
return E_INVALIDARG;
methodFull.Properties = oneMethodInfo.Properties;
methodFull.Props = oneMethodInfo.Props;
methodMode.Methods.Add(methodFull);
if (!_numSolidBytesDefined)
{
for (int j = 0; j < methodFull.Properties.Size(); j++)
for (int j = 0; j < methodFull.Props.Size(); j++)
{
const CProp &prop = methodFull.Properties[j];
const CProp &prop = methodFull.Props[j];
if ((prop.Id == NCoderPropID::kDictionarySize ||
prop.Id == NCoderPropID::kUsedMemorySize) && prop.Value.vt == VT_UI4)
{

171
CPP/7zip/Archive/7z/7zIn.cpp
View File

@@ -2,16 +2,18 @@
#include "StdAfx.h"
#include "7zIn.h"
#include "7zDecode.h"
#include "../../Common/StreamObjects.h"
#include "../../Common/StreamUtils.h"
extern "C"
{
#include "../../../../C/7zCrc.h"
#include "../../../../C/CpuArch.h"
}
#include "../../Common/StreamObjects.h"
#include "../../Common/StreamUtils.h"
#include "7zDecode.h"
#include "7zIn.h"
#define Get16(p) GetUi16(p)
#define Get32(p) GetUi32(p)
#define Get64(p) GetUi64(p)
@@ -24,6 +26,86 @@ extern "C"
namespace NArchive {
namespace N7z {
static void BoolVector_Fill_False(CBoolVector &v, int size)
{
v.Clear();
v.Reserve(size);
for (int i = 0; i < size; i++)
v.Add(false);
}
static bool BoolVector_GetAndSet(CBoolVector &v, UInt32 index)
{
if (index >= (UInt32)v.Size())
return true;
bool res = v[index];
v[index] = true;
return res;
}
bool CFolder::CheckStructure() const
{
const int kNumCodersMax = sizeof(UInt32) * 8; // don't change it
const int kMaskSize = sizeof(UInt32) * 8; // it must be >= kNumCodersMax
const int kNumBindsMax = 32;
if (Coders.Size() > kNumCodersMax || BindPairs.Size() > kNumBindsMax)
return false;
{
CBoolVector v;
BoolVector_Fill_False(v, BindPairs.Size() + PackStreams.Size());
int i;
for (i = 0; i < BindPairs.Size(); i++)
if (BoolVector_GetAndSet(v, BindPairs[i].InIndex))
return false;
for (i = 0; i < PackStreams.Size(); i++)
if (BoolVector_GetAndSet(v, PackStreams[i]))
return false;
BoolVector_Fill_False(v, UnpackSizes.Size());
for (i = 0; i < BindPairs.Size(); i++)
if (BoolVector_GetAndSet(v, BindPairs[i].OutIndex))
return false;
}
UInt32 mask[kMaskSize];
int i;
for (i = 0; i < kMaskSize; i++)
mask[i] = 0;
{
CIntVector inStreamToCoder, outStreamToCoder;
for (i = 0; i < Coders.Size(); i++)
{
CNum j;
const CCoderInfo &coder = Coders[i];
for (j = 0; j < coder.NumInStreams; j++)
inStreamToCoder.Add(i);
for (j = 0; j < coder.NumOutStreams; j++)
outStreamToCoder.Add(i);
}
for (i = 0; i < BindPairs.Size(); i++)
{
const CBindPair &bp = BindPairs[i];
mask[inStreamToCoder[bp.InIndex]] |= (1 << outStreamToCoder[bp.OutIndex]);
}
}
for (i = 0; i < kMaskSize; i++)
for (int j = 0; j < kMaskSize; j++)
if (((1 << j) & mask[i]) != 0)
mask[i] |= mask[j];
for (i = 0; i < kMaskSize; i++)
if (((1 << i) & mask[i]) != 0)
return false;
return true;
}
class CInArchiveException {};
static void ThrowException() { throw CInArchiveException(); }
@@ -323,9 +405,9 @@ void CInArchive::GetNextFolderItem(CFolder &folder)
}
if ((mainByte & 0x20) != 0)
{
CNum propertiesSize = ReadNum();
coder.Properties.SetCapacity((size_t)propertiesSize);
ReadBytes((Byte *)coder.Properties, (size_t)propertiesSize);
CNum propsSize = ReadNum();
coder.Props.SetCapacity((size_t)propsSize);
ReadBytes((Byte *)coder.Props, (size_t)propsSize);
}
if ((mainByte & 0x80) != 0)
ThrowUnsupported();
@@ -334,31 +416,34 @@ void CInArchive::GetNextFolderItem(CFolder &folder)
numOutStreams += coder.NumOutStreams;
}
CNum numBindPairs;
numBindPairs = numOutStreams - 1;
CNum numBindPairs = numOutStreams - 1;
folder.BindPairs.Clear();
folder.BindPairs.Reserve(numBindPairs);
for (i = 0; i < numBindPairs; i++)
{
CBindPair bindPair;
bindPair.InIndex = ReadNum();
bindPair.OutIndex = ReadNum();
folder.BindPairs.Add(bindPair);
CBindPair bp;
bp.InIndex = ReadNum();
bp.OutIndex = ReadNum();
folder.BindPairs.Add(bp);
}
CNum numPackedStreams = numInStreams - numBindPairs;
folder.PackStreams.Reserve(numPackedStreams);
if (numPackedStreams == 1)
if (numInStreams < numBindPairs)
ThrowUnsupported();
CNum numPackStreams = numInStreams - numBindPairs;
folder.PackStreams.Reserve(numPackStreams);
if (numPackStreams == 1)
{
for (CNum j = 0; j < numInStreams; j++)
if (folder.FindBindPairForInStream(j) < 0)
for (i = 0; i < numInStreams; i++)
if (folder.FindBindPairForInStream(i) < 0)
{
folder.PackStreams.Add(j);
folder.PackStreams.Add(i);
break;
}
if (folder.PackStreams.Size() != 1)
ThrowUnsupported();
}
else
for (i = 0; i < numPackedStreams; i++)
for (i = 0; i < numPackStreams; i++)
folder.PackStreams.Add(ReadNum());
}
@@ -376,7 +461,7 @@ void CInArchive::WaitAttribute(UInt64 attribute)
}
void CInArchive::ReadHashDigests(int numItems,
CRecordVector<bool> &digestsDefined,
CBoolVector &digestsDefined,
CRecordVector<UInt32> &digests)
{
ReadBoolVector2(numItems, digestsDefined);
@@ -394,7 +479,7 @@ void CInArchive::ReadHashDigests(int numItems,
void CInArchive::ReadPackInfo(
UInt64 &dataOffset,
CRecordVector<UInt64> &packSizes,
CRecordVector<bool> &packCRCsDefined,
CBoolVector &packCRCsDefined,
CRecordVector<UInt32> &packCRCs)
{
dataOffset = ReadNumber();
@@ -421,15 +506,11 @@ void CInArchive::ReadPackInfo(
}
if (packCRCsDefined.IsEmpty())
{
packCRCsDefined.Reserve(numPackStreams);
packCRCsDefined.Clear();
BoolVector_Fill_False(packCRCsDefined, numPackStreams);
packCRCs.Reserve(numPackStreams);
packCRCs.Clear();
for (CNum i = 0; i < numPackStreams; i++)
{
packCRCsDefined.Add(false);
packCRCs.Add(0);
}
}
}
@@ -471,7 +552,7 @@ void CInArchive::ReadUnpackInfo(
return;
if (type == NID::kCRC)
{
CRecordVector<bool> crcsDefined;
CBoolVector crcsDefined;
CRecordVector<UInt32> crcs;
ReadHashDigests(numFolders, crcsDefined, crcs);
for (i = 0; i < numFolders; i++)
@@ -490,7 +571,7 @@ void CInArchive::ReadSubStreamsInfo(
const CObjectVector<CFolder> &folders,
CRecordVector<CNum> &numUnpackStreamsInFolders,
CRecordVector<UInt64> &unpackSizes,
CRecordVector<bool> &digestsDefined,
CBoolVector &digestsDefined,
CRecordVector<UInt32> &digests)
{
numUnpackStreamsInFolders.Clear();
@@ -551,7 +632,7 @@ void CInArchive::ReadSubStreamsInfo(
{
if (type == NID::kCRC)
{
CRecordVector<bool> digestsDefined2;
CBoolVector digestsDefined2;
CRecordVector<UInt32> digests2;
ReadHashDigests(numDigests, digestsDefined2, digests2);
int digestIndex = 0;
@@ -576,13 +657,10 @@ void CInArchive::ReadSubStreamsInfo(
{
if (digestsDefined.IsEmpty())
{
digestsDefined.Clear();
BoolVector_Fill_False(digestsDefined, numDigestsTotal);
digests.Clear();
for (int i = 0; i < numDigestsTotal; i++)
{
digestsDefined.Add(false);
digests.Add(0);
}
}
return;
}
@@ -596,12 +674,12 @@ void CInArchive::ReadStreamsInfo(
const CObjectVector<CByteBuffer> *dataVector,
UInt64 &dataOffset,
CRecordVector<UInt64> &packSizes,
CRecordVector<bool> &packCRCsDefined,
CBoolVector &packCRCsDefined,
CRecordVector<UInt32> &packCRCs,
CObjectVector<CFolder> &folders,
CRecordVector<CNum> &numUnpackStreamsInFolders,
CRecordVector<UInt64> &unpackSizes,
CRecordVector<bool> &digestsDefined,
CBoolVector &digestsDefined,
CRecordVector<UInt32> &digests)
{
for (;;)
@@ -695,13 +773,13 @@ HRESULT CInArchive::ReadAndDecodePackedStreams(
)
{
CRecordVector<UInt64> packSizes;
CRecordVector<bool> packCRCsDefined;
CBoolVector packCRCsDefined;
CRecordVector<UInt32> packCRCs;
CObjectVector<CFolder> folders;
CRecordVector<CNum> numUnpackStreamsInFolders;
CRecordVector<UInt64> unpackSizes;
CRecordVector<bool> digestsDefined;
CBoolVector digestsDefined;
CRecordVector<UInt32> digests;
ReadStreamsInfo(NULL,
@@ -802,7 +880,7 @@ HRESULT CInArchive::ReadHeader(
}
CRecordVector<UInt64> unpackSizes;
CRecordVector<bool> digestsDefined;
CBoolVector digestsDefined;
CRecordVector<UInt32> digests;
if (type == NID::kMainStreamsInfo)
@@ -852,9 +930,7 @@ HRESULT CInArchive::ReadHeader(
db.ArchiveInfo.FileInfoPopIDs.Add(NID::kCRC);
CBoolVector emptyStreamVector;
emptyStreamVector.Reserve((int)numFiles);
for (i = 0; i < numFiles; i++)
emptyStreamVector.Add(false);
BoolVector_Fill_False(emptyStreamVector, (int)numFiles);
CBoolVector emptyFileVector;
CBoolVector antiFileVector;
CNum numEmptyStreams = 0;
@@ -901,13 +977,10 @@ HRESULT CInArchive::ReadHeader(
for (i = 0; i < (CNum)emptyStreamVector.Size(); i++)
if (emptyStreamVector[i])
numEmptyStreams++;
emptyFileVector.Reserve(numEmptyStreams);
antiFileVector.Reserve(numEmptyStreams);
for (i = 0; i < numEmptyStreams; i++)
{
emptyFileVector.Add(false);
antiFileVector.Add(false);
}
BoolVector_Fill_False(emptyFileVector, numEmptyStreams);
BoolVector_Fill_False(antiFileVector, numEmptyStreams);
break;
}
case NID::kEmptyFile: ReadBoolVector(numEmptyStreams, emptyFileVector); break;

14
CPP/7zip/Archive/7z/7zIn.h
View File

@@ -4,8 +4,10 @@
#define __7Z_IN_H
#include "../../../Common/MyCom.h"
#include "../../IStream.h"
#include "../../IPassword.h"
#include "../../IStream.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/InBuffer.h"
@@ -167,12 +169,12 @@ private:
void ReadArchiveProperties(CInArchiveInfo &archiveInfo);
void GetNextFolderItem(CFolder &itemInfo);
void ReadHashDigests(int numItems,
CRecordVector<bool> &digestsDefined, CRecordVector<UInt32> &digests);
CBoolVector &digestsDefined, CRecordVector<UInt32> &digests);
void ReadPackInfo(
UInt64 &dataOffset,
CRecordVector<UInt64> &packSizes,
CRecordVector<bool> &packCRCsDefined,
CBoolVector &packCRCsDefined,
CRecordVector<UInt32> &packCRCs);
void ReadUnpackInfo(
@@ -183,19 +185,19 @@ private:
const CObjectVector<CFolder> &folders,
CRecordVector<CNum> &numUnpackStreamsInFolders,
CRecordVector<UInt64> &unpackSizes,
CRecordVector<bool> &digestsDefined,
CBoolVector &digestsDefined,
CRecordVector<UInt32> &digests);
void ReadStreamsInfo(
const CObjectVector<CByteBuffer> *dataVector,
UInt64 &dataOffset,
CRecordVector<UInt64> &packSizes,
CRecordVector<bool> &packCRCsDefined,
CBoolVector &packCRCsDefined,
CRecordVector<UInt32> &packCRCs,
CObjectVector<CFolder> &folders,
CRecordVector<CNum> &numUnpackStreamsInFolders,
CRecordVector<UInt64> &unpackSizes,
CRecordVector<bool> &digestsDefined,
CBoolVector &digestsDefined,
CRecordVector<UInt32> &digests);

6
CPP/7zip/Archive/7z/7zItem.h
View File

@@ -5,7 +5,9 @@
#include "../../../Common/Buffer.h"
#include "../../../Common/MyString.h"
#include "../../Common/MethodId.h"
#include "7zHeader.h"
namespace NArchive {
@@ -18,7 +20,7 @@ const CNum kNumNoIndex = 0xFFFFFFFF;
struct CCoderInfo
{
CMethodId MethodID;
CByteBuffer Properties;
CByteBuffer Props;
CNum NumInStreams;
CNum NumOutStreams;
bool IsSimpleCoder() const { return (NumInStreams == 1) && (NumOutStreams == 1); }
@@ -80,6 +82,8 @@ struct CFolder
return i;
return -1;
}
bool CheckStructure() const;
};
struct CUInt64DefVector

10
CPP/7zip/Archive/7z/7zOut.cpp
View File

@@ -278,7 +278,7 @@ void COutArchive::WriteFolder(const CFolder &folder)
{
const CCoderInfo &coder = folder.Coders[i];
{
size_t propertiesSize = coder.Properties.GetCapacity();
size_t propsSize = coder.Props.GetCapacity();
UInt64 id = coder.MethodID;
int idSize;
@@ -292,7 +292,7 @@ void COutArchive::WriteFolder(const CFolder &folder)
b = (Byte)(idSize & 0xF);
bool isComplex = !coder.IsSimpleCoder();
b |= (isComplex ? 0x10 : 0);
b |= ((propertiesSize != 0) ? 0x20 : 0 );
b |= ((propsSize != 0) ? 0x20 : 0 );
WriteByte(b);
WriteBytes(longID, idSize);
if (isComplex)
@@ -300,10 +300,10 @@ void COutArchive::WriteFolder(const CFolder &folder)
WriteNumber(coder.NumInStreams);
WriteNumber(coder.NumOutStreams);
}
if (propertiesSize == 0)
if (propsSize == 0)
continue;
WriteNumber(propertiesSize);
WriteBytes(coder.Properties, propertiesSize);
WriteNumber(propsSize);
WriteBytes(coder.Props, propsSize);
}
}
for (i = 0; i < folder.BindPairs.Size(); i++)

53
CPP/7zip/Archive/7z/7zUpdate.cpp
View File

@@ -1,18 +1,19 @@
// UpdateMain.cpp
// 7zUpdate.cpp
#include "StdAfx.h"
#include "7zUpdate.h"
#include "7zFolderInStream.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/ItemNameUtils.h"
#include "7zEncode.h"
#include "7zFolderInStream.h"
#include "7zHandler.h"
#include "7zOut.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/LimitedStreams.h"
#include "../Common/ItemNameUtils.h"
#include "7zUpdate.h"
namespace NArchive {
namespace N7z {
@@ -78,7 +79,7 @@ static int CompareCoders(const CCoderInfo &c1, const CCoderInfo &c2)
RINOZ(MyCompare(c1.NumInStreams, c2.NumInStreams));
RINOZ(MyCompare(c1.NumOutStreams, c2.NumOutStreams));
RINOZ(MyCompare(c1.MethodID, c2.MethodID));
return CompareBuffers(c1.Properties, c2.Properties);
return CompareBuffers(c1.Props, c2.Props);
}
static int CompareBindPairs(const CBindPair &b1, const CBindPair &b2)
@@ -336,28 +337,28 @@ static bool MakeExeMethod(const CCompressionMethodMode &method,
if (!GetMethodFull(k_LZMA, 1, methodFull))
return false;
{
CProp property;
property.Id = NCoderPropID::kAlgorithm;
property.Value = kAlgorithmForBCJ2_LZMA;
methodFull.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kAlgorithm;
prop.Value = kAlgorithmForBCJ2_LZMA;
methodFull.Props.Add(prop);
}
{
CProp property;
property.Id = NCoderPropID::kMatchFinder;
property.Value = kMatchFinderForBCJ2_LZMA;
methodFull.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kMatchFinder;
prop.Value = kMatchFinderForBCJ2_LZMA;
methodFull.Props.Add(prop);
}
{
CProp property;
property.Id = NCoderPropID::kDictionarySize;
property.Value = kDictionaryForBCJ2_LZMA;
methodFull.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kDictionarySize;
prop.Value = kDictionaryForBCJ2_LZMA;
methodFull.Props.Add(prop);
}
{
CProp property;
property.Id = NCoderPropID::kNumFastBytes;
property.Value = kNumFastBytesForBCJ2_LZMA;
methodFull.Properties.Add(property);
CProp prop;
prop.Id = NCoderPropID::kNumFastBytes;
prop.Value = kNumFastBytesForBCJ2_LZMA;
methodFull.Props.Add(prop);
}
exeMethod.Methods.Add(methodFull);

10
CPP/7zip/Archive/ArjHandler.cpp
View File

@@ -16,11 +16,9 @@
#include "../Common/StreamObjects.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Arj/ArjDecoder1.h"
#include "../Compress/Arj/ArjDecoder2.h"
#include "../Compress/Copy/CopyCoder.h"
#include "IArchive.h"
#include "../Compress/ArjDecoder1.h"
#include "../Compress/ArjDecoder2.h"
#include "../Compress/CopyCoder.h"
#include "Common/ItemNameUtils.h"
#include "Common/OutStreamWithCRC.h"
@@ -427,7 +425,7 @@ HRESULT CInArchive::GetNextItem(bool &filled, CItem &item)
/*
UInt32 extraData;
if ((header.Flags & NFileHeader::NFlags::kExtFile) != 0)
extraData = GetUInt32FromMemLE(_block + pos);
extraData = GetUi32(_block + pos);
*/
RINOK(SkeepExtendedHeaders());

8
CPP/7zip/Archive/BZip2/BZip2Handler.cpp
View File

@@ -3,13 +3,13 @@
#include "StdAfx.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Windows/PropVariant.h"
#include "Windows/Defs.h"
#include "Windows/PropVariant.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/StreamUtils.h"
#include "../../Common/CreateCoder.h"
#include "../Common/DummyOutStream.h"
#include "BZip2Handler.h"

2
CPP/7zip/Archive/BZip2/BZip2HandlerOut.cpp
View File

@@ -9,7 +9,7 @@
#include "Windows/PropVariant.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/ParseProperties.h"

20
CPP/7zip/Archive/Cab/CabHandler.cpp
View File

@@ -2,27 +2,27 @@
#include "StdAfx.h"
#include "Common/StringConvert.h"
#include "Common/Defs.h"
#include "Common/UTFConvert.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/IntToString.h"
#include "Common/StringConvert.h"
#include "Common/UTFConvert.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "CabHandler.h"
#include "CabBlockInStream.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/Deflate/DeflateDecoder.h"
#include "../../Compress/Lzx/LzxDecoder.h"
#include "../../Compress/Quantum/QuantumDecoder.h"
#include "../../Compress/CopyCoder.h"
#include "../../Compress/DeflateDecoder.h"
#include "../../Compress/LzxDecoder.h"
#include "../../Compress/QuantumDecoder.h"
#include "../Common/ItemNameUtils.h"
#include "CabBlockInStream.h"
#include "CabHandler.h"
using namespace NWindows;
namespace NArchive {

15
CPP/7zip/Archive/Chm/ChmHandler.cpp
View File

@@ -1,27 +1,26 @@
// Chm/Handler.cpp
// ChmHandler.cpp
#include "StdAfx.h"
#include "Common/StringConvert.h"
#include "Common/Defs.h"
#include "Common/UTFConvert.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/UTFConvert.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/StreamUtils.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/StreamUtils.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/Lzx/LzxDecoder.h"
#include "../../Compress/CopyCoder.h"
#include "../../Compress/LzxDecoder.h"
#include "../Common/ItemNameUtils.h"
#include "ChmHandler.h"
using namespace NWindows;
using namespace NTime;

76
CPP/7zip/Archive/Common/HandlerOut.cpp
View File

@@ -1,17 +1,21 @@
// HandlerOutCommon.cpp
// HandlerOut.cpp
#include "StdAfx.h"
#include "HandlerOut.h"
#include "../../../Windows/PropVariant.h"
#include "../../../Common/StringToInt.h"
#include "../../ICoder.h"
#include "../Common/ParseProperties.h"
#include "../../../Windows/PropVariant.h"
#ifdef COMPRESS_MT
#include "../../../Windows/System.h"
#endif
#include "../../ICoder.h"
#include "../Common/ParseProperties.h"
#include "HandlerOut.h"
using namespace NWindows;
namespace NArchive {
@@ -161,13 +165,13 @@ static int FindPropIdFromStringName(const UString &name)
static void SetOneMethodProp(COneMethodInfo &oneMethodInfo, PROPID propID,
const NWindows::NCOM::CPropVariant &value)
{
for (int j = 0; j < oneMethodInfo.Properties.Size(); j++)
if (oneMethodInfo.Properties[j].Id == propID)
for (int j = 0; j < oneMethodInfo.Props.Size(); j++)
if (oneMethodInfo.Props[j].Id == propID)
return;
CProp property;
property.Id = propID;
property.Value = value;
oneMethodInfo.Properties.Add(property);
CProp prop;
prop.Id = propID;
prop.Value = value;
oneMethodInfo.Props.Add(prop);
}
void COutHandler::SetCompressionMethod2(COneMethodInfo &oneMethodInfo
@@ -311,19 +315,16 @@ static void SplitParam(const UString &param, UString &name, UString &value)
HRESULT COutHandler::SetParam(COneMethodInfo &oneMethodInfo, const UString &name, const UString &value)
{
CProp property;
if (
name.CompareNoCase(L"D") == 0 ||
name.CompareNoCase(L"MEM") == 0)
CProp prop;
if (name.CompareNoCase(L"D") == 0 ||
name.CompareNoCase(L"MEM") == 0)
{
UInt32 dicSize;
RINOK(ParsePropDictionaryValue(value, dicSize));
if (name.CompareNoCase(L"D") == 0)
property.Id = NCoderPropID::kDictionarySize;
else
property.Id = NCoderPropID::kUsedMemorySize;
property.Value = dicSize;
oneMethodInfo.Properties.Add(property);
prop.Id = (name.CompareNoCase(L"D") == 0) ?
NCoderPropID::kDictionarySize :
NCoderPropID::kUsedMemorySize;
prop.Value = dicSize;
}
else
{
@@ -332,7 +333,7 @@ HRESULT COutHandler::SetParam(COneMethodInfo &oneMethodInfo, const UString &name
return E_INVALIDARG;
const CNameToPropID &nameToPropID = g_NameToPropID[index];
property.Id = nameToPropID.PropID;
prop.Id = nameToPropID.PropID;
NCOM::CPropVariant propValue;
@@ -354,11 +355,10 @@ HRESULT COutHandler::SetParam(COneMethodInfo &oneMethodInfo, const UString &name
propValue = value;
}
if (!ConvertProperty(propValue, nameToPropID.VarType, property.Value))
if (!ConvertProperty(propValue, nameToPropID.VarType, prop.Value))
return E_INVALIDARG;
oneMethodInfo.Properties.Add(property);
}
oneMethodInfo.Props.Add(prop);
return S_OK;
}
@@ -576,14 +576,13 @@ HRESULT COutHandler::SetProperty(const wchar_t *nameSpec, const PROPVARIANT &val
}
else
{
CProp property;
CProp prop;
if (realName.Left(1).CompareNoCase(L"D") == 0)
{
UInt32 dicSize;
RINOK(ParsePropDictionaryValue(realName.Mid(1), value, dicSize));
property.Id = NCoderPropID::kDictionarySize;
property.Value = dicSize;
oneMethodInfo.Properties.Add(property);
prop.Id = NCoderPropID::kDictionarySize;
prop.Value = dicSize;
if (number <= mainDicMethodIndex)
mainDicSize = dicSize;
}
@@ -591,17 +590,15 @@ HRESULT COutHandler::SetProperty(const wchar_t *nameSpec, const PROPVARIANT &val
{
UInt32 blockSize;
RINOK(ParsePropDictionaryValue(realName.Mid(1), value, blockSize));
property.Id = NCoderPropID::kBlockSize;
property.Value = blockSize;
oneMethodInfo.Properties.Add(property);
prop.Id = NCoderPropID::kBlockSize;
prop.Value = blockSize;
}
else if (realName.Left(3).CompareNoCase(L"MEM") == 0)
{
UInt32 dicSize;
RINOK(ParsePropDictionaryValue(realName.Mid(3), value, dicSize));
property.Id = NCoderPropID::kUsedMemorySize;
property.Value = dicSize;
oneMethodInfo.Properties.Add(property);
prop.Id = NCoderPropID::kUsedMemorySize;
prop.Value = dicSize;
if (number <= mainDicMethodIndex)
mainDicSize = dicSize;
}
@@ -610,15 +607,12 @@ HRESULT COutHandler::SetProperty(const wchar_t *nameSpec, const PROPVARIANT &val
int index = FindPropIdFromStringName(realName);
if (index < 0)
return E_INVALIDARG;
const CNameToPropID &nameToPropID = g_NameToPropID[index];
property.Id = nameToPropID.PropID;
if (!ConvertProperty(value, nameToPropID.VarType, property.Value))
prop.Id = nameToPropID.PropID;
if (!ConvertProperty(value, nameToPropID.VarType, prop.Value))
return E_INVALIDARG;
oneMethodInfo.Properties.Add(property);
}
oneMethodInfo.Props.Add(prop);
}
return S_OK;
}

4
CPP/7zip/Archive/Common/HandlerOut.h
View File

@@ -3,14 +3,14 @@
#ifndef __HANDLER_OUT_H
#define __HANDLER_OUT_H
#include "../../Common/MethodProps.h"
#include "../../../Common/MyString.h"
#include "../../Common/MethodProps.h"
namespace NArchive {
struct COneMethodInfo
{
CObjectVector<CProp> Properties;
CObjectVector<CProp> Props;
UString MethodName;
};

4
CPP/7zip/Archive/Common/OutStreamWithCRC.h
View File

@@ -1,7 +1,7 @@
// OutStreamWithCRC.h
#ifndef __OUTSTREAMWITHCRC_H
#define __OUTSTREAMWITHCRC_H
#ifndef __OUT_STREAM_WITH_CRC_H
#define __OUT_STREAM_WITH_CRC_H
#include "../../../Common/MyCom.h"
#include "../../IStream.h"

6
CPP/7zip/Archive/Common/OutStreamWithSha1.h
View File

@@ -1,14 +1,14 @@
// OutStreamWithSha1.h
#ifndef __OUTSTREAMWITHSHA1_H
#define __OUTSTREAMWITHSHA1_H
#ifndef __OUT_STREAM_WITH_SHA1_H
#define __OUT_STREAM_WITH_SHA1_H
#include "../../../Common/MyCom.h"
#include "../../IStream.h"
#include "../../Crypto/Hash/Sha1.h"
#include "../../Crypto/Sha1.h"
class COutStreamWithSha1:

20
CPP/7zip/Archive/Cpio/CpioHandler.cpp
View File

@@ -1,25 +1,25 @@
// Archive/cpio/Handler.cpp
// CpioHandler.cpp
#include "StdAfx.h"
#include "CpioHandler.h"
#include "CpioIn.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/NewHandler.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/NewHandler.h"
#include "Common/StringConvert.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common//LimitedStreams.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/ItemNameUtils.h"
#include "CpioHandler.h"
#include "CpioIn.h"
using namespace NWindows;
using namespace NTime;

2
CPP/7zip/Archive/DebHandler.cpp
View File

@@ -16,7 +16,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/CopyCoder.h"
#include "Common/ItemNameUtils.h"

6
CPP/7zip/Archive/DmgHandler.cpp
View File

@@ -17,9 +17,9 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/BZip2/BZip2Decoder.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/Deflate/ZlibDecoder.h"
#include "../Compress/BZip2Decoder.h"
#include "../Compress/CopyCoder.h"
#include "../Compress/ZlibDecoder.h"
// #define DMG_SHOW_RAW

2
CPP/7zip/Archive/ElfHandler.cpp
View File

@@ -15,7 +15,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/CopyCoder.h"
#include "Common/DummyOutStream.h"

13
CPP/7zip/Archive/GZip/GZipHandlerOut.cpp
View File

@@ -1,19 +1,20 @@
// Archive/GZip/OutHandler.cpp
// GZipHandlerOut.cpp
#include "StdAfx.h"
#include "GZipHandler.h"
#include "GZipUpdate.h"
#include "Common/StringConvert.h"
#include "Common/StringToInt.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Compress/CopyCoder.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../Common/ParseProperties.h"
#include "GZipHandler.h"
#include "GZipUpdate.h"
using namespace NWindows;
using namespace NTime;

10
CPP/7zip/Archive/GZip/GZipUpdate.cpp
View File

@@ -2,8 +2,6 @@
#include "StdAfx.h"
#include "GZipUpdate.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
@@ -11,12 +9,16 @@
#include "Windows/PropVariant.h"
#include "../../ICoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/CreateCoder.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/InStreamWithCRC.h"
#include "GZipUpdate.h"
namespace NArchive {
namespace NGZip {

16
CPP/7zip/Archive/Iso/IsoHandler.cpp
View File

@@ -1,25 +1,25 @@
// Iso/Handler.cpp
// IsoHandler.cpp
#include "StdAfx.h"
#include "IsoHandler.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/IntToString.h"
#include "Common/NewHandler.h"
#include "Common/ComTry.h"
#include "Common/StringConvert.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/ItemNameUtils.h"
#include "IsoHandler.h"
using namespace NWindows;
using namespace NTime;

11
CPP/7zip/Archive/Lzh/LzhHandler.cpp
View File

@@ -2,23 +2,23 @@
#include "StdAfx.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/ComTry.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "LzhHandler.h"
#include "LzhOutStreamWithCRC.h"
#include "../../ICoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/Lzh/LzhDecoder.h"
#include "../../Compress/CopyCoder.h"
#include "../../Compress/LzhDecoder.h"
#include "../Common/ItemNameUtils.h"
@@ -384,5 +384,4 @@ STDMETHODIMP CHandler::Extract(const UInt32* indices, UInt32 numItems,
COM_TRY_END
}
}}

2
CPP/7zip/Archive/MachoHandler.cpp
View File

@@ -14,7 +14,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/CopyCoder.h"
#include "Common/DummyOutStream.h"

2
CPP/7zip/Archive/MubHandler.cpp
View File

@@ -13,7 +13,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/CopyCoder.h"
#define Get32(p) GetBe32(p)

8
CPP/7zip/Archive/PeHandler.cpp
View File

@@ -16,7 +16,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/CopyCoder.h"
#include "Common/DummyOutStream.h"
@@ -605,7 +605,11 @@ HRESULT CHandler::LoadDebugSections(IInStream *stream, bool &thereIsSection)
}
}
if (i == _sections.Size())
return S_FALSE;
{
return S_OK;
// Exe for ARM requires S_OK
// return S_FALSE;
}
CByteBuffer buffer;
buffer.SetCapacity(debugLink.Size);

22
CPP/7zip/Archive/Rar/RarHandler.cpp
View File

@@ -2,25 +2,29 @@
#include "StdAfx.h"
#include "RarHandler.h"
#include "Common/StringConvert.h"
#include "Common/ComTry.h"
#include "Common/IntToString.h"
#include "Common/StringConvert.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../IPassword.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/MethodId.h"
#include "../../Common/FilterCoder.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Crypto/Rar20/Rar20Cipher.h"
#include "../../Crypto/RarAES/RarAES.h"
#include "../Common/OutStreamWithCRC.h"
#include "../../Common/MethodId.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/CopyCoder.h"
#include "../../Crypto/Rar20Crypto.h"
#include "../../Crypto/RarAes.h"
#include "../Common/ItemNameUtils.h"
#include "../Common/OutStreamWithCRC.h"
#include "RarHandler.h"
using namespace NWindows;
using namespace NTime;

8
CPP/7zip/Archive/Rar/RarIn.h
View File

@@ -5,10 +5,14 @@
#include "Common/DynamicBuffer.h"
#include "Common/MyCom.h"
#include "../../IStream.h"
#include "../../ICoder.h"
#include "../../IStream.h"
#include "../../Common/StreamObjects.h"
#include "../../Crypto/RarAES/RarAES.h"
#include "../../Crypto/RarAes.h"
#include "RarHeader.h"
#include "RarItem.h"

2
CPP/7zip/Archive/RpmHandler.cpp
View File

@@ -13,7 +13,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/CopyCoder.h"
using namespace NWindows;

18
CPP/7zip/Archive/Split/SplitHandler.cpp
View File

@@ -1,22 +1,24 @@
// Tar/Handler.cpp
// SplitHandler.cpp
#include "StdAfx.h"
#include "SplitHandler.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/NewHandler.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/NewHandler.h"
#include "Common/StringConvert.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/ItemNameUtils.h"
#include "../Common/MultiStream.h"
#include "SplitHandler.h"
using namespace NWindows;
using namespace NTime;

34
CPP/7zip/Archive/Tar/TarHandler.cpp
View File

@@ -1,26 +1,26 @@
// Tar/Handler.cpp
// TarHandler.cpp
#include "StdAfx.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/NewHandler.h"
#include "Common/StringConvert.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/DummyOutStream.h"
#include "../Common/ItemNameUtils.h"
#include "TarHandler.h"
#include "TarIn.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/NewHandler.h"
#include "Common/ComTry.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/LimitedStreams.h"
#include "../Common/DummyOutStream.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../Common/ItemNameUtils.h"
using namespace NWindows;
namespace NArchive {

9
CPP/7zip/Archive/Tar/TarUpdate.cpp
View File

@@ -2,13 +2,10 @@
#include "StdAfx.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Windows/Defs.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/LimitedStreams.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/CopyCoder.h"
#include "TarOut.h"
#include "TarUpdate.h"

14
CPP/7zip/Archive/Udf/UdfHandler.cpp
View File

@@ -1,19 +1,21 @@
// Udf/Handler.cpp
// UdfHandler.cpp
#include "StdAfx.h"
#include "UdfHandler.h"
#include "Common/NewHandler.h"
#include "Common/ComTry.h"
#include "Common/NewHandler.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../Common/ProgressUtils.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "../Common/DummyOutStream.h"
#include "UdfHandler.h"
namespace NArchive {
namespace NUdf {

2
CPP/7zip/Archive/Wim/WimIn.cpp
View File

@@ -123,7 +123,7 @@ HRESULT CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outS
{
try { return CodeReal(inStream, outStream, outSize); }
catch(const CInBufferException &e) { return e.ErrorCode; } \
catch(const CLZOutWindowException &e) { return e.ErrorCode; }
catch(const CLzOutWindowException &e) { return e.ErrorCode; }
catch(...) { return S_FALSE; }
}

8
CPP/7zip/Archive/Wim/WimIn.h
View File

@@ -3,11 +3,11 @@
#ifndef __ARCHIVE_WIM_IN_H
#define __ARCHIVE_WIM_IN_H
#include "Common/MyString.h"
#include "Common/Buffer.h"
#include "Common/MyString.h"
#include "../../Compress/Lzx/LzxDecoder.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "../../Compress/LzxDecoder.h"
namespace NArchive {
namespace NWim {
@@ -66,7 +66,7 @@ const UInt32 kMainTableSize = 256 + kNumPosLenSlots;
class CDecoder
{
CBitStream m_InBitStream;
CLZOutWindow m_OutWindowStream;
CLzOutWindow m_OutWindowStream;
NCompress::NHuffman::CDecoder<kNumHuffmanBits, kMainTableSize> m_MainDecoder;
HRESULT CodeSpec(UInt32 size);

6
CPP/7zip/Archive/XarHandler.cpp
View File

@@ -18,9 +18,9 @@
#include "../Common/StreamObjects.h"
#include "../Common/StreamUtils.h"
#include "../Compress/BZip2/BZip2Decoder.h"
#include "../Compress/Copy/CopyCoder.h"
#include "../Compress/Deflate/ZlibDecoder.h"
#include "../Compress/BZip2Decoder.h"
#include "../Compress/CopyCoder.h"
#include "../Compress/ZlibDecoder.h"
#include "Common/OutStreamWithSha1.h"

2
CPP/7zip/Archive/ZHandler.cpp
View File

@@ -10,7 +10,7 @@
#include "../Common/RegisterArc.h"
#include "../Common/StreamUtils.h"
#include "../Compress/Z/ZDecoder.h"
#include "../Compress/ZDecoder.h"
#include "Common/DummyOutStream.h"

17
CPP/7zip/Archive/Zip/ZipAddCommon.cpp
View File

@@ -1,4 +1,4 @@
// AddCommon.cpp
// ZipAddCommon.cpp
#include "StdAfx.h"
@@ -8,14 +8,17 @@ extern "C"
}
#include "Windows/PropVariant.h"
#include "Windows/Defs.h"
#include "../../MyVersion.h"
#include "../../ICoder.h"
#include "../../IPassword.h"
#include "../../MyVersion.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/StreamObjects.h"
#include "../../Common/StreamUtils.h"
#include "../../Compress/LZMA/LZMAEncoder.h"
#include "../../Compress/LzmaEncoder.h"
#include "../Common/InStreamWithCRC.h"
#include "ZipAddCommon.h"
@@ -34,7 +37,7 @@ class CLzmaEncoder:
public ICompressCoder,
public CMyUnknownImp
{
NCompress::NLZMA::CEncoder *EncoderSpec;
NCompress::NLzma::CEncoder *EncoderSpec;
CMyComPtr<ICompressCoder> Encoder;
Byte Header[kLzmaHeaderSize];
public:
@@ -49,7 +52,7 @@ HRESULT CLzmaEncoder::SetCoderProperties(const PROPID *propIDs, const PROPVARIAN
{
if (!Encoder)
{
EncoderSpec = new NCompress::NLZMA::CEncoder;
EncoderSpec = new NCompress::NLzma::CEncoder;
Encoder = EncoderSpec;
}
CSequentialOutStreamImp *outStreamSpec = new CSequentialOutStreamImp;
@@ -153,7 +156,7 @@ HRESULT CAddCommon::Compress(
}
if (_options.IsAesMode)
{
_cryptoStreamSpec->Filter = _aesFilter = _filterAesSpec = new NCrypto::NWzAES::CEncoder;
_cryptoStreamSpec->Filter = _aesFilter = _filterAesSpec = new NCrypto::NWzAes::CEncoder;
_filterAesSpec->SetKeyMode(_options.AesKeyMode);
RINOK(_filterAesSpec->CryptoSetPassword(
(const Byte *)(const char *)_options.Password, _options.Password.Length()));

16
CPP/7zip/Archive/Zip/ZipAddCommon.h
View File

@@ -1,16 +1,18 @@
// Zip/AddCommon.h
// ZipAddCommon.h
#ifndef __ZIP_ADDCOMMON_H
#define __ZIP_ADDCOMMON_H
#ifndef __ZIP_ADD_COMMON_H
#define __ZIP_ADD_COMMON_H
#include "../../ICoder.h"
#include "../../IProgress.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/FilterCoder.h"
#include "../../Crypto/Zip/ZipCipher.h"
#include "../../Crypto/WzAES/WzAES.h"
#include "../../Compress/CopyCoder.h"
#include "../../Crypto/ZipCrypto.h"
#include "../../Crypto/WzAes.h"
#include "ZipCompressionMode.h"
@@ -38,7 +40,7 @@ class CAddCommon
CMyComPtr<ISequentialOutStream> _cryptoStream;
NCrypto::NZip::CEncoder *_filterSpec;
NCrypto::NWzAES::CEncoder *_filterAesSpec;
NCrypto::NWzAes::CEncoder *_filterAesSpec;
CMyComPtr<ICompressFilter> _zipCryptoFilter;
CMyComPtr<ICompressFilter> _aesFilter;

146
CPP/7zip/Archive/Zip/ZipHandler.cpp
View File

@@ -2,40 +2,35 @@
#include "StdAfx.h"
#include "ZipHandler.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/ComTry.h"
#include "Common/Defs.h"
#include "Common/IntToString.h"
#include "Common/StringConvert.h"
#include "Windows/Time.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../IPassword.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/FilterCoder.h"
#include "../../Common/ProgressUtils.h"
#include "../../Common/StreamObjects.h"
#include "../../Common/StreamUtils.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/FilterCoder.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/LZMA/LZMADecoder.h"
#include "../../Compress/CopyCoder.h"
#include "../../Compress/LzmaDecoder.h"
#include "../../Compress/ImplodeDecoder.h"
#include "../../Compress/ShrinkDecoder.h"
#include "../../Crypto/WzAes.h"
#include "../../Crypto/ZipCrypto.h"
#include "../../Crypto/ZipStrong.h"
#include "../Common/ItemNameUtils.h"
#include "../Common/OutStreamWithCRC.h"
#include "../../Compress/Shrink/ShrinkDecoder.h"
#include "../../Compress/Implode/ImplodeDecoder.h"
#include "../../Crypto/Zip/ZipCipher.h"
#include "../../Crypto/WzAES/WzAES.h"
#ifdef ZIP_STRONG_SUPORT
#include "../../Crypto/ZipStrong/ZipStrong.h"
#endif
#include "ZipHandler.h"
using namespace NWindows;
@@ -381,7 +376,7 @@ class CLzmaDecoder:
public ICompressCoder,
public CMyUnknownImp
{
NCompress::NLZMA::CDecoder *DecoderSpec;
NCompress::NLzma::CDecoder *DecoderSpec;
CMyComPtr<ICompressCoder> Decoder;
public:
CLzmaDecoder();
@@ -393,7 +388,7 @@ public:
CLzmaDecoder::CLzmaDecoder()
{
DecoderSpec = new NCompress::NLZMA::CDecoder;
DecoderSpec = new NCompress::NLzma::CDecoder;
Decoder = DecoderSpec;
}
@@ -417,20 +412,24 @@ struct CMethodItem
class CZipDecoder
{
NCrypto::NZip::CDecoder *_zipCryptoDecoderSpec;
NCrypto::NWzAES::CDecoder *_aesDecoderSpec;
NCrypto::NZipStrong::CDecoder *_pkAesDecoderSpec;
NCrypto::NWzAes::CDecoder *_wzAesDecoderSpec;
CMyComPtr<ICompressFilter> _zipCryptoDecoder;
CMyComPtr<ICompressFilter> _aesDecoder;
#ifdef ZIP_STRONG_SUPORT
NCrypto::NZipStrong::CDecoder *_zsDecoderSpec;
CMyComPtr<ICompressFilter> _zsDecoder;
#endif
CMyComPtr<ICompressFilter> _pkAesDecoder;
CMyComPtr<ICompressFilter> _wzAesDecoder;
CFilterCoder *filterStreamSpec;
CMyComPtr<ISequentialInStream> filterStream;
CMyComPtr<ICryptoGetTextPassword> getTextPassword;
CObjectVector<CMethodItem> methodItems;
public:
CZipDecoder(): _zipCryptoDecoderSpec(0), _aesDecoderSpec(0), filterStreamSpec(0) {}
CZipDecoder():
_zipCryptoDecoderSpec(0),
_pkAesDecoderSpec(0),
_wzAesDecoderSpec(0),
filterStreamSpec(0) {}
HRESULT Decode(
DECL_EXTERNAL_CODECS_LOC_VARS
@@ -453,23 +452,19 @@ HRESULT CZipDecoder::Decode(
CInStreamReleaser inStreamReleaser;
bool needCRC = true;
bool aesMode = false;
#ifdef ZIP_STRONG_SUPORT
bool wzAesMode = false;
bool pkAesMode = false;
#endif
UInt16 methodId = item.CompressionMethod;
if (item.IsEncrypted())
{
if (item.IsStrongEncrypted())
{
#ifdef ZIP_STRONG_SUPORT
CStrongCryptoField f;
if (item.CentralExtra.GetStrongCryptoField(f))
{
pkAesMode = true;
}
if (!pkAesMode)
#endif
{
res = NArchive::NExtract::NOperationResult::kUnSupportedMethod;
return S_OK;
@@ -480,7 +475,7 @@ HRESULT CZipDecoder::Decode(
CWzAesExtraField aesField;
if (item.CentralExtra.GetWzAesField(aesField))
{
aesMode = true;
wzAesMode = true;
needCRC = aesField.NeedCrc();
}
}
@@ -496,11 +491,11 @@ HRESULT CZipDecoder::Decode(
CMyComPtr<ISequentialInStream> inStream;
{
UInt64 packSize = item.PackSize;
if (aesMode)
if (wzAesMode)
{
if (packSize < NCrypto::NWzAES::kMacSize)
if (packSize < NCrypto::NWzAes::kMacSize)
return S_OK;
packSize -= NCrypto::NWzAES::kMacSize;
packSize -= NCrypto::NWzAes::kMacSize;
}
UInt64 dataPos = item.GetDataPosition();
inStream.Attach(archive.CreateLimitedStream(dataPos, packSize));
@@ -510,32 +505,30 @@ HRESULT CZipDecoder::Decode(
CMyComPtr<ICompressFilter> cryptoFilter;
if (item.IsEncrypted())
{
if (aesMode)
if (wzAesMode)
{
CWzAesExtraField aesField;
if (!item.CentralExtra.GetWzAesField(aesField))
return S_OK;
methodId = aesField.Method;
if (!_aesDecoder)
if (!_wzAesDecoder)
{
_aesDecoderSpec = new NCrypto::NWzAES::CDecoder;
_aesDecoder = _aesDecoderSpec;
_wzAesDecoderSpec = new NCrypto::NWzAes::CDecoder;
_wzAesDecoder = _wzAesDecoderSpec;
}
cryptoFilter = _aesDecoder;
cryptoFilter = _wzAesDecoder;
Byte properties = aesField.Strength;
RINOK(_aesDecoderSpec->SetDecoderProperties2(&properties, 1));
RINOK(_wzAesDecoderSpec->SetDecoderProperties2(&properties, 1));
}
#ifdef ZIP_STRONG_SUPORT
else if (pkAesMode)
{
if (!_zsDecoder)
if (!_pkAesDecoder)
{
_zsDecoderSpec = new NCrypto::NZipStrong::CDecoder;
_zsDecoder = _zsDecoderSpec;
_pkAesDecoderSpec = new NCrypto::NZipStrong::CDecoder;
_pkAesDecoder = _pkAesDecoderSpec;
}
cryptoFilter = _zsDecoder;
cryptoFilter = _pkAesDecoder;
}
#endif
else
{
if (!_zipCryptoDecoder)
@@ -556,11 +549,7 @@ HRESULT CZipDecoder::Decode(
CMyComBSTR password;
RINOK(getTextPassword->CryptoGetTextPassword(&password));
AString charPassword;
if (aesMode
#ifdef ZIP_STRONG_SUPORT
|| pkAesMode
#endif
)
if (wzAesMode || pkAesMode)
{
charPassword = UnicodeStringToMultiByte((const wchar_t *)password, CP_ACP);
/*
@@ -583,9 +572,9 @@ HRESULT CZipDecoder::Decode(
// we use OEM. WinZip/Windows probably use ANSI for some files
charPassword = UnicodeStringToMultiByte((const wchar_t *)password, CP_OEMCP);
}
HRESULT res = cryptoSetPassword->CryptoSetPassword(
HRESULT result = cryptoSetPassword->CryptoSetPassword(
(const Byte *)(const char *)charPassword, charPassword.Length());
if (res != S_OK)
if (result != S_OK)
return S_OK;
}
else
@@ -660,7 +649,7 @@ HRESULT CZipDecoder::Decode(
#endif
{
HRESULT result;
HRESULT result = S_OK;
CMyComPtr<ISequentialInStream> inStreamNew;
if (item.IsEncrypted())
{
@@ -670,33 +659,42 @@ HRESULT CZipDecoder::Decode(
filterStream = filterStreamSpec;
}
filterStreamSpec->Filter = cryptoFilter;
if (aesMode)
if (wzAesMode)
{
RINOK(_aesDecoderSpec->ReadHeader(inStream));
result = _wzAesDecoderSpec->ReadHeader(inStream);
if (result == S_OK)
{
if (!_wzAesDecoderSpec->CheckPasswordVerifyCode())
result = S_FALSE;
}
}
#ifdef ZIP_STRONG_SUPORT
else if (pkAesMode)
{
RINOK(_zsDecoderSpec->ReadHeader(inStream));
result =_pkAesDecoderSpec->ReadHeader(inStream, item.FileCRC, item.UnPackSize);
if (result == S_OK)
{
bool passwOK;
result = _pkAesDecoderSpec->CheckPassword(passwOK);
if (result == S_OK && !passwOK)
result = S_FALSE;
}
}
#endif
else
{
RINOK(_zipCryptoDecoderSpec->ReadHeader(inStream));
result = _zipCryptoDecoderSpec->ReadHeader(inStream);
}
RINOK(filterStreamSpec->SetInStream(inStream));
inStreamReleaser.FilterCoder = filterStreamSpec;
inStreamNew = filterStream;
if (aesMode)
if (result == S_OK)
{
if (!_aesDecoderSpec->CheckPasswordVerifyCode())
return S_OK;
RINOK(filterStreamSpec->SetInStream(inStream));
inStreamReleaser.FilterCoder = filterStreamSpec;
inStreamNew = filterStream;
}
}
else
inStreamNew = inStream;
result = coder->Code(inStreamNew, outStream, NULL, &item.UnPackSize, compressProgress);
if (result == S_OK)
result = coder->Code(inStreamNew, outStream, NULL, &item.UnPackSize, compressProgress);
if (result == S_FALSE)
return S_OK;
if (result == E_NOTIMPL)
@@ -711,10 +709,10 @@ HRESULT CZipDecoder::Decode(
bool authOk = true;
if (needCRC)
crcOK = (outStreamSpec->GetCRC() == item.FileCRC);
if (aesMode)
if (wzAesMode)
{
inStream.Attach(archive.CreateLimitedStream(authenticationPos, NCrypto::NWzAES::kMacSize));
if (_aesDecoderSpec->CheckMac(inStream, authOk) != S_OK)
inStream.Attach(archive.CreateLimitedStream(authenticationPos, NCrypto::NWzAes::kMacSize));
if (_wzAesDecoderSpec->CheckMac(inStream, authOk) != S_OK)
authOk = false;
}

19
CPP/7zip/Archive/Zip/ZipHandlerOut.cpp
View File

@@ -1,22 +1,25 @@
// Zip/HandlerOut.cpp
// ZipHandlerOut.cpp
#include "StdAfx.h"
#include "ZipHandler.h"
#include "ZipUpdate.h"
#include "Common/StringConvert.h"
#include "Common/ComTry.h"
#include "Common/StringConvert.h"
#include "Common/StringToInt.h"
#include "Windows/PropVariant.h"
#include "Windows/Time.h"
#include "../../IPassword.h"
#include "../../Common/OutBuffer.h"
#include "../../Crypto/WzAes.h"
#include "../Common/ItemNameUtils.h"
#include "../Common/ParseProperties.h"
#include "../../Crypto/WzAES/WzAES.h"
#include "../../Common/OutBuffer.h"
#include "ZipHandler.h"
#include "ZipUpdate.h"
using namespace NWindows;
using namespace NCOM;
@@ -253,7 +256,7 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
return E_INVALIDARG;
if (m_IsAesMode)
{
if (options.Password.Length() > NCrypto::NWzAES::kPasswordSizeMax)
if (options.Password.Length() > NCrypto::NWzAes::kPasswordSizeMax)
return E_INVALIDARG;
}
options.Password = UnicodeStringToMultiByte((const wchar_t *)password, CP_OEMCP);

21
CPP/7zip/Archive/Zip/ZipUpdate.cpp
View File

@@ -2,27 +2,26 @@
#include "StdAfx.h"
#include <stdio.h>
#include "ZipUpdate.h"
#include "ZipAddCommon.h"
#include "ZipOut.h"
#include "Common/Defs.h"
#include "Common/AutoPtr.h"
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Windows/Defs.h"
#include "Windows/Thread.h"
#include "../../Common/CreateCoder.h"
#include "../../Common/LimitedStreams.h"
#include "../../Common/OutMemStream.h"
#include "../../Common/ProgressUtils.h"
#ifdef COMPRESS_MT
#include "../../Common/ProgressMt.h"
#endif
#include "../../Common/LimitedStreams.h"
#include "../../Common/OutMemStream.h"
#include "../../Common/CreateCoder.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/CopyCoder.h"
#include "ZipAddCommon.h"
#include "ZipOut.h"
#include "ZipUpdate.h"
using namespace NWindows;
using namespace NSynchronization;

701
CPP/7zip/Bundles/Alone/Alone.dsp
View File

@@ -589,22 +589,6 @@ SOURCE=..\..\Common\LockedStream.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\LSBFDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\LSBFDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\LSBFEncoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\LSBFEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\MemBlocks.cpp
# End Source File
# Begin Source File
@@ -625,14 +609,6 @@ SOURCE=..\..\Common\MethodProps.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\MSBFDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\MSBFEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\OffsetStream.cpp
# End Source File
# Begin Source File
@@ -707,106 +683,20 @@ SOURCE=..\..\Common\VirtThread.h
# Begin Group "Compress"
# PROP Default_Filter ""
# Begin Group "Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchMisc.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchMisc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\Coder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86_2.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86_2.h
# End Source File
# End Group
# Begin Group "BZip2"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2CRC.cpp
SOURCE=..\..\Compress\BZip2Crc.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2CRC.h
SOURCE=..\..\Compress\BZip2Crc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2Decoder.cpp
SOURCE=..\..\Compress\BZip2Decoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -827,11 +717,11 @@ SOURCE=..\..\Compress\BZip2\BZip2Decoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2Decoder.h
SOURCE=..\..\Compress\BZip2Decoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2Encoder.cpp
SOURCE=..\..\Compress\BZip2Encoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -852,11 +742,11 @@ SOURCE=..\..\Compress\BZip2\BZip2Encoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2Encoder.h
SOURCE=..\..\Compress\BZip2Encoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2Register.cpp
SOURCE=..\..\Compress\BZip2Register.cpp
# End Source File
# End Group
# Begin Group "Copy"
@@ -864,15 +754,15 @@ SOURCE=..\..\Compress\BZip2\BZip2Register.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.cpp
SOURCE=..\..\Compress\CopyCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.h
SOURCE=..\..\Compress\CopyCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyRegister.cpp
SOURCE=..\..\Compress\CopyRegister.cpp
# End Source File
# End Group
# Begin Group "Deflate"
@@ -880,15 +770,15 @@ SOURCE=..\..\Compress\Copy\CopyRegister.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Deflate\Deflate64Register.cpp
SOURCE=..\..\Compress\Deflate64Register.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateConst.h
SOURCE=..\..\Compress\DeflateConst.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateDecoder.cpp
SOURCE=..\..\Compress\DeflateDecoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -909,11 +799,11 @@ SOURCE=..\..\Compress\Deflate\DeflateDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateDecoder.h
SOURCE=..\..\Compress\DeflateDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateEncoder.cpp
SOURCE=..\..\Compress\DeflateEncoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -934,15 +824,15 @@ SOURCE=..\..\Compress\Deflate\DeflateEncoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateEncoder.h
SOURCE=..\..\Compress\DeflateEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateExtConst.h
SOURCE=..\..\Compress\DeflateExtConst.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateRegister.cpp
SOURCE=..\..\Compress\DeflateRegister.cpp
# End Source File
# End Group
# Begin Group "Huffman"
@@ -950,7 +840,7 @@ SOURCE=..\..\Compress\Deflate\DeflateRegister.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Huffman\HuffmanDecoder.h
SOURCE=..\..\Compress\HuffmanDecoder.h
# End Source File
# End Group
# Begin Group "Implode"
@@ -958,82 +848,19 @@ SOURCE=..\..\Compress\Huffman\HuffmanDecoder.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Implode\ImplodeDecoder.cpp
SOURCE=..\..\Compress\ImplodeDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Implode\ImplodeDecoder.h
SOURCE=..\..\Compress\ImplodeDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Implode\ImplodeHuffmanDecoder.cpp
SOURCE=..\..\Compress\ImplodeHuffmanDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Implode\ImplodeHuffmanDecoder.h
# End Source File
# End Group
# Begin Group "LZ"
# PROP Default_Filter ""
# Begin Group "MT"
# PROP Default_Filter ""
# End Group
# Begin Group "HC"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZ\HashChain\HC.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\HashChain\HC2.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\HashChain\HC3.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\HashChain\HC4.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\HashChain\HC4b.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\HashChain\HCMain.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\Compress\LZ\IMatchFinder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O1
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O1
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.h
SOURCE=..\..\Compress\ImplodeHuffmanDecoder.h
# End Source File
# End Group
# Begin Group "LZMA"
@@ -1041,11 +868,11 @@ SOURCE=..\..\Compress\LZ\LZOutWindow.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMA.h
SOURCE=..\..\Compress\Lzma.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp
SOURCE=..\..\Compress\LzmaDecoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -1066,11 +893,11 @@ SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMADecoder.h
SOURCE=..\..\Compress\LzmaDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMAEncoder.cpp
SOURCE=..\..\Compress\LzmaEncoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -1091,11 +918,11 @@ SOURCE=..\..\Compress\LZMA\LZMAEncoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMAEncoder.h
SOURCE=..\..\Compress\LzmaEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMARegister.cpp
SOURCE=..\..\Compress\LzmaRegister.cpp
# End Source File
# End Group
# Begin Group "PPMd"
@@ -1103,15 +930,15 @@ SOURCE=..\..\Compress\LZMA\LZMARegister.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDContext.h
SOURCE=..\..\Compress\PpmdContext.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecode.h
SOURCE=..\..\Compress\PpmdDecode.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp
SOURCE=..\..\Compress\PpmdDecoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -1132,15 +959,15 @@ SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecoder.h
SOURCE=..\..\Compress\PpmdDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDEncode.h
SOURCE=..\..\Compress\PpmdEncode.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDEncoder.cpp
SOURCE=..\..\Compress\PpmdEncoder.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -1161,19 +988,19 @@ SOURCE=..\..\Compress\PPMD\PPMDEncoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDEncoder.h
SOURCE=..\..\Compress\PpmdEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp
SOURCE=..\..\Compress\PpmdRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h
SOURCE=..\..\Compress\PpmdSubAlloc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDType.h
SOURCE=..\..\Compress\PpmdType.h
# End Source File
# End Group
# Begin Group "RangeCoder"
@@ -1181,38 +1008,19 @@ SOURCE=..\..\Compress\PPMD\PPMDType.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\RangeCoder\RangeCoder.h
SOURCE=..\..\Compress\RangeCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O1
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O1
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
SOURCE=..\..\Compress\RangeCoderBit.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.h
SOURCE=..\..\Compress\RangeCoderBitTree.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\RangeCoder\RangeCoderBitTree.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h
SOURCE=..\..\Compress\RangeCoderOpt.h
# End Source File
# End Group
# Begin Group "Shrink"
@@ -1220,11 +1028,11 @@ SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Shrink\ShrinkDecoder.cpp
SOURCE=..\..\Compress\ShrinkDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Shrink\ShrinkDecoder.h
SOURCE=..\..\Compress\ShrinkDecoder.h
# End Source File
# End Group
# Begin Group "Z"
@@ -1232,11 +1040,11 @@ SOURCE=..\..\Compress\Shrink\ShrinkDecoder.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Z\ZDecoder.cpp
SOURCE=..\..\Compress\ZDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Z\ZDecoder.h
SOURCE=..\..\Compress\ZDecoder.h
# End Source File
# End Group
# Begin Group "BWT"
@@ -1244,7 +1052,7 @@ SOURCE=..\..\Compress\Z\ZDecoder.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\BWT\Mtf8.h
SOURCE=..\..\Compress\Mtf8.h
# End Source File
# End Group
# Begin Group "LZX"
@@ -1252,23 +1060,23 @@ SOURCE=..\..\Compress\BWT\Mtf8.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Lzx\Lzx.h
SOURCE=..\..\Compress\Lzx.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Lzx\Lzx86Converter.cpp
SOURCE=..\..\Compress\Lzx86Converter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Lzx\Lzx86Converter.h
SOURCE=..\..\Compress\Lzx86Converter.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Lzx\LzxDecoder.cpp
SOURCE=..\..\Compress\LzxDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Lzx\LzxDecoder.h
SOURCE=..\..\Compress\LzxDecoder.h
# End Source File
# End Group
# Begin Group "Quantum"
@@ -1276,11 +1084,11 @@ SOURCE=..\..\Compress\Lzx\LzxDecoder.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Quantum\QuantumDecoder.cpp
SOURCE=..\..\Compress\QuantumDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Quantum\QuantumDecoder.h
SOURCE=..\..\Compress\QuantumDecoder.h
# End Source File
# End Group
# Begin Group "LZMA_Alone"
@@ -1303,6 +1111,90 @@ SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.cpp
SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\Compress\Bcj2Coder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Bcj2Coder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Bcj2Register.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BcjCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BcjCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BcjRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BitlDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BitlDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BitlEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BitmDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BitmEncoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BranchCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BranchCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BranchMisc.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BranchMisc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BranchRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\ByteSwap.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\ByteSwap.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\ByteSwapRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LzOutWindow.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LzOutWindow.h
# End Source File
# End Group
# Begin Group "Archive"
@@ -1990,13 +1882,146 @@ SOURCE=..\..\UI\Common\WorkDir.h
# End Group
# Begin Group "Crypto"
# PROP Default_Filter ""
# Begin Group "Zip Crypto"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\Zip\ZipCipher.cpp
SOURCE=..\..\Crypto\7zAes.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAes.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAesRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\HmacSha1.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\HmacSha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\MyAes.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\MyAes.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Pbkdf2HmacSha1.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Pbkdf2HmacSha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\RandGen.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\RandGen.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Sha1.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Sha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\WzAes.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\WzAes.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\ZipCrypto.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -2015,185 +2040,17 @@ SOURCE=..\..\Crypto\Zip\ZipCipher.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Zip\ZipCipher.h
SOURCE=..\..\Crypto\ZipCrypto.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Zip\ZipCrypto.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O1
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O1
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
SOURCE=..\..\Crypto\ZipStrong.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Zip\ZipCrypto.h
SOURCE=..\..\Crypto\ZipStrong.h
# End Source File
# End Group
# Begin Group "AES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\AES\MyAES.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\AES\MyAES.h
# End Source File
# End Group
# Begin Group "7z AES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAES.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAES.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp
# End Source File
# End Group
# Begin Group "WzAES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\WzAES\WzAES.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\WzAES\WzAES.h
# End Source File
# End Group
# Begin Group "Hash"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\Hash\HmacSha1.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\HmacSha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Pbkdf2HmacSha1.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Pbkdf2HmacSha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\RandGen.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\RandGen.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha1.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha1.h
# End Source File
# End Group
# End Group
# Begin Group "7-zip"
# PROP Default_Filter ""

152
CPP/7zip/Bundles/Alone/makefile
View File

@@ -58,8 +58,6 @@ WIN_OBJS = \
$O\InOutTempBuffer.obj \
$O\LimitedStreams.obj \
$O\LockedStream.obj \
$O\LSBFDecoder.obj \
$O\LSBFEncoder.obj \
$O\MemBlocks.obj \
$O\MethodId.obj \
$O\MethodProps.obj \
@@ -182,88 +180,57 @@ ZIP_OBJS = \
$O\ZipRegister.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
COMPRESS_OBJS = \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BitlDecoder.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
BZIP2_OBJS = \
$O\BZip2CRC.obj \
$O\BZip2Register.obj \
BZIP2_OPT_OBJS = \
$O\BZip2Decoder.obj \
$O\BZip2Encoder.obj \
COPY_OBJS = \
$O\BZip2Register.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
DEFLATE_OPT_OBJS = \
$O\Deflate64Register.obj \
$O\DeflateDecoder.obj \
$O\DeflateEncoder.obj \
$O\DeflateRegister.obj \
$O\Deflate64Register.obj \
LZ_OBJS = \
$O\ImplodeDecoder.obj \
$O\ImplodeHuffmanDecoder.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
$O\LzOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
$O\LZMARegister.obj \
$O\Lzx86Converter.obj \
$O\LzxDecoder.obj \
$O\PpmdDecoder.obj \
$O\PpmdEncoder.obj \
$O\PpmdRegister.obj \
$O\QuantumDecoder.obj \
$O\ShrinkDecoder.obj \
$O\ZDecoder.obj \
LZMA_BENCH_OBJS = \
$O\LzmaBench.obj \
$O\LzmaBenchCon.obj \
LZX_OBJS = \
$O\LzxDecoder.obj \
$O\Lzx86Converter.obj \
IMPLODE_OBJS = \
$O\ImplodeDecoder.obj \
$O\ImplodeHuffmanDecoder.obj \
PPMD_OPT_OBJS = \
$O\PPMDDecoder.obj \
$O\PPMDEncoder.obj \
$O\PPMDRegister.obj \
SHRINK_OBJS = \
$O\ShrinkDecoder.obj \
COMPRESS_Z_OBJS = \
$O\ZDecoder.obj \
7ZAES_OPT_OBJS = \
$O\7zAES.obj \
$O\7zAESRegister.obj \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_HASH_OBJS = \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\HmacSha1.obj \
$O\MyAes.obj \
$O\Pbkdf2HmacSha1.obj \
$O\RandGen.obj \
$O\Sha1.obj \
CRYPTO_WZAES_OBJS = \
$O\WzAES.obj \
CRYPTO_ZIP_OBJS = \
$O\ZipCipher.obj \
$O\WzAes.obj \
$O\ZipCrypto.obj \
$O\ZipStrong.obj \
C_OBJS = \
$O\Alloc.obj \
@@ -301,28 +268,10 @@ OBJS = \
$(SPLIT_OBJS) \
$(TAR_OBJS) \
$(ZIP_OBJS) \
$(BZIP2_OBJS) \
$(BZIP2_OPT_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(DEFLATE_OPT_OBJS) \
$(IMPLODE_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(COMPRESS_OBJS) \
$(LZMA_BENCH_OBJS) \
$(LZX_OBJS) \
$(PPMD_OPT_OBJS) \
$(SHRINK_OBJS) \
$(COMPRESS_Z_OBJS) \
$(CRYPTO_OBJS) \
$(C_OBJS) \
$O\RangeCoderBit.obj \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(CRYPTO_ZIP_OBJS) \
$(CRYPTO_WZAES_OBJS) \
$O\QuantumDecoder.obj \
$(CRC_OBJS) \
$O\resource.res
@@ -362,50 +311,13 @@ $(TAR_OBJS): ../../Archive/Tar/$(*B).cpp
$(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL)
$(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp
$(COMPL_O2)
$(IMPLODE_OBJS): ../../Compress/Implode/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL_O2)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL_O2)
$(LZMA_BENCH_OBJS): ../../Compress/LZMA_Alone/$(*B).cpp
$(COMPL)
$(LZX_OBJS): ../../Compress/Lzx/$(*B).cpp
$(COMPL_O2)
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL_O2)
$(SHRINK_OBJS): ../../Compress/Shrink/$(*B).cpp
$(COMPL)
$(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp
$(COMPL)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
$O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp
$(COMPL)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL_O2)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_ZIP_OBJS): ../../Crypto/Zip/$(*B).cpp
$(COMPL)
$(CRYPTO_WZAES_OBJS): ../../Crypto/WzAES/$(*B).cpp
$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c

35
CPP/7zip/Bundles/Alone7z/makefile
View File

@@ -132,27 +132,21 @@ SPLIT_OBJS = \
$O\SplitHandlerOut.obj \
$O\SplitRegister.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
COMPRESS_OBJS = \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
COPY_OBJS = \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
$O\LZMARegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
LZMA_BENCH_OBJS = \
$O\LzmaBench.obj \
@@ -181,10 +175,7 @@ OBJS = \
$(7Z_OBJS) \
$(LZM_OBJS) \
$(SPLIT_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(LZMA_OPT_OBJS) \
$(COMPRESS_OBJS) \
$(LZMA_BENCH_OBJS) \
$(C_OBJS) \
$(CRC_OBJS) \
@@ -213,13 +204,7 @@ $(LZM_OBJS): ../../Archive/Lzma/$(*B).cpp
$(COMPL)
$(SPLIT_OBJS): ../../Archive/Split/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL_O2)
$(LZMA_BENCH_OBJS): ../../Compress/LZMA_Alone/$(*B).cpp
$(COMPL)

107
CPP/7zip/Bundles/Format7z/makefile
View File

@@ -33,7 +33,6 @@ WIN_OBJS = \
$O\FilterCoder.obj \
$O\LimitedStreams.obj \
$O\LockedStream.obj \
$O\LSBFDecoder.obj \
$O\MethodId.obj \
$O\MethodProps.obj \
$O\OutBuffer.obj \
@@ -78,57 +77,37 @@ AR_COMMON_OBJS = \
COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BitlDecoder.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
BZIP2_OBJS = \
$O\BZip2CRC.obj \
$O\BZip2Register.obj \
BZIP2_OPT_OBJS = \
$O\BZip2Crc.obj \
$O\BZip2Decoder.obj \
COPY_OBJS = \
$O\BZip2Encoder.obj \
$O\BZip2Register.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
DEFLATE_OPT_OBJS = \
$O\DeflateDecoder.obj \
$O\DeflateEncoder.obj \
$O\DeflateRegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
$O\LzOutWindow.obj \
$O\PpmdDecoder.obj \
$O\PpmdEncoder.obj \
$O\PpmdRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
$O\LZMARegister.obj \
PPMD_OPT_OBJS = \
$O\PPMDDecoder.obj \
$O\PPMDEncoder.obj \
$O\PPMDRegister.obj \
7ZAES_OPT_OBJS = \
$O\7zAES.obj \
$O\7zAESRegister.obj \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_HASH_OBJS = \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\MyAes.obj \
$O\RandGen.obj \
$O\Sha1.obj \
@@ -137,11 +116,14 @@ C_OBJS = \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\Threads.obj \
$O\BwtSort.obj \
$O\HuffEnc.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\Sort.obj \
$O\Threads.obj \
$O\Aes.obj \
$O\Sha256.obj \
@@ -157,19 +139,8 @@ OBJS = \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(COMPRESS_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(BZIP2_OBJS) \
$(BZIP2_OPT_OBJS) \
$(COPY_OBJS) \
$(DEFLATE_OPT_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(CRYPTO_OBJS) \
$(C_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(CRC_OBJS) \
$O\resource.res
@@ -191,31 +162,9 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL)
$(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp
$(COMPL_O2)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL_O2)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL_O2)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c

88
CPP/7zip/Bundles/Format7zExtract/makefile
View File

@@ -31,7 +31,6 @@ WIN_OBJS = \
$O\FilterCoder.obj \
$O\LimitedStreams.obj \
$O\LockedStream.obj \
$O\LSBFDecoder.obj \
$O\MethodId.obj \
$O\OutBuffer.obj \
$O\ProgressUtils.obj \
@@ -66,53 +65,33 @@ AR_COMMON_OBJS = \
COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BitlDecoder.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
BZIP2_OBJS = \
$O\BZip2CRC.obj \
$O\BZip2Register.obj \
BZIP2_OPT_OBJS = \
$O\BZip2Crc.obj \
$O\BZip2Decoder.obj \
COPY_OBJS = \
$O\BZip2Register.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
DEFLATE_OPT_OBJS = \
$O\DeflateDecoder.obj \
$O\DeflateRegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaRegister.obj \
$O\LzOutWindow.obj \
$O\PpmdDecoder.obj \
$O\PpmdRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMARegister.obj \
PPMD_OPT_OBJS = \
$O\PPMDDecoder.obj \
$O\PPMDRegister.obj \
7ZAES_OPT_OBJS = \
$O\7zAES.obj \
$O\7zAESRegister.obj \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\MyAes.obj \
C_OBJS = \
$O\Alloc.obj \
@@ -136,17 +115,7 @@ OBJS = \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(COMPRESS_OBJS) \
$(SWAP_OPT_OBJS) \
$(BZIP2_OBJS) \
$(BZIP2_OPT_OBJS) \
$(BRANCH_OPT_OBJS) \
$(COPY_OBJS) \
$(DEFLATE_OPT_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_OBJS) \
$(C_OBJS) \
$(CRC_OBJS) \
$O\resource.res
@@ -169,30 +138,11 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL)
$(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp
$(COMPL_O2)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL_O2)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL_O2)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)

36
CPP/7zip/Bundles/Format7zExtractR/makefile
View File

@@ -68,27 +68,19 @@ AR_COMMON_OBJS = \
COMPRESS_OBJS = \
$O\CodecExports.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
COPY_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMARegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaRegister.obj \
C_OBJS = \
$O\7zCrc.obj \
@@ -109,10 +101,6 @@ OBJS = \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(COMPRESS_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(LZMA_OPT_OBJS) \
$(C_OBJS) \
$O\resource.res
@@ -134,14 +122,6 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c

724
CPP/7zip/Bundles/Format7zF/Format7z.dsp
View File

File diff suppressed because it is too large Load Diff

184
CPP/7zip/Bundles/Format7zF/makefile
View File

@@ -38,8 +38,6 @@ WIN_OBJS = \
$O\FilterCoder.obj \
$O\LimitedStreams.obj \
$O\LockedStream.obj \
$O\LSBFDecoder.obj \
$O\LSBFEncoder.obj \
$O\MethodId.obj \
$O\MethodProps.obj \
$O\MemBlocks.obj \
@@ -213,107 +211,64 @@ ZIP_OBJS = \
COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
$O\ArjDecoder1.obj \
$O\ArjDecoder2.obj \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BitlDecoder.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
BZIP2_OBJS = \
$O\BZip2CRC.obj \
$O\BZip2Register.obj \
BZIP2_OPT_OBJS = \
$O\BZip2Crc.obj \
$O\BZip2Decoder.obj \
$O\BZip2Encoder.obj \
COPY_OBJS = \
$O\BZip2Register.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
DEFLATE_OPT_OBJS = \
$O\Deflate64Register.obj \
$O\DeflateDecoder.obj \
$O\DeflateEncoder.obj \
$O\DeflateRegister.obj \
$O\Deflate64Register.obj \
$O\DeflateNsisRegister.obj \
$O\ZlibDecoder.obj \
IMPLODE_OBJS = \
$O\DeflateRegister.obj \
$O\ImplodeDecoder.obj \
$O\ImplodeHuffmanDecoder.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
$O\LZMARegister.obj \
LZX_OBJS = \
$O\LzxDecoder.obj \
$O\LzhDecoder.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
$O\LzOutWindow.obj \
$O\Lzx86Converter.obj \
PPMD_OPT_OBJS = \
$O\PPMDDecoder.obj \
$O\PPMDEncoder.obj \
$O\PPMDRegister.obj \
RAR29_OPT_OBJS = \
$O\LzxDecoder.obj \
$O\PpmdDecoder.obj \
$O\PpmdEncoder.obj \
$O\PpmdRegister.obj \
$O\QuantumDecoder.obj \
$O\Rar1Decoder.obj \
$O\Rar2Decoder.obj \
$O\Rar3Decoder.obj \
$O\Rar3Vm.obj \
$O\RarCodecsRegister.obj \
SHRINK_OBJS = \
$O\ShrinkDecoder.obj \
COMPRESS_ARJ_OBJS = \
$O\ArjDecoder1.obj \
$O\ArjDecoder2.obj \
COMPRESS_LZH_OBJS = \
$O\LzhDecoder.obj \
COMPRESS_Z_OBJS = \
$O\ZlibDecoder.obj \
$O\ZDecoder.obj \
7ZAES_OPT_OBJS = \
$O\7zAES.obj \
$O\7zAESRegister.obj \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_HASH_OBJS = \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\HmacSha1.obj \
$O\MyAes.obj \
$O\Pbkdf2HmacSha1.obj \
$O\RandGen.obj \
$O\Sha1.obj \
CRYPTO_WZAES_OBJS = \
$O\WzAES.obj \
CRYPTO_ZIP_OBJS = \
$O\ZipCipher.obj \
$O\ZipCrypto.obj \
CRYPTO_RAR20_OBJS = \
$O\Rar20Cipher.obj \
$O\Rar20Crypto.obj \
CRYPTO_RARAES_OBJS = \
$O\RarAES.obj \
$O\RarAes.obj \
$O\Sha1.obj \
$O\WzAes.obj \
$O\ZipCrypto.obj \
$O\ZipStrong.obj \
C_OBJS = \
@@ -360,33 +315,9 @@ OBJS = \
$(UDF_OBJS) \
$(WIM_OBJS) \
$(ZIP_OBJS) \
$(BZIP2_OBJS) \
$(BZIP2_OPT_OBJS) \
$(COMPRESS_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(DEFLATE_OPT_OBJS) \
$(IMPLODE_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(LZX_OBJS) \
$(PPMD_OPT_OBJS) \
$(RAR29_OPT_OBJS) \
$(SHRINK_OBJS) \
$(COMPRESS_ARJ_OBJS) \
$(COMPRESS_LZH_OBJS) \
$(COMPRESS_Z_OBJS) \
$O\QuantumDecoder.obj \
$(CRYPTO_OBJS) \
$(C_OBJS) \
$O\RangeCoderBit.obj \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_ZIP_OBJS) \
$(CRYPTO_WZAES_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(CRYPTO_RAR20_OBJS) \
$(CRYPTO_RARAES_OBJS) \
$(CRC_OBJS) \
$O\resource.res
@@ -442,59 +373,10 @@ $(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp
$(COMPL)
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL)
$(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp
$(COMPL_O2)
$(IMPLODE_OBJS): ../../Compress/Implode/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(LZX_OBJS): ../../Compress/Lzx/$(*B).cpp
$(COMPL_O2)
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL_O2)
$(RAR29_OPT_OBJS): ../../Compress/Rar/$(*B).cpp
$(COMPL_O2)
$(SHRINK_OBJS): ../../Compress/Shrink/$(*B).cpp
$(COMPL)
$(COMPRESS_ARJ_OBJS): ../../Compress/Arj/$(*B).cpp
$(COMPL)
$(COMPRESS_LZH_OBJS): ../../Compress/Lzh/$(*B).cpp
$(COMPL)
$(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp
$(COMPL)
$O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp
$(COMPL)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
$(COMPL_O2)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_ZIP_OBJS): ../../Crypto/Zip/$(*B).cpp
$(COMPL)
$(CRYPTO_WZAES_OBJS): ../../Crypto/WzAES/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_RAR20_OBJS): ../../Crypto/Rar20/$(*B).cpp
$(COMPL)
$(CRYPTO_RARAES_OBJS): ../../Crypto/RarAES/$(*B).cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)

38
CPP/7zip/Bundles/Format7zR/makefile
View File

@@ -75,28 +75,20 @@ AR_COMMON_OBJS = \
COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
$O\ByteSwapRegister.obj \
COPY_OBJS = \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
$O\LZMARegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
C_OBJS = \
$O\7zCrc.obj \
@@ -119,15 +111,7 @@ OBJS = \
$(AR_OBJS) \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(BZIP2_OBJS) \
$(BZIP2_OPT_OBJS) \
$(COMPRESS_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(DEFLATE_OPT_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(C_OBJS) \
$O\resource.res
@@ -149,14 +133,6 @@ $(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c

84
CPP/7zip/Bundles/SFXCon/SFXCon.dsp
View File

@@ -254,128 +254,76 @@ SOURCE=..\..\Archive\7z\7zRegister.cpp
# End Group
# Begin Group "Compress"
# PROP Default_Filter ""
# Begin Group "LZMA"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp
SOURCE=..\..\Compress\Bcj2Coder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMARegister.cpp
# End Source File
# End Group
# Begin Group "Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
SOURCE=..\..\Compress\Bcj2Register.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJRegister.cpp
SOURCE=..\..\Compress\BcjCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.cpp
SOURCE=..\..\Compress\BcjRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.h
SOURCE=..\..\Compress\BranchCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.cpp
SOURCE=..\..\Compress\CopyCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86_2.cpp
# End Source File
# End Group
# Begin Group "PPMD"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp
SOURCE=..\..\Compress\CopyRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp
# End Source File
# End Group
# Begin Group "LZ"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.cpp
SOURCE=..\..\Compress\LzmaDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.h
# End Source File
# End Group
# Begin Group "Copy"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.cpp
SOURCE=..\..\Compress\LzmaRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.h
SOURCE=..\..\Compress\PpmdDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyRegister.cpp
SOURCE=..\..\Compress\PpmdRegister.cpp
# End Source File
# End Group
# End Group
# Begin Group "Crypto"
# PROP Default_Filter ""
# Begin Group "7zAES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAES.cpp
SOURCE=..\..\Crypto\7zAes.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAES.h
SOURCE=..\..\Crypto\7zAes.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp
# End Source File
# End Group
# Begin Group "AES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\AES\MyAES.cpp
SOURCE=..\..\Crypto\7zAesRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\AES\MyAES.h
SOURCE=..\..\Crypto\MyAes.cpp
# End Source File
# End Group
# Begin Group "Hash"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\Hash\RotateDefs.h
SOURCE=..\..\Crypto\MyAes.h
# End Source File
# End Group
# End Group
# Begin Group "Windows"
# PROP Default_Filter ""

61
CPP/7zip/Bundles/SFXCon/makefile
View File

@@ -81,34 +81,23 @@ AR_COMMON_OBJS = \
$O\7zIn.obj \
$O\7zRegister.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
COMPRESS_OBJS = \
$O\BranchCoder.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
COPY_OBJS = \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaRegister.obj \
$O\PpmdDecoder.obj \
$O\PpmdRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMARegister.obj \
PPMD_OPT_OBJS = \
$O\PPMDDecoder.obj \
$O\PPMDRegister.obj \
7ZAES_OPT_OBJS = \
$O\7zAES.obj \
$O\7zAESRegister.obj \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\MyAes.obj \
C_OBJS = \
$O\Alloc.obj \
@@ -130,13 +119,8 @@ OBJS = \
$(UI_COMMON_OBJS) \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(BRANCH_OPT_OBJS) \
$(COPY_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(COMPRESS_OBJS) \
$(CRYPTO_OBJS) \
$(C_OBJS) \
$(CRC_OBJS) \
$O\resource.res
@@ -162,20 +146,9 @@ $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL)
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)

50
CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
View File

@@ -242,76 +242,44 @@ SOURCE=..\..\Archive\Common\OutStreamWithCRC.h
# End Group
# Begin Group "Compress"
# PROP Default_Filter ""
# Begin Group "LZMA"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp
SOURCE=..\..\Compress\Bcj2Coder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMARegister.cpp
# End Source File
# End Group
# Begin Group "Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
SOURCE=..\..\Compress\Bcj2Register.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJRegister.cpp
SOURCE=..\..\Compress\BcjCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.cpp
SOURCE=..\..\Compress\BcjRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.h
SOURCE=..\..\Compress\BranchCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.cpp
SOURCE=..\..\Compress\CopyCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86_2.cpp
# End Source File
# End Group
# Begin Group "Copy"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.cpp
SOURCE=..\..\Compress\CopyRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.h
SOURCE=..\..\Compress\LzmaDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyRegister.cpp
SOURCE=..\..\Compress\LzmaRegister.cpp
# End Source File
# End Group
# Begin Group "LZ"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.h
# End Source File
# End Group
# End Group
# Begin Group "Common"
# PROP Default_Filter ""

34
CPP/7zip/Bundles/SFXSetup/makefile
View File

@@ -79,23 +79,16 @@ AR_COMMON_OBJS = \
$O\7zIn.obj \
$O\7zRegister.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
COMPRESS_OBJS = \
$O\BranchCoder.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
COPY_OBJS = \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMARegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaRegister.obj \
C_OBJS = \
$O\Alloc.obj \
@@ -116,10 +109,7 @@ OBJS = \
$(FM_OBJS)\
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(BRANCH_OPT_OBJS) \
$(COPY_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(COMPRESS_OBJS) \
$O\MyMessages.obj \
$(C_OBJS) \
$(CRC_OBJS) \
@@ -148,13 +138,7 @@ $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp

108
CPP/7zip/Bundles/SFXWin/SFXWin.dsp
View File

@@ -230,152 +230,76 @@ SOURCE=..\..\Archive\Common\OutStreamWithCRC.h
# End Group
# Begin Group "Compress"
# PROP Default_Filter ""
# Begin Group "LZMA"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp
SOURCE=..\..\Compress\Bcj2Coder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZMA\LZMARegister.cpp
# End Source File
# End Group
# Begin Group "Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
SOURCE=..\..\Compress\Bcj2Register.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJRegister.cpp
SOURCE=..\..\Compress\BcjCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.cpp
SOURCE=..\..\Compress\BcjRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchCoder.h
SOURCE=..\..\Compress\BranchCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.cpp
SOURCE=..\..\Compress\CopyCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86_2.cpp
# End Source File
# End Group
# Begin Group "PPMD"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDContext.h
SOURCE=..\..\Compress\CopyRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecode.h
SOURCE=..\..\Compress\LzmaDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecoder.cpp
SOURCE=..\..\Compress\LzmaRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDDecoder.h
SOURCE=..\..\Compress\PpmdDecoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDRegister.cpp
SOURCE=..\..\Compress\PpmdRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDSubAlloc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\PPMD\PPMDType.h
# End Source File
# End Group
# Begin Group "LZ"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\LZ\LZOutWindow.h
# End Source File
# End Group
# Begin Group "Copy"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Copy\CopyRegister.cpp
# End Source File
# End Group
# End Group
# Begin Group "Crypto"
# PROP Default_Filter ""
# Begin Group "AES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\AES\MyAES.cpp
SOURCE=..\..\Crypto\7zAes.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\AES\MyAES.h
# End Source File
# End Group
# Begin Group "7zAES"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAES.cpp
SOURCE=..\..\Crypto\7zAes.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAES.h
SOURCE=..\..\Crypto\7zAesRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\7zAESRegister.cpp
SOURCE=..\..\Crypto\MyAes.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\7zAES\MySHA256.h
SOURCE=..\..\Crypto\MyAes.h
# End Source File
# End Group
# Begin Group "Hash"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Crypto\Hash\RotateDefs.h
# End Source File
# End Group
# End Group
# Begin Group "Dialogs"
# PROP Default_Filter ""

63
CPP/7zip/Bundles/SFXWin/makefile
View File

@@ -89,35 +89,24 @@ AR_COMMON_OBJS = \
$O\7zIn.obj \
$O\7zRegister.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
COMPRESS_OBJS = \
$O\BranchCoder.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
COPY_OBJS = \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
$O\LzmaDecoder.obj \
$O\LzmaRegister.obj \
$O\PpmdDecoder.obj \
$O\PpmdRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMARegister.obj \
PPMD_OPT_OBJS = \
$O\PPMDDecoder.obj \
$O\PPMDRegister.obj \
7ZAES_OPT_OBJS = \
$O\7zAES.obj \
$O\7zAESRegister.obj \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\MyAes.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Bra86.obj \
@@ -140,13 +129,8 @@ OBJS = \
$(FM_OBJS)\
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(BRANCH_OPT_OBJS) \
$(COPY_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(COMPRESS_OBJS) \
$(CRYPTO_OBJS) \
$O\MyMessages.obj \
$(C_OBJS) \
$(CRC_OBJS) \
@@ -177,20 +161,9 @@ $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
$(COMPL)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL)
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
$(COMPL)
$O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp

11
CPP/7zip/Common/LSBFEncoder.cpp
View File

@@ -1,11 +0,0 @@
// LSBFEncoder.cpp
#include "StdAfx.h"
#include "LSBFEncoder.h"
#include "Common/Defs.h"
namespace NStream {
namespace NLSBF {
}}

17
CPP/7zip/Common/MethodProps.cpp
View File

@@ -2,9 +2,12 @@
#include "StdAfx.h"
#include "MethodProps.h"
#include "../../Common/MyCom.h"
#include "../ICoder.h"
#include "MethodProps.h"
static UInt64 k_LZMA = 0x030101;
// static UInt64 k_LZMA2 = 0x030102;
@@ -35,24 +38,24 @@ HRESULT SetMethodProperties(const CMethod &method, const UInt64 *inSizeForReduce
}
{
int numProperties = method.Properties.Size();
int numProps = method.Props.Size();
CMyComPtr<ICompressSetCoderProperties> setCoderProperties;
coder->QueryInterface(IID_ICompressSetCoderProperties, (void **)&setCoderProperties);
if (setCoderProperties == NULL)
{
if (numProperties != 0)
if (numProps != 0)
return E_INVALIDARG;
}
else
{
CRecordVector<PROPID> propIDs;
NWindows::NCOM::CPropVariant *values = new NWindows::NCOM::CPropVariant[numProperties];
NWindows::NCOM::CPropVariant *values = new NWindows::NCOM::CPropVariant[numProps];
HRESULT res = S_OK;
try
{
for (int i = 0; i < numProperties; i++)
for (int i = 0; i < numProps; i++)
{
const CProp &prop = method.Properties[i];
const CProp &prop = method.Props[i];
propIDs.Add(prop.Id);
NWindows::NCOM::CPropVariant &value = values[i];
value = prop.Value;
@@ -65,7 +68,7 @@ HRESULT SetMethodProperties(const CMethod &method, const UInt64 *inSizeForReduce
}
CMyComPtr<ICompressSetCoderProperties> setCoderProperties;
coder->QueryInterface(IID_ICompressSetCoderProperties, (void **)&setCoderProperties);
res = setCoderProperties->SetCoderProperties(&propIDs.Front(), values, numProperties);
res = setCoderProperties->SetCoderProperties(&propIDs.Front(), values, numProps);
}
catch(...)
{

8
CPP/7zip/Common/MethodProps.h
View File

@@ -3,11 +3,11 @@
#ifndef __7Z_METHOD_PROPS_H
#define __7Z_METHOD_PROPS_H
#include "MethodId.h"
#include "../../Common/MyVector.h"
#include "../../Windows/PropVariant.h"
#include "../../Common/MyVector.h"
#include "../ICoder.h"
#include "MethodId.h"
struct CProp
{
@@ -18,7 +18,7 @@ struct CProp
struct CMethod
{
CMethodId Id;
CObjectVector<CProp> Properties;
CObjectVector<CProp> Props;
};
struct CMethodsMode

64
CPP/7zip/Compress/Arj/ArjDecoder2.h
View File

@@ -1,64 +0,0 @@
// Arj/Decoder2.h
#ifndef __COMPRESS_ARJ_DECODER2_H
#define __COMPRESS_ARJ_DECODER2_H
#include "../../../Common/MyCom.h"
#include "../../ICoder.h"
#include "../../Common/MSBFDecoder.h"
#include "../../Common/InBuffer.h"
#include "../LZ/LZOutWindow.h"
/*
// {23170F69-40C1-278B-0404-020000000000}
DEFINE_GUID(CLSID_CCompressArj2Decoder,
0x23170F69, 0x40C1, 0x278B, 0x04, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00);
*/
namespace NCompress {
namespace NArj {
namespace NDecoder2 {
class CCoder :
public ICompressCoder,
public CMyUnknownImp
{
CLZOutWindow m_OutWindowStream;
NStream::NMSBF::CDecoder<CInBuffer> m_InBitStream;
void ReleaseStreams()
{
m_OutWindowStream.ReleaseStream();
m_InBitStream.ReleaseStream();
}
class CCoderReleaser
{
CCoder *m_Coder;
public:
bool NeedFlush;
CCoderReleaser(CCoder *coder): m_Coder(coder), NeedFlush(true) {}
~CCoderReleaser()
{
if (NeedFlush)
m_Coder->m_OutWindowStream.Flush();
m_Coder->ReleaseStreams();
}
};
friend class CCoderReleaser;
HRESULT CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
public:
MY_UNKNOWN_IMP
STDMETHOD(Code)(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
};
}}}
#endif

8
CPP/7zip/Compress/Arj/StdAfx.h
View File

@@ -1,8 +0,0 @@
// StdAfx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#include "../../../Common/MyWindows.h"
#endif

18
CPP/7zip/Compress/Arj/ArjDecoder1.cpp → CPP/7zip/Compress/ArjDecoder1.cpp
View File

@@ -1,18 +1,16 @@
// Arj/Decoder.cpp
// ArjDecoder1.cpp
#include "StdAfx.h"
#include "ArjDecoder1.h"
#include "Windows/Defs.h"
namespace NCompress{
namespace NArj {
namespace NDecoder1 {
static const UInt32 kHistorySize = 26624;
static const UInt32 kMatchMaxLen = 256;
static const UInt32 kMatchMinLen = 3;
static const UInt32 kMatchMaxLen = 256;
// static const UInt32 kNC = 255 + kMatchMaxLen + 2 - kMatchMinLen;
@@ -237,9 +235,8 @@ UInt32 CCoder::decode_p()
}
HRESULT CCoder::CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 * /* inSize */, const UInt64 *outSize,
ICompressProgressInfo *progress)
HRESULT CCoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 *outSize, ICompressProgressInfo *progress)
{
if (outSize == NULL)
return E_INVALIDARG;
@@ -306,13 +303,12 @@ HRESULT CCoder::CodeReal(ISequentialInStream *inStream,
return m_OutWindowStream.Flush();
}
STDMETHODIMP CCoder::Code(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress)
STDMETHODIMP CCoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
{
try { return CodeReal(inStream, outStream, inSize, outSize, progress);}
catch(const CInBufferException &e) { return e.ErrorCode; }
catch(const CLZOutWindowException &e) { return e.ErrorCode; }
catch(const CLzOutWindowException &e) { return e.ErrorCode; }
catch(...) { return S_FALSE; }
}

33
CPP/7zip/Compress/Arj/ArjDecoder1.h → CPP/7zip/Compress/ArjDecoder1.h
View File

@@ -1,19 +1,16 @@
// Arj/Decoder1.h
// ArjDecoder1.h
#ifndef __COMPRESS_ARJ_DECODER1_H
#define __COMPRESS_ARJ_DECODER1_H
#include "../../../Common/MyCom.h"
#include "../../ICoder.h"
#include "../../Common/MSBFDecoder.h"
#include "../../Common/InBuffer.h"
#include "../LZ/LZOutWindow.h"
#include "../../Common/MyCom.h"
/*
// {23170F69-40C1-278B-0404-010000000000}
DEFINE_GUID(CLSID_CCompressArjDecoder,
0x23170F69, 0x40C1, 0x278B, 0x04, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00);
*/
#include "../ICoder.h"
#include "../Common/InBuffer.h"
#include "BitmDecoder.h"
#include "LzOutWindow.h"
namespace NCompress {
namespace NArj {
@@ -47,8 +44,8 @@ class CCoder :
public ICompressCoder,
public CMyUnknownImp
{
CLZOutWindow m_OutWindowStream;
NStream::NMSBF::CDecoder<CInBuffer> m_InBitStream;
CLzOutWindow m_OutWindowStream;
NBitm::CDecoder<CInBuffer> m_InBitStream;
UInt32 left[2 * NC - 1];
UInt32 right[2 * NC - 1];
@@ -86,15 +83,13 @@ class CCoder :
UInt32 decode_c();
UInt32 decode_p();
HRESULT CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
public:
MY_UNKNOWN_IMP
STDMETHOD(Code)(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
};

15
CPP/7zip/Compress/Arj/ArjDecoder2.cpp → CPP/7zip/Compress/ArjDecoder2.cpp
View File

@@ -1,4 +1,4 @@
// Arj/Decoder2.cpp
// ArjDecoder2.cpp
#include "StdAfx.h"
@@ -9,12 +9,10 @@ namespace NArj {
namespace NDecoder2 {
static const UInt32 kHistorySize = 26624;
// static const UInt32 kMatchMaxLen = 256;
static const UInt32 kMatchMinLen = 3;
HRESULT CCoder::CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 * /* inSize */, const UInt64 *outSize,
ICompressProgressInfo * /* progress */)
HRESULT CCoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 *outSize, ICompressProgressInfo * /* progress */)
{
if (outSize == NULL)
return E_INVALIDARG;
@@ -80,13 +78,12 @@ HRESULT CCoder::CodeReal(ISequentialInStream *inStream,
return m_OutWindowStream.Flush();
}
STDMETHODIMP CCoder::Code(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress)
STDMETHODIMP CCoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
{
try { return CodeReal(inStream, outStream, inSize, outSize, progress);}
catch(const CInBufferException &e) { return e.ErrorCode; }
catch(const CLZOutWindowException &e) { return e.ErrorCode; }
catch(const CLzOutWindowException &e) { return e.ErrorCode; }
catch(...) { return S_FALSE; }
}

59
CPP/7zip/Compress/ArjDecoder2.h Executable file
View File

@@ -0,0 +1,59 @@
// ArjDecoder2.h
#ifndef __COMPRESS_ARJ_DECODER2_H
#define __COMPRESS_ARJ_DECODER2_H
#include "../../Common/MyCom.h"
#include "../ICoder.h"
#include "../Common/InBuffer.h"
#include "BitmDecoder.h"
#include "LzOutWindow.h"
namespace NCompress {
namespace NArj {
namespace NDecoder2 {
class CCoder :
public ICompressCoder,
public CMyUnknownImp
{
CLzOutWindow m_OutWindowStream;
NBitm::CDecoder<CInBuffer> m_InBitStream;
void ReleaseStreams()
{
m_OutWindowStream.ReleaseStream();
m_InBitStream.ReleaseStream();
}
class CCoderReleaser
{
CCoder *m_Coder;
public:
bool NeedFlush;
CCoderReleaser(CCoder *coder): m_Coder(coder), NeedFlush(true) {}
~CCoderReleaser()
{
if (NeedFlush)
m_Coder->m_OutWindowStream.Flush();
m_Coder->ReleaseStreams();
}
};
friend class CCoderReleaser;
HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
public:
MY_UNKNOWN_IMP
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
};
}}}
#endif

26
CPP/7zip/Compress/BZip2/BZip2CRC.cpp
View File

@@ -1,26 +0,0 @@
// BZip2CRC.cpp
#include "StdAfx.h"
#include "BZip2CRC.h"
UInt32 CBZip2CRC::Table[256];
static const UInt32 kBZip2CRCPoly = 0x04c11db7; /* AUTODIN II, Ethernet, & FDDI */
void CBZip2CRC::InitTable()
{
for (UInt32 i = 0; i < 256; i++)
{
UInt32 r = (i << 24);
for (int j = 8; j > 0; j--)
r = (r & 0x80000000) ? ((r << 1) ^ kBZip2CRCPoly) : (r << 1);
Table[i] = r;
}
}
class CBZip2CRCTableInit
{
public:
CBZip2CRCTableInit() { CBZip2CRC::InitTable(); }
} g_BZip2CRCTableInit;

8
CPP/7zip/Compress/BZip2/StdAfx.h
View File

@@ -1,8 +0,0 @@
// StdAfx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#include "../../../Common/MyWindows.h"
#endif

0
CPP/7zip/Compress/BZip2/BZip2Const.h → CPP/7zip/Compress/BZip2Const.h
View File

26
CPP/7zip/Compress/BZip2Crc.cpp Executable file
View File

@@ -0,0 +1,26 @@
// BZip2Crc.cpp
#include "StdAfx.h"
#include "BZip2Crc.h"
UInt32 CBZip2Crc::Table[256];
static const UInt32 kBZip2CrcPoly = 0x04c11db7; /* AUTODIN II, Ethernet, & FDDI */
void CBZip2Crc::InitTable()
{
for (UInt32 i = 0; i < 256; i++)
{
UInt32 r = (i << 24);
for (int j = 8; j > 0; j--)
r = (r & 0x80000000) ? ((r << 1) ^ kBZip2CrcPoly) : (r << 1);
Table[i] = r;
}
}
class CBZip2CrcTableInit
{
public:
CBZip2CrcTableInit() { CBZip2Crc::InitTable(); }
} g_BZip2CrcTableInit;

10
CPP/7zip/Compress/BZip2/BZip2CRC.h → CPP/7zip/Compress/BZip2Crc.h
View File

@@ -1,28 +1,28 @@
// BZip2CRC.h
// BZip2Crc.h
#ifndef __BZIP2_CRC_H
#define __BZIP2_CRC_H
#include "Common/Types.h"
class CBZip2CRC
class CBZip2Crc
{
UInt32 _value;
static UInt32 Table[256];
public:
static void InitTable();
CBZip2CRC(): _value(0xFFFFFFFF) {};
CBZip2Crc(): _value(0xFFFFFFFF) {};
void Init() { _value = 0xFFFFFFFF; }
void UpdateByte(Byte b) { _value = Table[(_value >> 24) ^ b] ^ (_value << 8); }
void UpdateByte(unsigned int b) { _value = Table[(_value >> 24) ^ b] ^ (_value << 8); }
UInt32 GetDigest() const { return _value ^ 0xFFFFFFFF; }
};
class CBZip2CombinedCRC
class CBZip2CombinedCrc
{
UInt32 _value;
public:
CBZip2CombinedCRC(): _value(0){};
CBZip2CombinedCrc(): _value(0){};
void Init() { _value = 0; }
void Update(UInt32 v) { _value = ((_value << 1) | (_value >> 31)) ^ v; }
UInt32 GetDigest() const { return _value ; }

44
CPP/7zip/Compress/BZip2/BZip2Decoder.cpp → CPP/7zip/Compress/BZip2Decoder.cpp
View File

@@ -2,20 +2,22 @@
#include "StdAfx.h"
#include "BZip2Decoder.h"
extern "C"
{
#include "../../../../C/Alloc.h"
#include "../../../C/Alloc.h"
}
#include "../../../Common/Defs.h"
#include "../BWT/Mtf8.h"
#include "BZip2CRC.h"
#include "../../Common/Defs.h"
#include "BZip2Crc.h"
#include "BZip2Decoder.h"
#include "Mtf8.h"
namespace NCompress {
namespace NBZip2 {
#define NO_INLINE MY_FAST_CALL
const UInt32 kNumThreadsMax = 4;
static const UInt32 kBufferSize = (1 << 17);
@@ -92,7 +94,7 @@ UInt32 CDecoder::ReadBits(int numBits) { return m_InStream.ReadBits(numBits); }
Byte CDecoder::ReadByte() {return (Byte)ReadBits(8); }
bool CDecoder::ReadBit() { return ReadBits(1) != 0; }
UInt32 CDecoder::ReadCRC()
UInt32 CDecoder::ReadCrc()
{
UInt32 crc = 0;
for (int i = 0; i < 4; i++)
@@ -103,17 +105,17 @@ UInt32 CDecoder::ReadCRC()
return crc;
}
UInt32 NO_INLINE ReadBits(NStream::NMSBF::CDecoder<CInBuffer> *m_InStream, int num)
UInt32 NO_INLINE ReadBits(NBitm::CDecoder<CInBuffer> *m_InStream, int num)
{
return m_InStream->ReadBits(num);
}
UInt32 NO_INLINE ReadBit(NStream::NMSBF::CDecoder<CInBuffer> *m_InStream)
UInt32 NO_INLINE ReadBit(NBitm::CDecoder<CInBuffer> *m_InStream)
{
return m_InStream->ReadBits(1);
}
static HRESULT NO_INLINE ReadBlock(NStream::NMSBF::CDecoder<CInBuffer> *m_InStream,
static HRESULT NO_INLINE ReadBlock(NBitm::CDecoder<CInBuffer> *m_InStream,
UInt32 *CharCounters, UInt32 blockSizeMax, Byte *m_Selectors, CHuffmanDecoder *m_HuffmanDecoders,
UInt32 *blockSizeRes, UInt32 *origPtrRes, bool *randRes)
{
@@ -280,7 +282,7 @@ void NO_INLINE DecodeBlock1(UInt32 *charCounters, UInt32 blockSize)
static UInt32 NO_INLINE DecodeBlock2(const UInt32 *tt, UInt32 blockSize, UInt32 OrigPtr, COutBuffer &m_OutStream)
{
CBZip2CRC crc;
CBZip2Crc crc;
// it's for speed optimization: prefetch & prevByte_init;
UInt32 tPos = tt[tt[OrigPtr] >> 8];
@@ -371,7 +373,7 @@ static UInt32 NO_INLINE DecodeBlock2(const UInt32 *tt, UInt32 blockSize, UInt32
static UInt32 NO_INLINE DecodeBlock2Rand(const UInt32 *tt, UInt32 blockSize, UInt32 OrigPtr, COutBuffer &m_OutStream)
{
CBZip2CRC crc;
CBZip2Crc crc;
UInt32 randIndex = 1;
UInt32 randToGo = kRandNums[0] - 2;
@@ -492,7 +494,7 @@ HRESULT CDecoder::ReadSignatures(bool &wasFinished, UInt32 &crc)
Byte s[6];
for (int i = 0; i < 6; i++)
s[i] = ReadByte();
crc = ReadCRC();
crc = ReadCrc();
if (s[0] == kFinSig0)
{
if (s[1] != kFinSig1 ||
@@ -503,7 +505,7 @@ HRESULT CDecoder::ReadSignatures(bool &wasFinished, UInt32 &crc)
return S_FALSE;
wasFinished = true;
return (crc == CombinedCRC.GetDigest()) ? S_OK : S_FALSE;
return (crc == CombinedCrc.GetDigest()) ? S_OK : S_FALSE;
}
if (s[0] != kBlockSig0 ||
s[1] != kBlockSig1 ||
@@ -512,7 +514,7 @@ HRESULT CDecoder::ReadSignatures(bool &wasFinished, UInt32 &crc)
s[4] != kBlockSig4 ||
s[5] != kBlockSig5)
return S_FALSE;
CombinedCRC.Update(crc);
CombinedCrc.Update(crc);
return S_OK;
}
@@ -552,7 +554,7 @@ HRESULT CDecoder::DecodeFile(bool &isBZ, ICompressProgressInfo *progress)
isBZ = true;
UInt32 dicSize = (UInt32)(s[3] - kArSig3) * kBlockSizeStep;
CombinedCRC.Init();
CombinedCrc.Init();
#ifdef COMPRESS_BZIP2_MT
if (MtMode)
{
@@ -608,9 +610,8 @@ HRESULT CDecoder::DecodeFile(bool &isBZ, ICompressProgressInfo *progress)
return S_OK;
}
HRESULT CDecoder::CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 * /* inSize */, const UInt64 * /* outSize */,
ICompressProgressInfo *progress)
HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 * /* outSize */, ICompressProgressInfo *progress)
{
if (!m_InStream.Create(kBufferSize))
return E_OUTOFMEMORY;
@@ -630,9 +631,8 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream,
return isBZ ? S_OK: S_FALSE;
}
STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress)
STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
{
try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
catch(const CInBufferException &e) { return e.ErrorCode; }

41
CPP/7zip/Compress/BZip2/BZip2Decoder.h → CPP/7zip/Compress/BZip2Decoder.h
View File

@@ -1,23 +1,24 @@
// Compress/BZip2/Decoder.h
// Compress/BZip2Decoder.h
#ifndef __COMPRESS_BZIP2_DECODER_H
#define __COMPRESS_BZIP2_DECODER_H
#include "../../ICoder.h"
#include "../../../Common/MyCom.h"
#include "../../Common/MSBFDecoder.h"
#include "../../Common/InBuffer.h"
#include "../../Common/OutBuffer.h"
#include "../Huffman/HuffmanDecoder.h"
#include "BZip2Const.h"
#include "BZip2CRC.h"
#include "../../Common/MyCom.h"
#ifdef COMPRESS_BZIP2_MT
#include "../../../Windows/Thread.h"
#include "../../../Windows/Synchronization.h"
#include "../../Windows/Synchronization.h"
#include "../../Windows/Thread.h"
#endif
#define NO_INLINE MY_FAST_CALL
#include "../ICoder.h"
#include "../Common/InBuffer.h"
#include "../Common/OutBuffer.h"
#include "BitmDecoder.h"
#include "BZip2Const.h"
#include "BZip2Crc.h"
#include "HuffmanDecoder.h"
namespace NCompress {
namespace NBZip2 {
@@ -67,7 +68,7 @@ class CDecoder :
public:
COutBuffer m_OutStream;
Byte MtPad[1 << 8]; // It's pad for Multi-Threading. Must be >= Cache_Line_Size.
NStream::NMSBF::CDecoder<CInBuffer> m_InStream;
NBitm::CDecoder<CInBuffer> m_InStream;
Byte m_Selectors[kNumSelectorsMax];
CHuffmanDecoder m_HuffmanDecoders[kNumTablesMax];
private:
@@ -77,12 +78,11 @@ private:
UInt32 ReadBits(int numBits);
Byte ReadByte();
bool ReadBit();
UInt32 ReadCRC();
UInt32 ReadCrc();
HRESULT PrepareBlock(CState &state);
HRESULT DecodeFile(bool &isBZ, ICompressProgressInfo *progress);
HRESULT CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
class CDecoderFlusher
{
CDecoder *_decoder;
@@ -98,7 +98,7 @@ private:
};
public:
CBZip2CombinedCRC CombinedCRC;
CBZip2CombinedCrc CombinedCrc;
#ifdef COMPRESS_BZIP2_MT
ICompressProgressInfo *Progress;
@@ -144,9 +144,8 @@ public:
#endif
STDMETHOD(Code)(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);

56
CPP/7zip/Compress/BZip2/BZip2Encoder.cpp → CPP/7zip/Compress/BZip2Encoder.cpp
View File

@@ -4,15 +4,14 @@
extern "C"
{
#include "../../../../C/Alloc.h"
#include "../../../../C/BwtSort.h"
#include "../../../../C/HuffEnc.h"
#include "../../../C/Alloc.h"
#include "../../../C/BwtSort.h"
#include "../../../C/HuffEnc.h"
}
#include "BZip2Crc.h"
#include "BZip2Encoder.h"
#include "../BWT/Mtf8.h"
#include "BZip2CRC.h"
#include "Mtf8.h"
namespace NCompress {
namespace NBZip2 {
@@ -239,7 +238,7 @@ void CThreadInfo::WriteBits2(UInt32 value, UInt32 numBits)
{ m_OutStreamCurrent->WriteBits(value, numBits); }
void CThreadInfo::WriteByte2(Byte b) { WriteBits2(b , 8); }
void CThreadInfo::WriteBit2(bool v) { WriteBits2((v ? 1 : 0), 1); }
void CThreadInfo::WriteCRC2(UInt32 v)
void CThreadInfo::WriteCrc2(UInt32 v)
{
for (int i = 0; i < 4; i++)
WriteByte2(((Byte)(v >> (24 - i * 8))));
@@ -249,7 +248,7 @@ void CEncoder::WriteBits(UInt32 value, UInt32 numBits)
{ m_OutStream.WriteBits(value, numBits); }
void CEncoder::WriteByte(Byte b) { WriteBits(b , 8); }
void CEncoder::WriteBit(bool v) { WriteBits((v ? 1 : 0), 1); }
void CEncoder::WriteCRC(UInt32 v)
void CEncoder::WriteCrc(UInt32 v)
{
for (int i = 0; i < 4; i++)
WriteByte(((Byte)(v >> (24 - i * 8))));
@@ -284,7 +283,7 @@ void CThreadInfo::EncodeBlock(const Byte *block, UInt32 blockSize)
if (inUse[i])
{
inUse16[i >> 4] = true;
mtf.Buffer[numInUse++] = (Byte)i;
mtf.Buf[numInUse++] = (Byte)i;
}
for (i = 0; i < 16; i++)
WriteBit2(inUse16[i]);
@@ -583,7 +582,7 @@ UInt32 CThreadInfo::EncodeBlockWithHeaders(const Byte *block, UInt32 blockSize)
WriteByte2(kBlockSig4);
WriteByte2(kBlockSig5);
CBZip2CRC crc;
CBZip2Crc crc;
int numReps = 0;
Byte prevByte = block[0];
UInt32 i = 0;
@@ -608,7 +607,7 @@ UInt32 CThreadInfo::EncodeBlockWithHeaders(const Byte *block, UInt32 blockSize)
}
while (++i < blockSize);
UInt32 crcRes = crc.GetDigest();
WriteCRC2(crcRes);
WriteCrc2(crcRes);
EncodeBlock(block, blockSize);
return crcRes;
}
@@ -689,7 +688,7 @@ HRESULT CThreadInfo::EncodeBlock3(UInt32 blockSize)
Encoder->ThreadsInfo[m_BlockIndex].CanWriteEvent.Lock();
#endif
for (UInt32 i = 0; i < m_NumCrcs; i++)
Encoder->CombinedCRC.Update(m_CRCs[i]);
Encoder->CombinedCrc.Update(m_CRCs[i]);
Encoder->WriteBytes(m_TempArray, outStreamTemp.GetPos(), outStreamTemp.GetCurByte());
HRESULT res = S_OK;
#ifdef COMPRESS_BZIP2_MT
@@ -720,9 +719,8 @@ void CEncoder::WriteBytes(const Byte *data, UInt32 sizeInBits, Byte lastByte)
}
HRESULT CEncoder::CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 * /* inSize */, const UInt64 * /* outSize */,
ICompressProgressInfo *progress)
HRESULT CEncoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 * /* outSize */, ICompressProgressInfo *progress)
{
#ifdef COMPRESS_BZIP2_MT
Progress = progress;
@@ -764,7 +762,7 @@ HRESULT CEncoder::CodeReal(ISequentialInStream *inStream,
CFlusher flusher(this);
CombinedCRC.Init();
CombinedCrc.Init();
#ifdef COMPRESS_BZIP2_MT
NextBlockIndex = 0;
StreamWasFinished = false;
@@ -824,13 +822,12 @@ HRESULT CEncoder::CodeReal(ISequentialInStream *inStream,
WriteByte(kFinSig4);
WriteByte(kFinSig5);
WriteCRC(CombinedCRC.GetDigest());
WriteCrc(CombinedCrc.GetDigest());
return S_OK;
}
STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress)
STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
{
try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
catch(const CInBufferException &e) { return e.ErrorCode; }
@@ -838,19 +835,18 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
catch(...) { return S_FALSE; }
}
HRESULT CEncoder::SetCoderProperties(const PROPID *propIDs,
const PROPVARIANT *properties, UInt32 numProperties)
HRESULT CEncoder::SetCoderProperties(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps)
{
for(UInt32 i = 0; i < numProperties; i++)
for(UInt32 i = 0; i < numProps; i++)
{
const PROPVARIANT &property = properties[i];
const PROPVARIANT &prop = props[i];
switch(propIDs[i])
{
case NCoderPropID::kNumPasses:
{
if (property.vt != VT_UI4)
if (prop.vt != VT_UI4)
return E_INVALIDARG;
UInt32 numPasses = property.ulVal;
UInt32 numPasses = prop.ulVal;
if (numPasses == 0)
numPasses = 1;
if (numPasses > kNumPassesMax)
@@ -861,9 +857,9 @@ HRESULT CEncoder::SetCoderProperties(const PROPID *propIDs,
}
case NCoderPropID::kDictionarySize:
{
if (property.vt != VT_UI4)
if (prop.vt != VT_UI4)
return E_INVALIDARG;
UInt32 dictionary = property.ulVal / kBlockSizeStep;
UInt32 dictionary = prop.ulVal / kBlockSizeStep;
if (dictionary < kBlockSizeMultMin)
dictionary = kBlockSizeMultMin;
else if (dictionary > kBlockSizeMultMax)
@@ -874,9 +870,9 @@ HRESULT CEncoder::SetCoderProperties(const PROPID *propIDs,
case NCoderPropID::kNumThreads:
{
#ifdef COMPRESS_BZIP2_MT
if (property.vt != VT_UI4)
if (prop.vt != VT_UI4)
return E_INVALIDARG;
NumThreads = property.ulVal;
NumThreads = prop.ulVal;
if (NumThreads < 1)
NumThreads = 1;
#endif

49
CPP/7zip/Compress/BZip2/BZip2Encoder.h → CPP/7zip/Compress/BZip2Encoder.h
View File

@@ -1,21 +1,25 @@
// Compress/BZip2/Encoder.h
// Compress/BZip2Encoder.h
#ifndef __COMPRESS_BZIP2_ENCODER_H
#define __COMPRESS_BZIP2_ENCODER_H
#include "../../ICoder.h"
#include "../../../Common/MyCom.h"
#include "../../Common/MSBFEncoder.h"
#include "../../Common/InBuffer.h"
#include "../../Common/OutBuffer.h"
#include "BZip2Const.h"
#include "BZip2CRC.h"
#include "../../Common/Defs.h"
#include "../../Common/MyCom.h"
#ifdef COMPRESS_BZIP2_MT
#include "../../../Windows/Thread.h"
#include "../../../Windows/Synchronization.h"
#include "../../Windows/Synchronization.h"
#include "../../Windows/Thread.h"
#endif
#include "../ICoder.h"
#include "../Common/InBuffer.h"
#include "../Common/OutBuffer.h"
#include "BitmEncoder.h"
#include "BZip2Const.h"
#include "BZip2Crc.h"
namespace NCompress {
namespace NBZip2 {
@@ -38,13 +42,13 @@ public:
void Flush()
{
if(m_BitPos < 8)
if (m_BitPos < 8)
WriteBits(0, m_BitPos);
}
void WriteBits(UInt32 value, int numBits)
{
while(numBits > 0)
while (numBits > 0)
{
int numNewBits = MyMin(numBits, m_BitPos);
numBits -= numNewBits;
@@ -108,7 +112,7 @@ private:
void WriteBits2(UInt32 value, UInt32 numBits);
void WriteByte2(Byte b);
void WriteBit2(bool v);
void WriteCRC2(UInt32 v);
void WriteCrc2(UInt32 v);
void EncodeBlock(const Byte *block, UInt32 blockSize);
UInt32 EncodeBlockWithHeaders(const Byte *block, UInt32 blockSize);
@@ -158,9 +162,9 @@ class CEncoder :
public:
CInBuffer m_InStream;
Byte MtPad[1 << 8]; // It's pad for Multi-Threading. Must be >= Cache_Line_Size.
NStream::NMSBF::CEncoder<COutBuffer> m_OutStream;
CBitmEncoder<COutBuffer> m_OutStream;
UInt32 NumPasses;
CBZip2CombinedCRC CombinedCRC;
CBZip2CombinedCrc CombinedCrc;
#ifdef COMPRESS_BZIP2_MT
CThreadInfo *ThreadsInfo;
@@ -186,7 +190,7 @@ public:
void WriteBits(UInt32 value, UInt32 numBits);
void WriteByte(Byte b);
void WriteBit(bool v);
void WriteCRC(UInt32 v);
void WriteCrc(UInt32 v);
#ifdef COMPRESS_BZIP2_MT
HRESULT Create();
@@ -227,15 +231,12 @@ public:
MY_UNKNOWN_IMP1(ICompressSetCoderProperties)
#endif
HRESULT CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
STDMETHOD(Code)(ISequentialInStream *inStream,
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
STDMETHOD(SetCoderProperties)(const PROPID *propIDs,
const PROPVARIANT *properties, UInt32 numProperties);
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
STDMETHOD(SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps);
#ifdef COMPRESS_BZIP2_MT
STDMETHOD(SetNumberOfThreads)(UInt32 numThreads);

5
CPP/7zip/Compress/BZip2/BZip2Register.cpp → CPP/7zip/Compress/BZip2Register.cpp
View File

@@ -1,10 +1,11 @@
// Bzip2Register.cpp
// BZip2Register.cpp
#include "StdAfx.h"
#include "../../Common/RegisterCodec.h"
#include "../Common/RegisterCodec.h"
#include "BZip2Decoder.h"
static void *CreateCodec() { return (void *)(ICompressCoder *)(new NCompress::NBZip2::CDecoder); }
#if !defined(EXTRACT_ONLY) && !defined(BZIP2_EXTRACT_ONLY)
#include "BZip2Encoder.h"

7
CPP/7zip/Compress/Branch/x86_2.cpp → CPP/7zip/Compress/Bcj2Coder.cpp
View File

@@ -1,13 +1,14 @@
// x86_2.cpp
// Bcj2Coder.cpp
#include "StdAfx.h"
#include "x86_2.h"
extern "C"
{
#include "../../../../C/Alloc.h"
#include "../../../C/Alloc.h"
}
#include "Bcj2Coder.h"
namespace NCompress {
namespace NBcj2 {

14
CPP/7zip/Compress/Branch/x86_2.h → CPP/7zip/Compress/Bcj2Coder.h
View File

@@ -1,11 +1,13 @@
// x86_2.h
// Bcj2Coder.h
#ifndef __BRANCH_X86_2_H
#define __BRANCH_X86_2_H
#ifndef __COMPRESS_BCJ2_CODER_H
#define __COMPRESS_BCJ2_CODER_H
#include "../../../Common/MyCom.h"
#include "../RangeCoder/RangeCoderBit.h"
#include "../../ICoder.h"
#include "../../Common/MyCom.h"
#include "../ICoder.h"
#include "RangeCoderBit.h"
namespace NCompress {
namespace NBcj2 {

7
CPP/7zip/Compress/Branch/BCJ2Register.cpp → CPP/7zip/Compress/Bcj2Register.cpp
View File

@@ -1,10 +1,11 @@
// BranchRegister.cpp
// Bcj2Register.cpp
#include "StdAfx.h"
#include "../../Common/RegisterCodec.h"
#include "../Common/RegisterCodec.h"
#include "Bcj2Coder.h"
#include "x86_2.h"
static void *CreateCodec() { return (void *)(ICompressCoder2 *)(new NCompress::NBcj2::CDecoder()); }
#ifndef EXTRACT_ONLY
static void *CreateCodecOut() { return (void *)(ICompressCoder2 *)(new NCompress::NBcj2::CEncoder()); }

5
CPP/7zip/Compress/Branch/x86.cpp → CPP/7zip/Compress/BcjCoder.cpp
View File

@@ -1,7 +1,8 @@
// x86.cpp
// BcjCoder.cpp
#include "StdAfx.h"
#include "x86.h"
#include "BcjCoder.h"
UInt32 CBCJ_x86_Encoder::SubFilter(Byte *data, UInt32 size)
{

11
CPP/7zip/Compress/Branch/x86.h → CPP/7zip/Compress/BcjCoder.h
View File

@@ -1,14 +1,15 @@
// x86.h
// BcjCoder.h
#ifndef __X86_H
#define __X86_H
#ifndef __COMPRESS_BCJ_CODER_H
#define __COMPRESS_BCJ_CODER_H
#include "BranchCoder.h"
extern "C"
{
#include "../../../../C/Bra.h"
#include "../../../C/Bra.h"
}
#include "BranchCoder.h"
struct CBranch86
{
UInt32 _prevMask;

7
CPP/7zip/Compress/Branch/BCJRegister.cpp → CPP/7zip/Compress/BcjRegister.cpp
View File

@@ -1,10 +1,11 @@
// BranchRegister.cpp
// BcjRegister.cpp
#include "StdAfx.h"
#include "../../Common/RegisterCodec.h"
#include "../Common/RegisterCodec.h"
#include "BcjCoder.h"
#include "x86.h"
static void *CreateCodec() { return (void *)(ICompressFilter *)(new CBCJ_x86_Decoder()); }
#ifndef EXTRACT_ONLY
static void *CreateCodecOut() { return (void *)(ICompressFilter *)(new CBCJ_x86_Encoder()); }

13
CPP/7zip/Common/LSBFDecoder.cpp → CPP/7zip/Compress/BitlDecoder.cpp
View File

@@ -1,17 +1,15 @@
// Stream/LSBFDecoder.cpp
// BitlDecoder.cpp
#include "StdAfx.h"
#include "LSBFDecoder.h"
#include "BitlDecoder.h"
namespace NStream {
namespace NLSBF {
namespace NBitl {
Byte kInvertTable[256];
class CInverterTableInitializer
struct CInverterTableInitializer
{
public:
CInverterTableInitializer()
{
for (int i = 0; i < 256; i++)
@@ -23,5 +21,4 @@ public:
}
} g_InverterTableInitializer;
}}
}

12
CPP/7zip/Common/LSBFDecoder.h → CPP/7zip/Compress/BitlDecoder.h
View File

@@ -1,12 +1,11 @@
// LSBFDecoder.h
// BitlDecoder.h -- the Least Significant Bit of byte is First
#ifndef __STREAM_LSBFDECODER_H
#define __STREAM_LSBFDECODER_H
#ifndef __BITL_DECODER_H
#define __BITL_DECODER_H
#include "../IStream.h"
namespace NStream {
namespace NLSBF {
namespace NBitl {
const int kNumBigValueBits = 8 * 4;
@@ -16,7 +15,6 @@ const int kNumValueBits = 8 * kNumValueBytes;
const UInt32 kMask = (1 << kNumValueBits) - 1;
extern Byte kInvertTable[256];
// the Least Significant Bit of byte is First
template<class TInByte>
class CBaseDecoder
@@ -122,6 +120,6 @@ public:
}
};
}}
}
#endif

17
CPP/7zip/Common/LSBFEncoder.h → CPP/7zip/Compress/BitlEncoder.h
View File

@@ -1,15 +1,11 @@
// Stream/LSBFEncoder.h
// BitlEncoder.h -- the Least Significant Bit of byte is First
#ifndef __STREAM_LSBFENCODER_H
#define __STREAM_LSBFENCODER_H
#ifndef __BITL_ENCODER_H
#define __BITL_ENCODER_H
#include "../IStream.h"
#include "OutBuffer.h"
#include "../Common/OutBuffer.h"
namespace NStream {
namespace NLSBF {
class CEncoder
class CBitlEncoder
{
COutBuffer m_Stream;
int m_BitPos;
@@ -61,7 +57,4 @@ public:
void WriteByte(Byte b) { m_Stream.WriteByte(b);}
};
}}
#endif

13
CPP/7zip/Common/MSBFDecoder.h → CPP/7zip/Compress/BitmDecoder.h
View File

@@ -1,14 +1,11 @@
// MSBFDecoder.h
// the Most Significant Bit of byte is First
// BitmDecoder.h -- the Most Significant Bit of byte is First
#ifndef __STREAM_MSBFDECODER_H
#define __STREAM_MSBFDECODER_H
#ifndef __BITM_DECODER_H
#define __BITM_DECODER_H
#include "../../Common/Types.h"
#include "../IStream.h"
namespace NStream {
namespace NMSBF {
namespace NBitm {
const int kNumBigValueBits = 8 * 4;
const int kNumValueBytes = 3;
@@ -64,6 +61,6 @@ public:
}
};
}}
}
#endif

15
CPP/7zip/Common/MSBFEncoder.h → CPP/7zip/Compress/BitmEncoder.h
View File

@@ -1,17 +1,12 @@
// Stream/MSBFEncoder.h
// BitmEncoder.h -- the Most Significant Bit of byte is First
#ifndef __STREAM_MSBFENCODER_H
#define __STREAM_MSBFENCODER_H
#ifndef __BITM_ENCODER_H
#define __BITM_ENCODER_H
#include "Common/Defs.h"
#include "../IStream.h"
#include "OutBuffer.h"
namespace NStream {
namespace NMSBF {
template<class TOutByte>
class CEncoder
class CBitmEncoder
{
TOutByte m_Stream;
int m_BitPos;
@@ -54,6 +49,4 @@ public:
return m_Stream.GetProcessedSize() + (8 - m_BitPos + 7) / 8; }
};
}}
#endif

8
CPP/7zip/Compress/Branch/StdAfx.h
View File

@@ -1,8 +0,0 @@
// StdAfx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#include "../../../Common/MyWindows.h"
#endif

1
CPP/7zip/Compress/Branch/BranchCoder.cpp → CPP/7zip/Compress/BranchCoder.cpp
View File

@@ -1,6 +1,7 @@
// BranchCoder.cpp
#include "StdAfx.h"
#include "BranchCoder.h"
STDMETHODIMP CBranchConverter::Init()

9
CPP/7zip/Compress/Branch/BranchCoder.h → CPP/7zip/Compress/BranchCoder.h
View File

@@ -1,12 +1,11 @@
// BranchCoder.h
#ifndef __BRANCH_CODER_H
#define __BRANCH_CODER_H
#ifndef __COMPRESS_BRANCH_CODER_H
#define __COMPRESS_BRANCH_CODER_H
#include "Common/MyCom.h"
#include "Common/Types.h"
#include "../../Common/MyCom.h"
#include "../../ICoder.h"
#include "../ICoder.h"
class CBranchConverter:
public ICompressFilter,

5
CPP/7zip/Compress/Branch/BranchMisc.cpp → CPP/7zip/Compress/BranchMisc.cpp
View File

@@ -1,13 +1,14 @@
// BranchMisc.cpp
#include "StdAfx.h"
#include "BranchMisc.h"
extern "C"
{
#include "../../../../C/Bra.h"
#include "../../../C/Bra.h"
}
#include "BranchMisc.h"
UInt32 CBC_ARM_Encoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::ARM_Convert(data, size, _bufferPos, 1); }

4
CPP/7zip/Compress/Branch/BranchMisc.h → CPP/7zip/Compress/BranchMisc.h
View File

@@ -1,7 +1,7 @@
// BranchMisc.h
#ifndef __BRANCHMISC_H
#define __BRANCHMISC_H
#ifndef __COMPRESS_BRANCH_MISC_H
#define __COMPRESS_BRANCH_MISC_H
#include "BranchCoder.h"

2
CPP/7zip/Compress/Branch/BranchRegister.cpp → CPP/7zip/Compress/BranchRegister.cpp
View File

@@ -2,7 +2,7 @@
#include "StdAfx.h"
#include "../../Common/RegisterCodec.h"
#include "../Common/RegisterCodec.h"
#include "BranchMisc.h"

0
CPP/7zip/Compress/ByteSwap/ByteSwap.cpp → CPP/7zip/Compress/ByteSwap.cpp
View File

30
CPP/7zip/Compress/ByteSwap.h Executable file
View File

@@ -0,0 +1,30 @@
// ByteSwap.h
#ifndef __COMPRESS_BYTE_SWAP_H
#define __COMPRESS_BYTE_SWAP_H
#include "../../Common/MyCom.h"
#include "../ICoder.h"
class CByteSwap2:
public ICompressFilter,
public CMyUnknownImp
{
public:
MY_UNKNOWN_IMP
STDMETHOD(Init)();
STDMETHOD_(UInt32, Filter)(Byte *data, UInt32 size);
};
class CByteSwap4:
public ICompressFilter,
public CMyUnknownImp
{
public:
MY_UNKNOWN_IMP
STDMETHOD(Init)();
STDMETHOD_(UInt32, Filter)(Byte *data, UInt32 size);
};
#endif

Some files were not shown because too many files have changed in this diff Show More