- 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

diff --git a/reactos/dll/win32/mswsock/mswsock.def b/reactos/dll/win32/mswsock/mswsock.def
deleted file mode 100644 (file)
index 3fca871..0000000
--- a/reactos/dll/win32/mswsock/mswsock.def
+++ /dev/null
@@ -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

diff --git a/reactos/dll/win32/mswsock/mswsock.spec b/reactos/dll/win32/mswsock/mswsock.spec
index 1f2bd78..0fef34d 100644 (file)
--- a/reactos/dll/win32/mswsock/mswsock.spec
+++ b/reactos/dll/win32/mswsock/mswsock.spec
@@ -2,31 +2,31 @@
 @ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA
 @ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW
 @ stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr)
-@ stub GetAddressByNameA
-@ stub GetAddressByNameW
-@ stub GetNameByTypeA
-@ stub GetNameByTypeW
-@ stub GetServiceA
-@ stub GetServiceW
-@ stub GetTypeByNameA
-@ stub GetTypeByNameW
-@ stub MigrateWinsockConfiguration
-@ stub NPLoadNameSpaces
-@ stub NSPStartup
-@ stub ServiceMain
-@ stub SetServiceA
-@ stub SetServiceW
-@ stub StartWsdpService
-@ stub StopWsdpService
-@ stub SvchostPushServiceGlobals
+@ stdcall GetAddressByNameA(long ptr ptr ptr long ptr ptr ptr ptr ptr)
+@ stdcall GetAddressByNameW(long ptr ptr ptr long ptr ptr ptr ptr ptr)
+@ stdcall GetNameByTypeA(ptr ptr long)
+@ stdcall GetNameByTypeW(ptr ptr long)
+@ stdcall GetServiceA(long ptr ptr long ptr ptr ptr)
+@ stdcall GetServiceW(long ptr ptr long ptr ptr ptr)
+@ stdcall GetTypeByNameA(ptr ptr)
+@ stdcall GetTypeByNameW(ptr ptr)
+@ stdcall MigrateWinsockConfiguration(long long long)
+@ stdcall NPLoadNameSpaces(ptr ptr ptr)
+@ stdcall NSPStartup(ptr ptr)
+@ stdcall ServiceMain(long long)
+@ stdcall SetServiceA(long long long ptr ptr ptr)
+@ stdcall SetServiceW(long long long ptr ptr ptr)
+@ stdcall StartWsdpService()
+@ stdcall StopWsdpService()
+@ stdcall SvchostPushServiceGlobals(long)
 @ stdcall TransmitFile(long long long long ptr ptr long)
 @ stdcall WSARecvEx(long ptr long ptr)
-@ stub WSPStartup
-@ stub dn_expand
-@ stub getnetbyname
-@ stub inet_network
-@ stub rcmd
-@ stub rexec
-@ stub rresvport
-@ stub s_perror
-@ stub sethostname
+@ stdcall WSPStartup(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall dn_expand(ptr ptr ptr ptr long)
+@ stdcall getnetbyname(ptr)
+@ stdcall inet_network(ptr)
+@ stdcall rcmd(ptr long ptr ptr ptr ptr)
+@ stdcall rexec(ptr long ptr ptr ptr ptr)
+@ stdcall rresvport(ptr)
+@ stdcall s_perror(ptr)
+@ stdcall sethostname(ptr long)

diff --git a/reactos/dll/win32/ws2_32/misc/stubs.c b/reactos/dll/win32/ws2_32/misc/stubs.c
index a5fe5a3..408f282 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/stubs.c
+++ b/reactos/dll/win32/ws2_32/misc/stubs.c
@@ -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
  */