[PORTCLS]

* Do not include debug.h into the main header.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61498

reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt

@@ -47,6 +47,7 @@ list(APPEND SOURCE
     undoc.cpp
     unregister.cpp
     version.cpp
+    guid.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/portcls.def)
 
 add_library(portcls SHARED

reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp

@@ -11,6 +11,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 //
 //  This is called from DriverEntry so that PortCls can take care of some
 //  IRPs and map some others to the main KS driver. In most cases this will

reactos/drivers/wdm/audio/backpln/portcls/api.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 PcGetDeviceProperty(

reactos/drivers/wdm/audio/backpln/portcls/connection.cpp

@@ -6,9 +6,14 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 extern
 "C"
 NTSYSAPI

reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp

@@ -6,9 +6,14 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 Dispatch_fnDeviceIoControl(

reactos/drivers/wdm/audio/backpln/portcls/dll.cpp

@@ -6,9 +6,14 @@
  * PROGRAMMER:      Andrew Greenwood
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 extern
 "C"
 ULONG

reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CDmaChannelInit : public IDmaChannelInit
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/drm.cpp

@@ -8,6 +8,11 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
 
 NTSTATUS
 NTAPI

reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CDrmPort2 : public IDrmPort2
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortFilterDMus : public IPortFilterDMus
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortFilterTopology : public IPortFilterTopology
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortFilterWaveCyclic : public IPortFilterWaveCyclic
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortFilterWavePci : public IPortFilterWavePci
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortFilterWaveRT : public IPortFilterWaveRT
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/guid.cpp

@@ -0,0 +1,9 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <portcls.h>
+#include <dmusicks.h>
+
+#include "interfaces.hpp"
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp

@@ -6,9 +6,14 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 typedef struct
 {
     LIST_ENTRY ListEntry;

reactos/drivers/wdm/audio/backpln/portcls/irp.cpp

@@ -9,9 +9,14 @@
  *                  27 Jan 07   Created
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 typedef struct
 {
     PIRP Irp;

reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp

@@ -8,6 +8,11 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
 
 class CIrpQueue : public IIrpQueue
 {

reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 PcNewMiniport(

reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp

@@ -7,9 +7,14 @@
  *
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 //  + for absolute / - for relative
 
 #define kOneMillisec (10 * 1000)

reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp

@@ -8,6 +8,11 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
 
 NTSTATUS NewMiniportFmSynth(
     OUT PMINIPORT* OutMiniport,

reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortPinDMus : public IPortPinDMus
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortPinWaveCyclic : public IPortPinWaveCyclic,
                            public IServiceSink
 {

reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortPinWavePci : public IPortPinWavePci,
                         public IServiceSink,
                         public IPortWavePciStream

reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortPinWaveRT : public IPortPinWaveRT
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/pool.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 PVOID
 AllocateItem(
     IN POOL_TYPE PoolType,

reactos/drivers/wdm/audio/backpln/portcls/port.cpp

@@ -7,10 +7,13 @@
  *                  Andrew Greenwood
  */
 
-#include <initguid.h>
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
 
+#include <debug.h>
 
 NTSTATUS
 NTAPI

reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortDMus : public IPortDMus,
                   public ISubdevice
 {

reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortTopology : public IPortTopology,
                       public ISubdevice,
                       public IPortEvents

reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 GUID IID_IDmaChannelSlave;
 
 class CPortWaveCyclic : public IPortWaveCyclic,

reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortWavePci : public IPortWavePci,
                      public IPortEvents,
                      public ISubdevice,

reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortWaveRT : public IPortWaveRT,
                     public IPortEvents,
                     public ISubdevice

reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortWaveRTStreamInit : public IPortWaveRTStreamInit
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/power.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 PcRegisterAdapterPowerManagement(

reactos/drivers/wdm/audio/backpln/portcls/private.hpp

@@ -7,6 +7,8 @@
 #ifndef PORTCLS_PRIVATE_H
 #define PORTCLS_PRIVATE_H
 
+#include <stdio.h>
+
 //#define _KS_NO_ANONYMOUS_STRUCTURES_
 #define PC_IMPLEMENTATION
 #define COM_STDMETHOD_CAN_THROW
@@ -14,21 +16,10 @@
 
 #include <ntddk.h>
 #include <portcls.h>
-
-#ifndef YDEBUG
-#define NDEBUG
-#endif
-
-#include <debug.h>
-
 #include <dmusicks.h>
 #include <kcom.h>
-#include "interfaces.hpp"
-#include <ks.h>
-#include <ksmedia.h>
-#include <stdio.h>
 
-//#include <intrin.h>
+#include "interfaces.hpp"
 
 #define TAG_PORTCLASS 'SLCP'
 
@@ -441,4 +432,4 @@ typedef struct
     PKSOBJECT_CREATE_ITEM CreateItem;
 }DISPATCH_CONTEXT, *PDISPATCH_CONTEXT;
 
-#endif
+#endif /* PORTCLS_PRIVATE_H */

reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 HandlePropertyInstances(
     IN PIO_STATUS_BLOCK IoStatus,

reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp

@@ -6,9 +6,13 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
 
 extern "C" {
   void 

reactos/drivers/wdm/audio/backpln/portcls/registry.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CRegistryKey : public IRegistryKey
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/resource.cpp

@@ -11,6 +11,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CResourceList : public IResourceList
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp

@@ -6,9 +6,14 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 VOID
 NTAPI
 IServiceGroupDpc(

reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 KsoDispatchCreateWithGenericFactory(

reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp

@@ -8,6 +8,12 @@
 
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CUnregisterSubdevice : public IUnregisterSubdevice
 {
 public:

reactos/drivers/wdm/audio/backpln/portcls/version.cpp

@@ -6,9 +6,13 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "private.hpp"
 
+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
 
 class CPortClsVersion : public IPortClsVersion
 {