[ros-diffs] [spetreolle] 50423: [CMAKE] Convert wsock32 to spec.

Author: spetreolle
Date: Tue Jan 18 15:02:26 2011
New Revision: 50423

URL: http://svn.reactos.org/svn/reactos?rev=50423&view=rev
Log:
[CMAKE]
Convert wsock32 to spec.

Added:
    branches/cmake-bringup/dll/win32/wsock32/wsock32.spec   (with props)
Removed:
    branches/cmake-bringup/dll/win32/wsock32/wsock32.def
Modified:
    branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32…
==============================================================================
--- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Tue Jan 18
15:02:26 2011
@@ -1,11 +1,8 @@
 
 set_unicode()
 
-add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def)
-
-if(NOT MSVC)
-    set_source_files_properties(wsock32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+spec2def(wsock32.dll wsock32.spec)
+add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def
${CMAKE_CURRENT_BINARY_DIR}/wsock32.def)
 
 set_module_type(wsock32 win32dll)
 

Removed: branches/cmake-bringup/dll/win32/wsock32/wsock32.def
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32…
==============================================================================
--- branches/cmake-bringup/dll/win32/wsock32/wsock32.def [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wsock32/wsock32.def (removed)
@@ -1,78 +1,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(a)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(a)16=ws2_32.recv @16
-recvfrom(a)24=ws2_32.recvfrom @17
-select=ws2_32.select @18
-send=ws2_32.send @19
-sendto=ws2_32.sendto @20
-setsockopt(a)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

Added: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32…
==============================================================================
--- branches/cmake-bringup/dll/win32/wsock32/wsock32.spec (added)
+++ branches/cmake-bringup/dll/win32/wsock32/wsock32.spec [iso-8859-1] Tue Jan 18 15:02:26
2011
@@ -1,0 +1,84 @@
+1   stdcall  accept(long ptr ptr) ws2_32.accept
+2   stdcall  bind(long ptr long) ws2_32.bind
+3   stdcall  closesocket(long) ws2_32.closesocket
+4   stdcall  connect(long ptr long) ws2_32.connect
+5   stdcall  getpeername(long ptr ptr) ws2_32.getpeername
+6   stdcall  getsockname(long ptr ptr) ws2_32.getsockname
+7   stdcall  getsockopt(long long long ptr ptr) ws2_32.getsockopt
+8   stdcall  htonl(long) ws2_32.htonl
+9   stdcall  htons(long) ws2_32.htons
+10  stdcall  ioctlsocket(long long ptr) ws2_32.ioctlsocket
+11  stdcall  inet_addr(str) ws2_32.inet_addr
+12  stdcall  inet_ntoa(ptr) ws2_32.inet_ntoa
+13  stdcall  listen(long long) ws2_32.listen
+14  stdcall  ntohl(long) ws2_32.ntohl
+15  stdcall  ntohs(long) ws2_32.ntohs
+16  stdcall  recv(long ptr long long) ws2_32.recv
+17  stdcall  recvfrom(long ptr long long ptr ptr) ws2_32.recvfrom
+18  stdcall  select(long ptr ptr ptr ptr) ws2_32.select
+19  stdcall  send(long ptr long long) ws2_32.send
+20  stdcall  sendto(long ptr long long ptr long) ws2_32.sendto
+21  stdcall  setsockopt(long long long ptr long) ws2_32.setsockopt
+22  stdcall  shutdown(long long) ws2_32.shutdown
+23  stdcall  socket(long long long) ws2_32.socket
+24  stdcall  MigrateWinsockConfiguration(long long long)
mswsock.MigrateWinsockConfiguration
+
+51  stdcall  gethostbyaddr(ptr long long) ws2_32.gethostbyaddr
+52  stdcall  gethostbyname(str) ws2_32.gethostbyname
+53  stdcall  getprotobyname(str) ws2_32.getprotobyname
+54  stdcall  getprotobynumber(long) ws2_32.getprotobynumber
+55  stdcall  getservbyname(str str) ws2_32.getservbyname
+56  stdcall  getservbyport(long str) ws2_32.getservbyport
+57  stdcall  gethostname(ptr long) ws2_32.gethostname
+
+101 stdcall WSAAsyncSelect(long long long long) ws2_32.WSAAsyncSelect
+102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long)
ws2_32.WSAAsyncGetHostByAddr
+103 stdcall WSAAsyncGetHostByName(long long str ptr long) ws2_32.WSAAsyncGetHostByName
+104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long)
ws2_32.WSAAsyncGetProtoByNumber
+105 stdcall WSAAsyncGetProtoByName(long long str ptr long) ws2_32.WSAAsyncGetProtoByName
+106 stdcall WSAAsyncGetServByPort(long long long str ptr long)
ws2_32.WSAAsyncGetServByPort
+107 stdcall WSAAsyncGetServByName(long long str str ptr long)
ws2_32.WSAAsyncGetServByName
+108 stdcall WSACancelAsyncRequest(long) ws2_32.WSACancelAsyncRequest
+109 stdcall WSASetBlockingHook(ptr) ws2_32.WSASetBlockingHook
+110 stdcall WSAUnhookBlockingHook() ws2_32.WSAUnhookBlockingHook
+111 stdcall WSAGetLastError() ws2_32.WSAGetLastError
+112 stdcall WSASetLastError(long) ws2_32.WSASetLastError
+113 stdcall WSACancelBlockingCall() ws2_32.WSACancelBlockingCall
+114 stdcall WSAIsBlocking() ws2_32.WSAIsBlocking
+115 stdcall WSAStartup(long ptr) ws2_32.WSAStartup
+116 stdcall WSACleanup() ws2_32.WSACleanup
+
+151 stdcall  __WSAFDIsSet(long ptr) ws2_32.__WSAFDIsSet
+
+500 stdcall WEP() ws2_32.WEP
+
+1000 stdcall WSApSetPostRoutine(ptr) ws2_32.WSApSetPostRoutine
+
+1100 stdcall inet_network(ptr) MSWSOCK.inet_network
+1101 stdcall getnetbyname(ptr) MSWSOCK.getnetbyname
+1102 stdcall rcmd(ptr long ptr ptr ptr ptr) MSWSOCK.rcmd
+1103 stdcall rexec(ptr long ptr ptr ptr ptr) MSWSOCK.rexec
+1104 stdcall rresvport(ptr) MSWSOCK.rresvport
+1105 stdcall sethostname(ptr long) MSWSOCK.sethostname
+1106 stdcall dn_expand(ptr ptr ptr ptr long) MSWSOCK.dn_expand
+1107 stdcall WSARecvEx(long ptr long ptr) MSWSOCK.WSARecvEx
+1108 stdcall s_perror(ptr) MSWSOCK.s_perror
+1109 stdcall GetAddressByNameA(long ptr ptr ptr long ptr ptr ptr ptr ptr)
MSWSOCK.GetAddressByNameA
+1110 stdcall GetAddressByNameW(long ptr ptr ptr long ptr ptr ptr ptr ptr)
MSWSOCK.GetAddressByNameW
+1111 stdcall EnumProtocolsA(ptr ptr ptr) MSWSOCK.EnumProtocolsA
+1112 stdcall EnumProtocolsW(ptr ptr ptr) MSWSOCK.EnumProtocolsW
+1113 stdcall GetTypeByNameA(ptr ptr) MSWSOCK.GetTypeByNameA
+1114 stdcall GetTypeByNameW(ptr ptr) MSWSOCK.GetTypeByNameW
+1115 stdcall GetNameByTypeA(ptr ptr long) MSWSOCK.GetNameByTypeA
+1116 stdcall GetNameByTypeW(ptr ptr long) MSWSOCK.GetNameByTypeW
+1117 stdcall SetServiceA(long long long ptr ptr ptr) MSWSOCK.SetServiceA
+1118 stdcall SetServiceW(long long long ptr ptr ptr) MSWSOCK.SetServiceW
+1119 stdcall GetServiceA(long ptr ptr long ptr ptr ptr) MSWSOCK.GetServiceA
+1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) MSWSOCK.GetServiceW
+1130 stdcall NPLoadNameSpaces(ptr ptr ptr) MSWSOCK.NPLoadNameSpaces
+1140 stdcall TransmitFile(long long long long ptr ptr long) MSWSOCK.TransmitFile
+1141 stdcall AcceptEx(long long ptr long long long ptr ptr) MSWSOCK.AcceptEx
+1142 stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr)
MSWSOCK.GetAcceptExSockaddrs
+
+
+

Propchange: branches/cmake-bringup/dll/win32/wsock32/wsock32.spec
------------------------------------------------------------------------------
    svn:eol-style = native