[CLASSPNP]

* 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=61946

diff --git a/reactos/drivers/storage/classpnp/CMakeLists.txt b/reactos/drivers/storage/classpnp/CMakeLists.txt
index 28d998d..29ce383 100644 (file)
--- a/reactos/drivers/storage/classpnp/CMakeLists.txt
+++ b/reactos/drivers/storage/classpnp/CMakeLists.txt
@@ -26,6 +26,7 @@ list(APPEND SOURCE
     retry.c
     utils.c
     xferpkt.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
 
 add_library(classpnp SHARED

diff --git a/reactos/drivers/storage/classpnp/autorun.c b/reactos/drivers/storage/classpnp/autorun.c
index 08f2a8e..3a32857 100644 (file)
--- a/reactos/drivers/storage/classpnp/autorun.c
+++ b/reactos/drivers/storage/classpnp/autorun.c
@@ -22,7 +22,8 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
+
+#include <wmidata.h>
 
 #define GESN_TIMEOUT_VALUE (0x4)
 #define GESN_BUFFER_SIZE (0x8)

diff --git a/reactos/drivers/storage/classpnp/class.c b/reactos/drivers/storage/classpnp/class.c
index 447d026..cc55743 100644 (file)
--- a/reactos/drivers/storage/classpnp/class.c
+++ b/reactos/drivers/storage/classpnp/class.c
@@ -21,9 +21,12 @@ Revision History:
 
 --*/
 
-#define CLASS_INIT_GUID 1
 #include "classp.h"
-#include "debug.h"
+
+#include <stddef.h>
+
+#include <initguid.h>
+#include <mountdev.h>
 
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(INIT, DriverEntry)

diff --git a/reactos/drivers/storage/classpnp/classp.h b/reactos/drivers/storage/classpnp/classp.h
index 951c5fe..7ae9436 100644 (file)
--- a/reactos/drivers/storage/classpnp/classp.h
+++ b/reactos/drivers/storage/classpnp/classp.h
@@ -25,24 +25,11 @@ Revision History:
 
 --*/
 
-#include <stddef.h>
-#include <stdarg.h>
 #include <ntddk.h>
-
-#include <scsi.h>
-#include <wmidata.h>
 #include <classpnp.h>
-
-#if CLASS_INIT_GUID
-#include <initguid.h>
-#endif
-
-#include <mountdev.h>
 #include <ioevent.h>
 #include <pseh/pseh2.h>
 
-#include "wmistr.h"
-
 extern CLASSPNP_SCAN_FOR_SPECIAL_INFO ClassBadItems[];
 
 extern GUID ClassGuidQueryRegInfoEx;
@@ -876,3 +863,5 @@ PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen);
 VOID NTAPI FreeDeviceInputMdl(PMDL Mdl);
 NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo);
 VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
+
+#include "debug.h"

diff --git a/reactos/drivers/storage/classpnp/classwmi.c b/reactos/drivers/storage/classpnp/classwmi.c
index c1462a1..890b347 100644 (file)
--- a/reactos/drivers/storage/classpnp/classwmi.c
+++ b/reactos/drivers/storage/classpnp/classwmi.c
@@ -23,6 +23,8 @@ Revision History:
 
 #include "classp.h"
 
+#include <wmistr.h>
+
 NTSTATUS
 NTAPI
 ClassSystemControl(

diff --git a/reactos/drivers/storage/classpnp/clntirp.c b/reactos/drivers/storage/classpnp/clntirp.c
index 39371db..c59c4cb 100644 (file)
--- a/reactos/drivers/storage/classpnp/clntirp.c
+++ b/reactos/drivers/storage/classpnp/clntirp.c
@@ -22,7 +22,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 /*
  *  EnqueueDeferredClientIrp

diff --git a/reactos/drivers/storage/classpnp/create.c b/reactos/drivers/storage/classpnp/create.c
index 7a0c5fa..00cfe2d 100644 (file)
--- a/reactos/drivers/storage/classpnp/create.c
+++ b/reactos/drivers/storage/classpnp/create.c
@@ -21,9 +21,7 @@ Revision History:
 
 --*/
 
-#define CLASS_INIT_GUID 0
 #include "classp.h"
-#include "debug.h"
 
 ULONG BreakOnClose = 0;
 

diff --git a/reactos/drivers/storage/classpnp/debug.c b/reactos/drivers/storage/classpnp/debug.c
index 3d1c085..c354d21 100644 (file)
--- a/reactos/drivers/storage/classpnp/debug.c
+++ b/reactos/drivers/storage/classpnp/debug.c
@@ -21,9 +21,7 @@ Revision History:
 
 --*/
 
-
 #include "classp.h"
-#include "debug.h"
 
 #if DBG
 

diff --git a/reactos/drivers/storage/classpnp/debug.h b/reactos/drivers/storage/classpnp/debug.h
index aca86fb..8e9141b 100644 (file)
--- a/reactos/drivers/storage/classpnp/debug.h
+++ b/reactos/drivers/storage/classpnp/debug.h
@@ -22,6 +22,7 @@ Revision History:
 
 --*/
 
+#pragma once
 
 VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...);
 
@@ -144,5 +145,3 @@ VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...
     #define DBGGETSRBSTATUSSTR(_pSrb)
     
 #endif
-
-

diff --git a/reactos/drivers/storage/classpnp/guid.c b/reactos/drivers/storage/classpnp/guid.c
new file mode 100644 (file)
index 0000000..49b4e93
--- /dev/null
+++ b/reactos/drivers/storage/classpnp/guid.c
@@ -0,0 +1,7 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <initguid.h>
+#include <ioevent.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/drivers/storage/classpnp/lock.c b/reactos/drivers/storage/classpnp/lock.c
index 3801020..3d60900 100644 (file)
--- a/reactos/drivers/storage/classpnp/lock.c
+++ b/reactos/drivers/storage/classpnp/lock.c
@@ -23,8 +23,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
-
 
 LONG LockHighWatermark = 0;
 LONG LockLowWatermark = 0;

diff --git a/reactos/drivers/storage/classpnp/obsolete.c b/reactos/drivers/storage/classpnp/obsolete.c
index 6086254..0e2ddf2 100644 (file)
--- a/reactos/drivers/storage/classpnp/obsolete.c
+++ b/reactos/drivers/storage/classpnp/obsolete.c
@@ -24,7 +24,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List);
 VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List);

diff --git a/reactos/drivers/storage/classpnp/retry.c b/reactos/drivers/storage/classpnp/retry.c
index 4b950fb..1cbafe1 100644 (file)
--- a/reactos/drivers/storage/classpnp/retry.c
+++ b/reactos/drivers/storage/classpnp/retry.c
@@ -22,7 +22,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 /*
  *  InterpretTransferPacketError

diff --git a/reactos/drivers/storage/classpnp/utils.c b/reactos/drivers/storage/classpnp/utils.c
index 71b5a02..de4cc04 100644 (file)
--- a/reactos/drivers/storage/classpnp/utils.c
+++ b/reactos/drivers/storage/classpnp/utils.c
@@ -22,7 +22,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, ClassGetDeviceParameter)

diff --git a/reactos/drivers/storage/classpnp/xferpkt.c b/reactos/drivers/storage/classpnp/xferpkt.c
index 42b19c8..390afe7 100644 (file)
--- a/reactos/drivers/storage/classpnp/xferpkt.c
+++ b/reactos/drivers/storage/classpnp/xferpkt.c
@@ -22,7 +22,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, InitializeTransferPackets)