react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/C/7zFile.c

@@ -1,5 +1,5 @@
 /* 7zFile.c -- File IO
-2023-04-02 : Igor Pavlov : Public domain */
+2017-04-03 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -7,19 +7,9 @@
 
 #ifndef USE_WINDOWS_FILE
 
-  #include <errno.h>
-
-  #ifndef USE_FOPEN
-    #include <stdio.h>
-    #include <fcntl.h>
-    #ifdef _WIN32
-      #include <io.h>
-      typedef int ssize_t;
-      typedef int off_t;
-    #else
-      #include <unistd.h>
-    #endif
-  #endif
+#ifndef UNDER_CE
+#include <errno.h>
+#endif
 
 #else
 
@@ -33,36 +23,30 @@
    And message can be "Network connection was lost"
 */
 
-#endif
-
 #define kChunkSizeMax (1 << 22)
 
+#endif
+
 void File_Construct(CSzFile *p)
 {
   #ifdef USE_WINDOWS_FILE
   p->handle = INVALID_HANDLE_VALUE;
-  #elif defined(USE_FOPEN)
-  p->file = NULL;
   #else
-  p->fd = -1;
+  p->file = NULL;
   #endif
 }
 
 #if !defined(UNDER_CE) || !defined(USE_WINDOWS_FILE)
-
 static WRes File_Open(CSzFile *p, const char *name, int writeMode)
 {
   #ifdef USE_WINDOWS_FILE
-  
   p->handle = CreateFileA(name,
       writeMode ? GENERIC_WRITE : GENERIC_READ,
       FILE_SHARE_READ, NULL,
       writeMode ? CREATE_ALWAYS : OPEN_EXISTING,
       FILE_ATTRIBUTE_NORMAL, NULL);
   return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();
-  
-  #elif defined(USE_FOPEN)
-  
+  #else
   p->file = fopen(name, writeMode ? "wb+" : "rb");
   return (p->file != 0) ? 0 :
     #ifdef UNDER_CE
@@ -70,34 +54,13 @@ static WRes File_Open(CSzFile *p, const char *name, int writeMode)
     #else
     errno;
     #endif
-  
-  #else
-
-  int flags = (writeMode ? (O_CREAT | O_EXCL | O_WRONLY) : O_RDONLY);
-  #ifdef O_BINARY
-  flags |= O_BINARY;
-  #endif
-  p->fd = open(name, flags, 0666);
-  return (p->fd != -1) ? 0 : errno;
-
   #endif
 }
 
 WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); }
-
-WRes OutFile_Open(CSzFile *p, const char *name)
-{
-  #if defined(USE_WINDOWS_FILE) || defined(USE_FOPEN)
-  return File_Open(p, name, 1);
-  #else
-  p->fd = creat(name, 0666);
-  return (p->fd != -1) ? 0 : errno;
-  #endif
-}
-
+WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); }
 #endif
 
