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 154 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];
+  memset(result, 0, sizeof(result));
+
+  while (*src_pos != 0) {
+    char* end_pos;
+    long int value = strtol(src_pos, &end_pos, 10);

[Sergey Ulanov, 2012/02/29 00:09:52]

I think that we need to verify that the string starts with a digit because
strtol() skips whitespace and handles a sign. So this code will accept things
like "34.+4.  34.55".
Now that I look at this code the first version that you wrote initially might be
better, so feel free to put it back if you think so too (just fix the problem
with parsing strings like "4...4").

[Ronghua Wu (Left Chromium), 2012/02/29 04:31:22]

Right. Added a check before strtol I think that should cover it.

+    if (value < 0 || value > 255 ||
+        src_pos == end_pos)
+      return 0;
+    result[num_dot] = value;
+    if (*end_pos == 0)
+      break;
+    src_pos = end_pos;
+    if (*src_pos == '.') {
+      if (++num_dot > 3)
+        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);
   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