[AFD]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61882

diff --git a/reactos/drivers/network/afd/afd/bind.c b/reactos/drivers/network/afd/afd/bind.c
index ec895fa..e16ab26 100644 (file)
--- a/reactos/drivers/network/afd/afd/bind.c
+++ b/reactos/drivers/network/afd/afd/bind.c
@@ -105,4 +105,3 @@ AfdBindSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp,
     return UnlockAndMaybeComplete( FCB, Status, Irp,
                                    (ULONG_PTR)FCB->AddressFile.Handle );
 }
-

diff --git a/reactos/drivers/network/afd/afd/connect.c b/reactos/drivers/network/afd/afd/connect.c
index bd394a3..7a08fdf 100644 (file)
--- a/reactos/drivers/network/afd/afd/connect.c
+++ b/reactos/drivers/network/afd/afd/connect.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 NTSTATUS

diff --git a/reactos/drivers/network/afd/afd/context.c b/reactos/drivers/network/afd/afd/context.c
index 5cc8ac7..6bcc17c 100644 (file)
--- a/reactos/drivers/network/afd/afd/context.c
+++ b/reactos/drivers/network/afd/afd/context.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 NTSTATUS NTAPI

diff --git a/reactos/drivers/network/afd/afd/event.c b/reactos/drivers/network/afd/afd/event.c
index 801f2a5..93f5f3d 100644 (file)
--- a/reactos/drivers/network/afd/afd/event.c
+++ b/reactos/drivers/network/afd/afd/event.c
@@ -7,6 +7,7 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
+
 #include <afd.h>
 
 NTSTATUS AfdEventError(
@@ -307,5 +308,4 @@ NTSTATUS AfdDeregisterEventHandlers(
     return STATUS_SUCCESS;
 }
 
-
 /* EOF */

diff --git a/reactos/drivers/network/afd/afd/info.c b/reactos/drivers/network/afd/afd/info.c
index 6095524..2ceff46 100644 (file)
--- a/reactos/drivers/network/afd/afd/info.c
+++ b/reactos/drivers/network/afd/afd/info.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 NTSTATUS NTAPI

diff --git a/reactos/drivers/network/afd/afd/listen.c b/reactos/drivers/network/afd/afd/listen.c
index 00f8e75..94893fc 100644 (file)
--- a/reactos/drivers/network/afd/afd/listen.c
+++ b/reactos/drivers/network/afd/afd/listen.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static NTSTATUS SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt,

diff --git a/reactos/drivers/network/afd/afd/lock.c b/reactos/drivers/network/afd/afd/lock.c
index 5b0ed22..714987d 100644 (file)
--- a/reactos/drivers/network/afd/afd/lock.c
+++ b/reactos/drivers/network/afd/afd/lock.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 PVOID GetLockedData(PIRP Irp, PIO_STACK_LOCATION IrpSp)

diff --git a/reactos/drivers/network/afd/afd/read.c b/reactos/drivers/network/afd/afd/read.c
index 9ba5c31..6e02a67 100644 (file)
--- a/reactos/drivers/network/afd/afd/read.c
+++ b/reactos/drivers/network/afd/afd/read.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static VOID RefillSocketBuffer( PAFD_FCB FCB )

diff --git a/reactos/drivers/network/afd/afd/select.c b/reactos/drivers/network/afd/afd/select.c
index a19ec57..66b8ac8 100644 (file)
--- a/reactos/drivers/network/afd/afd/select.c
+++ b/reactos/drivers/network/afd/afd/select.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static VOID PrintEvents( ULONG Events ) {

diff --git a/reactos/drivers/network/afd/afd/tdi.c b/reactos/drivers/network/afd/afd/tdi.c
index fcdb77b..60040e1 100644 (file)
--- a/reactos/drivers/network/afd/afd/tdi.c
+++ b/reactos/drivers/network/afd/afd/tdi.c
@@ -7,11 +7,11 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
+
 #include <afd.h>
-#include <pseh/pseh2.h>
-#include "debug.h"
-#include "tdiconn.h"
-#include "tdi_proto.h"
+
+#include <tdikrnl.h>
+#include <tdiinfo.h>
 
 #if DBG
 #if 0

diff --git a/reactos/drivers/network/afd/afd/tdiconn.c b/reactos/drivers/network/afd/afd/tdiconn.c
index 72b7c3f..a0c27c9 100644 (file)
--- a/reactos/drivers/network/afd/afd/tdiconn.c
+++ b/reactos/drivers/network/afd/afd/tdiconn.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include <afd.h>
 
 UINT TdiAddressSizeFromType( UINT AddressType ) {
@@ -261,4 +262,3 @@ TdiBuildConnectionInfo
 
     return Status;
 }
-

diff --git a/reactos/drivers/network/afd/afd/write.c b/reactos/drivers/network/afd/afd/write.c
index 6b2c23c..3f07109 100644 (file)
--- a/reactos/drivers/network/afd/afd/write.c
+++ b/reactos/drivers/network/afd/afd/write.c
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static IO_COMPLETION_ROUTINE SendComplete;
@@ -661,4 +662,3 @@ AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
         return UnlockAndMaybeComplete( FCB, Status, Irp, 0 );
     }
 }
-

diff --git a/reactos/drivers/network/afd/include/afd.h b/reactos/drivers/network/afd/include/afd.h
index d06bf46..f27ce8f 100644 (file)
--- a/reactos/drivers/network/afd/include/afd.h
+++ b/reactos/drivers/network/afd/include/afd.h
@@ -11,16 +11,9 @@
 #ifndef _AFD_H
 #define _AFD_H
 
-#include <ntddk.h>
 #include <ntifs.h>
 #include <ndk/obtypes.h>
-#include <ndk/obfuncs.h>
-#include <ndk/mmtypes.h>
-#include <ndk/mmfuncs.h>
 #include <tdi.h>
-#include <tdikrnl.h>
-#include <tdiinfo.h>
-#include <string.h>
 #define _WINBASE_
 #define _WINDOWS_H
 #define _INC_WINDOWS
@@ -434,4 +427,4 @@ NTSTATUS NTAPI
 AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
                         PIO_STACK_LOCATION IrpSp);
 
-#endif/*_AFD_H*/
+#endif /* _AFD_H */

diff --git a/reactos/drivers/network/afd/include/tdiconn.h b/reactos/drivers/network/afd/include/tdiconn.h
index 1eb94a3..4a6e10e 100644 (file)
--- a/reactos/drivers/network/afd/include/tdiconn.h
+++ b/reactos/drivers/network/afd/include/tdiconn.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#ifdef _MSC_VER
-#include <ntddtdi.h>
-#endif
-
 typedef VOID *PTDI_CONNECTION_INFO_PAIR;
 
 PTRANSPORT_ADDRESS TaCopyTransportAddress( PTRANSPORT_ADDRESS OtherAddress );