[ros-diffs] [akhaldi] 61878: [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 belon...

Author: akhaldi
Date: Wed Jan 29 10:53:48 2014
New Revision: 61878

URL: http://svn.reactos.org/svn/reactos?rev=61878&view=rev
Log:
[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

Added:
    trunk/reactos/drivers/input/kbdclass/guid.c   (with props)
Modified:
    trunk/reactos/drivers/input/kbdclass/CMakeLists.txt
    trunk/reactos/drivers/input/kbdclass/kbdclass.c
    trunk/reactos/drivers/input/kbdclass/kbdclass.h
    trunk/reactos/drivers/input/kbdclass/misc.c

Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMa…
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt	[iso-8859-1] Wed Jan 29 10:53:48
2014
@@ -2,6 +2,7 @@
 add_library(kbdclass SHARED
     kbdclass.c
     misc.c
+    guid.c
     kbdclass.rc)
 
 set_module_type(kbdclass kernelmodedriver)

Added: trunk/reactos/drivers/input/kbdclass/guid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/gui…
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/guid.c	(added)
+++ trunk/reactos/drivers/input/kbdclass/guid.c	[iso-8859-1] Wed Jan 29 10:53:48 2014
@@ -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 */

Propchange: trunk/reactos/drivers/input/kbdclass/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd…
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.c	[iso-8859-1] Wed Jan 29 10:53:48 2014
@@ -7,8 +7,12 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)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;

Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd…
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.h	[iso-8859-1] Wed Jan 29 10:53:48 2014
@@ -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
 

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