From 7e134dc10c5412505716891154c67df3ee229efe Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 1 Nov 2006 10:21:24 +0000 Subject: [PATCH] Reverted patch 1476893 pending further investigation (broke Advise in IPC) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/sckstrm.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp index 8b16fcca90..b4498a51d0 100644 --- a/src/common/sckstrm.cpp +++ b/src/common/sckstrm.cpp @@ -41,6 +41,12 @@ wxSocketOutputStream::~wxSocketOutputStream() size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size) { + size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount(); + m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; + return ret; + + // Patch 1476893 caused Advise to hang, needs further investigation +#if 0 const char *buf = (const char *)buffer; size_t count = 0; @@ -63,6 +69,7 @@ size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size) m_lasterror = wxSTREAM_NO_ERROR; return count; +#endif } // --------------------------------------------------------------------------- @@ -80,6 +87,12 @@ wxSocketInputStream::~wxSocketInputStream() size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size) { + size_t ret = m_i_socket->Read((char *)buffer, size).LastCount(); + m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR; + return ret; + + // Patch 1476893 caused Advise to hang, needs further investigation +#if 0 char *buf = (char *)buffer; size_t count = 0; @@ -102,6 +115,7 @@ size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size) m_lasterror = wxSTREAM_NO_ERROR; return count; +#endif } // --------------------------------------------------------------------------- -- 2.45.2