9.34

CPP/7zip/Archive/Nsis/NsisHandler.h

@@ -3,39 +3,32 @@
 #ifndef __NSIS_HANDLER_H
 #define __NSIS_HANDLER_H
 
-#include "Common/MyCom.h"
+#include "../../../Common/MyCom.h"
+
+#include "../../Common/CreateCoder.h"
+
 #include "../IArchive.h"
 
 #include "NsisIn.h"
 
-#include "../../Common/CreateCoder.h"
-
 namespace NArchive {
 namespace NNsis {
 
 class CHandler:
   public IInArchive,
-  PUBLIC_ISetCompressCodecsInfo
   public CMyUnknownImp
 {
-  CMyComPtr<IInStream> _inStream;
   CInArchive _archive;
+  AString _methodString;
 
-  DECL_EXTERNAL_CODECS_VARS
+  bool GetUncompressedSize(unsigned index, UInt32 &size) const;
+  bool GetCompressedSize(unsigned index, UInt32 &size) const;
 
-  bool GetUncompressedSize(int index, UInt32 &size);
-  bool GetCompressedSize(int index, UInt32 &size);
-
-  AString GetMethod(bool useItemFilter, UInt32 dictionary) const;
+  // AString GetMethod(NMethodType::EEnum method, bool useItemFilter, UInt32 dictionary) const;
 public:
-  MY_QUERYINTERFACE_BEGIN2(IInArchive)
-  QUERY_ENTRY_ISetCompressCodecsInfo
-  MY_QUERYINTERFACE_END
-  MY_ADDREF_RELEASE
+  MY_UNKNOWN_IMP1(IInArchive)
 
   INTERFACE_IInArchive(;)
-
-  DECL_ISetCompressCodecsInfo
 };
 
 }}