-
 #ifdef USE_WINDOWS_FILE
 static WRes File_OpenW(CSzFile *p, const WCHAR *name, int writeMode)
 {
@@ -115,124 +78,74 @@ WRes OutFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 1
 WRes File_Close(CSzFile *p)
 {
   #ifdef USE_WINDOWS_FILE
-  
   if (p->handle != INVALID_HANDLE_VALUE)
   {
     if (!CloseHandle(p->handle))
       return GetLastError();
     p->handle = INVALID_HANDLE_VALUE;
   }
-  
-  #elif defined(USE_FOPEN)
-
+  #else
   if (p->file != NULL)
   {
     int res = fclose(p->file);
     if (res != 0)
-    {
-      if (res == EOF)
-        return errno;
       return res;
-    }
     p->file = NULL;
   }
-
-  #else
-
-  if (p->fd != -1)
-  {
-    if (close(p->fd) != 0)
-      return errno;
-    p->fd = -1;
-  }
-
   #endif
-
   return 0;
 }
 
-
 WRes File_Read(CSzFile *p, void *data, size_t *size)
 {
   size_t originalSize = *size;
-  *size = 0;
   if (originalSize == 0)
     return 0;
 
   #ifdef USE_WINDOWS_FILE
 
+  *size = 0;
   do
   {
-    const DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
+    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
     DWORD processed = 0;
-    const BOOL res = ReadFile(p->handle, data, curSize, &processed, NULL);
+    BOOL res = ReadFile(p->handle, data, curSize, &processed, NULL);
     data = (void *)((Byte *)data + processed);
     originalSize -= processed;
     *size += processed;
     if (!res)
       return GetLastError();
-    // debug : we can break here for partial reading mode
-    if (processed == 0)
-      break;
-  }
-  while (originalSize > 0);
-
-  #elif defined(USE_FOPEN)
-
-  do
-  {
-    const size_t curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : originalSize;
-    const size_t processed = fread(data, 1, curSize, p->file);
-    data = (void *)((Byte *)data + (size_t)processed);
-    originalSize -= processed;
-    *size += processed;
-    if (processed != curSize)
-      return ferror(p->file);
-    // debug : we can break here for partial reading mode
     if (processed == 0)
       break;
   }
   while (originalSize > 0);
+  return 0;
 
   #else
-
-  do
-  {
-    const size_t curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : originalSize;
-    const ssize_t processed = read(p->fd, data, curSize);
-    if (processed == -1)
-      return errno;
-    if (processed == 0)
-      break;
-    data = (void *)((Byte *)data + (size_t)processed);
-    originalSize -= (size_t)processed;
-    *size += (size_t)processed;
-    // debug : we can break here for partial reading mode
-    // break;
-  }
-  while (originalSize > 0);
-
+  
+  *size = fread(data, 1, originalSize, p->file);
+  if (*size == originalSize)
+    return 0;
+  return ferror(p->file);
+  
   #endif
-
-  return 0;
 }
 
-
 WRes File_Write(CSzFile *p, const void *data, size_t *size)
 {
   size_t originalSize = *size;
-  *size = 0;
   if (originalSize == 0)
     return 0;
   
   #ifdef USE_WINDOWS_FILE
 
+  *size = 0;
   do
   {
-    const DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
+    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
     DWORD processed = 0;
-    const BOOL res = WriteFile(p->handle, data, curSize, &processed, NULL);
-    data = (const void *)((const Byte *)data + processed);
+    BOOL res = WriteFile(p->handle, data, curSize, &processed, NULL);
+    data = (void *)((Byte *)data + processed);
     originalSize -= processed;
     *size += processed;
     if (!res)
@@ -241,106 +154,61 @@ WRes File_Write(CSzFile *p, const void *data, size_t *size)
       break;
   }
   while (originalSize > 0);
-
-  #elif defined(USE_FOPEN)
-
-  do
-  {
-    const size_t curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : originalSize;
-    const size_t processed = fwrite(data, 1, curSize, p->file);
-    data = (void *)((Byte *)data + (size_t)processed);
-    originalSize -= processed;
-    *size += processed;
-    if (processed != curSize)
-      return ferror(p->file);
-    if (processed == 0)
-      break;
-  }
-  while (originalSize > 0);
+  return 0;
 
   #else
 
-  do
-  {
-    const size_t curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : originalSize;
-    const ssize_t processed = write(p->fd, data, curSize);
-    if (processed == -1)
-      return errno;
-    if (processed == 0)
-      break;
-    data = (const void *)((const Byte *)data + (size_t)processed);
-    originalSize -= (size_t)processed;
-    *size += (size_t)processed;
-  }
-  while (originalSize > 0);
-
+  *size = fwrite(data, 1, originalSize, p->file);
+  if (*size == originalSize)
+    return 0;
+  return ferror(p->file);
+  
   #endif
-
-  return 0;
 }
 
-
 WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin)
 {
   #ifdef USE_WINDOWS_FILE
 
+  LARGE_INTEGER value;
   DWORD moveMethod;
-  UInt32 low = (UInt32)*pos;
-  LONG high = (LONG)((UInt64)*pos >> 16 >> 16); /* for case when UInt64 is 32-bit only */
-  // (int) to eliminate clang warning
-  switch ((int)origin)
+  value.LowPart = (DWORD)*pos;
+  value.HighPart = (LONG)((UInt64)*pos >> 16 >> 16); /* for case when UInt64 is 32-bit only */
+  switch (origin)
   {
     case SZ_SEEK_SET: moveMethod = FILE_BEGIN; break;
     case SZ_SEEK_CUR: moveMethod = FILE_CURRENT; break;
     case SZ_SEEK_END: moveMethod = FILE_END; break;
     default: return ERROR_INVALID_PARAMETER;
   }
-  low = SetFilePointer(p->handle, (LONG)low, &high, moveMethod);
-  if (low == (UInt32)0xFFFFFFFF)
+  value.LowPart = SetFilePointer(p->handle, value.LowPart, &value.HighPart, moveMethod);
+  if (value.LowPart == 0xFFFFFFFF)
   {
     WRes res = GetLastError();
     if (res != NO_ERROR)
       return res;
   }
-  *pos = ((Int64)high << 32) | low;
+  *pos = ((Int64)value.HighPart << 32) | value.LowPart;
   return 0;
 
   #else
   
-  int moveMethod; // = origin;
-
-  switch ((int)origin)
+  int moveMethod;
+  int res;
+  switch (origin)
   {
     case SZ_SEEK_SET: moveMethod = SEEK_SET; break;
     case SZ_SEEK_CUR: moveMethod = SEEK_CUR; break;
     case SZ_SEEK_END: moveMethod = SEEK_END; break;
-    default: return EINVAL;
-  }
-  
-  #if defined(USE_FOPEN)
-  {
-    int res = fseek(p->file, (long)*pos, moveMethod);
-    if (res == -1)
-      return errno;
-    *pos = ftell(p->file);
-    if (*pos == -1)
-      return errno;
-    return 0;
-  }
-  #else
-  {
-    off_t res = lseek(p->fd, (off_t)*pos, moveMethod);
-    if (res == -1)
-      return errno;
-    *pos = res;
-    return 0;
+    default: return 1;
   }
+  res = fseek(p->file, (long)*pos, moveMethod);
+  *pos = ftell(p->file);
+  return res;
   
-  #endif // USE_FOPEN
-  #endif // USE_WINDOWS_FILE
+  #endif
 }
 
