[SACDRV]

* Improve the way we include the ntoskrnl internal hdl.h.
* Remove one time inclusions from the main header and put them back where they belong.
* Improve the GUIDs situation.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61939

reactos/drivers/sac/driver/CMakeLists.txt

@@ -1,4 +1,6 @@
 
+include_directories(${REACTOS_SOURCE_DIR})
+
 list(APPEND SOURCE
      chanmgr.c
      channel.c

reactos/drivers/sac/driver/channel.c

@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 BOOLEAN
@@ -575,4 +573,3 @@ ChannelClose(IN PSAC_CHANNEL Channel)
     Status = ChannelDereferenceHandles(Channel);
     return Status;
 }
-

reactos/drivers/sac/driver/cmdchan.c

@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS

reactos/drivers/sac/driver/concmd.c

@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <ndk/exfuncs.h>
+
 /* GLOBALS ********************************************************************/
 
 PVOID GlobalBuffer;

reactos/drivers/sac/driver/conmgr.c

@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <initguid.h>
+
 /* GLOBALS ********************************************************************/
 
 DEFINE_GUID(PRIMARY_SAC_CHANNEL_APPLICATION_GUID,
@@ -890,4 +892,3 @@ ConMgrHandleEvent(IN ULONG EventCode,
     ASSERT(FALSE);
     return STATUS_NOT_IMPLEMENTED;
 }
-

reactos/drivers/sac/driver/data.c

@@ -501,4 +501,3 @@ SuccessExit:
     SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting with status TRUE\n");
     return TRUE;
 }
-

reactos/drivers/sac/driver/init.c

@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS

reactos/drivers/sac/driver/rawchan.c

@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS

reactos/drivers/sac/driver/sacdrv.h

@@ -9,14 +9,8 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntifs.h>
-#include <intrin.h>
-#include <wchar.h>
 #include <stdio.h>
-#include <ndk/obtypes.h>
-#include <ndk/exfuncs.h>
-#include <ndk/rtlfuncs.h>
-#include <../../../ntoskrnl/include/internal/hdl.h>
-#include <initguid.h>
+#include <ntoskrnl/include/internal/hdl.h>
 #include <sacmsg.h>
 
 /* DEFINES ********************************************************************/

reactos/drivers/sac/driver/util.c

@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <ndk/rtlfuncs.h>
+
 /* GLOBALS ********************************************************************/
 
 PCHAR Utf8ConversionBuffer;