mirror of
https://github.com/aaru-dps/Aaru.Compression.Native.git
synced 2025-12-16 19:24:31 +00:00
Update to lzma 23.01.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
// ExtractCallbackConsole.h
|
||||
|
||||
#ifndef __EXTRACT_CALLBACK_CONSOLE_H
|
||||
#define __EXTRACT_CALLBACK_CONSOLE_H
|
||||
#ifndef ZIP7_INC_EXTRACT_CALLBACK_CONSOLE_H
|
||||
#define ZIP7_INC_EXTRACT_CALLBACK_CONSOLE_H
|
||||
|
||||
#include "../../../Common/StdOutStream.h"
|
||||
|
||||
@@ -15,12 +15,35 @@
|
||||
|
||||
#include "OpenCallbackConsole.h"
|
||||
|
||||
class CExtractScanConsole: public IDirItemsCallback
|
||||
/*
|
||||
struct CErrorPathCodes2
|
||||
{
|
||||
FStringVector Paths;
|
||||
CRecordVector<DWORD> Codes;
|
||||
|
||||
void AddError(const FString &path, DWORD systemError)
|
||||
{
|
||||
Paths.Add(path);
|
||||
Codes.Add(systemError);
|
||||
}
|
||||
void Clear()
|
||||
{
|
||||
Paths.Clear();
|
||||
Codes.Clear();
|
||||
}
|
||||
};
|
||||
*/
|
||||
|
||||
class CExtractScanConsole Z7_final: public IDirItemsCallback
|
||||
{
|
||||
Z7_IFACE_IMP(IDirItemsCallback)
|
||||
|
||||
CStdOutStream *_so;
|
||||
CStdOutStream *_se;
|
||||
CPercentPrinter _percent;
|
||||
|
||||
// CErrorPathCodes2 ScanErrors;
|
||||
|
||||
bool NeedPercents() const { return _percent._so != NULL; }
|
||||
|
||||
void ClosePercentsAndFlush()
|
||||
@@ -33,8 +56,6 @@ class CExtractScanConsole: public IDirItemsCallback
|
||||
|
||||
public:
|
||||
|
||||
virtual ~CExtractScanConsole() {}
|
||||
|
||||
void Init(CStdOutStream *outStream, CStdOutStream *errorStream, CStdOutStream *percentStream)
|
||||
{
|
||||
_so = outStream;
|
||||
@@ -46,8 +67,6 @@ public:
|
||||
|
||||
void StartScanning();
|
||||
|
||||
INTERFACE_IDirItemsCallback(;)
|
||||
|
||||
void CloseScanning()
|
||||
{
|
||||
if (NeedPercents())
|
||||
@@ -60,16 +79,36 @@ public:
|
||||
|
||||
|
||||
|
||||
class CExtractCallbackConsole:
|
||||
class CExtractCallbackConsole Z7_final:
|
||||
public IFolderArchiveExtractCallback,
|
||||
public IExtractCallbackUI,
|
||||
// public IArchiveExtractCallbackMessage,
|
||||
public IFolderArchiveExtractCallback2,
|
||||
#ifndef _NO_CRYPTO
|
||||
#ifndef Z7_NO_CRYPTO
|
||||
public ICryptoGetTextPassword,
|
||||
#endif
|
||||
#endif
|
||||
public COpenCallbackConsole,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
Z7_COM_QI_BEGIN2(IFolderArchiveExtractCallback)
|
||||
// Z7_COM_QI_ENTRY(IArchiveExtractCallbackMessage)
|
||||
Z7_COM_QI_ENTRY(IFolderArchiveExtractCallback2)
|
||||
#ifndef Z7_NO_CRYPTO
|
||||
Z7_COM_QI_ENTRY(ICryptoGetTextPassword)
|
||||
#endif
|
||||
Z7_COM_QI_END
|
||||
Z7_COM_ADDREF_RELEASE
|
||||
|
||||
Z7_IFACE_COM7_IMP(IProgress)
|
||||
Z7_IFACE_COM7_IMP(IFolderArchiveExtractCallback)
|
||||
Z7_IFACE_IMP(IExtractCallbackUI)
|
||||
// Z7_IFACE_COM7_IMP(IArchiveExtractCallbackMessage)
|
||||
Z7_IFACE_COM7_IMP(IFolderArchiveExtractCallback2)
|
||||
#ifndef Z7_NO_CRYPTO
|
||||
Z7_IFACE_COM7_IMP(ICryptoGetTextPassword)
|
||||
#endif
|
||||
|
||||
|
||||
AString _tempA;
|
||||
UString _tempU;
|
||||
|
||||
@@ -88,32 +127,7 @@ class CExtractCallbackConsole:
|
||||
if (_so)
|
||||
_so->Flush();
|
||||
}
|
||||
|
||||
public:
|
||||
MY_QUERYINTERFACE_BEGIN2(IFolderArchiveExtractCallback)
|
||||
// MY_QUERYINTERFACE_ENTRY(IArchiveExtractCallbackMessage)
|
||||
MY_QUERYINTERFACE_ENTRY(IFolderArchiveExtractCallback2)
|
||||
#ifndef _NO_CRYPTO
|
||||
MY_QUERYINTERFACE_ENTRY(ICryptoGetTextPassword)
|
||||
#endif
|
||||
MY_QUERYINTERFACE_END
|
||||
MY_ADDREF_RELEASE
|
||||
|
||||
STDMETHOD(SetTotal)(UInt64 total);
|
||||
STDMETHOD(SetCompleted)(const UInt64 *completeValue);
|
||||
|
||||
INTERFACE_IFolderArchiveExtractCallback(;)
|
||||
|
||||
INTERFACE_IExtractCallbackUI(;)
|
||||
// INTERFACE_IArchiveExtractCallbackMessage(;)
|
||||
INTERFACE_IFolderArchiveExtractCallback2(;)
|
||||
|
||||
#ifndef _NO_CRYPTO
|
||||
|
||||
STDMETHOD(CryptoGetTextPassword)(BSTR *password);
|
||||
|
||||
#endif
|
||||
|
||||
UInt64 NumTryArcs;
|
||||
|
||||
bool ThereIsError_in_Current;
|
||||
|
||||
Reference in New Issue
Block a user