[akhaldi] 61880: [SERMOUSE] * Do not include debug.h from within the main header. * Improve the GUIDs situation. * Remove one time inclusions from the main header and put them back where they belon...

Author: akhaldi
Date: Wed Jan 29 10:56:25 2014
New Revision: 61880

URL: http://svn.reactos.org/svn/reactos?rev=61880&view=rev
Log:
[SERMOUSE]
* Do not include debug.h from within the main header.
* Improve the GUIDs situation.
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

Modified:
    trunk/reactos/drivers/input/sermouse/createclose.c
    trunk/reactos/drivers/input/sermouse/detect.c
    trunk/reactos/drivers/input/sermouse/fdo.c
    trunk/reactos/drivers/input/sermouse/internaldevctl.c
    trunk/reactos/drivers/input/sermouse/misc.c
    trunk/reactos/drivers/input/sermouse/readmouse.c
    trunk/reactos/drivers/input/sermouse/sermouse.c
    trunk/reactos/drivers/input/sermouse/sermouse.h

Modified: trunk/reactos/drivers/input/sermouse/createclose.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/cre…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/createclose.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/createclose.c	[iso-8859-1] Wed Jan 29 10:56:25
2014
@@ -7,6 +7,8 @@
  */
 
 #include "sermouse.h"
+
+#include <debug.h>
 
 NTSTATUS NTAPI
 SermouseCreate(

Modified: trunk/reactos/drivers/input/sermouse/detect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/detect.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/detect.c	[iso-8859-1] Wed Jan 29 10:56:25 2014
@@ -9,6 +9,9 @@
  */
 
 #include "sermouse.h"
+
+#include <ntifs.h>
+#include <debug.h>
 
 /* Most of this file is ripped from reactos/drivers/bus/serenum/detect.c */
 

Modified: trunk/reactos/drivers/input/sermouse/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/fdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/fdo.c	[iso-8859-1] Wed Jan 29 10:56:25 2014
@@ -7,6 +7,8 @@
  */
 
 #include "sermouse.h"
+
+#include <debug.h>
 
 NTSTATUS NTAPI
 SermouseAddDevice(

Modified: trunk/reactos/drivers/input/sermouse/internaldevctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/int…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/internaldevctl.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/internaldevctl.c	[iso-8859-1] Wed Jan 29 10:56:25
2014
@@ -7,6 +7,8 @@
  */
 
 #include "sermouse.h"
+
+#include <debug.h>
 
 NTSTATUS NTAPI
 SermouseInternalDeviceControl(

Modified: trunk/reactos/drivers/input/sermouse/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/mis…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/misc.c	[iso-8859-1] Wed Jan 29 10:56:25 2014
@@ -7,6 +7,8 @@
  */
 
 #include "sermouse.h"
+
+#include <debug.h>
 
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 

Modified: trunk/reactos/drivers/input/sermouse/readmouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/rea…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/readmouse.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/readmouse.c	[iso-8859-1] Wed Jan 29 10:56:25
2014
@@ -9,6 +9,8 @@
  */
 
 #include "sermouse.h"
+
+#include <debug.h>
 
 static NTSTATUS
 SermouseDeviceIoControl(

Modified: trunk/reactos/drivers/input/sermouse/sermouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/sermouse.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/sermouse.c	[iso-8859-1] Wed Jan 29 10:56:25 2014
@@ -6,8 +6,9 @@
  * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
-#define INITGUID
 #include "sermouse.h"
+
+#include <debug.h>
 
 static DRIVER_UNLOAD DriverUnload;
 static DRIVER_DISPATCH IrpStub;

Modified: trunk/reactos/drivers/input/sermouse/sermouse.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser…
==============================================================================
--- trunk/reactos/drivers/input/sermouse/sermouse.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/sermouse/sermouse.h	[iso-8859-1] Wed Jan 29 10:56:25 2014
@@ -1,8 +1,6 @@
-#include <ntifs.h>
+#include <ntddk.h>
+#include <ntddser.h>
 #include <kbdmou.h>
-#include <ntddser.h>
-#include <ntddmou.h>
-#include <debug.h>
 
 #define SERMOUSE_TAG 'uoMS'