Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kornelski/7z.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '7zip/UI/GUI/UpdateCallbackGUI.cpp')
-rwxr-xr-x7zip/UI/GUI/UpdateCallbackGUI.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/7zip/UI/GUI/UpdateCallbackGUI.cpp b/7zip/UI/GUI/UpdateCallbackGUI.cpp
index 013e0c6f..61f27d61 100755
--- a/7zip/UI/GUI/UpdateCallbackGUI.cpp
+++ b/7zip/UI/GUI/UpdateCallbackGUI.cpp
@@ -37,6 +37,15 @@ void CUpdateCallbackGUI::AddErrorMessage(LPCWSTR message)
Messages.Add(message);
}
+void CUpdateCallbackGUI::AddErrorMessage(const wchar_t *name, DWORD systemError)
+{
+ AddErrorMessage(
+ UString(L"WARNING: ") +
+ NError::MyFormatMessageW(systemError) +
+ UString(L": ") +
+ UString(name));
+}
+
HRESULT CUpdateCallbackGUI::OpenResult(const wchar_t *name, HRESULT result)
{
if (result != S_OK)
@@ -52,6 +61,13 @@ HRESULT CUpdateCallbackGUI::StartScanning()
return S_OK;
}
+HRESULT CUpdateCallbackGUI::CanNotFindError(const wchar_t *name, DWORD systemError)
+{
+ FailedFiles.Add(name);
+ AddErrorMessage(name, systemError);
+ return S_OK;
+}
+
HRESULT CUpdateCallbackGUI::FinishScanning()
{
return S_OK;
@@ -111,11 +127,7 @@ HRESULT CUpdateCallbackGUI::OpenFileError(const wchar_t *name, DWORD systemError
FailedFiles.Add(name);
// if (systemError == ERROR_SHARING_VIOLATION)
{
- AddErrorMessage(
- UString(L"WARNING: ") +
- NError::MyFormatMessageW(systemError) +
- UString(L": ") +
- UString(name));
+ AddErrorMessage(name, systemError);
return S_FALSE;
}
return systemError;