Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[cgutman] 53261: [NTOSKRNL] - Fix a bug in IopCreateResourceListFromRequirements which was triggering a sanity ASSERT because it forgot to skip conflicting entries
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 08:29:22 2011 New Revision: 53261 URL: http://svn.reactos.org/svn/reactos?rev=53261&view=rev Log: [NTOSKRNL] - Fix a bug in IopCreateResourceListFromRequirements which was triggering a sanity ASSERT because it forgot to skip conflicting entries Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Mon Aug 15 08:29:22 2011 @@ -217,6 +217,7 @@ for (ii = 0; ii < ResList->Count; ii++) { PIO_RESOURCE_DESCRIPTOR ReqDesc = &ResList->Descriptors[ii]; + BOOLEAN FoundResource = TRUE; /* FIXME: Handle alternate ranges */ if (ReqDesc->Option == IO_RESOURCE_ALTERNATIVE) @@ -240,6 +241,8 @@ *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } + + FoundResource = FALSE; } break; @@ -256,6 +259,8 @@ *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } + + FoundResource = FALSE; } break; @@ -272,6 +277,8 @@ *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } + + FoundResource = FALSE; } break; @@ -288,6 +295,8 @@ *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } + + FoundResource = FALSE; } break; @@ -303,16 +312,22 @@ *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } + + FoundResource = FALSE; } break; default: DPRINT1("Unsupported resource type: %x\n", ReqDesc->Type); + FoundResource = FALSE; break; } - (*ResourceList)->List[0].PartialResourceList.Count++; - ResDesc++; + if (FoundResource) + { + (*ResourceList)->List[0].PartialResourceList.Count++; + ResDesc++; + } } }

1 0

[cgutman] 53260: [ACPI] - Don't assume that acpi_evaluate_reference will always complete successfully
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 07:46:02 2011 New Revision: 53260 URL: http://svn.reactos.org/svn/reactos?rev=53260&view=rev Log: [ACPI] - Don't assume that acpi_evaluate_reference will always complete successfully Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Mon Aug 15 07:46:02 2011 @@ -401,9 +401,9 @@ char object_name[5] = {'_','P','R','0'+i,'\0'}; /* Evaluate "_PRx" to se if power resources are referenced */ - acpi_evaluate_reference(device->handle, object_name, NULL, + status = acpi_evaluate_reference(device->handle, object_name, NULL, &ps->resources); - if (ps->resources.count) { + if (ACPI_SUCCESS(status) && ps->resources.count) { device->power.flags.power_resources = 1; ps->flags.valid = 1; }

1 0

[cgutman] 53259: - Revert some unintended debugging changes
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 07:36:58 2011 New Revision: 53259 URL: http://svn.reactos.org/svn/reactos?rev=53259&view=rev Log: - Revert some unintended debugging changes Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Aug 15 07:36:58 2011 @@ -293,7 +293,7 @@ ComputerIdentifier[0] = 0; } - DPRINT1("Computer identifier: '%S'\n", ComputerIdentifier); + DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); /* Search for matching device identifier */ if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) @@ -311,7 +311,7 @@ return NULL; } - DPRINT1("KeyValue: %S\n", KeyValue); + DPRINT("KeyValue: %S\n", KeyValue); if (wcsstr(ComputerIdentifier, KeyValue)) { if (!INF_GetDataField(&Context, 0, &KeyName))

1 0

[cgutman] 53258: [ACPI] - Fix a NULL free bug
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 07:35:04 2011 New Revision: 53258 URL: http://svn.reactos.org/svn/reactos?rev=53258&view=rev Log: [ACPI] - Fix a NULL free bug Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Mon Aug 15 07:35:04 2011 @@ -368,7 +368,8 @@ //ExFreePool(list->handles); } - AcpiOsFree(buffer.Pointer); + if (buffer.Pointer) + AcpiOsFree(buffer.Pointer); return_ACPI_STATUS(status); }

1 0

