Fix previous fix, by still making 'handle' the socket.

runtime/bin/eventhandler_win.cc

 // Copyright (c) 2013, 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 "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/eventhandler.h"
 
 #include <winsock2.h>  // NOLINT
@@ skipping 141 matching lines @@
 void Handle::Lock() {
   EnterCriticalSection(&cs_);
 }
 
 
 void Handle::Unlock() {
   LeaveCriticalSection(&cs_);
 }
 
 
-bool Handle::DoCreateCompletionPort(HANDLE handle, HANDLE completion_port) {
-  completion_port_ = CreateIoCompletionPort(handle,
+bool Handle::CreateCompletionPort(HANDLE completion_port) {
+  completion_port_ = CreateIoCompletionPort(handle(),
                                             completion_port,
                                             reinterpret_cast<ULONG_PTR>(this),
                                             0);
   if (completion_port_ == NULL) {
     return false;
   }
   return true;
 }
 
 
-bool Handle::CreateCompletionPort(HANDLE completion_port) {
-  return DoCreateCompletionPort(handle_, completion_port_);
-}
-
-
 void Handle::Close() {
   ScopedLock lock(this);
   if (!IsClosing()) {
     // Close the socket and set the closing state. This close method can be
     // called again if this socket has pending IO operations in flight.
     MarkClosing();
     // Perform handle type specific closing.
     DoClose();
   }
   ASSERT(IsHandleClosed());
@@ skipping 241 matching lines @@
 
   if (pending_read_ != NULL) {
     CancelIoEx(handle(), pending_read_->GetCleanOverlapped());
     // Don't dispose of the buffer, as it will still complete (with length 0).
   }
 
   DoClose();
 }
 
 
-bool SocketHandle::CreateCompletionPort(HANDLE completion_port) {
-  HANDLE handle = reinterpret_cast<HANDLE>(socket());
-  return DoCreateCompletionPort(handle, completion_port);
-}
-
-
 void SocketHandle::HandleIssueError() {
   int error = WSAGetLastError();
   if (error == WSAECONNRESET) {
     HandleClosed(this);
   } else {
     HandleError(this);
   }
   WSASetLastError(error);
 }
 
@@ skipping 356 matching lines @@
     MarkClosedRead();
     MarkClosedWrite();
   }
 }
 
 
 void ClientSocket::DoClose() {
   // Always do a shutdown before initiating a disconnect.
   shutdown(socket(), SD_BOTH);
   IssueDisconnect();
+  handle_ = INVALID_HANDLE_VALUE;
 }
 
 
 bool ClientSocket::IssueRead() {
   ScopedLock lock(this);
   ASSERT(completion_port_ != INVALID_HANDLE_VALUE);
   ASSERT(pending_read_ == NULL);
 
   // TODO(sgjesse): Use a MTU value here. Only the loopback adapter can
   // handle 64k datagrams.
@@ skipping 542 matching lines @@
 
 
 void EventHandlerImplementation::Shutdown() {
   SendData(kShutdownId, 0, 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)