Author: janderwald Date: Sun Dec 11 10:51:37 2011 New Revision: 54640
URL: http://svn.reactos.org/svn/reactos?rev=54640&view=rev Log: [PORTCLS] - Add support for IDrmPort, IDrmPort2 - more debug traces
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -58,6 +58,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IUnregisterPhysicalConnection) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -65,6 +67,12 @@
PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; + } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CUnregisterPhysicalConnection::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); }
return STATUS_UNSUCCESSFUL;
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -73,6 +73,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + DPRINT("CInterruptSync::QueryInterface: this %p\n", this);
if (IsEqualGUIDAligned(refiid, IID_IInterruptSync) || @@ -83,7 +85,13 @@ return STATUS_SUCCESS; }
- DPRINT("CInterruptSync::QueryInterface: this %p UNKNOWN interface requested\n", this); + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; }
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -137,22 +137,27 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) + { + *Output = PVOID(PPORTEVENTS(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } else if (IsEqualGUIDAligned(refiid, IID_ISubdevice)) { *Output = PVOID(PSUBDEVICE(this)); PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } - else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) - { - *Output = PVOID(PPORTEVENTS(this)); - PUNKNOWN(*Output)->AddRef(); - return STATUS_SUCCESS; - } else if (IsEqualGUIDAligned(refiid, IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); } + else if (IsEqualGUIDAligned(refiid, IID_IDrmPort) || + IsEqualGUIDAligned(refiid, IID_IDrmPort2)) + { + return NewIDrmPort((PDRMPORT2*)Output); + } else if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); @@ -164,7 +169,7 @@
if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL;
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -179,7 +179,7 @@
if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); }
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -32,7 +32,7 @@ Status = pUnknown->QueryInterface(IID_IAdapterPowerManagement, (PVOID*)&pPower); if (!NT_SUCCESS(Status)) { - DPRINT("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); + DPRINT1("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); DeviceExt->AdapterPowerManagement = NULL; return STATUS_SUCCESS; }
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -54,6 +54,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + DPRINT("CRegistryKey::QueryInterface entered\n"); if (IsEqualGUIDAligned(refiid, IID_IRegistryKey) || IsEqualGUIDAligned(refiid, IID_IUnknown)) @@ -63,7 +65,12 @@ return STATUS_SUCCESS; }
- DPRINT("IRegistryKey_QueryInterface: This %p\n", this); + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CRegistryKey::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; }
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -69,7 +69,7 @@
if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); }
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -91,7 +91,7 @@
if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); }
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -47,12 +47,20 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNREGISTERSUBDEVICE(this)); PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; + } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); }
return STATUS_UNSUCCESSFUL;
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -60,6 +60,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IPortClsVersion) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -67,6 +69,13 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CPortClsVersion::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; }