- Cleanup usage, EnsureWinsockInit is now the only method of initializing.

- Work around buggy third party hooks that can overwrite LastErrorValue during delay load binding.
Review URL: http://codereview.chromium.org/6483

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2877 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 30 insertions, 21 deletions

diff --git a/net/base/winsock_init.cc b/net/base/winsock_init.cc
index b7fbeaa..190ed77 100644
--- a/net/base/winsock_init.cc
+++ b/net/base/winsock_init.cc
@@ -8,30 +8,39 @@
 
 #include "base/singleton.h"
 
-namespace net {
-
-WinsockInit::WinsockInit() : did_init_(false) {
-  did_init_ = Init();
-}
-
-bool WinsockInit::Init() {
-  WORD winsock_ver = MAKEWORD(2,2);
-  WSAData wsa_data;
-  return (WSAStartup(winsock_ver, &wsa_data) == 0);
-}
+namespace {
+
+class WinsockInitSingleton {
+ public:
+  WinsockInitSingleton() : did_init_(false) {
+    WORD winsock_ver = MAKEWORD(2,2);
+    WSAData wsa_data;
+    did_init_ = (WSAStartup(winsock_ver, &wsa_data) == 0);
+
+    // The first time WSAGetLastError is called, the delay load helper will
+    // resolve the address with GetProcAddress and fixup the import.  If a third
+    // party application hooks system functions without correctly restoring the
+    // error code, it is possible that the error code will be overwritten during
+    // delay load resolution.  The result of the first call may be incorrect, so
+    // make sure the function is bound and future results will be correct.
+    WSAGetLastError();
+  }
+
+  ~WinsockInitSingleton() {
+    if (did_init_)
+      WSACleanup();
+  }
+
+ private:
+  bool did_init_;
+};
+
+}  // namespace
 
-void WinsockInit::Cleanup() {
-  WSACleanup();
-}
-
-WinsockInit::~WinsockInit() {
-  if (did_init_)
-    Cleanup();
-}
+namespace net {
 
 void EnsureWinsockInit() {
-  Singleton<WinsockInit>::get();
+  Singleton<WinsockInitSingleton>::get();
 }
 
 }  // namespace net
-