X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56dc1ffd50dac2369237e528abca6c12ea179c19..c13cace12594b37706e9520a6fbd602c949f8127:/src/common/mstream.cpp

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index aed7cae179..b0f1ab6a1a 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -51,10 +51,25 @@ char wxMemoryInputStream::Peek()
   return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()];
 }
 
+bool wxMemoryInputStream::Eof() const
+{
+    return m_i_streambuf->GetBufferPos() == m_i_streambuf->GetBufferEnd();
+}
+
 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
 {
-  m_lastcount = 0;
-  return m_i_streambuf->Read(buffer, nbytes);
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_EOF;
+
+        return 0;
+    }
+
+    m_i_streambuf->Read(buffer, nbytes);
+    m_lasterror = wxSTREAM_NOERROR;
+
+    return m_i_streambuf->GetIntPosition() - pos;
 }
 
 off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
@@ -88,8 +103,12 @@ wxMemoryOutputStream::~wxMemoryOutputStream()
 
 size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
 {
-  m_lastcount = 0;
-  return m_o_streambuf->Write(buffer, 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;
 }
 
 off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)