react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/StreamObjects.h

@@ -1,7 +1,7 @@
 // StreamObjects.h
 
-#ifndef ZIP7_INC_STREAM_OBJECTS_H
-#define ZIP7_INC_STREAM_OBJECTS_H
+#ifndef __STREAM_OBJECTS_H
+#define __STREAM_OBJECTS_H
 
 #include "../../Common/MyBuffer.h"
 #include "../../Common/MyCom.h"
@@ -9,33 +9,39 @@
 
 #include "../IStream.h"
 
-Z7_CLASS_IMP_IInStream(
-  CBufferInStream
-)
+class CBufferInStream:
+  public IInStream,
+  public CMyUnknownImp
+{
   UInt64 _pos;
 public:
   CByteBuffer Buf;
   void Init() { _pos = 0; }
-};
+ 
+  MY_UNKNOWN_IMP2(ISequentialInStream, IInStream)
 
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
+};
 
-Z7_CLASS_IMP_COM_0(
-  CReferenceBuf
-)
-public:
+struct CReferenceBuf:
+  public IUnknown,
+  public CMyUnknownImp
+{
   CByteBuffer Buf;
+  MY_UNKNOWN_IMP
 };
 
-
-Z7_CLASS_IMP_IInStream(
-  CBufInStream
-)
+class CBufInStream:
+  public IInStream,
+  public CMyUnknownImp
+{
   const Byte *_data;
   UInt64 _pos;
   size_t _size;
   CMyComPtr<IUnknown> _ref;
 public:
-  void Init(const Byte *data, size_t size, IUnknown *ref = NULL)
+  void Init(const Byte *data, size_t size, IUnknown *ref = 0)
   {
     _data = data;
     _size = size;
@@ -44,24 +50,22 @@ public:
   }
   void Init(CReferenceBuf *ref) { Init(ref->Buf, ref->Buf.Size(), ref); }
 
-  // Seek() is allowed here. So reading order could be changed
-  bool WasFinished() const { return _pos == _size; }
+  MY_UNKNOWN_IMP2(ISequentialInStream, IInStream)
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
 };
 
-
 void Create_BufInStream_WithReference(const void *data, size_t size, IUnknown *ref, ISequentialInStream **stream);
 void Create_BufInStream_WithNewBuffer(const void *data, size_t size, ISequentialInStream **stream);
 inline void Create_BufInStream_WithNewBuffer(const CByteBuffer &buf, ISequentialInStream **stream)
   { Create_BufInStream_WithNewBuffer(buf, buf.Size(), stream); }
 
-
-class CByteDynBuffer Z7_final
+class CByteDynBuffer
 {
   size_t _capacity;
   Byte *_buf;
-  Z7_CLASS_NO_COPY(CByteDynBuffer)
 public:
-  CByteDynBuffer(): _capacity(0), _buf(NULL) {}
+  CByteDynBuffer(): _capacity(0), _buf(0) {};
   // there is no copy constructor. So don't copy this object.
   ~CByteDynBuffer() { Free(); }
   void Free() throw();
@@ -71,11 +75,10 @@ public:
   bool EnsureCapacity(size_t capacity) throw();
 };
 
-
-Z7_CLASS_IMP_COM_1(
-  CDynBufSeqOutStream
-  , ISequentialOutStream
-)
+class CDynBufSeqOutStream:
+  public ISequentialOutStream,
+  public CMyUnknownImp
+{
   CByteDynBuffer _buffer;
   size_t _size;
 public:
@@ -86,13 +89,15 @@ public:
   void CopyToBuffer(CByteBuffer &dest) const;
   Byte *GetBufPtrForWriting(size_t addSize);
   void UpdateSize(size_t addSize) { _size += addSize; }
-};
 
+  MY_UNKNOWN_IMP1(ISequentialOutStream)
+  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
+};
 
-Z7_CLASS_IMP_COM_1(
-  CBufPtrSeqOutStream
-  , ISequentialOutStream
-)
+class CBufPtrSeqOutStream:
+  public ISequentialOutStream,
+  public CMyUnknownImp
+{
   Byte *_buffer;
   size_t _size;
   size_t _pos;
@@ -104,28 +109,30 @@ public:
     _size = size;
   }
   size_t GetPos() const { return _pos; }
