[ros-diffs] [cgutman] 47501: [MSAFD] - Msafd is really just a stub that points to mswsock
cgutman at svn.reactos.org
cgutman at svn.reactos.org
Mon May 31 20:17:06 CEST 2010
Author: cgutman
Date: Mon May 31 20:17:05 2010
New Revision: 47501
URL: http://svn.reactos.org/svn/reactos?rev=47501&view=rev
Log:
[MSAFD]
- Msafd is really just a stub that points to mswsock
Removed:
branches/aicom-network-branch/dll/win32/msafd/include/
branches/aicom-network-branch/dll/win32/msafd/misc/
branches/aicom-network-branch/dll/win32/msafd/msafd.h
Modified:
branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild
branches/aicom-network-branch/dll/win32/msafd/msafd.spec
Removed: branches/aicom-network-branch/dll/win32/msafd/msafd.h
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/msafd/msafd.h?rev=47500&view=auto
==============================================================================
--- branches/aicom-network-branch/dll/win32/msafd/msafd.h [iso-8859-1] (original)
+++ branches/aicom-network-branch/dll/win32/msafd/msafd.h (removed)
@@ -1,475 +1,0 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS Ancillary Function Driver DLL
- * FILE: include/msafd.h
- * PURPOSE: Ancillary Function Driver DLL header
- */
-#ifndef __MSAFD_H
-#define __MSAFD_H
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define WIN32_NO_STATUS
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2spi.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
-/* This includes ntsecapi.h so it needs to come after the NDK */
-#include <wsahelp.h>
-#include <tdi.h>
-#include <afd/shared.h>
-#include <helpers.h>
-
-extern HANDLE GlobalHeap;
-extern WSPUPCALLTABLE Upcalls;
-extern LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
-extern LIST_ENTRY SockHelpersListHead;
-extern HANDLE SockEvent;
-extern HANDLE SockAsyncCompletionPort;
-extern BOOLEAN SockAsyncSelectCalled;
-
-typedef enum _SOCKET_STATE {
- SocketOpen,
- SocketBound,
- SocketBoundUdp,
- SocketConnected,
- SocketClosed
-} SOCKET_STATE, *PSOCKET_STATE;
-
-typedef struct _SOCK_SHARED_INFO {
- SOCKET_STATE State;
- INT AddressFamily;
- INT SocketType;
- INT Protocol;
- INT SizeOfLocalAddress;
- INT SizeOfRemoteAddress;
- struct linger LingerData;
- ULONG SendTimeout;
- ULONG RecvTimeout;
- ULONG SizeOfRecvBuffer;
- ULONG SizeOfSendBuffer;
- struct {
- BOOLEAN Listening:1;
- BOOLEAN Broadcast:1;
- BOOLEAN Debug:1;
- BOOLEAN OobInline:1;
- BOOLEAN ReuseAddresses:1;
- BOOLEAN ExclusiveAddressUse:1;
- BOOLEAN NonBlocking:1;
- BOOLEAN DontUseWildcard:1;
- BOOLEAN ReceiveShutdown:1;
- BOOLEAN SendShutdown:1;
- BOOLEAN UseDelayedAcceptance:1;
- BOOLEAN UseSAN:1;
- }; // Flags
- DWORD CreateFlags;
- DWORD CatalogEntryId;
- DWORD ServiceFlags1;
- DWORD ProviderFlags;
- GROUP GroupID;
- DWORD GroupType;
- INT GroupPriority;
- INT SocketLastError;
- HWND hWnd;
- LONG Unknown;
- DWORD SequenceNumber;
- UINT wMsg;
- LONG AsyncEvents;
- LONG AsyncDisabledEvents;
-} SOCK_SHARED_INFO, *PSOCK_SHARED_INFO;
-
-typedef struct _SOCKET_INFORMATION {
- ULONG RefCount;
- SOCKET Handle;
- SOCK_SHARED_INFO SharedData;
- DWORD HelperEvents;
- PHELPER_DATA HelperData;
- PVOID HelperContext;
- PSOCKADDR LocalAddress;
- PSOCKADDR RemoteAddress;
- HANDLE TdiAddressHandle;
- HANDLE TdiConnectionHandle;
- PVOID AsyncData;
- HANDLE EventObject;
- LONG NetworkEvents;
- CRITICAL_SECTION Lock;
- PVOID SanData;
- BOOL TrySAN;
- SOCKADDR WSLocalAddress;
- SOCKADDR WSRemoteAddress;
-} SOCKET_INFORMATION, *PSOCKET_INFORMATION;
-
-
-typedef struct _SOCKET_CONTEXT {
- SOCK_SHARED_INFO SharedData;
- ULONG SizeOfHelperData;
- ULONG Padding;
- SOCKADDR LocalAddress;
- SOCKADDR RemoteAddress;
- /* Plus Helper Data */
-} SOCKET_CONTEXT, *PSOCKET_CONTEXT;
-
-typedef struct _ASYNC_DATA {
- PSOCKET_INFORMATION ParentSocket;
- DWORD SequenceNumber;
- IO_STATUS_BLOCK IoStatusBlock;
- AFD_POLL_INFO AsyncSelectInfo;
-} ASYNC_DATA, *PASYNC_DATA;
-
-SOCKET
-WSPAPI
-WSPAccept(
- IN SOCKET s,
- OUT LPSOCKADDR addr,
- IN OUT LPINT addrlen,
- IN LPCONDITIONPROC lpfnCondition,
- IN DWORD dwCallbackData,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPAddressToString(
- IN LPSOCKADDR lpsaAddress,
- IN DWORD dwAddressLength,
- IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
- OUT LPWSTR lpszAddressString,
- IN OUT LPDWORD lpdwAddressStringLength,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPAsyncSelect(
- IN SOCKET s,
- IN HWND hWnd,
- IN UINT wMsg,
- IN LONG lEvent,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI WSPBind(
- IN SOCKET s,
- IN CONST SOCKADDR *name,
- IN INT namelen,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPCancelBlockingCall(
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPCleanup(
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPCloseSocket(
- IN SOCKET s,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPConnect(
- IN SOCKET s,
- IN CONST SOCKADDR *name,
- IN INT namelen,
- IN LPWSABUF lpCallerData,
- OUT LPWSABUF lpCalleeData,
- IN LPQOS lpSQOS,
- IN LPQOS lpGQOS,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPDuplicateSocket(
- IN SOCKET s,
- IN DWORD dwProcessId,
- OUT LPWSAPROTOCOL_INFOW lpProtocolInfo,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPEnumNetworkEvents(
- IN SOCKET s,
- IN WSAEVENT hEventObject,
- OUT LPWSANETWORKEVENTS lpNetworkEvents,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPEventSelect(
- IN SOCKET s,
- IN WSAEVENT hEventObject,
- IN LONG lNetworkEvents,
- OUT LPINT lpErrno);
-
-BOOL
-WSPAPI
-WSPGetOverlappedResult(
- IN SOCKET s,
- IN LPWSAOVERLAPPED lpOverlapped,
- OUT LPDWORD lpcbTransfer,
- IN BOOL fWait,
- OUT LPDWORD lpdwFlags,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPGetPeerName(
- IN SOCKET s,
- OUT LPSOCKADDR name,
- IN OUT LPINT namelen,
- OUT LPINT lpErrno);
-
-BOOL
-WSPAPI
-WSPGetQOSByName(
- IN SOCKET s,
- IN OUT LPWSABUF lpQOSName,
- OUT LPQOS lpQOS,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPGetSockName(
- IN SOCKET s,
- OUT LPSOCKADDR name,
- IN OUT LPINT namelen,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPGetSockOpt(
- IN SOCKET s,
- IN INT level,
- IN INT optname,
- OUT CHAR FAR* optval,
- IN OUT LPINT optlen,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPIoctl(
- IN SOCKET s,
- IN DWORD dwIoControlCode,
- IN LPVOID lpvInBuffer,
- IN DWORD cbInBuffer,
- OUT LPVOID lpvOutBuffer,
- IN DWORD cbOutBuffer,
- OUT LPDWORD lpcbBytesReturned,
- IN LPWSAOVERLAPPED lpOverlapped,
- IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
- IN LPWSATHREADID lpThreadId,
- OUT LPINT lpErrno);
-
-SOCKET
-WSPAPI
-WSPJoinLeaf(
- IN SOCKET s,
- IN CONST SOCKADDR *name,
- IN INT namelen,
- IN LPWSABUF lpCallerData,
- OUT LPWSABUF lpCalleeData,
- IN LPQOS lpSQOS,
- IN LPQOS lpGQOS,
- IN DWORD dwFlags,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPListen(
- IN SOCKET s,
- IN INT backlog,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPRecv(
- IN SOCKET s,
- IN OUT LPWSABUF lpBuffers,
- IN DWORD dwBufferCount,
- OUT LPDWORD lpNumberOfBytesRecvd,
- IN OUT LPDWORD lpFlags,
- IN LPWSAOVERLAPPED lpOverlapped,
- IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
- IN LPWSATHREADID lpThreadId,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPRecvDisconnect(
- IN SOCKET s,
- OUT LPWSABUF lpInboundDisconnectData,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPRecvFrom(
- IN SOCKET s,
- IN OUT LPWSABUF lpBuffers,
- IN DWORD dwBufferCount,
- OUT LPDWORD lpNumberOfBytesRecvd,
- IN OUT LPDWORD lpFlags,
- OUT LPSOCKADDR lpFrom,
- IN OUT LPINT lpFromlen,
- IN LPWSAOVERLAPPED lpOverlapped,
- IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
- IN LPWSATHREADID lpThreadId,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPSelect(
- IN INT nfds,
- IN OUT LPFD_SET readfds,
- IN OUT LPFD_SET writefds,
- IN OUT LPFD_SET exceptfds,
- IN CONST LPTIMEVAL timeout,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPSend(
- IN SOCKET s,
- IN LPWSABUF lpBuffers,
- IN DWORD dwBufferCount,
- OUT LPDWORD lpNumberOfBytesSent,
- IN DWORD dwFlags,
- IN LPWSAOVERLAPPED lpOverlapped,
- IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
- IN LPWSATHREADID lpThreadId,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPSendDisconnect(
- IN SOCKET s,
- IN LPWSABUF lpOutboundDisconnectData,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPSendTo(
- IN SOCKET s,
- IN LPWSABUF lpBuffers,
- IN DWORD dwBufferCount,
- OUT LPDWORD lpNumberOfBytesSent,
- IN DWORD dwFlags,
- IN CONST SOCKADDR *lpTo,
- IN INT iTolen,
- IN LPWSAOVERLAPPED lpOverlapped,
- IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
- IN LPWSATHREADID lpThreadId,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPSetSockOpt(
- IN SOCKET s,
- IN INT level,
- IN INT optname,
- IN CONST CHAR FAR* optval,
- IN INT optlen,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPShutdown(
- IN SOCKET s,
- IN INT how,
- OUT LPINT lpErrno);
-
-SOCKET
-WSPAPI
-WSPSocket(
- IN INT af,
- IN INT type,
- IN INT protocol,
- IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
- IN GROUP g,
- IN DWORD dwFlags,
- OUT LPINT lpErrno);
-
-INT
-WSPAPI
-WSPStringToAddress(
- IN LPWSTR AddressString,
- IN INT AddressFamily,
- IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
- OUT LPSOCKADDR lpAddress,
- IN OUT LPINT lpAddressLength,
- OUT LPINT lpErrno);
-
-
-PSOCKET_INFORMATION GetSocketStructure(
- SOCKET Handle
-);
-
-VOID DeleteSocketStructure( SOCKET Handle );
-
-int GetSocketInformation(
- PSOCKET_INFORMATION Socket,
- ULONG AfdInformationClass,
- PULONG Ulong OPTIONAL,
- PLARGE_INTEGER LargeInteger OPTIONAL
-);
-
-int SetSocketInformation(
- PSOCKET_INFORMATION Socket,
- ULONG AfdInformationClass,
- PULONG Ulong OPTIONAL,
- PLARGE_INTEGER LargeInteger OPTIONAL
-);
-
-int CreateContext(
- PSOCKET_INFORMATION Socket
-);
-
-int SockAsyncThread(
- PVOID ThreadParam
-);
-
-VOID
-SockProcessAsyncSelect(
- PSOCKET_INFORMATION Socket,
- PASYNC_DATA AsyncData
-);
-
-VOID
-SockAsyncSelectCompletionRoutine(
- PVOID Context,
- PIO_STATUS_BLOCK IoStatusBlock
-);
-
-BOOLEAN
-SockCreateOrReferenceAsyncThread(
- VOID
-);
-
-BOOLEAN SockGetAsyncSelectHelperAfdHandle(
- VOID
-);
-
-VOID SockProcessQueuedAsyncSelect(
- PVOID Context,
- PIO_STATUS_BLOCK IoStatusBlock
-);
-
-VOID
-SockReenableAsyncSelectEvent (
- IN PSOCKET_INFORMATION Socket,
- IN ULONG Event
- );
-
-DWORD MsafdReturnWithErrno( NTSTATUS Status, LPINT Errno, DWORD Received,
- LPDWORD ReturnedBytes );
-
-typedef VOID (*PASYNC_COMPLETION_ROUTINE)(PVOID Context, PIO_STATUS_BLOCK IoStatusBlock);
-
-#endif /* __MSAFD_H */
-
-/* EOF */
Modified: branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild?rev=47501&r1=47500&r2=47501&view=diff
==============================================================================
--- branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild [iso-8859-1] (original)
+++ branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild [iso-8859-1] Mon May 31 20:17:05 2010
@@ -1,17 +1,4 @@
-<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes">
+<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" entrypoint="0" installbase="system32" installname="msafd.dll" unicode="yes">
<importlibrary definition="msafd.spec" />
- <include base="msafd">.</include>
- <include base="msafd">include</include>
- <include base="ReactOS">include/reactos/drivers</include>
- <pch>msafd.h</pch>
- <library>ntdll</library>
- <library>advapi32</library>
- <directory name="misc">
- <file>dllmain.c</file>
- <file>event.c</file>
- <file>helpers.c</file>
- <file>sndrcv.c</file>
- <file>stubs.c</file>
- </directory>
<file>msafd.rc</file>
</module>
Modified: branches/aicom-network-branch/dll/win32/msafd/msafd.spec
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/msafd/msafd.spec?rev=47501&r1=47500&r2=47501&view=diff
==============================================================================
--- branches/aicom-network-branch/dll/win32/msafd/msafd.spec [iso-8859-1] (original)
+++ branches/aicom-network-branch/dll/win32/msafd/msafd.spec [iso-8859-1] Mon May 31 20:17:05 2010
@@ -1,1 +1,1 @@
-@ stdcall WSPStartup (long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall WSPStartup (long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) mswsock.WSPStartup
More information about the Ros-diffs
mailing list