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

15.11

Browse Source
This commit is contained in:
Igor Pavlov
2015-11-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 7c8a265a15
commit e24f7fba53
70 changed files with 701 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
C/7zAlloc.c
View File

@@ -1,5 +1,5 @@
/* 7zAlloc.c -- Allocation functions
2015-02-21 : Igor Pavlov : Public domain */
2015-11-09 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -26,7 +26,7 @@ void *SzAlloc(void *p, size_t size)
if (size == 0)
return 0;
#ifdef _SZ_ALLOC_DEBUG
fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);
fprintf(stderr, "\nAlloc %10u bytes; count = %10d", (unsigned)size, g_allocCount);
g_allocCount++;
#endif
return malloc(size);
@@ -51,7 +51,7 @@ void *SzAllocTemp(void *p, size_t size)
if (size == 0)
return 0;
#ifdef _SZ_ALLOC_DEBUG
fprintf(stderr, "\nAlloc_temp %10d bytes; count = %10d", size, g_allocCountTemp);
fprintf(stderr, "\nAlloc_temp %10u bytes; count = %10d", (unsigned)size, g_allocCountTemp);
g_allocCountTemp++;
#ifdef _WIN32
return HeapAlloc(GetProcessHeap(), 0, size);

63
C/7zArcIn.c
View File

