Fix Win64 build of Dart VM.

runtime/bin/socket_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/builtin.h"
 #include "bin/eventhandler.h"
 #include "bin/file.h"
@@ skipping 52 matching lines @@
   }
   return err == 0;
 }
 
 intptr_t Socket::Available(intptr_t fd) {
   ClientSocket* client_socket = reinterpret_cast<ClientSocket*>(fd);
   return client_socket->Available();
 }
 
 
-intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
+int Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {

[srdjan, 2014/06/05 17:00:46]

Why is this necessary?

[siva, 2014/06/05 17:21:18]

Not sure I understand the divergence, num_bytes is an intptr_t and Read returns
the number of bytes read which in most cases would be num_bytes unless there is
a short read, why change the return value type then?

[Ivan Posva, 2014/06/05 17:42:11]

I see why this is necessary, but the real problem is that Socket::Read is
defined to return an int and not an intptr_t, which would be the correct thing
to do.

Should be fixed with this CL: https://codereview.chromium.org/312343002/

[Vyacheslav Egorov (Google), 2014/06/05 18:05:55]

Thanks. I will revert my changes to this file.

Handle::Read is defined to returned int still though even after your CL.

[Ivan Posva, 2014/06/05 18:13:38]

Please file a bug against IO and check with Anders what the lower layers of
Windows provide on 64-bit machines.

   Handle* handle = reinterpret_cast<Handle*>(fd);
   return handle->Read(buffer, num_bytes);
 }
 
 
 int Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
                      RawAddr* addr) {
   Handle* handle = reinterpret_cast<Handle*>(fd);
   socklen_t addr_len = sizeof(addr->ss);
   return handle->RecvFrom(buffer, num_bytes, &addr->addr, addr_len);
 }
 
 
-intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
+int Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
   Handle* handle = reinterpret_cast<Handle*>(fd);
   return handle->Write(buffer, num_bytes);
 }
 
 
 int Socket::SendTo(
     intptr_t fd, const void* buffer, intptr_t num_bytes, RawAddr addr) {
   Handle* handle = reinterpret_cast<Handle*>(fd);
   return handle->SendTo(
     buffer, num_bytes, &addr.addr, SocketAddress::GetAddrLength(&addr));
@@ skipping 602 matching lines @@
                     proto,
                     MCAST_LEAVE_GROUP,
                     reinterpret_cast<char *>(&mreq),
                     sizeof(mreq)) == 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)