xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2026-02-01 14:24:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.25 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-08-01 00:00:00 +00:00
committed by Kornel Lesiński
parent 47f4915611
commit af1fe52701
359 changed files with 5969 additions and 9853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
7zip/UI/Common/Update.cpp
+10 -5
View File
@@ -99,7 +99,7 @@ class COutMultiVolStream:
public IOutStream,
public CMyUnknownImp
{
size_t _streamIndex; // required stream
int _streamIndex; // required stream
UInt64 _offsetPos; // offset from start of _streamIndex index
UInt64 _absPos;
UInt64 _length;
@@ -142,7 +142,7 @@ STDMETHODIMP COutMultiVolStream::Write(const void *data, UInt32 size, UInt32 *pr
*processedSize = 0;
while(size > 0)
{
if (_streamIndex >= (size_t)Streams.Size())
if (_streamIndex >= Streams.Size())
{
CSubStreamInfo subStream;
@@ -694,12 +694,17 @@ HRESULT UpdateArchive(const NWildcard::CCensor &censor,
CEnumDirItemUpdateCallback enumCallback;
enumCallback.Callback = callback;
RINOK(callback->StartScanning());
UString errorPath;
HRESULT res = EnumerateItems(censor, dirItems, &enumCallback, errorPath);
UStringVector errorPaths;
CRecordVector<DWORD> errorCodes;
HRESULT res = EnumerateItems(censor, dirItems, &enumCallback, errorPaths, errorCodes);
for (int i = 0; i < errorPaths.Size(); i++)
{
RINOK(callback->CanNotFindError(errorPaths[i], errorCodes[i]));
}
if(res != S_OK)
{
errorInfo.Message = L"Scanning error";
errorInfo.FileName = errorPath;
// errorInfo.FileName = errorPath;
return res;
}
RINOK(callback->FinishScanning());