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

4.43 beta

Browse Source
This commit is contained in:
Igor Pavlov
2006-09-15 00:00:00 +00:00
committed by Kornel Lesiński
parent 0ec42ff829
commit 804edc5756
391 changed files with 9725 additions and 3168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
7zip/FileManager/ExtractCallback.cpp
View File

@@ -55,7 +55,7 @@ STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 total)
STDMETHODIMP CExtractCallbackImp::SetCompleted(const UInt64 *completeValue)
{
while(true)
for (;;)
{
if(ProgressDialog.ProgressSynch.GetStopped())
return E_ABORT;
@@ -76,7 +76,8 @@ STDMETHODIMP CExtractCallbackImp::AskOverwrite(
COverwriteDialog dialog;
dialog.OldFileInfo.Time = *existTime;
if (dialog.OldFileInfo.SizeIsDefined = (existSize != NULL))
dialog.OldFileInfo.SizeIsDefined = (existSize != NULL);
if (dialog.OldFileInfo.SizeIsDefined)
dialog.OldFileInfo.Size = *existSize;
dialog.OldFileInfo.Name = existName;
@@ -88,7 +89,8 @@ STDMETHODIMP CExtractCallbackImp::AskOverwrite(
dialog.NewFileInfo.Time = *newTime;
}
if (dialog.NewFileInfo.SizeIsDefined = (newSize != NULL))
dialog.NewFileInfo.SizeIsDefined = (newSize != NULL);
if (dialog.NewFileInfo.SizeIsDefined)
dialog.NewFileInfo.Size = *newSize;
dialog.NewFileInfo.Name = newName;
@@ -96,7 +98,7 @@ STDMETHODIMP CExtractCallbackImp::AskOverwrite(
NOverwriteDialog::NResult::EEnum writeAnswer =
NOverwriteDialog::Execute(oldFileInfo, newFileInfo);
*/
int writeAnswer = dialog.Create(NULL); // ParentWindow doesn't work with 7z
INT_PTR writeAnswer = dialog.Create(NULL); // ParentWindow doesn't work with 7z
switch(writeAnswer)
{
@@ -126,7 +128,7 @@ STDMETHODIMP CExtractCallbackImp::AskOverwrite(
}
STDMETHODIMP CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 askExtractMode, const UInt64 *position)
STDMETHODIMP CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 /* askExtractMode */, const UInt64 * /* position */)
{
return SetCurrentFilePath(name);
}
@@ -143,7 +145,7 @@ STDMETHODIMP CExtractCallbackImp::ShowMessage(const wchar_t *message)
return S_OK;
}
STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 operationResult)
STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 operationResult, bool encrypted)
{
switch(operationResult)
{
@@ -160,12 +162,16 @@ STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 operationResult)
langID = 0x02000A91;
break;
case NArchive::NExtract::NOperationResult::kDataError:
messageID = IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR;
langID = 0x02000A92;
messageID = encrypted ?
IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR_ENCRYPTED:
IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_DATA_ERROR;
langID = encrypted ? 0x02000A94 : 0x02000A92;
break;
case NArchive::NExtract::NOperationResult::kCRCError:
messageID = IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC;
langID = 0x02000A93;
messageID = encrypted ?
IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC_ENCRYPTED:
IDS_MESSAGES_DIALOG_EXTRACT_MESSAGE_CRC;
langID = encrypted ? 0x02000A95 : 0x02000A93;
break;
default:
return E_FAIL;