X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c2b2c10ed65dab95f0ec880a4730826f0706a156:/src/common/sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 2fd15c9a78..8b16fcca90 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -1,33 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckstrm.h
+// Name:        src/common/sckstrm.cpp
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sckstrm.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
+#include "wx/sckstrm.h"
+
 #ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #include "wx/stream.h"
 #endif
 
-#if wxUSE_SOCKETS && wxUSE_STREAMS
-
-#include "wx/stream.h"
 #include "wx/socket.h"
-#include "wx/sckstrm.h"
 
 // ---------------------------------------------------------------------------
 // wxSocketOutputStream
@@ -44,11 +41,28 @@ 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;
+    const char *buf = (const char *)buffer;
+    size_t count = 0;
+
+    while ( count < size && m_o_socket->WaitForWrite() )
+    {
+        const size_t ret = m_o_socket->Write(buf, size - count).LastCount();
+
+        buf += ret;
+        count += ret;
+
+        if ( m_o_socket->Error() )
+        {
+            if (m_o_socket->LastError() != wxSOCKET_WOULDBLOCK)
+            {
+                m_lasterror = wxSTREAM_WRITE_ERROR;
+                return count;
+            }
+        }
+    }
+
+    m_lasterror = wxSTREAM_NO_ERROR;
+    return count;
 }
 
 // ---------------------------------------------------------------------------
@@ -66,11 +80,28 @@ 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;
+    char *buf = (char *)buffer;
+    size_t count = 0;
+
+    while ( count < size && m_i_socket->WaitForRead() )
+    {
+        const size_t ret = m_i_socket->Read(buf, size - count).LastCount();
+
+        buf += ret;
+        count += ret;
+
+        if ( m_i_socket->Error() )
+        {
+            if (m_i_socket->LastError() != wxSOCKET_WOULDBLOCK)
+            {
+                m_lasterror = wxSTREAM_READ_ERROR;
+                return count;
+            }
+        }
+    }
+
+    m_lasterror = wxSTREAM_NO_ERROR;
+    return count;
 }
 
 // ---------------------------------------------------------------------------