-
 WRes File_GetLength(CSzFile *p, UInt64 *length)
 {
   #ifdef USE_WINDOWS_FILE
@@ -356,31 +224,13 @@ WRes File_GetLength(CSzFile *p, UInt64 *length)
   *length = (((UInt64)sizeHigh) << 32) + sizeLow;
   return 0;
   
-  #elif defined(USE_FOPEN)
+  #else
   
   long pos = ftell(p->file);
   int res = fseek(p->file, 0, SEEK_END);
   *length = ftell(p->file);
   fseek(p->file, pos, SEEK_SET);
   return res;
-
-  #else
-
-  off_t pos;
-  *length = 0;
-  pos = lseek(p->fd, 0, SEEK_CUR);
-  if (pos != -1)
-  {
-    const off_t len2 = lseek(p->fd, 0, SEEK_END);
-    const off_t res2 = lseek(p->fd, pos, SEEK_SET);
-    if (len2 != -1)
-    {
-      *length = (UInt64)len2;
-      if (res2 != -1)
-        return 0;
-    }
-  }
-  return errno;
   
   #endif
 }
@@ -388,12 +238,10 @@ WRes File_GetLength(CSzFile *p, UInt64 *length)
 
 /* ---------- FileSeqInStream ---------- */
 
-static SRes FileSeqInStream_Read(ISeqInStreamPtr pp, void *buf, size_t *size)
+static SRes FileSeqInStream_Read(const ISeqInStream *pp, void *buf, size_t *size)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CFileSeqInStream)
-  const WRes wres = File_Read(&p->file, buf, size);
-  p->wres = wres;
-  return (wres == 0) ? SZ_OK : SZ_ERROR_READ;
+  CFileSeqInStream *p = CONTAINER_FROM_VTBL(pp, CFileSeqInStream, vt);
+  return File_Read(&p->file, buf, size) == 0 ? SZ_OK : SZ_ERROR_READ;
 }
 
 void FileSeqInStream_CreateVTable(CFileSeqInStream *p)
