Revert last unicode change. Causes Pub issues.

runtime/bin/socket_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/builtin.h"
 #include "bin/eventhandler.h"
 #include "bin/log.h"
 #include "bin/socket.h"
 
 bool Socket::Initialize() {
@@ skipping 48 matching lines @@
   if (getpeername(socket_handle->socket(),
                   reinterpret_cast<struct sockaddr *>(&socket_address),
                   &size)) {
     Log::PrintErr("Error getpeername: %s\n", strerror(errno));
     return false;
   }
   *port = ntohs(socket_address.sin_port);
   // Clear the port before calling WSAAddressToString as WSAAddressToString
   // includes the port in the formatted string.
   socket_address.sin_port = 0;
-  wchar_t* unicode_host = StringUtils::Utf8ToWide(host);
   DWORD len = INET_ADDRSTRLEN;
-  int err = WSAAddressToStringW(reinterpret_cast<LPSOCKADDR>(&socket_address),
-                                sizeof(socket_address),
-                                NULL,
-                                unicode_host,
-                                &len);
-  free(unicode_host);
+  int err = WSAAddressToString(reinterpret_cast<LPSOCKADDR>(&socket_address),
+                               sizeof(socket_address),
+                               NULL,
+                               host,
+                               &len);
   if (err != 0) {
     Log::PrintErr("Error WSAAddressToString: %d\n", WSAGetLastError());
     return false;
   }
   return true;
 }
 
 intptr_t Socket::CreateConnect(const char* host, const intptr_t port) {
   SOCKET s = socket(AF_INET, SOCK_STREAM, 0);
   if (s == INVALID_SOCKET) {
@@ skipping 103 matching lines @@
     SetLastError(error_code);
     *os_error = new OSError();
     return NULL;
   }
   // Convert the address into IPv4 dotted decimal notation.
   char* buffer = reinterpret_cast<char*>(malloc(INET_ADDRSTRLEN));
   sockaddr_in *sockaddr = reinterpret_cast<sockaddr_in *>(info->ai_addr);
 
   // Clear the port before calling WSAAddressToString as WSAAddressToString
   // includes the port in the formatted string.
-  wchar_t* unicode_buffer = StringUtils::Utf8ToWide(buffer);
   DWORD len = INET_ADDRSTRLEN;
-  int err = WSAAddressToStringW(reinterpret_cast<LPSOCKADDR>(sockaddr),
-                                sizeof(sockaddr_in),
-                                NULL,
-                                unicode_buffer,
-                                &len);
-  free(unicode_buffer);
+  int err = WSAAddressToString(reinterpret_cast<LPSOCKADDR>(sockaddr),
+                               sizeof(sockaddr_in),
+                               NULL,
+                               buffer,
+                               &len);
   if (err != 0) {
     free(buffer);
     return NULL;
   }
   return buffer;
 }
 
 
 intptr_t ServerSocket::CreateBindListen(const char* host,
                                         intptr_t port,
@@ skipping 40 matching lines @@
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
     closesocket(s);
     SetLastError(rc);
     return -1;
   }
 
   ListenSocket* listen_socket = new ListenSocket(s);
   return reinterpret_cast<intptr_t>(listen_socket);
 }