Fixes for 16-bit compilation

[wxWidgets.git] / src / common / stream.cpp

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index fdfc9123339422458b9a29b0742c56b2db1124ef..6698b43ad89a3f74494f666555ba952d10d3f825 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -195,6 +195,23 @@ void wxStreamBuffer::PutChar(char c)
   m_stream->m_lastcount = 1;
 }
 
+char wxStreamBuffer::Peek()
+{
+  char c;
+
+  wxASSERT(m_stream != NULL && m_buffer_size != 0);
+
+  if (!GetDataLeft()) {
+    CHECK_ERROR(wxStream_READ_ERR);
+    return 0;
+  }
+
+  GetFromBuffer(&c, 1);
+  m_buffer_pos--;
+
+  return c;
+}
+
 char wxStreamBuffer::GetChar()
 {
   char c;
@@ -248,7 +265,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FillBuffer()) {
-        CHECK_ERROR(wxStream_READ_ERR);
+        CHECK_ERROR(wxStream_EOF);
         return (m_stream->m_lastcount = orig_size-size);
       }
     } else {
@@ -463,7 +480,9 @@ wxInputStream::~wxInputStream()
 char *wxInputStream::AllocSpaceWBack(size_t needed_size)
 {
   char *temp_b;
+  size_t old_size;
 
+  old_size = m_wbacksize;
   m_wbacksize += needed_size;
 
   if (!m_wback)
@@ -474,13 +493,16 @@ char *wxInputStream::AllocSpaceWBack(size_t needed_size)
   if (!temp_b)
     return NULL;
   m_wback = temp_b;
+  m_wbackcur += needed_size;
+
+  memmove(m_wback+needed_size, m_wback, old_size);
   
-  return (char *)(m_wback+(m_wbacksize-needed_size));
+  return (char *)(m_wback);
 }
 
 size_t wxInputStream::GetWBack(char *buf, size_t bsize)
 {
-  size_t s_toget = m_wbacksize-m_wbackcur;
+  size_t s_toget = m_wbackcur;
 
   if (!m_wback)
     return 0;
@@ -488,10 +510,10 @@ size_t wxInputStream::GetWBack(char *buf, size_t bsize)
   if (bsize < s_toget)
     s_toget = bsize;
 
-  memcpy(buf, (m_wback+m_wbackcur), s_toget);
+  memcpy(buf, (m_wback+m_wbackcur-bsize), s_toget);
 
-  m_wbackcur += s_toget;
-  if (m_wbackcur == m_wbacksize) {
+  m_wbackcur -= s_toget;
+  if (m_wbackcur == 0) {
     free(m_wback);
     m_wback = (char *)NULL;
     m_wbacksize = 0;
@@ -576,6 +598,10 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 
 off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
+  //should be check and improve, just to remove a slight bug !
+  // I don't know whether it should be put as well in wxFileInputStream::OnSysSeek ?
+  if (m_lasterror==wxSTREAM_EOF) m_lasterror=wxSTREAM_NOERROR;
+
   return OnSysSeek(pos, mode);
 }
 
@@ -660,7 +686,7 @@ size_t wxCountingOutputStream::GetSize() const
   return m_lastcount;
 }
 
-size_t wxCountingOutputStream::OnSysWrite(const void *buffer, size_t size)
+size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer), size_t size)
 {
   m_currentPos += size;
   if (m_currentPos > m_lastcount) m_lastcount = m_currentPos;
@@ -743,6 +769,11 @@ wxBufferedInputStream::~wxBufferedInputStream()
   delete m_i_streambuf;
 }
 
+char wxBufferedInputStream::Peek()
+{
+  return m_i_streambuf->Peek();
+}
+
 wxInputStream& wxBufferedInputStream::Read(void *buffer, size_t size)
 {
   size_t retsize;