@@ -404,20 +252,16 @@ void FileSeqInStream_CreateVTable(CFileSeqInStream *p)
 
 /* ---------- FileInStream ---------- */
 
-static SRes FileInStream_Read(ISeekInStreamPtr pp, void *buf, size_t *size)
+static SRes FileInStream_Read(const ISeekInStream *pp, void *buf, size_t *size)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CFileInStream)
-  const WRes wres = File_Read(&p->file, buf, size);
-  p->wres = wres;
-  return (wres == 0) ? SZ_OK : SZ_ERROR_READ;
+  CFileInStream *p = CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
+  return (File_Read(&p->file, buf, size) == 0) ? SZ_OK : SZ_ERROR_READ;
 }
 
-static SRes FileInStream_Seek(ISeekInStreamPtr pp, Int64 *pos, ESzSeek origin)
+static SRes FileInStream_Seek(const ISeekInStream *pp, Int64 *pos, ESzSeek origin)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CFileInStream)
-  const WRes wres = File_Seek(&p->file, pos, origin);
-  p->wres = wres;
-  return (wres == 0) ? SZ_OK : SZ_ERROR_READ;
+  CFileInStream *p = CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
+  return File_Seek(&p->file, pos, origin);
 }
 
 void FileInStream_CreateVTable(CFileInStream *p)
@@ -429,11 +273,10 @@ void FileInStream_CreateVTable(CFileInStream *p)
 
 /* ---------- FileOutStream ---------- */
 
-static size_t FileOutStream_Write(ISeqOutStreamPtr pp, const void *data, size_t size)
+static size_t FileOutStream_Write(const ISeqOutStream *pp, const void *data, size_t size)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CFileOutStream)
-  const WRes wres = File_Write(&p->file, data, &size);
-  p->wres = wres;
+  CFileOutStream *p = CONTAINER_FROM_VTBL(pp, CFileOutStream, vt);
+  File_Write(&p->file, data, &size);
   return size;
 }
 

package/harmony/pushy/src/main/cpp/lzma/C/7zFile.h

@@ -1,21 +1,17 @@
 /* 7zFile.h -- File IO
-2023-03-05 : Igor Pavlov : Public domain */
+2017-04-03 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_FILE_H
-#define ZIP7_INC_FILE_H
+#ifndef __7Z_FILE_H
+#define __7Z_FILE_H
 
 #ifdef _WIN32
 #define USE_WINDOWS_FILE
-// #include <windows.h>
 #endif
 
 #ifdef USE_WINDOWS_FILE
-#include "7zWindows.h"
-
+#include <windows.h>
 #else
-// note: USE_FOPEN mode is limited to 32-bit file size
-// #define USE_FOPEN
-// #include <stdio.h>
+#include <stdio.h>
 #endif
 
 #include "7zTypes.h"
@@ -28,10 +24,8 @@ typedef struct
 {
   #ifdef USE_WINDOWS_FILE
   HANDLE handle;
-  #elif defined(USE_FOPEN)
-  FILE *file;
   #else
-  int fd;
+  FILE *file;
   #endif
 } CSzFile;
 
@@ -62,7 +56,6 @@ typedef struct
 {
   ISeqInStream vt;
   CSzFile file;
-  WRes wres;
 } CFileSeqInStream;
 
 void FileSeqInStream_CreateVTable(CFileSeqInStream *p);
