xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-15 02:11:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.27 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-21 00:00:00 +00:00
committed by Kornel Lesiński
parent 31e7b924e8
commit d66cf2fcf3
393 changed files with 17345 additions and 4743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
7zip/Compress/LZ/LZInWindow.cpp
View File

@@ -72,7 +72,7 @@ HRESULT CLZInWindow::ReadBlock()
if(size == 0)
return S_OK;
UInt32 numReadBytes;
RINOK(_stream->ReadPart(_buffer + _streamPos, size, &numReadBytes));
RINOK(_stream->Read(_buffer + _streamPos, size, &numReadBytes));
if(numReadBytes == 0)
{
_posLimit = _streamPos;

74
7zip/Compress/LZ/LZOutWindow.cpp
View File

@@ -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()
{
if(_stream != 0)
{
// Flush(); // Test it
_stream->Release();
_stream = 0;
}
}
void CLZOutWindow::FlushWithCheck()
{
HRESULT result = Flush();
HRESULT result = FlushPart();
if (_pos == _bufferSize)
{
_pos = 0;
_overDict = true;
}
#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;
}

47
7zip/Compress/LZ/LZOutWindow.h
View File

@@ -4,6 +4,7 @@
#define __LZ_OUT_WINDOW_H
#include "../../IStream.h"
#include "../../Common/OutBuffer.h"
#ifndef _NO_EXCEPTIONS
class CLZOutWindowException
@@ -14,57 +15,47 @@ public:
};
#endif
class CLZOutWindow
class CLZOutWindow: public COutBuffer
{
Byte *_buffer;
UInt32 _pos;
UInt32 _windowSize;
UInt32 _streamPos;
ISequentialOutStream *_stream;
bool _overDict;
void FlushWithCheck();
public:
#ifdef _NO_EXCEPTIONS
HRESULT ErrorCode;
#endif
void Free();
CLZOutWindow(): _buffer(0), _stream(0) {}
~CLZOutWindow() { Free(); ReleaseStream(); }
bool Create(UInt32 windowSize);
void SetStream(ISequentialOutStream *stream);
void Init(bool solid = false);
HRESULT Flush();
void ReleaseStream();
void CopyBlock(UInt32 distance, UInt32 len)
// distance >= 0, len > 0,
bool CopyBlock(UInt32 distance, UInt32 len)
{
UInt32 pos = _pos - distance - 1;
if (pos >= _windowSize)
pos += _windowSize;
for(; len > 0; len--)
if (pos >= _bufferSize)
{
if (pos >= _windowSize)
if (!_overDict)
return false;
pos += _bufferSize;
}
do
{
if (pos == _bufferSize)
pos = 0;
_buffer[_pos++] = _buffer[pos++];
if (_pos >= _windowSize)
if (_pos == _limitPos)
FlushWithCheck();
// PutOneByte(GetOneByte(distance));
}
while(--len != 0);
return true;
}
void PutByte(Byte b)
{
_buffer[_pos++] = b;
if (_pos >= _windowSize)
if (_pos == _limitPos)
FlushWithCheck();
}
Byte GetByte(UInt32 distance) const
{
UInt32 pos = _pos - distance - 1;
if (pos >= _windowSize)
pos += _windowSize;
if (pos >= _bufferSize)
pos += _bufferSize;
return _buffer[pos];
}
};