Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New wxStream classes: wxStreamBuffer and wxObject*Stream.

Browse Source 
* Changes: ofsInvalid => wxInvalidOffset in filefn.h
* Updates: all wxStream classes use wxStreamBuffer.
           wxObject basic declaration changes (added LoadObject, modified
           StoreObject)
* Some base of the serialization.
(I hope not to have forgotten any files)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-07-24 17:13:47 +00:00
parent 439b3bf1f5
commit 1678ad7802
13 changed files with 324 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/file.h
View File

@@ -21,6 +21,8 @@
#include "wx/filefn.h"
// ----------------------------------------------------------------------------
<<<<<<< file.h
=======
// constants
// ----------------------------------------------------------------------------
@@ -45,6 +47,7 @@ const off_t ofsInvalid = (off_t)-1;
#define wxS_DEFAULT (wxS_IRUSR | wxS_IWUSR | wxS_IRGRP | wxS_IROTH)
// ----------------------------------------------------------------------------
>>>>>>> 1.7
// class wxFile: raw file IO
//
// NB: for space efficiency this class has no virtual functions, including
@@ -75,6 +78,11 @@ public:
wxFile(int fd) { m_fd = fd; }
// open/close
<<<<<<< file.h
bool Create(const char *szFileName, bool bOverwrite = FALSE);
bool Open(const char *szFileName, OpenMode mode = read);
inline bool Close(); // Close is a NOP if not opened
=======
// create a new file (with the default value of bOverwrite, it will fail if
// the file already exists, otherwise it will overwrite it and succeed)
bool Create(const char *szFileName, bool bOverwrite = FALSE,
@@ -82,6 +90,7 @@ public:
bool Open(const char *szFileName, OpenMode mode = read,
int access = wxS_DEFAULT);
bool Close(); // Close is a NOP if not opened
>>>>>>> 1.7
// assign an existing file descriptor and get it back from wxFile object
void Attach(int fd) { Close(); m_fd = fd; }

3
include/wx/filefn.h
View File

@@ -29,6 +29,8 @@
#define off_t _off_t
#endif
const off_t wxInvalidOffset = (off_t)-1;
typedef enum {
wxFromStart,
wxFromCurrent,
@@ -71,7 +73,6 @@ void WXDLLEXPORT wxUnix2DosFilename(char *s);
// Strip the extension, in situ
void WXDLLEXPORT wxStripExtension(char *buffer);
void WXDLLEXPORT wxStripExtension(wxString& buffer);
// Get a temporary filename, opening and closing the file.
char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = NULL);

35
include/wx/fstream.h
View File

@@ -16,51 +16,44 @@
#include <wx/stream.h>
#include <wx/file.h>
class wxFileInputStream: virtual public wxFile, public wxInputStream {
class wxFileInputStream: public wxInputStream, virtual public wxFile {
public:
wxFileInputStream(const wxString& fileName);
virtual ~wxFileInputStream();
wxInputStream& Read(void *buffer, size_t size);
off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellI() const;
virtual char Peek();
bool Eof() const { return m_eof; }
size_t LastRead() const { return m_lastread; }
virtual bool Eof() const { return wxFile::Eof(); }
bool Ok() const { return wxFile::IsOpened(); }
protected:
wxFileInputStream() {}
protected:
bool m_eof;
bool m_ok_i;
size_t m_lastread;
size_t DoRead(void *buffer, size_t size);
off_t DoSeekInput(off_t pos, wxSeekMode mode);
off_t DoTellInput() const;
};
class wxFileOutputStream: virtual wxFile, public wxOutputStream {
class wxFileOutputStream: public wxOutputStream, virtual public wxFile {
public:
wxFileOutputStream(const wxString& fileName);
virtual ~wxFileOutputStream();
wxOutputStream& Write(const void *buffer, size_t size);
off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellO() const;
bool Bad() const { return m_bad; }
size_t LastWrite() const { return m_lastwrite; }
// To solve an ambiguity on GCC
inline wxOutputStream& Write(const void *buffer, size_t size)
{ return wxOutputStream::Write(buffer, size); }
void Sync();
bool IsOpened() const { return wxFile::IsOpened(); }
bool Ok() const { return wxFile::IsOpened(); }
protected:
wxFileOutputStream() {}
protected:
bool m_bad;
size_t m_lastwrite;
size_t DoWrite(const void *buffer, size_t size);
off_t DoSeekOutput(off_t pos, wxSeekMode mode);
off_t DoTellOutput() const;
};
class wxFileStream: public wxFileInputStream, public wxFileOutputStream {

34
include/wx/mstream.h
View File

@@ -31,18 +31,15 @@ class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStre
public:
wxMemoryInputStream(const char *data, size_t length);
virtual ~wxMemoryInputStream();
wxInputStream& Read(void *buffer, size_t size);
off_t SeekI(off_t pos, wxSeekMode mode);
off_t TellI() const { return m_position_i; }
bool Eof() const { return m_eof; }
size_t LastRead() const { return m_lastread; }
protected:
bool m_eof;
size_t DoRead(void *buffer, size_t size);
off_t DoSeekInput(off_t pos, wxSeekMode mode);
off_t DoTellInput() const { return m_position_i; }
protected:
off_t m_position_i;
size_t m_lastread;
};
class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
@@ -50,20 +47,17 @@ class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputSt
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
virtual ~wxMemoryOutputStream();
wxOutputStream& Write(const void *buffer, size_t size);
off_t SeekO(off_t pos, wxSeekMode mode);
off_t TellO() const { return m_position_o; }
bool Bad() const { return m_bad; }
size_t LastWrite() const { return m_lastwrite; }
char *GetData() { return m_buffer; }
size_t GetLength() { return m_length; }
char *GetData() { Sync(); return m_buffer; }
size_t GetLength() { Sync(); return m_length; }
protected:
size_t DoWrite(const void *buffer, size_t size);
off_t DoSeekOutput(off_t pos, wxSeekMode mode);
off_t DoTellOutput() const { return m_position_o; }
protected:
bool m_bad;
off_t m_position_o;
size_t m_lastwrite;
};
class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {

57
include/wx/object.h
View File

@@ -29,9 +29,10 @@ class WXDLLEXPORT wxObject;
#endif
class WXDLLEXPORT wxClassInfo;
class WXDLLIMPORT istream;
class WXDLLIMPORT ostream;
class WXDLLEXPORT ostream;
class WXDLLEXPORT wxInputStream;
class WXDLLIMPORT wxObjectInputStream;
class WXDLLIMPORT wxObjectOutputStream;
/*
* Dynamic object system declarations
@@ -39,10 +40,6 @@ class WXDLLIMPORT ostream;
typedef wxObject * (*wxObjectConstructorFn) (void);
#ifdef USE_STORABLE_CLASSES
typedef wxObject* (*wxStorableConstructorFn) ( istream &stream, char *data );
#endif
class WXDLLEXPORT wxClassInfo
{
public:
@@ -52,10 +49,6 @@ class WXDLLEXPORT wxClassInfo
int objectSize;
wxObjectConstructorFn objectConstructor;
#ifdef USE_STORABLE_CLASSES
wxStorableConstructorFn storableConstructor;
#endif
// Pointers to base wxClassInfos: set in InitializeClasses
// called from wx_main.cc
wxClassInfo *baseInfo1;
@@ -64,19 +57,10 @@ class WXDLLEXPORT wxClassInfo
static wxClassInfo *first;
wxClassInfo *next;
#ifdef USE_STORABLE_CLASSES
wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn,
wxStorableConstructorFn stoFn = NULL );
#else
wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
#endif
wxObject *CreateObject(void);
#ifdef USE_STORABLE_CLASSES
wxObject* CreateObject( istream &stream, char *data );
#endif
inline char *GetClassName(void) const { return className; }
inline char *GetBaseClassName1(void) const { return baseClassName1; }
inline char *GetBaseClassName2(void) const { return baseClassName2; }
@@ -91,7 +75,7 @@ class WXDLLEXPORT wxClassInfo
wxObject* WXDLLEXPORT wxCreateDynamicObject(char *name);
#ifdef USE_STORABLE_CLASSES
wxObject* WXDLLEXPORT wxCreateStoredObject( char *name, istream &stream, char *data );
wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
#endif
#define DECLARE_DYNAMIC_CLASS(name) \
@@ -103,10 +87,6 @@ wxObject* WXDLLEXPORT wxCreateStoredObject( char *name, istream &stream, char *d
#define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#ifdef USE_STORABLE_CLASSES
#define DECLARE_STORABLECLASS(name) DECLARE_DYNAMIC_CLASS(name)
#endif
//////
////// for concrete classes
//////
@@ -123,30 +103,6 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
{ return new name; }\
wxClassInfo name::class##name(#name, #basename1, #basename2, sizeof(name), wxConstructorFor##name);
//////
////// for storable classes
//////
#ifdef USE_STORABLE_CLASSES
#define IMPLEMENT_STORABLE_CLASS(name, basename) \
wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\
{ return new name( stream, data ); }\
wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
{ return new name; }\
wxClassInfo name::class##name(#name, #basename, NULL, sizeof(name), wxConstructorFor##name,\
wxStorableConstructorFor##name );
#define IMPLEMENT_STORABLE_CLASS2(name, basename1, basename2) \
wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\
{ return new name( stream, data ); }\
wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
{ return new name; }\
wxClassInfo name::class##name(#name, #basename1, basename2, sizeof(name), wxConstructorFor##name,\
wxStorableConstructorFor##name );
#endif
//////
////// for abstract classes
//////
@@ -223,7 +179,8 @@ class WXDLLEXPORT wxObject
#endif
#ifdef USE_STORABLE_CLASSES
virtual void StoreObject( ostream &WXUNUSED(stream) ) {};
virtual void StoreObject( wxObjectOutputStream &WXUNUSED(stream) ) {};
virtual void LoadObject( wxObjectInputStream &WXUNUSED(stream) ) {};
#endif
// make a 'clone' of the object

163
include/wx/stream.h
View File

@@ -19,84 +19,187 @@
#include <stdio.h>
#include "wx/object.h"
#include "wx/string.h"
#include "wx/filefn.h" // for off_t and wxSeekMode
#include "wx/filefn.h" // for off_t, wxInvalidOffset and wxSeekMode
class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxOutputStream;
typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
wxOutputStream& WXDLLEXPORT wxEndL(wxOutputStream& o_stream);
class WXDLLEXPORT wxStreamBuffer {
public:
wxStreamBuffer(wxInputStream& stream);
wxStreamBuffer(wxOutputStream& stream);
~wxStreamBuffer();
void Read(void *buffer, size_t size);
void Write(const void *buffer, size_t size);
void WriteBack(char c);
void SetBufferIO(char *buffer_start, char *buffer_end);
void SetBufferIO(size_t bufsize);
void ResetBuffer();
void SetBufferPosition(char *buffer_position)
{ m_buffer_pos = buffer_position; }
void SetIntPosition(size_t pos)
{ m_buffer_pos = m_buffer_start + pos; }
char *GetBufferPosition() const { return m_buffer_pos; }
size_t GetIntPosition() const { return m_buffer_pos - m_buffer_start; }
char *GetBufferStart() const { return m_buffer_start; }
char *GetBufferEnd() const { return m_buffer_end; }
size_t GetBufferSize() const { return m_buffer_size; }
size_t GetLastAccess() const { return m_buffer_end - m_buffer_start; }
protected:
char *m_buffer_start, *m_buffer_end, *m_buffer_pos;
size_t m_buffer_size;
wxInputStream *m_istream;
wxOutputStream *m_ostream;
};
/*
* wxStream: base classes
*/
class wxOutputStream;
class wxInputStream {
class WXDLLEXPORT wxInputStream {
public:
wxInputStream();
virtual ~wxInputStream();
virtual wxInputStream& Read(void *buffer, size_t size) = 0;
// IO functions
virtual char Peek() = 0;
virtual char GetC();
virtual wxInputStream& Read(void *buffer, size_t size);
wxInputStream& Read(wxOutputStream& stream_out);
virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart) = 0;
virtual off_t TellI() const = 0;
// Position functions
off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellI() const;
virtual bool Eof() const = 0;
virtual size_t LastRead() const = 0;
// State functions
bool Eof() const { return m_eof; }
size_t LastRead() { return m_lastread; }
wxStreamBuffer *InputStreamBuffer() { return m_i_streambuf; }
// Operators
wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
wxInputStream& operator>>(wxString& line);
wxInputStream& operator>>(char& c);
wxInputStream& operator>>(short& i);
wxInputStream& operator>>(long& i);
wxInputStream& operator>>(float& i);
wxInputStream& operator>>( __wxInputManip func) { return func(*this); }
protected:
friend class wxStreamBuffer;
friend class wxFilterInputStream;
wxInputStream(wxStreamBuffer *buffer);
virtual size_t DoRead(void *buffer, size_t size) = 0;
virtual off_t DoSeekInput(off_t pos, wxSeekMode mode) = 0;
virtual off_t DoTellInput() const = 0;
protected:
bool m_eof, m_i_destroybuf;
size_t m_lastread;
wxStreamBuffer *m_i_streambuf;
};
class wxOutputStream {
class WXDLLEXPORT wxOutputStream {
public:
wxOutputStream();
virtual ~wxOutputStream();
virtual wxOutputStream& Write(const void *buffer, size_t size) = 0;
virtual wxOutputStream& Write(const void *buffer, size_t size);
wxOutputStream& Write(wxInputStream& stream_in);
virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart) = 0;
virtual off_t TellO() const = 0;
virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
virtual off_t TellO() const;
virtual bool Bad() const = 0;
virtual size_t LastWrite() const = 0;
virtual bool Bad() const { return m_bad; }
virtual size_t LastWrite() const { return m_lastwrite; }
wxStreamBuffer *OutputStreamBuffer() { return m_o_streambuf; }
virtual void Sync() {}
virtual void Sync();
wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }
wxOutputStream& operator<<(const char *string);
wxOutputStream& operator<<(wxString& string);
wxOutputStream& operator<<(char c);
wxOutputStream& operator<<(short i);
wxOutputStream& operator<<(int i);
wxOutputStream& operator<<(long i);
wxOutputStream& operator<<(double f);
wxOutputStream& operator<<(float f) { return operator<<((double)f); }
wxOutputStream& operator<<(unsigned char c) { return operator<<((char)c); }
wxOutputStream& operator<<(unsigned short i) { return operator<<((short)i); }
wxOutputStream& operator<<(unsigned int i) { return operator<<((int)i); }
wxOutputStream& operator<<(unsigned long i) { return operator<<((long)i); }
wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
protected:
friend class wxStreamBuffer;
friend class wxFilterOutputStream;
wxOutputStream(wxStreamBuffer *buffer);
virtual size_t DoWrite(const void *buffer, size_t size) = 0;
virtual off_t DoSeekOutput(off_t pos, wxSeekMode mode) = 0;
virtual off_t DoTellOutput() const = 0;
protected:
bool m_bad, m_o_destroybuf;
size_t m_lastwrite;
wxStreamBuffer *m_o_streambuf;
};
/*
* "Filter" streams
*/
class wxFilterInputStream: public wxInputStream {
class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
public:
wxFilterInputStream(wxInputStream& stream);
virtual ~wxFilterInputStream();
virtual wxInputStream& Read(void *buffer, size_t size)
{ return m_parent_i_stream->Read(buffer, size); }
virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart)
{ return m_parent_i_stream->SeekI(pos, mode); }
virtual off_t TellI() const
{ return m_parent_i_stream->TellI(); }
virtual char Peek() { return m_parent_i_stream->Peek(); }
virtual bool Eof() const { return m_parent_i_stream->Eof(); }
virtual size_t LastRead() const { return m_parent_i_stream->LastRead(); }
protected:
virtual size_t DoRead(void *buffer, size_t size);
virtual off_t DoSeekInput(off_t pos, wxSeekMode mode);
virtual off_t DoTellInput() const;
protected:
wxInputStream *m_parent_i_stream;
};
class wxFilterOutputStream: public wxOutputStream {
class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
public:
wxFilterOutputStream(wxOutputStream& stream);
virtual ~wxFilterOutputStream();
virtual wxOutputStream& Write(const void *buffer, size_t size)
{ return m_parent_o_stream->Write(buffer, size); }
virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart)
{ return m_parent_o_stream->SeekO(pos, mode); }
virtual off_t TellO() const
{ return m_parent_o_stream->TellO(); }
virtual bool Bad() const { return m_parent_o_stream->Bad(); }
virtual size_t LastWrite() const { return m_parent_o_stream->LastWrite(); }
protected:
// The forward is implicitely done by wxStreamBuffer.
virtual size_t DoWrite(const void *buffer, size_t size);
virtual off_t DoSeekOutput(off_t pos, wxSeekMode mode);
virtual off_t DoTellOutput() const;
protected:
wxOutputStream *m_parent_o_stream;
};

