Don't reuse m_lastcount in wxCountingOutputStream to store the stream length,
this doesn't make any sense and results in LastWrite() returning completely
wrong results as it expects m_lastcount to be the number of bytes written by
the last operation.
Add m_lastPos member to store the stream length instead.
Also correct wxCountingOutputStream documentation.
Closes #15215.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74036
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
- Allow testing for symlink/FIFO/socket existence in wxFileName (David Hart).
- Many important bug fixes in wxFileSystemWatcher (David Hart).
- Add wxInputStream::ReadAll() and wxOutputStream::WriteAll() (Catalin Raceanu).
- Allow testing for symlink/FIFO/socket existence in wxFileName (David Hart).
- Many important bug fixes in wxFileSystemWatcher (David Hart).
- Add wxInputStream::ReadAll() and wxOutputStream::WriteAll() (Catalin Raceanu).
+- Fix wxCountingOutputStream::LastWrite() return value (Catalin Raceanu).
- Add new wxFSW_EVENT_ATTRIB and wxFSW_EVENT_UNMOUNT flags (David Hart).
- Add separate read/written bytes counters and per-direction NOWAIT and WAITALL
flags to wxSocket (Rob Bresalier).
- Add new wxFSW_EVENT_ATTRIB and wxFSW_EVENT_UNMOUNT flags (David Hart).
- Add separate read/written bytes counters and per-direction NOWAIT and WAITALL
flags to wxSocket (Rob Bresalier).
public:
wxCountingOutputStream();
public:
wxCountingOutputStream();
- wxFileOffset GetLength() const;
+ virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); }
bool Ok() const { return IsOk(); }
- bool IsOk() const { return true; }
+ virtual bool IsOk() const { return true; }
protected:
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
protected:
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
+ size_t m_currentPos,
+ m_lastPos;
DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);
DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);
virtual ~wxCountingOutputStream();
/**
virtual ~wxCountingOutputStream();
/**
- Returns the current size of the stream.
+ Returns the current length of the stream.
+
+ This is the amount of data written to the stream so far, in bytes.
- size_t GetSize() const;
+ virtual wxFileOffset GetLength() const;
wxCountingOutputStream::wxCountingOutputStream ()
{
wxCountingOutputStream::wxCountingOutputStream ()
{
+ m_currentPos =
+ m_lastPos = 0;
}
wxFileOffset wxCountingOutputStream::GetLength() const
{
}
wxFileOffset wxCountingOutputStream::GetLength() const
{
}
size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
size_t size)
{
m_currentPos += size;
}
size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
size_t size)
{
m_currentPos += size;
- if (m_currentPos > m_lastcount)
- m_lastcount = m_currentPos;
+ if ( m_currentPos > m_lastPos )
+ m_lastPos = m_currentPos;
}
wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
}
wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
- new_pos = m_lastcount + new_pos;
- wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastcount + pos), wxInvalidOffset, wxT("huge position not supported") );
+ new_pos += m_lastPos;
+ wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastPos + pos), wxInvalidOffset, wxT("huge position not supported") );
break;
case wxFromCurrent:
break;
case wxFromCurrent:
- new_pos = m_currentPos + new_pos;
+ new_pos += m_currentPos;
wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") );
break;
wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") );
break;
- if (m_currentPos > m_lastcount)
- m_lastcount = m_currentPos;
+ if ( m_currentPos > m_lastPos )
+ m_lastPos = m_currentPos;