diff -r 000000000000 -r 6474c204b198 other-licenses/7zstub/src/7zip/Common/StreamObjects.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/other-licenses/7zstub/src/7zip/Common/StreamObjects.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,102 @@
+// StreamObjects.cpp
+
+#include "StdAfx.h"
+
+#include "StreamObjects.h"
+#include "../../Common/Defs.h"
+
+
+STDMETHODIMP CSequentialInStreamImp::Read(void *data, UInt32 size, UInt32 *processedSize)
+{
+  UInt32 numBytesToRead = (UInt32)(MyMin(_pos + size, _size) - _pos);
+  memmove(data, _dataPointer + _pos, numBytesToRead);
+  _pos += numBytesToRead;
+  if(processedSize != NULL)
+    *processedSize = numBytesToRead;
+  return S_OK;
+}
+
+
+void CWriteBuffer::Write(const void *data, size_t size)
+{
+  size_t newCapacity = _size + size;
+  _buffer.EnsureCapacity(newCapacity);
+  memmove(_buffer + _size, data, size);
+  _size += size;
+}
+
+STDMETHODIMP CSequentialOutStreamImp::Write(const void *data, UInt32 size, UInt32 *processedSize)
+{
+  _writeBuffer.Write(data, size);
+  if(processedSize != NULL)
+    *processedSize = size;
+  return S_OK; 
+}
+
+STDMETHODIMP CSequentialOutStreamImp2::Write(const void *data, UInt32 size, UInt32 *processedSize)
+{
+  UInt32 newSize = size;
+  if (_pos + size > _size)
+    newSize = (UInt32)(_size - _pos);
+  memmove(_buffer + _pos, data, newSize);
+  if(processedSize != NULL)
+    *processedSize = newSize;
+  _pos += newSize;
+  if (newSize != size)
+    return E_FAIL;
+  return S_OK; 
+}
+
+STDMETHODIMP CSequentialInStreamSizeCount::Read(void *data, UInt32 size, UInt32 *processedSize)
+{
+  UInt32 realProcessedSize;
+  HRESULT result = _stream->Read(data, size, &realProcessedSize);
+  _size += realProcessedSize;
+  if (processedSize != 0)
+    *processedSize = realProcessedSize;
+  return result; 
+}
+
+STDMETHODIMP CSequentialInStreamRollback::Read(void *data, UInt32 size, UInt32 *processedSize)
+{
+  if (_currentPos != _currentSize)
+  {
+    size_t curSize = _currentSize - _currentPos;
+    if (size > curSize)
+      size = (UInt32)curSize;
+    memmove(data, _buffer + _currentPos, size);
+    _currentPos += size;
+    if (processedSize != 0)
+      *processedSize = size;
+    return S_OK;
+  }
+  UInt32 realProcessedSize;
+  if (size > _bufferSize)
+    size = (UInt32)_bufferSize;
+  HRESULT result = _stream->Read(_buffer, size, &realProcessedSize);
+  memmove(data, _buffer, realProcessedSize);
+  _size += realProcessedSize;
+  _currentSize = realProcessedSize;
+  _currentPos = realProcessedSize;
+  if (processedSize != 0)
+    *processedSize = realProcessedSize;
+  return result; 
+}
+
+HRESULT CSequentialInStreamRollback::Rollback(size_t rollbackSize)
+{
+  if (rollbackSize > _currentPos)
+    return E_INVALIDARG;
+  _currentPos -= rollbackSize;
+  return S_OK;
+}
+
+STDMETHODIMP CSequentialOutStreamSizeCount::Write(const void *data, UInt32 size, UInt32 *processedSize)
+{
+  UInt32 realProcessedSize;
+  HRESULT result = _stream->Write(data, size, &realProcessedSize);
+  _size += realProcessedSize;
+  if (processedSize != 0)
+    *processedSize = realProcessedSize;
+  return result; 
+}