Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PORTCLS]

Browse source 
- Pass subdevice interface to PcNewRegistryKey
- Fix multiple bugs in PcNewRegistryKey such as
- If key type is GeneralRegistryKey, the function is supposed to create a new key
- If key type is HwProfileRegistryKey, the type must be or'd with PLUGPLAY_REGKEY_DEVICE
- Implement opening keys of type DeviceInterfaceRegistryKey
- Free key handle if there is not enough memory to create a registry key object
- Add more comments

svn path=/trunk/; revision=47222
This commit is contained in:
Johannes Anderwald 2010-05-15 17:17:05 +00:00
parent e5b5b48170
commit 94c135b485
7 changed files with 62 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp
View file

@ -340,7 +340,7 @@ CPortDMus::NewRegistryKey(
RegistryKeyType,
DesiredAccess,
m_pDeviceObject,
NULL,//FIXME
(ISubdevice*)this,
ObjectAttributes,
CreateOptions,
Disposition);

2
reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp
View file

@ -299,7 +299,7 @@ CPortTopology::NewRegistryKey(
RegistryKeyType,
DesiredAccess,
m_pDeviceObject,
NULL,//FIXME
(ISubdevice*)this,
ObjectAttributes,
CreateOptions,
Disposition);

2
reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp
View file

@ -340,7 +340,7 @@ CPortWaveCyclic::NewRegistryKey(
DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n");
return STATUS_UNSUCCESSFUL;
}
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, NULL /*FIXME*/, ObjectAttributes, CreateOptions, Disposition);
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition);
}

2
reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp
View file

@ -359,7 +359,7 @@ CPortWavePci::NewRegistryKey(
RegistryKeyType,
DesiredAccess,
m_pDeviceObject,
NULL,//FIXME
(ISubdevice*)this,
ObjectAttributes,
CreateOptions,
Disposition);

2
reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp
View file

@ -329,7 +329,7 @@ CPortWaveRT::NewRegistryKey(
DPRINT("IPortWaveRT_fnNewRegistryKey called w/o initialized\n");
return STATUS_UNSUCCESSFUL;
}
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, NULL /*FIXME*/, ObjectAttributes, CreateOptions, Disposition);
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition);
}
//---------------------------------------------------------------
// ISubdevice interface

2
reactos/drivers/wdm/audio/backpln/portcls/private.hpp
View file

@ -14,7 +14,7 @@
#include <ntddk.h>
#include <portcls.h>
#define NDEBUG
#define YDEBUG
#include <debug.h>
#include <dmusicks.h>

62
reactos/drivers/wdm/audio/backpln/portcls/registry.cpp
View file

@ -270,6 +270,9 @@ PcNewRegistryKey(
NTSTATUS Status = STATUS_UNSUCCESSFUL;
CRegistryKey * RegistryKey;
PPCLASS_DEVICE_EXTENSION DeviceExt;
PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor;
ISubdevice * Device;
PSYMBOLICLINK_ENTRY SymEntry;
DPRINT("PcNewRegistryKey entered\n");
@ -294,8 +297,8 @@ PcNewRegistryKey(
// object attributes is mandatory
return STATUS_INVALID_PARAMETER;
}
// try to open the key
Status = ZwOpenKey(&hHandle, DesiredAccess, ObjectAttributes);
// try to create the key
Status = ZwCreateKey(&hHandle, DesiredAccess, ObjectAttributes, 0, NULL, CreateOptions, Disposition);
}
else if (RegistryKeyType == DeviceRegistryKey ||
RegistryKeyType == DriverRegistryKey ||
@ -305,7 +308,7 @@ PcNewRegistryKey(
if (RegistryKeyType == HwProfileRegistryKey)
{
// IoOpenDeviceRegistryKey used different constant
RegistryKeyType = PLUGPLAY_REGKEY_CURRENT_HWPROFILE;
RegistryKeyType = PLUGPLAY_REGKEY_CURRENT_HWPROFILE | PLUGPLAY_REGKEY_DEVICE;
}
// obtain the new device extension
@ -315,24 +318,71 @@ PcNewRegistryKey(
}
else if (RegistryKeyType == DeviceInterfaceRegistryKey)
{
// FIXME
UNIMPLEMENTED
DbgBreakPoint();
if (SubDevice == NULL)
{
// invalid parameter
return STATUS_INVALID_PARAMETER;
}
// look up our undocumented interface
Status = ((PUNKNOWN)SubDevice)->QueryInterface(IID_ISubdevice, (LPVOID*)&Device);
if (!NT_SUCCESS(Status))
{
DPRINT("No ISubdevice interface\n");
// invalid parameter
return STATUS_INVALID_PARAMETER;
}
// get the subdevice descriptor
Status = Device->GetDescriptor(&SubDeviceDescriptor);
if (!NT_SUCCESS(Status))
{
DPRINT("Failed to get subdevice descriptor %x\n", Status);
((PUNKNOWN)SubDevice)->Release();
return STATUS_UNSUCCESSFUL;
}
// is there an registered device interface
if (IsListEmpty(&SubDeviceDescriptor->SymbolicLinkList))
{
DPRINT("No device interface registered\n");
((PUNKNOWN)SubDevice)->Release();
return STATUS_UNSUCCESSFUL;
}
// get the first symbolic link
SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(SubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry);
// open device interface
Status = IoOpenDeviceInterfaceRegistryKey(&SymEntry->SymbolicLink, DesiredAccess, &hHandle);
// release subdevice interface
((PUNKNOWN)SubDevice)->Release();
}
// check for success
if (!NT_SUCCESS(Status))
{
DPRINT1("PcNewRegistryKey failed with %lx\n", Status);
return Status;
}
// allocate new registry key object
RegistryKey = new(NonPagedPool, TAG_PORTCLASS)CRegistryKey(OuterUnknown, hHandle);
if (!RegistryKey)
{
// not enough memory
ZwClose(hHandle);
return STATUS_INSUFFICIENT_RESOURCES;
}
// query for interface
Status = RegistryKey->QueryInterface(IID_IRegistryKey, (PVOID*)OutRegistryKey);
if (!NT_SUCCESS(Status))
{
// out of memory
delete RegistryKey;
}