X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32a4b1d57c479a1c39def13df6c269c93d2fdf1a..ccf0b1d76ce28c0880df6d5c4866aaa548e2e56f:/src/common/mstream.cpp diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index 7f72e82db4..8e81abd394 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -15,113 +15,55 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include -#include -#include #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -// ---------------------------------------------------------------------------- -// wxMemoryStreamBase -// ---------------------------------------------------------------------------- -wxMemoryStreamBase::wxMemoryStreamBase() -{ - m_buffer = NULL; - m_iolimit = 0; - m_persistent = FALSE; - m_length = 0; -} - -wxMemoryStreamBase::~wxMemoryStreamBase() -{ - if (!m_persistent && m_buffer) - free(m_buffer); -} - -bool wxMemoryStreamBase::ChangeBufferSize(size_t new_size) -{ - if (m_iolimit == 1) - return FALSE; - - m_length = new_size; - if (!m_buffer) - m_buffer = (char *)malloc(m_length); - else - m_buffer = (char *)realloc(m_buffer, m_length); +#if wxUSE_STREAMS - return (m_buffer != NULL); -} +#include +#include +#include // ---------------------------------------------------------------------------- // wxMemoryInputStream // ---------------------------------------------------------------------------- wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len) + : wxInputStream() { - m_persistent = TRUE; - m_length = len; - m_buffer = (char *)data; // It's bad. - m_position_i = 0; - m_lastread = 0; - m_eof = FALSE; - m_iolimit = 1; + m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); + m_i_streambuf->SetBufferIO((char*) data, (char*) (data+len)); + m_i_streambuf->SetIntPosition(0); // seek to start pos + m_i_streambuf->Fixed(TRUE); - m_i_streambuf->SetBufferIO(0); + m_length = len; } wxMemoryInputStream::~wxMemoryInputStream() { + delete m_i_streambuf; } char wxMemoryInputStream::Peek() { - // wxStreamBuffer is disabled so just peek the current character. - - return m_buffer[m_position_i]; + return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()]; } -size_t wxMemoryInputStream::DoRead(void *buffer, size_t size) +size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) { - if (m_iolimit == 2) { - m_eof = TRUE; - return 0; - } - if (m_position_i+size > m_length) - size = m_length-m_position_i; - - memcpy((void *)((unsigned long)buffer+m_position_i), m_buffer, size); - m_position_i += size; - - return size; + return m_i_streambuf->Read(buffer, nbytes); } -off_t wxMemoryInputStream::DoSeekInput(off_t pos, wxSeekMode mode) +off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode) { - if (m_iolimit == 2) - return 0; - - switch (mode) { - case wxFromStart: - if ((size_t)pos > m_length) - return m_position_i; - return (m_position_i = pos); - - case wxFromCurrent: - if ((size_t)(m_position_i+pos) > m_length) - return m_position_i; - - return (m_position_i += pos); - - case wxFromEnd: - if ((size_t)(m_length-pos) > m_length) - return m_position_i; - - return (m_position_i = m_length-pos); - } + return m_i_streambuf->Seek(pos, mode); +} - return m_position_i; +off_t wxMemoryInputStream::OnSysTell() const +{ + return m_i_streambuf->Tell(); } // ---------------------------------------------------------------------------- @@ -129,82 +71,44 @@ off_t wxMemoryInputStream::DoSeekInput(off_t pos, wxSeekMode mode) // ---------------------------------------------------------------------------- wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len) + : wxOutputStream() { - m_persistent = FALSE; - m_buffer = data; - m_length = len; - m_position_o = 0; - m_lastwrite = 0; - m_bad = FALSE; - m_iolimit = 2; - - m_o_streambuf->SetBufferIO(0); + m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write); + if (data) + m_o_streambuf->SetBufferIO(data, data+len); + m_o_streambuf->Fixed(TRUE); } wxMemoryOutputStream::~wxMemoryOutputStream() { - Sync(); + delete m_o_streambuf; } -size_t wxMemoryOutputStream::DoWrite(const void *buffer, size_t size) +size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes) { - if (m_iolimit == 1) { - m_bad = TRUE; - return 0; - } - - if (m_position_o+size > m_length) - if (!ChangeBufferSize(m_position_o+size)) { - m_bad = TRUE; - return 0; - } - - memcpy(m_buffer+m_position_o, buffer, size); - m_position_o += size; - - return size; + return m_o_streambuf->Write(buffer, nbytes); } -off_t wxMemoryOutputStream::DoSeekOutput(off_t pos, wxSeekMode mode) +off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) { - if (m_iolimit == 1) - return 0; - - switch (mode) { - case wxFromStart: - if ((size_t)pos > m_length) - return m_position_o; - return (m_position_o = pos); - - case wxFromCurrent: - if ((size_t)(m_position_o+pos) > m_length) - return m_position_o; - - return (m_position_o += pos); - - case wxFromEnd: - if ((size_t)(m_length-pos) > m_length) - return m_position_o; - - return (m_position_o = m_length-pos); - } - - return m_position_o; + return m_o_streambuf->Seek(pos, mode); } -// ---------------------------------------------------------------------------- -// wxMemoryStream -// ---------------------------------------------------------------------------- - -wxMemoryStream::wxMemoryStream(char *data, size_t len) - : wxMemoryInputStream(NULL, 0), wxMemoryOutputStream(NULL, 0) +off_t wxMemoryOutputStream::OnSysTell() const { - m_persistent = FALSE; - m_buffer = data; - m_length = len; - m_iolimit = 0; + return m_o_streambuf->Tell(); } -wxMemoryStream::~wxMemoryStream() +size_t wxMemoryOutputStream::CopyTo(char *buffer, size_t len) const { + if (!buffer) + return 0; + + if (len > GetSize()) + len = GetSize(); + + memcpy(buffer, m_o_streambuf->GetBufferStart(), len); + return len; } + +#endif