@@ -1,5 +1,5 @@
/* 7zArcIn.c -- 7z Input functions
2015-09-28 : Igor Pavlov : Public domain */
2015-11-13 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -942,7 +942,6 @@ typedef struct
static SRes ReadSubStreamsInfo(CSzAr *p, CSzData *sd, CSubStreamInfo *ssi)
{
UInt64 type = 0;
UInt32 i;
UInt32 numSubDigests = 0;
UInt32 numFolders = p->NumFolders;
UInt32 numUnpackStreams = numFolders;
@@ -953,6 +952,7 @@ static SRes ReadSubStreamsInfo(CSzAr *p, CSzData *sd, CSubStreamInfo *ssi)
RINOK(ReadID(sd, &type));
if (type == k7zIdNumUnpackStream)
{
UInt32 i;
ssi->sdNumSubStreams.Data = sd->Data;
numUnpackStreams = 0;
numSubDigests = 0;
@@ -1215,7 +1215,6 @@ static SRes SzReadHeader2(
UInt64 type;
UInt32 numFiles = 0;
UInt32 numEmptyStreams = 0;
UInt32 i;
CSubStreamInfo ssi;
const Byte *emptyStreams = 0;
const Byte *emptyFiles = 0;
@@ -1397,22 +1396,22 @@ static SRes SzReadHeader2(
}
{
UInt32 i;
UInt32 emptyFileIndex = 0;
UInt32 folderIndex = 0;
UInt32 indexInFolder = 0;
UInt32 remSubStreams = 0;
UInt32 numSubStreams = 0;
UInt64 unpackPos = 0;
const Byte *digestsDefs = 0;
const Byte *digestsVals = 0;
UInt32 digestsValsIndex = 0;
UInt32 digestIndex;
Byte allDigestsDefined = 0;
UInt32 curNumSubStreams = (UInt32)(Int32)-1;
Byte isDirMask = 0;
Byte crcMask = 0;
Byte mask = 0x80;
// size_t unpSizesOffset = 0;
CSzData sdCodersUnpSizes;
sdCodersUnpSizes.Data = p->db.UnpackSizesData;
sdCodersUnpSizes.Size = p->db.UnpackSizesDataSize;
@@ -1437,6 +1436,7 @@ static SRes SzReadHeader2(
}
digestIndex = 0;
for (i = 0; i < numFiles; i++, mask >>= 1)
{
if (mask == 0)
@@ -1451,49 +1451,45 @@ static SRes SzReadHeader2(
p->UnpackPositions[i] = unpackPos;
p->CRCs.Vals[i] = 0;
// p->CRCs.Defs[i] = 0;
if (emptyStreams && SzBitArray_Check(emptyStreams , i))
if (emptyStreams && SzBitArray_Check(emptyStreams, i))
{
if (!emptyFiles || !SzBitArray_Check(emptyFiles, emptyFileIndex))
isDirMask |= mask;
emptyFileIndex++;
if (indexInFolder == 0)
if (remSubStreams == 0)
{
p->FileIndexToFolderIndexMap[i] = (UInt32)-1;
continue;
}
}
if (indexInFolder == 0)
if (remSubStreams == 0)
{
/*
v3.13 incorrectly worked with empty folders
v4.07: Loop for skipping empty folders
*/
for (;;)
{
if (folderIndex >= p->db.NumFolders)
return SZ_ERROR_ARCHIVE;
p->FolderStartFileIndex[folderIndex] = i;
if (curNumSubStreams == (UInt32)(Int32)-1);
numSubStreams = 1;
if (ssi.sdNumSubStreams.Data)
{
curNumSubStreams = 1;
if (ssi.sdNumSubStreams.Data != 0)
{
RINOK(SzReadNumber32(&ssi.sdNumSubStreams, &curNumSubStreams));
RINOK(SzReadNumber32(&ssi.sdNumSubStreams, &numSubStreams));
}
}
if (curNumSubStreams != 0)
remSubStreams = numSubStreams;
if (numSubStreams != 0)
break;
curNumSubStreams = (UInt32)(Int32)-1;
folderIndex++; // check it
p->db.FoSizesOffsets[folderIndex] = sdCodersUnpSizes.Data - p->db.UnpackSizesData;
folderIndex++;
}
}
p->FileIndexToFolderIndexMap[i] = folderIndex;
if (emptyStreams && SzBitArray_Check(emptyStreams , i))
if (emptyStreams && SzBitArray_Check(emptyStreams, i))
continue;
indexInFolder++;
if (indexInFolder >= curNumSubStreams)
if (--remSubStreams == 0)
{
UInt64 folderUnpackSize = 0;
UInt64 startFolderUnpackPos;
@@ -1523,7 +1519,7 @@ static SRes SzReadHeader2(
return SZ_ERROR_ARCHIVE;
unpackPos = startFolderUnpackPos + folderUnpackSize;
if (curNumSubStreams == 1 && SzBitWithVals_Check(&p->db.FolderCRCs, i))
if (numSubStreams == 1 && SzBitWithVals_Check(&p->db.FolderCRCs, i))
{
p->CRCs.Vals[i] = p->db.FolderCRCs.Vals[folderIndex];
crcMask |= mask;
@@ -1534,14 +1530,16 @@ static SRes SzReadHeader2(
digestsValsIndex++;
crcMask |= mask;
}
folderIndex++;
indexInFolder = 0;
}
else
{
UInt64 v;
RINOK(ReadNumber(&ssi.sdSizes, &v));
unpackPos += v;
if (unpackPos < v)
return SZ_ERROR_ARCHIVE;
if (allDigestsDefined || (digestsDefs && SzBitArray_Check(digestsDefs, digestIndex)))
{
p->CRCs.Vals[i] = GetUi32(digestsVals + (size_t)digestsValsIndex * 4);
@@ -1550,12 +1548,14 @@ static SRes SzReadHeader2(
}
}
}
if (mask != 0x80)
{
UInt32 byteIndex = (i - 1) >> 3;
p->IsDirs[byteIndex] = isDirMask;
p->CRCs.Defs[byteIndex] = crcMask;
}
p->UnpackPositions[i] = unpackPos;
p->FolderStartFileIndex[folderIndex] = i;
p->db.FoSizesOffsets[folderIndex] = sdCodersUnpSizes.Data - p->db.UnpackSizesData;
@@ -1567,9 +1567,8 @@ static SRes SzReadHeader(
CSzArEx *p,
CSzData *sd,
ILookInStream *inStream,
ISzAlloc *allocMain
,ISzAlloc *allocTemp
)
ISzAlloc *allocMain,
ISzAlloc *allocTemp)
{
// Byte *emptyStreamVector = 0;
// Byte *emptyFileVector = 0;

8
C/7zVersion.h
View File

@@ -1,9 +1,9 @@
#define MY_VER_MAJOR 15
#define MY_VER_MINOR 10
#define MY_VER_MINOR 11
#define MY_VER_BUILD 0
#define MY_VERSION_NUMBERS "15.10"
#define MY_VERSION "15.10 beta"
#define MY_DATE "2015-11-01"
#define MY_VERSION_NUMBERS "15.11"
#define MY_VERSION "15.11 beta"
#define MY_DATE "2015-11-14"
#undef MY_COPYRIGHT
#undef MY_VERSION_COPYRIGHT_DATE
#define MY_AUTHOR_NAME "Igor Pavlov"

1
C/BwtSort.c
View File

@@ -513,4 +513,3 @@ UInt32 BlockSort(UInt32 *Indices, const Byte *data, UInt32 blockSize)
#endif
return Groups[0];
}

10
C/Lzma2Dec.c
View File

@@ -1,5 +1,5 @@
/* Lzma2Dec.c -- LZMA2 Decoder
2014-10-29 : Igor Pavlov : Public domain */
2015-11-09 : Igor Pavlov : Public domain */
/* #define SHOW_DEBUG_INFO */
@@ -103,8 +103,8 @@ static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b)
{
case LZMA2_STATE_CONTROL:
p->control = b;
PRF(printf("\n %4X ", p->decoder.dicPos));
PRF(printf(" %2X", b));
PRF(printf("\n %4X ", (unsigned)p->decoder.dicPos));
PRF(printf(" %2X", (unsigned)b));
if (p->control == 0)
return LZMA2_STATE_FINISHED;
if (LZMA2_IS_UNCOMPRESSED_STATE(p))
@@ -124,7 +124,7 @@ static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b)
case LZMA2_STATE_UNPACK1:
p->unpackSize |= (UInt32)b;
p->unpackSize++;
PRF(printf(" %8d", p->unpackSize));
PRF(printf(" %8u", (unsigned)p->unpackSize));
return (LZMA2_IS_UNCOMPRESSED_STATE(p)) ? LZMA2_STATE_DATA : LZMA2_STATE_PACK0;
case LZMA2_STATE_PACK0:
@@ -134,7 +134,7 @@ static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b)
case LZMA2_STATE_PACK1:
p->packSize |= (UInt32)b;
p->packSize++;
PRF(printf(" %8d", p->packSize));
PRF(printf(" %8u", (unsigned)p->packSize));
return LZMA2_IS_THERE_PROP(LZMA2_GET_LZMA_MODE(p)) ? LZMA2_STATE_PROP:
(p->needInitProp ? LZMA2_STATE_ERROR : LZMA2_STATE_DATA);

8
C/Lzma86Dec.c
View File

@@ -1,5 +1,7 @@
/* Lzma86Dec.c -- LZMA + x86 (BCJ) Filter Decoder
2009-08-14 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
#include "Lzma86.h"
@@ -7,8 +9,8 @@
#include "Bra.h"
#include "LzmaDec.h"
static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
static void SzFree(void *p, void *address) { p = p; MyFree(address); }
static void *SzAlloc(void *p, size_t size) { UNUSED_VAR(p); return MyAlloc(size); }
static void SzFree(void *p, void *address) { UNUSED_VAR(p); MyFree(address); }
SRes Lzma86_GetUnpackSize(const Byte *src, SizeT srcLen, UInt64 *unpackSize)
{

8
C/Lzma86Enc.c
View File

@@ -1,5 +1,7 @@
/* Lzma86Enc.c -- LZMA + x86 (BCJ) Filter Encoder
2009-08-14 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
#include <string.h>
@@ -11,8 +13,8 @@
#define SZE_OUT_OVERFLOW SZE_DATA_ERROR
static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
static void SzFree(void *p, void *address) { p = p; MyFree(address); }
static void *SzAlloc(void *p, size_t size) { UNUSED_VAR(p); return MyAlloc(size); }
static void SzFree(void *p, void *address) { UNUSED_VAR(p); MyFree(address); }
int Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen,
int level, UInt32 dictSize, int filterMode)

18
C/LzmaEnc.c
View File

@@ -1,5 +1,5 @@
/* LzmaEnc.c -- LZMA Encoder
2015-10-15 Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -854,7 +854,7 @@ static void MovePos(CLzmaEnc *p, UInt32 num)
{
#ifdef SHOW_STAT
g_STAT_OFFSET += num;
printf("\n MovePos %d", num);
printf("\n MovePos %u", num);
#endif
if (num != 0)
@@ -871,12 +871,12 @@ static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
#ifdef SHOW_STAT
printf("\n i = %d numPairs = %d ", g_STAT_OFFSET, numPairs / 2);
printf("\n i = %u numPairs = %u ", g_STAT_OFFSET, numPairs / 2);
g_STAT_OFFSET++;
{
UInt32 i;
for (i = 0; i < numPairs; i += 2)
printf("%2d %6d | ", p->matches[i], p->matches[i + 1]);
printf("%2u %6u | ", p->matches[i], p->matches[i + 1]);
}
#endif
@@ -1167,12 +1167,12 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
cur = 0;
#ifdef SHOW_STAT2
if (position >= 0)
/* if (position >= 0) */
{
unsigned i;
printf("\n pos = %4X", position);
for (i = cur; i <= lenEnd; i++)
printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
printf("\nprice[%4X] = %u", position - cur + i, p->opt[i].price);
}
#endif
@@ -1397,13 +1397,13 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
{
UInt32 lenTest2 = lenTest + 1;
UInt32 limit = lenTest2 + p->numFastBytes;
UInt32 nextRepMatchPrice;
if (limit > numAvailFull)
limit = numAvailFull;
for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
lenTest2 -= lenTest + 1;
if (lenTest2 >= 2)
{
UInt32 nextRepMatchPrice;
UInt32 state2 = kRepNextStates[state];
UInt32 posStateNext = (position + lenTest) & p->pbMask;
UInt32 curAndLenCharPrice =
@@ -1487,13 +1487,13 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
const Byte *data2 = data - curBack - 1;
UInt32 lenTest2 = lenTest + 1;
UInt32 limit = lenTest2 + p->numFastBytes;
UInt32 nextRepMatchPrice;
if (limit > numAvailFull)
limit = numAvailFull;
for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
lenTest2 -= lenTest + 1;
if (lenTest2 >= 2)
{
UInt32 nextRepMatchPrice;
UInt32 state2 = kMatchNextStates[state];
UInt32 posStateNext = (position + lenTest) & p->pbMask;
UInt32 curAndLenCharPrice = curAndLenPrice +
@@ -1829,7 +1829,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
len = GetOptimum(p, nowPos32, &pos);
#ifdef SHOW_STAT2
printf("\n pos = %4X, len = %d pos = %d", nowPos32, len, pos);
printf("\n pos = %4X, len = %u pos = %u", nowPos32, len, pos);
#endif
posState = nowPos32 & p->pbMask;

37
C/Sha256.c
View File

@@ -1,5 +1,5 @@
/* Crypto/Sha256.c -- SHA-256 Hash
2015-03-02 : Igor Pavlov : Public domain
2015-11-14 : Igor Pavlov : Public domain
This code is based on public domain code from Wei Dai's Crypto++ library. */
#include "Precomp.h"
@@ -113,10 +113,26 @@ static void Sha256_WriteByteBlock(CSha256 *p)
{
UInt32 W[16];
unsigned j;
UInt32 *state = p->state;
UInt32 *state;
#ifdef _SHA256_UNROLL2
UInt32 a,b,c,d,e,f,g,h;
#else
UInt32 T[8];
#endif
for (j = 0; j < 16; j += 4)
{
const Byte *ccc = p->buffer + j * 4;
W[j ] = GetBe32(ccc);
W[j + 1] = GetBe32(ccc + 4);
W[j + 2] = GetBe32(ccc + 8);
W[j + 3] = GetBe32(ccc + 12);
}
state = p->state;
#ifdef _SHA256_UNROLL2
a = state[0];
b = state[1];
c = state[2];
@@ -126,17 +142,10 @@ static void Sha256_WriteByteBlock(CSha256 *p)
g = state[6];
h = state[7];
#else
UInt32 T[8];
for (j = 0; j < 8; j++)
T[j] = state[j];
#endif
for (j = 0; j < 16; j += 2)
{
W[j ] = GetBe32(p->buffer + j * 4);
W[j + 1] = GetBe32(p->buffer + j * 4 + 4);
}
for (j = 0; j < 64; j += 16)
{
RX_16
@@ -226,11 +235,13 @@ void Sha256_Final(CSha256 *p, Byte *digest)
Sha256_WriteByteBlock(p);
for (i = 0; i < 8; i++)
for (i = 0; i < 8; i += 2)
{
UInt32 v = p->state[i];
SetBe32(digest, v);
digest += 4;
UInt32 v0 = p->state[i];
UInt32 v1 = p->state[i + 1];
SetBe32(digest , v0);
SetBe32(digest + 4, v1);
digest += 8;
}
Sha256_Init(p);

26
C/Util/7zipInstall/7zipInstall.c
View File

@@ -1,5 +1,5 @@
/* 7zipInstall.c - 7-Zip Installer
2015-09-28 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -261,7 +261,7 @@ static LONG MyRegistry_CreateKeyAndVal(HKEY parentKey, LPCWSTR keyName, LPCWSTR
if (res == ERROR_SUCCESS)
{
res = MyRegistry_SetString(destKey, valName, val);
res = RegCloseKey(destKey);
/* res = */ RegCloseKey(destKey);
}
return res;
}
@@ -284,7 +284,7 @@ static LONG MyRegistry_CreateKeyAndVal_32(HKEY parentKey, LPCWSTR keyName, LPCWS
if (res == ERROR_SUCCESS)
{
res = MyRegistry_SetString(destKey, valName, val);
res = RegCloseKey(destKey);
/* res = */ RegCloseKey(destKey);
}
return res;
}
@@ -322,7 +322,7 @@ static Bool FindSignature(CSzFile *stream, UInt64 *resPos)
processed -= k7zStartHeaderSize;
for (pos = 0; pos <= processed; pos++)
{
for (; buf[pos] != '7' && pos <= processed; pos++);
for (; pos <= processed && buf[pos] != '7'; pos++);
if (pos > processed)
break;
if (memcmp(buf + pos, k7zSignature, k7zSignatureSize) == 0)
@@ -598,8 +598,8 @@ static LONG SetRegKey_Path2(HKEY parentKey)
if (res == ERROR_SUCCESS)
{
res = MyRegistry_SetString(destKey, k_Reg_Path32, path);
res = MyRegistry_SetString(destKey, k_Reg_Path, path);
res = RegCloseKey(destKey);
/* res = */ MyRegistry_SetString(destKey, k_Reg_Path, path);
/* res = */ RegCloseKey(destKey);
}
return res;
}
@@ -718,10 +718,10 @@ static void WriteCLSID()
WCHAR destPath[MAX_PATH + 10];
wcscpy(destPath, path);
wcscat(destPath, L"7-zip32.dll");
res = MyRegistry_SetString(destKey, NULL, destPath);
res = MyRegistry_SetString(destKey, L"ThreadingModel", L"Apartment");
/* res = */ MyRegistry_SetString(destKey, NULL, destPath);
/* res = */ MyRegistry_SetString(destKey, L"ThreadingModel", L"Apartment");
// DeleteRegValue(destKey, L"InprocServer32");
res = RegCloseKey(destKey);
/* res = */ RegCloseKey(destKey);
}
#endif
@@ -737,10 +737,10 @@ static void WriteCLSID()
WCHAR destPath[MAX_PATH + 10];
wcscpy(destPath, path);
wcscat(destPath, L"7-zip.dll");
res = MyRegistry_SetString(destKey, NULL, destPath);
res = MyRegistry_SetString(destKey, L"ThreadingModel", L"Apartment");
/* res = */ MyRegistry_SetString(destKey, NULL, destPath);
/* res = */ MyRegistry_SetString(destKey, L"ThreadingModel", L"Apartment");
// DeleteRegValue(destKey, L"InprocServer32");
res = RegCloseKey(destKey);
/* res = */ RegCloseKey(destKey);
}
}
@@ -1083,7 +1083,6 @@ static int Install()
WCHAR sfxPath[MAX_PATH + 2];
Bool needReboot = False;
size_t pathLen;
allocImp.Alloc = SzAlloc;
allocImp.Free = SzFree;
@@ -1116,6 +1115,7 @@ static int Install()
if (res == SZ_OK)
{
size_t pathLen;
if (!g_SilentMode)
{
GetDlgItemTextW(g_HWND, IDE_EXTRACT_PATH, path, MAX_PATH);

6
C/Util/7zipUninstall/7zipUninstall.c
View File

@@ -1,5 +1,5 @@
/* 7zipUninstall.c - 7-Zip Uninstaller
2015-08-09 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -384,7 +384,7 @@ static void WriteCLSID()
if (res == ERROR_SUCCESS)
{
RegDeleteValueW(destKey, k_7zip_CLSID);
res = RegCloseKey(destKey);
/* res = */ RegCloseKey(destKey);
}
}
}
@@ -419,7 +419,7 @@ static void WriteCLSID()
if (res == ERROR_SUCCESS)
{
RegDeleteValueW(destKey, k_7zip_CLSID);
res = RegCloseKey(destKey);
/* res = */ RegCloseKey(destKey);
}
}
}

4
C/Util/Lzma/LzmaUtil.c
View File

@@ -1,5 +1,5 @@
/* LzmaUtil.c -- Test application for LZMA compression
2015-06-13 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "../../Precomp.h"
@@ -133,7 +133,7 @@ static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 file
SRes res;
CLzmaEncProps props;
rs = rs;
UNUSED_VAR(rs);
enc = LzmaEnc_Create(&g_Alloc);
if (enc == 0)

10
C/Util/LzmaLib/LzmaLibExports.c
View File

@@ -1,12 +1,14 @@
/* LzmaLibExports.c -- LZMA library DLL Entry point
2008-10-04 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "../../Precomp.h"
#include <windows.h>
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
{
hInstance = hInstance;
dwReason = dwReason;
lpReserved = lpReserved;
UNUSED_VAR(hInstance);
UNUSED_VAR(dwReason);
UNUSED_VAR(lpReserved);
return TRUE;
}

14
C/Util/SfxSetup/SfxSetup.c
View File

@@ -1,5 +1,5 @@
/* SfxSetup.c - 7z SFX Setup
2015-03-25 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -88,7 +88,7 @@ static unsigned FindItem(const char * const *items, unsigned num, const wchar_t
#ifdef _CONSOLE
static BOOL WINAPI HandlerRoutine(DWORD ctrlType)
{
ctrlType = ctrlType;
UNUSED_VAR(ctrlType);
return TRUE;
}
#endif
@@ -144,7 +144,7 @@ static Bool FindSignature(CSzFile *stream, UInt64 *resPos)
processed -= k7zStartHeaderSize;
for (pos = 0; pos <= processed; pos++)
{
for (; buf[pos] != '7' && pos <= processed; pos++);
for (; pos <= processed && buf[pos] != '7'; pos++);
if (pos > processed)
break;
if (memcmp(buf + pos, k7zSignature, k7zSignatureSize) == 0)
@@ -257,10 +257,10 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
#ifdef _CONSOLE
SetConsoleCtrlHandler(HandlerRoutine, TRUE);
#else
hInstance = hInstance;
hPrevInstance = hPrevInstance;
lpCmdLine = lpCmdLine;
nCmdShow = nCmdShow;
UNUSED_VAR(hInstance);
UNUSED_VAR(hPrevInstance);
UNUSED_VAR(lpCmdLine);
UNUSED_VAR(nCmdShow);
#endif
CrcGenerateTable();

16
C/XzDec.c
View File

@@ -1,5 +1,5 @@
/* XzDec.c -- Xz Decode
2015-05-01 : Igor Pavlov : Public domain */
2015-11-09 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -74,7 +74,7 @@ static void BraState_Free(void *pp, ISzAlloc *alloc)
static SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc)
{
CBraState *p = ((CBraState *)pp);
alloc = alloc;
UNUSED_VAR(alloc);
p->ip = 0;
if (p->methodId == XZ_ID_Delta)
{
@@ -129,9 +129,9 @@ static SRes BraState_Code(void *pp, Byte *dest, SizeT *destLen, const Byte *src,
CBraState *p = ((CBraState *)pp);
SizeT destLenOrig = *destLen;
SizeT srcLenOrig = *srcLen;
UNUSED_VAR(finishMode);
*destLen = 0;
*srcLen = 0;
finishMode = finishMode;
*wasFinished = 0;
while (destLenOrig > 0)
{
@@ -236,8 +236,8 @@ static void SbState_Free(void *pp, ISzAlloc *alloc)
static SRes SbState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc)
{
UNUSED_VAR(pp);
props = props;
alloc = alloc;
UNUSED_VAR(props);
UNUSED_VAR(alloc);
return (propSize == 0) ? SZ_OK : SZ_ERROR_UNSUPPORTED;
}
@@ -251,7 +251,7 @@ static SRes SbState_Code(void *pp, Byte *dest, SizeT *destLen, const Byte *src,
{
CSbDec *p = (CSbDec *)pp;
SRes res;
srcWasFinished = srcWasFinished;
UNUSED_VAR(srcWasFinished);
p->dest = dest;
p->destLen = *destLen;
p->src = src;
@@ -308,7 +308,7 @@ static SRes Lzma2State_Code(void *pp, Byte *dest, SizeT *destLen, const Byte *sr
ELzmaStatus status;
/* ELzmaFinishMode fm = (finishMode == LZMA_FINISH_ANY) ? LZMA_FINISH_ANY : LZMA_FINISH_END; */
SRes res = Lzma2Dec_DecodeToBuf((CLzma2Dec *)pp, dest, destLen, src, srcLen, (ELzmaFinishMode)finishMode, &status);
srcWasFinished = srcWasFinished;
UNUSED_VAR(srcWasFinished);
*wasFinished = (status == LZMA_STATUS_FINISHED_WITH_MARK);
return res;
}
@@ -555,7 +555,7 @@ SRes XzBlock_Parse(CXzBlock *p, const Byte *header)
pos += (unsigned)size;
#ifdef XZ_DUMP
printf("\nf[%d] = %2X: ", i, filter->id);
printf("\nf[%u] = %2X: ", i, (unsigned)filter->id);
{
unsigned i;
for (i = 0; i < size; i++)

5
C/XzIn.c
View File

@@ -1,5 +1,5 @@
/* XzIn.c - Xz input
2015-04-21 : Igor Pavlov : Public domain */
2015-11-08 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -72,7 +72,7 @@ SRes XzBlock_ReadFooter(CXzBlock *p, CXzStreamFlags f, ISeqInStream *inStream)
static SRes Xz_ReadIndex2(CXzStream *p, const Byte *buf, size_t size, ISzAlloc *alloc)
{
size_t i, numBlocks, pos = 1;
size_t numBlocks, pos = 1;
UInt32 crc;
if (size < 5 || buf[0] != 0)
@@ -94,6 +94,7 @@ static SRes Xz_ReadIndex2(CXzStream *p, const Byte *buf, size_t size, ISzAlloc *
Xz_Free(p, alloc);
if (numBlocks != 0)
{
size_t i;
p->numBlocks = numBlocks;
p->numBlocksAllocated = numBlocks;
p->blocks = alloc->Alloc(alloc, sizeof(CXzBlockSizes) * numBlocks);

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

@@ -87,6 +87,8 @@ struct CFolders
return PackPositions[index + 1] - PackPositions[index];
}
CFolders(): NumPackStreams(0), NumFolders(0) {}
void Clear()
{
NumPackStreams = 0;

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

@@ -26,6 +26,7 @@ HINSTANCE g_hInstance;
#define NT_CHECK_FAIL_ACTION return FALSE;
#ifdef _WIN32
extern "C"
BOOL WINAPI DllMain(
#ifdef UNDER_CE
@@ -49,6 +50,7 @@ BOOL WINAPI DllMain(
*/
return TRUE;
}
#endif
DEFINE_GUID(CLSID_CArchiveHandler,
k_7zip_GUID_Data1,

14
CPP/7zip/Archive/Rar/Rar5Handler.cpp
View File

@@ -1825,6 +1825,8 @@ HRESULT CHandler::Open2(IInStream *stream,
int prevSplitFile = -1;
int prevMainFile = -1;
bool nextVol_is_Required = false;
CInArchive arch;
for (;;)
@@ -1861,6 +1863,7 @@ HRESULT CHandler::Open2(IInStream *stream,
if (!inStream || result != S_OK)
{
if (nextVol_is_Required)
_missingVolName = volName;
break;
}
@@ -2111,11 +2114,18 @@ HRESULT CHandler::Open2(IInStream *stream,
}
curBytes += endPos;
nextVol_is_Required = false;
if (!arcInfo.IsVolume())
break;
if (arcInfo.EndOfArchive_was_Read
&& !arcInfo.AreMoreVolumes())
if (arcInfo.EndOfArchive_was_Read)
{
if (!arcInfo.AreMoreVolumes())
break;
nextVol_is_Required = true;
}
}
FillLinks();

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

@@ -640,6 +640,7 @@ HRESULT CInArchive::GetNextItem(CItem &item, ICryptoGetTextPassword *getTextPass
{
ArcInfo.EndFlags = m_BlockHeader.Flags;
UInt32 offset = 7;
if (m_BlockHeader.Flags & NHeader::NArchive::kEndOfArc_Flags_DataCRC)
{
if (processed < offset + 4)
@@ -648,6 +649,7 @@ HRESULT CInArchive::GetNextItem(CItem &item, ICryptoGetTextPassword *getTextPass
ArcInfo.DataCRC = Get32(m_FileHeaderData + offset);
offset += 4;
}
if (m_BlockHeader.Flags & NHeader::NArchive::kEndOfArc_Flags_VolNumber)
{
if (processed < offset + 2)
@@ -657,6 +659,7 @@ HRESULT CInArchive::GetNextItem(CItem &item, ICryptoGetTextPassword *getTextPass
ArcInfo.EndOfArchive_was_Read = true;
}
m_Position += processed;
FinishCryptoBlock();
ArcInfo.EndPos = m_Position;
@@ -699,11 +702,13 @@ HRESULT CInArchive::GetNextItem(CItem &item, ICryptoGetTextPassword *getTextPass
continue;
*/
}
if (m_CryptoMode && m_BlockHeader.HeadSize > (1 << 10))
{
error = k_ErrorType_DecryptionError;
return S_OK;
}
if ((m_BlockHeader.Flags & NHeader::NBlock::kLongBlock) != 0)
{
if (m_FileHeaderData.Size() < 7 + 4)
@@ -1032,7 +1037,10 @@ HRESULT CHandler::Open2(IInStream *stream,
openCallback->QueryInterface(IID_ICryptoGetTextPassword, (void **)&getTextPassword);
}
bool nextVol_is_Required = false;
CInArchive archive;
for (;;)
{
CMyComPtr<IInStream> inStream;
@@ -1072,6 +1080,7 @@ HRESULT CHandler::Open2(IInStream *stream,
if (!inStream || result != S_OK)
{
if (nextVol_is_Required)
_missingVolName = volName;
break;
}
@@ -1191,6 +1200,18 @@ HRESULT CHandler::Open2(IInStream *stream,
arc.PhySize = archive.ArcInfo.GetPhySize();
arc.Stream = inStream;
}
nextVol_is_Required = false;
if (!archive.ArcInfo.IsVolume())
break;
if (archive.ArcInfo.EndOfArchive_was_Read)
{
if (!archive.ArcInfo.AreMoreVolumes())
break;
nextVol_is_Required = true;
}
}
}

1
CPP/7zip/Archive/Rar/RarHandler.h
View File

@@ -45,6 +45,7 @@ struct CInArcInfo
bool IsEncryptOld() const { return (!IsThereEncryptVer() || EncryptVersion < 36); }
bool AreMoreVolumes() const { return (EndFlags & NHeader::NArchive::kEndOfArc_Flags_NextVol) != 0; }
bool Is_VolNumber_Defined() const { return (EndFlags & NHeader::NArchive::kEndOfArc_Flags_VolNumber) != 0; }
bool Is_DataCRC_Defined() const { return (EndFlags & NHeader::NArchive::kEndOfArc_Flags_DataCRC) != 0; }
};

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

@@ -98,6 +98,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
if (!_archive.IsArc) v |= kpv_ErrorFlags_IsNotArc;
if (_archive.Unsupported) v |= kpv_ErrorFlags_UnsupportedFeature;
if (_archive.UnexpectedEnd) v |= kpv_ErrorFlags_UnexpectedEnd;
if (_archive.NoEndAnchor) v |= kpv_ErrorFlags_HeadersError;
prop = v;
break;
}

54
CPP/7zip/Archive/Udf/UdfIn.cpp
View File

@@ -610,6 +610,7 @@ API_FUNC_IsArc IsArc_Udf(const Byte *p, size_t size)
}
}
HRESULT CInArchive::Open2()
{
Clear();
@@ -644,8 +645,10 @@ HRESULT CInArchive::Open2()
CExtent extentVDS;
extentVDS.Parse(buf + i + 16);
*/
const size_t kBufSize = 1 << 11;
Byte buf[kBufSize];
for (SecLogSize = 11;; SecLogSize -= 3)
{
if (SecLogSize < 8)
@@ -665,6 +668,7 @@ HRESULT CInArchive::Open2()
break;
}
}
PhySize = (UInt32)(256 + 1) << SecLogSize;
IsArc = true;
@@ -946,28 +950,63 @@ HRESULT CInArchive::Open2()
}
{
UInt32 secMask = ((UInt32)1 << SecLogSize) - 1;
const UInt32 secMask = ((UInt32)1 << SecLogSize) - 1;
PhySize = (PhySize + secMask) & ~(UInt64)secMask;
}
NoEndAnchor = true;
if (PhySize < fileSize)
{
UInt64 rem = fileSize - PhySize;
const size_t secSize = (size_t)1 << SecLogSize;
RINOK(_stream->Seek(PhySize, STREAM_SEEK_SET, NULL));
size_t bufSize = (UInt32)1 << SecLogSize;
size_t readSize = bufSize;
// some UDF images contain ZEROs before "Anchor Volume Descriptor Pointer" at the end
for (unsigned sec = 0; sec < 1024; sec++)
{
if (rem == 0)
break;
size_t readSize = secSize;
if (readSize > rem)
readSize = (size_t)rem;
RINOK(ReadStream(_stream, buf, &readSize));
if (readSize == bufSize)
if (readSize == 0)
break;
if (readSize == secSize && NoEndAnchor)
{
CTag tag;
if (tag.Parse(buf, readSize) == S_OK)
if (tag.Id == DESC_TYPE_AnchorVolPtr)
if (tag.Parse(buf, readSize) == S_OK &&
tag.Id == DESC_TYPE_AnchorVolPtr)
{
PhySize += bufSize;
NoEndAnchor = false;
rem -= readSize;
PhySize = fileSize - rem;
continue;
}
}
size_t i;
for (i = 0; i < readSize && buf[i] == 0; i++);
if (i != readSize)
break;
rem -= readSize;
}
if (rem == 0)
PhySize = fileSize;
}
return S_OK;
}
HRESULT CInArchive::Open(IInStream *inStream, CProgressVirt *progress)
{
_progress = progress;
@@ -1000,6 +1039,7 @@ void CInArchive::Clear()
IsArc = false;
Unsupported = false;
UnexpectedEnd = false;
NoEndAnchor = false;
PhySize = 0;
FileSize = 0;

1
CPP/7zip/Archive/Udf/UdfIn.h
View File

@@ -370,6 +370,7 @@ public:
bool IsArc;
bool Unsupported;
bool UnexpectedEnd;
bool NoEndAnchor;
void UpdatePhySize(UInt64 val)
{

32
CPP/7zip/Archive/Zip/ZipIn.cpp
View File

@@ -188,9 +188,9 @@ API_FUNC_IsArc IsArc_Zip(const Byte *p, size_t size)
// Crc = Get32(p + 10);
// PackSize = Get32(p + 14);
// Size = Get32(p + 18);
unsigned nameSize = Get16(p + 22);
const unsigned nameSize = Get16(p + 22);
unsigned extraSize = Get16(p + 24);
UInt32 extraOffset = kLocalHeaderSize + (UInt32)nameSize;
const UInt32 extraOffset = kLocalHeaderSize + (UInt32)nameSize;
if (extraOffset + extraSize > (1 << 16))
return k_IsArc_Res_NO;
@@ -562,13 +562,21 @@ bool CInArchive::ReadLocalItem(CItemEx &item)
// return false;
}
}
if (!CheckDosTime(item.Time))
{
HeadersWarning = true;
// return false;
}
if (item.Name.Len() != nameSize)
{
// we support "bad" archives with null-terminated name.
if (item.Name.Len() + 1 != nameSize)
return false;
HeadersWarning = true;
}
return item.LocalFullHeaderSize <= ((UInt32)1 << 16);
}
@@ -782,9 +790,9 @@ HRESULT CInArchive::ReadCdItem(CItemEx &item)
item.Crc = Get32(p + 12);
item.PackSize = Get32(p + 16);
item.Size = Get32(p + 20);
unsigned nameSize = Get16(p + 24);
UInt16 extraSize = Get16(p + 26);
UInt16 commentSize = Get16(p + 28);
const unsigned nameSize = Get16(p + 24);
const unsigned extraSize = Get16(p + 26);
const unsigned commentSize = Get16(p + 28);
UInt32 diskNumberStart = Get16(p + 30);
item.InternalAttrib = Get16(p + 32);
item.ExternalAttrib = Get32(p + 34);
@@ -961,7 +969,7 @@ HRESULT CInArchive::TryReadCd(CObjectVector<CItemEx> &items, UInt64 cdOffset, UI
CItemEx cdItem;
RINOK(ReadCdItem(cdItem));
items.Add(cdItem);
if (progress && items.Size() % 1 == 0)
if (progress && (items.Size() & 0xFFF) == 0)
RINOK(progress->SetCompletedCD(items.Size()));
}
return (m_Position - cdOffset == cdSize) ? S_OK : S_FALSE;
@@ -1009,6 +1017,7 @@ bool IsStrangeItem(const CItem &item)
return item.Name.Len() > (1 << 14) || item.Method > (1 << 8);
}
HRESULT CInArchive::ReadLocals(
CObjectVector<CItemEx> &items, CProgressVirt *progress)
{
@@ -1037,7 +1046,8 @@ HRESULT CInArchive::ReadLocals(
return S_FALSE;
throw;
}
if (progress && items.Size() % 1 == 0)
if (progress && (items.Size() & 0xFF) == 0)
RINOK(progress->SetCompletedLocal(items.Size(), item.LocalHeaderPos));
}
@@ -1154,15 +1164,17 @@ HRESULT CInArchive::ReadHeaders2(CObjectVector<CItemEx> &items, CProgressVirt *p
HeadersError = true;
return S_OK;
}
_inBufMode = true;
_inBuffer.Init();
cdAbsOffset = m_Position - 4;
for (;;)
{
CItemEx cdItem;
RINOK(ReadCdItem(cdItem));
cdItems.Add(cdItem);
if (progress && cdItems.Size() % 1 == 0)
if (progress && (cdItems.Size() & 0xFFF) == 0)
RINOK(progress->SetCompletedCD(items.Size()));
m_Signature = ReadUInt32();
if (m_Signature != NSignature::kCentralFileHeader)
@@ -1183,6 +1195,7 @@ HRESULT CInArchive::ReadHeaders2(CObjectVector<CItemEx> &items, CProgressVirt *p
CEcd64 ecd64;
bool isZip64 = false;
UInt64 ecd64AbsOffset = m_Position - 4;
if (m_Signature == NSignature::kEcd64)
{
IsZip64 = isZip64 = true;
@@ -1213,6 +1226,7 @@ HRESULT CInArchive::ReadHeaders2(CObjectVector<CItemEx> &items, CProgressVirt *p
(!items.IsEmpty())))
return S_FALSE;
}
if (m_Signature == NSignature::kEcd64Locator)
{
if (!isZip64)
@@ -1224,6 +1238,7 @@ HRESULT CInArchive::ReadHeaders2(CObjectVector<CItemEx> &items, CProgressVirt *p
return S_FALSE;
m_Signature = ReadUInt32();
}
if (m_Signature != NSignature::kEcd)
return S_FALSE;
@@ -1323,6 +1338,7 @@ HRESULT CInArchive::ReadHeaders2(CObjectVector<CItemEx> &items, CProgressVirt *p
return S_OK;
}
HRESULT CInArchive::ReadHeaders(CObjectVector<CItemEx> &items, CProgressVirt *progress)
{
HRESULT res;

5
CPP/7zip/Bundles/LzmaCon/makefile.gcc
View File

@@ -18,7 +18,6 @@ FILE_IO =FileIO
FILE_IO_2 =Windows/$(FILE_IO)
MT_FILES = \
System.o \
LzFindMt.o \
Threads.o \
@@ -60,6 +59,7 @@ OBJS = \
StringConvert.o \
StringToInt.o \
PropVariant.o \
System.o \
7zCrc.o \
7zCrcOpt.o \
Alloc.o \
@@ -150,10 +150,8 @@ StringToInt.o: ../../../Common/StringToInt.cpp
PropVariant.o: ../../../Windows/PropVariant.cpp
$(CXX) $(CFLAGS) ../../../Windows/PropVariant.cpp
ifdef MT_FILES
System.o: ../../../Windows/System.cpp
$(CXX) $(CFLAGS) ../../../Windows/System.cpp
endif
7zCrc.o: ../../../../C/7zCrc.c
$(CXX_C) $(CFLAGS) ../../../../C/7zCrc.c
@@ -195,4 +193,3 @@ Lzma86Enc.o: ../../../../C/Lzma86Enc.c
clean:
-$(RM) $(PROG) $(OBJS)

2
CPP/7zip/Crypto/RandGen.cpp
View File

@@ -73,8 +73,10 @@ void CRandomGenerator::Init()
HASH_UPD(v2);
#endif
#ifdef _WIN32
DWORD tickCount = ::GetTickCount();
HASH_UPD(tickCount);
#endif
for (unsigned j = 0; j < 100; j++)
{

3
CPP/7zip/UI/Agent/AgentProxy.cpp
View File

@@ -248,7 +248,8 @@ HRESULT CProxyArc::Load(const CArc &arc, IProgress *progress)
unsigned len = 0;
bool isPtrName = false;
#ifdef MY_CPU_LE
#if defined(MY_CPU_LE) && defined(_WIN32)
// it works only if (sizeof(wchar_t) == 2)
if (arc.GetRawProps)
{
const void *p;

34
CPP/7zip/UI/Common/ArchiveCommandLine.cpp
View File

@@ -271,7 +271,7 @@ static const unsigned kCommandIndex = 0;
static const char *kCannotFindListFile = "Cannot find listfile";
static const char *kIncorrectListFile = "Incorrect item in listfile.\nCheck charset encoding and -scs switch.";
static const char *kTerminalOutError = "I won't write compressed data to a terminal";
static const char *kSameTerminalError = "I won't write data and program's messages to same terminal";
static const char *kSameTerminalError = "I won't write data and program's messages to same stream";
static const char *kEmptyFilePath = "Empty file path";
static const char *kCannotFindArchive = "Cannot find archive";
@@ -1219,8 +1219,26 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
if (isExtractGroupCommand)
{
if (options.StdOutMode && options.IsStdOutTerminal && options.IsStdErrTerminal)
if (options.StdOutMode)
{
if (
options.Number_for_Percents == k_OutStream_stdout
// || options.Number_for_Out == k_OutStream_stdout
// || options.Number_for_Errors == k_OutStream_stdout
||
(
(options.IsStdOutTerminal && options.IsStdErrTerminal)
&&
(
options.Number_for_Percents != k_OutStream_disabled
// || options.Number_for_Out != k_OutStream_disabled
// || options.Number_for_Errors != k_OutStream_disabled
)
)
)
throw CArcCmdLineException(kSameTerminalError);
}
if (parser[NKey::kOutputDir].ThereIs)
{
eo.OutputDir = us2fs(parser[NKey::kOutputDir].PostStrings[0]);
@@ -1293,8 +1311,18 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
if (updateOptions.StdOutMode && updateOptions.EMailMode)
throw CArcCmdLineException("stdout mode and email mode cannot be combined");
if (updateOptions.StdOutMode && options.IsStdOutTerminal)
if (updateOptions.StdOutMode)
{
if (options.IsStdOutTerminal)
throw CArcCmdLineException(kTerminalOutError);
if (options.Number_for_Percents == k_OutStream_stdout
|| options.Number_for_Out == k_OutStream_stdout
|| options.Number_for_Errors == k_OutStream_stdout)
throw CArcCmdLineException(kSameTerminalError);
}
if (updateOptions.StdInMode)
updateOptions.StdInFileName = parser[NKey::kStdIn].PostStrings.Front();

22
CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
View File

@@ -451,32 +451,42 @@ static UString GetDirPrefixOf(const UString &src)
return s;
}
static bool IsSafePath(const UString &path)
#endif
bool IsSafePath(const UString &path)
{
if (NName::IsAbsolutePath(path))
return false;
UStringVector parts;
SplitPathToParts(path, parts);
int level = 0;
FOR_VECTOR(i, parts)
unsigned level = 0;
FOR_VECTOR (i, parts)
{
const UString &s = parts[i];
if (s.IsEmpty())
{
if (i == 0)
return false;
continue;
}
if (s == L".")
continue;
if (s == L"..")
{
if (level <= 0)
if (level == 0)
return false;
level--;
}
else
level++;
}
return level > 0;
}
#endif
bool CensorNode_CheckPath2(const NWildcard::CCensorNode &node, const CReadArcItem &item, bool &include)
{

33
CPP/7zip/UI/Common/ArchiveOpenCallback.cpp
View File

@@ -73,18 +73,40 @@ struct CInFileStreamVol: public CInFileStream
}
};
// from ArchiveExtractCallback.cpp
bool IsSafePath(const UString &path);
STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStream)
{
COM_TRY_BEGIN
*inStream = NULL;
if (_subArchiveMode)
return S_FALSE;
if (Callback)
{
RINOK(Callback->Open_CheckBreak());
}
UString name2 = name;
#ifndef _SFX
#ifdef _WIN32
name2.Replace(L'/', WCHAR_PATH_SEPARATOR);
#endif
// if (!allowAbsVolPaths)
if (!IsSafePath(name2))
return S_FALSE;
#endif
FString fullPath;
if (!NFile::NName::GetFullPath(_folderPrefix, us2fs(name), fullPath))
if (!NFile::NName::GetFullPath(_folderPrefix, us2fs(name2), fullPath))
return S_FALSE;
if (!_fileInfo.Find(fullPath))
return S_FALSE;
@@ -93,10 +115,15 @@ STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
CInFileStreamVol *inFile = new CInFileStreamVol;
CMyComPtr<IInStream> inStreamTemp = inFile;
if (!inFile->Open(fullPath))
return ::GetLastError();
{
DWORD lastError = ::GetLastError();
if (lastError == 0)
return E_FAIL;
return HRESULT_FROM_WIN32(lastError);
}
FileSizes.Add(_fileInfo.Size);
FileNames.Add(name);
FileNames.Add(name2);
inFile->FileNameIndex = FileNames_WasUsed.Add(true);
inFile->OpenCallbackImp = this;
inFile->OpenCallbackRef = this;

19
CPP/7zip/UI/Common/Bench.cpp
View File

@@ -32,9 +32,7 @@
#include "../../../../C/Alloc.h"
#include "../../../../C/CpuArch.h"
#if defined(_WIN32)
#include "../../../Windows/System.h"
#endif
#ifndef _7ZIP_ST
#include "../../../Windows/Synchronization.h"
@@ -1860,11 +1858,15 @@ static void PrintTotals(IBenchPrintCallback &f, bool showFreq, UInt64 cpuFreq, c
PrintResults(f, res.Usage / numIterations2, res.RPU / numIterations2, res.Rating / numIterations2, showFreq, cpuFreq);
}
static void PrintRequirements(IBenchPrintCallback &f, const char *sizeString, UInt64 size, const char *threadsString, UInt32 numThreads)
static void PrintRequirements(IBenchPrintCallback &f, const char *sizeString,
bool size_Defined, UInt64 size, const char *threadsString, UInt32 numThreads)
{
f.Print("RAM ");
f.Print(sizeString);
if (size_Defined)
PrintNumber(f, (size >> 20), 6);
else
f.Print(" ?");
f.Print(" MB, # ");
f.Print(threadsString);
PrintNumber(f, numThreads, 3);
@@ -2450,15 +2452,13 @@ HRESULT Bench(
return S_FALSE;
UInt32 numCPUs = 1;
UInt64 ramSize = (UInt64)512 << 20;
UInt64 ramSize = (UInt64)(sizeof(size_t)) << 29;
#ifndef _7ZIP_ST
numCPUs = NSystem::GetNumberOfProcessors();
#endif
#if defined(_WIN32)
ramSize = NSystem::GetRamSize();
#endif
bool ramSize_Defined = NSystem::GetRamSize(ramSize);
UInt32 numThreadsSpecified = numCPUs;
@@ -2640,7 +2640,7 @@ HRESULT Bench(
{
printCallback->NewLine();
printCallback->NewLine();
PrintRequirements(*printCallback, "size: ", ramSize, "CPU hardware threads:", numCPUs);
PrintRequirements(*printCallback, "size: ", ramSize_Defined, ramSize, "CPU hardware threads:", numCPUs);
}
if (numThreadsSpecified < 1 || numThreadsSpecified > kNumThreadsMax)
@@ -2834,6 +2834,7 @@ HRESULT Bench(
dicSizeLog = (UInt64)1 << 20;
#endif
if (ramSize_Defined)
for (; dicSizeLog > kBenchMinDicLogSize; dicSizeLog--)
if (GetBenchMemoryUsage(numThreads, ((UInt32)1 << dicSizeLog), totalBenchMode) + (8 << 20) <= ramSize)
break;
@@ -2848,7 +2849,7 @@ HRESULT Bench(
}
}
PrintRequirements(f, "usage:", GetBenchMemoryUsage(numThreads, dict, totalBenchMode), "Benchmark threads: ", numThreads);
PrintRequirements(f, "usage:", true, GetBenchMemoryUsage(numThreads, dict, totalBenchMode), "Benchmark threads: ", numThreads);
f.NewLine();

12
CPP/7zip/UI/Common/PropIDUtils.cpp
View File

@@ -142,15 +142,17 @@ void ConvertPropertyToShortString(char *dest, const PROPVARIANT &prop, PROPID pr
case kpidVa:
{
UInt64 v = 0;
if (ConvertPropVariantToUInt64(prop, v))
{
if (prop.vt == VT_UI4)
v = prop.ulVal;
else if (prop.vt == VT_UI8)
v = (UInt64)prop.uhVal.QuadPart;
else
break;
dest[0] = '0';
dest[1] = 'x';
ConvertUInt64ToHex(prop.ulVal, dest + 2);
ConvertUInt64ToHex(v, dest + 2);
return;
}
break;
}
}
ConvertPropVariantToShortString(prop, dest);

4
CPP/7zip/UI/Common/SortUtils.cpp
View File

@@ -14,8 +14,10 @@ static int CompareStrings(const unsigned *p1, const unsigned *p2, void *param)
void SortFileNames(const UStringVector &strings, CUIntVector &indices)
{
unsigned numItems = strings.Size();
const unsigned numItems = strings.Size();
indices.ClearAndSetSize(numItems);
if (numItems == 0)
return;
unsigned *vals = &indices[0];
for (unsigned i = 0; i < numItems; i++)
vals[i] = i;

2
CPP/7zip/UI/Common/TempFiles.cpp
View File

@@ -17,5 +17,3 @@ void CTempFiles::Clear()
Paths.DeleteBack();
}
}

1
CPP/7zip/UI/Common/UpdateCallback.cpp
View File

@@ -757,4 +757,3 @@ void CArchiveUpdateCallback::InFileStream_On_Destroy(UINT_PTR val)
}
throw 20141125;
}

1
CPP/7zip/UI/Common/UpdatePair.cpp
View File

@@ -92,6 +92,7 @@ void GetUpdatePairInfoList(
{
arcIndices.ClearAndSetSize(numArcItems);
if (numArcItems != 0)
{
unsigned *vals = &arcIndices[0];
for (unsigned i = 0; i < numArcItems; i++)

2
CPP/7zip/UI/Common/WorkDir.cpp
View File

@@ -17,7 +17,7 @@ FString GetWorkDir(const NWorkDir::CInfo &workDirInfo, const FString &path, FStr
{
NWorkDir::NMode::EEnum mode = workDirInfo.Mode;
#ifndef UNDER_CE
#if defined(_WIN32) && !defined(UNDER_CE)
if (workDirInfo.ForRemovableOnly)
{
mode = NWorkDir::NMode::kCurrent;

6
CPP/7zip/UI/Console/Main.cpp
View File

@@ -4,11 +4,13 @@
#include "../../../Common/MyWindows.h"
#ifdef _WIN32
#include <Psapi.h>
#endif
#include "../../../../C/CpuArch.h"
#if defined( _WIN32) && defined( _7ZIP_LARGE_PAGES)
#if defined( _7ZIP_LARGE_PAGES)
#include "../../../../C/Alloc.h"
#endif
@@ -470,7 +472,7 @@ static void PrintHexId(CStdOutStream &so, UInt64 id)
int Main2(
#ifndef _WIN32
int numArgs, const char *args[]
int numArgs, char *args[]
#endif
)
{

4
CPP/7zip/UI/Console/MainAr.cpp
View File

@@ -20,7 +20,7 @@ CStdOutStream *g_ErrStream = NULL;
extern int Main2(
#ifndef _WIN32
int numArgs, const char *args[]
int numArgs, char *args[]
#endif
);
@@ -49,7 +49,7 @@ static void PrintError(const char *message)
int MY_CDECL main
(
#ifndef _WIN32
int numArgs, const char *args[]
int numArgs, char *args[]
#endif
)
{

5
CPP/7zip/UI/Far/StdAfx.h
View File

@@ -3,11 +3,6 @@
#ifndef __STDAFX_H
#define __STDAFX_H
// #define _CRT_SECURE_NO_DEPRECATE
// #include <windows.h>
// #include <stdio.h>
#include "../../../Common/Common.h"
#endif

3
CPP/7zip/UI/FileManager/FM.cpp
View File

@@ -42,6 +42,7 @@ using namespace NFind;
#define MENU_HEIGHT 26
bool g_RAM_Size_Defined;
UInt64 g_RAM_Size;
#ifdef _WIN32
@@ -425,7 +426,7 @@ static void ErrorMessage(const wchar_t *s)
static int WINAPI WinMain2(int nCmdShow)
{
g_RAM_Size = NSystem::GetRamSize();
g_RAM_Size_Defined = NSystem::GetRamSize(g_RAM_Size);
#ifdef _WIN32

58
CPP/7zip/UI/FileManager/Panel.h
View File

@@ -69,31 +69,67 @@ struct CPanelCallback
void PanelCopyItems();
struct CItemProperty
struct CPropColumn
{
UString Name;
int Order;
PROPID ID;
VARTYPE Type;
int Order;
bool IsVisible;
bool IsRawProp;
UInt32 Width;
UString Name;
int Compare(const CItemProperty &a) const { return MyCompare(Order, a.Order); }
bool IsEqualTo(const CPropColumn &a) const
{
return Order == a.Order
&& ID == a.ID
&& Type == a.Type
&& IsVisible == a.IsVisible
&& IsRawProp == a.IsRawProp
&& Width == a.Width
&& Name == a.Name;
}
int Compare(const CPropColumn &a) const { return MyCompare(Order, a.Order); }
int Compare_NameFirst(const CPropColumn &a) const
{
if (ID == kpidName)
{
if (a.ID != kpidName)
return -1;
}
else if (a.ID == kpidName)
return 1;
return MyCompare(Order, a.Order);
}
};
class CItemProperties: public CObjectVector<CItemProperty>
class CPropColumns: public CObjectVector<CPropColumn>
{
public:
int FindItemWithID(PROPID id)
int FindItem_for_PropID(PROPID id) const
{
FOR_VECTOR (i, (*this))
if ((*this)[i].ID == id)
return i;
return -1;
}
bool IsEqualTo(const CPropColumns &props) const
{
if (Size() != props.Size())
return false;
FOR_VECTOR (i, (*this))
if (!(*this)[i].IsEqualTo(props[i]))
return false;
return true;
}
};
struct CTempFileInfo
{
UInt32 FileIndex; // index of file in folder
@@ -284,8 +320,8 @@ private:
void ChangeWindowSize(int xSize, int ySize);
HRESULT InitColumns();
// void InitColumns2(PROPID sortID);
void InsertColumn(unsigned index);
void DeleteColumn(unsigned index);
void AddColumn(const CPropColumn &prop);
void SetFocusedSelectedItem(int index, bool select);
HRESULT RefreshListCtrl(const UString &focusedName, int focusedPos, bool selectFocused,
@@ -446,7 +482,6 @@ public:
void SetFocusToLastRememberedItem();
void ReadListViewInfo();
void SaveListViewInfo();
CPanel() :
@@ -484,8 +519,9 @@ public:
bool _needSaveInfo;
UString _typeIDString;
CListViewInfo _listViewInfo;
CItemProperties _properties;
CItemProperties _visibleProperties;
CPropColumns _columns;
CPropColumns _visibleColumns;
PROPID _sortID;
// int _sortIndex;

6
CPP/7zip/UI/FileManager/PanelItemOpen.cpp
View File

@@ -36,6 +36,7 @@ using namespace NSynchronization;
using namespace NFile;
using namespace NDir;
extern bool g_RAM_Size_Defined;
extern UInt64 g_RAM_Size;
#ifndef _UNICODE
@@ -1173,7 +1174,10 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal, bo
{
NCOM::CPropVariant prop;
_folder->GetProperty(index, kpidSize, &prop);
UInt64 fileLimit = g_RAM_Size / 4;
UInt64 fileLimit = 1 << 22;
if (g_RAM_Size_Defined)
fileLimit = g_RAM_Size / 4;
UInt64 fileSize = 0;
if (!ConvertPropVariantToUInt64(prop, fileSize))
fileSize = fileLimit;

210
CPP/7zip/UI/FileManager/PanelItems.cpp
View File

@@ -82,15 +82,33 @@ static int GetColumnAlign(PROPID propID, VARTYPE varType)
}
}
static int ItemProperty_Compare_NameFirst(void *const *a1, void *const *a2, void * /* param */)
{
return (*(*((const CPropColumn **)a1))).Compare_NameFirst(*(*((const CPropColumn **)a2)));
}
HRESULT CPanel::InitColumns()
{
if (_needSaveInfo)
SaveListViewInfo();
_listView.DeleteAllItems();
_selectedStatusVector.Clear();
ReadListViewInfo();
{
// ReadListViewInfo();
const UString oldType = _typeIDString;
_typeIDString = GetFolderTypeID();
// an empty _typeIDString is allowed.
// we read registry only for new FolderTypeID
if (!_needSaveInfo || _typeIDString != oldType)
_listViewInfo.Read(_typeIDString);
// folders with same FolderTypeID can have different columns
// so we still read columns for that case.
// if (_needSaveInfo && _typeIDString == oldType) return S_OK;
}
// PROPID sortID;
/*
@@ -101,9 +119,8 @@ HRESULT CPanel::InitColumns()
_ascending = _listViewInfo.Ascending;
_properties.Clear();
_columns.Clear();
_needSaveInfo = true;
bool isFsFolder = IsFSFolder() || IsAltStreamsFolder();
{
@@ -125,7 +142,7 @@ HRESULT CPanel::InitColumns()
}
if (propID == kpidIsDir)
continue;
CItemProperty prop;
CPropColumn prop;
prop.Type = varType;
prop.ID = propID;
prop.Name = GetNameOfProperty(propID, name);
@@ -133,7 +150,7 @@ HRESULT CPanel::InitColumns()
prop.IsVisible = GetColumnVisible(propID, isFsFolder);
prop.Width = GetColumnWidth(propID, varType);
prop.IsRawProp = false;
_properties.Add(prop);
_columns.Add(prop);
}
}
@@ -141,13 +158,15 @@ HRESULT CPanel::InitColumns()
{
UInt32 numProps;
_folderRawProps->GetNumRawProps(&numProps);
for (UInt32 i = 0; i < numProps; i++)
{
CMyComBSTR name;
PROPID propID;
RINOK(_folderRawProps->GetRawPropInfo(i, &name, &propID));
CItemProperty prop;
HRESULT res = _folderRawProps->GetRawPropInfo(i, &name, &propID);
if (res != S_OK)
continue;
CPropColumn prop;
prop.Type = VT_EMPTY;
prop.ID = propID;
prop.Name = GetNameOfProperty(propID, name);
@@ -155,83 +174,147 @@ HRESULT CPanel::InitColumns()
prop.IsVisible = GetColumnVisible(propID, isFsFolder);
prop.Width = GetColumnWidth(propID, VT_BSTR);;
prop.IsRawProp = true;
_properties.Add(prop);
_columns.Add(prop);
}
}
// InitColumns2(sortID);
for (;;)
if (!_listView.DeleteColumn(0))
break;
unsigned order = 0;
unsigned i;
for (i = 0; i < _listViewInfo.Columns.Size(); i++)
{
const CColumnInfo &columnInfo = _listViewInfo.Columns[i];
int index = _properties.FindItemWithID(columnInfo.PropID);
int index = _columns.FindItem_for_PropID(columnInfo.PropID);
if (index >= 0)
{
CItemProperty &item = _properties[index];
item.IsVisible = columnInfo.IsVisible;
CPropColumn &item = _columns[index];
if (item.Order >= 0)
continue; // we ignore duplicated items
bool isVisible = columnInfo.IsVisible;
// we enable kpidName, if it was disabled by some incorrect code
if (columnInfo.PropID == kpidName)
isVisible = true;
item.IsVisible = isVisible;
item.Width = columnInfo.Width;
if (columnInfo.IsVisible)
if (isVisible)
item.Order = order++;
continue;
}
}
for (i = 0; i < _properties.Size(); i++)
for (i = 0; i < _columns.Size(); i++)
{
CItemProperty &item = _properties[i];
CPropColumn &item = _columns[i];
if (item.IsVisible && item.Order < 0)
item.Order = order++;
}
for (i = 0; i < _columns.Size(); i++)
{
CPropColumn &item = _columns[i];
if (item.Order < 0)
item.Order = order++;
}
_visibleProperties.Clear();
for (i = 0; i < _properties.Size(); i++)
CPropColumns newColumns;
for (i = 0; i < _columns.Size(); i++)
{
const CItemProperty &prop = _properties[i];
const CPropColumn &prop = _columns[i];
if (prop.IsVisible)
_visibleProperties.Add(prop);
newColumns.Add(prop);
}
// _sortIndex = 0;
_sortID = kpidName;
/*
_sortIndex = 0;
if (_listViewInfo.SortIndex >= 0)
{
int sortIndex = _properties.FindItemWithID(sortID);
int sortIndex = _columns.FindItem_for_PropID(sortID);
if (sortIndex >= 0)
_sortIndex = sortIndex;
}
*/
if (_listViewInfo.IsLoaded)
_sortID = _listViewInfo.SortID;
else
{
_sortID = 0;
if (IsFSFolder() || IsAltStreamsFolder() || IsArcFolder())
_sortID = kpidName;
}
_visibleProperties.Sort();
/* There are restrictions in ListView control:
1) main column (kpidName) must have (LV_COLUMNW::iSubItem = 0)
So we need special sorting for columns.
2) when we add new column, LV_COLUMNW::iOrder can not be larger than already inserted columns)
So we set column order after all columns are added.
*/
newColumns.Sort(ItemProperty_Compare_NameFirst, NULL);
for (i = 0; i < _visibleProperties.Size(); i++)
InsertColumn(i);
if (newColumns.IsEqualTo(_visibleColumns))
return S_OK;
CIntArr columns(newColumns.Size());
for (i = 0; i < newColumns.Size(); i++)
columns[i] = -1;
bool orderError = false;
for (i = 0; i < newColumns.Size(); i++)
{
const CPropColumn &prop = newColumns[i];
if (prop.Order < (int)newColumns.Size() && columns[prop.Order] == -1)
columns[prop.Order] = i;
else
orderError = true;
}
for (;;)
{
unsigned numColumns = _visibleColumns.Size();
if (numColumns == 0)
break;
DeleteColumn(numColumns - 1);
}
for (i = 0; i < newColumns.Size(); i++)
AddColumn(newColumns[i]);
// columns[0], columns[1], .... should be displayed from left to right:
if (!orderError)
_listView.SetColumnOrderArray(_visibleColumns.Size(), columns);
_needSaveInfo = true;
return S_OK;
}
void CPanel::InsertColumn(unsigned index)
void CPanel::DeleteColumn(unsigned index)
{
const CItemProperty &prop = _visibleProperties[index];
_visibleColumns.Delete(index);
_listView.DeleteColumn(index);
}
void CPanel::AddColumn(const CPropColumn &prop)
{
const int index = _visibleColumns.Size();
LV_COLUMNW column;
column.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_ORDER;
column.cx = prop.Width;
column.fmt = GetColumnAlign(prop.ID, prop.Type);
column.iOrder = prop.Order;
// iOrder must be <= _listView.ItemCount
column.iSubItem = index;
column.iOrder = index; // must be <= _listView.ItemCount
column.iSubItem = index; // must be <= _listView.ItemCount
column.pszText = const_cast<wchar_t *>((const wchar_t *)prop.Name);
_visibleColumns.Add(prop);
_listView.InsertColumn(index, &column);
}
HRESULT CPanel::RefreshListCtrl()
{
return RefreshListCtrl(UString(), -1, true, UStringVector());
@@ -959,20 +1042,17 @@ UInt64 CPanel::GetItemSize(int itemIndex) const
return 0;
}
void CPanel::ReadListViewInfo()
{
_typeIDString = GetFolderTypeID();
if (!_typeIDString.IsEmpty())
_listViewInfo.Read(_typeIDString);
}
void CPanel::SaveListViewInfo()
{
if (!_needSaveInfo)
return;
unsigned i;
for (i = 0; i < _visibleProperties.Size(); i++)
for (i = 0; i < _visibleColumns.Size(); i++)
{
CItemProperty &prop = _visibleProperties[i];
CPropColumn &prop = _visibleColumns[i];
LVCOLUMN winColumnInfo;
winColumnInfo.mask = LVCF_ORDER | LVCF_WIDTH;
if (!_listView.GetColumn(i, &winColumnInfo))
@@ -983,14 +1063,18 @@ void CPanel::SaveListViewInfo()
CListViewInfo viewInfo;
// PROPID sortPropID = _properties[_sortIndex].ID;
// PROPID sortPropID = _columns[_sortIndex].ID;
PROPID sortPropID = _sortID;
_visibleProperties.Sort();
// we save columns as "sorted by order" to registry
for (i = 0; i < _visibleProperties.Size(); i++)
CPropColumns sortedProperties = _visibleColumns;
sortedProperties.Sort();
for (i = 0; i < sortedProperties.Size(); i++)
{
const CItemProperty &prop = _visibleProperties[i];
const CPropColumn &prop = sortedProperties[i];
CColumnInfo columnInfo;
columnInfo.IsVisible = prop.IsVisible;
columnInfo.PropID = prop.ID;
@@ -998,13 +1082,13 @@ void CPanel::SaveListViewInfo()
viewInfo.Columns.Add(columnInfo);
}
for (i = 0; i < _properties.Size(); i++)
for (i = 0; i < _columns.Size(); i++)
{
const CItemProperty &prop = _properties[i];
if (!prop.IsVisible)
const CPropColumn &prop = _columns[i];
if (sortedProperties.FindItem_for_PropID(prop.ID) < 0)
{
CColumnInfo columnInfo;
columnInfo.IsVisible = prop.IsVisible;
columnInfo.IsVisible = false;
columnInfo.PropID = prop.ID;
columnInfo.Width = prop.Width;
viewInfo.Columns.Add(columnInfo);
@@ -1040,9 +1124,9 @@ void CPanel::ShowColumnsContextMenu(int x, int y)
menu.CreatePopup();
const int kCommandStart = 100;
FOR_VECTOR (i, _properties)
FOR_VECTOR (i, _columns)
{
const CItemProperty &prop = _properties[i];
const CPropColumn &prop = _columns[i];
UINT flags = MF_STRING;
if (prop.IsVisible)
flags |= MF_CHECKED;
@@ -1053,25 +1137,22 @@ void CPanel::ShowColumnsContextMenu(int x, int y)
int menuResult = menu.Track(TPM_LEFTALIGN | TPM_RETURNCMD | TPM_NONOTIFY, x, y, _listView);
if (menuResult >= kCommandStart && menuResult <= kCommandStart + (int)_properties.Size())
if (menuResult >= kCommandStart && menuResult <= kCommandStart + (int)_columns.Size())
{
int index = menuResult - kCommandStart;
CItemProperty &prop = _properties[index];
CPropColumn &prop = _columns[index];
prop.IsVisible = !prop.IsVisible;
if (prop.IsVisible)
{
unsigned num = _visibleProperties.Size();
prop.Order = num;
_visibleProperties.Add(prop);
InsertColumn(num);
prop.Order = _visibleColumns.Size();
AddColumn(prop);
}
else
{
int visibleIndex = _visibleProperties.FindItemWithID(prop.ID);
int visibleIndex = _visibleColumns.FindItem_for_PropID(prop.ID);
if (visibleIndex >= 0)
{
_visibleProperties.Delete(visibleIndex);
/*
if (_sortIndex == index)
{
@@ -1084,8 +1165,7 @@ void CPanel::ShowColumnsContextMenu(int x, int y)
_sortID = kpidName;
_ascending = true;
}
_listView.DeleteColumn(visibleIndex);
DeleteColumn(visibleIndex);
}
}
}

2
CPP/7zip/UI/FileManager/PanelListNotify.cpp
View File

@@ -175,7 +175,7 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
if (item.cchTextMax <= 1)
return 0;
const CItemProperty &property = _visibleProperties[item.iSubItem];
const CPropColumn &property = _visibleColumns[item.iSubItem];
PROPID propID = property.ID;
if (realIndex == kParentIndex)

16
CPP/7zip/UI/FileManager/PanelSort.cpp
View File

@@ -83,9 +83,9 @@ static inline const wchar_t *GetExtensionPtr(const UString &name)
void CPanel::SetSortRawStatus()
{
_isRawSortProp = false;
FOR_VECTOR (i, _properties)
FOR_VECTOR (i, _columns)
{
const CItemProperty &prop = _properties[i];
const CPropColumn &prop = _columns[i];
if (prop.ID == _sortID)
{
_isRawSortProp = prop.IsRawProp ? 1 : 0;
@@ -169,7 +169,7 @@ int CALLBACK CompareItems2(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
return ::CompareFileTime(&file1.MTime, &file2.MTime);
*/
// PROPID propID = panel->_properties[panel->_sortIndex].ID;
// PROPID propID = panel->_columns[panel->_sortIndex].ID;
NCOM::CPropVariant prop1, prop2;
// Name must be first property
@@ -215,7 +215,7 @@ void CPanel::SortItems(int index)
{
_sortIndex = index;
_ascending = true;
switch (_properties[_sortIndex].ID)
switch (_columns[_sortIndex].ID)
{
case kpidSize:
case kpidPackedSize:
@@ -229,13 +229,15 @@ void CPanel::SortItems(int index)
_listView.SortItems(CompareItems, (LPARAM)this);
_listView.EnsureVisible(_listView.GetFocusedItem(), false);
}
void CPanel::SortItemsWithPropID(PROPID propID)
{
int index = _properties.FindItemWithID(propID);
int index = _columns.FindItem_for_PropID(propID);
if (index >= 0)
SortItems(index);
}
*/
void CPanel::SortItemsWithPropID(PROPID propID)
{
if (propID == _sortID)
@@ -264,8 +266,8 @@ void CPanel::SortItemsWithPropID(PROPID propID)
void CPanel::OnColumnClick(LPNMLISTVIEW info)
{
/*
int index = _properties.FindItemWithID(_visibleProperties[info->iSubItem].ID);
int index = _columns.FindItem_for_PropID(_visibleColumns[info->iSubItem].ID);
SortItems(index);
*/
SortItemsWithPropID(_visibleProperties[info->iSubItem].ID);
SortItemsWithPropID(_visibleColumns[info->iSubItem].ID);
}

2
CPP/7zip/UI/FileManager/ViewSettings.cpp
View File

@@ -97,6 +97,8 @@ void CListViewInfo::Read(const UString &id)
Get32(buf + 4, SortID);
GetBool(buf + 8, Ascending);
IsLoaded = true;
size -= kListViewHeaderSize;
if (size % kColumnInfoSize != 0)
return;

8
CPP/7zip/UI/FileManager/ViewSettings.h
View File

@@ -23,14 +23,22 @@ struct CListViewInfo
CRecordVector<CColumnInfo> Columns;
PROPID SortID;
bool Ascending;
bool IsLoaded;
void Clear()
{
SortID = 0;
Ascending = true;
IsLoaded = false;
Columns.Clear();
}
CListViewInfo():
SortID(0),
Ascending(true),
IsLoaded(false)
{}
/*
int FindColumnWithID(PROPID propID) const
{

14
CPP/7zip/UI/GUI/BenchmarkDialog.cpp
View File

@@ -177,7 +177,9 @@ bool CBenchmarkDialog::OnInit()
m_Dictionary.Attach(GetItem(IDC_BENCH_DICTIONARY));
cur = 0;
UInt64 ramSize = NSystem::GetRamSize();
UInt64 ramSize = (UInt64)(sizeof(size_t)) << 29;
bool ramSize_Defined = NSystem::GetRamSize(ramSize);
#ifdef UNDER_CE
const UInt32 kNormalizedCeSize = (16 << 20);
@@ -187,8 +189,14 @@ bool CBenchmarkDialog::OnInit()
if (Sync.DictionarySize == (UInt32)(Int32)-1)
{
unsigned dicSizeLog;
for (dicSizeLog = 25; dicSizeLog > kBenchMinDicLogSize; dicSizeLog--)
unsigned dicSizeLog = 25;
#ifdef UNDER_CE
dicSizeLog = 20;
#endif
if (ramSize_Defined)
for (; dicSizeLog > kBenchMinDicLogSize; dicSizeLog--)
if (GetBenchMemoryUsage(Sync.NumThreads, ((UInt32)1 << dicSizeLog)) + (8 << 20) <= ramSize)
break;
Sync.DictionarySize = (1 << dicSizeLog);

24
CPP/7zip/UI/GUI/CompressDialog.cpp
View File

@@ -250,9 +250,10 @@ static bool IsMethodSupportedBySfx(int methodID)
return false;
}
static UInt64 GetMaxRamSizeForProgram()
static bool GetMaxRamSizeForProgram(UInt64 &physSize)
{
UInt64 physSize = NSystem::GetRamSize();
physSize = (UInt64)(sizeof(size_t)) << 29;
bool ramSize_Defined = NSystem::GetRamSize(physSize);
const UInt64 kMinSysSize = (1 << 24);
if (physSize <= kMinSysSize)
physSize = 0;
@@ -261,7 +262,7 @@ static UInt64 GetMaxRamSizeForProgram()
const UInt64 kMinUseSize = (1 << 24);
if (physSize < kMinUseSize)
physSize = kMinUseSize;
return physSize;
return ramSize_Defined;
}
@@ -1170,7 +1171,8 @@ void CCompressDialog::SetDictionary()
UInt32 level = GetLevel2();
if (methodID < 0)
return;
const UInt64 maxRamSize = GetMaxRamSizeForProgram();
UInt64 maxRamSize;
bool maxRamSize_Defined = GetMaxRamSizeForProgram(maxRamSize);
switch (methodID)
{
@@ -1196,6 +1198,7 @@ void CCompressDialog::SetDictionary()
if (i == 20 && j > 0)
continue;
UInt32 dict = ((UInt32)(2 + j) << (i - 1));
if (dict >
#ifdef MY_CPU_64BIT
(3 << 29)
@@ -1204,10 +1207,11 @@ void CCompressDialog::SetDictionary()
#endif
)
continue;
AddDictionarySize(dict);
UInt64 decomprSize;
UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
if (dict <= defaultDict && requiredComprSize <= maxRamSize)
if (dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
}
@@ -1242,11 +1246,12 @@ void CCompressDialog::SetDictionary()
AddDictionarySize(dict);
UInt64 decomprSize;
UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
if (dict <= defaultDict && requiredComprSize <= maxRamSize || m_Dictionary.GetCount() == 0)
if ((dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
|| m_Dictionary.GetCount() == 1)
m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
}
SetNearestSelectComboBox(m_Dictionary, defaultDict);
// SetNearestSelectComboBox(m_Dictionary, defaultDict);
break;
}
@@ -1295,11 +1300,12 @@ void CCompressDialog::SetDictionary()
AddDictionarySize(dict);
UInt64 decomprSize;
UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
if (dict <= defaultDict && requiredComprSize <= maxRamSize || m_Dictionary.GetCount() == 0)
if ((dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
|| m_Dictionary.GetCount() == 1)
m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
}
SetNearestSelectComboBox(m_Dictionary, defaultDict);
// SetNearestSelectComboBox(m_Dictionary, defaultDict);
break;
}
}

2
CPP/Common/NewHandler.cpp
View File

@@ -109,7 +109,7 @@ void * __cdecl operator new(size_t size)
}
if (p == 0)
throw CNewException();
printf("Alloc %6d, size = %8d\n", numAllocs, size);
printf("Alloc %6d, size = %8u\n", numAllocs, (unsigned)size);
return p;
}

2
CPP/Common/Random.h
View File

@@ -12,5 +12,3 @@ public:
};
#endif

2
CPP/Common/StringConvert.cpp
View File

@@ -185,7 +185,7 @@ static void UnicodeStringToMultiByte2(AString &dest, const UString &src, UINT co
{
BOOL defUsed = FALSE;
bool isUtf = (codePage == CP_UTF8 || codePage == CP_UTF7);
defaultChar = defaultChar;
// defaultChar = defaultChar;
len = WideCharToMultiByte(codePage, 0, src, src.Len(),
dest.GetBuf(len), len,
(isUtf ? NULL : &defaultChar),

2
CPP/Common/TextConfig.h
View File

@@ -17,5 +17,3 @@ int FindTextConfigItem(const CObjectVector<CTextConfigPair> &pairs, const UStrin
UString GetTextConfigValue(const CObjectVector<CTextConfigPair> &pairs, const UString &id);
#endif

12
CPP/Windows/Control/ListView.h
View File

@@ -32,6 +32,18 @@ public:
int InsertColumn(int columnIndex, const LVCOLUMN *columnInfo) { return ListView_InsertColumn(_window, columnIndex, columnInfo); }
int InsertColumn(int columnIndex, LPCTSTR text, int width);
bool SetColumnOrderArray(int count, const int *columns) { return BOOLToBool(ListView_SetColumnOrderArray(_window, count, columns)); }
/*
int GetNumColumns()
{
HWND header = ListView_GetHeader(_window);
if (!header)
return -1;
return Header_GetItemCount(header);
}
*/
int InsertItem(const LVITEM* item) { return ListView_InsertItem(_window, item); }
int InsertItem(int index, LPCTSTR text);
bool SetItem(const LVITEM* item) { return BOOLToBool(ListView_SetItem(_window, item)); }

2
CPP/Windows/ProcessMessages.h
View File

@@ -10,5 +10,3 @@ void ProcessMessages(HWND window);
}
#endif

1
CPP/Windows/SecurityUtils.cpp
View File

@@ -179,4 +179,3 @@ bool AddLockMemoryPrivilege()
}
}}

58
CPP/Windows/System.cpp
View File

@@ -11,6 +11,8 @@
namespace NWindows {
namespace NSystem {
#ifdef _WIN32
UInt32 GetNumberOfProcessors()
{
SYSTEM_INFO systemInfo;
@@ -18,6 +20,18 @@ UInt32 GetNumberOfProcessors()
return (UInt32)systemInfo.dwNumberOfProcessors;
}
#else
UInt32 GetNumberOfProcessors()
{
return 1;
}
#endif
#ifdef _WIN32
#ifndef UNDER_CE
#if !defined(_WIN64) && defined(__GNUC__)
@@ -45,30 +59,54 @@ typedef BOOL (WINAPI *GlobalMemoryStatusExP)(MY_LPMEMORYSTATUSEX lpBuffer);
#endif
UInt64 GetRamSize()
#endif
bool GetRamSize(UInt64 &size)
{
size = (UInt64)(sizeof(size_t)) << 29;
#ifdef _WIN32
#ifndef UNDER_CE
MY_MEMORYSTATUSEX stat;
stat.dwLength = sizeof(stat);
#endif
#ifdef _WIN64
if (!::GlobalMemoryStatusEx(&stat))
return 0;
return MyMin(stat.ullTotalVirtual, stat.ullTotalPhys);
return false;
size = MyMin(stat.ullTotalVirtual, stat.ullTotalPhys);
return true;
#else
#ifndef UNDER_CE
GlobalMemoryStatusExP globalMemoryStatusEx = (GlobalMemoryStatusExP)
::GetProcAddress(::GetModuleHandle(TEXT("kernel32.dll")), "GlobalMemoryStatusEx");
if (globalMemoryStatusEx != 0 && globalMemoryStatusEx(&stat))
return MyMin(stat.ullTotalVirtual, stat.ullTotalPhys);
#endif
if (globalMemoryStatusEx && globalMemoryStatusEx(&stat))
{
MEMORYSTATUS stat;
stat.dwLength = sizeof(stat);
::GlobalMemoryStatus(&stat);
return MyMin(stat.dwTotalVirtual, stat.dwTotalPhys);
size = MyMin(stat.ullTotalVirtual, stat.ullTotalPhys);
return true;
}
#endif
{
MEMORYSTATUS stat2;
stat2.dwLength = sizeof(stat2);
::GlobalMemoryStatus(&stat2);
size = MyMin(stat2.dwTotalVirtual, stat2.dwTotalPhys);
return true;
}
#endif
#else
return false;
#endif
}
}}

3
CPP/Windows/System.h
View File

@@ -9,7 +9,8 @@ namespace NWindows {
namespace NSystem {
UInt32 GetNumberOfProcessors();
UInt64 GetRamSize();
bool GetRamSize(UInt64 &size); // returns false, if unknown ram size
}}

3
DOC/7zip.hhp
View File

@@ -39,6 +39,8 @@ cmdline\switches\method.htm
cmdline\switches\ar_include.htm
cmdline\switches\ar_exclude.htm
cmdline\switches\ar_no.htm
cmdline\switches\bb.htm
cmdline\switches\bs.htm
cmdline\switches\charset.htm
cmdline\switches\email.htm
cmdline\switches\list_tech.htm
@@ -61,6 +63,7 @@ cmdline\switches\stdin.htm
cmdline\switches\stdout.htm
cmdline\switches\stl.htm
cmdline\switches\stop_switch.htm
cmdline\switches\stx.htm
cmdline\switches\type.htm
cmdline\switches\update.htm
cmdline\switches\working_dir.htm

4
DOC/7zip.inf
View File

@@ -10,8 +10,8 @@ AppName = "7-Zip"
InstallDir = %CE1%\%AppName%
[Strings]
AppVer = "15.10"
AppDate = "2015-11-01"
AppVer = "15.11"
AppDate = "2015-11-14"
[CEDevice]
; ProcessorType = 2577 ; ARM

2
DOC/7zip.nsi
View File

@@ -2,7 +2,7 @@
;Defines
!define VERSION_MAJOR 15
!define VERSION_MINOR 10
!define VERSION_MINOR 11
!define VERSION_POSTFIX_FULL " beta"
!ifdef WIN64
!ifdef IA64

2
DOC/7zip.wxs
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?define VerMajor = "15" ?>
<?define VerMinor = "10" ?>
<?define VerMinor = "11" ?>
<?define VerBuild = "00" ?>
<?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
<?define MmHex = "$(var.VerMajor)$(var.VerMinor)" ?>

2
DOC/readme.txt
View File

@@ -1,4 +1,4 @@
7-Zip 15.10 Sources
7-Zip 15.11 Sources
-------------------
7-Zip is a file archiver for Windows.