[ros-diffs] [fireball] 44224: - 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.

[fireball at svn.reactos.org]

Author: fireball
Date: Wed Nov 18 15:16:34 2009
New Revision: 44224

URL: http://svn.reactos.org/svn/reactos?rev=44224&view=rev
Log:
- 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.

Removed:
    trunk/reactos/dll/win32/mswsock/mswsock.def
Modified:
    trunk/reactos/dll/win32/mswsock/mswsock.spec
    trunk/reactos/dll/win32/ws2_32/misc/stubs.c

Removed: trunk/reactos/dll/win32/mswsock/mswsock.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.def?rev=44223&view=auto
==============================================================================
--- trunk/reactos/dll/win32/mswsock/mswsock.def [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mswsock/mswsock.def (removed)
@@ -1,39 +1,0 @@
-; $Id$
-;
-; MSWSOCK.DLL - Windows Sockets 2 DLL
-
-LIBRARY mswsock.dll
-
-EXPORTS
-ServiceMain at 8 @0
-SvchostPushServiceGlobals at 4 @1
-AcceptEx at 32 @2
-EnumProtocolsA at 12 @3
-EnumProtocolsW at 12 @4
-GetAcceptExSockaddrs at 32 @5
-GetAddressByNameA at 40 @6
-GetAddressByNameW at 40 @7
-GetNameByTypeA at 12 @8
-GetNameByTypeW at 12 @9
-GetServiceA at 28 @10
-GetServiceW at 28 @11
-GetTypeByNameA at 8 @12
-GetTypeByNameW at 8 @13
-MigrateWinsockConfiguration at 12 @14
-NPLoadNameSpaces at 12 @15
-NSPStartup at 8 @16
-SetServiceA at 24 @17
-SetServiceW at 24 @18
-StartWsdpService at 0 @19
-StopWsdpService at 0 @20
-TransmitFile at 28 @21
-WSARecvEx at 16 @22
-WSPStartup at 76 @23
-dn_expand at 20 @24
-getnetbyname at 4 @25
-inet_network at 4 @26
-rcmd at 24 @27
-rexec at 24 @28
-rresvport at 4 @29
-s_perror at 4 @30
-sethostname at 8 @31

Modified: trunk/reactos/dll/win32/mswsock/mswsock.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.spec?rev=44224&r1=44223&r2=44224&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mswsock/mswsock.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mswsock/mswsock.spec [iso-8859-1] Wed Nov 18 15:16:34 2009
@@ -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)

Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stubs.c?rev=44224&r1=44223&r2=44224&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Wed Nov 18 15:16:34 2009
@@ -708,23 +708,6 @@
  */
 INT
 EXPORT
-WSPStartup(IN  WORD wVersionRequested,
-           OUT LPWSPDATA lpWSPData,
-           IN  LPWSAPROTOCOL_INFOW lpProtocolInfo,
-           IN  WSPUPCALLTABLE UpcallTable,
-           OUT LPWSPPROC_TABLE lpProcTable)
-{
-    UNIMPLEMENTED
-
-    return WSASYSCALLFAILURE;
-}
-
-
-/*
- * @unimplemented
- */
-INT
-EXPORT
 WSCDeinstallProvider(IN  LPGUID lpProviderId,
                      OUT LPINT lpErrno)
 {