* wxStream fixes.

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

diff --git a/src/common/fstream.cpp b/src/common/fstream.cpp
index 3d0468bbb937e720db5f51e2679cb11799a2588b..69bb1ea670d1aa5e08f12cffdca5761f61d2f6cd 100644 (file)
--- a/src/common/fstream.cpp
+++ b/src/common/fstream.cpp
@@ -44,10 +44,7 @@ char wxFileInputStream::Peek()
 
 size_t wxFileInputStream::DoRead(void *buffer, size_t size)
 {
-  size_t ret = wxFile::Read(buffer, size);
-  m_eof = wxFile::Eof();
-
-  return ret;
+  return wxFile::Read(buffer, size);
 }
 
 off_t wxFileInputStream::DoSeekInput(off_t pos, wxSeekMode mode)

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 34b9f1be7d2d3176164effca20d1e5e8da35a079..dda5f6446bee5ba0e264eb2fb20d85bd4655cdf6 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -59,31 +59,37 @@ void wxStreamBuffer::WriteBack(char c)
 
 void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
 {
-  m_buffer_pos  = m_buffer_start = buffer_start;
-  m_buffer_end  = buffer_end;
+  size_t ret;
+
+  m_buffer_start = buffer_start;
+  m_buffer_end   = buffer_end;
 
   m_buffer_size = m_buffer_end-m_buffer_start;
+
+  if (m_istream) {
+    ret = m_istream->DoRead(m_buffer_start, m_buffer_size);
+    m_buffer_end = m_buffer_start + ret;
+  }
+  m_buffer_pos = m_buffer_start;
 }
 
 void wxStreamBuffer::SetBufferIO(size_t bufsize)
 {
-  if (m_buffer_start)
-    delete[] m_buffer_start;
+  char *b_start;
+
+  wxDELETE(m_buffer_start);
 
   if (!bufsize) {
     m_buffer_start = NULL;
     m_buffer_end = NULL;
     m_buffer_pos = NULL;
     m_buffer_size = 0;
+    return;
   }
 
-  m_buffer_start = new char[bufsize];
-  m_buffer_end   = m_buffer_start + bufsize;
-  if (m_istream)
-    m_buffer_pos = m_buffer_end;
-  else
-    m_buffer_pos = m_buffer_start;
-  m_buffer_size  = bufsize;
+  b_start = new char[bufsize];
+
+  SetBufferIO(b_start, b_start + bufsize);
 }
 
 void wxStreamBuffer::ResetBuffer()
@@ -125,9 +131,10 @@ void wxStreamBuffer::Read(void *buffer, size_t size)
 
       read_ret = m_istream->DoRead(m_buffer_start, m_buffer_size);
 
-      // Read failed
+      // Read failed: EOF
       if (read_ret == 0) {
         m_istream->m_lastread = orig_size-size;
+        m_istream->m_eof = TRUE;
         m_buffer_pos = m_buffer_end = m_buffer_start;
         return;
       } else {
@@ -361,25 +368,30 @@ wxInputStream& wxInputStream::operator>>(wxObject *& obj)
 
 off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
-  off_t ret_off;
+  off_t ret_off, diff, last_access;
+
+  last_access = m_i_streambuf->GetLastAccess();
 
   switch (mode) {
   case wxFromStart:
-    if ( (unsigned)abs (DoTellInput()-pos) > m_i_streambuf->GetLastAccess()  ) {
+    diff = DoTellInput() - pos;
+    if ( diff < 0 || diff > last_access  ) {
       ret_off = DoSeekInput(pos, wxFromStart);
       m_i_streambuf->ResetBuffer();
       return ret_off;
     } else {
-      m_i_streambuf->SetIntPosition(DoTellInput() - pos);
+      m_i_streambuf->SetIntPosition(last_access - diff);
       return pos;
     }
   case wxFromCurrent:
-    if ( ((unsigned)pos > m_i_streambuf->GetLastAccess()) || (pos < 0) ) {
+    diff = pos + m_i_streambuf->GetIntPosition();
+
+    if ( (diff > last_access) || (diff < 0) ) {
       ret_off = DoSeekInput(pos, wxFromCurrent);
       m_i_streambuf->ResetBuffer();
       return ret_off;
     } else {
-      m_i_streambuf->SetIntPosition(pos);
+      m_i_streambuf->SetIntPosition(diff);
       return pos;
     }
   case wxFromEnd: