react-native-update 10.34.3 → 10.34.5

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

@@ -1,7 +1,7 @@
 // HandlerOut.h
 
-#ifndef ZIP7_INC_HANDLER_OUT_H
-#define ZIP7_INC_HANDLER_OUT_H
+#ifndef __HANDLER_OUT_H
+#define __HANDLER_OUT_H
 
 #include "../../../Windows/System.h"
 
@@ -16,59 +16,28 @@ class CCommonMethodProps
 protected:
   void InitCommon()
   {
-    // _Write_MTime = true;
-    {
-#ifndef Z7_ST
-      _numThreads_WasForced = false;
-      UInt32 numThreads;
-#ifdef _WIN32
-      NWindows::NSystem::CProcessAffinity aff;
-      numThreads = aff.Load_and_GetNumberOfThreads();
-      _numThreadGroups = aff.IsGroupMode ? aff.Groups.GroupSizes.Size() : 0;
-#else
-      numThreads = NWindows::NSystem::GetNumberOfProcessors();
-#endif // _WIN32
-      _numProcessors = _numThreads = numThreads;
-#endif // Z7_ST
-    }
-    
-    size_t memAvail = (size_t)sizeof(size_t) << 28;
+    #ifndef _7ZIP_ST
+    _numProcessors = _numThreads = NWindows::NSystem::GetNumberOfProcessors();
+    #endif
+
+    UInt64 memAvail = (UInt64)(sizeof(size_t)) << 28;
     _memAvail = memAvail;
-    _memUsage_Compress = memAvail;
-    _memUsage_Decompress = memAvail;
-    _memUsage_WasSet = NWindows::NSystem::GetRamSize(memAvail);
-    if (_memUsage_WasSet)
+    _memUsage = memAvail;
+    if (NWindows::NSystem::GetRamSize(memAvail))
     {
       _memAvail = memAvail;
-      unsigned bits = sizeof(size_t) * 8;
-      if (bits == 32)
-      {
-        const UInt32 limit2 = (UInt32)7 << 28;
-        if (memAvail > limit2)
-          memAvail = limit2;
-      }
-      // 80% - is auto usage limit in handlers
-      // _memUsage_Compress = memAvail * 4 / 5;
-      // _memUsage_Compress = Calc_From_Val_Percents(memAvail, 80);
-      _memUsage_Compress = Calc_From_Val_Percents_Less100(memAvail, 80);
-      _memUsage_Decompress = memAvail / 32 * 17;
+      _memUsage = memAvail / 32 * 17;
     }
   }
 
 public:
-#ifndef Z7_ST
+  #ifndef _7ZIP_ST
   UInt32 _numThreads;
   UInt32 _numProcessors;
-#ifdef _WIN32
-  UInt32 _numThreadGroups;
-#endif
-  bool _numThreads_WasForced;
-#endif
+  #endif
 
-  bool _memUsage_WasSet;
-  UInt64 _memUsage_Compress;
-  UInt64 _memUsage_Decompress;
-  size_t _memAvail;
+  UInt64 _memUsage;
+  UInt64 _memAvail;
 
   bool SetCommonProperty(const UString &name, const PROPVARIANT &value, HRESULT &hres);
 
@@ -76,7 +45,7 @@ public:
 };
 
 
-#ifndef Z7_EXTRACT_ONLY
+#ifndef EXTRACT_ONLY
 
 class CMultiMethodProps: public CCommonMethodProps
 {
@@ -93,12 +62,9 @@ public:
   
   void SetGlobalLevelTo(COneMethodInfo &oneMethodInfo) const;
 
-#ifndef Z7_ST
-  static void SetMethodThreadsTo_IfNotFinded(CMethodProps &props, UInt32 numThreads);
-  static void SetMethodThreadsTo_Replace(CMethodProps &props, UInt32 numThreads);
-  
-  static void Set_Method_NumThreadGroups_IfNotFinded(CMethodProps &props, UInt32 numThreadGroups);
-#endif
+  #ifndef _7ZIP_ST
+  static void SetMethodThreadsTo(COneMethodInfo &oneMethodInfo, UInt32 numThreads);
+  #endif
 
 
   unsigned GetNumEmptyMethods() const
@@ -134,36 +100,11 @@ public:
   CSingleMethodProps() { InitSingle(); }
   
   int GetLevel() const { return _level == (UInt32)(Int32)-1 ? 5 : (int)_level; }
-  HRESULT SetProperty(const wchar_t *name, const PROPVARIANT &values);
   HRESULT SetProperties(const wchar_t * const *names, const PROPVARIANT *values, UInt32 numProps);
 };
 
 #endif
 
