react-native-update 10.34.3 → 10.34.4

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

@@ -1,7 +1,7 @@
 // ProgressDialog2.h
 
-#ifndef ZIP7_INC_PROGRESS_DIALOG_2_H
-#define ZIP7_INC_PROGRESS_DIALOG_2_H
+#ifndef __PROGRESS_DIALOG_2_H
+#define __PROGRESS_DIALOG_2_H
 
 #include "../../../Common/MyCom.h"
 
@@ -33,9 +33,9 @@ class CProgressSync
 {
   bool _stopped;
   bool _paused;
+
 public:
-  bool _filesProgressMode;
-  bool _isDir;
+  bool _bytesProgressMode;
   UInt64 _totalBytes;
   UInt64 _completedBytes;
   UInt64 _totalFiles;
@@ -46,6 +46,7 @@ public:
   UString _titleFileName;
   UString _status;
   UString _filePath;
+  bool _isDir;
 
   UStringVector Messages;
   CProgressFinalMessage FinalMessage;
@@ -72,14 +73,13 @@ public:
     _paused = val;
   }
   
-  void Set_FilesProgressMode(bool filesProgressMode)
+  void Set_BytesProgressMode(bool bytesProgressMode)
   {
     NWindows::NSynchronization::CCriticalSectionLock lock(_cs);
-    _filesProgressMode = filesProgressMode;
+    _bytesProgressMode = bytesProgressMode;
   }
   
   HRESULT CheckStop();
-  void Clear_Stop_Status();
   HRESULT ScanProgress(UInt64 numFiles, UInt64 totalSize, const FString &fileName, bool isDir = false);
 
   HRESULT Set_NumFilesTotal(UInt64 val);
@@ -96,38 +96,17 @@ public:
 
   void AddError_Message(const wchar_t *message);
   void AddError_Message_Name(const wchar_t *message, const wchar_t *name);
-  // void AddError_Code_Name(DWORD systemError, const wchar_t *name);
-  void AddError_Code_Name(HRESULT systemError, const wchar_t *name);
+  void AddError_Code_Name(DWORD systemError, const wchar_t *name);
 
   bool ThereIsMessage() const { return !Messages.IsEmpty() || FinalMessage.ThereIsMessage(); }
 };
 
