From dd88e2643b4ccd49df95294d08b9e309fee4d65b Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 3 Jan 2014 17:10:56 +0000 Subject: [PATCH] [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 --- .../wdm/audio/backpln/portcls/CMakeLists.txt | 1 + .../wdm/audio/backpln/portcls/adapter.cpp | 6 ++++++ .../drivers/wdm/audio/backpln/portcls/api.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/connection.cpp | 7 ++++++- .../wdm/audio/backpln/portcls/dispatcher.cpp | 7 ++++++- .../drivers/wdm/audio/backpln/portcls/dll.cpp | 7 ++++++- .../wdm/audio/backpln/portcls/dma_slave.cpp | 6 ++++++ .../drivers/wdm/audio/backpln/portcls/drm.cpp | 5 +++++ .../wdm/audio/backpln/portcls/drm_port.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/filter_dmus.cpp | 6 ++++++ .../audio/backpln/portcls/filter_topology.cpp | 6 ++++++ .../audio/backpln/portcls/filter_wavecyclic.cpp | 6 ++++++ .../audio/backpln/portcls/filter_wavepci.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/filter_wavert.cpp | 6 ++++++ .../drivers/wdm/audio/backpln/portcls/guid.cpp | 9 +++++++++ .../wdm/audio/backpln/portcls/interrupt.cpp | 7 ++++++- .../drivers/wdm/audio/backpln/portcls/irp.cpp | 7 ++++++- .../wdm/audio/backpln/portcls/irpstream.cpp | 5 +++++ .../wdm/audio/backpln/portcls/miniport.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/miniport_dmus.cpp | 7 ++++++- .../audio/backpln/portcls/miniport_fmsynth.cpp | 5 +++++ .../wdm/audio/backpln/portcls/pin_dmus.cpp | 6 ++++++ .../audio/backpln/portcls/pin_wavecyclic.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/pin_wavepci.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/pin_wavert.cpp | 6 ++++++ .../drivers/wdm/audio/backpln/portcls/pool.cpp | 6 ++++++ .../drivers/wdm/audio/backpln/portcls/port.cpp | 5 ++++- .../wdm/audio/backpln/portcls/port_dmus.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/port_topology.cpp | 6 ++++++ .../audio/backpln/portcls/port_wavecyclic.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/port_wavepci.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/port_wavert.cpp | 6 ++++++ .../audio/backpln/portcls/port_wavertstream.cpp | 6 ++++++ .../drivers/wdm/audio/backpln/portcls/power.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/private.hpp | 17 ++++------------- .../audio/backpln/portcls/propertyhandler.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/purecall.cpp | 6 +++++- .../wdm/audio/backpln/portcls/registry.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/resource.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/service_group.cpp | 7 ++++++- .../drivers/wdm/audio/backpln/portcls/undoc.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/unregister.cpp | 6 ++++++ .../wdm/audio/backpln/portcls/version.cpp | 6 +++++- 43 files changed, 247 insertions(+), 23 deletions(-) create mode 100644 reactos/drivers/wdm/audio/backpln/portcls/guid.cpp diff --git a/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index 1b96012fa2b..b8da61d5974 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/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 diff --git a/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp b/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp index 5491a237bf1..ba9d911cc94 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp @@ -11,6 +11,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + // // 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 diff --git a/reactos/drivers/wdm/audio/backpln/portcls/api.cpp b/reactos/drivers/wdm/audio/backpln/portcls/api.cpp index 1c0fca303d8..fa006ef5253 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/api.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/api.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + NTSTATUS NTAPI PcGetDeviceProperty( diff --git a/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp b/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp index 5456c94ffa1..5a705166bf4 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp @@ -6,9 +6,14 @@ * PROGRAMMER: Johannes Anderwald */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + extern "C" NTSYSAPI diff --git a/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp b/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp index 3d2bbb6e018..063a5728fb4 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp @@ -6,9 +6,14 @@ * PROGRAMMER: Johannes Anderwald */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + NTSTATUS NTAPI Dispatch_fnDeviceIoControl( diff --git a/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp b/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp index 16a09dbf1c9..354c1964b2a 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp @@ -6,9 +6,14 @@ * PROGRAMMER: Andrew Greenwood */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + extern "C" ULONG diff --git a/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index 30d654c645b..f19989074ed 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CDmaChannelInit : public IDmaChannelInit { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/drm.cpp b/reactos/drivers/wdm/audio/backpln/portcls/drm.cpp index a6e6e358cea..d4c93c03126 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/drm.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/drm.cpp @@ -8,6 +8,11 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include NTSTATUS NTAPI diff --git a/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp b/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp index 2257efdaa85..04f694b12b2 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CDrmPort2 : public IDrmPort2 { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp index c542c329ae5..ebece4e8b30 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortFilterDMus : public IPortFilterDMus { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp b/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp index 4c7e0dcee22..6855faff01a 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortFilterTopology : public IPortFilterTopology { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp index e7882bb8da9..88653f33fa5 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortFilterWaveCyclic : public IPortFilterWaveCyclic { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp index 639fb86720f..cdc4be6887a 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortFilterWavePci : public IPortFilterWavePci { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp b/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp index c3da305a097..f38a8960b56 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortFilterWaveRT : public IPortFilterWaveRT { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/guid.cpp b/reactos/drivers/wdm/audio/backpln/portcls/guid.cpp new file mode 100644 index 00000000000..24ff837854d --- /dev/null +++ b/reactos/drivers/wdm/audio/backpln/portcls/guid.cpp @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include +#include +#include + +#include "interfaces.hpp" + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp b/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp index ca8fe540238..d0705a0ceaa 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp @@ -6,9 +6,14 @@ * PROGRAMMER: Johannes Anderwald */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + typedef struct { LIST_ENTRY ListEntry; diff --git a/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp b/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp index e18b1f7fee9..2cd09818ff7 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/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 + typedef struct { PIRP Irp; diff --git a/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp index 4eba6e346a9..390c62bc9c2 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -8,6 +8,11 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include class CIrpQueue : public IIrpQueue { diff --git a/reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp index a6856a67cc3..992e29ea1e7 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + NTSTATUS NTAPI PcNewMiniport( diff --git a/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index 7fd55aeb00c..d8f6772e72e 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -7,9 +7,14 @@ * */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + // + for absolute / - for relative #define kOneMillisec (10 * 1000) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp index 54080a998b5..44d479047d2 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp @@ -8,6 +8,11 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include NTSTATUS NewMiniportFmSynth( OUT PMINIPORT* OutMiniport, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp index 848e4e98795..dbd146bde41 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortPinDMus : public IPortPinDMus { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index 7dc1f3df91c..ab84dc3439d 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortPinWaveCyclic : public IPortPinWaveCyclic, public IServiceSink { diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 6d088d4d462..b493e4de130 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortPinWavePci : public IPortPinWavePci, public IServiceSink, public IPortWavePciStream diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index f9a2644bb62..59501179918 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortPinWaveRT : public IPortPinWaveRT { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp index 98f8b733c1c..cd39f61c3fb 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pool.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + PVOID AllocateItem( IN POOL_TYPE PoolType, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port.cpp index 307c4f977e5..504291a0d7d 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port.cpp @@ -7,10 +7,13 @@ * Andrew Greenwood */ -#include #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif +#include NTSTATUS NTAPI diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp index 3f4fb918259..a3b3d6d24e2 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortDMus : public IPortDMus, public ISubdevice { diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp index 36e094db109..6bb76aa4f1e 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortTopology : public IPortTopology, public ISubdevice, public IPortEvents diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp index b7e99b35a85..61152b2f3a5 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + GUID IID_IDmaChannelSlave; class CPortWaveCyclic : public IPortWaveCyclic, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp index 64e90097389..7a6b60874db 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortWavePci : public IPortWavePci, public IPortEvents, public ISubdevice, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp index 305d097276c..71e848262e2 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortWaveRT : public IPortWaveRT, public IPortEvents, public ISubdevice diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp index 16e83f61624..3472c071f66 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CPortWaveRTStreamInit : public IPortWaveRTStreamInit { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/power.cpp b/reactos/drivers/wdm/audio/backpln/portcls/power.cpp index 2aaf72db4d2..6371952b115 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/power.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/power.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + NTSTATUS NTAPI PcRegisterAdapterPowerManagement( diff --git a/reactos/drivers/wdm/audio/backpln/portcls/private.hpp b/reactos/drivers/wdm/audio/backpln/portcls/private.hpp index 641c1a402e4..ed756959fc3 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/private.hpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/private.hpp @@ -7,6 +7,8 @@ #ifndef PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H +#include + //#define _KS_NO_ANONYMOUS_STRUCTURES_ #define PC_IMPLEMENTATION #define COM_STDMETHOD_CAN_THROW @@ -14,21 +16,10 @@ #include #include - -#ifndef YDEBUG -#define NDEBUG -#endif - -#include - #include #include -#include "interfaces.hpp" -#include -#include -#include -//#include +#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 */ diff --git a/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp b/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp index 7dab0bea8f2..28dce3908be 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + NTSTATUS HandlePropertyInstances( IN PIO_STATUS_BLOCK IoStatus, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp b/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp index 5de3ea02790..d09cd6891bc 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp @@ -6,9 +6,13 @@ * PROGRAMMER: Johannes Anderwald */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include extern "C" { void diff --git a/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp b/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp index d8831449d0b..35b7946d384 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CRegistryKey : public IRegistryKey { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp b/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp index 388dc605366..e2b326dd80c 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp @@ -11,6 +11,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CResourceList : public IResourceList { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp b/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp index c74022c8d07..422c5aaf4a8 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp +++ b/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 + VOID NTAPI IServiceGroupDpc( diff --git a/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp b/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp index acbf2996fd2..6df999f0d87 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + NTSTATUS NTAPI KsoDispatchCreateWithGenericFactory( diff --git a/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp b/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp index 2d7c6a4816b..80e1b3903c2 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp @@ -8,6 +8,12 @@ #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include + class CUnregisterSubdevice : public IUnregisterSubdevice { public: diff --git a/reactos/drivers/wdm/audio/backpln/portcls/version.cpp b/reactos/drivers/wdm/audio/backpln/portcls/version.cpp index 2f0ccf14aad..629c74a4a6a 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/version.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/version.cpp @@ -6,9 +6,13 @@ * PROGRAMMER: Johannes Anderwald */ - #include "private.hpp" +#ifndef YDEBUG +#define NDEBUG +#endif + +#include class CPortClsVersion : public IPortClsVersion {