- Properly convert mswsock.def to mswsock.spec (we have all functions properly stubbed).

- Remove WSPStartup from ws2_32, it doesn't belong there. Spotted by Gabriel Ilardi.
See issue #4956 for more details.

svn path=/trunk/; revision=44224
This commit is contained in:
Aleksey Bragin 2009-11-18 14:16:34 +00:00
parent 4e2f21b12b
commit b5a0cbacfb
3 changed files with 26 additions and 82 deletions

View file

@ -1,39 +0,0 @@
; $Id$
;
; MSWSOCK.DLL - Windows Sockets 2 DLL
LIBRARY mswsock.dll
EXPORTS
ServiceMain@8 @0
SvchostPushServiceGlobals@4 @1
AcceptEx@32 @2
EnumProtocolsA@12 @3
EnumProtocolsW@12 @4
GetAcceptExSockaddrs@32 @5
GetAddressByNameA@40 @6
GetAddressByNameW@40 @7
GetNameByTypeA@12 @8
GetNameByTypeW@12 @9
GetServiceA@28 @10
GetServiceW@28 @11
GetTypeByNameA@8 @12
GetTypeByNameW@8 @13
MigrateWinsockConfiguration@12 @14
NPLoadNameSpaces@12 @15
NSPStartup@8 @16
SetServiceA@24 @17
SetServiceW@24 @18
StartWsdpService@0 @19
StopWsdpService@0 @20
TransmitFile@28 @21
WSARecvEx@16 @22
WSPStartup@76 @23
dn_expand@20 @24
getnetbyname@4 @25
inet_network@4 @26
rcmd@24 @27
rexec@24 @28
rresvport@4 @29
s_perror@4 @30
sethostname@8 @31

View file

@ -2,31 +2,31 @@
@ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA @ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA
@ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW @ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW
@ stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) @ stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr)
@ stub GetAddressByNameA @ stdcall GetAddressByNameA(long ptr ptr ptr long ptr ptr ptr ptr ptr)
@ stub GetAddressByNameW @ stdcall GetAddressByNameW(long ptr ptr ptr long ptr ptr ptr ptr ptr)
@ stub GetNameByTypeA @ stdcall GetNameByTypeA(ptr ptr long)
@ stub GetNameByTypeW @ stdcall GetNameByTypeW(ptr ptr long)
@ stub GetServiceA @ stdcall GetServiceA(long ptr ptr long ptr ptr ptr)
@ stub GetServiceW @ stdcall GetServiceW(long ptr ptr long ptr ptr ptr)
@ stub GetTypeByNameA @ stdcall GetTypeByNameA(ptr ptr)
@ stub GetTypeByNameW @ stdcall GetTypeByNameW(ptr ptr)
@ stub MigrateWinsockConfiguration @ stdcall MigrateWinsockConfiguration(long long long)
@ stub NPLoadNameSpaces @ stdcall NPLoadNameSpaces(ptr ptr ptr)
@ stub NSPStartup @ stdcall NSPStartup(ptr ptr)
@ stub ServiceMain @ stdcall ServiceMain(long long)
@ stub SetServiceA @ stdcall SetServiceA(long long long ptr ptr ptr)
@ stub SetServiceW @ stdcall SetServiceW(long long long ptr ptr ptr)
@ stub StartWsdpService @ stdcall StartWsdpService()
@ stub StopWsdpService @ stdcall StopWsdpService()
@ stub SvchostPushServiceGlobals @ stdcall SvchostPushServiceGlobals(long)
@ stdcall TransmitFile(long long long long ptr ptr long) @ stdcall TransmitFile(long long long long ptr ptr long)
@ stdcall WSARecvEx(long ptr long ptr) @ stdcall WSARecvEx(long ptr long ptr)
@ stub WSPStartup @ stdcall WSPStartup(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stub dn_expand @ stdcall dn_expand(ptr ptr ptr ptr long)
@ stub getnetbyname @ stdcall getnetbyname(ptr)
@ stub inet_network @ stdcall inet_network(ptr)
@ stub rcmd @ stdcall rcmd(ptr long ptr ptr ptr ptr)
@ stub rexec @ stdcall rexec(ptr long ptr ptr ptr ptr)
@ stub rresvport @ stdcall rresvport(ptr)
@ stub s_perror @ stdcall s_perror(ptr)
@ stub sethostname @ stdcall sethostname(ptr long)

View file

@ -703,23 +703,6 @@ WPUCompleteOverlappedRequest(IN SOCKET s,
} }
/*
* @unimplemented
*/
INT
EXPORT
WSPStartup(IN WORD wVersionRequested,
OUT LPWSPDATA lpWSPData,
IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
IN WSPUPCALLTABLE UpcallTable,
OUT LPWSPPROC_TABLE lpProcTable)
{
UNIMPLEMENTED
return WSASYSCALLFAILURE;
}
/* /*
* @unimplemented * @unimplemented
*/ */