Move implementation of EnumProtocols{A,W} from wsock32 to ws2_32.

dlls/mswsock/mswsock.spec

 @ stdcall AcceptEx(long long ptr long long long ptr ptr)
-@ stub EnumProtocolsA
-@ stub EnumProtocolsW
+@ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA
+@ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW
 @ stub GetAcceptExSockaddrs
 @ stub GetAddressByNameA
 @ stub GetAddressByNameW

dlls/winsock/Makefile.in

@@ -8,6 +8,7 @@ IMPORTS   = user32 iphlpapi kernel32 ntdll
 
 C_SRCS = \
 	async.c \
+	protocol.c \
 	socket.c
 
 C_SRCS16 = socket16.c

dlls/winsock/socket.c

@@ -1343,7 +1343,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen)
  */
 int WINAPI WS_closesocket(SOCKET s)
 {
-    TRACE("socket %08x\n", s);
+    TRACE("socket %04x\n", s);
     if (CloseHandle(SOCKET2HANDLE(s))) return 0;
     return SOCKET_ERROR;
 }
@@ -1440,7 +1440,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen)
     int fd;
     int res;
 
-    TRACE("socket: %04x, ptr %p, len %8x\n", s, name, *namelen);
+    TRACE("socket: %04x, ptr %p, len %08x\n", s, name, *namelen);
 
     /* Check if what we've received is valid. Should we use IsBadReadPtr? */
     if( (name == NULL) || (namelen == NULL) )
@@ -2669,7 +2669,7 @@ BOOL WINAPI WSAGetOverlappedResult ( SOCKET s, LPWSAOVERLAPPED lpOverlapped,
 {
     DWORD r;
 
-    TRACE ( "socket %d ovl %p trans %p, wait %d flags %p\n",
+    TRACE ( "socket %04x ovl %p trans %p, wait %d flags %p\n",
             s, lpOverlapped, lpcbTransfer, fWait, lpdwFlags );
 
     if ( !(lpOverlapped && lpOverlapped->hEvent) )
@@ -3339,7 +3339,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
        SOCKET cs;
        SOCKADDR src_addr, dst_addr;
 
-       TRACE("Socket  %u, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n",
+       TRACE("Socket  %04x, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n",
                s, addr, addrlen, lpfnCondition, dwCallbackData);
 
 
@@ -3394,24 +3394,6 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
 }
 
 /***********************************************************************
- *              WSAEnumProtocolsA                        (WS2_32.37)
- */
-int WINAPI WSAEnumProtocolsA(LPINT lpiProtocols, LPWSAPROTOCOL_INFOA lpProtocolBuffer, LPDWORD lpdwBufferLength)
-{
-    FIXME("(%p,%p,%p): stub\n", lpiProtocols,lpProtocolBuffer, lpdwBufferLength);
-    return 0;
-}
-
-/***********************************************************************
- *              WSAEnumProtocolsW                        (WS2_32.38)
- */
-int WINAPI WSAEnumProtocolsW(LPINT lpiProtocols, LPWSAPROTOCOL_INFOW lpProtocolBuffer, LPDWORD lpdwBufferLength)
-{
-    FIXME("(%p,%p,%p): stub\n", lpiProtocols,lpProtocolBuffer, lpdwBufferLength);
-    return 0;
-}
-
-/***********************************************************************
  *              WSADuplicateSocketA                      (WS2_32.32)
  */
 int WINAPI WSADuplicateSocketA( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOA lpProtocolInfo )

dlls/wsock32/wsock32.spec

@@ -62,8 +62,8 @@
 1108 stdcall s_perror(str)
 1109 stub GetAddressByNameA
 1110 stub GetAddressByNameW
-1111 stdcall EnumProtocolsA(ptr ptr ptr)
-1112 stdcall EnumProtocolsW(ptr ptr ptr)
+1111 stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA
+1112 stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW
 1113 stdcall GetTypeByNameA(str ptr)
 1114 stdcall GetTypeByNameW(wstr ptr)
 #1115 stub GetNameByTypeA