From fd94f77ea86f903bcdc45d6f7b5fb2282950260b Mon Sep 17 00:00:00 2001 From: Vizzini Date: Sat, 13 Sep 2003 21:15:03 +0000 Subject: [PATCH] patch by Filip Navara for remaining mswsock stubs svn path=/trunk/; revision=6063 --- reactos/lib/mswsock/mswsock.def | 15 +++---- reactos/lib/mswsock/mswsock.edf | 68 ++++++++++++++-------------- reactos/lib/mswsock/stubs.c | 80 ++++++++++++++++++++++++++++++--- 3 files changed, 115 insertions(+), 48 deletions(-) diff --git a/reactos/lib/mswsock/mswsock.def b/reactos/lib/mswsock/mswsock.def index 13007a7f507..46ea09fc17a 100644 --- a/reactos/lib/mswsock/mswsock.def +++ b/reactos/lib/mswsock/mswsock.def @@ -1,4 +1,4 @@ -; $Id: mswsock.def,v 1.1 2003/09/12 17:51:47 vizzini Exp $ +; $Id: mswsock.def,v 1.2 2003/09/13 21:15:03 vizzini Exp $ ; ; MSWSOCK.DLL - Windows Sockets 2 DLL @@ -17,8 +17,8 @@ GetServiceA@28 GetServiceW@28 GetTypeByNameA@8 GetTypeByNameW@8 -;MigrateWinsockConfiguration -;NPLoadNameSpaces +MigrateWinsockConfiguration@12 +NPLoadNameSpaces@12 SetServiceA@24 SetServiceW@24 TransmitFile@28 @@ -34,8 +34,7 @@ sethostname@8 NSPStartup@8 WSPStartup@76 NPLoadNameSpaces@12 -;MigrateWinsockConfiguration -;ServiceMain -;StartWsdpService -;StopWsdpService -;SvchostPushServiceGlobals +ServiceMain@8 +StartWsdpService@0 +StopWsdpService@0 +SvchostPushServiceGlobals@4 diff --git a/reactos/lib/mswsock/mswsock.edf b/reactos/lib/mswsock/mswsock.edf index 18e77ccc0a6..cc576d8bfb2 100644 --- a/reactos/lib/mswsock/mswsock.edf +++ b/reactos/lib/mswsock/mswsock.edf @@ -1,41 +1,39 @@ -; $Id: mswsock.edf,v 1.1 2003/09/12 17:51:47 vizzini Exp $ +; $Id: mswsock.edf,v 1.2 2003/09/13 21:15:03 vizzini Exp $ ; ; MSWSOCK.DLL - Windows Sockets 2 DLL LIBRARY mswsock.dll EXPORTS -AcceptEx=AcceptEx@32 -EnumProtocolsA=EnumProtocolsA@12 -EnumProtocolsW=EnumProtocolsW@12 -GetAcceptExSockaddrs=GetAcceptExSockaddrs@32 -GetAddressByNameA=GetAddressByNameA@40 -GetAddressByNameW=GetAddressByNameW@40 -GetNameByTypeA=GetNameByTypeA@12 -GetNameByTypeW=GetNameByTypeW@12 -GetServiceA=GetServiceA@28 -GetServiceW=GetServiceW@28 -GetTypeByNameA=GetTypeByNameA@8 -GetTypeByNameW=GetTypeByNameW@8 -;MigrateWinsockConfiguration -;NPLoadNameSpaces -SetServiceA=SetServiceA@24 -SetServiceW=SetServiceW@24 -TransmitFile=TransmitFile@28 -WSARecvEx=WSARecvEx@16 -dn_expand=dn_expand@20 -getnetbyname=getnetbyname@4 -inet_network=inet_network@4 -rcmd=rcmd@24 -rexec=rexec@24 -rresvport=rresvport@4 -s_perror=s_perror@4 -sethostname=sethostname@8 -NSPStartup=NSPStartup@8 -WSPStartup=WSPStartup@76 -NPLoadNameSpaces=NPLoadNameSpaces@12 -;MigrateWinsockConfiguration -;ServiceMain -;StartWsdpService -;StopWsdpService -;SvchostPushServiceGlobals +ServiceMain=ServiceMain@8 @0 +SvchostPushServiceGlobals=SvchostPushServiceGlobals@4 @1 +AcceptEx=AcceptEx@32 @2 +EnumProtocolsA=EnumProtocolsA@12 @3 +EnumProtocolsW=EnumProtocolsW@12 @4 +GetAcceptExSockaddrs=GetAcceptExSockaddrs@32 @5 +GetAddressByNameA=GetAddressByNameA@40 @6 +GetAddressByNameW=GetAddressByNameW@40 @7 +GetNameByTypeA=GetNameByTypeA@12 @8 +GetNameByTypeW=GetNameByTypeW@12 @9 +GetServiceA=GetServiceA@28 @10 +GetServiceW=GetServiceW@28 @11 +GetTypeByNameA=GetTypeByNameA@8 @12 +GetTypeByNameW=GetTypeByNameW@8 @13 +MigrateWinsockConfiguration=MigrateWinsockConfiguration@12 @14 +NPLoadNameSpaces=NPLoadNameSpaces@12 @15 +NSPStartup=NSPStartup@8 @16 +SetServiceA=SetServiceA@24 @17 +SetServiceW=SetServiceW@24 @18 +StartWsdpService=StartWsdpService@0 @19 +StopWsdpService=StopWsdpService@0 @20 +TransmitFile=TransmitFile@28 @21 +WSARecvEx=WSARecvEx@16 @22 +WSPStartup=WSPStartup@76 @23 +dn_expand=dn_expand@20 @24 +getnetbyname=getnetbyname@4 @25 +inet_network=inet_network@4 @26 +rcmd=rcmd@24 @27 +rexec=rexec@24 @28 +rresvport=rresvport@4 @29 +s_perror=s_perror@4 @30 +sethostname=sethostname@8 @31 diff --git a/reactos/lib/mswsock/stubs.c b/reactos/lib/mswsock/stubs.c index 1242ea87cbe..413d2e9fe84 100644 --- a/reactos/lib/mswsock/stubs.c +++ b/reactos/lib/mswsock/stubs.c @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.1 2003/09/12 17:51:47 vizzini Exp $ +/* $Id: stubs.c,v 1.2 2003/09/13 21:15:03 vizzini Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock DLL @@ -191,6 +191,21 @@ GetTypeByNameW(LPWSTR ServiceName, } +/* + * @unimplemented + */ +INT +STDCALL +MigrateWinsockConfiguration(DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3) +{ + OutputDebugStringW(L"w32sock MigrateWinsockConfiguration stub called\n"); + + return SOCKET_ERROR; +} + + /* * @unimplemented */ @@ -389,6 +404,7 @@ DllMain(HINSTANCE InstDLL, return TRUE; } + /* * @unimplemented */ @@ -400,6 +416,7 @@ GetNameByTypeA(LPGUID lpServiceType,LPSTR lpServiceName,DWORD dwNameLength) return TRUE; } + /* * @unimplemented */ @@ -411,6 +428,7 @@ GetNameByTypeW(LPGUID lpServiceType,LPWSTR lpServiceName,DWORD dwNameLength) return TRUE; } + /* * @unimplemented */ @@ -424,6 +442,7 @@ NSPStartup( return TRUE; } + /* * @unimplemented */ @@ -440,16 +459,67 @@ WSPStartup( return TRUE; } + /* * @unimplemented */ INT STDCALL -NPLoadNameSpaces ( - IN OUT LPDWORD lpdwVersion, - IN OUT LPNS_ROUTINE nsrBuffer, - IN OUT LPDWORD lpdwBufferLength +NPLoadNameSpaces( + IN OUT LPDWORD lpdwVersion, + IN OUT LPNS_ROUTINE nsrBuffer, + IN OUT LPDWORD lpdwBufferLength ) { + OutputDebugStringW(L"mswsock NPLoadNameSpaces stub called\n"); + + *lpdwVersion = 1; + return TRUE; } + + +/* + * @unimplemented + */ +VOID +STDCALL +StartWsdpService() +{ + OutputDebugStringW(L"mswsock StartWsdpService stub called\n"); +} + + +/* + * @unimplemented + */ +VOID +STDCALL +StopWsdpService() +{ + OutputDebugStringW(L"mswsock StopWsdpService stub called\n"); +} + + +/* + * @unimplemented + */ +DWORD +STDCALL +SvchostPushServiceGlobals(DWORD Value) +{ + OutputDebugStringW(L"mswsock SvchostPushServiceGlobals stub called\n"); + + return 0; +} + + +/* + * @unimplemented + */ +VOID +STDCALL +ServiceMain(DWORD Unknown1, DWORD Unknown2) +{ + OutputDebugStringW(L"mswsock ServiceMain stub called\n"); +}