From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 19 Feb 2000 00:55:10 +0000 (+0000)
Subject: fixed bug in wxMemoryInput/OutputStream::OnSysRead/Write that caused incorrect LastRe... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c83b076636bb068a4c03b6556edb84e325d63690

fixed bug in wxMemoryInput/OutputStream::OnSysRead/Write that caused incorrect LastRead reports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index aed7cae179..b0819a26ce 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -52,9 +52,13 @@ char wxMemoryInputStream::Peek()
 }
 
 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
-{
-  m_lastcount = 0;
-  return m_i_streambuf->Read(buffer, 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)
@@ -88,8 +92,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)