-};
 
+  MY_UNKNOWN_IMP1(ISequentialOutStream)
+  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
+};
 
-Z7_CLASS_IMP_COM_1(
-  CSequentialOutStreamSizeCount
-  , ISequentialOutStream
-)
+class CSequentialOutStreamSizeCount:
+  public ISequentialOutStream,
+  public CMyUnknownImp
+{
   CMyComPtr<ISequentialOutStream> _stream;
   UInt64 _size;
 public:
   void SetStream(ISequentialOutStream *stream) { _stream = stream; }
   void Init() { _size = 0; }
   UInt64 GetSize() const { return _size; }
-};
 
+  MY_UNKNOWN_IMP1(ISequentialOutStream)
+  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
+};
 
 class CCachedInStream:
   public IInStream,
   public CMyUnknownImp
 {
-  Z7_IFACES_IMP_UNK_2(ISequentialInStream, IInStream)
-
   UInt64 *_tags;
   Byte *_data;
   size_t _dataSize;
@@ -136,11 +143,15 @@ class CCachedInStream:
 protected:
   virtual HRESULT ReadBlock(UInt64 blockIndex, Byte *dest, size_t blockSize) = 0;
 public:
-  CCachedInStream(): _tags(NULL), _data(NULL) {}
-  virtual ~CCachedInStream() { Free(); } // the destructor must be virtual (Release() calls it) !!!
+  CCachedInStream(): _tags(0), _data(0) {}
+  virtual ~CCachedInStream() { Free(); } // the destructor must be virtual (release calls it) !!!
   void Free() throw();
   bool Alloc(unsigned blockSizeLog, unsigned numBlocksLog) throw();
   void Init(UInt64 size) throw();
+
+  MY_UNKNOWN_IMP2(ISequentialInStream, IInStream)
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
 };
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/StreamUtils.cpp

@@ -2,55 +2,10 @@
 
 #include "StdAfx.h"
 
-#include "../../Common/MyCom.h"
-
 #include "StreamUtils.h"
 
 static const UInt32 kBlockSize = ((UInt32)1 << 31);
 
-
-HRESULT InStream_SeekToBegin(IInStream *stream) throw()
-{
-  return InStream_SeekSet(stream, 0);
-}
-
-
-HRESULT InStream_AtBegin_GetSize(IInStream *stream, UInt64 &sizeRes) throw()
-{
-#ifdef _WIN32
-  {
-    Z7_DECL_CMyComPtr_QI_FROM(
-        IStreamGetSize,
-        streamGetSize, stream)
-    if (streamGetSize && streamGetSize->GetSize(&sizeRes) == S_OK)
-      return S_OK;
-  }
-#endif
-  const HRESULT hres = InStream_GetSize_SeekToEnd(stream, sizeRes);
-  const HRESULT hres2 = InStream_SeekToBegin(stream);
-  return hres != S_OK ? hres : hres2;
-}
-
-
-HRESULT InStream_GetPos_GetSize(IInStream *stream, UInt64 &curPosRes, UInt64 &sizeRes) throw()
-{
-  RINOK(InStream_GetPos(stream, curPosRes))
-#ifdef _WIN32
-  {
-    Z7_DECL_CMyComPtr_QI_FROM(
-        IStreamGetSize,
-        streamGetSize, stream)
-    if (streamGetSize && streamGetSize->GetSize(&sizeRes) == S_OK)
-      return S_OK;
-  }
-#endif
-  const HRESULT hres = InStream_GetSize_SeekToEnd(stream, sizeRes);
-  const HRESULT hres2 = InStream_SeekSet(stream, curPosRes);
-  return hres != S_OK ? hres : hres2;
-}
-
-
-
 HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *processedSize) throw()
 {
   size_t size = *processedSize;
@@ -63,7 +18,7 @@ HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *processedSiz
     *processedSize += processedSizeLoc;
     data = (void *)((Byte *)data + processedSizeLoc);
     size -= processedSizeLoc;
-    RINOK(res)
+    RINOK(res);
     if (processedSizeLoc == 0)
       return S_OK;
   }
