Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-13 06:18:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix default data sent to RtlQueryRegistryValues

Browse source 
svn path=/trunk/; revision=26124
This commit is contained in:
Hervé Poussineau 2007-03-17 20:53:05 +00:00
parent f06ffd93b8
commit 4670093f37
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/drivers/input/kbdclass/kbdclass.c
View file

@ -211,7 +211,7 @@ ReadRegistryEntries(
ULONG DefaultConnectMultiplePorts = 0; ULONG DefaultConnectMultiplePorts = 0;
ULONG DefaultDataQueueSize = 0x64; ULONG DefaultDataQueueSize = 0x64;
UNICODE_STRING DefaultDeviceBaseName = RTL_CONSTANT_STRING(L"KeyboardClass"); PCWSTR DefaultDeviceBaseName = L"KeyboardClass";
ParametersRegistryKey.Length = 0; ParametersRegistryKey.Length = 0;
ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL);
@ -245,7 +245,7 @@ ReadRegistryEntries(
Parameters[2].Name = L"KeyboardDeviceBaseName"; Parameters[2].Name = L"KeyboardDeviceBaseName";
Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].EntryContext = &DriverExtension->DeviceBaseName;
Parameters[2].DefaultType = REG_SZ; Parameters[2].DefaultType = REG_SZ;
Parameters[2].DefaultData = &DefaultDeviceBaseName; Parameters[2].DefaultData = (PVOID)DefaultDeviceBaseName;
Parameters[2].DefaultLength = 0; Parameters[2].DefaultLength = 0;
Status = RtlQueryRegistryValues( Status = RtlQueryRegistryValues(
@ -273,10 +273,10 @@ ReadRegistryEntries(
/* Registry path doesn't exist. Set defaults */ /* Registry path doesn't exist. Set defaults */
DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts;
DriverExtension->DataQueueSize = DefaultDataQueueSize; DriverExtension->DataQueueSize = DefaultDataQueueSize;
Status = RtlDuplicateUnicodeString( if (RtlCreateUnicodeString(&DriverExtension->DeviceBaseName, DefaultDeviceBaseName))
RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, Status = STATUS_SUCCESS;
&DefaultDeviceBaseName, else
&DriverExtension->DeviceBaseName); Status = STATUS_NO_MEMORY;
} }
return Status; return Status;

12
reactos/drivers/input/mouclass/mouclass.c
View file

@ -188,7 +188,7 @@ ReadRegistryEntries(
ULONG DefaultConnectMultiplePorts = 1; ULONG DefaultConnectMultiplePorts = 1;
ULONG DefaultDataQueueSize = 0x64; ULONG DefaultDataQueueSize = 0x64;
UNICODE_STRING DefaultDeviceBaseName = RTL_CONSTANT_STRING(L"PointerClass"); PCWSTR DefaultDeviceBaseName = L"PointerClass";
ParametersRegistryKey.Length = 0; ParametersRegistryKey.Length = 0;
ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL);
@ -222,7 +222,7 @@ ReadRegistryEntries(
Parameters[2].Name = L"PointerDeviceBaseName"; Parameters[2].Name = L"PointerDeviceBaseName";
Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].EntryContext = &DriverExtension->DeviceBaseName;
Parameters[2].DefaultType = REG_SZ; Parameters[2].DefaultType = REG_SZ;
Parameters[2].DefaultData = &DefaultDeviceBaseName; Parameters[2].DefaultData = (PVOID)DefaultDeviceBaseName;
Parameters[2].DefaultLength = 0; Parameters[2].DefaultLength = 0;
Status = RtlQueryRegistryValues( Status = RtlQueryRegistryValues(
@ -250,10 +250,10 @@ ReadRegistryEntries(
/* Registry path doesn't exist. Set defaults */ /* Registry path doesn't exist. Set defaults */
DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts;
DriverExtension->DataQueueSize = DefaultDataQueueSize; DriverExtension->DataQueueSize = DefaultDataQueueSize;
Status = RtlDuplicateUnicodeString( if (RtlCreateUnicodeString(&DriverExtension->DeviceBaseName, DefaultDeviceBaseName))
RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, Status = STATUS_SUCCESS;
&DefaultDeviceBaseName, else
&DriverExtension->DeviceBaseName); Status = STATUS_NO_MEMORY;
} }
return Status; return Status;