[ros-diffs] [akhaldi] 61882: [AFD] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Wed Jan 29 11:00:53 2014
New Revision: 61882

URL: http://svn.reactos.org/svn/reactos?rev=61882&view=rev
Log:
[AFD]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/drivers/network/afd/afd/bind.c
    trunk/reactos/drivers/network/afd/afd/connect.c
    trunk/reactos/drivers/network/afd/afd/context.c
    trunk/reactos/drivers/network/afd/afd/event.c
    trunk/reactos/drivers/network/afd/afd/info.c
    trunk/reactos/drivers/network/afd/afd/listen.c
    trunk/reactos/drivers/network/afd/afd/lock.c
    trunk/reactos/drivers/network/afd/afd/read.c
    trunk/reactos/drivers/network/afd/afd/select.c
    trunk/reactos/drivers/network/afd/afd/tdi.c
    trunk/reactos/drivers/network/afd/afd/tdiconn.c
    trunk/reactos/drivers/network/afd/afd/write.c
    trunk/reactos/drivers/network/afd/include/afd.h
    trunk/reactos/drivers/network/afd/include/tdiconn.h

Modified: trunk/reactos/drivers/network/afd/afd/bind.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/bind.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/bind.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -105,4 +105,3 @@
     return UnlockAndMaybeComplete( FCB, Status, Irp,
                                    (ULONG_PTR)FCB->AddressFile.Handle );
 }
-

Modified: trunk/reactos/drivers/network/afd/afd/connect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/connect.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/connect.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 NTSTATUS

Modified: trunk/reactos/drivers/network/afd/afd/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/context.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/context.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 NTSTATUS NTAPI

Modified: trunk/reactos/drivers/network/afd/afd/event.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ev…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/event.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/event.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
+
 #include <afd.h>
 
 NTSTATUS AfdEventError(
@@ -307,5 +308,4 @@
     return STATUS_SUCCESS;
 }
 
-
 /* EOF */

Modified: trunk/reactos/drivers/network/afd/afd/info.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/info.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/info.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 NTSTATUS NTAPI

Modified: trunk/reactos/drivers/network/afd/afd/listen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/listen.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/listen.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static NTSTATUS SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt,

Modified: trunk/reactos/drivers/network/afd/afd/lock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/lock.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/lock.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 PVOID GetLockedData(PIRP Irp, PIO_STACK_LOCATION IrpSp)

Modified: trunk/reactos/drivers/network/afd/afd/read.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/read.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/read.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static VOID RefillSocketBuffer( PAFD_FCB FCB )

Modified: trunk/reactos/drivers/network/afd/afd/select.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/select.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/select.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static VOID PrintEvents( ULONG Events ) {

Modified: trunk/reactos/drivers/network/afd/afd/tdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/tdi.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/tdi.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -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

Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/tdiconn.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/tdiconn.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include <afd.h>
 
 UINT TdiAddressSizeFromType( UINT AddressType ) {
@@ -261,4 +262,3 @@
 
     return Status;
 }
-

Modified: trunk/reactos/drivers/network/afd/afd/write.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/write.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/write.c	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -7,6 +7,7 @@
  * UPDATE HISTORY:
  * 20040708 Created
  */
+
 #include "afd.h"
 
 static IO_COMPLETION_ROUTINE SendComplete;
@@ -661,4 +662,3 @@
         return UnlockAndMaybeComplete( FCB, Status, Irp, 0 );
     }
 }
-

Modified: trunk/reactos/drivers/network/afd/include/afd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ…
==============================================================================
--- trunk/reactos/drivers/network/afd/include/afd.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/include/afd.h	[iso-8859-1] Wed Jan 29 11:00:53 2014
@@ -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 @@
 AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
 			 PIO_STACK_LOCATION IrpSp);
 
-#endif/*_AFD_H*/
+#endif /* _AFD_H */

Modified: trunk/reactos/drivers/network/afd/include/tdiconn.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ…
==============================================================================
--- trunk/reactos/drivers/network/afd/include/tdiconn.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/include/tdiconn.h	[iso-8859-1] Wed Jan 29 11:00:53
2014
@@ -1,8 +1,4 @@
 #pragma once
-
-#ifdef _MSC_VER
-#include <ntddtdi.h>
-#endif
 
 typedef VOID *PTDI_CONNECTION_INFO_PAIR;