7zExtract.cpp (p7zip_15.14.1_src_all) | : | 7zExtract.cpp (p7zip_16.02_src_all) | ||
---|---|---|---|---|
skipping to change at line 321 | skipping to change at line 321 | |||
break; | break; | |||
nextFile = fileIndex2 + 1; | nextFile = fileIndex2 + 1; | |||
} | } | |||
numSolidFiles = k - i; | numSolidFiles = k - i; | |||
for (k = fileIndex; k < nextFile; k++) | for (k = fileIndex; k < nextFile; k++) | |||
curUnpacked += _db.Files[k].Size; | curUnpacked += _db.Files[k].Size; | |||
} | } | |||
HRESULT result = folderOutStream->Init(fileIndex, | { | |||
allFilesMode ? NULL : indices + i, | HRESULT result = folderOutStream->Init(fileIndex, | |||
numSolidFiles); | allFilesMode ? NULL : indices + i, | |||
numSolidFiles); | ||||
i += numSolidFiles; | i += numSolidFiles; | |||
RINOK(result); | RINOK(result); | |||
} | ||||
// to test solid block with zero unpacked size we disable that code | // to test solid block with zero unpacked size we disable that code | |||
if (folderOutStream->WasWritingFinished()) | if (folderOutStream->WasWritingFinished()) | |||
continue; | continue; | |||
#ifndef _NO_CRYPTO | #ifndef _NO_CRYPTO | |||
CMyComPtr<ICryptoGetTextPassword> getTextPassword; | CMyComPtr<ICryptoGetTextPassword> getTextPassword; | |||
if (extractCallback) | if (extractCallback) | |||
extractCallback.QueryInterface(IID_ICryptoGetTextPassword, &getTextPasswor d); | extractCallback.QueryInterface(IID_ICryptoGetTextPassword, &getTextPasswor d); | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
5 lines changed or deleted | 7 lines changed or added |