X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cacae09fad9fee2c9cb222455e0f9aa4fa11d37..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/src/common/mstream.cpp

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 7bed3cbf11..b0819a26ce 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -13,128 +13,113 @@
 #pragma implementation "mstream.h"
 #endif
 
-#include <stdlib.h>
-#include <wx/stream.h>
-#include <wx/mstream.h>
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxMemoryStreamBase, wxStream)
-IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
 #endif
 
-wxMemoryStreamBase::wxMemoryStreamBase(char *data, size_t length, int iolimit)
+#if wxUSE_STREAMS
+
+#include <stdlib.h>
+#include "wx/stream.h"
+#include "wx/mstream.h"
+
+// ----------------------------------------------------------------------------
+// wxMemoryInputStream
+// ----------------------------------------------------------------------------
+
+wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
+  : wxInputStream()
 {
-  m_buffer = data;
-  m_iolimit = iolimit;
-  m_persistent = FALSE;
-  m_length = length;
-  m_position_i = m_position_o = 0;
+  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_length = len;
 }
 
-wxMemoryStreamBase::~wxMemoryStreamBase()
+wxMemoryInputStream::~wxMemoryInputStream()
 {
-  free(m_buffer);
+  delete m_i_streambuf;
 }
 
-wxInputStream& wxMemoryStreamBase::Read(void *buffer, size_t size)
+char wxMemoryInputStream::Peek()
 {
-  if (m_iolimit == 2) {
-    m_eof = TRUE;
-    return *this;
-  }
-  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;
-  m_lastread = size;
-
-  return *this;
+  return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()];
 }
 
-size_t wxMemoryStreamBase::SeekI(int pos, wxWhenceType whence)
+size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
+{ 
+  size_t bufsize = m_i_streambuf->GetBufferEnd() - m_i_streambuf->GetBufferStart();
+  size_t oldpos = m_i_streambuf->GetIntPosition();
+  m_i_streambuf->Read(buffer, nbytes);
+  size_t newpos = m_i_streambuf->GetIntPosition();
+  if (newpos == 0) return bufsize - oldpos;
+  else return newpos - oldpos;
+}
+
+off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-  if (m_iolimit == 2)
-    return 0;
+  return m_i_streambuf->Seek(pos, mode);
+}
 
-  switch (whence) {
-  case wxBeginPosition:
-    if ((size_t)pos > m_length)
-      return m_position_i;
-    return (m_position_i = pos);
+off_t wxMemoryInputStream::OnSysTell() const
+{
+  return m_i_streambuf->Tell();
+}
 
-  case wxCurrentPosition:
-    if ((size_t)(m_position_i+pos) > m_length)
-      return m_position_i;
+// ----------------------------------------------------------------------------
+// wxMemoryOutputStream
+// ----------------------------------------------------------------------------
 
-    return (m_position_i += pos);
+wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
+  : wxOutputStream()
+{
+  m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
+  if (data)
+    m_o_streambuf->SetBufferIO(data, data+len);
+  m_o_streambuf->Fixed(FALSE);
+  m_o_streambuf->Flushable(FALSE);
+}
 
-  case wxEndPosition:
-    if ((size_t)(m_length-pos) > m_length)
-      return m_position_i;
+wxMemoryOutputStream::~wxMemoryOutputStream()
+{
+  delete m_o_streambuf;
+}
 
-    return (m_position_i = m_length-pos);
-  }
+size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
+{
+  size_t bufsize = m_o_streambuf->GetBufferEnd() - m_o_streambuf->GetBufferStart();
+  size_t oldpos = m_o_streambuf->GetIntPosition();
+  m_o_streambuf->Write(buffer, nbytes);
+  size_t newpos = m_o_streambuf->GetIntPosition();
+  if (newpos == 0) return bufsize - oldpos;
+  else return newpos - oldpos;
+}
 
-  return m_position_i;
+off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+  return m_o_streambuf->Seek(pos, mode);
 }
 
-wxOutputStream& wxMemoryStreamBase::Write(const void *buffer, size_t size)
+off_t wxMemoryOutputStream::OnSysTell() const
 {
-  if (m_iolimit == 1) {
-    m_bad = TRUE;
-    return *this;
-  }
-  
-  if (m_position_o+size > m_length)
-    if (!ChangeBufferSize(m_position_o+size)) {
-      m_bad = TRUE;
-      return *this;
-    }
-
-  memcpy(m_buffer+m_position_o, buffer, size);
-  m_position_o += size;
-  m_lastwrite = size;
-
-  return *this;
+  return m_o_streambuf->Tell();
 }
 
-size_t wxMemoryStreamBase::SeekO(int pos, wxWhenceType whence)
+size_t wxMemoryOutputStream::CopyTo(char *buffer, size_t len) const
 {
-  if (m_iolimit == 2)
+  if (!buffer)
     return 0;
 
-  switch (whence) {
-  case wxBeginPosition:
-    if ((size_t)pos > m_length)
-      return m_position_o;
-    return (m_position_o = pos);
-
-  case wxCurrentPosition:
-    if ((size_t)(m_position_o+pos) > m_length)
-      return m_position_o;
+  if (len > GetSize())
+    len = GetSize();
 
-    return (m_position_o += pos);
-
-  case wxEndPosition:
-    if ((size_t)(m_length-pos) > m_length)
-      return m_position_o;
-
-    return (m_position_o = m_length-pos);
-  }
-
-  return m_position_o;
+  memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
+  return len;
 }
 
-bool wxMemoryStreamBase::ChangeBufferSize(size_t new_size)
-{
-  m_length = new_size;
-  if (!m_buffer)
-    m_buffer = (char *)malloc(m_length);
-  else
-    m_buffer = (char *)realloc(m_buffer, m_length);
-
-  return (m_buffer != NULL);
-}
+#endif