Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[rharabien] 52032: [INF] - Really add disk.inf. Forgotten in r51978
by rharabien＠svn.reactos.org 31 May '11

31 May '11

Author: rharabien Date: Tue May 31 23:19:07 2011 New Revision: 52032 URL: http://svn.reactos.org/svn/reactos?rev=52032&view=rev Log: [INF] - Really add disk.inf. Forgotten in r51978 Modified: trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/inf.rbuild 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] Tue May 31 23:19:07 2011 @@ -5,6 +5,7 @@ bda.inf cdrom.inf cpu.inf + disk.inf display.inf fdc.inf font.inf 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] Tue May 31 23:19:07 2011 @@ -7,6 +7,7 @@ <installfile installbase="inf">bda.inf</installfile> <installfile installbase="inf">cdrom.inf</installfile> <installfile installbase="inf">cpu.inf</installfile> + <installfile installbase="inf">disk.inf</installfile> <installfile installbase="inf">display.inf</installfile> <installfile installbase="inf">fdc.inf</installfile> <installfile installbase="inf">font.inf</installfile>

1 0

[cgutman] 52031: [NTOSKRNL] - Remove an extra semicolon - Dedicated to encoded
by cgutman＠svn.reactos.org 31 May '11

31 May '11

Author: cgutman Date: Tue May 31 23:04:59 2011 New Revision: 52031 URL: http://svn.reactos.org/svn/reactos?rev=52031&view=rev Log: [NTOSKRNL] - Remove an extra semicolon - Dedicated to encoded 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] Tue May 31 23:04:59 2011 @@ -438,7 +438,7 @@ return Status; } - DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps->Version + sizeof(DeviceCaps->Version));; + DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps->Version + sizeof(DeviceCaps->Version)); if (DeviceCaps->NoDisplayInUI) DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI;

1 0

[rharabien] 52030: [CMAKE] - sys-stubs.S depends now on w32ksvc.h. Unfortunately CMake isn't smart enough to find it automatically
by rharabien＠svn.reactos.org 31 May '11

31 May '11

Author: rharabien Date: Tue May 31 21:05:03 2011 New Revision: 52030 URL: http://svn.reactos.org/svn/reactos?rev=52030&view=rev Log: [CMAKE] - sys-stubs.S depends now on w32ksvc.h. Unfortunately CMake isn't smart enough to find it automatically Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Tue May 31 21:05:03 2011 @@ -199,3 +199,4 @@ add_importlib_target(win32k.spec) add_library(win32ksys sys-stubs.S) +set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)

1 0

