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

fix loading ICO from socket stream: override OnSysTell and OnSysSeek rather than directly SeekO/I or TellO/I; in wxICOHandler only call SeekI() if we have a non-null seek offset

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-06-01 13:56:41 +00:00
parent 77782a5c5f
commit a9a2485d64
2 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
include/wx/sckstrm.h
View File

@@ -19,38 +19,41 @@
class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
{
public:
wxSocketOutputStream(wxSocketBase& s);
virtual ~wxSocketOutputStream();
public:
wxSocketOutputStream(wxSocketBase& s);
virtual ~wxSocketOutputStream();
wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
wxFileOffset TellO() const
{ return -1; }
protected:
wxSocketBase *m_o_socket;
protected:
wxSocketBase *m_o_socket;
size_t OnSysWrite(const void *buffer, size_t bufsize);
size_t OnSysWrite(const void *buffer, size_t bufsize);
// socket streams are both un-seekable and size-less streams:
wxFileOffset OnSysTell() const
{ return wxInvalidOffset; }
wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode))
{ return wxInvalidOffset; }
wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);
};
class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
{
public:
wxSocketInputStream(wxSocketBase& s);
virtual ~wxSocketInputStream();
public:
wxSocketInputStream(wxSocketBase& s);
virtual ~wxSocketInputStream();
wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
wxFileOffset TellI() const
{ return -1; }
protected:
wxSocketBase *m_i_socket;
protected:
wxSocketBase *m_i_socket;
size_t OnSysRead(void *buffer, size_t bufsize);
size_t OnSysRead(void *buffer, size_t bufsize);
// socket streams are both un-seekable and size-less streams:
wxFileOffset OnSysTell() const
{ return wxInvalidOffset; }
wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode))
{ return wxInvalidOffset; }
wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);
};
@@ -58,11 +61,11 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
public wxSocketOutputStream
{
public:
wxSocketStream(wxSocketBase& s);
virtual ~wxSocketStream();
public:
wxSocketStream(wxSocketBase& s);
virtual ~wxSocketStream();
wxDECLARE_NO_COPY_CLASS(wxSocketStream);
wxDECLARE_NO_COPY_CLASS(wxSocketStream);
};
#endif