1 files changed, 7 insertions, 11 deletions
diff --git a/CPP/7zip/Archive/Wim/WimIn.h b/CPP/7zip/Archive/Wim/WimIn.h
index 3de8456..71d0a3a 100644
--- a/CPP/7zip/Archive/Wim/WimIn.h
+++ b/CPP/7zip/Archive/Wim/WimIn.h
@@ -5,6 +5,7 @@
 #include "../../../../C/Alloc.h"
+#include "../../../Common/AutoPtr.h"
 #include "../../../Common/MyBuffer.h"
 #include "../../../Common/MyXml.h"
@@ -583,27 +584,23 @@ struct CMidBuf
  {
    if (size > _size)
    {
-      ::MidFree(Data);
+      ::z7_AlignedFree(Data);
      _size = 0;
-      Data = (Byte *)::MidAlloc(size);
+      Data = (Byte *)::z7_AlignedAlloc(size);
      if (Data)
        _size = size;
    }
  }
-  ~CMidBuf() { ::MidFree(Data); }
+  ~CMidBuf() { ::z7_AlignedFree(Data); }
 };
 class CUnpacker
 {
-  NCompress::CCopyCoder *copyCoderSpec;
+  CMyComPtr2<ICompressCoder, NCompress::CCopyCoder> copyCoder;
-  CMyComPtr<ICompressCoder> copyCoder;
+  CMyUniquePtr<NCompress::NLzx::CDecoder> lzxDecoder;
+  CMyUniquePtr<NCompress::NLzms::CDecoder> lzmsDecoder;
-  NCompress::NLzx::CDecoder *lzxDecoderSpec;
-  CMyComPtr<IUnknown> lzxDecoder;
-  NCompress::NLzms::CDecoder *lzmsDecoder;
  CByteBuffer sizesBuf;
@@ -637,7 +634,6 @@ public:
      _unpackedChunkIndex(0),
      TotalPacked(0)
      {}
-  ~CUnpacker();
  HRESULT Unpack(
      IInStream *inStream,

diff --git a/CPP/7zip/Archive/Wim/WimIn.h b/CPP/7zip/Archive/Wim/WimIn.h index 3de8456..71d0a3a 100644 --- a/CPP/7zip/Archive/Wim/WimIn.h +++ b/CPP/7zip/Archive/Wim/WimIn.h
@@ -5,6 +5,7 @@
5		5
6	#include "../../../../C/Alloc.h"	6	#include "../../../../C/Alloc.h"
7		7
		8	#include "../../../Common/AutoPtr.h"
8	#include "../../../Common/MyBuffer.h"	9	#include "../../../Common/MyBuffer.h"
9	#include "../../../Common/MyXml.h"	10	#include "../../../Common/MyXml.h"
10		11
@@ -583,27 +584,23 @@ struct CMidBuf
583	{	584	{
584	if (size > _size)	585	if (size > _size)
585	{	586	{
586	::MidFree(Data);	587	::z7_AlignedFree(Data);
587	_size = 0;	588	_size = 0;
588	Data = (Byte *)::MidAlloc(size);	589	Data = (Byte *)::z7_AlignedAlloc(size);
589	if (Data)	590	if (Data)
590	_size = size;	591	_size = size;
591	}	592	}
592	}	593	}
593		594
594	~CMidBuf() { ::MidFree(Data); }	595	~CMidBuf() { ::z7_AlignedFree(Data); }
595	};	596	};
596		597
597		598
598	class CUnpacker	599	class CUnpacker
599	{	600	{
600	NCompress::CCopyCoder *copyCoderSpec;	601	CMyComPtr2<ICompressCoder, NCompress::CCopyCoder> copyCoder;
601	CMyComPtr<ICompressCoder> copyCoder;	602	CMyUniquePtr<NCompress::NLzx::CDecoder> lzxDecoder;
602		603	CMyUniquePtr<NCompress::NLzms::CDecoder> lzmsDecoder;
603	NCompress::NLzx::CDecoder *lzxDecoderSpec;
604	CMyComPtr<IUnknown> lzxDecoder;
605
606	NCompress::NLzms::CDecoder *lzmsDecoder;
607		604
608	CByteBuffer sizesBuf;	605	CByteBuffer sizesBuf;
609		606
@@ -637,7 +634,6 @@ public:
637	_unpackedChunkIndex(0),	634	_unpackedChunkIndex(0),
638	TotalPacked(0)	635	TotalPacked(0)
639	{}	636	{}
640	~CUnpacker();
641		637
642	HRESULT Unpack(	638	HRESULT Unpack(
643	IInStream *inStream,	639	IInStream *inStream,