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/Console/UpdateCallbackConsole.cpp')
-rwxr-xr-x7zip/UI/Console/UpdateCallbackConsole.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/7zip/UI/Console/UpdateCallbackConsole.cpp b/7zip/UI/Console/UpdateCallbackConsole.cpp
index 4abeecbe..51b96524 100755
--- a/7zip/UI/Console/UpdateCallbackConsole.cpp
+++ b/7zip/UI/Console/UpdateCallbackConsole.cpp
@@ -5,6 +5,7 @@
#include "UpdateCallbackConsole.h"
#include "Windows/Error.h"
+// #include "Windows/Synchronization.h"
#include "ConsoleClose.h"
#include "UserInputUtils.h"
@@ -19,6 +20,8 @@ static const char *kScanningMessage = "Scanning";
static const char *kNoFilesScannedMessage = "No files scanned";
static const char *kTotalFilesAddedMessage = "Total files added to archive: ";
+// static NSynchronization::CCriticalSection g_CriticalSection;
+
HRESULT CUpdateCallbackConsole::OpenResult(const wchar_t *name, HRESULT result)
{
(*OutStream) << endl;
@@ -86,6 +89,7 @@ HRESULT CUpdateCallbackConsole::CheckBreak()
HRESULT CUpdateCallbackConsole::Finilize()
{
+ // NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
if (m_NeedBeClosed)
{
if (EnablePercents)
@@ -102,6 +106,7 @@ HRESULT CUpdateCallbackConsole::Finilize()
HRESULT CUpdateCallbackConsole::SetTotal(UInt64 size)
{
+ // NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
if (EnablePercents)
m_PercentPrinter.SetTotal(size);
return S_OK;
@@ -109,6 +114,7 @@ HRESULT CUpdateCallbackConsole::SetTotal(UInt64 size)
HRESULT CUpdateCallbackConsole::SetCompleted(const UInt64 *completeValue)
{
+ // NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
if (completeValue != NULL)
{
if (EnablePercents)
@@ -125,6 +131,7 @@ HRESULT CUpdateCallbackConsole::SetCompleted(const UInt64 *completeValue)
HRESULT CUpdateCallbackConsole::GetStream(const wchar_t *name, bool isAnti)
{
+ // NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
if (StdOutMode)
return S_OK;
if(isAnti)
@@ -145,6 +152,7 @@ HRESULT CUpdateCallbackConsole::GetStream(const wchar_t *name, bool isAnti)
HRESULT CUpdateCallbackConsole::OpenFileError(const wchar_t *name, DWORD systemError)
{
+ // NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
FailedCodes.Add(systemError);
FailedFiles.Add(name);
// if (systemError == ERROR_SHARING_VIOLATION)
@@ -155,10 +163,10 @@ HRESULT CUpdateCallbackConsole::OpenFileError(const wchar_t *name, DWORD systemE
m_PercentPrinter.PrintString(NError::MyFormatMessageW(systemError));
return S_FALSE;
}
- return systemError;
+ // return systemError;
}
-HRESULT CUpdateCallbackConsole::SetOperationResult(Int32 operationResult)
+HRESULT CUpdateCallbackConsole::SetOperationResult(Int32 )
{
m_NeedBeClosed = true;
return S_OK;