mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-14 02:11:40 -06:00
4.20
This commit is contained in:
committed by
Kornel Lesiński
parent
8c1b5c7b7e
commit
3c510ba80b
@@ -1,7 +1,5 @@
|
||||
// StreamObjects.h
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef __STREAMOBJECTS_H
|
||||
#define __STREAMOBJECTS_H
|
||||
|
||||
@@ -9,16 +7,17 @@
|
||||
#include "../../Common/MyCom.h"
|
||||
#include "../IStream.h"
|
||||
|
||||
/*
|
||||
class COutStreamImp:
|
||||
public ISequentialStream,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
CByteDynamicBuffer _buffer;
|
||||
UINT32 _size;
|
||||
size_t _size;
|
||||
public:
|
||||
COutStreamImp(): _size(0) {}
|
||||
void Init(){ _size = 0; }
|
||||
UINT32 GetSize() const { return _size; }
|
||||
size_t GetSize() const { return _size; }
|
||||
const CByteDynamicBuffer& GetBuffer() const { return _buffer; }
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
@@ -31,30 +30,31 @@ class CInStreamImp:
|
||||
public ISequentialStream,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
BYTE *_dataPointer;
|
||||
UINT32 _size;
|
||||
UINT32 _pos;
|
||||
Byte *_dataPointer;
|
||||
size_t _size;
|
||||
size_t _pos;
|
||||
|
||||
public:
|
||||
CInStreamImp(): _size(0xFFFFFFFF), _pos(0), _dataPointer(NULL) {}
|
||||
void Init(BYTE *dataPointer, UINT32 size);
|
||||
void Init(Byte *dataPointer, size_t size);
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHODIMP Read(void *data, ULONG size, ULONG *processedSize);
|
||||
STDMETHODIMP Write(void const *data, ULONG size, ULONG *processedSize);
|
||||
};
|
||||
*/
|
||||
|
||||
class CSequentialInStreamImp:
|
||||
public ISequentialInStream,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
const BYTE *_dataPointer;
|
||||
UINT32 _size;
|
||||
UINT32 _pos;
|
||||
const Byte *_dataPointer;
|
||||
size_t _size;
|
||||
size_t _pos;
|
||||
|
||||
public:
|
||||
void Init(const BYTE *dataPointer, UINT32 size)
|
||||
void Init(const Byte *dataPointer, size_t size)
|
||||
{
|
||||
_dataPointer = dataPointer;
|
||||
_size = size;
|
||||
@@ -63,18 +63,18 @@ public:
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHOD(Read)(void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(ReadPart)(void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
};
|
||||
|
||||
|
||||
class CWriteBuffer
|
||||
{
|
||||
CByteDynamicBuffer _buffer;
|
||||
UINT32 _size;
|
||||
size_t _size;
|
||||
public:
|
||||
CWriteBuffer(): _size(0) {}
|
||||
// void Init(UINT32 size = 0)
|
||||
// void Init(size_t size = 0)
|
||||
void Init()
|
||||
{
|
||||
/*
|
||||
@@ -83,8 +83,8 @@ public:
|
||||
*/
|
||||
_size = 0;
|
||||
}
|
||||
void Write(const void *data, UINT32 size);
|
||||
UINT32 GetSize() const { return _size; }
|
||||
void Write(const void *data, size_t size);
|
||||
size_t GetSize() const { return _size; }
|
||||
const CByteDynamicBuffer& GetBuffer() const { return _buffer; }
|
||||
};
|
||||
|
||||
@@ -100,30 +100,30 @@ public:
|
||||
}
|
||||
|
||||
/*
|
||||
void Init(UINT32 size = 0)
|
||||
void Init(size_t size = 0)
|
||||
{
|
||||
_writeBuffer.Init(size);
|
||||
}
|
||||
*/
|
||||
UINT32 GetSize() const { return _writeBuffer.GetSize(); }
|
||||
size_t GetSize() const { return _writeBuffer.GetSize(); }
|
||||
const CByteDynamicBuffer& GetBuffer() const { return _writeBuffer.GetBuffer(); }
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHOD(Write)(const void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(WritePart)(const void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
|
||||
STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize);
|
||||
};
|
||||
|
||||
class CSequentialOutStreamImp2:
|
||||
public ISequentialOutStream,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
BYTE *_buffer;
|
||||
Byte *_buffer;
|
||||
public:
|
||||
UINT32 _size;
|
||||
UINT32 _pos;
|
||||
size_t _size;
|
||||
size_t _pos;
|
||||
|
||||
void Init(BYTE *buffer, UINT32 size)
|
||||
void Init(Byte *buffer, size_t size)
|
||||
{
|
||||
_buffer = buffer;
|
||||
_pos = 0;
|
||||
@@ -132,8 +132,8 @@ public:
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHOD(Write)(const void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(WritePart)(const void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
|
||||
STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize);
|
||||
};
|
||||
|
||||
class CSequentialInStreamSizeCount:
|
||||
@@ -141,19 +141,58 @@ class CSequentialInStreamSizeCount:
|
||||
public CMyUnknownImp
|
||||
{
|
||||
CMyComPtr<ISequentialInStream> _stream;
|
||||
UINT64 _size;
|
||||
UInt64 _size;
|
||||
public:
|
||||
void Init(ISequentialInStream *stream)
|
||||
{
|
||||
_stream = stream;
|
||||
_size = 0;
|
||||
}
|
||||
UINT64 GetSize() const { return _size; }
|
||||
UInt64 GetSize() const { return _size; }
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHOD(Read)(void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(ReadPart)(void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
};
|
||||
|
||||
class CSequentialInStreamRollback:
|
||||
public ISequentialInStream,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
CMyComPtr<ISequentialInStream> _stream;
|
||||
Byte *_buffer;
|
||||
size_t _bufferSize;
|
||||
UInt64 _size;
|
||||
|
||||
size_t _currentSize;
|
||||
size_t _currentPos;
|
||||
public:
|
||||
CSequentialInStreamRollback(size_t bufferSize):
|
||||
_bufferSize(bufferSize),
|
||||
_buffer(0)
|
||||
{
|
||||
_buffer = new Byte[bufferSize];
|
||||
}
|
||||
~CSequentialInStreamRollback()
|
||||
{
|
||||
delete _buffer;
|
||||
}
|
||||
|
||||
void Init(ISequentialInStream *stream)
|
||||
{
|
||||
_stream = stream;
|
||||
_size = 0;
|
||||
_currentSize = 0;
|
||||
_currentPos = 0;
|
||||
}
|
||||
UInt64 GetSize() const { return _size; }
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
HRESULT Rollback(size_t rollbackSize);
|
||||
};
|
||||
|
||||
class CSequentialOutStreamSizeCount:
|
||||
@@ -161,19 +200,19 @@ class CSequentialOutStreamSizeCount:
|
||||
public CMyUnknownImp
|
||||
{
|
||||
CMyComPtr<ISequentialOutStream> _stream;
|
||||
UINT64 _size;
|
||||
UInt64 _size;
|
||||
public:
|
||||
void Init(ISequentialOutStream *stream)
|
||||
{
|
||||
_stream = stream;
|
||||
_size = 0;
|
||||
}
|
||||
UINT64 GetSize() const { return _size; }
|
||||
UInt64 GetSize() const { return _size; }
|
||||
|
||||
MY_UNKNOWN_IMP
|
||||
|
||||
STDMETHOD(Write)(const void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(WritePart)(const void *data, UINT32 size, UINT32 *processedSize);
|
||||
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
|
||||
STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user