Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[cgutman] 53251: [HAL] - Invalidate device relations so the child devices get enumerated

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 03:44:10 2011 New Revision: 53251 URL: http://svn.reactos.org/svn/reactos?rev=53251&view=rev Log: [HAL] - Invalidate device relations so the child devices get enumerated 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 03:44:10 2011 @@ -136,6 +136,9 @@ PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; FdoExtension->ChildPdoList = PdoExtension; } + + /* Invalidate device relations since we added a new device */ + IoInvalidateDeviceRelations(TargetDevice, BusRelations); /* Return status */ DPRINT1("Device added %lx\n", Status);

13 years, 3 months

[cgutman] 53250: [HAL] - Fix string length calculation

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 03:20:17 2011 New Revision: 53250 URL: http://svn.reactos.org/svn/reactos?rev=53250&view=rev Log: [HAL] - Fix string length calculation 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 03:20:17 2011 @@ -492,16 +492,12 @@ /* Unknown */ return STATUS_NOT_SUPPORTED; } - - /* Static length */ - Length = 32; break; case BusQueryInstanceID: /* And our instance ID */ Id = L"0"; - Length = sizeof(L"0") + sizeof(UNICODE_NULL); break; case BusQueryCompatibleIDs: @@ -510,6 +506,9 @@ /* 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, @@ -556,14 +555,12 @@ /* This is our hardware ID */ Id = HalHardwareIdString; - Length = wcslen(HalHardwareIdString) + sizeof(UNICODE_NULL); break; case BusQueryInstanceID: /* And our instance ID */ Id = L"0"; - Length = sizeof(L"0") + sizeof(UNICODE_NULL); break; default: @@ -571,6 +568,9 @@ /* 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,

13 years, 3 months

