X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c980c992630e94e71139660631a77ffbca8ed958..4fdfb5587f4d6f704336b57bae57cc0268f8768c:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index 85f80d9507..d6f97b7e65 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 28/06/98 // RCS-ID: $Id$ -// Copyright: (c) Guilhem Lavaux +// Copyright: (c) Guilhem Lavaux // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -29,7 +29,7 @@ // --------------------------------------------------------------------------- wxDataInputStream::wxDataInputStream(wxInputStream& s) - : m_input(&s) + : m_input(&s), m_be_order(FALSE) { } @@ -39,31 +39,33 @@ wxDataInputStream::~wxDataInputStream() wxUint32 wxDataInputStream::Read32() { - char buf[4]; + wxUint32 i32; - m_input->Read(buf, 4); + m_input->Read(&i32, 4); - return (wxUint32)buf[0] | - ((wxUint32)buf[1] << 8) | - ((wxUint32)buf[2] << 16) | - ((wxUint32)buf[3] << 24); + if (m_be_order) + return wxUINT32_SWAP_ON_LE(i32); + else + return wxUINT32_SWAP_ON_BE(i32); } wxUint16 wxDataInputStream::Read16() { - char buf[2]; + wxUint16 i16; - m_input->Read(buf, 2); + m_input->Read(&i16, 2); - return (wxUint16)buf[0] | - ((wxUint16)buf[1] << 8); + if (m_be_order) + return wxUINT16_SWAP_ON_LE(i16); + else + return wxUINT16_SWAP_ON_BE(i16); } wxUint8 wxDataInputStream::Read8() { wxUint8 buf; - m_input->Read((char *)&buf, 1); + m_input->Read(&buf, 1); return (wxUint8)buf; } @@ -84,22 +86,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 s(tmp); + delete[] tmp; +#else + wxString s; + m_input->Read(s.GetWriteBuf(len), len); + s.UngetWriteBuf(); +#endif + return s; + } + else + return wxEmptyString; } - + wxDataInputStream& wxDataInputStream::operator>>(wxString& s) { s = ReadString(); @@ -159,7 +168,7 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f) // --------------------------------------------------------------------------- wxDataOutputStream::wxDataOutputStream(wxOutputStream& s) - : m_output(&s) + : m_output(&s), m_be_order(FALSE) { } @@ -169,22 +178,25 @@ wxDataOutputStream::~wxDataOutputStream() void wxDataOutputStream::Write32(wxUint32 i) { - char buf[4]; + wxUint32 i32; - buf[0] = i & 0xff; - buf[1] = (i >> 8) & 0xff; - buf[2] = (i >> 16) & 0xff; - buf[3] = (i >> 24) & 0xff; - m_output->Write(buf, 4); + if (m_be_order) + i32 = wxUINT32_SWAP_ON_LE(i); + else + i32 = wxUINT32_SWAP_ON_BE(i); + m_output->Write(&i32, 4); } void wxDataOutputStream::Write16(wxUint16 i) { - char buf[2]; + wxUint16 i16; + + if (m_be_order) + i16 = wxUINT16_SWAP_ON_LE(i); + else + i16 = wxUINT16_SWAP_ON_BE(i); - buf[0] = i & 0xff; - buf[1] = (i >> 8) & 0xff; - m_output->Write(buf, 2); + m_output->Write(&i16, 2); } void wxDataOutputStream::Write8(wxUint8 i) @@ -195,8 +207,9 @@ void wxDataOutputStream::Write8(wxUint8 i) void wxDataOutputStream::WriteString(const wxString& string) { const wxWX2MBbuf buf = string.mb_str(); - Write32(string.Length()); - m_output->Write(buf, string.Len()); + Write32(string.Len()); + if (string.Len() > 0) + m_output->Write(buf, string.Len()); } // Must be at global scope for VC++ 5 @@ -209,8 +222,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); } @@ -278,4 +293,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f) #endif // wxUSE_STREAMS - +