X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb4e516dd9774b4d14abedd8229dc4c9bcff8439..0d2a2b601b1994333886dff8f53d82a714c4042f:/src/common/stream.cpp diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 4f24cfc97a..728d50b5cf 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -136,6 +136,7 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize) void wxStreamBuffer::ResetBuffer() { + m_stream->m_lasterror = wxStream_NOERROR; if (m_mode == read) m_buffer_pos = m_buffer_end; else @@ -156,7 +157,7 @@ char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size) if (!temp_b) return NULL; m_wback = temp_b; - printf("Buffer(0x%x)->Write: 0x%x, %d\n", this, m_wback, m_wbacksize); + return (char *)(m_wback+(m_wbacksize-needed_size)); } @@ -164,7 +165,6 @@ size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize) { size_t s_toget = m_wbacksize-m_wbackcur; - printf("Buffer(0x%x): 0x%x, %d\n", this, m_wback, m_wbacksize); if (bsize < s_toget) s_toget = bsize; @@ -285,6 +285,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size) // Buffering disabled // ------------------ + m_stream->m_lasterror = wxStream_NOERROR; m_stream->m_lastcount = GetWBack((char *)buffer, size); size -= m_stream->m_lastcount; if (size == 0) @@ -345,6 +346,7 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size) // Buffering disabled // ------------------ + m_stream->m_lasterror = wxStream_NOERROR; if (!m_buffer_size) return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));