Author: dchapyshev Date: Tue Jul 21 11:06:25 2009 New Revision: 42113
URL: http://svn.reactos.org/svn/reactos?rev=42113&view=rev Log: - .def -> .spec - Fix .rbuild
Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec (with props) Removed: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
Removed: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_32... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.def (removed) @@ -1,124 +1,0 @@ -; WS2_32.DLL - Windows Sockets 2 DLL - -LIBRARY ws2_32.dll - -EXPORTS -WEP@0 @500 -WPUCompleteOverlappedRequest@20 @28 -WSAAccept@20 @29 -WSAAddressToStringA@20 @30 -WSAAddressToStringW@20 @31 -WSAAsyncGetHostByAddr@28 @102 -WSAAsyncGetHostByName@20 @103 -WSAAsyncGetProtoByName@20 @105 -WSAAsyncGetProtoByNumber@20 @104 -WSAAsyncGetServByName@24 @107 -WSAAsyncGetServByPort@24 @106 -WSAAsyncSelect@16 @101 -WSACancelAsyncRequest@4 @108 -WSACancelBlockingCall@0 @113 -WSACleanup@0 @116 -WSACloseEvent@4 @32 -WSAConnect@28 @33 -WSACreateEvent@0 @34 -WSADuplicateSocketA@12 @35 -WSADuplicateSocketW@12 @36 -WSAEnumNameSpaceProvidersA@8 @37 -WSAEnumNameSpaceProvidersW@8 @38 -WSAEnumNetworkEvents@12 @39 -WSAEnumProtocolsA@12 @40 -WSAEnumProtocolsW@12 @41 -WSAEventSelect @42 -WSAGetLastError @111 -WSAGetOverlappedResult @43 -WSAGetQOSByName @44 -WSAGetServiceClassInfoA @45 -WSAGetServiceClassInfoW @46 -WSAGetServiceClassNameByClassIdA @47 -WSAGetServiceClassNameByClassIdW @48 -WSAHtonl @49 -WSAHtons @50 -WSAInstallServiceClassA @58 -WSAInstallServiceClassW @59 -WSAIoctl @60 -WSAIsBlocking @114 -WSAJoinLeaf @61 -WSALookupServiceBeginA @62 -WSALookupServiceBeginW @63 -WSALookupServiceEnd @64 -WSALookupServiceNextA @65 -WSALookupServiceNextW @66 -WSANSPIoctl @67 -WSANtohl @68 -WSANtohs @69 -WSAProviderConfigChange @70 -WSARecv @71 -WSARecvDisconnect @72 -WSARecvFrom @73 -WSARemoveServiceClass @74 -WSAResetEvent @75 -WSASend @76 -WSASendDisconnect @77 -WSASendTo @78 -WSASetBlockingHook @109 -WSASetEvent @79 -WSASetLastError @112 -WSASetServiceA @80 -WSASetServiceW @81 -WSASocketA @82 -WSASocketW @83 -WSAStartup @115 -WSAStringToAddressA @84 -WSAStringToAddressW @85 -WSAUnhookBlockingHook @110 -WSAWaitForMultipleEvents @86 -WSApSetPostRoutine @26 -FreeAddrInfoW=freeaddrinfo @27 -WSCDeinstallProvider @87 -WSCEnableNSProvider @88 -WSCEnumProtocols @89 -WSCGetProviderPath @90 -WSCInstallNameSpace @91 -WSCInstallProvider @92 -WSCUnInstallNameSpace @93 -WSCUpdateProvider @94 -WSCWriteNameSpaceOrder @95 -WSCWriteProviderOrder @96 -__WSAFDIsSet @151 -accept @1 -bind @2 -closesocket @3 -connect @4 -freeaddrinfo @97 -getaddrinfo @98 -gethostbyaddr @51 -gethostbyname @52 -gethostname @57 -getnameinfo @99 -getpeername @5 -getprotobyname @53 -getprotobynumber @54 -getservbyname @55 -getservbyport @56 -getsockname @6 -getsockopt @7 -htonl @8 -htons @9 -inet_addr @11 -inet_ntoa @12 -ioctlsocket @10 -listen @13 -ntohl @14 -ntohs @15 -recv @16 -recvfrom @17 -select @18 -send @19 -sendto @20 -setsockopt @21 -shutdown @22 -socket @23 -GetAddrInfoW @24 -GetNameInfoW @25 - -; EOF
Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_32... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Tue Jul 21 11:06:25 2009 @@ -1,7 +1,6 @@ -<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes"> +<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll"> <importlibrary definition="ws2_32.spec" /> - <include base="ws2_32">include</include> - <include base="ReactOS">include/reactos/wine</include> + <include base="ws2_32_new">inc</include> <define name="LE" /> <library>wine</library> <library>ntdll</library> @@ -9,6 +8,7 @@ <library>user32</library> <library>advapi32</library> <library>dnsapi</library> + <library>ws2help</library> <directory name="src"> <file>addrconv.c</file> <file>addrinfo.c</file>
Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_32... ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec (added) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec [iso-8859-1] Tue Jul 21 11:06:25 2009 @@ -1,0 +1,117 @@ +500 stdcall WEP() +@ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) +@ stdcall WSAAccept(long ptr ptr ptr long) +@ stdcall WSAAddressToStringA(ptr long ptr ptr ptr) +@ stdcall WSAAddressToStringW(ptr long ptr ptr ptr) +102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) +103 stdcall WSAAsyncGetHostByName(long long str ptr long) +105 stdcall WSAAsyncGetProtoByName(long long str ptr long) +104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) +107 stdcall WSAAsyncGetServByName(long long str str ptr long) +106 stdcall WSAAsyncGetServByPort(long long long str ptr long) +101 stdcall WSAAsyncSelect(long long long long) +108 stdcall WSACancelAsyncRequest(long) +113 stdcall WSACancelBlockingCall() +116 stdcall WSACleanup() +@ stdcall WSACloseEvent(long) +@ stdcall WSAConnect(long ptr long ptr ptr ptr ptr) +@ stdcall WSACreateEvent () +@ stdcall WSADuplicateSocketA(long long ptr) +@ stdcall WSADuplicateSocketW(long long ptr) +@ stdcall WSAEnumNameSpaceProvidersA(ptr ptr) +@ stdcall WSAEnumNameSpaceProvidersW(ptr ptr) +@ stdcall WSAEnumNetworkEvents(long long ptr) +@ stdcall WSAEnumProtocolsA(ptr ptr ptr) +@ stdcall WSAEnumProtocolsW(ptr ptr ptr) +@ stdcall WSAEventSelect(long long long) +111 stdcall WSAGetLastError() +@ stdcall WSAGetOverlappedResult(long ptr ptr long ptr) +@ stdcall WSAGetQOSByName(long ptr ptr) +@ stdcall WSAGetServiceClassInfoA(ptr ptr ptr ptr) +@ stdcall WSAGetServiceClassInfoW(ptr ptr ptr ptr) +@ stdcall WSAGetServiceClassNameByClassIdA(ptr ptr ptr) +@ stdcall WSAGetServiceClassNameByClassIdW(ptr ptr ptr) +@ stdcall WSAHtonl(long long ptr) +@ stdcall WSAHtons(long long ptr) +@ stdcall WSAInstallServiceClassA(ptr) +@ stdcall WSAInstallServiceClassW(ptr) +@ stdcall WSAIoctl(long long ptr long ptr long ptr ptr ptr) +114 stdcall WSAIsBlocking() +@ stdcall WSAJoinLeaf(long ptr long ptr ptr ptr ptr long) +@ stdcall WSALookupServiceBeginA(ptr long ptr) +@ stdcall WSALookupServiceBeginW(ptr long ptr) +@ stdcall WSALookupServiceEnd(long) +@ stdcall WSALookupServiceNextA(long long ptr ptr) +@ stdcall WSALookupServiceNextW(long long ptr ptr) +@ stdcall WSANSPIoctl(long long ptr long ptr long ptr ptr) +@ stdcall WSANtohl(long long ptr) +@ stdcall WSANtohs(long long ptr) +@ stdcall WSAProviderConfigChange(ptr ptr ptr) +@ stdcall WSARecv(long ptr long ptr ptr ptr ptr) +@ stdcall WSARecvDisconnect(long ptr) +@ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall WSARemoveServiceClass(ptr) +@ stdcall WSAResetEvent(long) +@ stdcall WSASend(long ptr long ptr long ptr ptr) +@ stdcall WSASendDisconnect(long ptr) +@ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) +109 stdcall WSASetBlockingHook(ptr) +@ stdcall WSASetEvent(long) +112 stdcall WSASetLastError(long) +@ stdcall WSASetServiceA(ptr long long) +@ stdcall WSASetServiceW(ptr long long) +@ stdcall WSASocketA(long long long ptr long long) +@ stdcall WSASocketW(long long long ptr long long) +115 stdcall WSAStartup(long ptr) +@ stdcall WSAStringToAddressA(str long ptr ptr ptr) +@ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) +110 stdcall WSAUnhookBlockingHook() +@ stdcall WSAWaitForMultipleEvents(long ptr long long long) +@ stdcall WSApSetPostRoutine(ptr) +@ stdcall FreeAddrInfoW(ptr) freeaddrinfo +@ stdcall WSCDeinstallProvider(ptr ptr) +@ stdcall WSCEnableNSProvider(ptr long) +@ stdcall WSCEnumProtocols(ptr ptr ptr ptr) +@ stdcall WSCGetProviderPath(ptr ptr ptr ptr) +@ stdcall WSCInstallNameSpace(wstr wstr long long ptr) +@ stdcall WSCInstallProvider(ptr wstr ptr long ptr) +@ stdcall WSCUnInstallNameSpace(ptr) +@ stdcall WSCUpdateProvider(ptr ptr ptr long ptr) +@ stdcall WSCWriteNameSpaceOrder(ptr long) +@ stdcall WSCWriteProviderOrder(ptr long) +151 stdcall __WSAFDIsSet(long ptr) +1 stdcall accept(long ptr ptr) +2 stdcall bind(long ptr long) +3 stdcall closesocket(long) +4 stdcall connect(long ptr long) +@ stdcall freeaddrinfo(ptr) +@ stdcall getaddrinfo(str str ptr ptr) +51 stdcall gethostbyaddr(ptr long long) +52 stdcall gethostbyname(str) +57 stdcall gethostname(ptr long) +@ stdcall getnameinfo(ptr long ptr long ptr long long) +5 stdcall getpeername(long ptr ptr) +53 stdcall getprotobyname(str) +54 stdcall getprotobynumber(long) +55 stdcall getservbyname(str str) +56 stdcall getservbyport(long str) +6 stdcall getsockname(long ptr ptr) +7 stdcall getsockopt(long long long ptr ptr) +8 stdcall htonl(long) +9 stdcall htons(long) +11 stdcall inet_addr(str) +12 stdcall inet_ntoa(ptr) +10 stdcall ioctlsocket(long long ptr) +13 stdcall listen(long long) +14 stdcall ntohl(long) +15 stdcall ntohs(long) +16 stdcall recv(long ptr long long) +17 stdcall recvfrom(long ptr long long ptr ptr) +18 stdcall select(long ptr ptr ptr ptr) +19 stdcall send(long ptr long long) +20 stdcall sendto(long ptr long long ptr long) +21 stdcall setsockopt(long long long ptr long) +22 stdcall shutdown(long long) +23 stdcall socket(long long long) +@ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetNameInfoW(ptr long wstr long wstr long long)
Propchange: trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec ------------------------------------------------------------------------------ svn:eol-style = native