26
include/wx/zstream.h
View File

@@ -16,25 +16,23 @@
#endif
#include <wx/stream.h>
#include "../../src/zlib/zlib.h"
#include "zlib.h"
class wxZlibInputStream: public wxFilterInputStream {
public:
wxZlibInputStream(wxInputStream& stream);
virtual ~wxZlibInputStream();
wxInputStream& Read(void *buffer, size_t size);
off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellI() const;
size_t LastRead() const { return m_lastread; }
bool Eof() const;
protected:
size_t m_lastread;
size_t DoRead(void *buffer, size_t size);
off_t DoSeekInput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
off_t DoTellInput() const { return wxInvalidOffset; }
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
bool m_eof;
struct z_stream_s m_inflate;
};
@@ -43,18 +41,18 @@ class wxZlibOutputStream: public wxFilterOutputStream {
wxZlibOutputStream(wxOutputStream& stream);
virtual ~wxZlibOutputStream();
wxOutputStream& Write(const void *buffer, size_t size);
off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellO() const;
void Sync();
size_t LastWrite() const { return m_lastwrite; }
bool Bad() const;
protected:
size_t m_lastwrite;
size_t DoWrite(const void *buffer, size_t size);
off_t DoSeekOutput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
off_t DoTellOutput() const { return wxInvalidOffset; }
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
bool m_bad;
struct z_stream_s m_deflate;
};