[cgutman] 53249: [NTOSKRNL] - Rewrite IopIsAcpiComputer (and rename to IopIsFirmwareMapperDisabled) to eliminate the need for the ENABLE_ACPI define - IopIsFirmwareMapperDisabled now reads the regi...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 02:15:18 2011 New Revision: 53249 URL: http://svn.reactos.org/svn/reactos?rev=53249&view=rev Log: [NTOSKRNL] - Rewrite IopIsAcpiComputer (and rename to IopIsFirmwareMapperDisabled) to eliminate the need for the ENABLE_ACPI define - IopIsFirmwareMapperDisabled now reads the registry entry that HAL sets to indicate that the firmware mapper should be disabled - Partially rewrite IopUpdateRootKey so it does not interfere with HAL's PnP driver - ACPI is automatically enabled when the ACPI HAL is loaded and disabled when the standard HAL is loaded Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Aug 15 02:15:18 2011 @@ -12,8 +12,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -//#define ENABLE_ACPI /* GLOBALS *******************************************************************/ @@ -2693,143 +2691,73 @@ } static BOOLEAN INIT_FUNCTION -IopIsAcpiComputer(VOID) -{ -#ifndef ENABLE_ACPI - return FALSE; -#else - 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"); +IopIsFirmwareMapperDisabled(VOID) +{ + UNICODE_STRING KeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CURRENTCONTROLSET\\Control\\Pnp"); + UNICODE_STRING KeyNameU = RTL_CONSTANT_STRING(L"DisableFirmwareMapper"); 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; + HANDLE hPnpKey; + PKEY_VALUE_PARTIAL_INFORMATION KeyInformation; + ULONG DesiredLength, Length, KeyValue; NTSTATUS Status; - BOOLEAN ret = FALSE; - - InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&hDevicesKey, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - pDeviceInformation = ExAllocatePool(PagedPool, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - pValueInformation = ExAllocatePool(PagedPool, ValueInfoLength); - if (!pDeviceInformation) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - while (TRUE) - { - Status = ZwEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - ExFreePool(pDeviceInformation); - DeviceInfoLength = RequiredSize; - pDeviceInformation = ExAllocatePool(PagedPool, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - Status = ZwEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() 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_KERNEL_HANDLE, hDevicesKey, NULL); - Status = ZwOpenKey( - &hDeviceKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Read identifier */ - Status = ZwQueryValueKey(hDeviceKey, &IdentifierU, KeyValuePartialInformation, pValueInformation, ValueInfoLength, &RequiredSize); - if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - ExFreePool(pValueInformation); - ValueInfoLength = RequiredSize; - pValueInformation = ExAllocatePool(PagedPool, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - Status = ZwQueryValueKey(hDeviceKey, &IdentifierU, KeyValuePartialInformation, pValueInformation, ValueInfoLength, &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryValueKey() 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: - ZwClose(hDeviceKey); - hDeviceKey = NULL; - } - -cleanup: - if (pDeviceInformation) - ExFreePool(pDeviceInformation); - if (pValueInformation) - ExFreePool(pValueInformation); - if (hDevicesKey) - ZwClose(hDevicesKey); - if (hDeviceKey) - ZwClose(hDeviceKey); - return ret; -#endif + + InitializeObjectAttributes(&ObjectAttributes, &KeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&hPnpKey, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + Status = ZwQueryValueKey(hPnpKey, + &KeyNameU, + KeyValuePartialInformation, + NULL, + 0, + &DesiredLength); + if ((Status == STATUS_BUFFER_TOO_SMALL) || + (Status == STATUS_BUFFER_OVERFLOW)) + { + Length = DesiredLength; + KeyInformation = ExAllocatePool(PagedPool, Length); + if (KeyInformation) + { + Status = ZwQueryValueKey(hPnpKey, + &KeyNameU, + KeyValuePartialInformation, + KeyInformation, + Length, + &DesiredLength); + if (NT_SUCCESS(Status) && KeyInformation->DataLength == sizeof(ULONG)) + { + KeyValue = (ULONG)(*KeyInformation->Data); + } + else + { + DPRINT1("ZwQueryValueKey(%wZ%wZ) failed\n", &KeyPathU, &KeyNameU); + KeyValue = 0; + } + + ExFreePool(KeyInformation); + } + else + { + DPRINT1("Failed to allocate memory for registry query\n"); + KeyValue = 0; + } + } + else + { + DPRINT1("ZwQueryValueKey(%wZ%wZ) failed with status 0x%08lx\n", &KeyPathU, &KeyNameU, Status); + KeyValue = 0; + } + + ZwClose(hPnpKey); + } + else + { + DPRINT1("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyPathU, Status); + } + + DPRINT1("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled"); + + return (KeyValue != 0) ? TRUE : FALSE; } NTSTATUS @@ -2840,17 +2768,9 @@ UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root"); UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); - UNICODE_STRING DeviceDescU = RTL_CONSTANT_STRING(L"DeviceDesc"); - UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); - UNICODE_STRING LogConfU = RTL_CONSTANT_STRING(L"LogConf"); - UNICODE_STRING HalAcpiDevice = RTL_CONSTANT_STRING(L"ACPI_HAL"); - UNICODE_STRING HalAcpiId = RTL_CONSTANT_STRING(L"0000"); - UNICODE_STRING HalAcpiDeviceDesc = RTL_CONSTANT_STRING(L"HAL ACPI"); - UNICODE_STRING HalAcpiHardwareID = RTL_CONSTANT_STRING(L"*PNP0C08\0"); OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; + HANDLE hEnum, hRoot; NTSTATUS Status; - ULONG Disposition; InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); @@ -2869,35 +2789,7 @@ return Status; } - if (IopIsAcpiComputer()) - { - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hRoot, NULL); - Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); - ZwClose(hRoot); - if (!NT_SUCCESS(Status)) - return Status; - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); - Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, &ObjectAttributes, 0, NULL, 0, &Disposition); - ZwClose(hHalAcpiDevice); - if (!NT_SUCCESS(Status)) - return Status; - if (Disposition == REG_CREATED_NEW_KEY) - { - Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); - if (NT_SUCCESS(Status)) - Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); - } - if (NT_SUCCESS(Status)) - { - InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); - Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - if (NT_SUCCESS(Status)) - ZwClose(hLogConf); - } - ZwClose(hHalAcpiId); - return Status; - } - else + if (!IopIsFirmwareMapperDisabled()) { Status = IopOpenRegistryKeyEx(&hEnum, NULL, &MultiKeyPathU, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) @@ -2915,9 +2807,16 @@ NULL, 0); ZwClose(hEnum); - ZwClose(hRoot); - return Status; - } + } + else + { + /* Enumeration is disabled */ + Status = STATUS_SUCCESS; + } + + ZwClose(hRoot); + + return Status; } NTSTATUS

13 years, 3 months

[cgutman] 53248: [HAL] - Fix a bug writing the DisableFirmwareMapper entry

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 01:55:32 2011 New Revision: 53248 URL: http://svn.reactos.org/svn/reactos?rev=53248&view=rev Log: [HAL] - Fix a bug writing the DisableFirmwareMapper entry Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Mon Aug 15 01:55:32 2011 @@ -62,6 +62,7 @@ UNICODE_STRING KeyString; HANDLE KeyHandle; HANDLE Handle; + ULONG Value = HalDisableFirmwareMapper ? 1 : 0; /* Open the control set key */ RtlInitUnicodeString(&KeyString, @@ -88,8 +89,8 @@ &KeyString, 0, REG_DWORD, - &HalDisableFirmwareMapper, - sizeof(HalDisableFirmwareMapper)); + &Value, + sizeof(Value)); /* Close subkey */ ZwClose(KeyHandle);