@@ -72,7 +65,6 @@ typedef struct
 {
   ISeekInStream vt;
   CSzFile file;
-  WRes wres;
 } CFileInStream;
 
 void FileInStream_CreateVTable(CFileInStream *p);
@@ -82,7 +74,6 @@ typedef struct
 {
   ISeqOutStream vt;
   CSzFile file;
-  WRes wres;
 } CFileOutStream;
 
 void FileOutStream_CreateVTable(CFileOutStream *p);

package/harmony/pushy/src/main/cpp/lzma/C/7zStream.c

@@ -1,5 +1,5 @@
 /* 7zStream.c -- 7z Stream functions
-2023-04-02 : Igor Pavlov : Public domain */
+2017-04-03 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -7,33 +7,12 @@
 
 #include "7zTypes.h"
 
-
-SRes SeqInStream_ReadMax(ISeqInStreamPtr stream, void *buf, size_t *processedSize)
-{
-  size_t size = *processedSize;
-  *processedSize = 0;
-  while (size != 0)
-  {
-    size_t cur = size;
-    const SRes res = ISeqInStream_Read(stream, buf, &cur);
-    *processedSize += cur;
-    buf = (void *)((Byte *)buf + cur);
-    size -= cur;
-    if (res != SZ_OK)
-      return res;
-    if (cur == 0)
-      return SZ_OK;
-  }
-  return SZ_OK;
-}
-
-/*
-SRes SeqInStream_Read2(ISeqInStreamPtr stream, void *buf, size_t size, SRes errorType)
+SRes SeqInStream_Read2(const ISeqInStream *stream, void *buf, size_t size, SRes errorType)
 {
   while (size != 0)
   {
     size_t processed = size;
-    RINOK(ISeqInStream_Read(stream, buf, &processed))
+    RINOK(ISeqInStream_Read(stream, buf, &processed));
     if (processed == 0)
       return errorType;
     buf = (void *)((Byte *)buf + processed);
@@ -42,44 +21,42 @@ SRes SeqInStream_Read2(ISeqInStreamPtr stream, void *buf, size_t size, SRes erro
   return SZ_OK;
 }
 
-SRes SeqInStream_Read(ISeqInStreamPtr stream, void *buf, size_t size)
+SRes SeqInStream_Read(const ISeqInStream *stream, void *buf, size_t size)
 {
   return SeqInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
 }
-*/
-
 
-SRes SeqInStream_ReadByte(ISeqInStreamPtr stream, Byte *buf)
+SRes SeqInStream_ReadByte(const ISeqInStream *stream, Byte *buf)
 {
   size_t processed = 1;
-  RINOK(ISeqInStream_Read(stream, buf, &processed))
+  RINOK(ISeqInStream_Read(stream, buf, &processed));
   return (processed == 1) ? SZ_OK : SZ_ERROR_INPUT_EOF;
 }
 
 
 
-SRes LookInStream_SeekTo(ILookInStreamPtr stream, UInt64 offset)
+SRes LookInStream_SeekTo(const ILookInStream *stream, UInt64 offset)
 {
-  Int64 t = (Int64)offset;
+  Int64 t = offset;
   return ILookInStream_Seek(stream, &t, SZ_SEEK_SET);
 }
 
-SRes LookInStream_LookRead(ILookInStreamPtr stream, void *buf, size_t *size)
+SRes LookInStream_LookRead(const ILookInStream *stream, void *buf, size_t *size)
 {
   const void *lookBuf;
   if (*size == 0)
     return SZ_OK;
-  RINOK(ILookInStream_Look(stream, &lookBuf, size))
+  RINOK(ILookInStream_Look(stream, &lookBuf, size));
   memcpy(buf, lookBuf, *size);
   return ILookInStream_Skip(stream, *size);
 }
 
