Remove the dependency to ws2_32.dll from talk_base::ThreadManager and talk_base::Thread.

third_party/libjingle/overrides/talk/base/win32.cc

 /*
  * libjingle
  * Copyright 2004--2005, Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 48 matching lines @@
     case AF_INET6: {
       return inet_ntop_v6(src, dst, size);
     }
   }
   return NULL;
 }
 
 // As above, but for inet_pton. Wraps inet_addr for v4, and implements inet_pton
 // for v6. Slightly more permissive than the RFC specified inet_pton, as it uses
 // windows' inet_addr which permits octal and hexadecimal values in v4
 // addresses, while inet_pton only allows decimal.

[Sergey Ulanov, 2012/02/29 05:30:31]

nit: update this comment.

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

 // Note that our inet_ntop will output normal 'dotted' v4 addresses only.
 int win32_inet_pton(int af, const char* src, void* dst) {
   if (!src || !dst) {
     return 0;
   }
   if (af == AF_INET) {
     return inet_pton_v4(src, dst);
   } else if (af == AF_INET6) {
     return inet_pton_v6(src, dst);
   }
@@ skipping 85 matching lines @@
         *cursor++ = ':';
         *cursor++ = ':';
         i += (max - 1);
       }
     }
   }
   return dst;
 }
 
 // Helper function for inet_pton for IPv4 addresses.
-// Uses win32's inet_addr.
+// |src| points to a character string containing an IPv4 network address in
+// dotted-decimal format, "ddd.ddd.ddd.ddd", where ddd is a decimal number
+// of up to three digits in the range 0 to 255.
+// The address is converted and copied to dst,
+// which must be sizeof(struct in_addr) (4) bytes (32 bits) long.
 int inet_pton_v4(const char* src, void* dst) {
-  uint32 ip = inet_addr(src);
-  if (ip == 0xFFFFFFFF && strcmp(src, "255.255.255.255") != 0) {
+  int num_dot = 0;
+  const char* src_pos = src;
+  unsigned char result[4];

[Sergey Ulanov, 2012/02/29 05:30:31]

Might be better to define const kIpv4AddressSize = 4 and use it here. And also
replace 3 in the code below with k Ipv4AddressSize - 1.

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

+  memset(result, 0, sizeof(result));

[tommi (sloooow) - chröme, 2012/02/29 09:54:22]

nit: instead of memset, you can just do:
unsigned char result[4] = {0};

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

+
+  while (*src_pos != 0) {

[Sergey Ulanov, 2012/02/29 05:30:31]

can replace this with a for loop from 0 to 3, that would make this code simpler.

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

I tried to do that be it seems that won't save much code because we will need to
check there's no 4 and 5... after that etc. So if you don't mind, I will stay
with while.

+    if (*src_pos < '0' || *src_pos > '9')

[Sergey Ulanov, 2012/02/29 05:30:31]

nit: add a comment explaining why we need it.

[Sergey Ulanov, 2012/02/29 05:30:31]

use isdigit()

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

+      return 0;
+    char* end_pos;
+    long int value = strtol(src_pos, &end_pos, 10);
+    if (value < 0 || value > 255 ||
+        src_pos == end_pos)

[Sergey Ulanov, 2012/02/29 05:30:31]

nit: no need to wrap this line. move this condition to the previous line or add
{ } around the return statement

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

+      return 0;
+    result[num_dot] = value;
+    if (*end_pos == 0)
+      break;
+    src_pos = end_pos;
+    if (*src_pos == '.') {
+      if (++num_dot > 3)

[Sergey Ulanov, 2012/02/29 05:30:31]

move increment out of the if condition:
 ++num_dot;
 if (num_dot > 3)

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

+        return 0;
+    }
+    ++src_pos;
+  }
+  if (num_dot != 3) {
     return 0;
   }
-  struct in_addr* dst_as_in_addr = reinterpret_cast<struct in_addr*>(dst);
-  dst_as_in_addr->s_addr = ip;
+  memcpy(dst, result, 4);

[Sergey Ulanov, 2012/02/29 05:30:31]

s/4/sizeof(result)/

[Ronghua Wu (Left Chromium), 2012/03/01 00:50:13]

Done.

   return 1;
 }
 
 // Helper function for inet_pton for IPv6 addresses.
 int inet_pton_v6(const char* src, void* dst) {
   // sscanf will pick any other invalid chars up, but it parses 0xnnnn as hex.
   // Check for literal x in the input string.
   const char* readcursor = src;
   char c = *readcursor++;
   while (c) {
@@ skipping 238 matching lines @@
         DWORD count = *GetSidSubAuthorityCount(til->Label.Sid);
         *level = *GetSidSubAuthority(til->Label.Sid, count - 1);
         ret = true;
       }
     }
     CloseHandle(token);
   }
   return ret;
 }
 }  // namespace talk_base