13 years, 3 months

[cgutman] 53247: [HALACPI] - Fix several bugs involving garbage data in a PHYSICAL_ADDRESS struct

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 01:19:20 2011 New Revision: 53247 URL: http://svn.reactos.org/svn/reactos?rev=53247&view=rev Log: [HALACPI] - Fix several bugs involving garbage data in a PHYSICAL_ADDRESS struct Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Mon Aug 15 01:19:20 2011 @@ -166,6 +166,7 @@ if (Fadt) { /* Grab the DSDT address and assume 2 pages */ + PhysicalAddress.HighPart = 0; PhysicalAddress.LowPart = Fadt->dsdt; TableLength = 2 * PAGE_SIZE; @@ -263,6 +264,7 @@ { /* Read the 32-bit physical address */ PhysicalAddress.LowPart = Rsdt->Tables[CurrentEntry]; + PhysicalAddress.HighPart = 0; } else { @@ -603,6 +605,7 @@ PageCount = BYTES_TO_PAGES(NodeLength); /* Allocate the memory */ + PhysicalAddress.HighPart = 0; PhysicalAddress.LowPart = HalpAllocPhysicalMemory(LoaderBlock, 0x1000000, PageCount, @@ -652,12 +655,13 @@ /* Find the RSDT */ Status = HalpAcpiFindRsdtPhase0(LoaderBlock, &AcpiMultiNode); if (!NT_SUCCESS(Status)) return Status; + + PhysicalAddress.QuadPart = AcpiMultiNode->RsdtAddress.QuadPart; /* Map the RSDT */ if (LoaderBlock) { /* Phase0: Use HAL Heap to map the RSDT, we assume it's about 2 pages */ - PhysicalAddress.QuadPart = AcpiMultiNode->RsdtAddress.QuadPart; MappedAddress = HalpMapPhysicalMemory64(PhysicalAddress, 2); } else

13 years, 3 months

[cgutman] 53246: [PCI] - Don't report bogus interrupt resources

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 00:28:33 2011 New Revision: 53246 URL: http://svn.reactos.org/svn/reactos?rev=53246&view=rev Log: [PCI] - Don't report bogus interrupt resources Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Mon Aug 15 00:28:33 2011 @@ -669,6 +669,7 @@ } if ((PciConfig.u.type0.InterruptPin != 0) && + (PciConfig.u.type0.InterruptLine != 0) && (PciConfig.u.type0.InterruptLine != 0xFF)) ResCount++; } @@ -769,6 +770,7 @@ /* Add interrupt resource */ if ((PciConfig.u.type0.InterruptPin != 0) && + (PciConfig.u.type0.InterruptLine != 0) && (PciConfig.u.type0.InterruptLine != 0xFF)) { Descriptor->Type = CmResourceTypeInterrupt;

13 years, 3 months

[cgutman] 53245: [NTOSKRNL] - Add a debug print when AddDevice fails - Fix IopStopDevice - Fix a typo - Reduce code duplication

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 00:17:42 2011 New Revision: 53245 URL: http://svn.reactos.org/svn/reactos?rev=53245&view=rev Log: [NTOSKRNL] - Add a debug print when AddDevice fails - Fix IopStopDevice - Fix a typo - Reduce code duplication Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Aug 15 00:17:42 2011 @@ -95,6 +95,10 @@ DriverObject, DeviceNode->PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { + DPRINT1("%wZ->AddDevice(%wZ) failed with status 0x%x\n", + &DriverObject->DriverName, + &DeviceNode->InstancePath, + Status); IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); return Status; } @@ -393,9 +397,13 @@ DPRINT("Stopping device: %wZ\n", &DeviceNode->InstancePath); Status = IopQueryStopDevice(DeviceNode->PhysicalDeviceObject); - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { IopSendStopDevice(DeviceNode->PhysicalDeviceObject); + + DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); + DeviceNode->Flags |= DNF_STOPPED; + return STATUS_SUCCESS; } @@ -490,7 +498,7 @@ if (DeviceCaps->NoDisplayInUI) DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI; else - DeviceNode->UserFlags &= DNUF_DONT_SHOW_IN_UI; + DeviceNode->UserFlags &= ~DNUF_DONT_SHOW_IN_UI; Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); if (NT_SUCCESS(Status)) @@ -3720,12 +3728,13 @@ { /* Stop for resource rebalance */ - if (NT_SUCCESS(IopQueryStopDevice(PhysicalDeviceObject))) + Status = IopStopDevice(DeviceNode); + if (!NT_SUCCESS(Status)) { - IopSendStopDevice(PhysicalDeviceObject); - - DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); - DeviceNode->Flags |= DNF_STOPPED; + DPRINT1("Failed to stop device for rebalancing\n"); + + /* Stop failed so don't rebalance */ + PnPFlags &= ~PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED; } }

