Integrate with Sarathy.

p4raw-id: //depot/cfgperl@6320

3 files changed, 105 insertions, 257 deletions

diff --git a/win32/perllib.c b/win32/perllib.c
index 857aada247..fae334608f 100644
--- a/win32/perllib.c
+++ b/win32/perllib.c
@@ -338,6 +338,10 @@ RunPerl(int argc, char **argv, char **env)
 EXTERN_C void
 set_w32_module_name(void);
 
+EXTERN_C void
+EndSockets(void);
+
+
 #ifdef __MINGW32__
 EXTERN_C		/* GCC in C++ mode mangles the name, otherwise */
 #endif
@@ -367,6 +371,7 @@ DllMain(HANDLE hModule,		/* DLL module handle */
 	 * process termination or call to FreeLibrary.
 	 */
     case DLL_PROCESS_DETACH:
+	EndSockets();
 	break;
 
 	/* The attached process creates a new thread. */
diff --git a/win32/vdir.h b/win32/vdir.h
index df9a10b130..0b634a80fc 100644
--- a/win32/vdir.h
+++ b/win32/vdir.h
@@ -10,7 +10,11 @@
 #ifndef ___VDir_H___
 #define ___VDir_H___
 
-const int driveCount = 30;
+/*
+ * Allow one slot for each possible drive letter
+ * and one additional slot for a UNC name
+ */
+const int driveCount = ('Z'-'A')+1+1;
 
 class VDir
 {
@@ -105,6 +109,8 @@ protected:
 
     inline int DriveIndex(char chr)
     {
+	if (chr == '\\' || chr == '/')
+	    return ('Z'-'A')+1;
 	return (chr | 0x20)-'a';
     };
 
@@ -366,8 +372,12 @@ char *VDir::MapPathA(const char *pInName)
      */
     char szBuffer[(MAX_PATH+1)*2];
     char szlBuf[MAX_PATH+1];
+    int length = strlen(pInName);
+
+    if (!length)
+	return (char*)pInName;
 
-    if (strlen(pInName) > MAX_PATH) {
+    if (length > MAX_PATH) {
 	strncpy(szlBuf, pInName, MAX_PATH);
 	if (IsPathSep(pInName[0]) && !IsPathSep(pInName[1])) {   
 	    /* absolute path - reduce length by 2 for drive specifier */
@@ -430,32 +440,23 @@ char *VDir::MapPathA(const char *pInName)
 
 int VDir::SetCurrentDirectoryA(char *lpBuffer)
 {
-    HANDLE hHandle;
-    WIN32_FIND_DATA win32FD;
-    char szBuffer[MAX_PATH+1], *pPtr;
+    char *pPtr;
     int length, nRet = -1;
 
-    GetFullPathNameA(MapPathA(lpBuffer), sizeof(szBuffer), szBuffer, &pPtr);
-    /* if the last char is a '\\' or a '/' then add
-     * an '*' before calling FindFirstFile
-     */
-    length = strlen(szBuffer);
-    if(length > 0 && IsPathSep(szBuffer[length-1])) {
-	szBuffer[length] = '*';
-	szBuffer[length+1] = '\0';
+    pPtr = MapPathA(lpBuffer);
+    length = strlen(pPtr);
+    if(length > 3 && IsPathSep(pPtr[length-1])) {
+	/* don't remove the trailing slash from 'x:\'  */
+	pPtr[length-1] = '\0';
     }
 
-    hHandle = FindFirstFileA(szBuffer, &win32FD);
-    if (hHandle != INVALID_HANDLE_VALUE) {
-        FindClose(hHandle);
-
-	/* if an '*' was added remove it */
-	if(szBuffer[length] == '*')
-	    szBuffer[length] = '\0';
-
-	SetDefaultDirA(szBuffer, DriveIndex(szBuffer[0]));
+    DWORD r = GetFileAttributesA(pPtr);
+    if ((r != 0xffffffff) && (r & FILE_ATTRIBUTE_DIRECTORY))
+    {
+	SetDefaultDirA(pPtr, DriveIndex(pPtr[0]));
 	nRet = 0;
     }
+
     return nRet;
 }
 
@@ -590,8 +591,12 @@ WCHAR* VDir::MapPathW(const WCHAR *pInName)
      */
     WCHAR szBuffer[(MAX_PATH+1)*2];
     WCHAR szlBuf[MAX_PATH+1];
+    int length = wcslen(pInName);
 
-    if (wcslen(pInName) > MAX_PATH) {
+    if (!length)
+	return (WCHAR*)pInName;
+
+    if (length > MAX_PATH) {
 	wcsncpy(szlBuf, pInName, MAX_PATH);
 	if (IsPathSep(pInName[0]) && !IsPathSep(pInName[1])) {   
 	    /* absolute path - reduce length by 2 for drive specifier */
@@ -653,32 +658,23 @@ WCHAR* VDir::MapPathW(const WCHAR *pInName)
 
 int VDir::SetCurrentDirectoryW(WCHAR *lpBuffer)
 {
-    HANDLE hHandle;
-    WIN32_FIND_DATAW win32FD;
-    WCHAR szBuffer[MAX_PATH+1], *pPtr;
+    WCHAR *pPtr;
     int length, nRet = -1;
 
-    GetFullPathNameW(MapPathW(lpBuffer), (sizeof(szBuffer)/sizeof(WCHAR)), szBuffer, &pPtr);
-    /* if the last char is a '\\' or a '/' then add
-     * an '*' before calling FindFirstFile
-     */
-    length = wcslen(szBuffer);
-    if(length > 0 && IsPathSep(szBuffer[length-1])) {
-	szBuffer[length] = '*';
-	szBuffer[length+1] = '\0';
+    pPtr = MapPathW(lpBuffer);
+    length = wcslen(pPtr);
+    if(length > 3 && IsPathSep(pPtr[length-1])) {
+	/* don't remove the trailing slash from 'x:\'  */
+	pPtr[length-1] = '\0';
     }
 
-    hHandle = FindFirstFileW(szBuffer, &win32FD);
-    if (hHandle != INVALID_HANDLE_VALUE) {
-        FindClose(hHandle);
-
-	/* if an '*' was added remove it */
-	if(szBuffer[length] == '*')
-	    szBuffer[length] = '\0';
-
-	SetDefaultDirW(szBuffer, DriveIndex((char)szBuffer[0]));
+    DWORD r = GetFileAttributesW(pPtr);
+    if ((r != 0xffffffff) && (r & FILE_ATTRIBUTE_DIRECTORY))
+    {
+	SetDefaultDirW(pPtr, DriveIndex((char)pPtr[0]));
 	nRet = 0;
     }
+
     return nRet;
 }
 
diff --git a/win32/win32sck.c b/win32/win32sck.c
index 9d93cf4e3a..cc96688919 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -27,9 +27,7 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#ifndef __MINGW32__
 #include <assert.h>
-#endif
 #include <io.h>
 
 /* thanks to Beverly Brown	(beverly@datacube.com) */
@@ -41,7 +39,7 @@
 #	define TO_SOCKET(x)	(x)
 #endif	/* USE_SOCKETS_AS_HANDLES */
 
-#if defined(USE_THREADS) || defined(USE_ITHREADS)
+#ifdef USE_THREADS
 #define StartSockets() \
     STMT_START {					\
 	if (!wsock_started)				\
@@ -62,7 +60,7 @@
     STMT_START {					\
 	StartSockets();					\
 	if((x) == (y))					\
-	    errno = CALL(WSAGetLastError)();			\
+	    errno = WSAGetLastError();			\
     } STMT_END
 
 #define SOCKET_TEST_ERROR(x) SOCKET_TEST(x, SOCKET_ERROR)
@@ -73,87 +71,13 @@ static struct servent* win32_savecopyservent(struct servent*d,
 
 static int wsock_started = 0;
 
-#ifdef PERL_WIN32_SOCK_DLOAD /* we load the socket libraries when needed -- BKS 5-29-2000 */
-#define CALL(x) (*p ## x)
-typedef SOCKET (PASCAL *Paccept)(SOCKET,struct sockaddr*,int*);
-typedef int (PASCAL *Pbind)(SOCKET,const struct sockaddr*,int);
-typedef int (PASCAL *Pclosesocket)(SOCKET);
-typedef int (PASCAL *Pconnect)(SOCKET,const struct sockaddr*,int);
-typedef int (PASCAL *Pioctlsocket)(SOCKET,long,u_long *);
-typedef int (PASCAL *Pgetpeername)(SOCKET,struct sockaddr*,int*);
-typedef int (PASCAL *Pgetsockname)(SOCKET,struct sockaddr*,int*);
-typedef int (PASCAL *Pgetsockopt)(SOCKET,int,int,char*,int*);
-typedef unsigned long (PASCAL *Pinet_addr)(const char*);
-typedef char * (PASCAL *Pinet_ntoa)(struct in_addr);
-typedef int (PASCAL *Plisten)(SOCKET,int);
-typedef int (PASCAL *Precv)(SOCKET,char*,int,int);
-typedef int (PASCAL *Precvfrom)(SOCKET,char*,int,int,struct sockaddr*,int*);
-typedef int (PASCAL *Psend)(SOCKET,const char*,int,int);
-typedef int (PASCAL *Psendto)(SOCKET,const char*,int,int,const struct sockaddr*,int);
-typedef int (PASCAL *Psetsockopt)(SOCKET,int,int,const char*,int);
-typedef int (PASCAL *Pshutdown)(SOCKET,int);
-typedef SOCKET (PASCAL *Psocket)(int,int,int);
-typedef struct hostent* (PASCAL *Pgethostbyaddr)(const char*,int,int);
-typedef struct hostent* (PASCAL *Pgethostbyname)(const char*);
-typedef struct servent* (PASCAL *Pgetservbyport)(int,const char*);
-typedef struct servent* (PASCAL *Pgetservbyname)(const char*,const char*);
-typedef struct protoent* (PASCAL *Pgetprotobynumber)(int);
-typedef struct protoent* (PASCAL *Pgetprotobyname)(const char*);
-typedef int (PASCAL *PWSACleanup)(void);
-typedef int (PASCAL *PWSAStartup)(unsigned short, WSADATA*);
-typedef void (PASCAL *PWSASetLastError)(int);
-typedef int (PASCAL *PWSAGetLastError)(void);
-typedef int (PASCAL *P__WSAFDIsSet)(SOCKET,fd_set*);
-typedef int (PASCAL *Pselect)(int nfds,fd_set*,fd_set*,fd_set*,const struct timeval*);
-typedef int (PASCAL *Pgethostname)(char*,int);
-typedef u_long (PASCAL *Phtonl)(u_long), (PASCAL *Pntohl)(u_long);
-typedef u_short (PASCAL *Phtons)(u_short), (PASCAL *Pntohs)(u_short);
-static Paccept 		paccept;
-static Pbind 		pbind;
-static Pclosesocket 	pclosesocket;
-static Pconnect 	pconnect;
-static Pioctlsocket	pioctlsocket;
-static Pgetpeername	pgetpeername;
-static Pgetsockname	pgetsockname;
-static Pgetsockopt	pgetsockopt;
-static Pinet_addr	pinet_addr;
-static Pinet_ntoa	pinet_ntoa;
-static Plisten		plisten;
-static Precv		precv;
-static Precvfrom	precvfrom;
-static Psend		psend;
-static Psendto		psendto;
-static Psetsockopt	psetsockopt;
-static Pshutdown	pshutdown;
-static Psocket		psocket;
-static Pgethostbyaddr	pgethostbyaddr;
-static Pgethostbyname	pgethostbyname;
-static Pgetservbyport	pgetservbyport;
-static Pgetservbyname	pgetservbyname;
-static Pgetprotobynumber pgetprotobynumber;
-static Pgetprotobyname	pgetprotobyname;
-static PWSAStartup	pWSAStartup;
-static PWSACleanup	pWSACleanup;
-static PWSASetLastError	pWSASetLastError;
-static PWSAGetLastError	pWSAGetLastError;
-static P__WSAFDIsSet	p__WSAFDIsSet;
-static Pselect		pselect;
-static Pgethostname	pgethostname;
-#if BYTEORDER != 0x1234
-static Phtons		phtons;
-static Pntohs		pntohs;
-static Phtonl		phtonl;
-static Pntohl		pntohl;
-#endif
-void end_sockets(pTHXo_ void *ptr)
+EXTERN_C void
+EndSockets(void)
 {
-    CALL(WSACleanup)();
-    wsock_started = 0;
-    FreeLibrary(ptr);
+    if (wsock_started)
+	WSACleanup();
 }
-#else
-#define CALL(x) x
-#endif /* PERL_WIN32_SOCK_DLOAD */
+
 void
 start_sockets(void) 
 {
@@ -161,67 +85,18 @@ start_sockets(void)
     unsigned short version;
     WSADATA retdata;
     int ret;
-#ifdef PERL_WIN32_SOCK_DLOAD
-    HANDLE hDll = LoadLibraryA("wsock32.dll");
 
     /*
      * initalize the winsock interface and insure that it is
      * cleaned up at exit.
-     * Also, only load the DLL when needed -- BKS, 4-2-2000
      */
-    if (!(hDll &&
-	(paccept = (Paccept)GetProcAddress(hDll, "accept")) &&
-	(pbind = (Pbind)GetProcAddress(hDll, "bind")) &&
-	(pclosesocket = (Pclosesocket)GetProcAddress(hDll, "closesocket")) &&
-	(pconnect = (Pconnect)GetProcAddress(hDll, "connect")) &&
-	(pioctlsocket = (Pioctlsocket)GetProcAddress(hDll, "ioctlsocket")) &&
-	(pgetpeername = (Pgetpeername)GetProcAddress(hDll, "getpeername")) &&
-	(pgetsockname = (Pgetsockname)GetProcAddress(hDll, "getsockname")) &&
-	(pgetsockopt = (Pgetsockopt)GetProcAddress(hDll, "getsockopt")) &&
-	(pinet_addr = (Pinet_addr)GetProcAddress(hDll, "inet_addr")) &&
-	(pinet_ntoa = (Pinet_ntoa)GetProcAddress(hDll, "inet_ntoa")) &&
-	(plisten = (Plisten)GetProcAddress(hDll, "listen")) &&
-	(precv = (Precv)GetProcAddress(hDll, "recv")) &&
-	(precvfrom = (Precvfrom)GetProcAddress(hDll, "recvfrom")) &&
-	(psend = (Psend)GetProcAddress(hDll, "send")) &&
-	(psendto = (Psendto)GetProcAddress(hDll, "sendto")) &&
-	(psetsockopt = (Psetsockopt)GetProcAddress(hDll, "setsockopt")) &&
-	(pshutdown = (Pshutdown)GetProcAddress(hDll, "shutdown")) &&
-	(psocket = (Psocket)GetProcAddress(hDll, "socket")) &&
-	(pgethostbyaddr = (Pgethostbyaddr)GetProcAddress(hDll, "gethostbyaddr")) &&
-	(pgethostbyname = (Pgethostbyname)GetProcAddress(hDll, "gethostbyname")) &&
-	(pgetservbyport = (Pgetservbyport)GetProcAddress(hDll, "getservbyport")) &&
-	(pgetservbyname = (Pgetservbyname)GetProcAddress(hDll, "getservbyname")) &&
-	(pgetprotobynumber = (Pgetprotobynumber)GetProcAddress(hDll, "getprotobynumber")) &&
-	(pgetprotobyname = (Pgetprotobyname)GetProcAddress(hDll, "getprotobyname")) &&
-	(pWSAStartup = (PWSAStartup)GetProcAddress(hDll, "WSAStartup")) &&
-	(pWSACleanup = (PWSACleanup)GetProcAddress(hDll, "WSACleanup")) &&
-	(pWSASetLastError = (PWSASetLastError)GetProcAddress(hDll, "WSASetLastError")) &&
-	(pWSAGetLastError = (PWSAGetLastError)GetProcAddress(hDll, "WSAGetLastError")) &&
-	(p__WSAFDIsSet = (P__WSAFDIsSet)GetProcAddress(hDll, "__WSAFDIsSet")) &&
-	(pselect = (Pselect)GetProcAddress(hDll, "select")) &&
-	(pgethostname = (Pgethostname)GetProcAddress(hDll, "gethostname")) &&
-#if BYTEORDER != 0x1234
-	(phtonl = (Phtonl)GetProcAddress(hDll, "htonl")) &&
-	(pntohl = (Pntohl)GetProcAddress(hDll, "ntohl")) &&
-	(phtons = (Pntohs)GetProcAddress(hDll, "htons")) &&
-	(pntohs = (Pntohs)GetProcAddress(hDll, "ntohs")
-#else
-	1
-#endif
-    )) {
-	Perl_croak(aTHX_ "Unable to load winsock library!\n");
-    }
-#endif /* PERL_WIN32_SOCK_DLOAD */
     version = 0x101;
-    if(ret = CALL(WSAStartup)(version, &retdata))
-	Perl_croak(aTHX_ "Unable to initialize winsock library!\n");
+    if(ret = WSAStartup(version, &retdata))
+	Perl_croak_nocontext("Unable to locate winsock library!\n");
     if(retdata.wVersion != version)
-	Perl_croak(aTHX_ "Could not find version 1.1 of winsock dll\n");
+	Perl_croak_nocontext("Could not find version 1.1 of winsock dll\n");
 
-#ifdef PERL_WIN32_SOCK_DLOAD
-    call_atexit(end_sockets, hDll);
-#endif
+    /* atexit((void (*)(void)) EndSockets); */
     wsock_started = 1;
 }
 
@@ -237,7 +112,7 @@ set_socktype(void)
 	/*
 	 * Enable the use of sockets as filehandles
 	 */
-	CALL(setsockopt)(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
+	setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
 		    (char *)&iSockOpt, sizeof(iSockOpt));
 #ifdef USE_THREADS
 	w32_init_socktype = 1;
@@ -260,8 +135,8 @@ my_fdopen(int fd, char *mode)
     if (!wsock_started)
 	return(fdopen(fd, mode));
 
-    retval = CALL(getsockopt)((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
-    if(retval == SOCKET_ERROR && CALL(WSAGetLastError)() == WSAENOTSOCK) {
+    retval = getsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
+    if(retval == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK) {
 	return(fdopen(fd, mode));
     }
 
@@ -284,61 +159,33 @@ my_fdopen(int fd, char *mode)
 }
 #endif	/* USE_SOCKETS_AS_HANDLES */
 
-/* ntoh* and hton* are implemented here so that ByteLoader doesn't need to load WinSock;
-   these functions are simply copied from util.c */
 
 u_long
-win32_htonl(u_long l)
-{
-#if BYTEORDER == 0x1234
-    union { u_long r; char c[4]; } u;
-    u.c[0] = (l >> 24) & 255;
-    u.c[1] = (l >> 16) & 255;
-    u.c[2] = (l >> 8) & 255;
-    u.c[3] = l & 255;
-    return u.r;
-#else
+win32_htonl(u_long hostlong)
+{
     StartSockets();
-    return CALL(htonl)(l);
-#endif
+    return htonl(hostlong);
 }
 
 u_short
-win32_htons(u_short s)
+win32_htons(u_short hostshort)
 {
-#if BYTEORDER == 0x1234
-    return (((s >> 8) & 255) | ((s & 255) << 8));
-#else
     StartSockets();
-    return CALL(htons)(s);
-#endif
+    return htons(hostshort);
 }
 
 u_long
-win32_ntohl(u_long l)
-{
-#if BYTEORDER == 0x1234
-    union { u_long r; char c[4]; } u;
-    u.c[0] = (l >> 24) & 255;
-    u.c[1] = (l >> 16) & 255;
-    u.c[2] = (l >> 8) & 255;
-    u.c[3] = l & 255;
-    return u.r;
-#else
+win32_ntohl(u_long netlong)
+{
     StartSockets();
-    return CALL(ntohl)(l);
-#endif
+    return ntohl(netlong);
 }
 
 u_short
-win32_ntohs(u_short s)
+win32_ntohs(u_short netshort)
 {
-#if BYTEORDER == 0x1234
-    return (((s >> 8) & 255) | ((s & 255) << 8));
-#else
     StartSockets();
-    return CALL(ntohs)(s);
-#endif
+    return ntohs(netshort);
 }
 
 
@@ -348,7 +195,7 @@ win32_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
     SOCKET r;
 
-    SOCKET_TEST((r = CALL(accept)(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
+    SOCKET_TEST((r = accept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
     return OPEN_SOCKET(r);
 }
 
@@ -357,7 +204,7 @@ win32_bind(SOCKET s, const struct sockaddr *addr, int addrlen)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(bind)(TO_SOCKET(s), addr, addrlen));
+    SOCKET_TEST_ERROR(r = bind(TO_SOCKET(s), addr, addrlen));
     return r;
 }
 
@@ -366,7 +213,7 @@ win32_connect(SOCKET s, const struct sockaddr *addr, int addrlen)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(connect)(TO_SOCKET(s), addr, addrlen));
+    SOCKET_TEST_ERROR(r = connect(TO_SOCKET(s), addr, addrlen));
     return r;
 }
 
@@ -376,7 +223,7 @@ win32_getpeername(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(getpeername)(TO_SOCKET(s), addr, addrlen));
+    SOCKET_TEST_ERROR(r = getpeername(TO_SOCKET(s), addr, addrlen));
     return r;
 }
 
@@ -385,7 +232,7 @@ win32_getsockname(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(getsockname)(TO_SOCKET(s), addr, addrlen));
+    SOCKET_TEST_ERROR(r = getsockname(TO_SOCKET(s), addr, addrlen));
     return r;
 }
 
@@ -394,7 +241,7 @@ win32_getsockopt(SOCKET s, int level, int optname, char *optval, int *optlen)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(getsockopt)(TO_SOCKET(s), level, optname, optval, optlen));
+    SOCKET_TEST_ERROR(r = getsockopt(TO_SOCKET(s), level, optname, optval, optlen));
     return r;
 }
 
@@ -403,7 +250,7 @@ win32_ioctlsocket(SOCKET s, long cmd, u_long *argp)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(ioctlsocket)(TO_SOCKET(s), cmd, argp));
+    SOCKET_TEST_ERROR(r = ioctlsocket(TO_SOCKET(s), cmd, argp));
     return r;
 }
 
@@ -412,7 +259,7 @@ win32_listen(SOCKET s, int backlog)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(listen)(TO_SOCKET(s), backlog));
+    SOCKET_TEST_ERROR(r = listen(TO_SOCKET(s), backlog));
     return r;
 }
 
@@ -421,7 +268,7 @@ win32_recv(SOCKET s, char *buf, int len, int flags)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(recv)(TO_SOCKET(s), buf, len, flags));
+    SOCKET_TEST_ERROR(r = recv(TO_SOCKET(s), buf, len, flags));
     return r;
 }
 
@@ -431,7 +278,7 @@ win32_recvfrom(SOCKET s, char *buf, int len, int flags, struct sockaddr *from, i
     int r;
     int frombufsize = *fromlen;
 
-    SOCKET_TEST_ERROR(r = CALL(recvfrom)(TO_SOCKET(s), buf, len, flags, from, fromlen));
+    SOCKET_TEST_ERROR(r = recvfrom(TO_SOCKET(s), buf, len, flags, from, fromlen));
     /* Winsock's recvfrom() only returns a valid 'from' when the socket
      * is connectionless.  Perl expects a valid 'from' for all types
      * of sockets, so go the extra mile.
@@ -490,19 +337,19 @@ win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr, Perl_fd_set* ex, const
 	    FD_SET(fd, &nex);
     }
 
-    SOCKET_TEST_ERROR(r = CALL(select)(nfds, prd, pwr, pex, timeout));
+    SOCKET_TEST_ERROR(r = select(nfds, prd, pwr, pex, timeout));
 
     for (i = 0; i < nfds; i++) {
 	fd = TO_SOCKET(i);
-	if (PERL_FD_ISSET(i,rd) && !CALL(__WSAFDIsSet)(fd, &nrd))
+	if (PERL_FD_ISSET(i,rd) && !FD_ISSET(fd, &nrd))
 	    PERL_FD_CLR(i,rd);
-	if (PERL_FD_ISSET(i,wr) && !CALL(__WSAFDIsSet)(fd, &nwr))
+	if (PERL_FD_ISSET(i,wr) && !FD_ISSET(fd, &nwr))
 	    PERL_FD_CLR(i,wr);
-	if (PERL_FD_ISSET(i,ex) && !CALL(__WSAFDIsSet)(fd, &nex))
+	if (PERL_FD_ISSET(i,ex) && !FD_ISSET(fd, &nex))
 	    PERL_FD_CLR(i,ex);
     }
 #else
-    SOCKET_TEST_ERROR(r = CALL(select)(nfds, rd, wr, ex, timeout));
+    SOCKET_TEST_ERROR(r = select(nfds, rd, wr, ex, timeout));
 #endif
     return r;
 }
@@ -512,7 +359,7 @@ win32_send(SOCKET s, const char *buf, int len, int flags)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(send)(TO_SOCKET(s), buf, len, flags));
+    SOCKET_TEST_ERROR(r = send(TO_SOCKET(s), buf, len, flags));
     return r;
 }
 
@@ -522,7 +369,7 @@ win32_sendto(SOCKET s, const char *buf, int len, int flags,
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(sendto)(TO_SOCKET(s), buf, len, flags, to, tolen));
+    SOCKET_TEST_ERROR(r = sendto(TO_SOCKET(s), buf, len, flags, to, tolen));
     return r;
 }
 
@@ -531,7 +378,7 @@ win32_setsockopt(SOCKET s, int level, int optname, const char *optval, int optle
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(setsockopt)(TO_SOCKET(s), level, optname, optval, optlen));
+    SOCKET_TEST_ERROR(r = setsockopt(TO_SOCKET(s), level, optname, optval, optlen));
     return r;
 }
     
@@ -540,7 +387,7 @@ win32_shutdown(SOCKET s, int how)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(shutdown)(TO_SOCKET(s), how));
+    SOCKET_TEST_ERROR(r = shutdown(TO_SOCKET(s), how));
     return r;
 }
 
@@ -549,7 +396,7 @@ win32_closesocket(SOCKET s)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(closesocket)(TO_SOCKET(s)));
+    SOCKET_TEST_ERROR(r = closesocket(TO_SOCKET(s)));
     return r;
 }
 
@@ -559,11 +406,11 @@ win32_socket(int af, int type, int protocol)
     SOCKET s;
 
 #ifndef USE_SOCKETS_AS_HANDLES
-    SOCKET_TEST(s = CALL(socket)(af, type, protocol), INVALID_SOCKET);
+    SOCKET_TEST(s = socket(af, type, protocol), INVALID_SOCKET);
 #else
     StartSockets();
-    if((s = CALL(socket)(af, type, protocol)) == INVALID_SOCKET)
-	errno = CALL(WSAGetLastError)();
+    if((s = socket(af, type, protocol)) == INVALID_SOCKET)
+	errno = WSAGetLastError();
     else
 	s = OPEN_SOCKET(s);
 #endif	/* USE_SOCKETS_AS_HANDLES */
@@ -581,8 +428,8 @@ my_fclose (FILE *pf)
     osf = TO_SOCKET(fileno(pf));/* Get it now before it's gone! */
     retval = fclose(pf);	/* Must fclose() before closesocket() */
     if (osf != -1
-	&& CALL(closesocket)(osf) == SOCKET_ERROR
-	&& CALL(WSAGetLastError)() != WSAENOTSOCK)
+	&& closesocket(osf) == SOCKET_ERROR
+	&& WSAGetLastError() != WSAENOTSOCK)
     {
 	return EOF;
     }
@@ -594,7 +441,7 @@ win32_gethostbyaddr(const char *addr, int len, int type)
 {
     struct hostent *r;
 
-    SOCKET_TEST(r = CALL(gethostbyaddr)(addr, len, type), NULL);
+    SOCKET_TEST(r = gethostbyaddr(addr, len, type), NULL);
     return r;
 }
 
@@ -603,7 +450,7 @@ win32_gethostbyname(const char *name)
 {
     struct hostent *r;
 
-    SOCKET_TEST(r = CALL(gethostbyname)(name), NULL);
+    SOCKET_TEST(r = gethostbyname(name), NULL);
     return r;
 }
 
@@ -612,7 +459,7 @@ win32_gethostname(char *name, int len)
 {
     int r;
 
-    SOCKET_TEST_ERROR(r = CALL(gethostname)(name, len));
+    SOCKET_TEST_ERROR(r = gethostname(name, len));
     return r;
 }
 
@@ -621,7 +468,7 @@ win32_getprotobyname(const char *name)
 {
     struct protoent *r;
 
-    SOCKET_TEST(r = CALL(getprotobyname)(name), NULL);
+    SOCKET_TEST(r = getprotobyname(name), NULL);
     return r;
 }
 
@@ -630,7 +477,7 @@ win32_getprotobynumber(int num)
 {
     struct protoent *r;
 
-    SOCKET_TEST(r = CALL(getprotobynumber)(num), NULL);
+    SOCKET_TEST(r = getprotobynumber(num), NULL);
     return r;
 }
 
@@ -640,7 +487,7 @@ win32_getservbyname(const char *name, const char *proto)
     dTHXo;    
     struct servent *r;
 
-    SOCKET_TEST(r = CALL(getservbyname)(name, proto), NULL);
+    SOCKET_TEST(r = getservbyname(name, proto), NULL);
     if (r) {
 	r = win32_savecopyservent(&w32_servent, r, proto);
     }
@@ -653,7 +500,7 @@ win32_getservbyport(int port, const char *proto)
     dTHXo; 
     struct servent *r;
 
-    SOCKET_TEST(r = CALL(getservbyport)(port, proto), NULL);
+    SOCKET_TEST(r = getservbyport(port, proto), NULL);
     if (r) {
 	r = win32_savecopyservent(&w32_servent, r, proto);
     }
@@ -672,13 +519,13 @@ win32_ioctl(int i, unsigned int u, char *data)
 	/* NOTREACHED */
     }
 
-    retval = CALL(ioctlsocket)(TO_SOCKET(i), (long)u, &argp);
+    retval = ioctlsocket(TO_SOCKET(i), (long)u, &argp);
     if (retval == SOCKET_ERROR) {
-	if (CALL(WSAGetLastError)() == WSAENOTSOCK) {
+	if (WSAGetLastError() == WSAENOTSOCK) {
 	    Perl_croak_nocontext("ioctl implemented only on sockets");
 	    /* NOTREACHED */
 	}
-	errno = CALL(WSAGetLastError)();
+	errno = WSAGetLastError();
     }
     return retval;
 }
@@ -687,14 +534,14 @@ char FAR *
 win32_inet_ntoa(struct in_addr in)
 {
     StartSockets();
-    return CALL(inet_ntoa)(in);
+    return inet_ntoa(in);
 }
 
 unsigned long
 win32_inet_addr(const char FAR *cp)
 {
     StartSockets();
-    return CALL(inet_addr)(cp);
+    return inet_addr(cp);
 }
 
 /*