-
 class CProgressDialog: public NWindows::NControl::CModalDialog
 {
-  bool _isDir;
-  bool _wasCreated;
-  bool _needClose;
-  bool _errorsWereDisplayed;
-  bool _waitCloseByCancelButton;
-  bool _cancelWasPressed;
-  bool _inCancelMessageBox;
-  bool _externalCloseMessageWasReceived;
-  bool _background;
-public:
-  bool WaitMode;
-  bool MessagesDisplayed; // = true if user pressed OK on all messages or there are no messages.
-  bool CompressingMode;
-  bool ShowCompressionInfo;
-
-private:
-  unsigned _numPostedMessages;
-  unsigned _numAutoSizeMessages;
-  unsigned _numMessages;
-
   UString _titleFileName;
   UString _filePath;
   UString _status;
+  bool _isDir;
 
   UString _background_String;
   UString _backgrounded_String;
@@ -172,11 +151,11 @@ private:
   NWindows::NControl::CProgressBar m_ProgressBar;
   NWindows::NControl::CListView _messageList;
   
-  UStringVector _messageStrings;
+  int _numMessages;
 
-  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   CMyComPtr<ITaskbarList3> _taskbarList;
-  // #endif
+  #endif
   HWND _hwndForTaskbar;
 
   UInt32 _prevTime;
@@ -190,37 +169,50 @@ private:
   UInt64 _processed_Prev;
   UInt64 _packed_Prev;
   UInt64 _ratio_Prev;
-
   UString _filesStr_Prev;
-  UString _filesTotStr_Prev;
 
-  unsigned _numReduceSymbols;
   unsigned _prevSpeed_MoveBits;
   UInt64 _prevSpeed;
 
-  // #ifdef __ITaskbarList3_INTERFACE_DEFINED__
+  bool _foreground;
+
+  unsigned _numReduceSymbols;
+
+  bool _wasCreated;
+  bool _needClose;
+
+  unsigned _numPostedMessages;
+  UInt32 _numAutoSizeMessages;
+
+  bool _errorsWereDisplayed;
+
+  bool _waitCloseByCancelButton;
+  bool _cancelWasPressed;
+  
+  bool _inCancelMessageBox;
+  bool _externalCloseMessageWasReceived;
+
+
+  #ifdef __ITaskbarList3_INTERFACE_DEFINED__
   void SetTaskbarProgressState(TBPFLAG tbpFlags)
   {
     if (_taskbarList && _hwndForTaskbar)
       _taskbarList->SetProgressState(_hwndForTaskbar, tbpFlags);
   }
-  // #endif
+  #endif
   void SetTaskbarProgressState();
 
   void UpdateStatInfo(bool showAll);
+  bool OnTimer(WPARAM timerID, LPARAM callback);
   void SetProgressRange(UInt64 range);
   void SetProgressPos(UInt64 pos);
-  virtual bool OnTimer(WPARAM timerID, LPARAM callback) Z7_override;
-  virtual bool OnInit() Z7_override;
-  virtual bool OnSize(WPARAM wParam, int xSize, int ySize) Z7_override;
-  virtual void OnCancel() Z7_override;
-  virtual void OnOK() Z7_override;
-  virtual bool OnNotify(UINT /* controlID */, LPNMHDR header) Z7_override;
-  void CopyToClipboard();
-
+  virtual bool OnInit();
+  virtual bool OnSize(WPARAM wParam, int xSize, int ySize);
+  virtual void OnCancel();
+  virtual void OnOK();
   NWindows::NSynchronization::CManualResetEvent _createDialogEvent;
   NWindows::NSynchronization::CManualResetEvent _dialogCreatedEvent;
-  #ifndef Z7_SFX
+  #ifndef _SFX
   void AddToTitle(LPCWSTR string);
   #endif
 
@@ -228,11 +220,11 @@ private:
   void SetPriorityText();
   void OnPauseButton();
   void OnPriorityButton();
-  bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
-  bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
+  bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
 
   void SetTitleText();
-  void ShowSize(unsigned id, UInt64 val, UInt64 &prev);
+  void ShowSize(int id, UInt64 val, UInt64 &prev);
 
   void UpdateMessagesDialog();
 
@@ -245,15 +237,19 @@ private:
   void ShowAfterMessages(HWND wndParent);
 
   void CheckNeedClose();
-
 public:
   CProgressSync Sync;
+  bool CompressingMode;
+  bool WaitMode;
+  bool ShowCompressionInfo;
+  bool MessagesDisplayed; // = true if user pressed OK on all messages or there are no messages.
   int IconID;
+
   HWND MainWindow;
-  #ifndef Z7_SFX
+  #ifndef _SFX
   UString MainTitle;
   UString MainAddTitle;
-  ~CProgressDialog() Z7_DESTRUCTOR_override;
+  ~CProgressDialog();
   #endif
 
   CProgressDialog();
@@ -263,7 +259,7 @@ public:
     _dialogCreatedEvent.Lock();
   }
 
