[KBDCLASS]

* 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

svn path=/trunk/; revision=61878

diff --git a/reactos/drivers/input/kbdclass/CMakeLists.txt b/reactos/drivers/input/kbdclass/CMakeLists.txt
index ac63a01..f899f64 100644 (file)
--- a/reactos/drivers/input/kbdclass/CMakeLists.txt
+++ b/reactos/drivers/input/kbdclass/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_library(kbdclass SHARED
     kbdclass.c
     misc.c
+    guid.c
     kbdclass.rc)
 
 set_module_type(kbdclass kernelmodedriver)

diff --git a/reactos/drivers/input/kbdclass/guid.c b/reactos/drivers/input/kbdclass/guid.c
new file mode 100644 (file)
index 0000000..542ffa1
--- /dev/null
+++ b/reactos/drivers/input/kbdclass/guid.c
@@ -0,0 +1,8 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#define STDAPICALLTYPE __stdcall
+#include <wdm.h>
+#include <initguid.h>
+#include <kbdmou.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/drivers/input/kbdclass/kbdclass.c b/reactos/drivers/input/kbdclass/kbdclass.c
index ec8de66..12ff89e 100644 (file)
--- a/reactos/drivers/input/kbdclass/kbdclass.c
+++ b/reactos/drivers/input/kbdclass/kbdclass.c
@@ -7,9 +7,13 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "kbdclass.h"
 
+#include <stdio.h>
+#include <pseh/pseh2.h>
+#include <kbdmou.h>
+#include <debug.h>
+
 static DRIVER_UNLOAD DriverUnload;
 static DRIVER_DISPATCH ClassCreate;
 static DRIVER_DISPATCH ClassClose;

diff --git a/reactos/drivers/input/kbdclass/kbdclass.h b/reactos/drivers/input/kbdclass/kbdclass.h
index fd92082..6c40fd9 100644 (file)
--- a/reactos/drivers/input/kbdclass/kbdclass.h
+++ b/reactos/drivers/input/kbdclass/kbdclass.h
@@ -1,10 +1,5 @@
 #include <ntifs.h>
-#include <kbdmou.h>
 #include <ntddkbd.h>
-#include <stdio.h>
-#include <pseh/pseh2.h>
-
-#include <debug.h>
 
 #define MAX_PATH 260
 

diff --git a/reactos/drivers/input/kbdclass/misc.c b/reactos/drivers/input/kbdclass/misc.c
index 91aa4f8..ce0db80 100644 (file)
--- a/reactos/drivers/input/kbdclass/misc.c
+++ b/reactos/drivers/input/kbdclass/misc.c
@@ -9,6 +9,8 @@
 
 #include "kbdclass.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI