From c6c6c62cb5b44468aad38b0604339a97f80b1b69 Mon Sep 17 00:00:00 2001 From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:14:12 +0100 Subject: [PATCH] [PORTCLS] Remove meaningless YDEBUG (#5858) Addendum to b77ebc4 (r54584). Follow-up of #5818. --- drivers/wdm/audio/backpln/portcls/adapter.cpp | 4 --- drivers/wdm/audio/backpln/portcls/api.cpp | 8 ------ .../wdm/audio/backpln/portcls/connection.cpp | 7 ----- .../wdm/audio/backpln/portcls/dispatcher.cpp | 9 ------ drivers/wdm/audio/backpln/portcls/dll.cpp | 4 --- .../wdm/audio/backpln/portcls/dma_slave.cpp | 7 ----- drivers/wdm/audio/backpln/portcls/drm.cpp | 3 -- .../wdm/audio/backpln/portcls/drm_port.cpp | 5 ---- .../wdm/audio/backpln/portcls/filter_dmus.cpp | 7 ----- .../audio/backpln/portcls/filter_topology.cpp | 6 ---- .../backpln/portcls/filter_wavecyclic.cpp | 6 ---- .../audio/backpln/portcls/filter_wavepci.cpp | 5 ---- .../audio/backpln/portcls/filter_wavert.cpp | 3 -- .../wdm/audio/backpln/portcls/interrupt.cpp | 10 ------- drivers/wdm/audio/backpln/portcls/irp.cpp | 10 ------- .../wdm/audio/backpln/portcls/irpstream.cpp | 5 ---- .../wdm/audio/backpln/portcls/miniport.cpp | 4 --- .../audio/backpln/portcls/miniport_dmus.cpp | 3 -- .../backpln/portcls/miniport_fmsynth.cpp | 6 ---- .../wdm/audio/backpln/portcls/pin_dmus.cpp | 13 +-------- .../audio/backpln/portcls/pin_wavecyclic.cpp | 28 ------------------- .../wdm/audio/backpln/portcls/pin_wavepci.cpp | 19 +------------ .../wdm/audio/backpln/portcls/pin_wavert.cpp | 8 +----- drivers/wdm/audio/backpln/portcls/pool.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/port.cpp | 3 -- .../wdm/audio/backpln/portcls/port_dmus.cpp | 11 -------- .../audio/backpln/portcls/port_topology.cpp | 12 -------- .../audio/backpln/portcls/port_wavecyclic.cpp | 15 +--------- .../audio/backpln/portcls/port_wavepci.cpp | 11 +------- .../wdm/audio/backpln/portcls/port_wavert.cpp | 12 -------- .../backpln/portcls/port_wavertstream.cpp | 5 ---- drivers/wdm/audio/backpln/portcls/power.cpp | 8 ------ .../audio/backpln/portcls/propertyhandler.cpp | 4 --- .../wdm/audio/backpln/portcls/purecall.cpp | 8 ------ .../wdm/audio/backpln/portcls/registry.cpp | 4 --- .../wdm/audio/backpln/portcls/resource.cpp | 5 ---- .../audio/backpln/portcls/service_group.cpp | 6 ---- drivers/wdm/audio/backpln/portcls/undoc.cpp | 14 ---------- .../wdm/audio/backpln/portcls/unregister.cpp | 3 -- drivers/wdm/audio/backpln/portcls/version.cpp | 5 ---- 40 files changed, 5 insertions(+), 306 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/adapter.cpp b/drivers/wdm/audio/backpln/portcls/adapter.cpp index 0b5e87d7795..32fd9ccf161 100644 --- a/drivers/wdm/audio/backpln/portcls/adapter.cpp +++ b/drivers/wdm/audio/backpln/portcls/adapter.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include // @@ -201,7 +198,6 @@ cleanup: // delete created fdo IoDeleteDevice(fdo); - return status; } diff --git a/drivers/wdm/audio/backpln/portcls/api.cpp b/drivers/wdm/audio/backpln/portcls/api.cpp index fa006ef5253..7f9538686e2 100644 --- a/drivers/wdm/audio/backpln/portcls/api.cpp +++ b/drivers/wdm/audio/backpln/portcls/api.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS @@ -150,10 +147,8 @@ PcUnregisterIoTimeout( if (!pDeviceObject || !pDeviceObject->DeviceExtension) return STATUS_INVALID_PARAMETER; - DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; - KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); ListEntry = DeviceExtension->TimerList.Flink; @@ -181,8 +176,6 @@ PcUnregisterIoTimeout( return STATUS_NOT_FOUND; } - - NTSTATUS NTAPI PcCompletePendingPropertyRequest( @@ -263,4 +256,3 @@ PcDmaSlaveDescription( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/connection.cpp b/drivers/wdm/audio/backpln/portcls/connection.cpp index ffa71c80137..58894664ad1 100644 --- a/drivers/wdm/audio/backpln/portcls/connection.cpp +++ b/drivers/wdm/audio/backpln/portcls/connection.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include extern @@ -24,7 +21,6 @@ RtlCreateUnicodeString( PCWSTR SourceString ); - class CUnregisterPhysicalConnection : public CUnknownImpl { public: @@ -175,7 +171,6 @@ RegisterConnection( FromString = &SymEntry->SymbolicLink; } - if (ToUnknown) { Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); @@ -192,7 +187,6 @@ RegisterConnection( goto cleanup; } - SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); ToString = &SymEntry->SymbolicLink; @@ -229,7 +223,6 @@ RegisterConnection( InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); } - if (ToSubDeviceDescriptor) { ToEntry->FromPin = ToPin; diff --git a/drivers/wdm/audio/backpln/portcls/dispatcher.cpp b/drivers/wdm/audio/backpln/portcls/dispatcher.cpp index 063a5728fb4..9fd133e5f91 100644 --- a/drivers/wdm/audio/backpln/portcls/dispatcher.cpp +++ b/drivers/wdm/audio/backpln/portcls/dispatcher.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS @@ -48,7 +45,6 @@ Dispatch_fnRead( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Read(DeviceObject, Irp); } @@ -68,7 +64,6 @@ Dispatch_fnWrite( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Write(DeviceObject, Irp); } @@ -88,7 +83,6 @@ Dispatch_fnFlush( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request return DispatchContext->Target->Flush(DeviceObject, Irp); } @@ -135,7 +129,6 @@ Dispatch_fnQuerySecurity( // get dispatch context DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - // let IrpTarget handle request 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); } - BOOLEAN NTAPI Dispatch_fnFastRead( @@ -279,4 +271,3 @@ NewDispatchObject( DPRINT("KsAllocateObjectHeader result %x Target %p Context %p\n", Status, Target, DispatchContext); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/dll.cpp b/drivers/wdm/audio/backpln/portcls/dll.cpp index 354c1964b2a..63832017caf 100644 --- a/drivers/wdm/audio/backpln/portcls/dll.cpp +++ b/drivers/wdm/audio/backpln/portcls/dll.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include extern @@ -23,7 +20,6 @@ DllInitialize(ULONG Unknown) return 0; } - extern "C" { diff --git a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp index ef71d248981..34f68dc65e4 100644 --- a/drivers/wdm/audio/backpln/portcls/dma_slave.cpp +++ b/drivers/wdm/audio/backpln/portcls/dma_slave.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CDmaChannelInit : public CUnknownImpl @@ -74,8 +71,6 @@ protected: friend IO_ALLOCATION_ACTION NTAPI AdapterControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, IN PVOID Context); }; - - //--------------------------------------------------------------- // IUnknown methods // @@ -235,7 +230,6 @@ CDmaChannelInit::PhysicalAddress( return Result; } - #endif VOID @@ -257,7 +251,6 @@ CDmaChannelInit::BufferSize() return m_BufferSize; } - PVOID NTAPI CDmaChannelInit::SystemAddress() diff --git a/drivers/wdm/audio/backpln/portcls/drm.cpp b/drivers/wdm/audio/backpln/portcls/drm.cpp index d4c93c03126..abd953db992 100644 --- a/drivers/wdm/audio/backpln/portcls/drm.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/drm_port.cpp b/drivers/wdm/audio/backpln/portcls/drm_port.cpp index 6d10cd8d626..e6ee225db28 100644 --- a/drivers/wdm/audio/backpln/portcls/drm_port.cpp +++ b/drivers/wdm/audio/backpln/portcls/drm_port.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CDrmPort2 : public CUnknownImpl @@ -134,5 +131,3 @@ NewIDrmPort( *OutPort = (PDRMPORT2)This; return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp index b375cd8b67e..13711d85498 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortFilterDMus : public CUnknownImpl @@ -287,7 +284,6 @@ CPortFilterDMus::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortFilterDMus::FreePin( @@ -321,7 +317,6 @@ CPortFilterDMus::NotifyPins() } } - NTSTATUS NewPortFilterDMus( OUT PPORTFILTERDMUS * OutFilter) @@ -339,5 +334,3 @@ NewPortFilterDMus( return STATUS_SUCCESS; } - - diff --git a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp index 150de8c3cab..f7cbdda4924 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortFilterTopology : public CUnknownImpl @@ -29,7 +26,6 @@ protected: ISubdevice * m_SubDevice; }; - NTSTATUS NTAPI CPortFilterTopology::QueryInterface( @@ -70,7 +66,6 @@ CPortFilterTopology::NewIrpTarget( return STATUS_NOT_SUPPORTED; } - NTSTATUS NTAPI CPortFilterTopology::DeviceIoControl( @@ -232,7 +227,6 @@ CPortFilterTopology::Init( SUBDEVICE_DESCRIPTOR * Descriptor; NTSTATUS Status; - // get our private interface Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&ISubDevice); if (!NT_SUCCESS(Status)) diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp index 6a935da41c6..bae79593c7e 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortFilterWaveCyclic : public CUnknownImpl @@ -312,7 +309,6 @@ CPortFilterWaveCyclic::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortFilterWaveCyclic::FreePin( @@ -332,7 +328,6 @@ CPortFilterWaveCyclic::FreePin( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortFilterWaveCyclic( OUT IPortFilterWaveCyclic ** OutFilter) @@ -351,4 +346,3 @@ NewPortFilterWaveCyclic( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp index 9bf3a9465b8..1d1bf7781fd 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortFilterWavePci : public CUnknownImpl @@ -91,7 +88,6 @@ CPortFilterWavePci::NewIrpTarget( return STATUS_UNSUCCESSFUL; } - // now create the pin Status = NewPortPinWavePci(&Pin); if (!NT_SUCCESS(Status)) @@ -313,7 +309,6 @@ CPortFilterWavePci::FreePin( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortFilterWavePci( OUT IPortFilterWavePci ** OutFilter) diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp index a91abafb880..99b32680e68 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortFilterWaveRT : public CUnknownImpl diff --git a/drivers/wdm/audio/backpln/portcls/interrupt.cpp b/drivers/wdm/audio/backpln/portcls/interrupt.cpp index f733c615974..91ce323e0b2 100644 --- a/drivers/wdm/audio/backpln/portcls/interrupt.cpp +++ b/drivers/wdm/audio/backpln/portcls/interrupt.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include typedef struct @@ -47,13 +44,10 @@ public: friend BOOLEAN NTAPI IInterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); }; - //--------------------------------------------------------------- // IUnknown methods // - - NTSTATUS NTAPI CInterruptSync::QueryInterface( @@ -72,7 +66,6 @@ CInterruptSync::QueryInterface( return STATUS_SUCCESS; } - if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); @@ -86,7 +79,6 @@ CInterruptSync::QueryInterface( // CInterruptSync methods // - BOOLEAN NTAPI CInterruptSynchronizedRoutine( @@ -219,7 +211,6 @@ IInterruptServiceRoutine( } } - NTSTATUS NTAPI CInterruptSync::Connect() @@ -255,7 +246,6 @@ CInterruptSync::Connect() return Status; } - VOID NTAPI CInterruptSync::Disconnect() diff --git a/drivers/wdm/audio/backpln/portcls/irp.cpp b/drivers/wdm/audio/backpln/portcls/irp.cpp index 8d775bfe493..2130c29be94 100644 --- a/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/drivers/wdm/audio/backpln/portcls/irp.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include typedef struct @@ -23,7 +20,6 @@ typedef struct PDEVICE_OBJECT DeviceObject; }QUERY_POWER_CONTEXT, *PQUERY_POWER_CONTEXT; - NTSTATUS NTAPI PortClsCreate( @@ -35,7 +31,6 @@ PortClsCreate( return KsDispatchIrp(DeviceObject, Irp); } - NTSTATUS NTAPI PortClsPnp( @@ -53,7 +48,6 @@ PortClsPnp( DeviceExt = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT("PortClsPnp called %u\n", IoStack->MinorFunction); //PC_ASSERT(DeviceExt); @@ -203,7 +197,6 @@ PwrCompletionFunction( FreeItem(PwrContext, TAG_PORTCLASS); } - NTSTATUS NTAPI PortClsPower( @@ -460,7 +453,6 @@ PcDispatchIrp( return STATUS_SUCCESS; } - NTSTATUS NTAPI PcCompleteIrp( @@ -512,8 +504,6 @@ CompletionRoutine( if (_InvokeOnCancel) _IrpSp->Control |= SL_INVOKE_ON_CANCEL; \ } - - NTSTATUS NTAPI PcForwardIrpSynchronous( diff --git a/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/drivers/wdm/audio/backpln/portcls/irpstream.cpp index 4e2b701eca1..a79259fa082 100644 --- a/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include static @@ -86,7 +83,6 @@ typedef struct #define STREAM_DATA_OFFSET (0) - NTSTATUS NTAPI CIrpQueue::QueryInterface( @@ -248,7 +244,6 @@ CIrpQueue::AddMapping( } } - // now get a system address for the user buffers Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; Mdl = Irp->MdlAddress; diff --git a/drivers/wdm/audio/backpln/portcls/miniport.cpp b/drivers/wdm/audio/backpln/portcls/miniport.cpp index 8f00823770f..f7f4b44c836 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include PVOID @@ -79,4 +76,3 @@ PcNewMiniport( DPRINT("PcNewMiniport Status %x\n", Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index f57aa72a7dc..70cee8d66b3 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -9,10 +9,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include // + for absolute / - for relative diff --git a/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp b/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp index 44d479047d2..a84cd33674f 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp @@ -8,12 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif - -#include - NTSTATUS NewMiniportFmSynth( OUT PMINIPORT* OutMiniport, IN REFCLSID ClassId) diff --git a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp index ef07aabed7d..9455d3fcbb2 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortPinDMus : public CUnknownImpl @@ -46,7 +43,6 @@ protected: PMINIPORTMIDI m_MidiMiniport; PMINIPORTMIDISTREAM m_MidiStream; - KSSTATE m_State; PKSDATAFORMAT m_Format; KSPIN_CONNECT * m_ConnectDetails; @@ -124,7 +120,6 @@ CPortPinDMus::GetBuffer( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortPinDMus::PutBuffer( @@ -147,7 +142,6 @@ CPortPinDMus::SetState( return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI CPortPinDMus::PutMessage( @@ -157,7 +151,6 @@ CPortPinDMus::PutMessage( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortPinDMus::ConnectOutput( @@ -167,7 +160,6 @@ CPortPinDMus::ConnectOutput( return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI CPortPinDMus::DisconnectOutput( @@ -255,7 +247,6 @@ CPortPinDMus::TransferMidiDataToDMus() Event->Event.cbEvent = (USHORT)BufferSize; Event->Event.uData.pbData = (PBYTE)Buffer; - if (!Root) Root = Event; else @@ -276,8 +267,6 @@ CPortPinDMus::TransferMidiDataToDMus() DPRINT("Status %x\n", Status); } - - VOID NTAPI CPortPinDMus::RequestService() @@ -295,6 +284,7 @@ CPortPinDMus::RequestService() } //================================================================================================================================== + NTSTATUS NTAPI CPortPinDMus::QueryInterface( @@ -629,4 +619,3 @@ NewPortPinDMus( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index ec67bb50ef0..15495d2aeef 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortPinWaveCyclic : public CUnknownImpl @@ -109,7 +106,6 @@ protected: ULONG m_Delay; }; - typedef struct { ULONG bLoopedStreaming; @@ -121,8 +117,6 @@ typedef struct ULONG bLoopedStreaming; }ENDOFSTREAM_EVENT_CONTEXT, *PENDOFSTREAM_EVENT_CONTEXT; - - 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 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 PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); DEFINE_KSPROPERTY_DRMSET(PinWaveCyclicDRMSet, PinWaveCyclicDRMHandler); @@ -156,7 +149,6 @@ KSEVENT_ITEM PinWaveCyclicStreamingEventSet = 0 }; - KSPROPERTY_SET PinWaveCyclicPropertySet[] = { { @@ -196,7 +188,6 @@ KSEVENT_SET PinWaveCyclicEventSet[] = } }; - //================================================================================================================================== NTSTATUS @@ -237,7 +228,6 @@ PinWaveCyclicDRMHandler( return STATUS_INVALID_PARAMETER; } - NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent( @@ -335,7 +325,6 @@ PinWaveCyclicAllocatorFraming( // cast to pin impl Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - if (Request->Flags & KSPROPERTY_TYPE_GET) { // copy pin framing @@ -452,7 +441,6 @@ PinSetStateWorkerRoutine( } - NTSTATUS NTAPI PinWaveCyclicState( @@ -600,7 +588,6 @@ PinWaveCyclicDataFormat( PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); 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, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -613,7 +600,6 @@ PinWaveCyclicDataFormat( FreeItem(NewDataFormat, TAG_PORTCLASS); } - // done return Status; } @@ -773,7 +759,6 @@ CPortPinWaveCyclic::UpdateCommonBufferOverlap( PUCHAR Buffer; NTSTATUS Status; - BufferLength = Gap = m_CommonBufferSize - m_CommonBufferOffset; BufferLength = Length = min(BufferLength, MaxTransferCount); while(BufferLength) @@ -1076,7 +1061,6 @@ CPortPinWaveCyclic::Close( m_Stream = NULL; } - if (m_Filter) { // disconnect pin from filter @@ -1141,7 +1125,6 @@ CPortPinWaveCyclic::FastDeviceIoControl( return KsDispatchFastIoDeviceControlFailure(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, StatusBlock, DeviceObject); } - BOOLEAN NTAPI CPortPinWaveCyclic::FastRead( @@ -1157,7 +1140,6 @@ CPortPinWaveCyclic::FastRead( return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } - BOOLEAN NTAPI CPortPinWaveCyclic::FastWrite( @@ -1173,7 +1155,6 @@ CPortPinWaveCyclic::FastWrite( return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } - NTSTATUS NTAPI CPortPinWaveCyclic::Init( @@ -1218,7 +1199,6 @@ CPortPinWaveCyclic::Init( while(TRUE); } - Status = m_Miniport->NewStream(&m_Stream, NULL, 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()); - /* set up allocator framing */ m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY; m_AllocatorFraming.PoolType = NonPagedPool; @@ -1354,7 +1333,6 @@ CPortPinWaveCyclic::Init( return STATUS_SUCCESS; } - ULONG NTAPI CPortPinWaveCyclic::GetCompletedPosition() @@ -1363,7 +1341,6 @@ CPortPinWaveCyclic::GetCompletedPosition() return 0; } - ULONG NTAPI CPortPinWaveCyclic::GetCycleCount() @@ -1372,7 +1349,6 @@ CPortPinWaveCyclic::GetCycleCount() return 0; } - ULONG NTAPI CPortPinWaveCyclic::GetDeviceBufferSize() @@ -1380,7 +1356,6 @@ CPortPinWaveCyclic::GetDeviceBufferSize() return m_CommonBufferSize; } - PVOID NTAPI CPortPinWaveCyclic::GetIrpStream() @@ -1388,7 +1363,6 @@ CPortPinWaveCyclic::GetIrpStream() return (PVOID)m_IrpQueue; } - PMINIPORT NTAPI CPortPinWaveCyclic::GetMiniport() @@ -1396,7 +1370,6 @@ CPortPinWaveCyclic::GetMiniport() return (PMINIPORT)m_Miniport; } - NTSTATUS NewPortPinWaveCyclic( OUT IPortPinWaveCyclic ** OutPin) @@ -1414,4 +1387,3 @@ NewPortPinWaveCyclic( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 879965edc32..97f2d8311da 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortPinWavePci : public CUnknownImpl @@ -93,7 +90,6 @@ KSPROPERTY_SET PinWavePciPropertySet[] = } }; - NTSTATUS NTAPI PinWavePciAllocatorFraming( @@ -115,7 +111,6 @@ PinWavePciAllocatorFraming( // cast to pin impl Pin = (CPortPinWavePci*)Descriptor->PortPin; - if (Request->Flags & KSPROPERTY_TYPE_GET) { // copy pin framing @@ -168,7 +163,6 @@ PinWavePciAudioPosition( return STATUS_NOT_SUPPORTED; } - NTSTATUS NTAPI PinWavePciState( @@ -330,7 +324,6 @@ PinWavePciDataFormat( PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.SubFormat, KSDATAFORMAT_SUBTYPE_PCM)); 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, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -343,7 +336,6 @@ PinWavePciDataFormat( FreeItem(NewDataFormat, TAG_PORTCLASS); } - // done return Status; } @@ -371,8 +363,8 @@ PinWavePciDataFormat( return STATUS_NOT_SUPPORTED; } - //================================================================================================================================== + NTSTATUS NTAPI CPortPinWavePci::QueryInterface( @@ -396,7 +388,6 @@ CPortPinWavePci::QueryInterface( return STATUS_SUCCESS; } - if (IsEqualGUIDAligned(refiid, IID_IPortWavePciStream)) { *Output = PVOID(PPORTWAVEPCISTREAM(this)); @@ -440,7 +431,6 @@ CPortPinWavePci::TerminatePacket() return STATUS_SUCCESS; } - VOID NTAPI CPortPinWavePci::RequestService() @@ -554,7 +544,6 @@ CPortPinWavePci::HandleKsStream( return Status; } - NTSTATUS NTAPI CPortPinWavePci::DeviceIoControl( @@ -639,7 +628,6 @@ CPortPinWavePci::Close( m_IrpQueue = NULL; } - if (m_ServiceGroup) { // remove member from service group @@ -766,7 +754,6 @@ CPortPinWavePci::FastWrite( return FALSE; } - NTSTATUS NTAPI CPortPinWavePci::Init( @@ -960,7 +947,6 @@ CPortPinWavePci::Init( } } - return STATUS_SUCCESS; } @@ -971,7 +957,6 @@ CPortPinWavePci::GetIrpStream() return (PVOID)m_IrpQueue; } - PMINIPORT NTAPI CPortPinWavePci::GetMiniport() @@ -979,7 +964,6 @@ CPortPinWavePci::GetMiniport() return (PMINIPORT)m_Miniport; } - NTSTATUS NewPortPinWavePci( OUT IPortPinWavePci ** OutPin) @@ -997,4 +981,3 @@ NewPortPinWavePci( return STATUS_SUCCESS; } - diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index d259649d3c0..922b952bbb8 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortPinWaveRT : public CUnknownImpl @@ -60,7 +57,6 @@ protected: }; - typedef struct { CPortPinWaveRT *Pin; @@ -68,8 +64,8 @@ typedef struct KSSTATE State; }SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; - //================================================================================================================================== + NTSTATUS NTAPI CPortPinWaveRT::QueryInterface( @@ -286,7 +282,6 @@ CPortPinWaveRT::DeviceIoControl( IoStack = IoGetCurrentIrpStackLocation(Irp); - switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_KS_PROPERTY: @@ -671,7 +666,6 @@ cleanup: return Status; } - NTSTATUS NewPortPinWaveRT( OUT IPortPinWaveRT ** OutPin) diff --git a/drivers/wdm/audio/backpln/portcls/pool.cpp b/drivers/wdm/audio/backpln/portcls/pool.cpp index 63ee67edcdd..03ed6b365fb 100644 --- a/drivers/wdm/audio/backpln/portcls/pool.cpp +++ b/drivers/wdm/audio/backpln/portcls/pool.cpp @@ -8,11 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif -#include - PVOID AllocateItem( IN POOL_TYPE PoolType, diff --git a/drivers/wdm/audio/backpln/portcls/port.cpp b/drivers/wdm/audio/backpln/portcls/port.cpp index 504291a0d7d..2cd774de1ef 100644 --- a/drivers/wdm/audio/backpln/portcls/port.cpp +++ b/drivers/wdm/audio/backpln/portcls/port.cpp @@ -9,10 +9,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS diff --git a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp index 8a3e8cdae13..f2bfe94f072 100644 --- a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortDMus : public CUnknownImpl @@ -79,7 +76,6 @@ KSPROPERTY_SET PortDMusPropertySet[] = } }; - //--------------------------------------------------------------- // IUnknown interface functions // @@ -302,7 +298,6 @@ CPortDMus::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortDMus::NewRegistryKey( @@ -393,7 +388,6 @@ CPortDMus::NewIrpTarget( return STATUS_SUCCESS; } - Status = NewPortFilterDMus(&Filter); if (!NT_SUCCESS(Status)) { @@ -462,7 +456,6 @@ CPortDMus::PowerChangeNotify( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortDMus::PinCount( @@ -485,8 +478,6 @@ CPortDMus::PinCount( return STATUS_UNSUCCESSFUL; } - - NTSTATUS NewPortDMus( OUT PPORT* OutPort) @@ -508,8 +499,6 @@ NewPortDMus( } - - VOID GetDMusMiniport( IN IPortDMus * iface, diff --git a/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/drivers/wdm/audio/backpln/portcls/port_topology.cpp index 32467b3d6a4..8e346b223ea 100644 --- a/drivers/wdm/audio/backpln/portcls/port_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_topology.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortTopology : public CUnknownImpl @@ -78,7 +75,6 @@ KSPROPERTY_SET TopologyPropertySet[] = // IPortEvents // - void NTAPI CPortTopology::AddEventToEventList( @@ -100,7 +96,6 @@ CPortTopology::GenerateEventList( UNIMPLEMENTED; } - //--------------------------------------------------------------- // IUnknown interface functions // @@ -255,7 +250,6 @@ CPortTopology::Init( NULL, m_pDescriptor); - DPRINT("IPortTopology_fnInit success\n"); if (NT_SUCCESS(Status)) { @@ -266,7 +260,6 @@ CPortTopology::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortTopology::NewRegistryKey( @@ -431,7 +424,6 @@ CPortTopology::PinCount( return STATUS_UNSUCCESSFUL; } - NTSTATUS NTAPI PcCreatePinDispatch( @@ -456,7 +448,6 @@ PcCreatePinDispatch( PC_ASSERT(Filter != NULL); PC_ASSERT_IRQL(PASSIVE_LEVEL); - #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) @@ -517,7 +508,6 @@ PcCreateItemDispatch( // sanity checks PC_ASSERT(SubDevice != NULL); - #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) @@ -571,7 +561,6 @@ PcCreateItemDispatch( return STATUS_SUCCESS; } - NTSTATUS NewPortTopology( OUT PPORT* OutPort) @@ -594,7 +583,6 @@ NewPortTopology( return Status; } - PMINIPORTTOPOLOGY GetTopologyMiniport( PPORTTOPOLOGY Port) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp index 3a4f3545de7..04525ab53f8 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include GUID IID_IDmaChannelSlave; @@ -87,7 +84,6 @@ KSPROPERTY_SET WaveCyclicPropertySet[] = //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, - //--------------------------------------------------------------- // IPortEvents // @@ -100,7 +96,6 @@ CPortWaveCyclic::AddEventToEventList( UNIMPLEMENTED; } - void NTAPI CPortWaveCyclic::GenerateEventList( @@ -227,7 +222,6 @@ CPortWaveCyclic::Init( return Status; } - // get the miniport device descriptor Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) @@ -283,7 +277,6 @@ CPortWaveCyclic::Init( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::NewRegistryKey( @@ -300,7 +293,6 @@ CPortWaveCyclic::NewRegistryKey( return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); } - //--------------------------------------------------------------- // IPortWaveCyclic interface functions // @@ -431,7 +423,6 @@ CPortWaveCyclic::NewIrpTarget( return Status; } - NTSTATUS NTAPI CPortWaveCyclic::ReleaseChildren() @@ -459,7 +450,6 @@ CPortWaveCyclic::ReleaseChildren() return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::GetDescriptor( @@ -473,7 +463,6 @@ CPortWaveCyclic::GetDescriptor( return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveCyclic::DataRangeIntersection( @@ -494,7 +483,6 @@ CPortWaveCyclic::DataRangeIntersection( return STATUS_UNSUCCESSFUL; } - NTSTATUS NTAPI CPortWaveCyclic::PowerChangeNotify( @@ -530,8 +518,8 @@ CPortWaveCyclic::PinCount( return STATUS_UNSUCCESSFUL; } - ///-------------------------------------------------------------- + PMINIPORTWAVECYCLIC GetWaveCyclicMiniport( IN IPortWaveCyclic* iface) @@ -573,4 +561,3 @@ NewPortWaveCyclic( DPRINT("NewPortWaveCyclic %p Status %u\n", Port, Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp index 068d28256a8..e630e20958d 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortWavePci : public CUnknownImpl @@ -82,7 +79,6 @@ KSPROPERTY_SET WavePciPropertySet[] = } }; - //--------------------------------------------------------------- // IPortEvents // @@ -101,8 +97,6 @@ CPortWavePci::AddEventToEventList( KeReleaseSpinLock(&m_EventListLock, OldIrql); } - - void NTAPI CPortWavePci::GenerateEventList( @@ -268,7 +262,6 @@ CPortWavePci::Init( NULL, m_pDescriptor); - if (!NT_SUCCESS(Status)) { DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); @@ -277,7 +270,7 @@ CPortWavePci::Init( } // did we get a service group - if (ServiceGroup) + if (ServiceGroup) { // store service group in context m_ServiceGroup = ServiceGroup; @@ -512,7 +505,6 @@ CPortWavePci::PinCount( return STATUS_UNSUCCESSFUL; } - NTSTATUS NewPortWavePci( OUT PPORT* OutPort) @@ -536,7 +528,6 @@ NewPortWavePci( } - PDEVICE_OBJECT GetDeviceObjectFromPortWavePci( IPortWavePci* iface) diff --git a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp index c7f5f7d51ab..0a809b467af 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortWaveRT : public CUnknownImpl @@ -81,8 +78,6 @@ KSPROPERTY_SET WaveRTPropertySet[] = //KSEVENTSETID_LoopedStreaming, Type = KSEVENT_LOOPEDSTREAMING_POSITION //KSEVENTSETID_Connection, Type = KSEVENT_CONNECTION_ENDOFSTREAM, - - //--------------------------------------------------------------- // IPortEvents // @@ -95,7 +90,6 @@ CPortWaveRT::AddEventToEventList( UNIMPLEMENTED; } - void NTAPI CPortWaveRT::GenerateEventList( @@ -237,7 +231,6 @@ CPortWaveRT::Init( return Status; } - // get the miniport device descriptor Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) @@ -291,12 +284,10 @@ CPortWaveRT::Init( // increment reference on resource list ResourceList->AddRef(); - DPRINT("IPortWaveRT successfully initialized\n"); return STATUS_SUCCESS; } - NTSTATUS NTAPI CPortWaveRT::NewRegistryKey( @@ -343,7 +334,6 @@ CPortWaveRT::NewIrpTarget( return STATUS_SUCCESS; } - Status = NewPortFilterWaveRT(&Filter); if (!NT_SUCCESS(Status)) { @@ -459,7 +449,6 @@ GetDeviceObjectFromPortWaveRT( // IPortWaveRT constructor // - NTSTATUS NewPortWaveRT( OUT PPORT* OutPort) @@ -481,4 +470,3 @@ NewPortWaveRT( DPRINT("NewPortWaveRT %p Status %u\n", Port, Status); return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp index 4689f07b609..7f01f35bcb9 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortWaveRTStreamInit : public CUnknownImpl @@ -44,7 +41,6 @@ CPortWaveRTStreamInit::QueryInterface( return STATUS_UNSUCCESSFUL; } - PMDL NTAPI CPortWaveRTStreamInit::AllocatePagesForMdl( @@ -157,7 +153,6 @@ CPortWaveRTStreamInit::GetPhysicalPageAddress( return Result; } - NTSTATUS NewPortWaveRTStream( PPORTWAVERTSTREAM *OutStream) diff --git a/drivers/wdm/audio/backpln/portcls/power.cpp b/drivers/wdm/audio/backpln/portcls/power.cpp index 17bfceca966..0f0f00c2d67 100644 --- a/drivers/wdm/audio/backpln/portcls/power.cpp +++ b/drivers/wdm/audio/backpln/portcls/power.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS @@ -31,7 +28,6 @@ PcRegisterAdapterPowerManagement( if (!pUnknown || !pvContext) return STATUS_INVALID_PARAMETER; - pDeviceObject = (PDEVICE_OBJECT)pvContext; DeviceExt = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; @@ -71,8 +67,6 @@ PcUnregisterAdapterPowerManagement( return STATUS_SUCCESS; } - - static VOID NTAPI @@ -114,7 +108,5 @@ PcRequestNewPowerState( KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL); } - return Status; } - diff --git a/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp b/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp index a63bff78b10..5aa07fcf998 100644 --- a/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp +++ b/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS @@ -90,7 +87,6 @@ HandleNecessaryPropertyInstances( Result = (PULONG)Data; - // check if the miniport supports the IPinCount interface Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); diff --git a/drivers/wdm/audio/backpln/portcls/purecall.cpp b/drivers/wdm/audio/backpln/portcls/purecall.cpp index 6f078cc9191..ee5588c1d78 100644 --- a/drivers/wdm/audio/backpln/portcls/purecall.cpp +++ b/drivers/wdm/audio/backpln/portcls/purecall.cpp @@ -8,12 +8,6 @@ #include "private.hpp" -#ifndef YDEBUG -#define NDEBUG -#endif - -#include - extern "C" { void __cxa_pure_virtual() @@ -21,7 +15,5 @@ extern "C" { // put error handling here DbgBreakPoint(); - } } - diff --git a/drivers/wdm/audio/backpln/portcls/registry.cpp b/drivers/wdm/audio/backpln/portcls/registry.cpp index 56a8cc144c8..d157365d1ed 100644 --- a/drivers/wdm/audio/backpln/portcls/registry.cpp +++ b/drivers/wdm/audio/backpln/portcls/registry.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CRegistryKey : public CUnknownImpl @@ -44,7 +41,6 @@ CRegistryKey::~CRegistryKey() } } - NTSTATUS NTAPI CRegistryKey::QueryInterface( diff --git a/drivers/wdm/audio/backpln/portcls/resource.cpp b/drivers/wdm/audio/backpln/portcls/resource.cpp index 19020345579..21b90254e00 100644 --- a/drivers/wdm/audio/backpln/portcls/resource.cpp +++ b/drivers/wdm/audio/backpln/portcls/resource.cpp @@ -11,10 +11,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CResourceList : public CUnknownImpl @@ -220,7 +217,6 @@ CResourceList::AddEntry( /* Sanity check */ PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* Is there still room for another entry */ if (m_NumberOfEntries >= m_MaxEntries) { @@ -293,7 +289,6 @@ CResourceList::UntranslatedList() return m_UntranslatedResourceList; } - PORTCLASSAPI NTSTATUS NTAPI diff --git a/drivers/wdm/audio/backpln/portcls/service_group.cpp b/drivers/wdm/audio/backpln/portcls/service_group.cpp index d3688a92c14..8a2b83334e0 100644 --- a/drivers/wdm/audio/backpln/portcls/service_group.cpp +++ b/drivers/wdm/audio/backpln/portcls/service_group.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include VOID @@ -50,13 +47,10 @@ protected: friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); }; - - //--------------------------------------------------------------- // IUnknown methods // - NTSTATUS NTAPI CServiceGroup::QueryInterface( diff --git a/drivers/wdm/audio/backpln/portcls/undoc.cpp b/drivers/wdm/audio/backpln/portcls/undoc.cpp index d6a42baa1ab..6bd1a1bb23b 100644 --- a/drivers/wdm/audio/backpln/portcls/undoc.cpp +++ b/drivers/wdm/audio/backpln/portcls/undoc.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include NTSTATUS @@ -98,7 +95,6 @@ PcHandlePropertyWithTable( // store device descriptor KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; - // then try KsPropertyHandler return KsPropertyHandler(Irp, PropertySetCount, PropertySet); } @@ -181,7 +177,6 @@ PropertyItemDispatch( PropertyRequest->Irp = Irp; PropertyRequest->Verb = Property->Flags; - // check if this is filter / pin property request if (!(Property->Flags & KSPROPERTY_TYPE_TOPOLOGY)) { @@ -324,8 +319,6 @@ ASSERT(PropertyItem->Set); // RtlStringFromGUID(*PropertyItem->Set, &GuidBuffer); // DPRINT1("PcAddToPropertyTable Adding Item Set %S Id %lu Flags %lx\n", GuidBuffer.Buffer, PropertyItem->Id, PropertyItem->Flags); - - //DPRINT1("FilterPropertySetCount %lu\n", SubDeviceDescriptor->FilterPropertySetCount); // first step check if the property set is present already for(Index = 0; Index < SubDeviceDescriptor->FilterPropertySetCount; Index++) @@ -516,9 +509,6 @@ PcCaptureFormat( return STATUS_NOT_IMPLEMENTED; } - - - VOID DumpAutomationTable( IN PPCAUTOMATION_TABLE AutomationTable, @@ -631,7 +621,6 @@ DumpAutomationTable( DPRINT("=====================================================================\n"); } - VOID DumpFilterDescriptor( IN PPCFILTER_DESCRIPTOR FilterDescription) @@ -649,7 +638,6 @@ DumpFilterDescriptor( // dump filter description table DumpAutomationTable((PPCAUTOMATION_TABLE)FilterDescription->AutomationTable, L"Filter", L""); - if (FilterDescription->PinCount) { if (FilterDescription->PinSize >= sizeof(PCPIN_DESCRIPTOR)) @@ -678,7 +666,6 @@ DumpFilterDescriptor( } } - if (FilterDescription->Nodes) { if (FilterDescription->NodeSize >= sizeof(PCNODE_DESCRIPTOR)) @@ -1002,4 +989,3 @@ PcValidateConnectRequest( { return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect); } - diff --git a/drivers/wdm/audio/backpln/portcls/unregister.cpp b/drivers/wdm/audio/backpln/portcls/unregister.cpp index ef9d7130888..b4ace6d9eaf 100644 --- a/drivers/wdm/audio/backpln/portcls/unregister.cpp +++ b/drivers/wdm/audio/backpln/portcls/unregister.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CUnregisterSubdevice : public CUnknownImpl diff --git a/drivers/wdm/audio/backpln/portcls/version.cpp b/drivers/wdm/audio/backpln/portcls/version.cpp index c3571cc7bd1..fb102188a6f 100644 --- a/drivers/wdm/audio/backpln/portcls/version.cpp +++ b/drivers/wdm/audio/backpln/portcls/version.cpp @@ -8,10 +8,7 @@ #include "private.hpp" -#ifndef YDEBUG #define NDEBUG -#endif - #include class CPortClsVersion : public CUnknownImpl @@ -30,8 +27,6 @@ public: } }; - - //--------------------------------------------------------------- // IPortClsVersion interface functions //