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 class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
{ {
public: public:
wxSocketOutputStream(wxSocketBase& s); wxSocketOutputStream(wxSocketBase& s);
virtual ~wxSocketOutputStream(); virtual ~wxSocketOutputStream();
wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) protected:
{ return -1; } wxSocketBase *m_o_socket;
wxFileOffset TellO() const
{ return -1; }
protected: size_t OnSysWrite(const void *buffer, size_t bufsize);
wxSocketBase *m_o_socket;
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); wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);
}; };
class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
{ {
public: public:
wxSocketInputStream(wxSocketBase& s); wxSocketInputStream(wxSocketBase& s);
virtual ~wxSocketInputStream(); virtual ~wxSocketInputStream();
wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) protected:
{ return -1; } wxSocketBase *m_i_socket;
wxFileOffset TellI() const
{ return -1; }
protected: size_t OnSysRead(void *buffer, size_t bufsize);
wxSocketBase *m_i_socket;
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); wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);
}; };
@@ -58,11 +61,11 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream, class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
public wxSocketOutputStream public wxSocketOutputStream
{ {
public: public:
wxSocketStream(wxSocketBase& s); wxSocketStream(wxSocketBase& s);
virtual ~wxSocketStream(); virtual ~wxSocketStream();
wxDECLARE_NO_COPY_CLASS(wxSocketStream); wxDECLARE_NO_COPY_CLASS(wxSocketStream);
}; };
#endif #endif

8
src/common/imagbmp.cpp
View File

@@ -1280,11 +1280,11 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
int iSel = wxNOT_FOUND; int iSel = wxNOT_FOUND;
// remember how many bytes we read from the stream: // remember how many bytes we read from the stream:
wxFileOffset offset = sizeof(IconDir); wxFileOffset alreadySeeked = sizeof(IconDir);
for (unsigned int i = 0; i < nIcons; i++ ) for (unsigned int i = 0; i < nIcons; i++ )
{ {
offset += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead(); alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();
// bHeight and bColorCount are wxUint8 // bHeight and bColorCount are wxUint8
if ( pCurrentEntry->bWidth >= wMax ) if ( pCurrentEntry->bWidth >= wMax )
@@ -1322,8 +1322,8 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
// NOTE: seeking a positive amount in wxFromCurrent mode allows us to // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
// load even non-seekable streams (see wxInputStream::SeekI docs)! // load even non-seekable streams (see wxInputStream::SeekI docs)!
if (stream.SeekI(wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - offset, wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked;
wxFromCurrent) == wxInvalidOffset) if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
return false; return false;
bResult = LoadDib(image, stream, true, IsBmp); bResult = LoadDib(image, stream, true, IsBmp);