Modified: trunk/reactos/drivers/net/afd/afd/connect.c
Modified: trunk/reactos/drivers/net/afd/afd/listen.c
Modified: trunk/reactos/drivers/net/afd/afd/lock.c
Modified: trunk/reactos/drivers/net/afd/afd/read.c
Modified: trunk/reactos/drivers/net/afd/afd/tdi.c
Modified: trunk/reactos/drivers/net/afd/afd/tdiconn.c
Modified: trunk/reactos/drivers/net/afd/afd/write.c
Modified: trunk/reactos/drivers/net/afd/include/afd.h
--- trunk/reactos/drivers/net/afd/afd/connect.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/connect.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -65,7 +65,7 @@
return Status;
}
-static NTSTATUS DDKAPI StreamSocketConnectComplete
+static NTSTATUS NTAPI StreamSocketConnectComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context ) {
--- trunk/reactos/drivers/net/afd/afd/listen.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/listen.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -72,7 +72,7 @@
IoCompleteRequest( Irp, IO_NETWORK_INCREMENT );
}
-static NTSTATUS DDKAPI ListenComplete
+static NTSTATUS NTAPI ListenComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context ) {
--- trunk/reactos/drivers/net/afd/afd/lock.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/lock.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -232,7 +232,7 @@
ExReleaseFastMutex( &FCB->Mutex );
}
-NTSTATUS DDKAPI UnlockAndMaybeComplete
+NTSTATUS NTAPI UnlockAndMaybeComplete
( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp,
UINT Information,
PIO_COMPLETION_ROUTINE Completion,
--- trunk/reactos/drivers/net/afd/afd/read.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/read.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -47,10 +47,11 @@
UINT i, BytesToCopy = 0,
BytesAvailable =
FCB->Recv.Content - FCB->Recv.BytesUsed;
- *TotalBytesCopied = 0;
PAFD_MAPBUF Map;
NTSTATUS Status;
+ *TotalBytesCopied = 0;
+
AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n",
BytesAvailable));
@@ -210,7 +211,7 @@
return RetStatus;
}
-NTSTATUS DDKAPI ReceiveComplete
+NTSTATUS NTAPI ReceiveComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context ) {
@@ -418,7 +419,7 @@
return Status;
}
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
PacketSocketRecvComplete(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
--- trunk/reactos/drivers/net/afd/afd/tdi.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/tdi.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -8,9 +8,7 @@
* CSH 01/09-2000 Created
*/
#include <afd.h>
-#ifndef _MSC_VER
#include <pseh/pseh.h>
-#endif
#include "debug.h"
#include "tdiconn.h"
#include "tdi_proto.h"
--- trunk/reactos/drivers/net/afd/afd/tdiconn.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/tdiconn.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -183,6 +183,7 @@
PCHAR LayoutFrame;
UINT SizeOfEntry;
ULONG TdiAddressSize;
+ PTDI_CONNECTION_INFORMATION FromTdiConn, ToTdiConn;
/* FIXME: Get from socket information */
TdiAddressSize = TdiAddressSizeFromType(From->Address[0].AddressType);
@@ -197,8 +198,7 @@
RtlZeroMemory( LayoutFrame, 2 * SizeOfEntry );
- PTDI_CONNECTION_INFORMATION
- FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame,
+ FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame;
ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry;
if (From != NULL) {
--- trunk/reactos/drivers/net/afd/afd/write.c 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/afd/write.c 2006-01-07 08:07:41 UTC (rev 20658)
@@ -12,7 +12,7 @@
#include "tdiconn.h"
#include "debug.h"
-static NTSTATUS DDKAPI SendComplete
+static NTSTATUS NTAPI SendComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context ) {
@@ -159,7 +159,7 @@
return STATUS_SUCCESS;
}
-static NTSTATUS DDKAPI PacketSocketSendComplete
+static NTSTATUS NTAPI PacketSocketSendComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context ) {
--- trunk/reactos/drivers/net/afd/include/afd.h 2006-01-07 07:56:55 UTC (rev 20657)
+++ trunk/reactos/drivers/net/afd/include/afd.h 2006-01-07 08:07:41 UTC (rev 20658)
@@ -19,6 +19,8 @@
#include <string.h>
#define _WINBASE_
#define _WINDOWS_H
+#define _INC_WINDOWS
+#include <windef.h>
#include <winsock2.h>
#include <afd/shared.h>
@@ -201,7 +203,7 @@
BOOLEAN Write, BOOLEAN LockAddress );
VOID UnlockBuffers( PAFD_WSABUF Buf, UINT Count, BOOL Address );
UINT SocketAcquireStateLock( PAFD_FCB FCB );
-NTSTATUS DDKAPI UnlockAndMaybeComplete
+NTSTATUS NTAPI UnlockAndMaybeComplete
( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp,
UINT Information,
PIO_COMPLETION_ROUTINE Completion,
@@ -223,12 +225,12 @@
/* read.c */
-NTSTATUS DDKAPI ReceiveComplete
+NTSTATUS NTAPI ReceiveComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context );
-NTSTATUS DDKAPI PacketSocketRecvComplete
+NTSTATUS NTAPI PacketSocketRecvComplete
( PDEVICE_OBJECT DeviceObject,
PIRP Irp,
PVOID Context );