X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/841ad0a4a06b03c349cd44e433a1d309fc038d56..03715438eb3d56600ab3cba83fd43bc145978a4b:/src/common/stream.cpp?ds=sidebyside diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 728d50b5cf..1c34deffff 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -82,6 +82,9 @@ size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize) { char *ptrback; + if (m_mode != read) + return 0; + ptrback = AllocSpaceWBack(bufsize); if (!ptrback) return 0; @@ -137,6 +140,7 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize) void wxStreamBuffer::ResetBuffer() { m_stream->m_lasterror = wxStream_NOERROR; + m_stream->m_lastcount = 0; if (m_mode == read) m_buffer_pos = m_buffer_end; else @@ -247,8 +251,8 @@ void wxStreamBuffer::PutChar(char c) return; } - if (!GetDataLeft() && !FlushBuffer()) { - CHECK_ERROR(wxStream_READ_ERR); + if (GetDataLeft() == 0 && !FlushBuffer()) { + CHECK_ERROR(wxStream_WRITE_ERR); return; } @@ -281,6 +285,9 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size) { wxASSERT(m_stream != NULL); + if (m_mode == write) + return 0; + // ------------------ // Buffering disabled // ------------------ @@ -330,6 +337,9 @@ size_t wxStreamBuffer::Read(wxStreamBuffer *s_buf) char buf[BUF_TEMP_SIZE]; size_t s = 0, bytes_read = BUF_TEMP_SIZE; + if (m_mode == write) + return 0; + while (bytes_read == BUF_TEMP_SIZE) { bytes_read = Read(buf, bytes_read); bytes_read = s_buf->Write(buf, bytes_read); @@ -342,6 +352,9 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size) { wxASSERT(m_stream != NULL); + if (m_mode == read) + return 0; + // ------------------ // Buffering disabled // ------------------ @@ -388,6 +401,9 @@ size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf) char buf[BUF_TEMP_SIZE]; size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2; + if (m_mode == read) + return 0; + while (bytes_count == BUF_TEMP_SIZE) { b_count2 = sbuf->Read(buf, bytes_count); bytes_count = Write(buf, b_count2); @@ -736,7 +752,12 @@ wxOutputStream& wxOutputStream::operator<<(const char *string) wxOutputStream& wxOutputStream::operator<<(wxString& string) { +#if wxUSE_UNICODE + const wxWX2MBbuf buf = string.mb_str(); + return *this << buf; +#else return Write(string, string.Len()); +#endif } wxOutputStream& wxOutputStream::operator<<(char c) @@ -748,32 +769,32 @@ wxOutputStream& wxOutputStream::operator<<(short i) { wxString strint; - strint.Printf("%i", i); - return Write(strint, strint.Len()); + strint.Printf(_T("%i"), i); + return *this << strint; } wxOutputStream& wxOutputStream::operator<<(int i) { wxString strint; - strint.Printf("%i", i); - return Write(strint, strint.Len()); + strint.Printf(_T("%i"), i); + return *this << strint; } wxOutputStream& wxOutputStream::operator<<(long i) { wxString strlong; - strlong.Printf("%i", i); - return Write((const char *)strlong, strlong.Len()); + strlong.Printf(_T("%i"), i); + return *this << strlong; } wxOutputStream& wxOutputStream::operator<<(double f) { wxString strfloat; - strfloat.Printf("%f", f); - return Write(strfloat, strfloat.Len()); + strfloat.Printf(_T("%f"), f); + return *this << strfloat; } #if wxUSE_SERIAL