XzHandler.cpp (p7zip_15.14.1_src_all) | : | XzHandler.cpp (p7zip_16.02_src_all) | ||
---|---|---|---|---|
skipping to change at line 13 | skipping to change at line 13 | |||
#include "StdAfx.h" | #include "StdAfx.h" | |||
#include "../../../C/Alloc.h" | #include "../../../C/Alloc.h" | |||
#include "../../../C/XzCrc64.h" | #include "../../../C/XzCrc64.h" | |||
#include "../../../C/XzEnc.h" | #include "../../../C/XzEnc.h" | |||
#include "../../Common/ComTry.h" | #include "../../Common/ComTry.h" | |||
#include "../../Common/Defs.h" | #include "../../Common/Defs.h" | |||
#include "../../Common/IntToString.h" | #include "../../Common/IntToString.h" | |||
#include "../../Windows/PropVariant.h" | ||||
#include "../ICoder.h" | #include "../ICoder.h" | |||
#include "../Common/CWrappers.h" | #include "../Common/CWrappers.h" | |||
#include "../Common/ProgressUtils.h" | #include "../Common/ProgressUtils.h" | |||
#include "../Common/RegisterArc.h" | #include "../Common/RegisterArc.h" | |||
#include "../Common/StreamUtils.h" | #include "../Common/StreamUtils.h" | |||
#include "../Compress/CopyCoder.h" | #include "../Compress/CopyCoder.h" | |||
#include "IArchive.h" | #include "IArchive.h" | |||
#ifndef EXTRACT_ONLY | ||||
#include "Common/HandlerOut.h" | #include "Common/HandlerOut.h" | |||
#endif | ||||
#include "XzHandler.h" | #include "XzHandler.h" | |||
using namespace NWindows; | using namespace NWindows; | |||
namespace NCompress { | namespace NCompress { | |||
namespace NLzma2 { | namespace NLzma2 { | |||
HRESULT SetLzma2Prop(PROPID propID, const PROPVARIANT &prop, CLzma2EncProps &lzm a2Props); | HRESULT SetLzma2Prop(PROPID propID, const PROPVARIANT &prop, CLzma2EncProps &lzm a2Props); | |||
skipping to change at line 86 | skipping to change at line 90 | |||
{ | { | |||
CStatInfo _stat; | CStatInfo _stat; | |||
bool _isArc; | bool _isArc; | |||
bool _needSeekToStart; | bool _needSeekToStart; | |||
bool _phySize_Defined; | bool _phySize_Defined; | |||
CMyComPtr<IInStream> _stream; | CMyComPtr<IInStream> _stream; | |||
CMyComPtr<ISequentialInStream> _seqStream; | CMyComPtr<ISequentialInStream> _seqStream; | |||
UInt32 _filterId; | ||||
AString _methodsString; | AString _methodsString; | |||
#ifndef EXTRACT_ONLY | ||||
UInt32 _filterId; | ||||
void Init() | void Init() | |||
{ | { | |||
_filterId = 0; | _filterId = 0; | |||
CMultiMethodProps::Init(); | CMultiMethodProps::Init(); | |||
} | } | |||
#endif | ||||
HRESULT Open2(IInStream *inStream, /* UInt32 flags, */ IArchiveOpenCallback *c allback); | HRESULT Open2(IInStream *inStream, /* UInt32 flags, */ IArchiveOpenCallback *c allback); | |||
HRESULT Decode2(ISequentialInStream *seqInStream, ISequentialOutStream *outStr eam, | HRESULT Decode2(ISequentialInStream *seqInStream, ISequentialOutStream *outStr eam, | |||
CDecoder &decoder, ICompressProgressInfo *progress) | CDecoder &decoder, ICompressProgressInfo *progress) | |||
{ | { | |||
RINOK(decoder.Decode(seqInStream, outStream, progress)); | RINOK(decoder.Decode(seqInStream, outStream, progress)); | |||
_stat = decoder; | _stat = decoder; | |||
_phySize_Defined = true; | _phySize_Defined = true; | |||
return S_OK; | return S_OK; | |||
} | } | |||
skipping to change at line 129 | skipping to change at line 138 | |||
#ifndef EXTRACT_ONLY | #ifndef EXTRACT_ONLY | |||
INTERFACE_IOutArchive(;) | INTERFACE_IOutArchive(;) | |||
STDMETHOD(SetProperties)(const wchar_t * const *names, const PROPVARIANT *valu es, UInt32 numProps); | STDMETHOD(SetProperties)(const wchar_t * const *names, const PROPVARIANT *valu es, UInt32 numProps); | |||
#endif | #endif | |||
CHandler(); | CHandler(); | |||
}; | }; | |||
CHandler::CHandler() | CHandler::CHandler() | |||
{ | { | |||
#ifndef EXTRACT_ONLY | ||||
Init(); | Init(); | |||
#endif | ||||
} | } | |||
static const Byte kProps[] = | static const Byte kProps[] = | |||
{ | { | |||
kpidSize, | kpidSize, | |||
kpidPackSize, | kpidPackSize, | |||
kpidMethod | kpidMethod | |||
}; | }; | |||
static const Byte kArcProps[] = | static const Byte kArcProps[] = | |||
End of changes. 8 change blocks. | ||||
1 lines changed or deleted | 12 lines changed or added |