Fix socket error reporting on Windows

runtime/bin/eventhandler_win.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/eventhandler.h"
 
 #include <process.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <mswsock.h>
@@ skipping 243 matching lines @@
                        buffer->GetBufferStart(),
                        buffer->GetBufferSize(),
                        NULL,
                        buffer->GetCleanOverlapped());
     if (ok || GetLastError() == ERROR_IO_PENDING) {
       // Completing asynchronously.
       pending_read_ = buffer;
       return true;
     }
     IOBuffer::DisposeBuffer(buffer);
-
-    if (GetLastError() == ERROR_BROKEN_PIPE) {
-      event_handler_->HandleClosed(this);
-    } else {
-      event_handler_->HandleError(this);
-    }
+    HandleIssueError();
     return false;
   } else {
     // Completing asynchronously through thread.
     pending_read_ = buffer;
     uint32_t tid;
     uintptr_t thread_handle =
         _beginthreadex(NULL, 32 * 1024, ReadFileThread, this, 0, &tid);
     if (thread_handle == -1) {
       FATAL("Failed to start read file thread");
     }
@@ skipping 14 matching lines @@
                       buffer->GetBufferStart(),
                       buffer->GetBufferSize(),
                       NULL,
                       buffer->GetCleanOverlapped());
   if (ok || GetLastError() == ERROR_IO_PENDING) {
     // Completing asynchronously.
     pending_write_ = buffer;
     return true;
   }
   IOBuffer::DisposeBuffer(buffer);
+  HandleIssueError();
+  return false;
+}
 
-  if (GetLastError() == ERROR_BROKEN_PIPE) {
+
+void Handle::HandleIssueError() {
+  DWORD error = GetLastError();
+  if (error == ERROR_BROKEN_PIPE) {
     event_handler_->HandleClosed(this);
   } else {
     event_handler_->HandleError(this);
   }
-  return false;
+  SetLastError(error);
 }
 
 
 void FileHandle::EnsureInitialized(EventHandlerImplementation* event_handler) {
   ScopedLock lock(this);
   event_handler_ = event_handler;
   if (SupportsOverlappedIO() && completion_port_ == INVALID_HANDLE_VALUE) {
     CreateCompletionPort(event_handler_->completion_port());
   }
 }
 
 
 bool FileHandle::IsClosed() {
   return false;
 }
 
 
 void FileHandle::AfterClose() {
 }
 
 
+void SocketHandle::HandleIssueError() {
+  int error = WSAGetLastError();
+  if (error == WSAECONNRESET) {
+    event_handler_->HandleClosed(this);
+  } else {
+    event_handler_->HandleError(this);
+  }
+  WSASetLastError(error);
+}
+
+
 bool ListenSocket::LoadAcceptEx() {
   // Load the AcceptEx function into memory using WSAIoctl.
   // The WSAIoctl function is an extension of the ioctlsocket()
   // function that can use overlapped I/O. The function's 3rd
   // through 6th parameters are input and output buffers where
   // we pass the pointer to our AcceptEx function. This is used
   // so that we can call the AcceptEx function directly, rather
   // than refer to the Mswsock.lib library.
   GUID guid_accept_ex = WSAID_ACCEPTEX;
   DWORD bytes;
@@ skipping 215 matching lines @@
                    NULL,
                    &flags,
                    buffer->GetCleanOverlapped(),
                    NULL);
   if (rc == NO_ERROR || WSAGetLastError() == WSA_IO_PENDING) {
     pending_read_ = buffer;
     return true;
   }
   IOBuffer::DisposeBuffer(buffer);
   pending_read_ = NULL;
-
-  if (WSAGetLastError() == WSAECONNRESET) {
-    event_handler_->HandleClosed(this);
-  } else {
-    event_handler_->HandleError(this);
-  }
+  HandleIssueError();
   return false;
 }
 
 
 bool ClientSocket::IssueWrite() {
   ScopedLock lock(this);
   ASSERT(completion_port_ != INVALID_HANDLE_VALUE);
   ASSERT(pending_write_ != NULL);
   ASSERT(pending_write_->operation() == IOBuffer::kWrite);
 
   int rc = WSASend(socket(),
                    pending_write_->GetWASBUF(),
                    1,
                    NULL,
                    0,
                    pending_write_->GetCleanOverlapped(),
                    NULL);
   if (rc == NO_ERROR || WSAGetLastError() == WSA_IO_PENDING) {
     return true;
   }
   IOBuffer::DisposeBuffer(pending_write_);
   pending_write_ = NULL;
-
-  if (WSAGetLastError() == WSAECONNRESET) {
-    event_handler_->HandleClosed(this);
-  } else {
-    event_handler_->HandleError(this);
-  }
+  HandleIssueError();
   return false;
 }
 
 
 void ClientSocket::EnsureInitialized(
     EventHandlerImplementation* event_handler) {
   ScopedLock lock(this);
   if (completion_port_ == INVALID_HANDLE_VALUE) {
     ASSERT(event_handler_ == NULL);
     event_handler_ = event_handler;
@@ skipping 327 matching lines @@
   // Initialize Winsock32
   if (!Socket::Initialize()) {
     FATAL("Failed to initialized Windows sockets");
   }
 }
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }