Trying to fix problem with missing incoming data

Author: nickgammon

doc.cpp

@@ -1162,11 +1162,6 @@ CString str;
 	return TRUE;
 }
 
-void CMUSHclientDoc::ProcessPendingRead() 
-{
-	ReceiveMsg();
-}
-
 // SendMsg sends a message (command) to the MUD.
 // If there is already a queue (for speedwalking etc.) it is placed 
 // at the end of the queue. The message is marked to indicate whether
@@ -1350,15 +1345,18 @@ CString str = strText;
 
 }
 
-void CMUSHclientDoc::ReceiveMsg()
+void CMUSHclientDoc::ReceiveMsg(char * buff, int count)
 {
-char buff [1000];   // must be less than COMPRESS_BUFFER_LENGTH or it won't fit
-int count = m_pSocket->Receive (buff, sizeof (buff) - 1);
 
   Frame.CheckTimerFallback ();   // see if time is up for timers to fire
 
   if (count == SOCKET_ERROR)
     {
+
+    DWORD errcode = GetLastError();
+    if (errcode == WSAEWOULDBLOCK || errcode == 0)
+      return;  // it's ok, nothing to do
+
     // don't delete the socket if we are already closing it
     if (m_iConnectPhase == eConnectDisconnecting)
        return;

doc.h

@@ -1399,15 +1399,14 @@ class CMUSHclientDoc : public CDocument
 // Operations
 public:
 	BOOL ConnectSocket(void);
-	void ProcessPendingRead();
 	void DoSendMsg(const CString& strText, 
                  const bool bEchoIt,
                  const bool bLogIt);
 	void SendMsg(CString strText, 
                const bool bEchoIt,
                const bool bQueueIt,
                const bool bLogIt);
-	void ReceiveMsg();
+	void ReceiveMsg(char * buff, int count);
 	void DisplayMsg(LPCTSTR lpszText, int size, const int flags);
   void AddToLine (LPCTSTR lpszText, const int flags);
   void StartNewLine_KeepPreviousStyle (const int flags);

worldsock.cpp

@@ -29,7 +29,22 @@ CWorldSocket::CWorldSocket(CMUSHclientDoc* pDoc)
 
 void CWorldSocket::OnReceive(int nErrorCode)
 {
-	m_pDoc->ProcessPendingRead();
+
+char buff [1000];   // must be less than COMPRESS_BUFFER_LENGTH or it won't fit
+
+  while (true)
+    {
+    int count = m_pDoc->m_pSocket->Receive (buff, sizeof (buff) - 1);
+	  m_pDoc->ReceiveMsg(buff, count);
+
+    if (count == 0)  // connection closed or nothing left
+      break;
+
+    if (count == SOCKET_ERROR)
+      break;         // some error or other
+
+    } // end of while
+
   CAsyncSocket::OnReceive(nErrorCode);
 }