-  INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = NULL);
+  INT_PTR Create(const UString &title, NWindows::CThread &thread, HWND wndParent = 0);
 
 
   /* how it works:
@@ -304,7 +300,7 @@ public:
   void Process();
   void AddErrorPath(const FString &path) { ErrorPaths.Add(path); }
 
-  HRESULT Create(const UString &title, HWND parentWindow = NULL);
+  HRESULT Create(const UString &title, HWND parentWindow = 0);
   CProgressThreadVirt(): Result(E_FAIL), ThreadFinishedOK(false) {}
 
   CProgressMessageBoxPair &GetMessagePair(bool isError) { return isError ? FinalMessage.ErrorMessage : FinalMessage.OkMessage; }
@@ -325,7 +321,7 @@ CProgressThreadVirt::Create()
 CProgressThreadVirt::Process()
 {
   {
-    Result = ProcessVirt(); // virtual function that must implement real work
+    ProcessVirt(); // virtual function that must implement real work
   }
   if (exceptions) or FinalMessage.ErrorMessage.Message
   {

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

@@ -28,7 +28,6 @@
 
 #define IDT_PROGRESS_PACKED_VAL    110
 #define IDT_PROGRESS_FILES_VAL     111
-#define IDT_PROGRESS_FILES_TOTAL   112
 
 #define IDT_PROGRESS_ELAPSED_VAL   120
 #define IDT_PROGRESS_REMAINING_VAL 121
@@ -42,7 +41,7 @@
 #ifdef UNDER_CE
 #define MY_PROGRESS_VAL_UNITS  44
 #else
-#define MY_PROGRESS_VAL_UNITS  72
+#define MY_PROGRESS_VAL_UNITS  76
 #endif
 #define MY_PROGRESS_LABEL_UNITS_MIN   60
 #define MY_PROGRESS_LABEL_UNITS_START 90

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

@@ -44,35 +44,30 @@ DIALOG_ID  DIALOG  0, 0, xs, ys  MY_MODAL_RESIZE_DIALOG_STYLE  MY_FONT
 CAPTION "Progress"
 {
   DEFPUSHBUTTON  "&Background", IDB_PROGRESS_BACKGROUND, bx3, by, bxs, bys
-  PUSHBUTTON     "&Pause",      IDB_PAUSE,               bx2, by, bxs, bys
+  PUSHBUTTON     "&Pause",      IDB_PAUSE                bx2, by, bxs, bys
   PUSHBUTTON     "Cancel",      IDCANCEL,                bx1, by, bxs, bys
 
-
   LTEXT  "Elapsed time:",      IDT_PROGRESS_ELAPSED,   m, y0, x0s, 8
   LTEXT  "Remaining time:",    IDT_PROGRESS_REMAINING, m, y1, x0s, 8
   LTEXT  "Files:",             IDT_PROGRESS_FILES,     m, y2, x0s, 8
-
+  LTEXT  "Compression ratio:", IDT_PROGRESS_RATIO,     m, y3, x0s, 8
   LTEXT  "Errors:",            IDT_PROGRESS_ERRORS,    m, y4, x0s, 8
 
-
   LTEXT  "Total size:",        IDT_PROGRESS_TOTAL,    x2, y0, x2s, 8
   LTEXT  "Speed:",             IDT_PROGRESS_SPEED,    x2, y1, x2s, 8
   LTEXT  "Processed:",         IDT_PROGRESS_PROCESSED,x2, y2, x2s, 8
   LTEXT  "Compressed size:"  , IDT_PROGRESS_PACKED,   x2, y3, x2s, 8
-  LTEXT  "Compression ratio:", IDT_PROGRESS_RATIO,    x2, y4, x2s, 8
 
-  
   RTEXT  "",  IDT_PROGRESS_ELAPSED_VAL,   x1, y0, x1s, MY_TEXT_NOPREFIX
   RTEXT  "",  IDT_PROGRESS_REMAINING_VAL, x1, y1, x1s, MY_TEXT_NOPREFIX
   RTEXT  "",  IDT_PROGRESS_FILES_VAL,     x1, y2, x1s, MY_TEXT_NOPREFIX
-  RTEXT  "",  IDT_PROGRESS_FILES_TOTAL,   x1, y3, x1s, MY_TEXT_NOPREFIX
+  RTEXT  "",  IDT_PROGRESS_RATIO_VAL,     x1, y3, x1s, MY_TEXT_NOPREFIX
   RTEXT  "",  IDT_PROGRESS_ERRORS_VAL,    x1, y4, x1s, MY_TEXT_NOPREFIX
 
   RTEXT  "",  IDT_PROGRESS_TOTAL_VAL,     x3, y0, x3s, MY_TEXT_NOPREFIX
   RTEXT  "",  IDT_PROGRESS_SPEED_VAL,     x3, y1, x3s, MY_TEXT_NOPREFIX
   RTEXT  "",  IDT_PROGRESS_PROCESSED_VAL, x3, y2, x3s, MY_TEXT_NOPREFIX
   RTEXT  "",  IDT_PROGRESS_PACKED_VAL,    x3, y3, x3s, MY_TEXT_NOPREFIX
-  RTEXT  "",  IDT_PROGRESS_RATIO_VAL,     x3, y4, x3s, MY_TEXT_NOPREFIX
 
   LTEXT  "", IDT_PROGRESS_STATUS, m, z3, xc, MY_TEXT_NOPREFIX
   CONTROL  "", IDT_PROGRESS_FILE_NAME, "Static", SS_NOPREFIX | SS_LEFTNOWORDWRAP, m, z2, xc, z2s

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

@@ -1,7 +1,7 @@
 // PropertyName.h
 
-#ifndef ZIP7_INC_PROPERTY_NAME_H
-#define ZIP7_INC_PROPERTY_NAME_H
+#ifndef __PROPERTY_NAME_H
+#define __PROPERTY_NAME_H
 
 #include "../../../Common/MyString.h"
 

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

@@ -93,12 +93,3 @@
 #define IDS_PROP_READ_ONLY        1093
 #define IDS_PROP_OUT_NAME         1094
 #define IDS_PROP_COPY_LINK        1095
-#define IDS_PROP_ARC_FILE_NAME    1096
-#define IDS_PROP_IS_HASH          1097
-#define IDS_PROP_CHANGE_TIME      1098
-#define IDS_PROP_USER_ID          1099
-#define IDS_PROP_GROUP_ID         1100
-#define IDS_PROP_DEVICE_MAJOR     1101
-#define IDS_PROP_DEVICE_MINOR     1102
-#define IDS_PROP_DEV_MAJOR        1103
-#define IDS_PROP_DEV_MINOR        1104