[akhaldi] 61946: [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 - Ros-diffs

3 Feb 2014

Author: akhaldi
Date: Mon Feb  3 10:43:32 2014
New Revision: 61946
URL: http://svn.reactos.org/svn/reactos?rev=61946&view=rev
Log:
[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
Added:
    trunk/reactos/drivers/storage/classpnp/guid.c   (with props)
Modified:
    trunk/reactos/drivers/storage/classpnp/CMakeLists.txt
    trunk/reactos/drivers/storage/classpnp/autorun.c
    trunk/reactos/drivers/storage/classpnp/class.c
    trunk/reactos/drivers/storage/classpnp/classp.h
    trunk/reactos/drivers/storage/classpnp/classwmi.c
    trunk/reactos/drivers/storage/classpnp/clntirp.c
    trunk/reactos/drivers/storage/classpnp/create.c
    trunk/reactos/drivers/storage/classpnp/debug.c
    trunk/reactos/drivers/storage/classpnp/debug.h
    trunk/reactos/drivers/storage/classpnp/lock.c
    trunk/reactos/drivers/storage/classpnp/obsolete.c
    trunk/reactos/drivers/storage/classpnp/retry.c
    trunk/reactos/drivers/storage/classpnp/utils.c
    trunk/reactos/drivers/storage/classpnp/xferpkt.c
Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/CM...
==============================================================================

--- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -26,6 +26,7 @@
     retry.c
     utils.c
     xferpkt.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
add_library(classpnp SHARED
Modified: trunk/reactos/drivers/storage/classpnp/autorun.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/au...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/autorun.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/autorun.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,7 +22,8 @@
 --*/
#include "classp.h"
-#include "debug.h"
+
+#include <wmidata.h>
#define GESN_TIMEOUT_VALUE (0x4)
 #define GESN_BUFFER_SIZE (0x8)
Modified: trunk/reactos/drivers/storage/classpnp/class.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/cl...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/class.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/class.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -21,9 +21,12 @@
--*/
-#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)
Modified: trunk/reactos/drivers/storage/classpnp/classp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/cl...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/classp.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/classp.h	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -25,23 +25,10 @@
--*/
-#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[];
@@ -876,3 +863,5 @@
 VOID NTAPI FreeDeviceInputMdl(PMDL Mdl);
 NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo);
 VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
+
+#include "debug.h"
Modified: trunk/reactos/drivers/storage/classpnp/classwmi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/cl...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/classwmi.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/classwmi.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,6 +22,8 @@
 --*/
#include "classp.h"
+
+#include <wmistr.h>
NTSTATUS
 NTAPI
Modified: trunk/reactos/drivers/storage/classpnp/clntirp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/cl...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/clntirp.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/clntirp.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,7 +22,6 @@
 --*/
#include "classp.h"
-#include "debug.h"
/*
  *  EnqueueDeferredClientIrp
Modified: trunk/reactos/drivers/storage/classpnp/create.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/cr...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/create.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/create.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -21,9 +21,7 @@
--*/
-#define CLASS_INIT_GUID 0
 #include "classp.h"
-#include "debug.h"
ULONG BreakOnClose = 0;
Modified: trunk/reactos/drivers/storage/classpnp/debug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/de...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/debug.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/debug.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -21,9 +21,7 @@
--*/
-
 #include "classp.h"
-#include "debug.h"
#if DBG
Modified: trunk/reactos/drivers/storage/classpnp/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/de...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/debug.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/debug.h	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,6 +22,7 @@
--*/
+#pragma once
VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...);
@@ -144,5 +145,3 @@
     #define DBGGETSRBSTATUSSTR(_pSrb)
#endif
-
-
Added: trunk/reactos/drivers/storage/classpnp/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/gu...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/guid.c	(added)
+++ trunk/reactos/drivers/storage/classpnp/guid.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -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 */
Propchange: trunk/reactos/drivers/storage/classpnp/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native
Modified: trunk/reactos/drivers/storage/classpnp/lock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/lo...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/lock.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/lock.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -23,8 +23,6 @@
 --*/
#include "classp.h"
-#include "debug.h"
-
LONG LockHighWatermark = 0;
 LONG LockLowWatermark = 0;
Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/ob...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/obsolete.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/obsolete.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -24,7 +24,6 @@
 --*/
#include "classp.h"
-#include "debug.h"
PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List);
 VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List);
Modified: trunk/reactos/drivers/storage/classpnp/retry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/re...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/retry.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/retry.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,7 +22,6 @@
 --*/
#include "classp.h"
-#include "debug.h"
/*
  *  InterpretTransferPacketError
Modified: trunk/reactos/drivers/storage/classpnp/utils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/ut...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/utils.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,7 +22,6 @@
 --*/
#include "classp.h"
-#include "debug.h"
#ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, ClassGetDeviceParameter)
Modified: trunk/reactos/drivers/storage/classpnp/xferpkt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/xf...
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/xferpkt.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/xferpkt.c	[iso-8859-1] Mon Feb  3 10:43:32 2014
@@ -22,7 +22,6 @@
 --*/
#include "classp.h"
-#include "debug.h"
#ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, InitializeTransferPackets)

    