[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
2026-08-29 04:13:32 +00:00 · 2014-01-03 17:10:56 +00:00
parent 8c30aa7f03
commit dd88e2643b
43 changed files with 247 additions and 23 deletions
@@ -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
@@ -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
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

-
 #include "private.hpp"

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

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 Dispatch_fnDeviceIoControl(
@@ -6,9 +6,14 @@
 * PROGRAMMER:      Andrew Greenwood
 */

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 extern
 "C"
 ULONG
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>

 NTSTATUS
 NTAPI
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CPortFilterWaveRT : public IPortFilterWaveRT
 {
 public:
@@ -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 */
@@ -6,9 +6,14 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "private.hpp"

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

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 typedef struct
 {
    PIRP Irp;
@@ -8,6 +8,11 @@

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>

 class CIrpQueue : public IIrpQueue
 {
@@ -8,6 +8,12 @@

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 PcNewMiniport(
@@ -7,9 +7,14 @@
 *
 */

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 //  + for absolute / - for relative

 #define kOneMillisec (10 * 1000)
@@ -8,6 +8,11 @@

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>

 NTSTATUS NewMiniportFmSynth(
    OUT PMINIPORT* OutMiniport,
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 PVOID
 AllocateItem(
    IN POOL_TYPE PoolType,
@@ -7,10 +7,13 @@
 *                  Andrew Greenwood
 */

-#include <initguid.h>
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif

+#include <debug.h>

 NTSTATUS
 NTAPI
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 GUID IID_IDmaChannelSlave;

 class CPortWaveCyclic : public IPortWaveCyclic,
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

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

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 PcRegisterAdapterPowerManagement(
@@ -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 */
@@ -8,6 +8,12 @@

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 NTSTATUS
 HandlePropertyInstances(
    IN PIO_STATUS_BLOCK IoStatus,
@@ -6,9 +6,13 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>

 extern "C" {
  void 
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 class CResourceList : public IResourceList
 {
 public:
@@ -6,9 +6,14 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>
+
 VOID
 NTAPI
 IServiceGroupDpc(
@@ -8,6 +8,12 @@

 #include "private.hpp"

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

 #include "private.hpp"

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

-
 #include "private.hpp"

+#ifndef YDEBUG
+#define NDEBUG
+#endif
+
+#include <debug.h>

 class CPortClsVersion : public IPortClsVersion
 {