react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/ProgressDialog2.cpp

@@ -2,14 +2,10 @@
 
 #include "StdAfx.h"
 
-#ifdef Z7_OLD_WIN_SDK
-#include <ShlGuid.h>
-#endif
-
 #include "../../../Common/IntToString.h"
 #include "../../../Common/StringConvert.h"
 
-#include "../../../Windows/Clipboard.h"
+#include "../../../Windows/Control/Static.h"
 #include "../../../Windows/ErrorMsg.h"
 
 #include "../GUI/ExtractRes.h"
@@ -23,7 +19,6 @@
 using namespace NWindows;
 
 extern HINSTANCE g_hInstance;
-extern bool g_DisableUserQuestions;
 
 static const UINT_PTR kTimerID = 3;
 
@@ -48,7 +43,7 @@ static const UINT kCreateDelay =
 
 static const DWORD kPauseSleepTime = 100;
 
-#ifdef Z7_LANG
+#ifdef LANG
 
 static const UInt32 kLangIDs[] =
 {
@@ -72,20 +67,19 @@ static const UInt32 kLangIDs_Colon[] =
 #endif
 
 
-#define UNDEFINED_VAL         ((UInt64)(Int64)-1)
-#define INIT_AS_UNDEFINED(v)  v = UNDEFINED_VAL;
-#define IS_UNDEFINED_VAL(v)   ((v) == UNDEFINED_VAL)
-#define IS_DEFINED_VAL(v)     ((v) != UNDEFINED_VAL)
+#define UNDEFINED_VAL ((UInt64)(Int64)-1)
+#define INIT_AS_UNDEFINED(v) v = UNDEFINED_VAL;
+#define IS_UNDEFINED_VAL(v) ((v) == UNDEFINED_VAL)
+#define IS_DEFINED_VAL(v) ((v) != UNDEFINED_VAL)
 
 CProgressSync::CProgressSync():
-    _stopped(false),
-    _paused(false),
-    _filesProgressMode(false),
-    _isDir(false),
+    _stopped(false), _paused(false),
+    _bytesProgressMode(true),
     _totalBytes(UNDEFINED_VAL), _completedBytes(0),
     _totalFiles(UNDEFINED_VAL), _curFiles(0),
     _inSize(UNDEFINED_VAL),
-    _outSize(UNDEFINED_VAL)
+    _outSize(UNDEFINED_VAL),
+    _isDir(false)
     {}
 
 #define CHECK_STOP  if (_stopped) return E_ABORT; if (!_paused) return S_OK;
@@ -109,13 +103,6 @@ HRESULT CProgressSync::CheckStop()
   }
 }
 
