Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PORTCLS] Remove meaningless YDEBUG (#5858)

Browse source 
Addendum to b77ebc4 (r54584).
Follow-up of #5818.
This commit is contained in:
Serge Gautherie 2023-11-02 13:14:12 +01:00 committed by GitHub
parent dabb3f4d61
commit c6c6c62cb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 5 additions and 306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/wdm/audio/backpln/portcls/adapter.cpp
View file

@ -11,10 +11,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
// //
@ -201,7 +198,6 @@ cleanup:
// delete created fdo // delete created fdo
IoDeleteDevice(fdo); IoDeleteDevice(fdo);
return status; return status;
} }

8
drivers/wdm/audio/backpln/portcls/api.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -150,10 +147,8 @@ PcUnregisterIoTimeout(
if (!pDeviceObject || !pDeviceObject->DeviceExtension) if (!pDeviceObject || !pDeviceObject->DeviceExtension)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension;
KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql);
ListEntry = DeviceExtension->TimerList.Flink; ListEntry = DeviceExtension->TimerList.Flink;
@ -181,8 +176,6 @@ PcUnregisterIoTimeout(
return STATUS_NOT_FOUND; return STATUS_NOT_FOUND;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PcCompletePendingPropertyRequest( PcCompletePendingPropertyRequest(
@ -263,4 +256,3 @@ PcDmaSlaveDescription(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

7
drivers/wdm/audio/backpln/portcls/connection.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
extern extern
@ -24,7 +21,6 @@ RtlCreateUnicodeString(
PCWSTR SourceString PCWSTR SourceString
); );
class CUnregisterPhysicalConnection : public CUnknownImpl<IUnregisterPhysicalConnection> class CUnregisterPhysicalConnection : public CUnknownImpl<IUnregisterPhysicalConnection>
{ {
public: public:
@ -175,7 +171,6 @@ RegisterConnection(
FromString = &SymEntry->SymbolicLink; FromString = &SymEntry->SymbolicLink;
} }
if (ToUnknown) if (ToUnknown)
{ {
Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice);
@ -192,7 +187,6 @@ RegisterConnection(
goto cleanup; goto cleanup;
} }
SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry);
ToString = &SymEntry->SymbolicLink; ToString = &SymEntry->SymbolicLink;
@ -229,7 +223,6 @@ RegisterConnection(
InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry);
} }
if (ToSubDeviceDescriptor) if (ToSubDeviceDescriptor)
{ {
ToEntry->FromPin = ToPin; ToEntry->FromPin = ToPin;

9
drivers/wdm/audio/backpln/portcls/dispatcher.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -48,7 +45,6 @@ Dispatch_fnRead(
// get dispatch context // get dispatch context
DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext;
// let IrpTarget handle request // let IrpTarget handle request
return DispatchContext->Target->Read(DeviceObject, Irp); return DispatchContext->Target->Read(DeviceObject, Irp);
} }
@ -68,7 +64,6 @@ Dispatch_fnWrite(
// get dispatch context // get dispatch context
DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext;
// let IrpTarget handle request // let IrpTarget handle request
return DispatchContext->Target->Write(DeviceObject, Irp); return DispatchContext->Target->Write(DeviceObject, Irp);
} }
@ -88,7 +83,6 @@ Dispatch_fnFlush(
// get dispatch context // get dispatch context
DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext;
// let IrpTarget handle request // let IrpTarget handle request
return DispatchContext->Target->Flush(DeviceObject, Irp); return DispatchContext->Target->Flush(DeviceObject, Irp);
} }
@ -135,7 +129,6 @@ Dispatch_fnQuerySecurity(
// get dispatch context // get dispatch context
DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext;
// let IrpTarget handle request // let IrpTarget handle request
return DispatchContext->Target->QuerySecurity(DeviceObject, Irp); return DispatchContext->Target->QuerySecurity(DeviceObject, Irp);
} }
@ -181,7 +174,6 @@ Dispatch_fnFastDeviceIoControl(
return DispatchContext->Target->FastDeviceIoControl(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); return DispatchContext->Target->FastDeviceIoControl(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject);
} }
BOOLEAN BOOLEAN
NTAPI NTAPI
Dispatch_fnFastRead( Dispatch_fnFastRead(
@ -279,4 +271,3 @@ NewDispatchObject(
DPRINT("KsAllocateObjectHeader result %x Target %p Context %p\n", Status, Target, DispatchContext); DPRINT("KsAllocateObjectHeader result %x Target %p Context %p\n", Status, Target, DispatchContext);
return Status; return Status;
} }

4
drivers/wdm/audio/backpln/portcls/dll.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
extern extern
@ -23,7 +20,6 @@ DllInitialize(ULONG Unknown)
return 0; return 0;
} }
extern extern
"C" "C"
{ {

7
drivers/wdm/audio/backpln/portcls/dma_slave.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CDmaChannelInit : public CUnknownImpl<IDmaChannelInit> class CDmaChannelInit : public CUnknownImpl<IDmaChannelInit>
@ -74,8 +71,6 @@ protected:
friend IO_ALLOCATION_ACTION NTAPI AdapterControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, IN PVOID Context); friend IO_ALLOCATION_ACTION NTAPI AdapterControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, IN PVOID Context);
}; };
//--------------------------------------------------------------- //---------------------------------------------------------------
// IUnknown methods // IUnknown methods
// //
@ -235,7 +230,6 @@ CDmaChannelInit::PhysicalAddress(
return Result; return Result;
} }
#endif #endif
VOID VOID
@ -257,7 +251,6 @@ CDmaChannelInit::BufferSize()
return m_BufferSize; return m_BufferSize;
} }
PVOID PVOID
NTAPI NTAPI
CDmaChannelInit::SystemAddress() CDmaChannelInit::SystemAddress()

3
drivers/wdm/audio/backpln/portcls/drm.cpp
View file

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

