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

runtime/bin/eventhandler_win.h

 // 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.
 
 #ifndef BIN_EVENTHANDLER_WIN_H_
 #define BIN_EVENTHANDLER_WIN_H_
 
 #if !defined(BIN_EVENTHANDLER_H_)
 #error Do not include eventhandler_win.h directly; use eventhandler.h instead.
 #endif
@@ skipping 210 matching lines @@
 
   virtual void EnsureInitialized(
     EventHandlerImplementation* event_handler) = 0;
 
   HANDLE handle() { return handle_; }
   Dart_Port port() { return port_; }
 
   void Lock();
   void Unlock();
 
-  bool DoCreateCompletionPort(HANDLE handle, HANDLE completion_port);
-  virtual bool CreateCompletionPort(HANDLE completion_port);
+  bool CreateCompletionPort(HANDLE completion_port);
 
   void Close();
   virtual void DoClose();
   virtual bool IsClosed() = 0;
 
   bool IsHandleClosed() const { return handle_ == INVALID_HANDLE_VALUE; }
 
   void SetPortAndMask(Dart_Port port, intptr_t mask) {
     port_ = port;
     mask_ = mask;
@@ skipping 114 matching lines @@
  private:
   int events_;
   bool recursive_;
 };
 
 
 class SocketHandle : public Handle {
  public:
   SOCKET socket() const { return socket_; }
 
-  virtual bool CreateCompletionPort(HANDLE completion_port);
-
  protected:
   explicit SocketHandle(SOCKET s)
-      : Handle(INVALID_HANDLE_VALUE),
+      : Handle(reinterpret_cast<HANDLE>(s)),
         socket_(s) {}
   SocketHandle(SOCKET s, Dart_Port port)
-      : Handle(INVALID_HANDLE_VALUE, port),
+      : Handle(reinterpret_cast<HANDLE>(s), port),
         socket_(s) {}
 
   virtual void HandleIssueError();
 
  private:
   const SOCKET socket_;
 };
 
 
 // Information on listen sockets.
@@ skipping 157 matching lines @@
 
   TimeoutQueue timeout_queue_;  // Time for next timeout.
   bool shutdown_;
   HANDLE completion_port_;
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_EVENTHANDLER_WIN_H_