Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-19 00:55:10 +00:00
parent 69a492c9b2
commit c83b076636
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/mstream.cpp
View File

@@ -52,9 +52,13 @@ char wxMemoryInputStream::Peek()
} }
size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
{ {
m_lastcount = 0; size_t bufsize = m_i_streambuf->GetBufferEnd() - m_i_streambuf->GetBufferStart();
return m_i_streambuf->Read(buffer, nbytes); 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) 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) size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
{ {
m_lastcount = 0; size_t bufsize = m_o_streambuf->GetBufferEnd() - m_o_streambuf->GetBufferStart();
return m_o_streambuf->Write(buffer, nbytes); 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) off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)