X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a96d2f45fec76a2d0da1c0c7672b62c19280f43..da32743f22ecdf32ff25899ea5f7abcce8d126ea:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 5112d93f6b..b0ef8302a2 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux 
-// Licence:   	wxWindows license
+// Copyright:   (c) Guilhem Lavaux
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -28,8 +28,13 @@
 // wxDataInputStream
 // ---------------------------------------------------------------------------
 
+#if wxUSE_UNICODE
+wxDataInputStream::wxDataInputStream(wxInputStream& s, wxMBConv& conv)
+  : m_input(&s), m_be_order(FALSE), m_conv(conv)
+#else
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
   : m_input(&s), m_be_order(FALSE)
+#endif
 {
 }
 
@@ -37,6 +42,18 @@ wxDataInputStream::~wxDataInputStream()
 {
 }
 
+wxUint64 wxDataInputStream::Read64()
+{
+  wxUint64 i64;
+
+  m_input->Read(&i64, 8);
+
+  if (m_be_order)
+    return wxUINT64_SWAP_ON_LE(i64);
+  else
+    return wxUINT64_SWAP_ON_BE(i64);
+}
+
 wxUint32 wxDataInputStream::Read32()
 {
   wxUint32 i32;
@@ -86,22 +103,29 @@ double wxDataInputStream::ReadDouble()
 
 wxString wxDataInputStream::ReadString()
 {
-  wxString wx_string;
-  char *string;
-  unsigned long len;
+  size_t len;
 
   len = Read32();
-  string = new char[len+1];
 
-  m_input->Read(string, len);
-
-  string[len] = 0;
-  wx_string = string;
-  delete string;
-
-  return wx_string;
+  if (len > 0)
+  {
+#if wxUSE_UNICODE
+    char *tmp = new char[len + 1];
+    m_input->Read(tmp, len);
+    tmp[len] = 0;
+    wxString ret( (const wxChar*) m_conv.cMB2WX(tmp) );
+    delete[] tmp;
+#else
+    wxString ret;
+    m_input->Read( ret.GetWriteBuf(len), len);
+    ret.UngetWriteBuf();
+#endif
+    return ret;
+  }
+  else
+    return wxEmptyString;
 }
-  
+
 wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
 {
   s = ReadString();
@@ -144,6 +168,12 @@ wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
   return *this;
 }
 
+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
+{
+  i = Read64();
+  return *this;
+}
+
 wxDataInputStream& wxDataInputStream::operator>>(double& i)
 {
   i = ReadDouble();
@@ -160,8 +190,13 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f)
 // wxDataOutputStream
 // ---------------------------------------------------------------------------
 
+#if wxUSE_UNICODE
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)
+  : m_output(&s), m_be_order(FALSE), m_conv(conv)
+#else
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
-  : m_output(&s)
+  : m_output(&s), m_be_order(FALSE)
+#endif
 {
 }
 
@@ -169,6 +204,17 @@ wxDataOutputStream::~wxDataOutputStream()
 {
 }
 
+void wxDataOutputStream::Write64(wxUint64 i)
+{
+  wxUint64 i64;
+
+  if (m_be_order)
+    i64 = wxUINT64_SWAP_ON_LE(i);
+  else
+    i64 = wxUINT64_SWAP_ON_BE(i);
+  m_output->Write(&i64, 8);
+}
+
 void wxDataOutputStream::Write32(wxUint32 i)
 {
   wxUint32 i32;
@@ -199,9 +245,15 @@ void wxDataOutputStream::Write8(wxUint8 i)
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
+#if wxUSE_UNICODE
+  const wxWX2MBbuf buf = string.mb_str(m_conv);
+#else
   const wxWX2MBbuf buf = string.mb_str();
-  Write32(string.Length());
-  m_output->Write(buf, string.Len());
+#endif
+  size_t len = strlen(buf);
+  Write32(len);
+  if (len > 0)
+      m_output->Write(buf, len);
 }
 
 // Must be at global scope for VC++ 5
@@ -214,8 +266,10 @@ void wxDataOutputStream::WriteDouble(double d)
 #if wxUSE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
-#  pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
- buf[0] = '\0';
+#ifndef __VMS__
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+   buf[0] = '\0';
 #endif
   m_output->Write(buf, 10);
 }
@@ -227,7 +281,7 @@ wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
   return *this;
 }
 
-wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);
   return *this;
@@ -269,6 +323,12 @@ wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
   return *this;
 }
 
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
+{
+  Write64(i);
+  return *this;
+}
+
 wxDataOutputStream& wxDataOutputStream::operator<<(double f)
 {
   WriteDouble(f);
@@ -283,4 +343,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f)
 
 #endif
   // wxUSE_STREAMS
-  
+