@@ -73,14 +28,14 @@ HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *processedSiz
 HRESULT ReadStream_FALSE(ISequentialInStream *stream, void *data, size_t size) throw()
 {
   size_t processedSize = size;
-  RINOK(ReadStream(stream, data, &processedSize))
+  RINOK(ReadStream(stream, data, &processedSize));
   return (size == processedSize) ? S_OK : S_FALSE;
 }
 
 HRESULT ReadStream_FAIL(ISequentialInStream *stream, void *data, size_t size) throw()
 {
   size_t processedSize = size;
-  RINOK(ReadStream(stream, data, &processedSize))
+  RINOK(ReadStream(stream, data, &processedSize));
   return (size == processedSize) ? S_OK : E_FAIL;
 }
 
@@ -93,7 +48,7 @@ HRESULT WriteStream(ISequentialOutStream *stream, const void *data, size_t size)
     HRESULT res = stream->Write(data, curSize, &processedSizeLoc);
     data = (const void *)((const Byte *)data + processedSizeLoc);
     size -= processedSizeLoc;
-    RINOK(res)
+    RINOK(res);
     if (processedSizeLoc == 0)
       return E_FAIL;
   }

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/StreamUtils.h

@@ -1,28 +1,10 @@
 // StreamUtils.h
 
-#ifndef ZIP7_INC_STREAM_UTILS_H
-#define ZIP7_INC_STREAM_UTILS_H
+#ifndef __STREAM_UTILS_H
+#define __STREAM_UTILS_H
 
 #include "../IStream.h"
 
-inline HRESULT InStream_SeekSet(IInStream *stream, UInt64 offset) throw()
-  {  return stream->Seek((Int64)offset, STREAM_SEEK_SET, NULL); }
-inline HRESULT InStream_GetPos(IInStream *stream, UInt64 &curPosRes) throw()
-  {  return stream->Seek(0, STREAM_SEEK_CUR, &curPosRes); }
-inline HRESULT InStream_GetSize_SeekToEnd(IInStream *stream, UInt64 &sizeRes) throw()
-  { return stream->Seek(0, STREAM_SEEK_END, &sizeRes); }
-
-HRESULT InStream_SeekToBegin(IInStream *stream) throw();
-HRESULT InStream_AtBegin_GetSize(IInStream *stream, UInt64 &size) throw();
-HRESULT InStream_GetPos_GetSize(IInStream *stream, UInt64 &curPosRes, UInt64 &sizeRes) throw();
-
-inline HRESULT InStream_GetSize_SeekToBegin(IInStream *stream, UInt64 &sizeRes) throw()
-{
-  RINOK(InStream_SeekToBegin(stream))
-  return InStream_AtBegin_GetSize(stream, sizeRes);
-}
-
-
 HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *size) throw();
 HRESULT ReadStream_FALSE(ISequentialInStream *stream, void *data, size_t size) throw();
 HRESULT ReadStream_FAIL(ISequentialInStream *stream, void *data, size_t size) throw();

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/UniqBlocks.cpp

