react-native-update 10.34.3 → 10.34.4

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

@@ -6,54 +6,14 @@
 
 #include "../../../Windows/FileName.h"
 #include "../../../Windows/PropVariant.h"
-#include "../../../Windows/System.h"
 
-#include "../../Common/StreamUtils.h"
+#include "../../Common/FileStreams.h"
 
 #include "ArchiveOpenCallback.h"
 
-// #define DEBUG_VOLUMES
-
-#ifdef DEBUG_VOLUMES
-#include <stdio.h>
-#endif
-
-
-#ifdef DEBUG_VOLUMES
-  #define PRF(x) x
-#else
-  #define PRF(x)
-#endif
-
 using namespace NWindows;
 
-HRESULT COpenCallbackImp::Init2(const FString &folderPrefix, const FString &fileName)
-{
-  Volumes.Init();
-  FileNames.Clear();
-  FileNames_WasUsed.Clear();
-  FileSizes.Clear();
-  _subArchiveMode = false;
-  // TotalSize = 0;
-  PasswordWasAsked = false;
-  _folderPrefix = folderPrefix;
-  if (!_fileInfo.Find_FollowLink(_folderPrefix + fileName))
-  {
-    // throw 20121118;
-    return GetLastError_noZero_HRESULT();
-  }
-  return S_OK;
-}
-
-Z7_COM7F_IMF(COpenCallbackImp::SetSubArchiveName(const wchar_t *name))
-{
-  _subArchiveMode = true;
-  _subArchiveName = name;
-  // TotalSize = 0;
-  return S_OK;
-}
-
-Z7_COM7F_IMF(COpenCallbackImp::SetTotal(const UInt64 *files, const UInt64 *bytes))
+STDMETHODIMP COpenCallbackImp::SetTotal(const UInt64 *files, const UInt64 *bytes)
 {
   COM_TRY_BEGIN
   if (ReOpenCallback)
@@ -64,7 +24,7 @@ Z7_COM7F_IMF(COpenCallbackImp::SetTotal(const UInt64 *files, const UInt64 *bytes
   COM_TRY_END
 }
 
-Z7_COM7F_IMF(COpenCallbackImp::SetCompleted(const UInt64 *files, const UInt64 *bytes))
+STDMETHODIMP COpenCallbackImp::SetCompleted(const UInt64 *files, const UInt64 *bytes)
 {
   COM_TRY_BEGIN
   if (ReOpenCallback)
@@ -74,9 +34,8 @@ Z7_COM7F_IMF(COpenCallbackImp::SetCompleted(const UInt64 *files, const UInt64 *b
   return Callback->Open_SetCompleted(files, bytes);
   COM_TRY_END
 }
-
- 
-Z7_COM7F_IMF(COpenCallbackImp::GetProperty(PROPID propID, PROPVARIANT *value))
+  
+STDMETHODIMP COpenCallbackImp::GetProperty(PROPID propID, PROPVARIANT *value)
 {
   COM_TRY_BEGIN
   NCOM::CPropVariant prop;
@@ -85,203 +44,41 @@ Z7_COM7F_IMF(COpenCallbackImp::GetProperty(PROPID propID, PROPVARIANT *value))
     {
       case kpidName: prop = _subArchiveName; break;
       // case kpidSize:  prop = _subArchiveSize; break; // we don't use it now
-      default: break;
     }
   else
     switch (propID)
     {
-      case kpidName:  prop = fs2us(_fileInfo.Name); break;
+      case kpidName:  prop = _fileInfo.Name; break;
       case kpidIsDir:  prop = _fileInfo.IsDir(); break;
       case kpidSize:  prop = _fileInfo.Size; break;
-      case kpidAttrib:  prop = (UInt32)_fileInfo.GetWinAttrib(); break;
-      case kpidPosixAttrib:  prop = (UInt32)_fileInfo.GetPosixAttrib(); break;
-      case kpidCTime:  PropVariant_SetFrom_FiTime(prop, _fileInfo.CTime); break;
-      case kpidATime:  PropVariant_SetFrom_FiTime(prop, _fileInfo.ATime); break;
-      case kpidMTime:  PropVariant_SetFrom_FiTime(prop, _fileInfo.MTime); break;
-      default: break;
+      case kpidAttrib:  prop = (UInt32)_fileInfo.Attrib; break;
+      case kpidCTime:  prop = _fileInfo.CTime; break;
+      case kpidATime:  prop = _fileInfo.ATime; break;
+      case kpidMTime:  prop = _fileInfo.MTime; break;
     }
   prop.Detach(value);
   return S_OK;
   COM_TRY_END
 }
 
-
-// ---------- CInFileStreamVol ----------
-
-Z7_class_final(CInFileStreamVol):
-    public IInStream
-  , public IStreamGetSize
-  , public CMyUnknownImp
+struct CInFileStreamVol: public CInFileStream
 {
-  Z7_IFACES_IMP_UNK_3(
-    IInStream,
-    ISequentialInStream,
-    IStreamGetSize)
-public:
-  unsigned FileIndex;
+  int FileNameIndex;
   COpenCallbackImp *OpenCallbackImp;
   CMyComPtr<IArchiveOpenCallback> OpenCallbackRef;
-
-  HRESULT EnsureOpen()
-  {
-    return OpenCallbackImp->Volumes.EnsureOpen(FileIndex);
-  }
-
+ 
   ~CInFileStreamVol()
   {
     if (OpenCallbackRef)
-      OpenCallbackImp->AtCloseFile(FileIndex);
+      OpenCallbackImp->FileNames_WasUsed[FileNameIndex] = false;
   }
 };
 
 
-void CMultiStreams::InsertToList(unsigned index)
-{
-  {
-    CSubStream &s = Streams[index];
-    s.Next = Head;
-    s.Prev = -1;
-  }
-  if (Head != -1)
-    Streams[(unsigned)Head].Prev = (int)index;
-  else
-  {
-    // if (Tail != -1) throw 1;
-    Tail = (int)index;
-  }
-  Head = (int)index;
-  NumListItems++;
-}
-
-// s must bee in List
-void CMultiStreams::RemoveFromList(CSubStream &s)
-{
-  if (s.Next != -1) Streams[(unsigned)s.Next].Prev = s.Prev; else Tail = s.Prev;
-  if (s.Prev != -1) Streams[(unsigned)s.Prev].Next = s.Next; else Head = s.Next;
-  s.Next = -1; // optional
-  s.Prev = -1; // optional
-  NumListItems--;
-}
-
-void CMultiStreams::CloseFile(unsigned index)
-{
-  CSubStream &s = Streams[index];
-  if (s.Stream)
-  {
-    s.Stream.Release();
-    RemoveFromList(s);
-    // s.InFile->Close();
-    // s.IsOpen = false;
-   #ifdef DEBUG_VOLUMES
-    static int numClosing = 0;
-    numClosing++;
-    printf("\nCloseFile %u, total_closes = %u, num_open_files = %u\n", index, numClosing, NumListItems);
-   #endif
-  }
-}
-
-void CMultiStreams::Init()
-{
-  Head = -1;
-  Tail = -1;
-  NumListItems = 0;
-  Streams.Clear();
-}
-
-CMultiStreams::CMultiStreams():
-    Head(-1),
-    Tail(-1),
-    NumListItems(0)
-{
-  NumOpenFiles_AllowedMax = NSystem::Get_File_OPEN_MAX_Reduced_for_3_tasks();
-  PRF(printf("\nNumOpenFiles_Limit = %u\n", NumOpenFiles_AllowedMax));
-}
-
-
-HRESULT CMultiStreams::PrepareToOpenNew()
-{
-  if (NumListItems < NumOpenFiles_AllowedMax)
-    return S_OK;
-  if (Tail == -1)
-    return E_FAIL;
-  CMultiStreams::CSubStream &tailStream = Streams[(unsigned)Tail];
-  RINOK(InStream_GetPos(tailStream.Stream, tailStream.LocalPos))
-  CloseFile((unsigned)Tail);
-  return S_OK;
-}
-
-
-HRESULT CMultiStreams::EnsureOpen(unsigned index)
-{
-  CMultiStreams::CSubStream &s = Streams[index];
-  if (s.Stream)
-  {
-    if ((int)index != Head)
-    {
-      RemoveFromList(s);
-      InsertToList(index);
-    }
-  }
-  else
-  {
-    RINOK(PrepareToOpenNew())
-    {
-      CInFileStream *inFile = new CInFileStream;
-      CMyComPtr<IInStream> inStreamTemp = inFile;
-      if (!inFile->Open(s.Path))
-        return GetLastError_noZero_HRESULT();
-      s.FileSpec = inFile;
-      s.Stream = s.FileSpec;
-      InsertToList(index);
-    }
-    // s.IsOpen = true;
-    if (s.LocalPos != 0)
-    {
-      RINOK(s.Stream->Seek((Int64)s.LocalPos, STREAM_SEEK_SET, &s.LocalPos))
-    }
-   #ifdef DEBUG_VOLUMES
-    static int numOpens = 0;
-    numOpens++;
-    printf("\n-- %u, ReOpen, total_reopens = %u, num_open_files = %u\n", index, numOpens, NumListItems);
-   #endif
-  }
-  return S_OK;
-}
-
-
-Z7_COM7F_IMF(CInFileStreamVol::Read(void *data, UInt32 size, UInt32 *processedSize))
-{
-  if (processedSize)
-    *processedSize = 0;
-  if (size == 0)
-    return S_OK;
-  RINOK(EnsureOpen())
-  CMultiStreams::CSubStream &s = OpenCallbackImp->Volumes.Streams[FileIndex];
-  PRF(printf("\n== %u, Read =%u \n", FileIndex, size));
-  return s.Stream->Read(data, size, processedSize);
-}
-
-Z7_COM7F_IMF(CInFileStreamVol::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition))
-{
-  // if (seekOrigin >= 3) return STG_E_INVALIDFUNCTION;
-  RINOK(EnsureOpen())
-  CMultiStreams::CSubStream &s = OpenCallbackImp->Volumes.Streams[FileIndex];
-  PRF(printf("\n-- %u, Seek seekOrigin=%u Seek =%u\n", FileIndex, seekOrigin, (unsigned)offset));
-  return s.Stream->Seek(offset, seekOrigin, newPosition);
-}
-
-Z7_COM7F_IMF(CInFileStreamVol::GetSize(UInt64 *size))
-{
-  RINOK(EnsureOpen())
-  CMultiStreams::CSubStream &s = OpenCallbackImp->Volumes.Streams[FileIndex];
-  return s.FileSpec->GetSize(size);
-}
-
-
 // from ArchiveExtractCallback.cpp
 bool IsSafePath(const UString &path);
 
-Z7_COM7F_IMF(COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStream))
+STDMETHODIMP COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStream)
 {
   COM_TRY_BEGIN
   *inStream = NULL;
@@ -290,13 +87,13 @@ Z7_COM7F_IMF(COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
     return S_FALSE;
   if (Callback)
   {
-    RINOK(Callback->Open_CheckBreak())
+    RINOK(Callback->Open_CheckBreak());
   }
 
   UString name2 = name;
 
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
   
   #ifdef _WIN32
   name2.Replace(L'/', WCHAR_PATH_SEPARATOR);
@@ -306,20 +103,12 @@ Z7_COM7F_IMF(COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
   if (!IsSafePath(name2))
     return S_FALSE;
 
-  #ifdef _WIN32
-  /* WIN32 allows wildcards in Find() function
-     and doesn't allow wildcard in File.Open()
-     so we can work without the following wildcard check here */
-  if (name2.Find(L'*') >= 0)
+  // #ifdef _WIN32
+  // we don't want to support wildcards in names here here
+  if (name2.Find(L'?') >= 0 ||
+      name2.Find(L'*') >= 0)
     return S_FALSE;
-  {
-    unsigned startPos = 0;
-    if (name2.IsPrefixedBy_Ascii_NoCase("\\\\?\\"))
-      startPos = 3;
-    if (name2.Find(L'?', startPos) >= 0)
-      return S_FALSE;
-  }
-  #endif
+  // #endif
 
   #endif
 
@@ -327,36 +116,23 @@ Z7_COM7F_IMF(COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
   FString fullPath;
   if (!NFile::NName::GetFullPath(_folderPrefix, us2fs(name2), fullPath))
     return S_FALSE;
-  if (!_fileInfo.Find_FollowLink(fullPath))
+  if (!_fileInfo.Find(fullPath))
     return S_FALSE;
   if (_fileInfo.IsDir())
     return S_FALSE;
-
-  CMultiStreams::CSubStream s;
-
+  CInFileStreamVol *inFile = new CInFileStreamVol;
+  CMyComPtr<IInStream> inStreamTemp = inFile;
+  if (!inFile->Open(fullPath))
   {
-    CInFileStream *inFile = new CInFileStream;
-    CMyComPtr<IInStream> inStreamTemp = inFile;
-    if (!inFile->Open(fullPath))
-      return GetLastError_noZero_HRESULT();
-    RINOK(Volumes.PrepareToOpenNew())
-    s.FileSpec = inFile;
-    s.Stream = s.FileSpec;
-    s.Path = fullPath;
-    // s.Size = _fileInfo.Size;
-    // s.IsOpen = true;
+    DWORD lastError = ::GetLastError();
+    if (lastError == 0)
+      return E_FAIL;
+    return HRESULT_FROM_WIN32(lastError);
   }
 
-  const unsigned fileIndex = Volumes.Streams.Add(s);
-  Volumes.InsertToList(fileIndex);
-
   FileSizes.Add(_fileInfo.Size);
   FileNames.Add(name2);
-  FileNames_WasUsed.Add(true);
-
-  CInFileStreamVol *inFile = new CInFileStreamVol;
-  CMyComPtr<IInStream> inStreamTemp = inFile;
-  inFile->FileIndex = fileIndex;
+  inFile->FileNameIndex = FileNames_WasUsed.Add(true);
   inFile->OpenCallbackImp = this;
   inFile->OpenCallbackRef = this;
   // TotalSize += _fileInfo.Size;
@@ -365,16 +141,14 @@ Z7_COM7F_IMF(COpenCallbackImp::GetStream(const wchar_t *name, IInStream **inStre
   COM_TRY_END
 }
 
-
-#ifndef Z7_NO_CRYPTO
-Z7_COM7F_IMF(COpenCallbackImp::CryptoGetTextPassword(BSTR *password))
+#ifndef _NO_CRYPTO
+STDMETHODIMP COpenCallbackImp::CryptoGetTextPassword(BSTR *password)
 {
   COM_TRY_BEGIN
   if (ReOpenCallback)
   {
-    Z7_DECL_CMyComPtr_QI_FROM(
-        ICryptoGetTextPassword,
-        getTextPassword, ReOpenCallback)
+    CMyComPtr<ICryptoGetTextPassword> getTextPassword;
+    ReOpenCallback.QueryInterface(IID_ICryptoGetTextPassword, &getTextPassword);
     if (getTextPassword)
       return getTextPassword->CryptoGetTextPassword(password);
   }
@@ -385,14 +159,3 @@ Z7_COM7F_IMF(COpenCallbackImp::CryptoGetTextPassword(BSTR *password))
   COM_TRY_END
 }
 #endif
-
-// IProgress
-Z7_COM7F_IMF(COpenCallbackImp::SetTotal(const UInt64 /* total */))
-{
-  return S_OK;
-}
-
-Z7_COM7F_IMF(COpenCallbackImp::SetCompleted(const UInt64 * /* completed */))
-{
-  return S_OK;
-}

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

@@ -1,181 +1,111 @@
 // ArchiveOpenCallback.h
 
-#ifndef ZIP7_INC_ARCHIVE_OPEN_CALLBACK_H
-#define ZIP7_INC_ARCHIVE_OPEN_CALLBACK_H
+#ifndef __ARCHIVE_OPEN_CALLBACK_H
+#define __ARCHIVE_OPEN_CALLBACK_H
 
 #include "../../../Common/MyCom.h"
 
 #include "../../../Windows/FileFind.h"
 
-#include "../../Common/FileStreams.h"
-
-#ifndef Z7_NO_CRYPTO
+#ifndef _NO_CRYPTO
 #include "../../IPassword.h"
 #endif
 #include "../../Archive/IArchive.h"
 
-Z7_PURE_INTERFACES_BEGIN
-
-#ifdef Z7_NO_CRYPTO
+#ifdef _NO_CRYPTO
 
-#define Z7_IFACEM_IOpenCallbackUI_Crypto(x)
+#define INTERFACE_IOpenCallbackUI_Crypto(x)
 
 #else
 
-#define Z7_IFACEM_IOpenCallbackUI_Crypto(x) \
-  virtual HRESULT Open_CryptoGetTextPassword(BSTR *password) x \
-  /* virtual HRESULT Open_GetPasswordIfAny(bool &passwordIsDefined, UString &password) x */ \
-  /* virtual bool Open_WasPasswordAsked() x */ \
-  /* virtual void Open_Clear_PasswordWasAsked_Flag() x */  \
+#define INTERFACE_IOpenCallbackUI_Crypto(x) \
+  virtual HRESULT Open_CryptoGetTextPassword(BSTR *password) x; \
+  /* virtual HRESULT Open_GetPasswordIfAny(bool &passwordIsDefined, UString &password) x; */ \
+  /* virtual bool Open_WasPasswordAsked() x; */ \
+  /* virtual void Open_Clear_PasswordWasAsked_Flag() x; */  \
   
 #endif
 
-#define Z7_IFACEN_IOpenCallbackUI(x) \
-  virtual HRESULT Open_CheckBreak() x \
-  virtual HRESULT Open_SetTotal(const UInt64 *files, const UInt64 *bytes) x \
-  virtual HRESULT Open_SetCompleted(const UInt64 *files, const UInt64 *bytes) x \
-  virtual HRESULT Open_Finished() x \
-  Z7_IFACEM_IOpenCallbackUI_Crypto(x)
-
-Z7_IFACE_DECL_PURE(IOpenCallbackUI)
-
-Z7_PURE_INTERFACES_END
-
+#define INTERFACE_IOpenCallbackUI(x) \
+  virtual HRESULT Open_CheckBreak() x; \
+  virtual HRESULT Open_SetTotal(const UInt64 *files, const UInt64 *bytes) x; \
+  virtual HRESULT Open_SetCompleted(const UInt64 *files, const UInt64 *bytes) x; \
+  virtual HRESULT Open_Finished() x; \
+  INTERFACE_IOpenCallbackUI_Crypto(x)
 
-class CMultiStreams Z7_final
+struct IOpenCallbackUI
 {
-public:
-  struct CSubStream
-  {
-    CMyComPtr<IInStream> Stream;
-    CInFileStream *FileSpec;
-    FString Path;
-    // UInt64 Size;
-    UInt64 LocalPos;
-    int Next; // next older
-    int Prev; // prev newer
-    // bool IsOpen;
-
-    CSubStream():
-        FileSpec(NULL),
-        // Size(0),
-        LocalPos(0),
-        Next(-1),
-        Prev(-1)
-        // IsOpen(false)
-        {}
-  };
-
-  CObjectVector<CSubStream> Streams;
-private:
-  // we must use critical section here, if we want to access from different volumnes simultaneously
-  int Head; // newest
-  int Tail; // oldest
-  unsigned NumListItems;
-  unsigned NumOpenFiles_AllowedMax;
-public:
-
-  CMultiStreams();
-  void Init();
-  HRESULT PrepareToOpenNew();
-  void InsertToList(unsigned index);
-  void RemoveFromList(CSubStream &s);
-  void CloseFile(unsigned index);
-  HRESULT EnsureOpen(unsigned index);
+  INTERFACE_IOpenCallbackUI(=0)
 };
 
-
-/*
-  We need COpenCallbackImp class for multivolume processing.
-  Also we use it as proxy from COM interfaces (IArchiveOpenCallback) to internal (IOpenCallbackUI) interfaces.
-  If archive is multivolume:
-    COpenCallbackImp object will exist after Open stage.
-    COpenCallbackImp object will be deleted when last reference
-      from each volume object (CInFileStreamVol) will be closed (when archive will be closed).
-*/
-
-class COpenCallbackImp Z7_final:
+class COpenCallbackImp:
   public IArchiveOpenCallback,
   public IArchiveOpenVolumeCallback,
   public IArchiveOpenSetSubArchiveName,
- #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   public ICryptoGetTextPassword,
- #endif
-  public IProgress, // IProgress is used for 7zFM
+  #endif
   public CMyUnknownImp
 {
-  Z7_COM_QI_BEGIN2(IArchiveOpenCallback)
-  Z7_COM_QI_ENTRY(IArchiveOpenVolumeCallback)
-  Z7_COM_QI_ENTRY(IArchiveOpenSetSubArchiveName)
- #ifndef Z7_NO_CRYPTO
-  Z7_COM_QI_ENTRY(ICryptoGetTextPassword)
- #endif
-  // Z7_COM_QI_ENTRY(IProgress) // the code doesn't require it
-  Z7_COM_QI_END
-  Z7_COM_ADDREF_RELEASE
-  
-  Z7_IFACE_COM7_IMP(IArchiveOpenCallback)
-  Z7_IFACE_COM7_IMP(IArchiveOpenVolumeCallback)
-  Z7_IFACE_COM7_IMP(IProgress)
-public:
-  Z7_IFACE_COM7_IMP(IArchiveOpenSetSubArchiveName)
-private:
- #ifndef Z7_NO_CRYPTO
-  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword)
- #endif
-
-  bool _subArchiveMode;
-
 public:
-  bool PasswordWasAsked;
-  UStringVector FileNames;
-  CBoolVector FileNames_WasUsed;
-  CRecordVector<UInt64> FileSizes;
-
-  void AtCloseFile(unsigned fileIndex)
+  MY_QUERYINTERFACE_BEGIN2(IArchiveOpenVolumeCallback)
+  MY_QUERYINTERFACE_ENTRY(IArchiveOpenSetSubArchiveName)
+  #ifndef _NO_CRYPTO
+  MY_QUERYINTERFACE_ENTRY(ICryptoGetTextPassword)
+  #endif
+  MY_QUERYINTERFACE_END
+  MY_ADDREF_RELEASE
+
+  INTERFACE_IArchiveOpenCallback(;)
+  INTERFACE_IArchiveOpenVolumeCallback(;)
+
+  #ifndef _NO_CRYPTO
+  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
+  #endif
+
+  STDMETHOD(SetSubArchiveName(const wchar_t *name))
   {
-    FileNames_WasUsed[fileIndex] = false;
-    Volumes.CloseFile(fileIndex);
+    _subArchiveMode = true;
+    _subArchiveName = name;
+    // TotalSize = 0;
+    return S_OK;
   }
 
-  /* we have two ways to Callback from this object
-      1) IArchiveOpenCallback * ReOpenCallback - for ReOpen function, when IOpenCallbackUI is not available
-      2) IOpenCallbackUI *Callback - for usual callback
-     we can't transfer IOpenCallbackUI pointer via internal interface,
-     so we use ReOpenCallback to callback without IOpenCallbackUI.
-  */
-
-  /* we use Callback/ReOpenCallback only at Open stage.
-     So the CMyComPtr reference counter is not required,
-     and we don't want additional reference to unused object,
-     if COpenCallbackImp is not closed
-  */
-  IArchiveOpenCallback *ReOpenCallback;
-  // CMyComPtr<IArchiveOpenCallback> ReOpenCallback;
-  IOpenCallbackUI *Callback;
-  // CMyComPtr<IUnknown> Callback_Ref;
-
 private:
   FString _folderPrefix;
-  UString _subArchiveName;
   NWindows::NFile::NFind::CFileInfo _fileInfo;
+  bool _subArchiveMode;
+  UString _subArchiveName;
 
 public:
-  CMultiStreams Volumes;
+  UStringVector FileNames;
+  CBoolVector FileNames_WasUsed;
+  CRecordVector<UInt64> FileSizes;
   
+  bool PasswordWasAsked;
+
+  IOpenCallbackUI *Callback;
+  CMyComPtr<IArchiveOpenCallback> ReOpenCallback;
   // UInt64 TotalSize;
 
-  COpenCallbackImp():
-      _subArchiveMode(false),
-      PasswordWasAsked(false),
-      ReOpenCallback(NULL),
-      Callback(NULL)  {}
+  COpenCallbackImp(): Callback(NULL), _subArchiveMode(false) {}
   
-  HRESULT Init2(const FString &folderPrefix, const FString &fileName);
+  void Init(const FString &folderPrefix, const FString &fileName)
+  {
+    _folderPrefix = folderPrefix;
+    if (!_fileInfo.Find(_folderPrefix + fileName))
+      throw 20121118;
+    FileNames.Clear();
+    FileNames_WasUsed.Clear();
+    FileSizes.Clear();
+    _subArchiveMode = false;
+    // TotalSize = 0;
+    PasswordWasAsked = false;
+  }
 
   bool SetSecondFileInfo(CFSTR newName)
   {
-    return _fileInfo.Find_FollowLink(newName) && !_fileInfo.IsDir();
+    return _fileInfo.Find(newName) && !_fileInfo.IsDir();
   }
 };