Merge branch 'master' into Sync-weave

1 files changed, 0 insertions, 156 deletions

diff --git a/other-licenses/7zstub/src/7zip/Common/StreamObjects.h b/other-licenses/7zstub/src/7zip/Common/StreamObjects.h
deleted file mode 100644
index b028a2114..000000000
--- a/other-licenses/7zstub/src/7zip/Common/StreamObjects.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// StreamObjects.h

-

-#ifndef __STREAMOBJECTS_H

-#define __STREAMOBJECTS_H

-

-#include "../../Common/DynamicBuffer.h"

-#include "../../Common/MyCom.h"

-#include "../IStream.h"

-

-class CSequentialInStreamImp: 

-  public ISequentialInStream,

-  public CMyUnknownImp

-{

-  const Byte *_dataPointer;

-  size_t _size;

-  size_t _pos;

-

-public:

-  void Init(const Byte *dataPointer, size_t size)

-  {

-    _dataPointer = dataPointer;

-    _size = size;

-    _pos = 0;

-  }

-

-  MY_UNKNOWN_IMP

-

-  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);

-};

-

-

-class CWriteBuffer

-{

-  CByteDynamicBuffer _buffer;

-  size_t _size;

-public:

-  CWriteBuffer(): _size(0) {}

-  void Init() { _size = 0;  }

-  void Write(const void *data, size_t size);

-  size_t GetSize() const { return _size; }

-  const CByteDynamicBuffer& GetBuffer() const { return _buffer; }

-};

-

-class CSequentialOutStreamImp: 

-  public ISequentialOutStream,

-  public CMyUnknownImp

-{

-  CWriteBuffer _writeBuffer;

-public:

-  void Init() { _writeBuffer.Init(); }

-  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);

-};

-

-class CSequentialOutStreamImp2: 

-  public ISequentialOutStream,

-  public CMyUnknownImp

-{

-  Byte *_buffer;

-public:

-  size_t _size;

-  size_t _pos;

-

-  void Init(Byte *buffer, size_t size)  

-  { 

-    _buffer = buffer;

-    _pos = 0;

-    _size = size; 

-  }

-

-  MY_UNKNOWN_IMP

-

-  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);

-};

-

-class CSequentialInStreamSizeCount: 

-  public ISequentialInStream,

-  public CMyUnknownImp

-{

-  CMyComPtr<ISequentialInStream> _stream;

-  UInt64 _size;

-public:

-  void Init(ISequentialInStream *stream)

-  {

-    _stream = stream;

-    _size = 0;

-  }

-  UInt64 GetSize() const { return _size; }

-

-  MY_UNKNOWN_IMP

-

-  STDMETHOD(Read)(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);

-  HRESULT Rollback(size_t rollbackSize);

-};

-

-class CSequentialOutStreamSizeCount: 

-  public ISequentialOutStream,

-  public CMyUnknownImp

-{

-  CMyComPtr<ISequentialOutStream> _stream;

-  UInt64 _size;

-public:

-  void Init(ISequentialOutStream *stream)

-  {

-    _stream = stream;

-    _size = 0;

-  }

-  UInt64 GetSize() const { return _size; }

-

-  MY_UNKNOWN_IMP

-

-  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);

-};

-

-#endif