-struct CHandlerTimeOptions
-{
-  CBoolPair Write_MTime;
-  CBoolPair Write_ATime;
-  CBoolPair Write_CTime;
-  UInt32 Prec;
-
-  void Init()
-  {
-    Write_MTime.Init();
-    Write_MTime.Val = true;
-    Write_ATime.Init();
-    Write_CTime.Init();
-    Prec = (UInt32)(Int32)-1;
-  }
-
-  CHandlerTimeOptions()
-  {
-    Init();
-  }
-
-  HRESULT Parse(const UString &name, const PROPVARIANT &prop, bool &processed);
-};
-
 }
 
 #endif

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

@@ -4,33 +4,22 @@
 
 #include "InStreamWithCRC.h"
 
-Z7_COM7F_IMF(CSequentialInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP CSequentialInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
   UInt32 realProcessed = 0;
   HRESULT result = S_OK;
-  if (size != 0)
-  {
-    if (_stream)
-      result = _stream->Read(data, size, &realProcessed);
-    _size += realProcessed;
-    if (realProcessed == 0)
-      _wasFinished = true;
-    else
-      _crc = CrcUpdate(_crc, data, realProcessed);
-  }
+  if (_stream)
+    result = _stream->Read(data, size, &realProcessed);
+  _size += realProcessed;
+  if (size != 0 && realProcessed == 0)
+    _wasFinished = true;
+  _crc = CrcUpdate(_crc, data, realProcessed);
   if (processedSize)
     *processedSize = realProcessed;
   return result;
 }
 
