1 files changed, 8 insertions, 19 deletions

diff --git a/CPP/7zip/UI/Far/ExtractEngine.h b/CPP/7zip/UI/Far/ExtractEngine.h
index f57602a9..5861d92c 100644
--- a/CPP/7zip/UI/Far/ExtractEngine.h
+++ b/CPP/7zip/UI/Far/ExtractEngine.h
@@ -11,40 +11,29 @@
 
 #include "ProgressBox.h"
 
-class CExtractCallBackImp:
+class CExtractCallbackImp:
   public IFolderArchiveExtractCallback,
+  public IFolderArchiveExtractCallback2,
   public ICryptoGetTextPassword,
   public CMyUnknownImp
 {
 public:
-  MY_UNKNOWN_IMP1(ICryptoGetTextPassword)
+  MY_UNKNOWN_IMP2(ICryptoGetTextPassword, IFolderArchiveExtractCallback2)
 
   // IProgress
   STDMETHOD(SetTotal)(UInt64 size);
   STDMETHOD(SetCompleted)(const UInt64 *completeValue);
 
-  // IExtractCallBack
-  STDMETHOD(AskOverwrite)(
-      const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize,
-      const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize,
-      Int32 *result);
-  STDMETHOD (PrepareOperation)(const wchar_t *name, bool isFolder, Int32 askExtractMode, const UInt64 *position);
+  INTERFACE_IFolderArchiveExtractCallback(;)
+  INTERFACE_IFolderArchiveExtractCallback2(;)
 
-  STDMETHOD(MessageError)(const wchar_t *message);
-  STDMETHOD(SetOperationResult)(Int32 resultEOperationResult, bool encrypted);
   // ICryptoGetTextPassword
   STDMETHOD(CryptoGetTextPassword)(BSTR *password);
 
 private:
-  UInt64 _total;
-  UInt64 _processed;
-  
-  bool _totalIsDefined;
-  bool _processedIsDefined;
-
   UString m_CurrentFilePath;
 
-  CProgressBox *m_ProgressBox;
+  CProgressBox *_percent;
   UINT m_CodePage;
 
   bool m_PasswordIsDefined;
@@ -58,8 +47,8 @@ private:
   */
   void AddErrorMessage(LPCTSTR message);
 public:
-  CExtractCallBackImp(): _totalIsDefined(false), _processedIsDefined(false) {}
-  ~CExtractCallBackImp();
+  // CExtractCallbackImp() {}
+  ~CExtractCallbackImp();
   void Init(UINT codePage,
       CProgressBox *progressBox,
       bool passwordIsDefined, const UString &password);