mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-08 22:07:07 -06:00
23.01
This commit is contained in:
@@ -51,7 +51,7 @@ HRESULT CUpdateCallbackGUI::StartScanning()
|
||||
HRESULT CUpdateCallbackGUI::ScanError(const FString &path, DWORD systemError)
|
||||
{
|
||||
FailedFiles.Add(path);
|
||||
ProgressDialog->Sync.AddError_Code_Name(systemError, fs2us(path));
|
||||
ProgressDialog->Sync.AddError_Code_Name(HRESULT_FROM_WIN32(systemError), fs2us(path));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ HRESULT CUpdateCallbackGUI::FinishScanning(const CDirItemsStat &st)
|
||||
{
|
||||
CProgressSync &sync = ProgressDialog->Sync;
|
||||
RINOK(ProgressDialog->Sync.ScanProgress(st.NumFiles + st.NumAltStreams,
|
||||
st.GetTotalBytes(), FString(), true));
|
||||
st.GetTotalBytes(), FString(), true))
|
||||
sync.Set_Status(L"");
|
||||
return S_OK;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ HRESULT CUpdateCallbackGUI::OpenFileError(const FString &path, DWORD systemError
|
||||
FailedFiles.Add(path);
|
||||
// if (systemError == ERROR_SHARING_VIOLATION)
|
||||
{
|
||||
ProgressDialog->Sync.AddError_Code_Name(systemError, fs2us(path));
|
||||
ProgressDialog->Sync.AddError_Code_Name(HRESULT_FROM_WIN32(systemError), fs2us(path));
|
||||
return S_FALSE;
|
||||
}
|
||||
// return systemError;
|
||||
@@ -209,7 +209,7 @@ HRESULT CUpdateCallbackGUI::Open_SetCompleted(const UInt64 * /* numFiles */, con
|
||||
return ProgressDialog->Sync.CheckStop();
|
||||
}
|
||||
|
||||
#ifndef _NO_CRYPTO
|
||||
#ifndef Z7_NO_CRYPTO
|
||||
|
||||
HRESULT CUpdateCallbackGUI::Open_CryptoGetTextPassword(BSTR *password)
|
||||
{
|
||||
@@ -260,7 +260,7 @@ HRESULT CUpdateCallbackGUI::StartOpenArchive(const wchar_t * /* name */)
|
||||
HRESULT CUpdateCallbackGUI::ReadingFileError(const FString &path, DWORD systemError)
|
||||
{
|
||||
FailedFiles.Add(path);
|
||||
ProgressDialog->Sync.AddError_Code_Name(systemError, fs2us(path));
|
||||
ProgressDialog->Sync.AddError_Code_Name(HRESULT_FROM_WIN32(systemError), fs2us(path));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user