-Z7_COM7F_IMF(CSequentialInStreamWithCRC::GetSize(UInt64 *size))
-{
-  *size = _fullSize;
-  return S_OK;
-}
-
-
-Z7_COM7F_IMF(CInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP CInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
   UInt32 realProcessed = 0;
   HRESULT result = S_OK;
@@ -47,7 +36,7 @@ Z7_COM7F_IMF(CInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSi
   return result;
 }
 
-Z7_COM7F_IMF(CInStreamWithCRC::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition))
+STDMETHODIMP CInStreamWithCRC::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition)
 {
   if (seekOrigin != STREAM_SEEK_SET || offset != 0)
     return E_FAIL;

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

@@ -1,7 +1,7 @@
 // InStreamWithCRC.h
 
-#ifndef ZIP7_INC_IN_STREAM_WITH_CRC_H
-#define ZIP7_INC_IN_STREAM_WITH_CRC_H
+#ifndef __IN_STREAM_WITH_CRC_H
+#define __IN_STREAM_WITH_CRC_H
 
 #include "../../../../C/7zCrc.h"
 
@@ -9,29 +9,26 @@
 
 #include "../../IStream.h"
 
-Z7_CLASS_IMP_NOQIB_2(
-  CSequentialInStreamWithCRC
-  , ISequentialInStream
-  , IStreamGetSize
-)
+class CSequentialInStreamWithCRC:
+  public ISequentialInStream,
+  public CMyUnknownImp
+{
+public:
+  MY_UNKNOWN_IMP
+
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+private:
   CMyComPtr<ISequentialInStream> _stream;
   UInt64 _size;
   UInt32 _crc;
   bool _wasFinished;
-  UInt64 _fullSize;
 public:
-  
-  CSequentialInStreamWithCRC():
-    _fullSize((UInt64)(Int64)-1)
-    {}
-
-  void SetStream(ISequentialInStream *stream) { _stream = stream; }
-  void SetFullSize(UInt64 fullSize) { _fullSize = fullSize; }
+  void SetStream(ISequentialInStream *stream) { _stream = stream;  }
   void Init()
   {
     _size = 0;
-    _crc = CRC_INIT_VAL;
     _wasFinished = false;
+    _crc = CRC_INIT_VAL;
   }
   void ReleaseStream() { _stream.Release(); }
   UInt32 GetCRC() const { return CRC_GET_DIGEST(_crc); }
@@ -39,16 +36,22 @@ public:
   bool WasFinished() const { return _wasFinished; }
 };
 
+class CInStreamWithCRC:
+  public IInStream,
+  public CMyUnknownImp
+{
+public:
+  MY_UNKNOWN_IMP1(IInStream)
 
-Z7_CLASS_IMP_IInStream(
-  CInStreamWithCRC
-)
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
+private:
   CMyComPtr<IInStream> _stream;
   UInt64 _size;
   UInt32 _crc;
   // bool _wasFinished;
 public:
-  void SetStream(IInStream *stream) { _stream = stream; }
+  void SetStream(IInStream *stream) { _stream = stream;  }
   void Init()
   {
     _size = 0;

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

@@ -8,10 +8,7 @@ namespace NArchive {
 namespace NItemName {
 
 static const wchar_t kOsPathSepar = WCHAR_PATH_SEPARATOR;
-
-#if WCHAR_PATH_SEPARATOR != L'/'
 static const wchar_t kUnixPathSepar = L'/';
-#endif
 
 void ReplaceSlashes_OsToUnix
 #if WCHAR_PATH_SEPARATOR != L'/'
@@ -47,65 +44,19 @@ UString GetOsPath_Remove_TailSlash(const UString &name)
 }
 
 
-#if WCHAR_PATH_SEPARATOR != L'/'
-void ReplaceToWinSlashes(UString &name, bool useBackslashReplacement)
+void ReplaceToOsSlashes_Remove_TailSlash(UString &name)
 {
-  // name.Replace(kUnixPathSepar, kOsPathSepar);
-  const unsigned len = name.Len();
-  for (unsigned i = 0; i < len; i++)
+  if (!name.IsEmpty())
   {
-    wchar_t c = name[i];
-    if (c == L'/')
-      c = WCHAR_PATH_SEPARATOR;
-    else if (useBackslashReplacement && c == L'\\')
-      c = WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT; // WSL scheme
-    else
-      continue;
-    name.ReplaceOneCharAtPos(i, c);
-  }
-}
-#endif
-
-void ReplaceToOsSlashes_Remove_TailSlash(UString &name, bool
     #if WCHAR_PATH_SEPARATOR != L'/'
-      useBackslashReplacement
+      name.Replace(kUnixPathSepar, kOsPathSepar);
     #endif
-    )
-{
-  if (name.IsEmpty())
-    return;
-
-  #if WCHAR_PATH_SEPARATOR != L'/'
-  ReplaceToWinSlashes(name, useBackslashReplacement);
-  #endif
     
-  if (name.Back() == kOsPathSepar)
-    name.DeleteBack();
-}
-
-
-void NormalizeSlashes_in_FileName_for_OsPath(wchar_t *name, unsigned len)
-{
-  for (unsigned i = 0; i < len; i++)
-  {
-    wchar_t c = name[i];
-    if (c == L'/')
-      c = L'_';
-   #if WCHAR_PATH_SEPARATOR != L'/'
-    else if (c == L'\\')
-      c = WCHAR_IN_FILE_NAME_BACKSLASH_REPLACEMENT; // WSL scheme
-   #endif
-    else
-      continue;
-    name[i] = c;
+    if (name.Back() == kOsPathSepar)
+      name.DeleteBack();
   }
 }
 
-void NormalizeSlashes_in_FileName_for_OsPath(UString &name)
-{
-  NormalizeSlashes_in_FileName_for_OsPath(name.GetBuf(), name.Len());
-}
-
 
 bool HasTailSlash(const AString &name, UINT
   #if defined(_WIN32) && !defined(UNDER_CE)
@@ -115,15 +66,12 @@ bool HasTailSlash(const AString &name, UINT
 {
   if (name.IsEmpty())
     return false;
-  char c;
+  char c =
     #if defined(_WIN32) && !defined(UNDER_CE)
-    if (codePage != CP_UTF8)
-      c = *CharPrevExA((WORD)codePage, name, name.Ptr(name.Len()), 0);
-    else
+      *CharPrevExA((WORD)codePage, name, name.Ptr(name.Len()), 0);
+    #else
+      name.Back();
     #endif
-    {
-      c = name.Back();
-    }
   return (c == '/');
 }
 

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

@@ -1,7 +1,7 @@
 // Archive/Common/ItemNameUtils.h
 
-#ifndef ZIP7_INC_ARCHIVE_ITEM_NAME_UTILS_H
-#define ZIP7_INC_ARCHIVE_ITEM_NAME_UTILS_H
+#ifndef __ARCHIVE_ITEM_NAME_UTILS_H
+#define __ARCHIVE_ITEM_NAME_UTILS_H
 
 #include "../../../Common/MyString.h"
 
@@ -13,12 +13,7 @@ void ReplaceSlashes_OsToUnix(UString &name);
 UString GetOsPath(const UString &name);
 UString GetOsPath_Remove_TailSlash(const UString &name);
   
-#if WCHAR_PATH_SEPARATOR != L'/'
-void ReplaceToWinSlashes(UString &name, bool useBackslashReplacement);
-#endif
-void ReplaceToOsSlashes_Remove_TailSlash(UString &name, bool useBackslashReplacement = false);
-void NormalizeSlashes_in_FileName_for_OsPath(wchar_t *s, unsigned len);
-void NormalizeSlashes_in_FileName_for_OsPath(UString &name);
+void ReplaceToOsSlashes_Remove_TailSlash(UString &name);
   
 bool HasTailSlash(const AString &name, UINT codePage);
   

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

@@ -4,7 +4,7 @@
 
 #include "MultiStream.h"
 
-Z7_COM7F_IMF(CMultiStream::Read(void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP CMultiStream::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
   if (processedSize)
     *processedSize = 0;
@@ -23,7 +23,10 @@ Z7_COM7F_IMF(CMultiStream::Read(void *data, UInt32 size, UInt32 *processedSize))
       else if (_pos >= m.GlobalOffset + m.Size)
         left = mid + 1;
       else
+      {
+        _streamIndex = mid;
         break;
+      }
       mid = (left + right) / 2;
     }
     _streamIndex = mid;
@@ -33,14 +36,12 @@ Z7_COM7F_IMF(CMultiStream::Read(void *data, UInt32 size, UInt32 *processedSize))
   UInt64 localPos = _pos - s.GlobalOffset;
   if (localPos != s.LocalPos)
   {
-    RINOK(s.Stream->Seek((Int64)localPos, STREAM_SEEK_SET, &s.LocalPos))
+    RINOK(s.Stream->Seek(localPos, STREAM_SEEK_SET, &s.LocalPos));
   }
-  {
-    const UInt64 rem = s.Size - localPos;
-    if (size > rem)
-      size = (UInt32)rem;
-  }
-  const HRESULT result = s.Stream->Read(data, size, &size);
+  UInt64 rem = s.Size - localPos;
+  if (size > rem)
+    size = (UInt32)rem;
+  HRESULT result = s.Stream->Read(data, size, &size);
   _pos += size;
   s.LocalPos += size;
   if (processedSize)
@@ -48,7 +49,7 @@ Z7_COM7F_IMF(CMultiStream::Read(void *data, UInt32 size, UInt32 *processedSize))
   return result;
 }
   
-Z7_COM7F_IMF(CMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition))
+STDMETHODIMP CMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition)
 {
   switch (seekOrigin)
   {
@@ -59,9 +60,9 @@ Z7_COM7F_IMF(CMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosi
   }
   if (offset < 0)
     return HRESULT_WIN32_ERROR_NEGATIVE_SEEK;
-  _pos = (UInt64)offset;
+  _pos = offset;
   if (newPosition)
-    *newPosition = (UInt64)offset;
+    *newPosition = offset;
   return S_OK;
 }
 
@@ -71,9 +72,6 @@ class COutVolumeStream:
   public ISequentialOutStream,
   public CMyUnknownImp
 {
-  Z7_COM_UNKNOWN_IMP_0
-  Z7_IFACE_COM7_IMP(ISequentialOutStream)
-
   unsigned _volIndex;
   UInt64 _volSize;
   UInt64 _curPos;
@@ -82,6 +80,8 @@ class COutVolumeStream:
   CCRC _crc;
 
 public:
+  MY_UNKNOWN_IMP
+
   CFileItem _file;
   CUpdateOptions _options;
   CMyComPtr<IArchiveUpdateCallback2> VolumeCallback;
@@ -98,6 +98,7 @@ public:
   }
   
   HRESULT Flush();
+  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
 };
 
 HRESULT COutVolumeStream::Flush()
@@ -106,7 +107,7 @@ HRESULT COutVolumeStream::Flush()
   {
     _file.UnPackSize = _curPos;
     _file.FileCRC = _crc.GetDigest();
-    RINOK(WriteVolumeHeader(_archive, _file, _options))
+    RINOK(WriteVolumeHeader(_archive, _file, _options));
     _archive.Close();
     _volumeStream.Release();
     _file.StartPos += _file.UnPackSize;
@@ -116,10 +117,7 @@ HRESULT COutVolumeStream::Flush()
 */
 
 /*
-
-#include "../../../Common/Defs.h"
-
-Z7_COM7F_IMF(COutMultiStream::Write(const void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP COutMultiStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
 {
   if (processedSize)
     *processedSize = 0;
@@ -128,8 +126,8 @@ Z7_COM7F_IMF(COutMultiStream::Write(const void *data, UInt32 size, UInt32 *proce
     if (_streamIndex >= Streams.Size())
     {
       CSubStreamInfo subStream;
-      RINOK(VolumeCallback->GetVolumeSize(Streams.Size(), &subStream.Size))
-      RINOK(VolumeCallback->GetVolumeStream(Streams.Size(), &subStream.Stream))
+      RINOK(VolumeCallback->GetVolumeSize(Streams.Size(), &subStream.Size));
+      RINOK(VolumeCallback->GetVolumeStream(Streams.Size(), &subStream.Stream));
       subStream.Pos = 0;
       Streams.Add(subStream);
       continue;
@@ -144,15 +142,15 @@ Z7_COM7F_IMF(COutMultiStream::Write(const void *data, UInt32 size, UInt32 *proce
     if (_offsetPos != subStream.Pos)
     {
       CMyComPtr<IOutStream> outStream;
-      RINOK(subStream.Stream.QueryInterface(IID_IOutStream, &outStream))
-      RINOK(outStream->Seek((Int64)_offsetPos, STREAM_SEEK_SET, NULL))
+      RINOK(subStream.Stream.QueryInterface(IID_IOutStream, &outStream));
+      RINOK(outStream->Seek(_offsetPos, STREAM_SEEK_SET, NULL));
       subStream.Pos = _offsetPos;
     }
 
-    const UInt32 curSize = (UInt32)MyMin((UInt64)size, subStream.Size - subStream.Pos);
+    UInt32 curSize = (UInt32)MyMin((UInt64)size, subStream.Size - subStream.Pos);
     UInt32 realProcessed;
-    RINOK(subStream.Stream->Write(data, curSize, &realProcessed))
-    data = (const void *)((const Byte *)data + realProcessed);
+    RINOK(subStream.Stream->Write(data, curSize, &realProcessed));
+    data = (void *)((Byte *)data + realProcessed);
     size -= realProcessed;
     subStream.Pos += realProcessed;
     _offsetPos += realProcessed;
@@ -172,7 +170,7 @@ Z7_COM7F_IMF(COutMultiStream::Write(const void *data, UInt32 size, UInt32 *proce
   return S_OK;
 }
 
-Z7_COM7F_IMF(COutMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition))
+STDMETHODIMP COutMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition)
 {
   switch (seekOrigin)
   {
@@ -183,11 +181,11 @@ Z7_COM7F_IMF(COutMultiStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newP
   }
   if (offset < 0)
     return HRESULT_WIN32_ERROR_NEGATIVE_SEEK;
-  _absPos = (UInt64)offset;
+  _absPos = offset;
   _offsetPos = _absPos;
   _streamIndex = 0;
   if (newPosition)
-    *newPosition = (UInt64)offset;
+    *newPosition = offset;
   return S_OK;
 }
 */

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

@@ -1,21 +1,20 @@
 // MultiStream.h
 
-#ifndef ZIP7_INC_MULTI_STREAM_H
-#define ZIP7_INC_MULTI_STREAM_H
+#ifndef __MULTI_STREAM_H
+#define __MULTI_STREAM_H
 
 #include "../../../Common/MyCom.h"
 #include "../../../Common/MyVector.h"
 
 #include "../../IStream.h"
-#include "../../Archive/IArchive.h"
 
-Z7_CLASS_IMP_IInStream(
-  CMultiStream
-)
-
-  unsigned _streamIndex;
+class CMultiStream:
+  public IInStream,
+  public CMyUnknownImp
+{
   UInt64 _pos;
   UInt64 _totalLength;
+  unsigned _streamIndex;
 
 public:
 
@@ -25,12 +24,12 @@ public:
     UInt64 Size;
     UInt64 GlobalOffset;
     UInt64 LocalPos;
+
     CSubStreamInfo(): Size(0), GlobalOffset(0), LocalPos(0) {}
   };
-
-  CMyComPtr<IArchiveUpdateCallbackFile> updateCallbackFile;
+  
   CObjectVector<CSubStreamInfo> Streams;
- 
+  
   HRESULT Init()
   {
     UInt64 total = 0;
@@ -38,27 +37,26 @@ public:
     {
       CSubStreamInfo &s = Streams[i];
       s.GlobalOffset = total;
-      total += s.Size;
-      s.LocalPos = 0;
-      {
-        // it was already set to start
-        // RINOK(InStream_GetPos(s.Stream, s.LocalPos));
-      }
+      total += Streams[i].Size;
+      RINOK(s.Stream->Seek(0, STREAM_SEEK_CUR, &s.LocalPos));
     }
     _totalLength = total;
     _pos = 0;
     _streamIndex = 0;
     return S_OK;
   }
+
+  MY_UNKNOWN_IMP1(IInStream)
+
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
 };
 
 /*
-Z7_CLASS_IMP_COM_1(
-  COutMultiStream,
-  IOutStream
-)
-  Z7_IFACE_COM7_IMP(ISequentialOutStream)
-
+class COutMultiStream:
+  public IOutStream,
+  public CMyUnknownImp
+{
   unsigned _streamIndex; // required stream
   UInt64 _offsetPos; // offset from start of _streamIndex index
   UInt64 _absPos;
@@ -80,6 +78,11 @@ public:
     _absPos = 0;
     _length = 0;
   }
+
+  MY_UNKNOWN_IMP1(IOutStream)
+
+  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
 };
 */
 

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

@@ -4,7 +4,7 @@
 
 #include "OutStreamWithCRC.h"
 
-Z7_COM7F_IMF(COutStreamWithCRC::Write(const void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP COutStreamWithCRC::Write(const void *data, UInt32 size, UInt32 *processedSize)
 {
   HRESULT result = S_OK;
   if (_stream)
@@ -12,7 +12,7 @@ Z7_COM7F_IMF(COutStreamWithCRC::Write(const void *data, UInt32 size, UInt32 *pro
   if (_calculate)
     _crc = CrcUpdate(_crc, data, size);
   _size += size;
-  if (processedSize)
+  if (processedSize != NULL)
     *processedSize = size;
   return result;
 }