-void CProgressSync::Clear_Stop_Status()
-{
-  CRITICAL_LOCK
-  if (_stopped)
-    _stopped = false;
-}
-
 HRESULT CProgressSync::ScanProgress(UInt64 numFiles, UInt64 totalSize, const FString &fileName, bool isDir)
 {
   {
@@ -241,7 +228,7 @@ void CProgressSync::AddError_Message_Name(const wchar_t *message, const wchar_t
   AddError_Message(s);
 }
 
-void CProgressSync::AddError_Code_Name(HRESULT systemError, const wchar_t *name)
+void CProgressSync::AddError_Code_Name(DWORD systemError, const wchar_t *name)
 {
   UString s = NError::MyFormatMessage(systemError);
   if (systemError == 0)
@@ -250,50 +237,50 @@ void CProgressSync::AddError_Code_Name(HRESULT systemError, const wchar_t *name)
 }
 
 CProgressDialog::CProgressDialog():
-    _isDir(false),
-    _wasCreated(false),
-    _needClose(false),
-    _errorsWereDisplayed(false),
-    _waitCloseByCancelButton(false),
-    _cancelWasPressed(false),
-    _inCancelMessageBox(false),
-    _externalCloseMessageWasReceived(false),
-    _background(false),
-    WaitMode(false),
-    MessagesDisplayed(false),
-    CompressingMode(true),
-    ShowCompressionInfo(true),
-    _numPostedMessages(0),
-    _numAutoSizeMessages(0),
-    _numMessages(0),
-    _timer(0),
-    IconID(-1),
-    MainWindow(NULL)
+   _timer(0),
+   CompressingMode(true),
+   MainWindow(0)
 {
-
+  _isDir = false;
+
+  _numMessages = 0;
+  IconID = -1;
+  MessagesDisplayed = false;
+  _wasCreated = false;
+  _needClose = false;
+  _inCancelMessageBox = false;
+  _externalCloseMessageWasReceived = false;
+  
+  _numPostedMessages = 0;
+  _numAutoSizeMessages = 0;
+  _errorsWereDisplayed = false;
+  _waitCloseByCancelButton = false;
+  _cancelWasPressed = false;
+  ShowCompressionInfo = true;
+  WaitMode = false;
   if (_dialogCreatedEvent.Create() != S_OK)
     throw 1334987;
   if (_createDialogEvent.Create() != S_OK)
     throw 1334987;
-  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (void**)&_taskbarList);
   if (_taskbarList)
     _taskbarList->HrInit();
-  // #endif
+  #endif
 }
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
 CProgressDialog::~CProgressDialog()
 {
-  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   SetTaskbarProgressState(TBPF_NOPROGRESS);
-  // #endif
+  #endif
   AddToTitle(L"");
 }
 void CProgressDialog::AddToTitle(LPCWSTR s)
 {
-  if (MainWindow)
+  if (MainWindow != 0)
   {
     CWindow window(MainWindow);
     window.SetText((UString)s + MainTitle);
@@ -305,7 +292,7 @@ void CProgressDialog::AddToTitle(LPCWSTR s)
 
 void CProgressDialog::SetTaskbarProgressState()
 {
-  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   if (_taskbarList && _hwndForTaskbar)
   {
     TBPFLAG tbpFlags;
@@ -315,7 +302,7 @@ void CProgressDialog::SetTaskbarProgressState()
       tbpFlags = _errorsWereDisplayed ? TBPF_ERROR: TBPF_NORMAL;
     SetTaskbarProgressState(tbpFlags);
   }
-  // #endif
+  #endif
 }
 
 static const unsigned kTitleFileNameSizeLimit = 36;
@@ -344,38 +331,37 @@ bool CProgressDialog::OnInit()
   if (!_hwndForTaskbar)
     _hwndForTaskbar = *this;
 
-  INIT_AS_UNDEFINED(_progressBar_Range)
-  INIT_AS_UNDEFINED(_progressBar_Pos)
+  INIT_AS_UNDEFINED(_progressBar_Range);
+  INIT_AS_UNDEFINED(_progressBar_Pos);
 
-  INIT_AS_UNDEFINED(_prevPercentValue)
-  INIT_AS_UNDEFINED(_prevElapsedSec)
-  INIT_AS_UNDEFINED(_prevRemainingSec)
+  INIT_AS_UNDEFINED(_prevPercentValue);
+  INIT_AS_UNDEFINED(_prevElapsedSec);
+  INIT_AS_UNDEFINED(_prevRemainingSec);
 
-  INIT_AS_UNDEFINED(_prevSpeed)
+  INIT_AS_UNDEFINED(_prevSpeed);
   _prevSpeed_MoveBits = 0;
   
   _prevTime = ::GetTickCount();
   _elapsedTime = 0;
 
-  INIT_AS_UNDEFINED(_totalBytes_Prev)
-  INIT_AS_UNDEFINED(_processed_Prev)
-  INIT_AS_UNDEFINED(_packed_Prev)
-  INIT_AS_UNDEFINED(_ratio_Prev)
-  
+  INIT_AS_UNDEFINED(_totalBytes_Prev);
+  INIT_AS_UNDEFINED(_processed_Prev);
+  INIT_AS_UNDEFINED(_packed_Prev);
+  INIT_AS_UNDEFINED(_ratio_Prev);
   _filesStr_Prev.Empty();
-  _filesTotStr_Prev.Empty();
+
+  _foreground = true;
 
   m_ProgressBar.Attach(GetItem(IDC_PROGRESS1));
   _messageList.Attach(GetItem(IDL_PROGRESS_MESSAGES));
   _messageList.SetUnicodeFormat();
-  _messageList.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT);
 
   _wasCreated = true;
   _dialogCreatedEvent.Set();
 
-  #ifdef Z7_LANG
-  LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
-  LangSetDlgItems_Colon(*this, kLangIDs_Colon, Z7_ARRAY_SIZE(kLangIDs_Colon));
+  #ifdef LANG
+  LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
+  LangSetDlgItems_Colon(*this, kLangIDs_Colon, ARRAY_SIZE(kLangIDs_Colon));
   #endif
 
   CWindow window(GetItem(IDB_PROGRESS_BACKGROUND));
@@ -394,8 +380,9 @@ bool CProgressDialog::OnInit()
   SetPauseText();
   SetPriorityText();
 
-  _messageList.InsertColumn(0, L"", 40);
-  _messageList.InsertColumn(1, L"", 460);
+  _messageList.InsertColumn(0, L"", 30);
+  _messageList.InsertColumn(1, L"", 600);
+
   _messageList.SetColumnWidthAuto(0);
   _messageList.SetColumnWidthAuto(1);
 
@@ -436,14 +423,13 @@ static const UINT kIDs[] =
   IDT_PROGRESS_ELAPSED,   IDT_PROGRESS_ELAPSED_VAL,
   IDT_PROGRESS_REMAINING, IDT_PROGRESS_REMAINING_VAL,
   IDT_PROGRESS_FILES,     IDT_PROGRESS_FILES_VAL,
-  0,                      IDT_PROGRESS_FILES_TOTAL,
+  IDT_PROGRESS_RATIO,     IDT_PROGRESS_RATIO_VAL,
   IDT_PROGRESS_ERRORS,    IDT_PROGRESS_ERRORS_VAL,
   
   IDT_PROGRESS_TOTAL,     IDT_PROGRESS_TOTAL_VAL,
   IDT_PROGRESS_SPEED,     IDT_PROGRESS_SPEED_VAL,
   IDT_PROGRESS_PROCESSED, IDT_PROGRESS_PROCESSED_VAL,
-  IDT_PROGRESS_PACKED,    IDT_PROGRESS_PACKED_VAL,
-  IDT_PROGRESS_RATIO,     IDT_PROGRESS_RATIO_VAL
+  IDT_PROGRESS_PACKED,    IDT_PROGRESS_PACKED_VAL
 };
 
 bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
@@ -463,12 +449,12 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
 
   InvalidateRect(NULL);
 
-  const int xSizeClient = xSize - mx * 2;
+  int xSizeClient = xSize - mx * 2;
 
   {
-    unsigned i;
+    int i;
     for (i = 800; i > 40; i = i * 9 / 10)
-      if (Units_To_Pixels_X((int)i) <= xSizeClient)
+      if (Units_To_Pixels_X(i) <= xSizeClient)
         break;
     _numReduceSymbols = i / 4;
   }
@@ -483,7 +469,7 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   int mx2 = mx;
   for (;; mx2--)
   {
-    const int bSize2 = bSizeX * 3 + mx2 * 2;
+    int bSize2 = bSizeX * 3 + mx2 * 2;
     if (bSize2 <= xSizeClient)
       break;
     if (mx2 < 5)
@@ -498,7 +484,7 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   {
     RECT r;
     GetClientRectOfItem(IDL_PROGRESS_MESSAGES, r);
-    const int y = r.top;
+    int y = r.top;
     int ySize2 = yPos - my - y;
     const int kMinYSize = _buttonSizeY + _buttonSizeY * 3 / 4;
     int xx = xSize - mx * 2;
@@ -529,13 +515,13 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   labelSize = Units_To_Pixels_X(MY_PROGRESS_LABEL_UNITS_MIN);
   valueSize = Units_To_Pixels_X(MY_PROGRESS_VAL_UNITS);
   padSize = Units_To_Pixels_X(MY_PROGRESS_PAD_UNITS);
-  const int requiredSize = (labelSize + valueSize) * 2 + padSize;
+  int requiredSize = (labelSize + valueSize) * 2 + padSize;
 
   int gSize;
   {
     if (requiredSize < xSizeClient)
     {
-      const int incr = (xSizeClient - requiredSize) / 3;
+      int incr = (xSizeClient - requiredSize) / 3;
       labelSize += incr;
     }
     else
@@ -550,17 +536,16 @@ bool CProgressDialog::OnSize(WPARAM /* wParam */, int xSize, int ySize)
   labelSize = gSize - valueSize;
 
   yPos = my;
-  for (unsigned i = 0; i < Z7_ARRAY_SIZE(kIDs); i += 2)
+  for (int i = 0; i < ARRAY_SIZE(kIDs); i += 2)
   {
     int x = mx;
-    const unsigned kNumColumn1Items = 5 * 2;
+    const int kNumColumn1Items = 5 * 2;
     if (i >= kNumColumn1Items)
     {
       if (i == kNumColumn1Items)
         yPos = my;
       x = mx + gSize + padSize;
     }
-    if (kIDs[i] != 0)
     MoveItem(kIDs[i], x, yPos, labelSize, sY);
     MoveItem(kIDs[i + 1], x + labelSize, yPos, valueSize, sY);
     yPos += sStep;
@@ -576,7 +561,7 @@ void CProgressDialog::SetProgressRange(UInt64 range)
   if (range == _progressBar_Range)
     return;
   _progressBar_Range = range;
-  INIT_AS_UNDEFINED(_progressBar_Pos)
+  INIT_AS_UNDEFINED(_progressBar_Pos);
   _progressConv.Init(range);
   m_ProgressBar.SetRange32(0, _progressConv.Count(range));
 }
@@ -588,17 +573,16 @@ void CProgressDialog::SetProgressPos(UInt64 pos)
       pos - _progressBar_Pos >= (_progressBar_Range >> 10))
   {
     m_ProgressBar.SetPos(_progressConv.Count(pos));
-    // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+    #ifdef __ITaskbarList3_INTERFACE_DEFINED__
     if (_taskbarList && _hwndForTaskbar)
       _taskbarList->SetProgressValue(_hwndForTaskbar, pos, _progressBar_Range);
-    // #endif
+    #endif
     _progressBar_Pos = pos;
   }
 }
 
 #define UINT_TO_STR_2(val) { s[0] = (wchar_t)('0' + (val) / 10); s[1] = (wchar_t)('0' + (val) % 10); s += 2; }
 
-void GetTimeString(UInt64 timeValue, wchar_t *s);
 void GetTimeString(UInt64 timeValue, wchar_t *s)
 {
   UInt64 hours = timeValue / 3600;
@@ -613,10 +597,10 @@ void GetTimeString(UInt64 timeValue, wchar_t *s)
   else
   {
     UInt32 hours32 = (UInt32)hours;
-    UINT_TO_STR_2(hours32)
+    UINT_TO_STR_2(hours32);
   }
-  *s++ = ':'; UINT_TO_STR_2(minutes)
-  *s++ = ':'; UINT_TO_STR_2(seconds)
+  *s++ = ':'; UINT_TO_STR_2(minutes);
+  *s++ = ':'; UINT_TO_STR_2(seconds);
   *s = 0;
 }
 
@@ -632,12 +616,11 @@ static void ConvertSizeToString(UInt64 v, wchar_t *s)
     s += MyStringLen(s);
     *s++ = ' ';
     *s++ = c;
-    *s++ = 'B';
     *s++ = 0;
   }
 }
 