@@ -11,10 +11,10 @@ unsigned CUniqBlocks::AddUniq(const Byte *data, size_t size)
   unsigned left = 0, right = Sorted.Size();
   while (left != right)
   {
-    const unsigned mid = (unsigned)(((size_t)left + (size_t)right) / 2);
-    const unsigned index = Sorted[mid];
+    unsigned mid = (left + right) / 2;
+    unsigned index = Sorted[mid];
     const CByteBuffer &buf = Bufs[index];
-    const size_t sizeMid = buf.Size();
+    size_t sizeMid = buf.Size();
     if (size < sizeMid)
       right = mid;
     else if (size > sizeMid)
@@ -23,7 +23,7 @@ unsigned CUniqBlocks::AddUniq(const Byte *data, size_t size)
     {
       if (size == 0)
         return index;
-      const int cmp = memcmp(data, buf, size);
+      int cmp = memcmp(data, buf, size);
       if (cmp == 0)
         return index;
       if (cmp < 0)

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/UniqBlocks.h

@@ -1,26 +1,11 @@
 // UniqBlocks.h
 
-#ifndef ZIP7_INC_UNIQ_BLOCKS_H
-#define ZIP7_INC_UNIQ_BLOCKS_H
+#ifndef __UNIQ_BLOCKS_H
+#define __UNIQ_BLOCKS_H
 
+#include "../../Common/MyTypes.h"
 #include "../../Common/MyBuffer.h"
-#include "../../Common/MyString.h"
-
-struct C_UInt32_UString_Map
-{
-  CRecordVector<UInt32> Numbers;
-  UStringVector Strings;
-  
-  void Add_UInt32(const UInt32 n)
-  {
-    Numbers.AddToUniqueSorted(n);
-  }
-  int Find(const UInt32 n)
-  {
-    return Numbers.FindInSorted(n);
-  }
-};
-
+#include "../../Common/MyVector.h"
 
 struct CUniqBlocks
 {
@@ -34,7 +19,7 @@ struct CUniqBlocks
 
   bool IsOnlyEmpty() const
   {
-    return (Bufs.Size() == 0 || (Bufs.Size() == 1 && Bufs[0].Size() == 0));
+    return (Bufs.Size() == 0 || Bufs.Size() == 1 && Bufs[0].Size() == 0);
   }
 };
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/VirtThread.cpp

@@ -11,7 +11,7 @@ static THREAD_FUNC_DECL CoderThread(void *p)
     CVirtThread *t = (CVirtThread *)p;
     t->StartEvent.Lock();
     if (t->Exit)
-      return THREAD_FUNC_RET_ZERO;
+      return 0;
     t->Execute();
     t->FinishedEvent.Set();
   }
@@ -19,20 +19,20 @@ static THREAD_FUNC_DECL CoderThread(void *p)
 
 WRes CVirtThread::Create()
 {
-  RINOK_WRes(StartEvent.CreateIfNotCreated_Reset())
-  RINOK_WRes(FinishedEvent.CreateIfNotCreated_Reset())
-  // StartEvent.Reset();
-  // FinishedEvent.Reset();
+  RINOK(StartEvent.CreateIfNotCreated());
+  RINOK(FinishedEvent.CreateIfNotCreated());
+  StartEvent.Reset();
+  FinishedEvent.Reset();
   Exit = false;
   if (Thread.IsCreated())
     return S_OK;
   return Thread.Create(CoderThread, this);
 }
 
-WRes CVirtThread::Start()
+void CVirtThread::Start()
 {
   Exit = false;
-  return StartEvent.Set();
+  StartEvent.Set();
 }
 
 void CVirtThread::WaitThreadFinish()
@@ -42,6 +42,7 @@ void CVirtThread::WaitThreadFinish()
     StartEvent.Set();
   if (Thread.IsCreated())
   {
-    Thread.Wait_Close();
+    Thread.Wait();
+    Thread.Close();
   }
 }

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/VirtThread.h

@@ -1,7 +1,7 @@
 // VirtThread.h
 
-#ifndef ZIP7_INC_VIRT_THREAD_H
-#define ZIP7_INC_VIRT_THREAD_H
+#ifndef __VIRT_THREAD_H
+#define __VIRT_THREAD_H
 
 #include "../../Windows/Synchronization.h"
 #include "../../Windows/Thread.h"
@@ -13,12 +13,12 @@ struct CVirtThread
   NWindows::CThread Thread;
   bool Exit;
 
-  virtual ~CVirtThread() { WaitThreadFinish(); }
+  ~CVirtThread() { WaitThreadFinish(); }
   void WaitThreadFinish(); // call it in destructor of child class !
   WRes Create();
-  WRes Start();
+  void Start();
   virtual void Execute() = 0;
-  WRes WaitExecuteFinish() { return FinishedEvent.Lock(); }
+  void WaitExecuteFinish() { FinishedEvent.Lock(); }
 };
 
 #endif