Update to NSPR 4.10.2.

nspr/pr/src/md/windows/w95sock.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Win95 Sockets module
  *
  */
 
 #include "primpl.h"
 
 #define READ_FD     1
 #define WRITE_FD    2
 #define CONNECT_FD  3
 
 static PRInt32 socket_io_wait(
     PROsfd osfd, 
     PRInt32 fd_type,
     PRIntervalTime timeout);
 
 
 /* --- SOCKET IO --------------------------------------------------------- */
 
-/*
- * we only want to call WSAIoctl() on Vista and later
- * so don't pay for it at build time (and avoid including winsock2.h)
- */
-
-/* from ws2def.h */
-#define IOC_IN                      0x80000000      /* copy in parameters */
-#define IOC_VENDOR                  0x18000000
-#define _WSAIOW(x,y)                (IOC_IN|(x)|(y))
-/* from MSWSockDef.h */
-#define SIO_SET_COMPATIBILITY_MODE  _WSAIOW(IOC_VENDOR,300)
-
-typedef enum _WSA_COMPATIBILITY_BEHAVIOR_ID {
-    WsaBehaviorAll = 0,
-    WsaBehaviorReceiveBuffering,
-    WsaBehaviorAutoTuning
-} WSA_COMPATIBILITY_BEHAVIOR_ID, *PWSA_COMPATIBILITY_BEHAVIOR_ID;
-
-/* from sdkddkver.h */
-#define NTDDI_WIN6              0x06000000  /* Windows Vista */
-
-/* from winsock2.h */
-#define WSAEVENT                HANDLE
-
-#define WSAOVERLAPPED           OVERLAPPED
-typedef struct _OVERLAPPED *    LPWSAOVERLAPPED;
-
-typedef void (CALLBACK * LPWSAOVERLAPPED_COMPLETION_ROUTINE)(
-    IN DWORD dwError,
-    IN DWORD cbTransferred,
-    IN LPWSAOVERLAPPED lpOverlapped,
-    IN DWORD dwFlags
-);
-
-typedef int (__stdcall * WSAIOCTLPROC) (
-    SOCKET s,
-    DWORD dwIoControlCode,
-    LPVOID lpvInBuffer,
-    DWORD cbInBuffer,
-    LPVOID lpvOutBuffer,
-    DWORD cbOutBuffer,
-    LPDWORD lpcbBytesReturned,
-    LPWSAOVERLAPPED lpOverlapped,
-    LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
-);
-
-typedef struct _WSA_COMPATIBILITY_MODE {
-    WSA_COMPATIBILITY_BEHAVIOR_ID BehaviorId;
-    ULONG TargetOsVersion;
-} WSA_COMPATIBILITY_MODE, *PWSA_COMPATIBILITY_MODE;
-
-static HMODULE libWinsock2 = NULL;
-static WSAIOCTLPROC wsaioctlProc = NULL;
-static PRBool socketSetCompatMode = PR_FALSE;
 static PRBool socketFixInet6RcvBuf = PR_FALSE;
 
 void _PR_MD_InitSockets(void)
 {
     OSVERSIONINFO osvi;
 
     memset(&osvi, 0, sizeof(osvi));
     osvi.dwOSVersionInfoSize = sizeof(osvi);
     GetVersionEx(&osvi);
 
-    /* if Vista or later... */
-    if (osvi.dwMajorVersion >= 6)
-    {
-        libWinsock2 = LoadLibraryW(L"Ws2_32.dll");
-        if (libWinsock2)
-        {
-            wsaioctlProc = (WSAIOCTLPROC)GetProcAddress(libWinsock2, 
-                                                        "WSAIoctl");
-            if (wsaioctlProc)
-            {
-                socketSetCompatMode = PR_TRUE;
-            }
-        }
-    }
-    else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
+    if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
     {
         /* if Windows XP (32-bit) */
         socketFixInet6RcvBuf = PR_TRUE;
     }
 }
 
 void _PR_MD_CleanupSockets(void)
 {
-    socketSetCompatMode = PR_FALSE;
-    wsaioctlProc = NULL;
-    if (libWinsock2)
-    {
-        FreeLibrary(libWinsock2);
-        libWinsock2 = NULL;
-    }
+    socketFixInet6RcvBuf = PR_FALSE;
 }
 
 PROsfd
 _PR_MD_SOCKET(int af, int type, int flags)
 {
     SOCKET sock;
     u_long one = 1;
 
     sock = socket(af, type, flags);
 
     if (sock == INVALID_SOCKET ) 
     {
         _PR_MD_MAP_SOCKET_ERROR(WSAGetLastError());
         return (PROsfd)sock;
     }
 
     /*
     ** Make the socket Non-Blocking
     */
     if (ioctlsocket( sock, FIONBIO, &one) != 0)
     {
         PR_SetError(PR_UNKNOWN_ERROR, WSAGetLastError());
         closesocket(sock);
         return -1;
     }
 
-    if ((af == AF_INET || af == AF_INET6) && 
-        type == SOCK_STREAM && socketSetCompatMode)
-    {
-        WSA_COMPATIBILITY_MODE mode;
-        char dummy[4];
-        int ret_dummy;
-
-        mode.BehaviorId = WsaBehaviorAutoTuning;
-        mode.TargetOsVersion = NTDDI_WIN6;
-        if (wsaioctlProc(sock, SIO_SET_COMPATIBILITY_MODE,  
-                         (char *)&mode, sizeof(mode),
-                         dummy, 4, &ret_dummy, 0, NULL) == SOCKET_ERROR)
-        {
-            int err = WSAGetLastError();
-            PR_LOG(_pr_io_lm, PR_LOG_DEBUG, ("WSAIoctl() failed with %d", err));
-
-            /* SIO_SET_COMPATIBILITY_MODE may not be supported.
-            ** If the call to WSAIoctl() fails with WSAEOPNOTSUPP,
-            ** don't close the socket.
-            */ 
-        }
-    }
-
     if (af == AF_INET6 && socketFixInet6RcvBuf)
     {
         int bufsize;
         int len = sizeof(bufsize);
         int rv;
 
         /* Windows XP 32-bit returns an error on getpeername() for AF_INET6
          * sockets if the receive buffer size is greater than 65535 before
          * the connection is initiated. The default receive buffer size may
          * be 128000 so fix it here to always be <= 65535. See bug 513659
@@ skipping 580 matching lines @@
                         break;
                     } else {
                         remaining = remaining - elapsed;
                     }
                 }
             } while (rv == 0 );
             break;
     }
     return(rv);
 } /* end socket_io_wait() */