13 years, 3 months

[cgutman] 53244: [HAL] - Fix incorrect modification of device object flags

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 15 00:08:47 2011 New Revision: 53244 URL: http://svn.reactos.org/svn/reactos?rev=53244&view=rev Log: [HAL] - Fix incorrect modification of device object flags 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 00:08:47 2011 @@ -84,7 +84,7 @@ FdoExtension->FunctionalDeviceObject = DeviceObject; /* FDO is done initializing */ - DeviceObject->Flags &= DO_DEVICE_INITIALIZING; + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; /* Attach to the physical device object (the bus) */ AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, TargetDevice); @@ -126,14 +126,14 @@ if (!Wdrt) { /* None exists, there is nothing to do more */ - PdoDeviceObject->Flags &= DO_DEVICE_INITIALIZING; + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; FdoExtension->ChildPdoList = PdoExtension; } else { /* FIXME: TODO */ DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - PdoDeviceObject->Flags &= DO_DEVICE_INITIALIZING; + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; FdoExtension->ChildPdoList = PdoExtension; }

13 years, 3 months

[jgardou] 53243: [ROSSYM_NEW] - add missing debug.h include

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Aug 14 21:39:37 2011 New Revision: 53243 URL: http://svn.reactos.org/svn/reactos?rev=53243&view=rev Log: [ROSSYM_NEW] - add missing debug.h include Modified: trunk/reactos/lib/rossym_new/fromfile.c Modified: trunk/reactos/lib/rossym_new/fromfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/fromfile.c?… ============================================================================== --- trunk/reactos/lib/rossym_new/fromfile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/fromfile.c [iso-8859-1] Sun Aug 14 21:39:37 2011 @@ -8,6 +8,9 @@ */ #include <precomp.h> + +#define NDEBUG +#include <debug.h> #define SYMBOL_SIZE 18

13 years, 3 months

[jgardou] 53242: [ROSSYM_NEW] - including debug.h once is enough This time for real, sorry.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Aug 14 21:25:25 2011 New Revision: 53242 URL: http://svn.reactos.org/svn/reactos?rev=53242&view=rev Log: [ROSSYM_NEW] - including debug.h once is enough This time for real, sorry. Modified: trunk/reactos/lib/rossym_new/frommem.c trunk/reactos/lib/rossym_new/fromraw.c trunk/reactos/lib/rossym_new/getraw.c trunk/reactos/lib/rossym_new/initkm.c trunk/reactos/lib/rossym_new/iofile.c Modified: trunk/reactos/lib/rossym_new/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/frommem.c?r… ============================================================================== --- trunk/reactos/lib/rossym_new/frommem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/frommem.c [iso-8859-1] Sun Aug 14 21:25:25 2011 @@ -15,7 +15,6 @@ #include <ntimage.h> #define NDEBUG -#include <debug.h> #include <debug.h> #include "dwarf.h" Modified: trunk/reactos/lib/rossym_new/fromraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/fromraw.c?r… ============================================================================== --- trunk/reactos/lib/rossym_new/fromraw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/fromraw.c [iso-8859-1] Sun Aug 14 21:25:25 2011 @@ -13,7 +13,6 @@ #include "rossympriv.h" #define NDEBUG -#include <debug.h> #include <debug.h> BOOLEAN Modified: trunk/reactos/lib/rossym_new/getraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/getraw.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/getraw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/getraw.c [iso-8859-1] Sun Aug 14 21:25:25 2011 @@ -13,7 +13,6 @@ #include "rossympriv.h" #define NDEBUG -#include <debug.h> #include <debug.h> ULONG Modified: trunk/reactos/lib/rossym_new/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/initkm.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/initkm.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/initkm.c [iso-8859-1] Sun Aug 14 21:25:25 2011 @@ -15,7 +15,6 @@ #include "rossympriv.h" #define NDEBUG -#include <debug.h> #include <debug.h> #define TAG_ROSSYM 'MYSR' Modified: trunk/reactos/lib/rossym_new/iofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/iofile.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/iofile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/iofile.c [iso-8859-1] Sun Aug 14 21:25:25 2011 @@ -13,7 +13,6 @@ #include "rossympriv.h" #define NDEBUG -#include <debug.h> #include <debug.h> NTSTATUS RosSymStatus;

13 years, 3 months

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

Jump to page:

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