5
drivers/wdm/audio/backpln/portcls/drm_port.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CDrmPort2 : public CUnknownImpl<IDrmPort2> class CDrmPort2 : public CUnknownImpl<IDrmPort2>
@ -134,5 +131,3 @@ NewIDrmPort(
*OutPort = (PDRMPORT2)This; *OutPort = (PDRMPORT2)This;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

7
drivers/wdm/audio/backpln/portcls/filter_dmus.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortFilterDMus : public CUnknownImpl<IPortFilterDMus> class CPortFilterDMus : public CUnknownImpl<IPortFilterDMus>
@ -287,7 +284,6 @@ CPortFilterDMus::Init(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortFilterDMus::FreePin( CPortFilterDMus::FreePin(
@ -321,7 +317,6 @@ CPortFilterDMus::NotifyPins()
} }
} }
NTSTATUS NTSTATUS
NewPortFilterDMus( NewPortFilterDMus(
OUT PPORTFILTERDMUS * OutFilter) OUT PPORTFILTERDMUS * OutFilter)
@ -339,5 +334,3 @@ NewPortFilterDMus(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

6
drivers/wdm/audio/backpln/portcls/filter_topology.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortFilterTopology : public CUnknownImpl<IPortFilterTopology> class CPortFilterTopology : public CUnknownImpl<IPortFilterTopology>
@ -29,7 +26,6 @@ protected:
ISubdevice * m_SubDevice; ISubdevice * m_SubDevice;
}; };
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortFilterTopology::QueryInterface( CPortFilterTopology::QueryInterface(
@ -70,7 +66,6 @@ CPortFilterTopology::NewIrpTarget(
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortFilterTopology::DeviceIoControl( CPortFilterTopology::DeviceIoControl(
@ -232,7 +227,6 @@ CPortFilterTopology::Init(
SUBDEVICE_DESCRIPTOR * Descriptor; SUBDEVICE_DESCRIPTOR * Descriptor;
NTSTATUS Status; NTSTATUS Status;
// get our private interface // get our private interface
Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&ISubDevice); Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&ISubDevice);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))

6
drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortFilterWaveCyclic : public CUnknownImpl<IPortFilterWaveCyclic> class CPortFilterWaveCyclic : public CUnknownImpl<IPortFilterWaveCyclic>
@ -312,7 +309,6 @@ CPortFilterWaveCyclic::Init(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortFilterWaveCyclic::FreePin( CPortFilterWaveCyclic::FreePin(
@ -332,7 +328,6 @@ CPortFilterWaveCyclic::FreePin(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
NTSTATUS NTSTATUS
NewPortFilterWaveCyclic( NewPortFilterWaveCyclic(
OUT IPortFilterWaveCyclic ** OutFilter) OUT IPortFilterWaveCyclic ** OutFilter)
@ -351,4 +346,3 @@ NewPortFilterWaveCyclic(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

5
drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortFilterWavePci : public CUnknownImpl<IPortFilterWavePci> class CPortFilterWavePci : public CUnknownImpl<IPortFilterWavePci>
@ -91,7 +88,6 @@ CPortFilterWavePci::NewIrpTarget(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
// now create the pin // now create the pin
Status = NewPortPinWavePci(&Pin); Status = NewPortPinWavePci(&Pin);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -313,7 +309,6 @@ CPortFilterWavePci::FreePin(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
NTSTATUS NTSTATUS
NewPortFilterWavePci( NewPortFilterWavePci(
OUT IPortFilterWavePci ** OutFilter) OUT IPortFilterWavePci ** OutFilter)

3
drivers/wdm/audio/backpln/portcls/filter_wavert.cpp
View file

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

10
drivers/wdm/audio/backpln/portcls/interrupt.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
typedef struct typedef struct
@ -47,13 +44,10 @@ public:
friend BOOLEAN NTAPI IInterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); friend BOOLEAN NTAPI IInterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext);
}; };
//--------------------------------------------------------------- //---------------------------------------------------------------
// IUnknown methods // IUnknown methods
// //
NTSTATUS NTSTATUS
NTAPI NTAPI
CInterruptSync::QueryInterface( CInterruptSync::QueryInterface(
@ -72,7 +66,6 @@ CInterruptSync::QueryInterface(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS)
{ {
DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer);
@ -86,7 +79,6 @@ CInterruptSync::QueryInterface(
// CInterruptSync methods // CInterruptSync methods
// //
BOOLEAN BOOLEAN
NTAPI NTAPI
CInterruptSynchronizedRoutine( CInterruptSynchronizedRoutine(
@ -219,7 +211,6 @@ IInterruptServiceRoutine(
} }
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CInterruptSync::Connect() CInterruptSync::Connect()
@ -255,7 +246,6 @@ CInterruptSync::Connect()
return Status; return Status;
} }
VOID VOID
NTAPI NTAPI
CInterruptSync::Disconnect() CInterruptSync::Disconnect()

10
drivers/wdm/audio/backpln/portcls/irp.cpp
View file

@ -11,10 +11,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
typedef struct typedef struct
@ -23,7 +20,6 @@ typedef struct
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
}QUERY_POWER_CONTEXT, *PQUERY_POWER_CONTEXT; }QUERY_POWER_CONTEXT, *PQUERY_POWER_CONTEXT;
NTSTATUS NTSTATUS
NTAPI NTAPI
PortClsCreate( PortClsCreate(
@ -35,7 +31,6 @@ PortClsCreate(
return KsDispatchIrp(DeviceObject, Irp); return KsDispatchIrp(DeviceObject, Irp);
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PortClsPnp( PortClsPnp(
@ -53,7 +48,6 @@ PortClsPnp(
DeviceExt = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; DeviceExt = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension;
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
DPRINT("PortClsPnp called %u\n", IoStack->MinorFunction); DPRINT("PortClsPnp called %u\n", IoStack->MinorFunction);
//PC_ASSERT(DeviceExt); //PC_ASSERT(DeviceExt);
@ -203,7 +197,6 @@ PwrCompletionFunction(
FreeItem(PwrContext, TAG_PORTCLASS); FreeItem(PwrContext, TAG_PORTCLASS);
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PortClsPower( PortClsPower(
@ -460,7 +453,6 @@ PcDispatchIrp(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PcCompleteIrp( PcCompleteIrp(
@ -512,8 +504,6 @@ CompletionRoutine(
if (_InvokeOnCancel) _IrpSp->Control |= SL_INVOKE_ON_CANCEL; \ if (_InvokeOnCancel) _IrpSp->Control |= SL_INVOKE_ON_CANCEL; \
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PcForwardIrpSynchronous( PcForwardIrpSynchronous(

5
drivers/wdm/audio/backpln/portcls/irpstream.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
static static
@ -86,7 +83,6 @@ typedef struct
#define STREAM_DATA_OFFSET (0) #define STREAM_DATA_OFFSET (0)
NTSTATUS NTSTATUS
NTAPI NTAPI
CIrpQueue::QueryInterface( CIrpQueue::QueryInterface(
@ -248,7 +244,6 @@ CIrpQueue::AddMapping(
} }
} }
// now get a system address for the user buffers // now get a system address for the user buffers
Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer;
Mdl = Irp->MdlAddress; Mdl = Irp->MdlAddress;

4
drivers/wdm/audio/backpln/portcls/miniport.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
PVOID PVOID
@ -79,4 +76,3 @@ PcNewMiniport(
DPRINT("PcNewMiniport Status %x\n", Status); DPRINT("PcNewMiniport Status %x\n", Status);
return Status; return Status;
} }

3
drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp
View file

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

6
drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp
View file

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

13
drivers/wdm/audio/backpln/portcls/pin_dmus.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortPinDMus : public CUnknownImpl<IPortPinDMus> class CPortPinDMus : public CUnknownImpl<IPortPinDMus>
@ -46,7 +43,6 @@ protected:
PMINIPORTMIDI m_MidiMiniport; PMINIPORTMIDI m_MidiMiniport;
PMINIPORTMIDISTREAM m_MidiStream; PMINIPORTMIDISTREAM m_MidiStream;
KSSTATE m_State; KSSTATE m_State;
PKSDATAFORMAT m_Format; PKSDATAFORMAT m_Format;
KSPIN_CONNECT * m_ConnectDetails; KSPIN_CONNECT * m_ConnectDetails;
@ -124,7 +120,6 @@ CPortPinDMus::GetBuffer(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinDMus::PutBuffer( CPortPinDMus::PutBuffer(
@ -147,7 +142,6 @@ CPortPinDMus::SetState(
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinDMus::PutMessage( CPortPinDMus::PutMessage(
@ -157,7 +151,6 @@ CPortPinDMus::PutMessage(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinDMus::ConnectOutput( CPortPinDMus::ConnectOutput(
@ -167,7 +160,6 @@ CPortPinDMus::ConnectOutput(
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinDMus::DisconnectOutput( CPortPinDMus::DisconnectOutput(
@ -255,7 +247,6 @@ CPortPinDMus::TransferMidiDataToDMus()
Event->Event.cbEvent = (USHORT)BufferSize; Event->Event.cbEvent = (USHORT)BufferSize;
Event->Event.uData.pbData = (PBYTE)Buffer; Event->Event.uData.pbData = (PBYTE)Buffer;
if (!Root) if (!Root)
Root = Event; Root = Event;
else else
@ -276,8 +267,6 @@ CPortPinDMus::TransferMidiDataToDMus()
DPRINT("Status %x\n", Status); DPRINT("Status %x\n", Status);
} }
VOID VOID
NTAPI NTAPI
CPortPinDMus::RequestService() CPortPinDMus::RequestService()
@ -295,6 +284,7 @@ CPortPinDMus::RequestService()
} }
//================================================================================================================================== //==================================================================================================================================
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinDMus::QueryInterface( CPortPinDMus::QueryInterface(
@ -629,4 +619,3 @@ NewPortPinDMus(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

28
drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortPinWaveCyclic : public CUnknownImpl<IPortPinWaveCyclic, IServiceSink> class CPortPinWaveCyclic : public CUnknownImpl<IPortPinWaveCyclic, IServiceSink>
@ -109,7 +106,6 @@ protected:
ULONG m_Delay; ULONG m_Delay;
}; };
typedef struct typedef struct
{ {
ULONG bLoopedStreaming; ULONG bLoopedStreaming;
@ -121,8 +117,6 @@ typedef struct
ULONG bLoopedStreaming; ULONG bLoopedStreaming;
}ENDOFSTREAM_EVENT_CONTEXT, *PENDOFSTREAM_EVENT_CONTEXT; }ENDOFSTREAM_EVENT_CONTEXT, *PENDOFSTREAM_EVENT_CONTEXT;
NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data);
NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data);
NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data);
@ -131,7 +125,6 @@ NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA Ev
NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry);
NTSTATUS NTAPI PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data);
DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming);
DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition);
DEFINE_KSPROPERTY_DRMSET(PinWaveCyclicDRMSet, PinWaveCyclicDRMHandler); DEFINE_KSPROPERTY_DRMSET(PinWaveCyclicDRMSet, PinWaveCyclicDRMHandler);
@ -156,7 +149,6 @@ KSEVENT_ITEM PinWaveCyclicStreamingEventSet =
0 0
}; };
KSPROPERTY_SET PinWaveCyclicPropertySet[] = KSPROPERTY_SET PinWaveCyclicPropertySet[] =
{ {
{ {
@ -196,7 +188,6 @@ KSEVENT_SET PinWaveCyclicEventSet[] =
} }
}; };
//================================================================================================================================== //==================================================================================================================================
NTSTATUS NTSTATUS
@ -237,7 +228,6 @@ PinWaveCyclicDRMHandler(
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PinWaveCyclicAddEndOfStreamEvent( PinWaveCyclicAddEndOfStreamEvent(
@ -335,7 +325,6 @@ PinWaveCyclicAllocatorFraming(
// cast to pin impl // cast to pin impl
Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; Pin = (CPortPinWaveCyclic*)Descriptor->PortPin;
if (Request->Flags & KSPROPERTY_TYPE_GET) if (Request->Flags & KSPROPERTY_TYPE_GET)
{ {
// copy pin framing // copy pin framing
@ -452,7 +441,6 @@ PinSetStateWorkerRoutine(
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PinWaveCyclicState( PinWaveCyclicState(
@ -600,7 +588,6 @@ PinWaveCyclicDataFormat(
PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM));
PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX));
DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels,
((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample,
((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec);
@ -613,7 +600,6 @@ PinWaveCyclicDataFormat(
FreeItem(NewDataFormat, TAG_PORTCLASS); FreeItem(NewDataFormat, TAG_PORTCLASS);
} }
// done // done
return Status; return Status;
} }
@ -773,7 +759,6 @@ CPortPinWaveCyclic::UpdateCommonBufferOverlap(
PUCHAR Buffer; PUCHAR Buffer;
NTSTATUS Status; NTSTATUS Status;
BufferLength = Gap = m_CommonBufferSize - m_CommonBufferOffset; BufferLength = Gap = m_CommonBufferSize - m_CommonBufferOffset;
BufferLength = Length = min(BufferLength, MaxTransferCount); BufferLength = Length = min(BufferLength, MaxTransferCount);
while(BufferLength) while(BufferLength)
@ -1076,7 +1061,6 @@ CPortPinWaveCyclic::Close(
m_Stream = NULL; m_Stream = NULL;
} }
if (m_Filter) if (m_Filter)
{ {
// disconnect pin from filter // disconnect pin from filter
@ -1141,7 +1125,6 @@ CPortPinWaveCyclic::FastDeviceIoControl(
return KsDispatchFastIoDeviceControlFailure(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, StatusBlock, DeviceObject); return KsDispatchFastIoDeviceControlFailure(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, StatusBlock, DeviceObject);
} }
BOOLEAN BOOLEAN
NTAPI NTAPI
CPortPinWaveCyclic::FastRead( CPortPinWaveCyclic::FastRead(
@ -1157,7 +1140,6 @@ CPortPinWaveCyclic::FastRead(
return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject);
} }
BOOLEAN BOOLEAN
NTAPI NTAPI
CPortPinWaveCyclic::FastWrite( CPortPinWaveCyclic::FastWrite(
@ -1173,7 +1155,6 @@ CPortPinWaveCyclic::FastWrite(
return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject);
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinWaveCyclic::Init( CPortPinWaveCyclic::Init(
@ -1218,7 +1199,6 @@ CPortPinWaveCyclic::Init(
while(TRUE); while(TRUE);
} }
Status = m_Miniport->NewStream(&m_Stream, Status = m_Miniport->NewStream(&m_Stream,
NULL, NULL,
NonPagedPool, NonPagedPool,
@ -1321,7 +1301,6 @@ CPortPinWaveCyclic::Init(
DPRINT1("Bits %u Samples %u Channels %u Tag %u FrameSize %u CommonBufferSize %lu, CommonBuffer %p\n", ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nSamplesPerSec, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wFormatTag, m_FrameSize, m_CommonBufferSize, m_DmaChannel->SystemAddress()); DPRINT1("Bits %u Samples %u Channels %u Tag %u FrameSize %u CommonBufferSize %lu, CommonBuffer %p\n", ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nSamplesPerSec, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wFormatTag, m_FrameSize, m_CommonBufferSize, m_DmaChannel->SystemAddress());
/* set up allocator framing */ /* set up allocator framing */
m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY; m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY;
m_AllocatorFraming.PoolType = NonPagedPool; m_AllocatorFraming.PoolType = NonPagedPool;
@ -1354,7 +1333,6 @@ CPortPinWaveCyclic::Init(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
ULONG ULONG
NTAPI NTAPI
CPortPinWaveCyclic::GetCompletedPosition() CPortPinWaveCyclic::GetCompletedPosition()
@ -1363,7 +1341,6 @@ CPortPinWaveCyclic::GetCompletedPosition()
return 0; return 0;
} }
ULONG ULONG
NTAPI NTAPI
CPortPinWaveCyclic::GetCycleCount() CPortPinWaveCyclic::GetCycleCount()
@ -1372,7 +1349,6 @@ CPortPinWaveCyclic::GetCycleCount()
return 0; return 0;
} }
ULONG ULONG
NTAPI NTAPI
CPortPinWaveCyclic::GetDeviceBufferSize() CPortPinWaveCyclic::GetDeviceBufferSize()
@ -1380,7 +1356,6 @@ CPortPinWaveCyclic::GetDeviceBufferSize()
return m_CommonBufferSize; return m_CommonBufferSize;
} }
PVOID PVOID
NTAPI NTAPI
CPortPinWaveCyclic::GetIrpStream() CPortPinWaveCyclic::GetIrpStream()
@ -1388,7 +1363,6 @@ CPortPinWaveCyclic::GetIrpStream()
return (PVOID)m_IrpQueue; return (PVOID)m_IrpQueue;
} }
PMINIPORT PMINIPORT
NTAPI NTAPI
CPortPinWaveCyclic::GetMiniport() CPortPinWaveCyclic::GetMiniport()
@ -1396,7 +1370,6 @@ CPortPinWaveCyclic::GetMiniport()
return (PMINIPORT)m_Miniport; return (PMINIPORT)m_Miniport;
} }
NTSTATUS NTSTATUS
NewPortPinWaveCyclic( NewPortPinWaveCyclic(
OUT IPortPinWaveCyclic ** OutPin) OUT IPortPinWaveCyclic ** OutPin)
@ -1414,4 +1387,3 @@ NewPortPinWaveCyclic(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

19
drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortPinWavePci : public CUnknownImpl<IPortPinWavePci, IServiceSink, IPortWavePciStream> class CPortPinWavePci : public CUnknownImpl<IPortPinWavePci, IServiceSink, IPortWavePciStream>
@ -93,7 +90,6 @@ KSPROPERTY_SET PinWavePciPropertySet[] =
} }
}; };
NTSTATUS NTSTATUS
NTAPI NTAPI
PinWavePciAllocatorFraming( PinWavePciAllocatorFraming(
@ -115,7 +111,6 @@ PinWavePciAllocatorFraming(
// cast to pin impl // cast to pin impl
Pin = (CPortPinWavePci*)Descriptor->PortPin; Pin = (CPortPinWavePci*)Descriptor->PortPin;
if (Request->Flags & KSPROPERTY_TYPE_GET) if (Request->Flags & KSPROPERTY_TYPE_GET)
{ {
// copy pin framing // copy pin framing
@ -168,7 +163,6 @@ PinWavePciAudioPosition(
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PinWavePciState( PinWavePciState(
@ -330,7 +324,6 @@ PinWavePciDataFormat(
PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM));
PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX));
DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels,
((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample,
((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec);
@ -343,7 +336,6 @@ PinWavePciDataFormat(
FreeItem(NewDataFormat, TAG_PORTCLASS); FreeItem(NewDataFormat, TAG_PORTCLASS);
} }
// done // done
return Status; return Status;
} }
@ -371,8 +363,8 @@ PinWavePciDataFormat(
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
//================================================================================================================================== //==================================================================================================================================
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinWavePci::QueryInterface( CPortPinWavePci::QueryInterface(
@ -396,7 +388,6 @@ CPortPinWavePci::QueryInterface(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
if (IsEqualGUIDAligned(refiid, IID_IPortWavePciStream)) if (IsEqualGUIDAligned(refiid, IID_IPortWavePciStream))
{ {
*Output = PVOID(PPORTWAVEPCISTREAM(this)); *Output = PVOID(PPORTWAVEPCISTREAM(this));
@ -440,7 +431,6 @@ CPortPinWavePci::TerminatePacket()
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
VOID VOID
NTAPI NTAPI
CPortPinWavePci::RequestService() CPortPinWavePci::RequestService()
@ -554,7 +544,6 @@ CPortPinWavePci::HandleKsStream(
return Status; return Status;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinWavePci::DeviceIoControl( CPortPinWavePci::DeviceIoControl(
@ -639,7 +628,6 @@ CPortPinWavePci::Close(
m_IrpQueue = NULL; m_IrpQueue = NULL;
} }
if (m_ServiceGroup) if (m_ServiceGroup)
{ {
// remove member from service group // remove member from service group
@ -766,7 +754,6 @@ CPortPinWavePci::FastWrite(
return FALSE; return FALSE;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinWavePci::Init( CPortPinWavePci::Init(
@ -960,7 +947,6 @@ CPortPinWavePci::Init(
} }
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -971,7 +957,6 @@ CPortPinWavePci::GetIrpStream()
return (PVOID)m_IrpQueue; return (PVOID)m_IrpQueue;
} }
PMINIPORT PMINIPORT
NTAPI NTAPI
CPortPinWavePci::GetMiniport() CPortPinWavePci::GetMiniport()
@ -979,7 +964,6 @@ CPortPinWavePci::GetMiniport()
return (PMINIPORT)m_Miniport; return (PMINIPORT)m_Miniport;
} }
NTSTATUS NTSTATUS
NewPortPinWavePci( NewPortPinWavePci(
OUT IPortPinWavePci ** OutPin) OUT IPortPinWavePci ** OutPin)
@ -997,4 +981,3 @@ NewPortPinWavePci(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

8
drivers/wdm/audio/backpln/portcls/pin_wavert.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortPinWaveRT : public CUnknownImpl<IPortPinWaveRT> class CPortPinWaveRT : public CUnknownImpl<IPortPinWaveRT>
@ -60,7 +57,6 @@ protected:
}; };
typedef struct typedef struct
{ {
CPortPinWaveRT *Pin; CPortPinWaveRT *Pin;
@ -68,8 +64,8 @@ typedef struct
KSSTATE State; KSSTATE State;
}SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; }SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT;
//================================================================================================================================== //==================================================================================================================================
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortPinWaveRT::QueryInterface( CPortPinWaveRT::QueryInterface(
@ -286,7 +282,6 @@ CPortPinWaveRT::DeviceIoControl(
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
switch (IoStack->Parameters.DeviceIoControl.IoControlCode) switch (IoStack->Parameters.DeviceIoControl.IoControlCode)
{ {
case IOCTL_KS_PROPERTY: case IOCTL_KS_PROPERTY:
@ -671,7 +666,6 @@ cleanup:
return Status; return Status;
} }
NTSTATUS NTSTATUS
NewPortPinWaveRT( NewPortPinWaveRT(
OUT IPortPinWaveRT ** OutPin) OUT IPortPinWaveRT ** OutPin)

5
drivers/wdm/audio/backpln/portcls/pool.cpp
View file

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

3
drivers/wdm/audio/backpln/portcls/port.cpp
View file

@ -9,10 +9,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS

11
drivers/wdm/audio/backpln/portcls/port_dmus.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortDMus : public CUnknownImpl<IPortDMus, ISubdevice> class CPortDMus : public CUnknownImpl<IPortDMus, ISubdevice>
@ -79,7 +76,6 @@ KSPROPERTY_SET PortDMusPropertySet[] =
} }
}; };
//--------------------------------------------------------------- //---------------------------------------------------------------
// IUnknown interface functions // IUnknown interface functions
// //
@ -302,7 +298,6 @@ CPortDMus::Init(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortDMus::NewRegistryKey( CPortDMus::NewRegistryKey(
@ -393,7 +388,6 @@ CPortDMus::NewIrpTarget(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
Status = NewPortFilterDMus(&Filter); Status = NewPortFilterDMus(&Filter);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -462,7 +456,6 @@ CPortDMus::PowerChangeNotify(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortDMus::PinCount( CPortDMus::PinCount(
@ -485,8 +478,6 @@ CPortDMus::PinCount(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
NTSTATUS NTSTATUS
NewPortDMus( NewPortDMus(
OUT PPORT* OutPort) OUT PPORT* OutPort)
@ -508,8 +499,6 @@ NewPortDMus(
} }
VOID VOID
GetDMusMiniport( GetDMusMiniport(
IN IPortDMus * iface, IN IPortDMus * iface,

12
drivers/wdm/audio/backpln/portcls/port_topology.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortTopology : public CUnknownImpl<IPortTopology, ISubdevice, IPortEvents> class CPortTopology : public CUnknownImpl<IPortTopology, ISubdevice, IPortEvents>
@ -78,7 +75,6 @@ KSPROPERTY_SET TopologyPropertySet[] =
// IPortEvents // IPortEvents
// //
void void
NTAPI NTAPI
CPortTopology::AddEventToEventList( CPortTopology::AddEventToEventList(
@ -100,7 +96,6 @@ CPortTopology::GenerateEventList(
UNIMPLEMENTED; UNIMPLEMENTED;
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
// IUnknown interface functions // IUnknown interface functions
// //
@ -255,7 +250,6 @@ CPortTopology::Init(
NULL, NULL,
m_pDescriptor); m_pDescriptor);
DPRINT("IPortTopology_fnInit success\n"); DPRINT("IPortTopology_fnInit success\n");
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
@ -266,7 +260,6 @@ CPortTopology::Init(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortTopology::NewRegistryKey( CPortTopology::NewRegistryKey(
@ -431,7 +424,6 @@ CPortTopology::PinCount(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
PcCreatePinDispatch( PcCreatePinDispatch(
@ -456,7 +448,6 @@ PcCreatePinDispatch(
PC_ASSERT(Filter != NULL); PC_ASSERT(Filter != NULL);
PC_ASSERT_IRQL(PASSIVE_LEVEL); PC_ASSERT_IRQL(PASSIVE_LEVEL);
#if KS_IMPLEMENTED #if KS_IMPLEMENTED
Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader);
if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED)
@ -517,7 +508,6 @@ PcCreateItemDispatch(
// sanity checks // sanity checks
PC_ASSERT(SubDevice != NULL); PC_ASSERT(SubDevice != NULL);
#if KS_IMPLEMENTED #if KS_IMPLEMENTED
Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader);
if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED)
@ -571,7 +561,6 @@ PcCreateItemDispatch(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NewPortTopology( NewPortTopology(
OUT PPORT* OutPort) OUT PPORT* OutPort)
@ -594,7 +583,6 @@ NewPortTopology(
return Status; return Status;
} }
PMINIPORTTOPOLOGY PMINIPORTTOPOLOGY
GetTopologyMiniport( GetTopologyMiniport(
PPORTTOPOLOGY Port) PPORTTOPOLOGY Port)

15
drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
GUID IID_IDmaChannelSlave; GUID IID_IDmaChannelSlave;
@ -87,7 +84,6 @@ KSPROPERTY_SET WaveCyclicPropertySet[] =
//KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION
//KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM,
//--------------------------------------------------------------- //---------------------------------------------------------------
// IPortEvents // IPortEvents
// //
@ -100,7 +96,6 @@ CPortWaveCyclic::AddEventToEventList(
UNIMPLEMENTED; UNIMPLEMENTED;
} }
void void
NTAPI NTAPI
CPortWaveCyclic::GenerateEventList( CPortWaveCyclic::GenerateEventList(
@ -227,7 +222,6 @@ CPortWaveCyclic::Init(
return Status; return Status;
} }
// get the miniport device descriptor // get the miniport device descriptor
Status = Miniport->GetDescription(&m_pDescriptor); Status = Miniport->GetDescription(&m_pDescriptor);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -283,7 +277,6 @@ CPortWaveCyclic::Init(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortWaveCyclic::NewRegistryKey( CPortWaveCyclic::NewRegistryKey(
@ -300,7 +293,6 @@ CPortWaveCyclic::NewRegistryKey(
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition);
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
// IPortWaveCyclic interface functions // IPortWaveCyclic interface functions
// //
@ -431,7 +423,6 @@ CPortWaveCyclic::NewIrpTarget(
return Status; return Status;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortWaveCyclic::ReleaseChildren() CPortWaveCyclic::ReleaseChildren()
@ -459,7 +450,6 @@ CPortWaveCyclic::ReleaseChildren()
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortWaveCyclic::GetDescriptor( CPortWaveCyclic::GetDescriptor(
@ -473,7 +463,6 @@ CPortWaveCyclic::GetDescriptor(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortWaveCyclic::DataRangeIntersection( CPortWaveCyclic::DataRangeIntersection(
@ -494,7 +483,6 @@ CPortWaveCyclic::DataRangeIntersection(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortWaveCyclic::PowerChangeNotify( CPortWaveCyclic::PowerChangeNotify(
@ -530,8 +518,8 @@ CPortWaveCyclic::PinCount(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
///-------------------------------------------------------------- ///--------------------------------------------------------------
PMINIPORTWAVECYCLIC PMINIPORTWAVECYCLIC
GetWaveCyclicMiniport( GetWaveCyclicMiniport(
IN IPortWaveCyclic* iface) IN IPortWaveCyclic* iface)
@ -573,4 +561,3 @@ NewPortWaveCyclic(
DPRINT("NewPortWaveCyclic %p Status %u\n", Port, Status); DPRINT("NewPortWaveCyclic %p Status %u\n", Port, Status);
return Status; return Status;
} }

9
drivers/wdm/audio/backpln/portcls/port_wavepci.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortWavePci : public CUnknownImpl<IPortWavePci, IPortEvents, ISubdevice, IServiceSink> class CPortWavePci : public CUnknownImpl<IPortWavePci, IPortEvents, ISubdevice, IServiceSink>
@ -82,7 +79,6 @@ KSPROPERTY_SET WavePciPropertySet[] =
} }
}; };
//--------------------------------------------------------------- //---------------------------------------------------------------
// IPortEvents // IPortEvents
// //
@ -101,8 +97,6 @@ CPortWavePci::AddEventToEventList(
KeReleaseSpinLock(&m_EventListLock, OldIrql); KeReleaseSpinLock(&m_EventListLock, OldIrql);
} }
void void
NTAPI NTAPI
CPortWavePci::GenerateEventList( CPortWavePci::GenerateEventList(
@ -268,7 +262,6 @@ CPortWavePci::Init(
NULL, NULL,
m_pDescriptor); m_pDescriptor);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status);
@ -512,7 +505,6 @@ CPortWavePci::PinCount(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
NTSTATUS NTSTATUS
NewPortWavePci( NewPortWavePci(
OUT PPORT* OutPort) OUT PPORT* OutPort)
@ -536,7 +528,6 @@ NewPortWavePci(
} }
PDEVICE_OBJECT PDEVICE_OBJECT
GetDeviceObjectFromPortWavePci( GetDeviceObjectFromPortWavePci(
IPortWavePci* iface) IPortWavePci* iface)

12
drivers/wdm/audio/backpln/portcls/port_wavert.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortWaveRT : public CUnknownImpl<IPortWaveRT, IPortEvents, ISubdevice> class CPortWaveRT : public CUnknownImpl<IPortWaveRT, IPortEvents, ISubdevice>
@ -81,8 +78,6 @@ KSPROPERTY_SET WaveRTPropertySet[] =
//KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION
//KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM,
//--------------------------------------------------------------- //---------------------------------------------------------------
// IPortEvents // IPortEvents
// //
@ -95,7 +90,6 @@ CPortWaveRT::AddEventToEventList(
UNIMPLEMENTED; UNIMPLEMENTED;
} }
void void
NTAPI NTAPI
CPortWaveRT::GenerateEventList( CPortWaveRT::GenerateEventList(
@ -237,7 +231,6 @@ CPortWaveRT::Init(
return Status; return Status;
} }
// get the miniport device descriptor // get the miniport device descriptor
Status = Miniport->GetDescription(&m_pDescriptor); Status = Miniport->GetDescription(&m_pDescriptor);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -291,12 +284,10 @@ CPortWaveRT::Init(
// increment reference on resource list // increment reference on resource list
ResourceList->AddRef(); ResourceList->AddRef();
DPRINT("IPortWaveRT successfully initialized\n"); DPRINT("IPortWaveRT successfully initialized\n");
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CPortWaveRT::NewRegistryKey( CPortWaveRT::NewRegistryKey(
@ -343,7 +334,6 @@ CPortWaveRT::NewIrpTarget(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
Status = NewPortFilterWaveRT(&Filter); Status = NewPortFilterWaveRT(&Filter);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -459,7 +449,6 @@ GetDeviceObjectFromPortWaveRT(
// IPortWaveRT constructor // IPortWaveRT constructor
// //
NTSTATUS NTSTATUS
NewPortWaveRT( NewPortWaveRT(
OUT PPORT* OutPort) OUT PPORT* OutPort)
@ -481,4 +470,3 @@ NewPortWaveRT(
DPRINT("NewPortWaveRT %p Status %u\n", Port, Status); DPRINT("NewPortWaveRT %p Status %u\n", Port, Status);
return Status; return Status;
} }

5
drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortWaveRTStreamInit : public CUnknownImpl<IPortWaveRTStreamInit> class CPortWaveRTStreamInit : public CUnknownImpl<IPortWaveRTStreamInit>
@ -44,7 +41,6 @@ CPortWaveRTStreamInit::QueryInterface(
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
PMDL PMDL
NTAPI NTAPI
CPortWaveRTStreamInit::AllocatePagesForMdl( CPortWaveRTStreamInit::AllocatePagesForMdl(
@ -157,7 +153,6 @@ CPortWaveRTStreamInit::GetPhysicalPageAddress(
return Result; return Result;
} }
NTSTATUS NTSTATUS
NewPortWaveRTStream( NewPortWaveRTStream(
PPORTWAVERTSTREAM *OutStream) PPORTWAVERTSTREAM *OutStream)

8
drivers/wdm/audio/backpln/portcls/power.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -31,7 +28,6 @@ PcRegisterAdapterPowerManagement(
if (!pUnknown || !pvContext) if (!pUnknown || !pvContext)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
pDeviceObject = (PDEVICE_OBJECT)pvContext; pDeviceObject = (PDEVICE_OBJECT)pvContext;
DeviceExt = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; DeviceExt = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension;
@ -71,8 +67,6 @@ PcUnregisterAdapterPowerManagement(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static static
VOID VOID
NTAPI NTAPI
@ -114,7 +108,5 @@ PcRequestNewPowerState(
KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL);
} }
return Status; return Status;
} }

4
drivers/wdm/audio/backpln/portcls/propertyhandler.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -90,7 +87,6 @@ HandleNecessaryPropertyInstances(
Result = (PULONG)Data; Result = (PULONG)Data;
// check if the miniport supports the IPinCount interface // check if the miniport supports the IPinCount interface
Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible);

8
drivers/wdm/audio/backpln/portcls/purecall.cpp
View file

@ -8,12 +8,6 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG
#endif
#include <debug.h>
extern "C" { extern "C" {
void void
__cxa_pure_virtual() __cxa_pure_virtual()
@ -21,7 +15,5 @@ extern "C" {
// put error handling here // put error handling here
DbgBreakPoint(); DbgBreakPoint();
} }
} }

4
drivers/wdm/audio/backpln/portcls/registry.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CRegistryKey : public CUnknownImpl<IRegistryKey> class CRegistryKey : public CUnknownImpl<IRegistryKey>
@ -44,7 +41,6 @@ CRegistryKey::~CRegistryKey()
} }
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
CRegistryKey::QueryInterface( CRegistryKey::QueryInterface(

5
drivers/wdm/audio/backpln/portcls/resource.cpp
View file

@ -11,10 +11,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CResourceList : public CUnknownImpl<IResourceList> class CResourceList : public CUnknownImpl<IResourceList>
@ -220,7 +217,6 @@ CResourceList::AddEntry(
/* Sanity check */ /* Sanity check */
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
/* Is there still room for another entry */ /* Is there still room for another entry */
if (m_NumberOfEntries >= m_MaxEntries) if (m_NumberOfEntries >= m_MaxEntries)
{ {
@ -293,7 +289,6 @@ CResourceList::UntranslatedList()
return m_UntranslatedResourceList; return m_UntranslatedResourceList;
} }
PORTCLASSAPI PORTCLASSAPI
NTSTATUS NTSTATUS
NTAPI NTAPI

6
drivers/wdm/audio/backpln/portcls/service_group.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
VOID VOID
@ -50,13 +47,10 @@ protected:
friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2);
}; };
//--------------------------------------------------------------- //---------------------------------------------------------------
// IUnknown methods // IUnknown methods
// //
NTSTATUS NTSTATUS
NTAPI NTAPI
CServiceGroup::QueryInterface( CServiceGroup::QueryInterface(

14
drivers/wdm/audio/backpln/portcls/undoc.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
NTSTATUS NTSTATUS
@ -98,7 +95,6 @@ PcHandlePropertyWithTable(
// store device descriptor // store device descriptor
KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor;
// then try KsPropertyHandler // then try KsPropertyHandler
return KsPropertyHandler(Irp, PropertySetCount, PropertySet); return KsPropertyHandler(Irp, PropertySetCount, PropertySet);
} }
@ -181,7 +177,6 @@ PropertyItemDispatch(
PropertyRequest->Irp = Irp; PropertyRequest->Irp = Irp;
PropertyRequest->Verb = Property->Flags; PropertyRequest->Verb = Property->Flags;
// check if this is filter / pin property request // check if this is filter / pin property request
if (!(Property->Flags & KSPROPERTY_TYPE_TOPOLOGY)) if (!(Property->Flags & KSPROPERTY_TYPE_TOPOLOGY))
{ {
@ -324,8 +319,6 @@ ASSERT(PropertyItem->Set);
// RtlStringFromGUID(*PropertyItem->Set, &GuidBuffer); // RtlStringFromGUID(*PropertyItem->Set, &GuidBuffer);
// DPRINT1("PcAddToPropertyTable Adding Item Set %S Id %lu Flags %lx\n", GuidBuffer.Buffer, PropertyItem->Id, PropertyItem->Flags); // DPRINT1("PcAddToPropertyTable Adding Item Set %S Id %lu Flags %lx\n", GuidBuffer.Buffer, PropertyItem->Id, PropertyItem->Flags);
//DPRINT1("FilterPropertySetCount %lu\n", SubDeviceDescriptor->FilterPropertySetCount); //DPRINT1("FilterPropertySetCount %lu\n", SubDeviceDescriptor->FilterPropertySetCount);
// first step check if the property set is present already // first step check if the property set is present already
for(Index = 0; Index < SubDeviceDescriptor->FilterPropertySetCount; Index++) for(Index = 0; Index < SubDeviceDescriptor->FilterPropertySetCount; Index++)
@ -516,9 +509,6 @@ PcCaptureFormat(
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
VOID VOID
DumpAutomationTable( DumpAutomationTable(
IN PPCAUTOMATION_TABLE AutomationTable, IN PPCAUTOMATION_TABLE AutomationTable,
@ -631,7 +621,6 @@ DumpAutomationTable(
DPRINT("=====================================================================\n"); DPRINT("=====================================================================\n");
} }
VOID VOID
DumpFilterDescriptor( DumpFilterDescriptor(
IN PPCFILTER_DESCRIPTOR FilterDescription) IN PPCFILTER_DESCRIPTOR FilterDescription)
@ -649,7 +638,6 @@ DumpFilterDescriptor(
// dump filter description table // dump filter description table
DumpAutomationTable((PPCAUTOMATION_TABLE)FilterDescription->AutomationTable, L"Filter", L""); DumpAutomationTable((PPCAUTOMATION_TABLE)FilterDescription->AutomationTable, L"Filter", L"");
if (FilterDescription->PinCount) if (FilterDescription->PinCount)
{ {
if (FilterDescription->PinSize >= sizeof(PCPIN_DESCRIPTOR)) if (FilterDescription->PinSize >= sizeof(PCPIN_DESCRIPTOR))
@ -678,7 +666,6 @@ DumpFilterDescriptor(
} }
} }
if (FilterDescription->Nodes) if (FilterDescription->Nodes)
{ {
if (FilterDescription->NodeSize >= sizeof(PCNODE_DESCRIPTOR)) if (FilterDescription->NodeSize >= sizeof(PCNODE_DESCRIPTOR))
@ -1002,4 +989,3 @@ PcValidateConnectRequest(
{ {
return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect); return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect);
} }

3
drivers/wdm/audio/backpln/portcls/unregister.cpp
View file

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

5
drivers/wdm/audio/backpln/portcls/version.cpp
View file

@ -8,10 +8,7 @@
#include "private.hpp" #include "private.hpp"
#ifndef YDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <debug.h> #include <debug.h>
class CPortClsVersion : public CUnknownImpl<IPortClsVersion> class CPortClsVersion : public CUnknownImpl<IPortClsVersion>
@ -30,8 +27,6 @@ public:
} }
}; };
//--------------------------------------------------------------- //---------------------------------------------------------------
// IPortClsVersion interface functions // IPortClsVersion interface functions
// //