[WSOCK32]

remove useless def file
rbuild : use spec file
cmake : do not use two def files, it's... pointless.

svn path=/trunk/; revision=52069

diff --git a/reactos/dll/win32/wsock32/CMakeLists.txt b/reactos/dll/win32/wsock32/CMakeLists.txt
index 3018af1..f6d69c6 100644 (file)
--- a/reactos/dll/win32/wsock32/CMakeLists.txt
+++ b/reactos/dll/win32/wsock32/CMakeLists.txt
@@ -2,7 +2,7 @@
 set_unicode()
 
 spec2def(wsock32.dll wsock32.spec)
-add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def)
+add_library(wsock32 SHARED stubs.c wsock32.rc ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def)
 
 set_module_type(wsock32 win32dll)
 

diff --git a/reactos/dll/win32/wsock32/wsock32.def b/reactos/dll/win32/wsock32/wsock32.def
deleted file mode 100644 (file)
index 6b87a57..0000000
--- a/reactos/dll/win32/wsock32/wsock32.def
+++ /dev/null
@@ -1,78 +0,0 @@
-LIBRARY wsock32.dll
-
-EXPORTS
-accept=ws2_32.accept @1
-bind=ws2_32.bind @2
-closesocket=ws2_32.closesocket @3
-connect=ws2_32.connect @4
-getpeername=ws2_32.getpeername @5
-getsockname=ws2_32.getsockname @6
-getsockopt@20=ws2_32.getsockopt @7
-htonl=ws2_32.htonl @8
-htons=ws2_32.htons @9
-inet_addr=ws2_32.inet_addr @10
-inet_ntoa=ws2_32.inet_ntoa @11
-ioctlsocket=ws2_32.ioctlsocket @12
-listen=ws2_32.listen @13
-ntohl=ws2_32.ntohl @14
-ntohs=ws2_32.ntohs @15
-recv@16=ws2_32.recv @16
-recvfrom@24=ws2_32.recvfrom @17
-select=ws2_32.select @18
-send=ws2_32.send @19
-sendto=ws2_32.sendto @20
-setsockopt@20=ws2_32.setsockopt @21
-shutdown=ws2_32.shutdown @22
-socket=ws2_32.socket @23
-MigrateWinsockConfiguration=MSWSOCK.MigrateWinsockConfiguration @24
-gethostbyaddr=ws2_32.gethostbyaddr @51
-gethostbyname=ws2_32.gethostbyname @52
-getprotobyname=ws2_32.getprotobyname @53
-getprotobynumber=ws2_32.getprotobynumber @54
-getservbyname=ws2_32.getservbyname @55
-getservbyport=ws2_32.getservbyport @56
-gethostname=ws2_32.gethostname @57
-WSAAsyncSelect=ws2_32.WSAAsyncSelect @101
-WSAAsyncGetHostByAddr=ws2_32.WSAAsyncGetHostByAddr @102
-WSAAsyncGetHostByName=ws2_32.WSAAsyncGetHostByName @103
-WSAAsyncGetProtoByNumber=ws2_32.WSAAsyncGetProtoByNumber @104
-WSAAsyncGetProtoByName=ws2_32.WSAAsyncGetProtoByName @105
-WSAAsyncGetServByPort=ws2_32.WSAAsyncGetServByPort @106
-WSAAsyncGetServByName=ws2_32.WSAAsyncGetServByName @107
-WSACancelAsyncRequest=ws2_32.WSACancelAsyncRequest @108
-WSASetBlockingHook=ws2_32.WSASetBlockingHook @109
-WSAUnhookBlockingHook=ws2_32.WSAUnhookBlockingHook @110
-WSAGetLastError=ws2_32.WSAGetLastError @111
-WSASetLastError=ws2_32.WSASetLastError @112
-WSACancelBlockingCall=ws2_32.WSACancelBlockingCall @113
-WSAIsBlocking=ws2_32.WSAIsBlocking @114
-WSAStartup=ws2_32.WSAStartup @115
-WSACleanup=ws2_32.WSACleanup @116
-__WSAFDIsSet=ws2_32.__WSAFDIsSet @151
-WEP=ws2_32.WEP @500
-WSApSetPostRoutine=ws2_32.WSApSetPostRoutine @1000
-inet_network=MSWSOCK.inet_network @1100
-getnetbyname=MSWSOCK.getnetbyname @1101
-rcmd=MSWSOCK.rcmd @1102
-rexec=MSWSOCK.rexec @1103
-rresvport=MSWSOCK.rresvport @1104
-sethostname=MSWSOCK.sethostname @1105
-dn_expand=MSWSOCK.dn_expand @1106
-WSARecvEx=MSWSOCK.WSARecvEx @1107
-s_perror=MSWSOCK.s_perror @1108
-GetAddressByNameA=MSWSOCK.GetAddressByNameA @1109
-GetAddressByNameW=MSWSOCK.GetAddressByNameW @1110
-EnumProtocolsA=MSWSOCK.EnumProtocolsA @1111
-EnumProtocolsW=MSWSOCK.EnumProtocolsW @1112
-GetTypeByNameA=MSWSOCK.GetTypeByNameA @1113
-GetTypeByNameW=MSWSOCK.GetTypeByNameW @1114
-GetNameByTypeA=MSWSOCK.GetNameByTypeA @1115
-GetNameByTypeW=MSWSOCK.GetNameByTypeW @1116
-SetServiceA=MSWSOCK.SetServiceA @1117
-SetServiceW=MSWSOCK.SetServiceW @1118
-GetServiceA=MSWSOCK.GetServiceA @1119
-GetServiceW=MSWSOCK.GetServiceW @1120
-NPLoadNameSpaces=MSWSOCK.NPLoadNameSpaces @1130
-TransmitFile=MSWSOCK.TransmitFile @1140
-AcceptEx=MSWSOCK.AcceptEx @1141
-GetAcceptExSockaddrs=MSWSOCK.GetAcceptExSockaddrs  @1142

diff --git a/reactos/dll/win32/wsock32/wsock32.rbuild b/reactos/dll/win32/wsock32/wsock32.rbuild
index a0d74bc..5375b53 100644 (file)
--- a/reactos/dll/win32/wsock32/wsock32.rbuild
+++ b/reactos/dll/win32/wsock32/wsock32.rbuild
@@ -1,5 +1,5 @@
 <module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll" unicode="yes">
-       <importlibrary definition="wsock32.def" />
+       <importlibrary definition="wsock32.spec" />
        <include base="wsock32">.</include>
        <library>ntdll</library>
        <library>ws2_32</library>