react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/7z/7zOut.h

@@ -1,7 +1,7 @@
 // 7zOut.h
 
-#ifndef ZIP7_INC_7Z_OUT_H
-#define ZIP7_INC_7Z_OUT_H
+#ifndef __7Z_OUT_H
+#define __7Z_OUT_H
 
 #include "7zCompressionMode.h"
 #include "7zEncode.h"
@@ -14,46 +14,35 @@
 namespace NArchive {
 namespace N7z {
 
-const unsigned k_StartHeadersRewriteSize = 32;
-
 class CWriteBufferLoc
 {
   Byte *_data;
-  Byte *_dataLim;
-  Byte *_dataBase;
+  size_t _size;
+  size_t _pos;
 public:
-  // CWriteBufferLoc(): _data(NULL), _dataLim(NULL), _dataBase(NULL) {}
+  CWriteBufferLoc(): _size(0), _pos(0) {}
   void Init(Byte *data, size_t size)
   {
     _data = data;
-    _dataBase = data;
-    _dataLim = data + size;
-  }
-  
-  Byte *GetDest_and_Update(size_t size)
-  {
-    Byte *dest = _data;
-    if (size > (size_t)(_dataLim - dest))
-      throw 1;
-    _data = dest + size;
-    return dest;
+    _size = size;
+    _pos = 0;
   }
   void WriteBytes(const void *data, size_t size)
   {
     if (size == 0)
       return;
-    Byte *dest = GetDest_and_Update(size);
-    memcpy(dest, data, size);
+    if (size > _size - _pos)
+      throw 1;
+    memcpy(_data + _pos, data, size);
+    _pos += size;
   }
   void WriteByte(Byte b)
   {
-    Byte *dest = _data;
-    if (dest == _dataLim)
+    if (_size == _pos)
       throw 1;
-    *dest++ = b;
-    _data = dest;
+    _data[_pos++] = b;
   }
-  size_t GetPos() const { return (size_t)(_data - _dataBase); }
+  size_t GetPos() const { return _pos; }
 };
 
 
@@ -251,26 +240,22 @@ struct CArchiveDatabaseOut: public COutFolders
 
 class COutArchive
 {
+  UInt64 _prefixHeaderPos;
+
   HRESULT WriteDirect(const void *data, UInt32 size) { return WriteStream(SeqStream, data, size); }
   
   UInt64 GetPos() const;
   void WriteBytes(const void *data, size_t size);
   void WriteBytes(const CByteBuffer &data) { WriteBytes(data, data.Size()); }
   void WriteByte(Byte b);
-  void WriteByte_ToStream(Byte b)
-  {
-    _outByte.WriteByte(b);
-    // _crc = CRC_UPDATE_BYTE(_crc, b);
-  }
-  // void WriteUInt32(UInt32 value);
-  // void WriteUInt64(UInt64 value);
+  void WriteUInt32(UInt32 value);
+  void WriteUInt64(UInt64 value);
   void WriteNumber(UInt64 value);
   void WriteID(UInt64 value) { WriteNumber(value); }
 
   void WriteFolder(const CFolder &folder);
   HRESULT WriteFileHeader(const CFileItem &itemInfo);
-  void Write_BoolVector(const CBoolVector &boolVector);
-  void Write_BoolVector_numDefined(const CBoolVector &boolVector, unsigned numDefined);
+  void WriteBoolVector(const CBoolVector &boolVector);
   void WritePropBoolVector(Byte id, const CBoolVector &boolVector);
 
   void WriteHashDigests(const CUInt32DefVector &digests);
@@ -292,8 +277,7 @@ class COutArchive
 
   void SkipToAligned(unsigned pos, unsigned alignShifts);
   void WriteAlignedBools(const CBoolVector &v, unsigned numDefined, Byte type, unsigned itemSizeShifts);
-  void Write_UInt32DefVector_numDefined(const CUInt32DefVector &v, unsigned numDefined);
-  void Write_UInt64DefVector_type(const CUInt64DefVector &v, Byte type);
+  void WriteUInt64DefVector(const CUInt64DefVector &v, Byte type);
 
   HRESULT EncodeStream(
       DECL_EXTERNAL_CODECS_LOC_VARS
@@ -306,39 +290,44 @@ class COutArchive
   
   bool _countMode;
   bool _writeToStream;
-  bool _useAlign;
-  #ifdef Z7_7Z_VOL
-  bool _endMarker;
-  #endif
-  // UInt32 _crc;
   size_t _countSize;
-  CWriteBufferLoc _outByte2;
+  UInt32 _crc;
   COutBuffer _outByte;
-  UInt64 _signatureHeaderPos;
-  CMyComPtr<IOutStream> Stream;
+  CWriteBufferLoc _outByte2;
+
+  #ifdef _7Z_VOL
+  bool _endMarker;
+  #endif
 
-  #ifdef Z7_7Z_VOL
+  bool _useAlign;
+
+  HRESULT WriteSignature();
+  #ifdef _7Z_VOL
   HRESULT WriteFinishSignature();
-  HRESULT WriteFinishHeader(const CFinishHeader &h);
   #endif
   HRESULT WriteStartHeader(const CStartHeader &h);
-
+  #ifdef _7Z_VOL
+  HRESULT WriteFinishHeader(const CFinishHeader &h);
+  #endif
+  CMyComPtr<IOutStream> Stream;
 public:
-  CMyComPtr<ISequentialOutStream> SeqStream;
 
-  // COutArchive();
-  HRESULT Create_and_WriteStartPrefix(ISequentialOutStream *stream /* , bool endMarker */);
+  COutArchive() { _outByte.Create(1 << 16); }
+  CMyComPtr<ISequentialOutStream> SeqStream;
+  HRESULT Create(ISequentialOutStream *stream, bool endMarker);
   void Close();
+  HRESULT SkipPrefixArchiveHeader();
   HRESULT WriteDatabase(
       DECL_EXTERNAL_CODECS_LOC_VARS
       const CArchiveDatabaseOut &db,
       const CCompressionMethodMode *options,
       const CHeaderOptions &headerOptions);
 
-  #ifdef Z7_7Z_VOL
+  #ifdef _7Z_VOL
   static UInt32 GetVolHeadersSize(UInt64 dataSize, int nameLength = 0, bool props = false);
   static UInt64 GetVolPureSize(UInt64 volSize, int nameLength = 0, bool props = false);
   #endif
+
 };
 
 }}

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/7z/7zProperties.cpp

@@ -2,63 +2,56 @@
 
 #include "StdAfx.h"
 
-#include "7zHandler.h"
 #include "7zProperties.h"
+#include "7zHeader.h"
+#include "7zHandler.h"
+
+// #define _MULTI_PACK
 
 namespace NArchive {
 namespace N7z {
 
 struct CPropMap
 {
-  Byte FilePropID;
-  // CStatProp StatProp;
-  VARTYPE vt;
-  UInt32 StatPropID;
+  UInt32 FilePropID;
+  CStatProp StatProp;
 };
 
-// #define STAT_PROP(name, id, vt)  { name, id, vt }
-#define STAT_PROP(name, id, vt)  vt, id
-
-#define STAT_PROP2(id, vt) STAT_PROP(NULL, id, vt)
-
-#define k_7z_id_Encrypted    97
-#define k_7z_id_Method       98
-#define k_7z_id_Block        99
-
 static const CPropMap kPropMap[] =
 {
-  { NID::kName, STAT_PROP2(kpidPath, VT_BSTR) },
-  { NID::kSize, STAT_PROP2(kpidSize, VT_UI8) },
-  { NID::kPackInfo, STAT_PROP2(kpidPackSize, VT_UI8) },
+  { NID::kName, { NULL, kpidPath, VT_BSTR } },
+  { NID::kSize, { NULL, kpidSize, VT_UI8 } },
+  { NID::kPackInfo, { NULL, kpidPackSize, VT_UI8 } },
   
-  #ifdef Z7_7Z_SHOW_PACK_STREAMS_SIZES
-#define k_7z_id_PackedSize0 100
-  { k_7z_id_PackedSize0 + 0, STAT_PROP("Pack0", kpidPackedSize0, VT_UI8) },
-  { k_7z_id_PackedSize0 + 1, STAT_PROP("Pack1", kpidPackedSize1, VT_UI8) },
-  { k_7z_id_PackedSize0 + 2, STAT_PROP("Pack2", kpidPackedSize2, VT_UI8) },
-  { k_7z_id_PackedSize0 + 3, STAT_PROP("Pack3", kpidPackedSize3, VT_UI8) },
-  { k_7z_id_PackedSize0 + 4, STAT_PROP("Pack4", kpidPackedSize4, VT_UI8) },
+  #ifdef _MULTI_PACK
+  { 100, { "Pack0", kpidPackedSize0, VT_UI8 } },
+  { 101, { "Pack1", kpidPackedSize1, VT_UI8 } },
+  { 102, { "Pack2", kpidPackedSize2, VT_UI8 } },
+  { 103, { "Pack3", kpidPackedSize3, VT_UI8 } },
+  { 104, { "Pack4", kpidPackedSize4, VT_UI8 } },
   #endif
 
-  { NID::kCTime, STAT_PROP2(kpidCTime, VT_FILETIME) },
-  { NID::kMTime, STAT_PROP2(kpidMTime, VT_FILETIME) },
-  { NID::kATime, STAT_PROP2(kpidATime, VT_FILETIME) },
-  { NID::kWinAttrib, STAT_PROP2(kpidAttrib, VT_UI4) },
-  { NID::kStartPos, STAT_PROP2(kpidPosition, VT_UI8) },
-
-  { NID::kCRC, STAT_PROP2(kpidCRC, VT_UI4) },
-  // { NID::kIsAux, STAT_PROP2(kpidIsAux, VT_BOOL) },
-  { NID::kAnti, STAT_PROP2(kpidIsAnti, VT_BOOL) }
+  { NID::kCTime, { NULL, kpidCTime, VT_FILETIME } },
+  { NID::kMTime, { NULL, kpidMTime, VT_FILETIME } },
+  { NID::kATime, { NULL, kpidATime, VT_FILETIME } },
+  { NID::kWinAttrib, { NULL, kpidAttrib, VT_UI4 } },
+  { NID::kStartPos, { NULL, kpidPosition, VT_UI8 } },
 
-  #ifndef Z7_SFX
-  , { k_7z_id_Encrypted, STAT_PROP2(kpidEncrypted, VT_BOOL) }
-  , { k_7z_id_Method,    STAT_PROP2(kpidMethod, VT_BSTR) }
-  , { k_7z_id_Block,     STAT_PROP2(kpidBlock, VT_UI4) }
+  { NID::kCRC, { NULL, kpidCRC, VT_UI4 } },
+  
+//  { NID::kIsAux, { NULL, kpidIsAux, VT_BOOL } },
+  { NID::kAnti, { NULL, kpidIsAnti, VT_BOOL } }
+
+  #ifndef _SFX
+  ,
+  { 97, { NULL, kpidEncrypted, VT_BOOL } },
+  { 98, { NULL, kpidMethod, VT_BSTR } },
+  { 99, { NULL, kpidBlock, VT_UI4 } }
   #endif
 };
 
 static void CopyOneItem(CRecordVector<UInt64> &src,
-    CRecordVector<UInt64> &dest, const UInt32 item)
+    CRecordVector<UInt64> &dest, UInt32 item)
 {
   FOR_VECTOR (i, src)
     if (src[i] == item)
@@ -69,7 +62,7 @@ static void CopyOneItem(CRecordVector<UInt64> &src,
     }
 }
 
-static void RemoveOneItem(CRecordVector<UInt64> &src, const UInt32 item)
+static void RemoveOneItem(CRecordVector<UInt64> &src, UInt32 item)
 {
   FOR_VECTOR (i, src)
     if (src[i] == item)
@@ -79,7 +72,7 @@ static void RemoveOneItem(CRecordVector<UInt64> &src, const UInt32 item)
     }
 }
 
-static void InsertToHead(CRecordVector<UInt64> &dest, const UInt32 item)
+static void InsertToHead(CRecordVector<UInt64> &dest, UInt32 item)
 {
   FOR_VECTOR (i, dest)
     if (dest[i] == item)
@@ -96,7 +89,7 @@ void CHandler::FillPopIDs()
 {
   _fileInfoPopIDs.Clear();
 
-  #ifdef Z7_7Z_VOL
+  #ifdef _7Z_VOL
   if (_volumes.Size() < 1)
     return;
   const CVolume &volume = _volumes.Front();
@@ -112,31 +105,34 @@ void CHandler::FillPopIDs()
   RemoveOneItem(fileInfoPopIDs, NID::kNtSecure);
   */
 
-  COPY_ONE_ITEM(kName)
-  COPY_ONE_ITEM(kAnti)
-  COPY_ONE_ITEM(kSize)
-  COPY_ONE_ITEM(kPackInfo)
-  COPY_ONE_ITEM(kCTime)
-  COPY_ONE_ITEM(kMTime)
-  COPY_ONE_ITEM(kATime)
-  COPY_ONE_ITEM(kWinAttrib)
-  COPY_ONE_ITEM(kCRC)
-  COPY_ONE_ITEM(kComment)
+  COPY_ONE_ITEM(kName);
+  COPY_ONE_ITEM(kAnti);
+  COPY_ONE_ITEM(kSize);
+  COPY_ONE_ITEM(kPackInfo);
+  COPY_ONE_ITEM(kCTime);
+  COPY_ONE_ITEM(kMTime);
+  COPY_ONE_ITEM(kATime);
+  COPY_ONE_ITEM(kWinAttrib);
+  COPY_ONE_ITEM(kCRC);
+  COPY_ONE_ITEM(kComment);
 
   _fileInfoPopIDs += fileInfoPopIDs;
  
-  #ifndef Z7_SFX
-  _fileInfoPopIDs.Add(k_7z_id_Encrypted);
-  _fileInfoPopIDs.Add(k_7z_id_Method);
-  _fileInfoPopIDs.Add(k_7z_id_Block);
+  #ifndef _SFX
+  _fileInfoPopIDs.Add(97);
+  _fileInfoPopIDs.Add(98);
+  _fileInfoPopIDs.Add(99);
   #endif
 
-  #ifdef Z7_7Z_SHOW_PACK_STREAMS_SIZES
-  for (unsigned i = 0; i < 5; i++)
-    _fileInfoPopIDs.Add(k_7z_id_PackedSize0 + i);
+  #ifdef _MULTI_PACK
+  _fileInfoPopIDs.Add(100);
+  _fileInfoPopIDs.Add(101);
+  _fileInfoPopIDs.Add(102);
+  _fileInfoPopIDs.Add(103);
+  _fileInfoPopIDs.Add(104);
   #endif
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   InsertToHead(_fileInfoPopIDs, NID::kMTime);
   InsertToHead(_fileInfoPopIDs, NID::kPackInfo);
   InsertToHead(_fileInfoPopIDs, NID::kSize);
@@ -144,29 +140,25 @@ void CHandler::FillPopIDs()
   #endif
 }
 
-Z7_COM7F_IMF(CHandler::GetNumberOfProperties(UInt32 *numProps))
+STDMETHODIMP CHandler::GetNumberOfProperties(UInt32 *numProps)
 {
   *numProps = _fileInfoPopIDs.Size();
   return S_OK;
 }
 
-Z7_COM7F_IMF(CHandler::GetPropertyInfo(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType))
+STDMETHODIMP CHandler::GetPropertyInfo(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)
 {
   if (index >= _fileInfoPopIDs.Size())
     return E_INVALIDARG;
-  const UInt64 id = _fileInfoPopIDs[index];
-  for (unsigned i = 0; i < Z7_ARRAY_SIZE(kPropMap); i++)
+  UInt64 id = _fileInfoPopIDs[index];
+  for (unsigned i = 0; i < ARRAY_SIZE(kPropMap); i++)
   {
     const CPropMap &pr = kPropMap[i];
     if (pr.FilePropID == id)
     {
-      *propID = pr.StatPropID;
-      *varType = pr.vt;
-      /*
       const CStatProp &st = pr.StatProp;
       *propID = st.PropID;
       *varType = st.vt;
-      */
       /*
       if (st.lpwstrName)
         *name = ::SysAllocString(st.lpwstrName);

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/7z/7zProperties.h

@@ -1,16 +1,13 @@
 // 7zProperties.h
 
-#ifndef ZIP7_INC_7Z_PROPERTIES_H
-#define ZIP7_INC_7Z_PROPERTIES_H
+#ifndef __7Z_PROPERTIES_H
+#define __7Z_PROPERTIES_H
 
 #include "../../PropID.h"
 
 namespace NArchive {
 namespace N7z {
 
-// #define Z7_7Z_SHOW_PACK_STREAMS_SIZES // for debug
-
-#ifdef Z7_7Z_SHOW_PACK_STREAMS_SIZES
 enum
 {
   kpidPackedSize0 = kpidUserDefined,
@@ -19,7 +16,6 @@ enum
   kpidPackedSize3,
   kpidPackedSize4
 };
-#endif
 
 }}
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/7z/7zRegister.cpp

@@ -15,13 +15,7 @@ REGISTER_ARC_IO_DECREMENT_SIG(
   "7z", "7z", NULL, 7,
   k_Signature_Dec,
   0,
-    NArcInfoFlags::kFindSignature
-  | NArcInfoFlags::kCTime
-  | NArcInfoFlags::kATime
-  | NArcInfoFlags::kMTime
-  | NArcInfoFlags::kMTime_Default
-  , TIME_PREC_TO_ARC_FLAGS_MASK(NFileTimeType::kWindows)
-  | TIME_PREC_TO_ARC_FLAGS_TIME_DEFAULT(NFileTimeType::kWindows)
-  , NULL)
+  NArcInfoFlags::kFindSignature,
+  NULL);
 
 }}

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp

@@ -4,28 +4,19 @@
 
 #include "7zSpecStream.h"
 
-/*
-Z7_COM7F_IMF(CSequentialInStreamSizeCount2::Read(void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP CSequentialInStreamSizeCount2::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
   UInt32 realProcessedSize;
-  const HRESULT result = _stream->Read(data, size, &realProcessedSize);
+  HRESULT result = _stream->Read(data, size, &realProcessedSize);
   _size += realProcessedSize;
   if (processedSize)
     *processedSize = realProcessedSize;
   return result;
 }
 
-Z7_COM7F_IMF(CSequentialInStreamSizeCount2::GetSubStreamSize(UInt64 subStream, UInt64 *value))
+STDMETHODIMP CSequentialInStreamSizeCount2::GetSubStreamSize(UInt64 subStream, UInt64 *value)
 {
   if (!_getSubStreamSize)
     return E_NOTIMPL;
   return _getSubStreamSize->GetSubStreamSize(subStream, value);
 }
-
-Z7_COM7F_IMF(CSequentialInStreamSizeCount2::GetNextInSubStream(UInt64 *streamIndexRes, ISequentialInStream **stream))
-{
-  if (!_compressGetSubStreamSize)
-    return E_NOTIMPL;
-  return _compressGetSubStreamSize->GetNextInSubStream(streamIndexRes, stream);
-}
-*/

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/7z/7zSpecStream.h

@@ -1,49 +1,35 @@
 // 7zSpecStream.h
 
-#ifndef ZIP7_INC_7Z_SPEC_STREAM_H
-#define ZIP7_INC_7Z_SPEC_STREAM_H
+#ifndef __7Z_SPEC_STREAM_H
+#define __7Z_SPEC_STREAM_H
 
 #include "../../../Common/MyCom.h"
 
 #include "../../ICoder.h"
 
-/*
-#define Z7_COM_QI_ENTRY_AG_2(i, sub0, sub) else if (iid == IID_ ## i) \
-  { if (!sub) RINOK(sub0->QueryInterface(IID_ ## i, (void **)&sub)) \
-    { i *ti = this;  *outObject = ti; }  }
-
-class CSequentialInStreamSizeCount2 Z7_final:
+class CSequentialInStreamSizeCount2:
   public ISequentialInStream,
   public ICompressGetSubStreamSize,
-  public ICompressInSubStreams,
   public CMyUnknownImp
 {
-  Z7_COM_QI_BEGIN2(ISequentialInStream)
-    Z7_COM_QI_ENTRY(ICompressGetSubStreamSize)
-    Z7_COM_QI_ENTRY_AG_2(ISequentialInStream, _stream, _compressGetSubStreamSize)
-  Z7_COM_QI_END
-  Z7_COM_ADDREF_RELEASE
-
-  Z7_IFACE_COM7_IMP(ISequentialInStream)
-  Z7_IFACE_COM7_IMP(ICompressGetSubStreamSize)
-  Z7_IFACE_COM7_IMP(ICompressInSubStreams)
-
   CMyComPtr<ISequentialInStream> _stream;
   CMyComPtr<ICompressGetSubStreamSize> _getSubStreamSize;
-  CMyComPtr<ICompressInSubStreams> _compressGetSubStreamSize;
   UInt64 _size;
 public:
   void Init(ISequentialInStream *stream)
   {
     _size = 0;
     _getSubStreamSize.Release();
-    _compressGetSubStreamSize.Release();
     _stream = stream;
     _stream.QueryInterface(IID_ICompressGetSubStreamSize, &_getSubStreamSize);
-    _stream.QueryInterface(IID_ICompressInSubStreams, &_compressGetSubStreamSize);
   }
   UInt64 GetSize() const { return _size; }
+
+  MY_UNKNOWN_IMP2(ISequentialInStream, ICompressGetSubStreamSize)
+
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+
+  STDMETHOD(GetSubStreamSize)(UInt64 subStream, UInt64 *value);
 };
-*/
 
 #endif