[cgutman] 53257: [USETUP] - Autodetect ACPI like we autodetect a multiprocessor configuration - This will make the ACPI HAL the default on ACPI-compliant machines while the standard HAL will contin...
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 06:27:23 2011 New Revision: 53257 URL: http://svn.reactos.org/svn/reactos?rev=53257&view=rev Log: [USETUP] - Autodetect ACPI like we autodetect a multiprocessor configuration - This will make the ACPI HAL the default on ACPI-compliant machines while the standard HAL will continue to be the default on older machines - Please file bugs for any issues encountered when running in ACPI mode and assign them to me (I think it's very important to have working ACPI for 0.4.0 so I'd really like to get everything fixed now) [TXTSETUP.SIF] - Add a MP configuration for ACPI HAL - Slightly modify the names of each HAL configuration Modified: trunk/reactos/base/setup/usetup/settings.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Aug 15 06:27:23 2011 @@ -34,6 +34,143 @@ /* FUNCTIONS ****************************************************************/ static BOOLEAN +IsAcpiComputer(VOID) +{ + UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); + UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); + UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); + OBJECT_ATTRIBUTES ObjectAttributes; + PKEY_BASIC_INFORMATION pDeviceInformation = NULL; + ULONG DeviceInfoLength = sizeof(KEY_BASIC_INFORMATION) + 50 * sizeof(WCHAR); + PKEY_VALUE_PARTIAL_INFORMATION pValueInformation = NULL; + ULONG ValueInfoLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 50 * sizeof(WCHAR); + ULONG RequiredSize; + ULONG IndexDevice = 0; + UNICODE_STRING DeviceName, ValueName; + HANDLE hDevicesKey = NULL; + HANDLE hDeviceKey = NULL; + NTSTATUS Status; + BOOLEAN ret = FALSE; + + InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenKey(&hDevicesKey, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); + if (!pDeviceInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); + if (!pDeviceInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + while (TRUE) + { + Status = NtEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); + DeviceInfoLength = RequiredSize; + pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); + if (!pDeviceInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = NtEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("NtEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + IndexDevice++; + + /* Open device key */ + DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; + DeviceName.Buffer = pDeviceInformation->Name; + InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_CASE_INSENSITIVE, hDevicesKey, NULL); + Status = NtOpenKey( + &hDeviceKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + /* Read identifier */ + Status = NtQueryValueKey(hDeviceKey, &IdentifierU, KeyValuePartialInformation, pValueInformation, ValueInfoLength, &RequiredSize); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); + ValueInfoLength = RequiredSize; + pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); + if (!pValueInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = NtQueryValueKey(hDeviceKey, &IdentifierU, KeyValuePartialInformation, pValueInformation, ValueInfoLength, &RequiredSize); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryValueKey() failed with status 0x%08lx\n", Status); + goto nextdevice; + } + else if (pValueInformation->Type != REG_SZ) + { + DPRINT("Wrong registry type: got 0x%lx, expected 0x%lx\n", pValueInformation->Type, REG_SZ); + goto nextdevice; + } + + ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; + ValueName.Buffer = (PWCHAR)pValueInformation->Data; + if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) + ValueName.Length -= sizeof(WCHAR); + if (RtlCompareUnicodeString(&ValueName, &AcpiBiosIdentifier, FALSE) == 0) + { + DPRINT("Found ACPI BIOS\n"); + ret = TRUE; + goto cleanup; + } + +nextdevice: + NtClose(hDeviceKey); + hDeviceKey = NULL; + } + +cleanup: + if (pDeviceInformation) + RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); + if (pValueInformation) + RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); + if (hDevicesKey) + NtClose(hDevicesKey); + if (hDeviceKey) + NtClose(hDeviceKey); + return ret; +} + + +static BOOLEAN GetComputerIdentifier(PWSTR Identifier, ULONG IdentifierLength) { @@ -98,15 +235,31 @@ return FALSE; } - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"PC UP"; + if (IsAcpiComputer()) + { + if (pFullInfo->SubKeys == 1) + { + /* Computer is mono-CPU */ + ComputerIdentifier = L"ACPI UP"; + } + else + { + /* Computer is multi-CPUs */ + ComputerIdentifier = L"ACPI MP"; + } } else { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"PC MP"; + if (pFullInfo->SubKeys == 1) + { + /* Computer is mono-CPU */ + ComputerIdentifier = L"PC UP"; + } + else + { + /* Computer is multi-CPUs */ + ComputerIdentifier = L"PC MP"; + } } RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); @@ -140,7 +293,7 @@ ComputerIdentifier[0] = 0; } - DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); + DPRINT1("Computer identifier: '%S'\n", ComputerIdentifier); /* Search for matching device identifier */ if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) @@ -158,7 +311,7 @@ return NULL; } - DPRINT("KeyValue: %S\n", KeyValue); + DPRINT1("KeyValue: %S\n", KeyValue); if (wcsstr(ComputerIdentifier, KeyValue)) { if (!INF_GetDataField(&Context, 0, &KeyName)) Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon Aug 15 06:27:23 2011 @@ -91,15 +91,17 @@ DefaultLanguage = 00000409 [Computer] -pci_up = "Standard-PC" -pci_mp = "Standard-PC Multiprocessor" -acpi = "ACPI PC" +pci_up = "Standard PC Uniprocessor" +pci_mp = "Standard PC Multiprocessor" +acpi_up = "ACPI PC Uniprocessor" +acpi_mp = "ACPI PC Multiprocessor" [Map.Computer] ;<id> = <pnp id string> pci_up = "PC UP" pci_mp = "PC MP" -acpi = "ACPI" +acpi_up = "ACPI UP" +acpi_mp = "ACPI MP" [Files.pci_up] ntoskrnl.exe=,,,,,,,,,,,,2 @@ -109,8 +111,12 @@ ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2 halmps.dll=,,,,,,,,,,hal.dll,,2 -[Files.acpi] +[Files.acpi_up] ntoskrnl.exe=,,,,,,,,,,,,2 +halacpi.dll=,,,,,,,,,,hal.dll,,2 + +[Files.acpi_mp] +ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2 halacpi.dll=,,,,,,,,,,hal.dll,,2 [Display]

