1 files changed, 8 insertions, 64 deletions

diff --git a/7zip/Compress/LZ/LZOutWindow.cpp b/7zip/Compress/LZ/LZOutWindow.cpp
index 4101079b..093c9ce8 100755
--- a/7zip/Compress/LZ/LZOutWindow.cpp
+++ b/7zip/Compress/LZ/LZOutWindow.cpp
@@ -5,62 +5,29 @@
 #include "../../../Common/Alloc.h"
 #include "LZOutWindow.h"
 
-bool CLZOutWindow::Create(UInt32 windowSize)
-{
-  const UInt32 kMinBlockSize = 1;
-  if (windowSize < kMinBlockSize)
-    windowSize = kMinBlockSize;
-  if (_buffer != 0 && _windowSize == windowSize)
-    return true;
-
-  // It's here to allow Solid decoding / and calling Create for RAR
-  _pos = 0;
-  _streamPos = 0;
-  
-  Free();
-  _windowSize = windowSize;
-  _buffer = (Byte *)::BigAlloc(windowSize);
-  return (_buffer != 0);
-}
-
-void CLZOutWindow::Free()
-{
-  ::BigFree(_buffer);
-  _buffer = 0;
-}
-
-void CLZOutWindow::SetStream(ISequentialOutStream *stream)
-{
-  ReleaseStream();
-  _stream = stream;
-  _stream->AddRef();
-}
-
 void CLZOutWindow::Init(bool solid)
 {
   if(!solid)
   {
     _streamPos = 0;
+    _limitPos = _bufferSize;
     _pos = 0;
+    _processedSize = 0;
+    _overDict = false;
   }
   #ifdef _NO_EXCEPTIONS
   ErrorCode = S_OK;
   #endif
 }
 
-void CLZOutWindow::ReleaseStream()
+void CLZOutWindow::FlushWithCheck()
 {
-  if(_stream != 0)
+  HRESULT result = FlushPart();
+  if (_pos == _bufferSize)
   {
-    // Flush(); // Test it
-    _stream->Release();
-    _stream = 0;
+    _pos = 0;
+    _overDict = true;
   }
-}
-
-void CLZOutWindow::FlushWithCheck()
-{
-  HRESULT result = Flush();
   #ifdef _NO_EXCEPTIONS
   ErrorCode = result;
   #else
@@ -69,27 +36,4 @@ void CLZOutWindow::FlushWithCheck()
   #endif
 }
 
-HRESULT CLZOutWindow::Flush()
-{
-  UInt32 size = _pos - _streamPos;
-  if(size == 0)
-    return S_OK;
-  #ifdef _NO_EXCEPTIONS
-  if (ErrorCode != S_OK)
-    return ErrorCode;
-  #endif
 
-  if(_stream != 0)
-  {
-    UInt32 processedSize;
-    HRESULT result = _stream->Write(_buffer + _streamPos, size, &processedSize);
-    if (result != S_OK)
-      return result;
-    if (size != processedSize)
-      return E_FAIL;
-  }
-  if (_pos >= _windowSize)
-    _pos = 0;
-  _streamPos = _pos;
-  return S_OK;
-}