-void CProgressDialog::ShowSize(unsigned id, UInt64 val, UInt64 &prev)
+void CProgressDialog::ShowSize(int id, UInt64 val, UInt64 &prev)
 {
   if (val == prev)
     return;
@@ -695,7 +678,7 @@ static UInt64 MyMultAndDiv(UInt64 mult1, UInt64 mult2, UInt64 divider)
 void CProgressDialog::UpdateStatInfo(bool showAll)
 {
   UInt64 total, completed, totalFiles, completedFiles, inSize, outSize;
-  bool filesProgressMode;
+  bool bytesProgressMode;
 
   bool titleFileName_Changed;
   bool curFilePath_Changed;
@@ -709,7 +692,7 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
     completedFiles = Sync._curFiles;
     inSize = Sync._inSize;
     outSize = Sync._outSize;
-    filesProgressMode = Sync._filesProgressMode;
+    bytesProgressMode = Sync._bytesProgressMode;
 
     GetChangedString(Sync._titleFileName, _titleFileName, titleFileName_Changed);
     GetChangedString(Sync._filePath, _filePath, curFilePath_Changed);
@@ -724,8 +707,8 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
 
   UInt32 curTime = ::GetTickCount();
 
-  const UInt64 progressTotal = filesProgressMode ? totalFiles : total;
-  const UInt64 progressCompleted = filesProgressMode ? completedFiles : completed;
+  const UInt64 progressTotal = bytesProgressMode ? total : totalFiles;
+  const UInt64 progressCompleted = bytesProgressMode ? completed : completedFiles;
   {
     if (IS_UNDEFINED_VAL(progressTotal))
     {
@@ -781,7 +764,7 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
       {
         if (IS_DEFINED_VAL(_prevRemainingSec))
         {
-          INIT_AS_UNDEFINED(_prevRemainingSec)
+          INIT_AS_UNDEFINED(_prevRemainingSec);
           SetItemText(IDT_PROGRESS_REMAINING_VAL, L"");
         }
       }
@@ -800,9 +783,8 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
         }
       }
       {
-        const UInt64 elapsedTime = (_elapsedTime == 0) ? 1 : _elapsedTime;
-        // 22.02: progressCompleted can be for number of files
-        UInt64 v = (completed * 1000) / elapsedTime;
+        UInt64 elapsedTime = (_elapsedTime == 0) ? 1 : _elapsedTime;
+        UInt64 v = (progressCompleted * 1000) / elapsedTime;
         Byte c = 0;
         unsigned moveBits = 0;
              if (v >= ((UInt64)10000 << 10)) { moveBits = 20; c = 'M'; }
@@ -846,24 +828,16 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
     
     {
       wchar_t s[64];
-      
       ConvertUInt64ToString(completedFiles, s);
-      if (_filesStr_Prev != s)
-      {
-        _filesStr_Prev = s;
-        SetItemText(IDT_PROGRESS_FILES_VAL, s);
-      }
-      
-      s[0] = 0;
       if (IS_DEFINED_VAL(totalFiles))
       {
-        MyStringCopy(s, L" / ");
+        MyStringCat(s, L" / ");
         ConvertUInt64ToString(totalFiles, s + MyStringLen(s));
       }
-      if (_filesTotStr_Prev != s)
+      if (_filesStr_Prev != s)
       {
-        _filesTotStr_Prev = s;
-        SetItemText(IDT_PROGRESS_FILES_TOTAL, s);
+        _filesStr_Prev = s;
+        SetItemText(IDT_PROGRESS_FILES_VAL, s);
       }
     }
     
@@ -905,7 +879,7 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
   {
     UString s = _status;
     ReduceString(s, _numReduceSymbols);
-    SetItemText(IDT_PROGRESS_STATUS, s);
+    SetItemText(IDT_PROGRESS_STATUS, _status);
   }
 
   if (curFilePath_Changed)
@@ -918,8 +892,8 @@ void CProgressDialog::UpdateStatInfo(bool showAll)
       int slashPos = _filePath.ReverseFind_PathSepar();
       if (slashPos >= 0)
       {
-        s1.SetFrom(_filePath, (unsigned)(slashPos + 1));
-        s2 = _filePath.Ptr((unsigned)(slashPos + 1));
+        s1.SetFrom(_filePath, slashPos + 1);
+        s2 = _filePath.Ptr(slashPos + 1);
       }
       else
         s2 = _filePath;
@@ -968,7 +942,7 @@ INT_PTR CProgressDialog::Create(const UString &title, NWindows::CThread &thread,
       CWaitCursor waitCursor;
       HANDLE h[] = { thread, _createDialogEvent };
       
-      const DWORD res2 = WaitForMultipleObjects(Z7_ARRAY_SIZE(h), h, FALSE, kCreateDelay);
+      WRes res2 = WaitForMultipleObjects(ARRAY_SIZE(h), h, FALSE, kCreateDelay);
       if (res2 == WAIT_OBJECT_0 && !Sync.ThereIsMessage())
         return 0;
     }
@@ -980,10 +954,10 @@ INT_PTR CProgressDialog::Create(const UString &title, NWindows::CThread &thread,
   {
     _wasCreated = true;
     _dialogCreatedEvent.Set();
+    res = res;
   }
-  thread.Wait_Close();
+  thread.Wait();
   if (!MessagesDisplayed)
-  if (!g_DisableUserQuestions)
     MessageBoxW(wndParent, L"Progress Error", L"7-Zip", MB_ICONERROR);
   return res;
 }
@@ -991,9 +965,9 @@ INT_PTR CProgressDialog::Create(const UString &title, NWindows::CThread &thread,
 bool CProgressDialog::OnExternalCloseMessage()
 {
   // it doesn't work if there is MessageBox.
-  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   SetTaskbarProgressState(TBPF_NOPROGRESS);
-  // #endif
+  #endif
   // AddToTitle(L"Finished ");
   // SetText(L"Finished2 ");
 
@@ -1019,8 +993,7 @@ bool CProgressDialog::OnExternalCloseMessage()
     MessagesDisplayed = true;
     if (fm.ErrorMessage.Title.IsEmpty())
       fm.ErrorMessage.Title = "7-Zip";
-    if (!g_DisableUserQuestions)
-      MessageBoxW(*this, fm.ErrorMessage.Message, fm.ErrorMessage.Title, MB_ICONERROR);
+    MessageBoxW(*this, fm.ErrorMessage.Message, fm.ErrorMessage.Title, MB_ICONERROR);
   }
   else if (!thereAreMessages)
   {
@@ -1030,12 +1003,10 @@ bool CProgressDialog::OnExternalCloseMessage()
     {
       if (fm.OkMessage.Title.IsEmpty())
         fm.OkMessage.Title = "7-Zip";
-      if (!g_DisableUserQuestions)
-        MessageBoxW(*this, fm.OkMessage.Message, fm.OkMessage.Title, MB_OK);
+      MessageBoxW(*this, fm.OkMessage.Message, fm.OkMessage.Title, MB_OK);
     }
   }
 
-  if (!g_DisableUserQuestions)
   if (thereAreMessages && !_cancelWasPressed)
   {
     _waitCloseByCancelButton = true;
@@ -1053,17 +1024,10 @@ bool CProgressDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   {
     case kCloseMessage:
     {
-      if (_timer)
-      {
-        /* 21.03 : KillTimer(kTimerID) instead of KillTimer(_timer).
-           But (_timer == kTimerID) in Win10. So it worked too */
-        KillTimer(kTimerID);
-        _timer = 0;
-      }
+      KillTimer(_timer);
+      _timer = 0;
       if (_inCancelMessageBox)
       {
-        /* if user is in MessageBox(), we will call OnExternalCloseMessage()
-           later, when MessageBox() will be closed */
         _externalCloseMessageWasReceived = true;
         break;
       }
@@ -1091,17 +1055,19 @@ void CProgressDialog::SetTitleText()
   }
   if (IS_DEFINED_VAL(_prevPercentValue))
   {
-    s.Add_UInt64(_prevPercentValue);
-    s.Add_Char('%');
+    char temp[32];
+    ConvertUInt64ToString(_prevPercentValue, temp);
+    s += temp;
+    s += '%';
   }
-  if (_background)
+  if (!_foreground)
   {
     s.Add_Space();
     s += _backgrounded_String;
   }
 
   s.Add_Space();
-  #ifndef Z7_SFX
+  #ifndef _SFX
   {
     unsigned len = s.Len();
     s += MainAddTitle;
@@ -1141,33 +1107,30 @@ void CProgressDialog::OnPauseButton()
 
 void CProgressDialog::SetPriorityText()
 {
-  SetItemText(IDB_PROGRESS_BACKGROUND, _background ?
-      _foreground_String :
-      _background_String);
+  SetItemText(IDB_PROGRESS_BACKGROUND, _foreground ?
+      _background_String :
+      _foreground_String);
   SetTitleText();
 }
 
 void CProgressDialog::OnPriorityButton()
 {
-  _background = !_background;
+  _foreground = !_foreground;
   #ifndef UNDER_CE
-  SetPriorityClass(GetCurrentProcess(), _background ? IDLE_PRIORITY_CLASS : NORMAL_PRIORITY_CLASS);
+  SetPriorityClass(GetCurrentProcess(), _foreground ? NORMAL_PRIORITY_CLASS: IDLE_PRIORITY_CLASS);
   #endif
   SetPriorityText();
 }
 
 void CProgressDialog::AddMessageDirect(LPCWSTR message, bool needNumber)
 {
+  int itemIndex = _messageList.GetItemCount();
   wchar_t sz[16];
   sz[0] = 0;
   if (needNumber)
     ConvertUInt32ToString(_numMessages + 1, sz);
-  const unsigned itemIndex = _messageStrings.Size(); // _messageList.GetItemCount();
-  if (_messageList.InsertItem(itemIndex, sz) == (int)itemIndex)
-  {
-    _messageList.SetSubItem(itemIndex, 1, message);
-    _messageStrings.Add(message);
-  }
+  _messageList.InsertItem(itemIndex, sz);
+  _messageList.SetSubItem(itemIndex, 1, message);
 }
 
 void CProgressDialog::AddMessage(LPCWSTR message)
@@ -1176,27 +1139,23 @@ void CProgressDialog::AddMessage(LPCWSTR message)
   bool needNumber = true;
   while (!s.IsEmpty())
   {
-    const int pos = s.Find(L'\n');
+    int pos = s.Find(L'\n');
     if (pos < 0)
       break;
-    AddMessageDirect(s.Left((unsigned)pos), needNumber);
+    AddMessageDirect(s.Left(pos), needNumber);
     needNumber = false;
-    s.DeleteFrontal((unsigned)pos + 1);
+    s.DeleteFrontal(pos + 1);
   }
   AddMessageDirect(s, needNumber);
   _numMessages++;
 }
 
-static unsigned GetNumDigits(unsigned val)
+static unsigned GetNumDigits(UInt32 val)
 {
-  unsigned i = 0;
-  for (;;)
-  {
-    i++;
+  unsigned i;
+  for (i = 0; val >= 10; i++)
     val /= 10;
-    if (val == 0)
-      return i;
-  }
+  return i;
 }
 
 void CProgressDialog::UpdateMessagesDialog()
@@ -1204,7 +1163,7 @@ void CProgressDialog::UpdateMessagesDialog()
   UStringVector messages;
   {
     NSynchronization::CCriticalSectionLock lock(Sync._cs);
-    const unsigned num = Sync.Messages.Size();
+    unsigned num = Sync.Messages.Size();
     if (num > _numPostedMessages)
     {
       messages.ClearAndReserve(num - _numPostedMessages);
@@ -1217,11 +1176,7 @@ void CProgressDialog::UpdateMessagesDialog()
   {
     FOR_VECTOR (i, messages)
       AddMessage(messages[i]);
-    // SetColumnWidthAuto() can be slow for big number of files.
-    if (_numPostedMessages < 1000000 || _numAutoSizeMessages < 100)
-    if (_numAutoSizeMessages < 100 ||
-        GetNumDigits(_numPostedMessages) >
-        GetNumDigits(_numAutoSizeMessages))
+    if (_numAutoSizeMessages < 256 || GetNumDigits(_numPostedMessages) > GetNumDigits(_numAutoSizeMessages))
     {
       _messageList.SetColumnWidthAuto(0);
       _messageList.SetColumnWidthAuto(1);
@@ -1231,7 +1186,7 @@ void CProgressDialog::UpdateMessagesDialog()
 }
 
 
-bool CProgressDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
+bool CProgressDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
@@ -1244,42 +1199,24 @@ bool CProgressDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
         End(IDCLOSE);
         break;
       }
-      
-      if (_cancelWasPressed)
-        return true;
         
-      const bool paused = Sync.Get_Paused();
-      
+      bool paused = Sync.Get_Paused();
       if (!paused)
-      {
         OnPauseButton();
-      }
-
       _inCancelMessageBox = true;
-      const int res = ::MessageBoxW(*this, LangString(IDS_PROGRESS_ASK_CANCEL), _title, MB_YESNOCANCEL);
+      int res = ::MessageBoxW(*this, LangString(IDS_PROGRESS_ASK_CANCEL), _title, MB_YESNOCANCEL);
       _inCancelMessageBox = false;
-      if (res == IDYES)
-        _cancelWasPressed = true;
-      
       if (!paused)
-      {
         OnPauseButton();
-      }
-
-      if (_externalCloseMessageWasReceived)
+      if (res == IDCANCEL || res == IDNO)
       {
-        /* we have received kCloseMessage while we were in MessageBoxW().
-           so we call OnExternalCloseMessage() here.
-           it can show MessageBox and it can close dialog */
-        OnExternalCloseMessage();
+        if (_externalCloseMessageWasReceived)
+          OnExternalCloseMessage();
         return true;
       }
 
-      if (!_cancelWasPressed)
-        return true;
-
+      _cancelWasPressed = true;
       MessagesDisplayed = true;
-      // we will call Sync.Set_Stopped(true) in OnButtonClicked() : OnCancel()
       break;
     }
 
@@ -1315,87 +1252,6 @@ void CProgressDialog::ProcessWasFinished()
 }
 
 
-bool CProgressDialog::OnNotify(UINT /* controlID */, LPNMHDR header)
-{
-  if (header->hwndFrom != _messageList)
-    return false;
-  switch (header->code)
-  {
-    case LVN_KEYDOWN:
-    {
-      LPNMLVKEYDOWN keyDownInfo = LPNMLVKEYDOWN(header);
-      switch (keyDownInfo->wVKey)
-      {
-        case 'A':
-        {
-          if (IsKeyDown(VK_CONTROL))
-          {
-            _messageList.SelectAll();
-            return true;
-          }
-          break;
-        }
-        case VK_INSERT:
-        case 'C':
-        {
-          if (IsKeyDown(VK_CONTROL))
-          {
-            CopyToClipboard();
-            return true;
-          }
-          break;
-        }
-      }
-    }
-  }
-  return false;
-}
-
-
-static void ListView_GetSelected(NControl::CListView &listView, CUIntVector &vector)
-{
-  vector.Clear();
-  int index = -1;
-  for (;;)
-  {
-    index = listView.GetNextSelectedItem(index);
-    if (index < 0)
-      break;
-    vector.Add((unsigned)index);
-  }
-}
-
-
-void CProgressDialog::CopyToClipboard()
-{
-  CUIntVector indexes;
-  ListView_GetSelected(_messageList, indexes);
-  UString s;
-  unsigned numIndexes = indexes.Size();
-  if (numIndexes == 0)
-    numIndexes = (unsigned)_messageList.GetItemCount();
-  
-  for (unsigned i = 0; i < numIndexes; i++)
-  {
-    const unsigned index = (i < indexes.Size() ? indexes[i] : i);
-    // s.Add_UInt32(index);
-    // s += ": ";
-    s += _messageStrings[index];
-    {
-      s +=
-        #ifdef _WIN32
-          "\r\n"
-        #else
-          "\n"
-        #endif
-        ;
-    }
-  }
-  
-  ClipboardSetText(*this, s);
-}
-
-
 static THREAD_FUNC_DECL MyThreadFunction(void *param)
 {
   CProgressThreadVirt *p = (CProgressThreadVirt *)param;
@@ -1412,9 +1268,7 @@ static THREAD_FUNC_DECL MyThreadFunction(void *param)
 HRESULT CProgressThreadVirt::Create(const UString &title, HWND parentWindow)
 {
   NWindows::CThread thread;
-  const WRes wres = thread.Create(MyThreadFunction, this);
-  if (wres != 0)
-    return HRESULT_FROM_WIN32(wres);
+  RINOK(thread.Create(MyThreadFunction, this));
   CProgressDialog::Create(title, thread, parentWindow);
   return S_OK;
 }
@@ -1440,7 +1294,7 @@ void CProgressThreadVirt::Process()
   catch(int v)
   {
     m = "Error #";
-    m.Add_UInt32((unsigned)v);
+    m.Add_UInt32(v);
   }
   catch(...) { m = "Error"; }
   if (Result != E_ABORT)