1 0

[cgutman] 53256: [TXTSETUP.SIF] - Add an option to install the ACPI HAL - Feel free to try it out (you might be surprised)
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 05:45:16 2011 New Revision: 53256 URL: http://svn.reactos.org/svn/reactos?rev=53256&view=rev Log: [TXTSETUP.SIF] - Add an option to install the ACPI HAL - Feel free to try it out (you might be surprised) Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon Aug 15 05:45:16 2011 @@ -93,11 +93,13 @@ [Computer] pci_up = "Standard-PC" pci_mp = "Standard-PC Multiprocessor" +acpi = "ACPI PC" [Map.Computer] ;<id> = <pnp id string> pci_up = "PC UP" pci_mp = "PC MP" +acpi = "ACPI" [Files.pci_up] ntoskrnl.exe=,,,,,,,,,,,,2 @@ -106,6 +108,10 @@ [Files.pci_mp] ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2 halmps.dll=,,,,,,,,,,hal.dll,,2 + +[Files.acpi] +ntoskrnl.exe=,,,,,,,,,,,,2 +halacpi.dll=,,,,,,,,,,hal.dll,,2 [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp>

1 0

[cgutman] 53255: [NTOSKRNL] - Hack around a strange registry-related bug (we created the whole registry path previously but it won't let us open it without the correct volatile option) to fix devic...
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 05:43:16 2011 New Revision: 53255 URL: http://svn.reactos.org/svn/reactos?rev=53255&view=rev Log: [NTOSKRNL] - Hack around a strange registry-related bug (we created the whole registry path previously but it won't let us open it without the correct volatile option) to fix devices enumerated via IoReportDetectedDevice Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Mon Aug 15 05:43:16 2011 @@ -248,7 +248,8 @@ IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); /* Open a handle to the instance path key */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + /* REG_OPTION_VOLATILE is a HACK!!! */ + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_VOLATILE, &InstanceKey); if (!NT_SUCCESS(Status)) return Status;

1 0

[cgutman] 53254: [INF] - Add hal.inf
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 05:39:53 2011 New Revision: 53254 URL: http://svn.reactos.org/svn/reactos?rev=53254&view=rev Log: [INF] - Add hal.inf Added: trunk/reactos/media/inf/hal.inf (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Aug 15 05:39:53 2011 @@ -663,6 +663,7 @@ media\inf\display.inf 6 media\inf\font.inf 6 media\inf\fdc.inf 6 +media\inf\hal.inf 6 media\inf\hdc.inf 6 media\inf\intl.inf 6 media\inf\layout.inf 6 Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Mon Aug 15 05:39:53 2011 @@ -9,6 +9,7 @@ display.inf fdc.inf font.inf + hal.inf hdc.inf intl.inf keyboard.inf Added: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=5325… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/hal.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=5… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Mon Aug 15 05:39:53 2011 @@ -11,6 +11,7 @@ <installfile installbase="inf">display.inf</installfile> <installfile installbase="inf">fdc.inf</installfile> <installfile installbase="inf">font.inf</installfile> + <installfile installbase="inf">hal.inf</installfile> <installfile installbase="inf">hdc.inf</installfile> <installfile installbase="inf">intl.inf</installfile> <installfile installbase="inf">keyboard.inf</installfile> Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 53253: [NTOSKRNL] - Also create the instance key when we create a new device object
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 05:03:53 2011 New Revision: 53253 URL: http://svn.reactos.org/svn/reactos?rev=53253&view=rev Log: [NTOSKRNL] - Also create the instance key when we create a new device object Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Mon Aug 15 05:03:53 2011 @@ -142,7 +142,7 @@ UNICODE_STRING PathSep = RTL_CONSTANT_STRING(L"\\"); ULONG NextInstance; UNICODE_STRING EnumKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM); - HANDLE EnumHandle, DeviceKeyHandle = INVALID_HANDLE_VALUE; + HANDLE EnumHandle, DeviceKeyHandle = INVALID_HANDLE_VALUE, InstanceKeyHandle; RTL_QUERY_REGISTRY_TABLE QueryTable[2]; OBJECT_ATTRIBUTES ObjectAttributes; @@ -240,6 +240,18 @@ Status = STATUS_NO_MEMORY; goto cleanup; } + + /* Finish creating the instance path in the registry */ + InitializeObjectAttributes(&ObjectAttributes, &Device->InstanceID, OBJ_CASE_INSENSITIVE, DeviceKeyHandle, NULL); + Status = ZwCreateKey(&InstanceKeyHandle, KEY_QUERY_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + if (NT_SUCCESS(Status)) + { + DPRINT1("Failed to create instance path (0x%x)\n", Status); + goto cleanup; + } + + /* Just close the handle */ + ZwClose(InstanceKeyHandle); if (FullInstancePath) {

1 0

[cgutman] 53252: [HAL] - Also report the *PNP style IDs - Don't hang when a power IRP is received
by cgutman＠svn.reactos.org 15 Aug '11

15 Aug '11

Author: cgutman Date: Mon Aug 15 04:07:40 2011 New Revision: 53252 URL: http://svn.reactos.org/svn/reactos?rev=53252&view=rev Log: [HAL] - Also report the *PNP style IDs - Don't hang when a power IRP is received Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Mon Aug 15 04:07:40 2011 @@ -463,9 +463,10 @@ { PPDO_EXTENSION PdoExtension; PDO_TYPE PdoType; - PWCHAR Id; + PWCHAR CurrentId; + WCHAR Id[100]; NTSTATUS Status; - ULONG Length; + ULONG Length = 0; PWCHAR Buffer; /* Get the PDO type */ @@ -482,13 +483,25 @@ /* What kind of PDO is this? */ if (PdoType == AcpiPdo) { - /* PCI ID */ - Id = L"ACPI_HAL\\PNP0C08"; + /* ACPI ID */ + CurrentId = L"ACPI_HAL\\PNP0C08"; + RtlCopyMemory(Id, CurrentId, (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL)); + Length += (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); + + CurrentId = L"*PNP0C08"; + RtlCopyMemory(&Id[wcslen(Id) + 1], CurrentId, (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL)); + Length += (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); } else if (PdoType == WdPdo) { /* WatchDog ID */ - Id = L"ACPI_HAL\\PNP0C18"; + CurrentId = L"ACPI_HAL\\PNP0C18"; + RtlCopyMemory(Id, CurrentId, (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL)); + Length += (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); + + CurrentId = L"*PNP0C18"; + RtlCopyMemory(&Id[wcslen(Id) + 1], CurrentId, (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL)); + Length += (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); } else { @@ -498,9 +511,11 @@ break; case BusQueryInstanceID: - - /* And our instance ID */ - Id = L"0"; + + /* Instance ID */ + CurrentId = L"0"; + RtlCopyMemory(Id, CurrentId, (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL)); + Length += (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); break; case BusQueryCompatibleIDs: @@ -509,9 +524,7 @@ /* We don't support anything else */ return STATUS_NOT_SUPPORTED; } - - /* Calculate the length */ - Length = (wcslen(Id) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); + /* Allocate the buffer */ Buffer = ExAllocatePoolWithTag(PagedPool, @@ -815,7 +828,6 @@ IN PIRP Irp) { DbgPrint("HAL: PnP Driver Power!\n"); - while (TRUE); return STATUS_SUCCESS; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011