[cgutman] 52029: [NTOSKRNL] - Implement IopRemoveDevice and IopStopDevice - Do a graceful remove before installing new drivers (like Windows does) - Debug log warnings abound (don't be alarmed ; )) ...
by cgutman＠svn.reactos.org 31 May '11

31 May '11

Author: cgutman Date: Tue May 31 19:34:08 2011 New Revision: 52029 URL: http://svn.reactos.org/svn/reactos?rev=52029&view=rev Log: [NTOSKRNL] - Implement IopRemoveDevice and IopStopDevice - Do a graceful remove before installing new drivers (like Windows does) - Debug log warnings abound (don't be alarmed ;)) because drivers aren't used to receiving IRP_MN_QUERY_REMOVE_DEVICE, IRP_MN_REMOVE_DEVICE and IRP_MN_QUERY_PNP_DEVICE_STATE from our (formly) crippled PnP manager Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue May 31 19:34:08 2011 @@ -790,6 +790,16 @@ IN PDEVICE_NODE DeviceNode ); +NTSTATUS +IopStopDevice( + IN PDEVICE_NODE DeviceNode +); + +NTSTATUS +IopRemoveDevice( + IN PDEVICE_NODE DeviceNode +); + PVPB NTAPI IopCheckVpbMounted( Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Tue May 31 19:34:08 2011 @@ -551,10 +551,18 @@ DeviceNode = IopGetDeviceNode(DeviceObject); - /* FIXME: we should stop the device, before starting it again */ - - /* Start the device */ - IopDeviceNodeClearFlag(DeviceNode, DNF_DISABLED); + /* Remove the device */ + if (DeviceNode->Flags & DNF_ENUMERATED) + { + Status = IopRemoveDevice(DeviceNode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WARNING: Ignoring failed IopRemoveDevice() for %wZ (likely a driver bug)\n", &DeviceNode->InstancePath); + } + } + + /* Reenumerate the device and its children */ + DeviceNode->Flags &= ~DNF_DISABLED; Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); if (NT_SUCCESS(Status)) 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] Tue May 31 19:34:08 2011 @@ -335,6 +335,24 @@ /* Return */ return Status; +} + +NTSTATUS +IopStopDevice( + PDEVICE_NODE DeviceNode) +{ + NTSTATUS Status; + + DPRINT("Stopping device: %wZ\n", &DeviceNode->InstancePath); + + Status = IopQueryStopDevice(DeviceNode->PhysicalDeviceObject); + if (!NT_SUCCESS(Status)) + { + IopSendStopDevice(DeviceNode->PhysicalDeviceObject); + return STATUS_SUCCESS; + } + + return Status; } NTSTATUS @@ -420,7 +438,7 @@ return Status; } - DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps + 4); + DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps->Version + sizeof(DeviceCaps->Version));; if (DeviceCaps->NoDisplayInUI) DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI; @@ -3873,6 +3891,12 @@ PDEVICE_RELATIONS DeviceRelations; NTSTATUS Status; ULONG i; + + if (DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) + { + DPRINT1("Removal not allowed for %wZ\n", &DeviceNode->InstancePath); + return STATUS_UNSUCCESSFUL; + } IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, &DeviceNode->InstancePath); @@ -3958,6 +3982,23 @@ return Status; } +NTSTATUS +IopRemoveDevice(PDEVICE_NODE DeviceNode) +{ + NTSTATUS Status; + + DPRINT("Removing device: %wZ\n", &DeviceNode->InstancePath); + + Status = IopPrepareDeviceForRemoval(DeviceNode->PhysicalDeviceObject); + if (NT_SUCCESS(Status)) + { + IopSendRemoveDevice(DeviceNode->PhysicalDeviceObject); + return STATUS_SUCCESS; + } + + return Status; +} + /* * @implemented */

1 0

[cgutman] 52028: [PCIIDEX] - Handle IRP_MN_QUERY_REMOVE_DEVICE - Handle IRP_MN_QUERY_PNP_DEVICE_STATE to report that we are not disableable to the PnP manager so we don't get removed during driver ...
by cgutman＠svn.reactos.org 31 May '11

31 May '11

Author: cgutman Date: Tue May 31 19:29:22 2011 New Revision: 52028 URL: http://svn.reactos.org/svn/reactos?rev=52028&view=rev Log: [PCIIDEX] - Handle IRP_MN_QUERY_REMOVE_DEVICE - Handle IRP_MN_QUERY_PNP_DEVICE_STATE to report that we are not disableable to the PnP manager so we don't get removed during driver installation Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/fdo.c [iso-8859-1] Tue May 31 19:29:22 2011 @@ -402,7 +402,7 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; - ULONG_PTR Information = 0; + ULONG_PTR Information = Irp->IoStatus.Information; NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -419,6 +419,12 @@ Status = PciIdeXFdoStartDevice(DeviceObject, Irp); break; } + case IRP_MN_QUERY_REMOVE_DEVICE: /* 0x01 */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_REMOVE_DEVICE\n"); + Status = STATUS_UNSUCCESSFUL; + break; + } case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x07 */ { switch (Stack->Parameters.QueryDeviceRelations.Type) @@ -441,6 +447,13 @@ } break; } + case IRP_MN_QUERY_PNP_DEVICE_STATE: /* 0x14 */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_PNP_DEVICE_STATE\n"); + Information |= PNP_DEVICE_NOT_DISABLEABLE; + Status = STATUS_SUCCESS; + break; + } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* 0x0d */ { DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Tue May 31 19:29:22 2011 @@ -360,7 +360,7 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; - ULONG_PTR Information = 0; + ULONG_PTR Information = Irp->IoStatus.Information; NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -404,6 +404,12 @@ Status = STATUS_SUCCESS; break; } + case IRP_MN_QUERY_REMOVE_DEVICE: /* 0x01 */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_REMOVE_DEVICE\n"); + Status = STATUS_UNSUCCESSFUL; + break; + } case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x07 */ { switch (Stack->Parameters.QueryDeviceRelations.Type) @@ -485,6 +491,13 @@ Status = PciIdeXPdoQueryId(DeviceObject, Irp, &Information); break; } + case IRP_MN_QUERY_PNP_DEVICE_STATE: /* 0x14 */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_PNP_DEVICE_STATE\n"); + Information |= PNP_DEVICE_NOT_DISABLEABLE; + Status = STATUS_SUCCESS; + break; + } case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */ { PPNP_BUS_INFORMATION BusInfo;

1 0

[akhaldi] 52027: [CMAKE] * Several improvements to debug symbols handling. * A new (killer/awesome/...etc) feature has been introduced to kdbg: argument values support. Now backtraces contain not o...
by akhaldi＠svn.reactos.org 31 May '11

31 May '11

Author: akhaldi Date: Tue May 31 18:22:20 2011 New Revision: 52027 URL: http://svn.reactos.org/svn/reactos?rev=52027&view=rev Log: [CMAKE] * Several improvements to debug symbols handling. * A new (killer/awesome/...etc) feature has been introduced to kdbg: argument values support. Now backtraces contain not only usermode and kernelmode addresses translated, but also the argument values passed to the functions along the trace. * Brought to you by the Arty. Modified: branches/cmake-bringup/include/reactos/rossym.h branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/lib/rossym/compat.h branches/cmake-bringup/lib/rossym/dwarf.h branches/cmake-bringup/lib/rossym/dwarfabbrev.c branches/cmake-bringup/lib/rossym/dwarfaranges.c branches/cmake-bringup/lib/rossym/dwarfcfa.c branches/cmake-bringup/lib/rossym/dwarfget.c branches/cmake-bringup/lib/rossym/dwarfinfo.c branches/cmake-bringup/lib/rossym/dwarfopen.c branches/cmake-bringup/lib/rossym/dwarfpc.c branches/cmake-bringup/lib/rossym/find.c branches/cmake-bringup/lib/rossym/fromfile.c branches/cmake-bringup/lib/rossym/initum.c branches/cmake-bringup/lib/rossym/pe.c branches/cmake-bringup/lib/rossym/pe.h branches/cmake-bringup/lib/rossym/rossympriv.h branches/cmake-bringup/ntoskrnl/include/internal/kd.h branches/cmake-bringup/ntoskrnl/kdbg/i386/i386-dis.c branches/cmake-bringup/ntoskrnl/kdbg/kdb_cli.c branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c branches/cmake-bringup/ntoskrnl/ke/bug.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/include/reactos/rossym.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/r… Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… Modified: branches/cmake-bringup/lib/rossym/compat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/compat… Modified: branches/cmake-bringup/lib/rossym/dwarf.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarf.… Modified: branches/cmake-bringup/lib/rossym/dwarfabbrev.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfa… Modified: branches/cmake-bringup/lib/rossym/dwarfaranges.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfa… Modified: branches/cmake-bringup/lib/rossym/dwarfcfa.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfc… Modified: branches/cmake-bringup/lib/rossym/dwarfget.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfg… Modified: branches/cmake-bringup/lib/rossym/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfi… Modified: branches/cmake-bringup/lib/rossym/dwarfopen.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfo… Modified: branches/cmake-bringup/lib/rossym/dwarfpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dwarfp… Modified: branches/cmake-bringup/lib/rossym/find.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/find.c… Modified: branches/cmake-bringup/lib/rossym/fromfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/fromfi… Modified: branches/cmake-bringup/lib/rossym/initum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initum… Modified: branches/cmake-bringup/lib/rossym/pe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/pe.c?r… Modified: branches/cmake-bringup/lib/rossym/pe.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/pe.h?r… Modified: branches/cmake-bringup/lib/rossym/rossympriv.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/rossym… Modified: branches/cmake-bringup/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/i38… Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… Modified: branches/cmake-bringup/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/bug.c…

1 0

[cgutman] 52026: [NTOSKRNL] - Set the DNF_DISABLED flag if a driver returns with the HardwareDisabled flag set to true (but only BEFORE starting the device) - Don't try to start a device with the D...
by cgutman＠svn.reactos.org 31 May '11

31 May '11

Author: cgutman Date: Tue May 31 18:11:40 2011 New Revision: 52026 URL: http://svn.reactos.org/svn/reactos?rev=52026&view=rev Log: [NTOSKRNL] - Set the DNF_DISABLED flag if a driver returns with the HardwareDisabled flag set to true (but only BEFORE starting the device) - Don't try to start a device with the DNF_DISABLED flag set - Send IRP_MN_QUERY_CAPABILITIES (again) and IRP_MN_QUERY_PNP_DEVICE_STATE after the device has started - Write the UINumber and Capabilities registry entries in IopQueryDeviceCapabilities so they will be updated after every IRP_MN_QUERY_CAPABILITIES is sent - Set the DNUF_DONT_SHOW_IN_UI flag in response to the NoDisplayInUI flag set in DEVICE_CAPABILITIES or PNP_DEVICE_DONT_DISPLAY_IN_UI set after sending IRP_MN_QUERY_PNP_DEVICE_STATE - Set DNUF_NBOT_DISABLEABLE if PNP_DEVICE_NOT_DISABLEABLE is set after sending IRP_MN_QUERY_PNP_DEVICE_STATE - Remove duplicate code - Fix sending GUID_DEVICE_ARRIVAL (patch by Eric Kohl) - IRPs sent to PnP devices on enumeration and start are now completely compatible with Windows XP/2003/Vista Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue May 31 18:11:40 2011 @@ -602,6 +602,11 @@ NTSTATUS NTAPI +IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode, + PDEVICE_CAPABILITIES DeviceCaps); + +NTSTATUS +NTAPI IopSynchronousCall( IN PDEVICE_OBJECT DeviceObject, IN PIO_STACK_LOCATION IoStackLocation, 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] Tue May 31 18:11:40 2011 @@ -235,25 +235,23 @@ PDEVICE_NODE DeviceNode; NTSTATUS Status; PVOID Dummy; + DEVICE_CAPABILITIES DeviceCapabilities; /* Get the device node */ DeviceNode = IopGetDeviceNode(DeviceObject); + ASSERT(!(DeviceNode->Flags & DNF_DISABLED)); + /* Build the I/O stack locaiton */ RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_START_DEVICE; - /* Check if we didn't already report the resources */ - if (!(DeviceNode->Flags & DNF_RESOURCE_REPORTED)) - { - /* Report them */ - Stack.Parameters.StartDevice.AllocatedResources = - DeviceNode->ResourceList; - Stack.Parameters.StartDevice.AllocatedResourcesTranslated = - DeviceNode->ResourceListTranslated; - } - + Stack.Parameters.StartDevice.AllocatedResources = + DeviceNode->ResourceList; + Stack.Parameters.StartDevice.AllocatedResourcesTranslated = + DeviceNode->ResourceListTranslated; + /* Do the call */ Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy); if (!NT_SUCCESS(Status)) @@ -267,6 +265,17 @@ DPRINT1("Warning: PnP Start failed (%wZ)\n", &DeviceNode->InstancePath); return; } + + DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack (after start)\n"); + + Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); + } + + /* Invalidate device state so IRP_MN_QUERY_PNP_DEVICE_STATE is sent */ + IoInvalidateDeviceState(DeviceObject); /* Otherwise, mark us as started */ DeviceNode->Flags |= DNF_STARTED; @@ -316,7 +325,6 @@ { /* Enumerate us */ IoSynchronousInvalidateDeviceRelations(DeviceObject, BusRelations); - IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); Status = STATUS_SUCCESS; } else @@ -337,6 +345,9 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; + + if (DeviceNode->Flags & DNF_DISABLED) + return STATUS_SUCCESS; Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) @@ -383,6 +394,9 @@ { IO_STATUS_BLOCK StatusBlock; IO_STACK_LOCATION Stack; + NTSTATUS Status; + HANDLE InstanceKey; + UNICODE_STRING ValueName; /* Set up the Header */ RtlZeroMemory(DeviceCaps, sizeof(DEVICE_CAPABILITIES)); @@ -396,10 +410,49 @@ Stack.Parameters.DeviceCapabilities.Capabilities = DeviceCaps; /* Send the IRP */ - return IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject, - &StatusBlock, - IRP_MN_QUERY_CAPABILITIES, - &Stack); + Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject, + &StatusBlock, + IRP_MN_QUERY_CAPABILITIES, + &Stack); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IRP_MN_QUERY_CAPABILITIES failed with status 0x%x\n", Status); + return Status; + } + + DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps + 4); + + if (DeviceCaps->NoDisplayInUI) + DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI; + else + DeviceNode->UserFlags &= DNUF_DONT_SHOW_IN_UI; + + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + if (NT_SUCCESS(Status)) + { + /* Set 'Capabilities' value */ + RtlInitUnicodeString(&ValueName, L"Capabilities"); + Status = ZwSetValueKey(InstanceKey, + &ValueName, + 0, + REG_DWORD, + (PVOID)&DeviceNode->CapabilityFlags, + sizeof(ULONG)); + + /* Set 'UINumber' value */ + if (DeviceCaps->UINumber != MAXULONG) + { + RtlInitUnicodeString(&ValueName, L"UINumber"); + Status = ZwSetValueKey(InstanceKey, + &ValueName, + 0, + REG_DWORD, + &DeviceCaps->UINumber, + sizeof(ULONG)); + } + } + + return Status; } static VOID NTAPI @@ -1303,7 +1356,7 @@ DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); } - DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack\n"); + DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack (after enumeration)\n"); Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); if (!NT_SUCCESS(Status)) @@ -1311,7 +1364,15 @@ DPRINT("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); } - DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCapabilities + 4); + /* This bit is only check after enumeration */ + if (DeviceCapabilities.HardwareDisabled) + { + /* FIXME: Cleanup device */ + DeviceNode->Flags |= DNF_DISABLED; + return STATUS_SUCCESS; + } + else + DeviceNode->Flags &= ~DNF_DISABLED; if (!DeviceCapabilities.UniqueID) { @@ -1371,29 +1432,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); - } - - { - /* Set 'Capabilities' value */ - RtlInitUnicodeString(&ValueName, L"Capabilities"); - Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_DWORD, - (PVOID)&DeviceNode->CapabilityFlags, - sizeof(ULONG)); - - /* Set 'UINumber' value */ - if (DeviceCapabilities.UINumber != MAXULONG) - { - RtlInitUnicodeString(&ValueName, L"UINumber"); - Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_DWORD, - &DeviceCapabilities.UINumber, - sizeof(ULONG)); - } } DPRINT("Sending IRP_MN_QUERY_ID.BusQueryHardwareIDs to device stack\n"); @@ -1696,6 +1734,15 @@ ULONG i; DPRINT("DeviceObject 0x%p\n", DeviceObject); + + if (DeviceNode->Flags & DNF_NEED_ENUMERATION_ONLY) + { + DeviceNode->Flags &= ~DNF_NEED_ENUMERATION_ONLY; + + DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &DeviceNode->InstancePath); + } DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); @@ -1746,12 +1793,6 @@ &ChildDeviceNode); if (NT_SUCCESS(Status)) { - DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &ChildDeviceNode->InstancePath); - /* Mark the node as enumerated */ ChildDeviceNode->Flags |= DNF_ENUMERATED; @@ -3162,33 +3203,6 @@ NTSTATUS NTAPI -PpIrpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, - OUT PDEVICE_CAPABILITIES DeviceCaps) -{ - PVOID Dummy; - IO_STACK_LOCATION Stack; - - PAGED_CODE(); - - /* Set up the Header */ - RtlZeroMemory(DeviceCaps, sizeof(DEVICE_CAPABILITIES)); - DeviceCaps->Size = sizeof(DEVICE_CAPABILITIES); - DeviceCaps->Version = 1; - DeviceCaps->Address = -1; - DeviceCaps->UINumber = -1; - - /* Set up the Stack */ - RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); - Stack.MajorFunction = IRP_MJ_PNP; - Stack.MinorFunction = IRP_MN_QUERY_CAPABILITIES; - Stack.Parameters.DeviceCapabilities.Capabilities = DeviceCaps; - - /* Send the IRP */ - return IopSynchronousCall(DeviceObject, &Stack, &Dummy); -} - -NTSTATUS -NTAPI PnpDeviceObjectToDeviceInstance(IN PDEVICE_OBJECT DeviceObject, IN PHANDLE DeviceInstanceHandle, IN ACCESS_MASK DesiredAccess) @@ -3446,7 +3460,7 @@ case DevicePropertyAddress: /* Query the device caps */ - Status = PpIrpQueryCapabilities(DeviceObject, &DeviceCaps); + Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps); if (!NT_SUCCESS(Status) || (DeviceCaps.Address == MAXULONG)) return STATUS_OBJECT_NAME_NOT_FOUND; @@ -3607,6 +3621,16 @@ return; } + if (PnPFlags & PNP_DEVICE_NOT_DISABLEABLE) + DeviceNode->UserFlags |= DNUF_NOT_DISABLEABLE; + else + DeviceNode->UserFlags &= ~DNUF_NOT_DISABLEABLE; + + if (PnPFlags & PNP_DEVICE_DONT_DISPLAY_IN_UI) + DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI; + else + DeviceNode->UserFlags &= ~DNUF_DONT_SHOW_IN_UI; + if ((PnPFlags & PNP_DEVICE_REMOVED) || ((PnPFlags & PNP_DEVICE_FAILED) && !(PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED))) {

1 0

[cgutman] 52025: [I8042PRT] - Don't ASSERT(FALSE) when receiving an unknown PNP IRP
by cgutman＠svn.reactos.org 31 May '11

31 May '11

Author: cgutman Date: Tue May 31 18:02:49 2011 New Revision: 52025 URL: http://svn.reactos.org/svn/reactos?rev=52025&view=rev Log: [I8042PRT] - Don't ASSERT(FALSE) when receiving an unknown PNP IRP Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Tue May 31 18:02:49 2011 @@ -708,7 +708,6 @@ default: { ERR_(I8042PRT, "IRP_MJ_PNP / unknown minor function 0x%x\n", MinorFunction); - ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); } }

1 0

[tkreuzer] 52024: fix build
by tkreuzer＠svn.reactos.org 31 May '11

31 May '11

Author: tkreuzer Date: Tue May 31 17:50:55 2011 New Revision: 52024 URL: http://svn.reactos.org/svn/reactos?rev=52024&view=rev Log: fix build Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Tue May 31 17:50:55 2011 @@ -24,7 +24,7 @@ /* Check parameter */ if (!path) { - __set_errno(EINVAL); + //__set_errno(EINVAL); return; }

1 0

[tkreuzer] 52023: [CRT] Rewrite _splitpath. See issue #6244 for more details.
by tkreuzer＠svn.reactos.org 31 May '11

31 May '11

Author: tkreuzer Date: Tue May 31 17:29:49 2011 New Revision: 52023 URL: http://svn.reactos.org/svn/reactos?rev=52023&view=rev Log: [CRT] Rewrite _splitpath. See issue #6244 for more details. Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Tue May 31 17:29:49 2011 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: CRT: implementation of _splitpath / _wsplitpath + * PROGRAMMERS: Timo Kreuzer + */ + #include <precomp.h> #include <tchar.h> @@ -6,64 +13,72 @@ */ void _tsplitpath(const _TCHAR* path, _TCHAR* drive, _TCHAR* dir, _TCHAR* fname, _TCHAR* ext) { - _TCHAR* tmp_drive = NULL; - _TCHAR* tmp_dir = NULL; - _TCHAR* tmp_ext = NULL; + const _TCHAR *src, *dir_start, *file_start = 0, *ext_start = 0; - tmp_drive = (_TCHAR*)_tcschr(path,':'); - if (drive) + /* Truncate all output strings */ + if (drive) drive[0] = '\0'; + if (dir) dir[0] = '\0'; + if (fname) fname[0] = '\0'; + if (ext) ext[0] = '\0'; + + /* Check parameter */ + if (!path) { - if (tmp_drive) - { - _tcsncpy(drive,tmp_drive-1,2); - *(drive+2) = 0; - } - else - { - *drive = 0; - } - } - if (!tmp_drive) - { - tmp_drive = (_TCHAR*)path - 1; + __set_errno(EINVAL); + return; } - tmp_dir = (_TCHAR*)_tcsrchr(path,'\\'); - if (dir) + /* Skip '\\?\' prefix */ + if ((path[0] == '\\') && (path[1] == '\\') && + (path[2] == '?') && (path[3] == '\\')) path += 4; + + if (path[0] == '\0') return; + + /* Check if we have a drive letter (only 1 char supported) */ + if (path[1] == ':') { - if (tmp_dir) + if (drive) { - _tcsncpy(dir,tmp_drive+1,tmp_dir-tmp_drive); - *(dir+(tmp_dir-tmp_drive)) = 0; + drive[0] = path[0]; + drive[1] = ':'; + drive[2] = '\0'; } - else - { - *dir =0; - } + path += 2; + } + + /* Scan the rest of the string */ + dir_start = path; + while (*path != '\0') + { + /* Remember last path seperator and last dot */ + if ((*path == '\\') || (*path == '/')) file_start = path + 1; + if (*path == '.') ext_start = path; + path++; } - /* If the dot is before the last dir separator, it's part - * of a directory name, not the start of the extension */ - if (!tmp_ext || tmp_ext < tmp_dir) + /* Check if we got */ + if (!file_start) file_start = path; + if (!ext_start || ext_start < file_start) ext_start = path; + + if (dir) { - tmp_ext = (_TCHAR*)path+_tcslen(path); - } - if (ext) - { - _tcscpy(ext,tmp_ext); + src = dir_start; + while (src < file_start) *dir++ = *src++; + *dir = '\0'; } - if (fname) + if (fname) { - if (tmp_dir) - { - _tcsncpy(fname,tmp_dir+1,tmp_ext-tmp_dir-1); - *(fname+(tmp_ext-tmp_dir-1)) = 0; - } - else - { - _tcsncpy(fname,tmp_drive+1,tmp_ext-tmp_drive-1); - *(fname+(tmp_ext-path))=0; - } + src = file_start; + while (src < ext_start) *fname++ = *src++; + *fname = '\0'; + } + + if (ext) + { + src = ext_start; + while (*src != '\0') *ext++ = *src++; + *ext = '\0'; } } +

1 0

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 May 2011