Committing in .

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 5c7ba37d3f3d967e17b8c7c6eb4b69c2211b053d..ed5190b1dc8480c49c0b3b40eac53bd2a987992c 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -27,9 +27,9 @@
 #if wxUSE_STREAMS
 
 #include <ctype.h>
 #if wxUSE_STREAMS
 
 #include <ctype.h>

-#include <wx/stream.h>
-#include <wx/datstrm.h>
-#include <wx/objstrm.h>
+#include "wx/stream.h"
+#include "wx/datstrm.h"
+#include "wx/objstrm.h"

 
 #define BUF_TEMP_SIZE 10000
 
 
 #define BUF_TEMP_SIZE 10000
 


@@ -165,10 +165,17 @@ void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
   size_t s_toput = m_buffer_end-m_buffer_pos;
 
   if (s_toput < size && !m_fixed) {
   size_t s_toput = m_buffer_end-m_buffer_pos;
 
   if (s_toput < size && !m_fixed) {

-    m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size+size);
-    // I round a bit
-    m_buffer_size += size;
-    m_buffer_end = m_buffer_start+m_buffer_size;
+    if (!m_buffer_start)
+      SetBufferIO(size);
+    else {
+      size_t delta = m_buffer_pos-m_buffer_start;
+
+      m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size+size);
+      m_buffer_pos   = m_buffer_start + delta;
+      // I round a bit
+      m_buffer_size += size;
+      m_buffer_end   = m_buffer_start+m_buffer_size;
+    }

     s_toput = size;
   }
   if (s_toput > size)
     s_toput = size;
   }
   if (s_toput > size)


@@ -306,7 +313,7 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
   // ------------------
 
   m_stream->m_lasterror = wxStream_NOERROR;
   // ------------------
 
   m_stream->m_lasterror = wxStream_NOERROR;

-  if (!m_buffer_size)
+  if (!m_buffer_size && m_fixed)

     return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));
 
   // ------------------
     return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));
 
   // ------------------


@@ -320,7 +327,9 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
 
     // First case: the buffer to write is larger than the stream buffer,
     //             we split it
 
     // First case: the buffer to write is larger than the stream buffer,
     //             we split it

-    if (size > buf_left) {
+    // NB: If stream buffer isn't fixed (as for wxMemoryOutputStream),
+    // we always go to the second case.
+    if (size > buf_left && m_fixed) {

       PutToBuffer(buffer, buf_left);
       size -= buf_left;
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
       PutToBuffer(buffer, buf_left);
       size -= buf_left;
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.


@@ -480,7 +489,9 @@ wxInputStream::~wxInputStream()
 char *wxInputStream::AllocSpaceWBack(size_t needed_size)
 {
   char *temp_b;
 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)
   m_wbacksize += needed_size;
 
   if (!m_wback)


@@ -491,8 +502,10 @@ char *wxInputStream::AllocSpaceWBack(size_t needed_size)
   if (!temp_b)
     return NULL;
   m_wback = temp_b;
   if (!temp_b)
     return NULL;
   m_wback = temp_b;

+
+  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 wxInputStream::GetWBack(char *buf, size_t bsize)


@@ -593,6 +606,10 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 
 off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
 
 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);
 }
 
   return OnSysSeek(pos, mode);
 }
 


@@ -677,7 +694,7 @@ size_t wxCountingOutputStream::GetSize() const
   return m_lastcount;
 }
 
   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;
 {
   m_currentPos += size;
   if (m_currentPos > m_lastcount) m_lastcount = m_currentPos;