-SRes LookInStream_Read2(ILookInStreamPtr stream, void *buf, size_t size, SRes errorType)
+SRes LookInStream_Read2(const ILookInStream *stream, void *buf, size_t size, SRes errorType)
 {
   while (size != 0)
   {
     size_t processed = size;
-    RINOK(ILookInStream_Read(stream, buf, &processed))
+    RINOK(ILookInStream_Read(stream, buf, &processed));
     if (processed == 0)
       return errorType;
     buf = (void *)((Byte *)buf + processed);
@@ -88,16 +65,16 @@ SRes LookInStream_Read2(ILookInStreamPtr stream, void *buf, size_t size, SRes er
   return SZ_OK;
 }
 
-SRes LookInStream_Read(ILookInStreamPtr stream, void *buf, size_t size)
+SRes LookInStream_Read(const ILookInStream *stream, void *buf, size_t size)
 {
   return LookInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
 }
 
 
 
-#define GET_LookToRead2  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CLookToRead2)
+#define GET_LookToRead2 CLookToRead2 *p = CONTAINER_FROM_VTBL(pp, CLookToRead2, vt);
 
-static SRes LookToRead2_Look_Lookahead(ILookInStreamPtr pp, const void **buf, size_t *size)
+static SRes LookToRead2_Look_Lookahead(const ILookInStream *pp, const void **buf, size_t *size)
 {
   SRes res = SZ_OK;
   GET_LookToRead2
@@ -116,7 +93,7 @@ static SRes LookToRead2_Look_Lookahead(ILookInStreamPtr pp, const void **buf, si
   return res;
 }
 
-static SRes LookToRead2_Look_Exact(ILookInStreamPtr pp, const void **buf, size_t *size)
+static SRes LookToRead2_Look_Exact(const ILookInStream *pp, const void **buf, size_t *size)
 {
   SRes res = SZ_OK;
   GET_LookToRead2
@@ -136,14 +113,14 @@ static SRes LookToRead2_Look_Exact(ILookInStreamPtr pp, const void **buf, size_t
   return res;
 }
 
-static SRes LookToRead2_Skip(ILookInStreamPtr pp, size_t offset)
+static SRes LookToRead2_Skip(const ILookInStream *pp, size_t offset)
 {
   GET_LookToRead2
   p->pos += offset;
   return SZ_OK;
 }
 
-static SRes LookToRead2_Read(ILookInStreamPtr pp, void *buf, size_t *size)
+static SRes LookToRead2_Read(const ILookInStream *pp, void *buf, size_t *size)
 {
   GET_LookToRead2
   size_t rem = p->size - p->pos;
@@ -157,7 +134,7 @@ static SRes LookToRead2_Read(ILookInStreamPtr pp, void *buf, size_t *size)
   return SZ_OK;
 }
 
-static SRes LookToRead2_Seek(ILookInStreamPtr pp, Int64 *pos, ESzSeek origin)
+static SRes LookToRead2_Seek(const ILookInStream *pp, Int64 *pos, ESzSeek origin)
 {
   GET_LookToRead2
   p->pos = p->size = 0;
@@ -176,9 +153,9 @@ void LookToRead2_CreateVTable(CLookToRead2 *p, int lookahead)
 
 
 
-static SRes SecToLook_Read(ISeqInStreamPtr pp, void *buf, size_t *size)
+static SRes SecToLook_Read(const ISeqInStream *pp, void *buf, size_t *size)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CSecToLook)
+  CSecToLook *p = CONTAINER_FROM_VTBL(pp, CSecToLook, vt);
   return LookInStream_LookRead(p->realStream, buf, size);
 }
 
@@ -187,9 +164,9 @@ void SecToLook_CreateVTable(CSecToLook *p)
   p->vt.Read = SecToLook_Read;
 }
 
-static SRes SecToRead_Read(ISeqInStreamPtr pp, void *buf, size_t *size)
+static SRes SecToRead_Read(const ISeqInStream *pp, void *buf, size_t *size)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CSecToRead)
+  CSecToRead *p = CONTAINER_FROM_VTBL(pp, CSecToRead, vt);
   return ILookInStream_Read(p->realStream, buf, size);
 }