Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/04: [NTOS:IO] Do device reset inside the PipDeviceActionWorker This make the operation synchonized with the other device tree actions
by Victor Perevertkin 21 Aug '20

21 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acd07e725e723ab62ea8b… commit acd07e725e723ab62ea8bcd2251e93746b9dc569 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Aug 21 08:20:59 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 21 08:20:59 2020 +0300 [NTOS:IO] Do device reset inside the PipDeviceActionWorker This make the operation synchonized with the other device tree actions CORE-10456 CORE-17150 --- ntoskrnl/include/internal/io.h | 3 ++- ntoskrnl/io/pnpmgr/devaction.c | 57 ++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/io/pnpmgr/plugplay.c | 46 ++-------------------------------- 3 files changed, 61 insertions(+), 45 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 4e810bc34fe..73f862c003d 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -544,7 +544,8 @@ typedef enum _SECURITY_DESCRIPTOR_TYPE typedef enum _DEVICE_ACTION { PiActionEnumDeviceTree, - PiActionEnumRootDevices + PiActionEnumRootDevices, + PiActionResetDevice } DEVICE_ACTION; // diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 77b9990f35b..0351bec4dbd 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -2324,6 +2324,57 @@ cleanup: &DeviceNode->InstancePath); } +static +NTSTATUS +PipResetDevice( + _In_ PDEVICE_NODE DeviceNode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + ASSERT(DeviceNode->Flags & DNF_ENUMERATED); + ASSERT(DeviceNode->Flags & DNF_PROCESSED); + + /* Check if there's already a driver loaded for this device */ + if (DeviceNode->Flags & DNF_ADDED) + { + /* FIXME: our drivers do not handle device removal well enough */ +#if 0 + /* Remove the device node */ + Status = IopRemoveDevice(DeviceNode); + if (NT_SUCCESS(Status)) + { + /* Invalidate device relations for the parent to reenumerate the device */ + DPRINT1("A new driver will be loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); + Status = IoInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); + } + else +#endif + { + /* A driver has already been loaded for this device */ + DPRINT("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); + DeviceNode->Problem = CM_PROB_NEED_RESTART; + } + } + else + { + /* FIXME: What if the device really is disabled? */ + DeviceNode->Flags &= ~DNF_DISABLED; + DeviceNode->Problem = 0; + + /* Load service data from the registry */ + Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + if (NT_SUCCESS(Status)) + { + /* Start the service and begin PnP initialization of the device again */ + DPRINT("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); + Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); + } + } + + return Status; +} + #ifdef DBG static PCSTR @@ -2336,6 +2387,8 @@ ActionToStr( return "PiActionEnumDeviceTree"; case PiActionEnumRootDevices: return "PiActionEnumRootDevices"; + case PiActionResetDevice: + return "PiActionResetDevice"; default: return "(request unknown)"; } @@ -2376,6 +2429,10 @@ PipDeviceActionWorker( status = PipEnumerateDevice(deviceNode); break; + case PiActionResetDevice: + status = PipResetDevice(deviceNode); + break; + default: DPRINT1("Unimplemented device action %u\n", Request->Action); status = STATUS_NOT_IMPLEMENTED; diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 968c6804b86..933e514d9f9 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -1037,8 +1037,7 @@ static NTSTATUS IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData) { PDEVICE_OBJECT DeviceObject; - PDEVICE_NODE DeviceNode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; UNICODE_STRING DeviceInstance; Status = IopCaptureUnicodeString(&DeviceInstance, &ResetDeviceData->DeviceInstance); @@ -1060,48 +1059,7 @@ IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData) return STATUS_NO_SUCH_DEVICE; } - /* Get the device node */ - DeviceNode = IopGetDeviceNode(DeviceObject); - - ASSERT(DeviceNode->Flags & DNF_ENUMERATED); - ASSERT(DeviceNode->Flags & DNF_PROCESSED); - - /* Check if there's already a driver loaded for this device */ - if (DeviceNode->Flags & DNF_ADDED) - { -#if 0 - /* Remove the device node */ - Status = IopRemoveDevice(DeviceNode); - if (NT_SUCCESS(Status)) - { - /* Invalidate device relations for the parent to reenumerate the device */ - DPRINT1("A new driver will be loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); - Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); - } - else -#endif - { - /* A driver has already been loaded for this device */ - DPRINT("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); - DeviceNode->Problem = CM_PROB_NEED_RESTART; - } - } - else - { - /* FIXME: What if the device really is disabled? */ - DeviceNode->Flags &= ~DNF_DISABLED; - DeviceNode->Problem = 0; - - /* Load service data from the registry */ - Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); - - if (NT_SUCCESS(Status)) - { - /* Start the service and begin PnP initialization of the device again */ - DPRINT("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); - Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); - } - } + Status = PiPerformSyncDeviceAction(DeviceObject, PiActionResetDevice); ObDereferenceObject(DeviceObject);

1 0

[reactos] 03/04: [HALX86] Report HAL root device to the stack before passing it to the driver PnP manager now correctly delays device actions if needed, so this can be safely done as a one operation (IoReportDetectedDevice itself creates a PDO for us if not passed)
by Victor Perevertkin 21 Aug '20

21 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8aff2c9de7cf45dd306e4… commit 8aff2c9de7cf45dd306e447b0c27a379f827fe4c Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Jun 24 19:37:20 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 21 08:19:53 2020 +0300 [HALX86] Report HAL root device to the stack before passing it to the driver PnP manager now correctly delays device actions if needed, so this can be safely done as a one operation (IoReportDetectedDevice itself creates a PDO for us if not passed) CORE-10456 --- hal/halx86/acpi/halpnpdd.c | 27 +++++++++------------------ hal/halx86/legacy/halpnpdd.c | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/hal/halx86/acpi/halpnpdd.c b/hal/halx86/acpi/halpnpdd.c index 0719e7ebcb0..beec1190f76 100644 --- a/hal/halx86/acpi/halpnpdd.c +++ b/hal/halx86/acpi/halpnpdd.c @@ -862,14 +862,15 @@ HalpDriverEntry(IN PDRIVER_OBJECT DriverObject, DriverObject->MajorFunction[IRP_MJ_POWER] = HalpDispatchPower; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HalpDispatchWmi; - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - 0, - NULL, - FILE_DEVICE_CONTROLLER, - 0, - FALSE, - &TargetDevice); + /* Create the PDO and tell the PnP manager about us*/ + Status = IoReportDetectedDevice(DriverObject, + InterfaceTypeUndefined, + -1, + -1, + NULL, + NULL, + FALSE, + &TargetDevice); if (!NT_SUCCESS(Status)) return Status; @@ -883,16 +884,6 @@ HalpDriverEntry(IN PDRIVER_OBJECT DriverObject, return Status; } - /* Tell the PnP manager about us */ - Status = IoReportDetectedDevice(DriverObject, - InterfaceTypeUndefined, - -1, - -1, - NULL, - NULL, - FALSE, - &TargetDevice); - /* Return to kernel */ return Status; } diff --git a/hal/halx86/legacy/halpnpdd.c b/hal/halx86/legacy/halpnpdd.c index 5f84e03a684..4bf1ff3f18d 100644 --- a/hal/halx86/legacy/halpnpdd.c +++ b/hal/halx86/legacy/halpnpdd.c @@ -888,14 +888,15 @@ HalpDriverEntry(IN PDRIVER_OBJECT DriverObject, DriverObject->MajorFunction[IRP_MJ_POWER] = HalpDispatchPower; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HalpDispatchWmi; - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - 0, - NULL, - FILE_DEVICE_CONTROLLER, - 0, - FALSE, - &TargetDevice); + /* Create the PDO and tell the PnP manager about us*/ + Status = IoReportDetectedDevice(DriverObject, + InterfaceTypeUndefined, + -1, + -1, + NULL, + NULL, + FALSE, + &TargetDevice); if (!NT_SUCCESS(Status)) return Status; @@ -909,16 +910,6 @@ HalpDriverEntry(IN PDRIVER_OBJECT DriverObject, return Status; } - /* Tell the PnP manager about us */ - Status = IoReportDetectedDevice(DriverObject, - InterfaceTypeUndefined, - -1, - -1, - NULL, - NULL, - FALSE, - &TargetDevice); - /* Return to kernel */ return Status; }

1 0

[reactos] 02/04: [NTOS:IO] Enumerate devices only inside the PipDeviceActionWorker Introduce the PiPerformSyncDeviceAction routine for queuing synchronous device actions Change all kernel code to use PiPerformSyncDeviceAction and PiQueueDeviceAction for device enumeration
by Victor Perevertkin 21 Aug '20

21 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2839c850927ce52e59673… commit 2839c850927ce52e59673dd9b04ffd19c96d44c5 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Jun 24 19:34:44 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 21 08:02:26 2020 +0300 [NTOS:IO] Enumerate devices only inside the PipDeviceActionWorker Introduce the PiPerformSyncDeviceAction routine for queuing synchronous device actions Change all kernel code to use PiPerformSyncDeviceAction and PiQueueDeviceAction for device enumeration CORE-10456 --- hal/halx86/acpi/halpnpdd.c | 4 +- hal/halx86/legacy/halpnpdd.c | 2 +- ntoskrnl/include/internal/io.h | 10 ++-- ntoskrnl/io/iomgr/driver.c | 12 +++++ ntoskrnl/io/iomgr/iomgr.c | 3 -- ntoskrnl/io/iomgr/ramdisk.c | 10 ++++ ntoskrnl/io/pnpmgr/devaction.c | 102 +++++++++++++++++++++++++++++++++++------ ntoskrnl/io/pnpmgr/plugplay.c | 2 +- ntoskrnl/io/pnpmgr/pnpinit.c | 7 +++ ntoskrnl/io/pnpmgr/pnpmgr.c | 13 +++++- 10 files changed, 139 insertions(+), 26 deletions(-) diff --git a/hal/halx86/acpi/halpnpdd.c b/hal/halx86/acpi/halpnpdd.c index cc30284d513..0719e7ebcb0 100644 --- a/hal/halx86/acpi/halpnpdd.c +++ b/hal/halx86/acpi/halpnpdd.c @@ -99,8 +99,8 @@ HalpReportDetectedDevices(IN PDRIVER_OBJECT DriverObject, DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); } - /* This will synchronously load the ACPI driver (needed because we're critical for boot) */ - IoSynchronousInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); + /* This will load the ACPI driver (IO initialization will wait for this operation to finish) */ + IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); } NTSTATUS diff --git a/hal/halx86/legacy/halpnpdd.c b/hal/halx86/legacy/halpnpdd.c index 084ae866add..5f84e03a684 100644 --- a/hal/halx86/legacy/halpnpdd.c +++ b/hal/halx86/legacy/halpnpdd.c @@ -91,7 +91,7 @@ HalpReportDetectedDevices(IN PDRIVER_OBJECT DriverObject, PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; /* Invalidate device relations since we added a new device */ - IoSynchronousInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); + IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); } NTSTATUS diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 2d3c53fec24..4e810bc34fe 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -687,11 +687,6 @@ IopActionInitChildServices( IN PVOID Context ); -NTSTATUS -IopEnumerateDevice( - IN PDEVICE_OBJECT DeviceObject -); - NTSTATUS IoCreateDriverList( VOID @@ -1424,6 +1419,11 @@ PiQueueDeviceAction( _In_opt_ PKEVENT CompletionEvent, _Out_opt_ NTSTATUS *CompletionStatus); +NTSTATUS +PiPerformSyncDeviceAction( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ DEVICE_ACTION Action); + // // Global I/O Data // diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 8e0bea4092f..8727c26330f 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -35,6 +35,8 @@ POBJECT_TYPE IoDriverObjectType = NULL; extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; +extern BOOLEAN PnPBootDriversLoaded; +extern KEVENT PiEnumerationFinished; USHORT IopGroupIndex; PLIST_ENTRY IopGroupTable; @@ -1125,6 +1127,13 @@ IopInitializeBootDrivers(VOID) } } + /* HAL Root Bus is being initialized before loading the boot drivers so this may cause issues + * when some devices are not being initialized with their drivers. This flag is used to delay + * all actions with devices (except PnP root device) until boot drivers are loaded. + * See PiQueueDeviceAction function + */ + PnPBootDriversLoaded = TRUE; + /* In old ROS, the loader list became empty after this point. Simulate. */ InitializeListHead(&KeLoaderBlock->LoadOrderListHead); } @@ -1478,6 +1487,9 @@ IopReinitializeBootDrivers(VOID) Entry = ExInterlockedRemoveHeadList(&DriverBootReinitListHead, &DriverBootReinitListLock); } + + /* Wait for all device actions being finished*/ + KeWaitForSingleObject(&PiEnumerationFinished, Executive, KernelMode, FALSE, NULL); } NTSTATUS diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 2aadf7a7502..d815dda0c3b 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -581,9 +581,6 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return FALSE; } - /* Initialize PnP root relations */ - IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); - #if !defined(_WINKD_) && defined(KDBG) /* Read KDB Data */ KdbInit(); diff --git a/ntoskrnl/io/iomgr/ramdisk.c b/ntoskrnl/io/iomgr/ramdisk.c index 67ec971982a..fd78ddf4601 100644 --- a/ntoskrnl/io/iomgr/ramdisk.c +++ b/ntoskrnl/io/iomgr/ramdisk.c @@ -14,6 +14,10 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +extern KEVENT PiEnumerationFinished; + /* DATA ***********************************************************************/ #if defined (ALLOC_PRAGMA) @@ -268,6 +272,12 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock) IoCreateSymbolicLink(&DriveLetter, &DeviceString); } + // + // Wait for ramdisk relations being initialized + // + + KeWaitForSingleObject(&PiEnumerationFinished, Executive, KernelMode, FALSE, NULL); + // // We made it // diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 75390c47cbd..77b9990f35b 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -5,6 +5,22 @@ * COPYRIGHT: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * 2007 Hervé Poussineau (hpoussin(a)reactos.org) * 2014-2017 Thomas Faber (thomas.faber(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) + */ + +/* Device tree is a resource shared among all system services: hal, kernel, drivers etc. + * Thus all code which interacts with the tree needs to be synchronized. + * Here it's done via a list of DEVICE_ACTION_REQUEST structures, which represents + * the device action queue. It is being processed exclusively by the PipDeviceActionWorker. + * + * Operation queuing can be done with the PiQueueDeviceAction function or with + * the PiPerfomSyncDeviceAction for synchronous operations. + * All device manipulation like starting, removing, enumeration (see DEVICE_ACTION enum) + * have to be done with the PiQueueDeviceAction in order to avoid race conditions. + * + * Note: there is one special operation here - PiActionEnumRootDevices. It is meant to be done + * during initialization process (and be the first device tree operation executed) and + * is always executed synchronously. */ /* INCLUDES ******************************************************************/ @@ -18,6 +34,7 @@ extern ERESOURCE IopDriverLoadResource; extern BOOLEAN PnpSystemInit; extern PDEVICE_NODE IopRootDeviceNode; +extern BOOLEAN PnPBootDriversLoaded; #define MAX_DEVICE_ID_LEN 200 #define MAX_SEPARATORS_INSTANCEID 0 @@ -29,6 +46,7 @@ LIST_ENTRY IopDeviceActionRequestList; WORK_QUEUE_ITEM IopDeviceActionWorkItem; BOOLEAN IopDeviceActionInProgress; KSPIN_LOCK IopDeviceActionLock; +KEVENT PiEnumerationFinished; /* TYPES *********************************************************************/ @@ -1349,7 +1367,7 @@ IopStartAndEnumerateDevice(IN PDEVICE_NODE DeviceNode) (DeviceNode->Flags & DNF_NEED_ENUMERATION_ONLY)) { /* Enumerate us */ - IoSynchronousInvalidateDeviceRelations(DeviceObject, BusRelations); + IoInvalidateDeviceRelations(DeviceObject, BusRelations); Status = STATUS_SUCCESS; } else @@ -2060,12 +2078,11 @@ IopInitializePnpServices(IN PDEVICE_NODE DeviceNode) return IopTraverseDeviceTree(&Context); } - +static NTSTATUS -IopEnumerateDevice( - IN PDEVICE_OBJECT DeviceObject) +PipEnumerateDevice( + _In_ PDEVICE_NODE DeviceNode) { - PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); DEVICETREE_TRAVERSE_CONTEXT Context; PDEVICE_RELATIONS DeviceRelations; PDEVICE_OBJECT ChildDeviceObject; @@ -2075,13 +2092,11 @@ IopEnumerateDevice( NTSTATUS Status; 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"); + DPRINT("Sending GUID_DEVICE_ARRIVAL %wZ\n", &DeviceNode->InstancePath); IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, &DeviceNode->InstancePath); } @@ -2091,11 +2106,11 @@ IopEnumerateDevice( Stack.Parameters.QueryDeviceRelations.Type = BusRelations; Status = IopInitiatePnpIrp( - DeviceObject, + DeviceNode->PhysicalDeviceObject, &IoStatusBlock, IRP_MN_QUERY_DEVICE_RELATIONS, &Stack); - if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + if (!NT_SUCCESS(Status)) { DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); return Status; @@ -2344,23 +2359,46 @@ PipDeviceActionWorker( KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); Request = CONTAINING_RECORD(ListEntry, DEVICE_ACTION_REQUEST, RequestListEntry); + ASSERT(Request->DeviceObject); + + PDEVICE_NODE deviceNode = IopGetDeviceNode(Request->DeviceObject); + ASSERT(deviceNode); + + NTSTATUS status = STATUS_SUCCESS; + + DPRINT("Processing PnP request %p: DeviceObject - %p, Action - %s\n", + Request, Request->DeviceObject, ActionToStr(Request->Action)); + switch (Request->Action) { + case PiActionEnumRootDevices: case PiActionEnumDeviceTree: - // this will be reworked in next commits - IoSynchronousInvalidateDeviceRelations(Request->DeviceObject, BusRelations); + status = PipEnumerateDevice(deviceNode); break; default: DPRINT1("Unimplemented device action %u\n", Request->Action); + status = STATUS_NOT_IMPLEMENTED; break; } + if (Request->CompletionStatus) + { + *Request->CompletionStatus = status; + } + + if (Request->CompletionEvent) + { + KeSetEvent(Request->CompletionEvent, IO_NO_INCREMENT, FALSE); + } + + DPRINT("Finished processing PnP request %p\n", Request); ObDereferenceObject(Request->DeviceObject); ExFreePoolWithTag(Request, TAG_IO); KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); } IopDeviceActionInProgress = FALSE; + KeSetEvent(&PiEnumerationFinished, IO_NO_INCREMENT, FALSE); KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); } @@ -2402,14 +2440,52 @@ PiQueueDeviceAction( KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); InsertTailList(&IopDeviceActionRequestList, &Request->RequestListEntry); - if (IopDeviceActionInProgress) + + if (Action == PiActionEnumRootDevices) + { + ASSERT(!IopDeviceActionInProgress); + + IopDeviceActionInProgress = TRUE; + KeClearEvent(&PiEnumerationFinished); + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); + + PipDeviceActionWorker(NULL); + return; + } + + if (IopDeviceActionInProgress || !PnPBootDriversLoaded) { KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); return; } IopDeviceActionInProgress = TRUE; + KeClearEvent(&PiEnumerationFinished); KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); ExInitializeWorkItem(&IopDeviceActionWorkItem, PipDeviceActionWorker, NULL); ExQueueWorkItem(&IopDeviceActionWorkItem, DelayedWorkQueue); } + +/** + * @brief Perfom a device operation synchronously via PiQueueDeviceAction + * + * @param[in] DeviceObject The device object + * @param[in] Action The action + * + * @return Status of the operation + */ + +NTSTATUS +PiPerformSyncDeviceAction( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ DEVICE_ACTION Action) +{ + KEVENT opFinished; + NTSTATUS status; + + KeInitializeEvent(&opFinished, SynchronizationEvent, FALSE); + PiQueueDeviceAction(DeviceObject, Action, &opFinished, &status); + KeWaitForSingleObject(&opFinished, Executive, KernelMode, FALSE, NULL); + + return status; +} diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 96bac114d27..968c6804b86 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -215,7 +215,7 @@ IopPnpEnumerateDevice(PPLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA DeviceData) return STATUS_NO_SUCH_DEVICE; } - Status = IopEnumerateDevice(DeviceObject); + Status = PiPerformSyncDeviceAction(DeviceObject, PiActionEnumDeviceTree); ObDereferenceObject(DeviceObject); diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c index a32192bcc39..b4c99683609 100644 --- a/ntoskrnl/io/pnpmgr/pnpinit.c +++ b/ntoskrnl/io/pnpmgr/pnpinit.c @@ -23,6 +23,7 @@ typedef struct _IOPNP_DEVICE_EXTENSION PUNICODE_STRING PiInitGroupOrderTable; USHORT PiInitGroupOrderTableCount; INTERFACE_TYPE PnpDefaultInterfaceType; +BOOLEAN PnPBootDriversLoaded = FALSE; ARBITER_INSTANCE IopRootBusNumberArbiter; ARBITER_INSTANCE IopRootIrqArbiter; @@ -30,6 +31,8 @@ ARBITER_INSTANCE IopRootDmaArbiter; ARBITER_INSTANCE IopRootMemArbiter; ARBITER_INSTANCE IopRootPortArbiter; +extern KEVENT PiEnumerationFinished; + NTSTATUS NTAPI IopPortInitialize(VOID); NTSTATUS NTAPI IopMemInitialize(VOID); NTSTATUS NTAPI IopDmaInitialize(VOID); @@ -438,6 +441,7 @@ IopInitializePlugPlayServices(VOID) KeInitializeSpinLock(&IopDeviceTreeLock); KeInitializeSpinLock(&IopDeviceActionLock); InitializeListHead(&IopDeviceActionRequestList); + KeInitializeEvent(&PiEnumerationFinished, NotificationEvent, TRUE); /* Get the default interface */ PnpDefaultInterfaceType = IopDetermineDefaultInterfaceType(); @@ -597,6 +601,9 @@ IopInitializePlugPlayServices(VOID) /* Close the handle to the control set */ NtClose(KeyHandle); + /* Initialize PnP root relations (this is a syncronous operation) */ + PiQueueDeviceAction(IopRootDeviceNode->PhysicalDeviceObject, PiActionEnumRootDevices, NULL, NULL); + /* We made it */ return STATUS_SUCCESS; } diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 443c3ab7b35..7ed3eee62a0 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -18,6 +18,7 @@ ERESOURCE PpRegistryDeviceResource; KGUARDED_MUTEX PpDeviceReferenceTableLock; RTL_AVL_TABLE PpDeviceReferenceTable; +BOOLEAN PnPBootDriversLoaded; extern ULONG ExpInitializationPhase; @@ -2474,6 +2475,11 @@ IoInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN DEVICE_RELATION_TYPE Type) { + if (!IopIsValidPhysicalDeviceObject(DeviceObject)) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG_PTR)DeviceObject, 0, 0); + } + switch (Type) { case BusRelations: @@ -2497,11 +2503,16 @@ IoSynchronousInvalidateDeviceRelations( { PAGED_CODE(); + if (!IopIsValidPhysicalDeviceObject(DeviceObject)) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x2, (ULONG_PTR)DeviceObject, 0, 0); + } + switch (Type) { case BusRelations: /* Enumerate the device */ - return IopEnumerateDevice(DeviceObject); + return PiPerformSyncDeviceAction(DeviceObject, PiActionEnumDeviceTree); case PowerRelations: /* Not handled yet */ return STATUS_NOT_IMPLEMENTED;

1 0

[reactos] 01/04: [NTOS:IO] change DEVICE_ACTION values and rename functions
by Victor Perevertkin 21 Aug '20

21 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ed132e90e5390ff1935a… commit 2ed132e90e5390ff1935a7e2c1019ec231de03bb Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Jun 24 04:49:18 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 21 07:48:56 2020 +0300 [NTOS:IO] change DEVICE_ACTION values and rename functions --- ntoskrnl/include/internal/io.h | 28 ++++------- ntoskrnl/io/pnpmgr/devaction.c | 102 ++++++++++++++++++++++++++++------------- ntoskrnl/io/pnpmgr/pnpmgr.c | 17 ++++--- 3 files changed, 89 insertions(+), 58 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 3f801a0f647..2d3c53fec24 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -539,28 +539,14 @@ typedef enum _SECURITY_DESCRIPTOR_TYPE } SECURITY_DESCRIPTOR_TYPE, *PSECURITY_DESCRIPTOR_TYPE; // -// Action types and data for IopQueueDeviceAction() +// Action types and data for PiQueueDeviceAction() // typedef enum _DEVICE_ACTION { - DeviceActionInvalidateDeviceRelations, - MaxDeviceAction + PiActionEnumDeviceTree, + PiActionEnumRootDevices } DEVICE_ACTION; -typedef struct _DEVICE_ACTION_DATA -{ - LIST_ENTRY RequestListEntry; - PDEVICE_OBJECT DeviceObject; - DEVICE_ACTION Action; - union - { - struct - { - DEVICE_RELATION_TYPE Type; - } InvalidateDeviceRelations; - }; -} DEVICE_ACTION_DATA, *PDEVICE_ACTION_DATA; - // // Resource code // @@ -1432,9 +1418,11 @@ IopStoreSystemPartitionInformation(IN PUNICODE_STRING NtSystemPartitionDeviceNam // Device action // VOID -IopQueueDeviceAction( - _In_ PDEVICE_ACTION_DATA ActionData -); +PiQueueDeviceAction( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ DEVICE_ACTION Action, + _In_opt_ PKEVENT CompletionEvent, + _Out_opt_ NTSTATUS *CompletionStatus); // // Global I/O Data diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 16877098994..75390c47cbd 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -30,6 +30,17 @@ WORK_QUEUE_ITEM IopDeviceActionWorkItem; BOOLEAN IopDeviceActionInProgress; KSPIN_LOCK IopDeviceActionLock; +/* TYPES *********************************************************************/ + +typedef struct _DEVICE_ACTION_REQUEST +{ + LIST_ENTRY RequestListEntry; + PDEVICE_OBJECT DeviceObject; + PKEVENT CompletionEvent; + NTSTATUS *CompletionStatus; + DEVICE_ACTION Action; +} DEVICE_ACTION_REQUEST, *PDEVICE_ACTION_REQUEST; + /* FUNCTIONS *****************************************************************/ PDEVICE_OBJECT @@ -2298,14 +2309,32 @@ cleanup: &DeviceNode->InstancePath); } +#ifdef DBG +static +PCSTR +ActionToStr( + _In_ DEVICE_ACTION Action) +{ + switch (Action) + { + case PiActionEnumDeviceTree: + return "PiActionEnumDeviceTree"; + case PiActionEnumRootDevices: + return "PiActionEnumRootDevices"; + default: + return "(request unknown)"; + } +} +#endif + static VOID NTAPI -IopDeviceActionWorker( - _In_ PVOID Context) +PipDeviceActionWorker( + _In_opt_ PVOID Context) { PLIST_ENTRY ListEntry; - PDEVICE_ACTION_DATA Data; + PDEVICE_ACTION_REQUEST Request; KIRQL OldIrql; KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); @@ -2313,52 +2342,66 @@ IopDeviceActionWorker( { ListEntry = RemoveHeadList(&IopDeviceActionRequestList); KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); - Data = CONTAINING_RECORD(ListEntry, - DEVICE_ACTION_DATA, - RequestListEntry); + Request = CONTAINING_RECORD(ListEntry, DEVICE_ACTION_REQUEST, RequestListEntry); - switch (Data->Action) + switch (Request->Action) { - case DeviceActionInvalidateDeviceRelations: - IoSynchronousInvalidateDeviceRelations(Data->DeviceObject, - Data->InvalidateDeviceRelations.Type); + case PiActionEnumDeviceTree: + // this will be reworked in next commits + IoSynchronousInvalidateDeviceRelations(Request->DeviceObject, BusRelations); break; default: - DPRINT1("Unimplemented device action %u\n", Data->Action); + DPRINT1("Unimplemented device action %u\n", Request->Action); break; } - ObDereferenceObject(Data->DeviceObject); - ExFreePoolWithTag(Data, TAG_IO); + ObDereferenceObject(Request->DeviceObject); + ExFreePoolWithTag(Request, TAG_IO); KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); } IopDeviceActionInProgress = FALSE; KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); } +/** + * @brief Queue a device operation to a worker thread. + * + * @param[in] DeviceObject The device object + * @param[in] Action The action + * @param[in] CompletionEvent The completion event object (optional) + * @param[out] CompletionStatus Status returned be the action will be written here + */ + VOID -IopQueueDeviceAction( - _In_ PDEVICE_ACTION_DATA ActionData) +PiQueueDeviceAction( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ DEVICE_ACTION Action, + _In_opt_ PKEVENT CompletionEvent, + _Out_opt_ NTSTATUS *CompletionStatus) { - PDEVICE_ACTION_DATA Data; + PDEVICE_ACTION_REQUEST Request; KIRQL OldIrql; - DPRINT("IopQueueDeviceAction(%p)\n", ActionData); - - Data = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DEVICE_ACTION_DATA), - TAG_IO); - if (!Data) + Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_IO); + if (!Request) + { + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x3, 0, 0, 0); return; + } - ObReferenceObject(ActionData->DeviceObject); - RtlCopyMemory(Data, ActionData, sizeof(DEVICE_ACTION_DATA)); + DPRINT("PiQueueDeviceAction: DeviceObject - %p, Request - %p, Action - %s\n", + DeviceObject, Request, ActionToStr(Action)); - DPRINT("Action %u\n", Data->Action); + ObReferenceObject(DeviceObject); + + Request->DeviceObject = DeviceObject; + Request->Action = Action; + Request->CompletionEvent = CompletionEvent; + Request->CompletionStatus = CompletionStatus; KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); - InsertTailList(&IopDeviceActionRequestList, &Data->RequestListEntry); + InsertTailList(&IopDeviceActionRequestList, &Request->RequestListEntry); if (IopDeviceActionInProgress) { KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); @@ -2367,9 +2410,6 @@ IopQueueDeviceAction( IopDeviceActionInProgress = TRUE; KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); - ExInitializeWorkItem(&IopDeviceActionWorkItem, - IopDeviceActionWorker, - NULL); - ExQueueWorkItem(&IopDeviceActionWorkItem, - DelayedWorkQueue); + ExInitializeWorkItem(&IopDeviceActionWorkItem, PipDeviceActionWorker, NULL); + ExQueueWorkItem(&IopDeviceActionWorkItem, DelayedWorkQueue); } diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 8b9c92ca466..443c3ab7b35 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -2474,13 +2474,16 @@ IoInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN DEVICE_RELATION_TYPE Type) { - DEVICE_ACTION_DATA ActionData; - - ActionData.DeviceObject = DeviceObject; - ActionData.Action = DeviceActionInvalidateDeviceRelations; - ActionData.InvalidateDeviceRelations.Type = Type; - - IopQueueDeviceAction(&ActionData); + switch (Type) + { + case BusRelations: + /* Enumerate the device */ + PiQueueDeviceAction(DeviceObject, PiActionEnumDeviceTree, NULL, NULL); + break; + default: + /* Everything else is not implemented */ + break; + } } /*

1 0

[reactos] 01/01: [CMD] Update Polish (pl-PL) translation (#3082)
by Adam Stachowicz 20 Aug '20

20 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca68686a98f5e19c2282d… commit ca68686a98f5e19c2282d89aff7f084832a018bc Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Thu Aug 20 09:25:52 2020 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 20 12:25:52 2020 +0300 [CMD] Update Polish (pl-PL) translation (#3082) Addendum to 7c175d4. --- base/shell/cmd/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index f079d3e3213..ef56df34093 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -523,7 +523,7 @@ title nowy tytuł okna\n" STRING_ERROR_CANNOTPIPE "Błąd potoków! Nie można otworzyć pliku tymczasowego.\n" STRING_ERROR_D_PAUSEMSG "Naciśnij dowolny klawisz, aby kontynuować . . . " STRING_ERROR_DRIVER_NOT_READY "Napęd nie jest gotowy" - STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" + STRING_SET_ENV_ERROR "Zmienna środowiskowa '%s' nie jest zdefiniowana\n" STRING_REPLACE_ERROR1 "Nieprawidłowy parametr - %s\n" STRING_REPLACE_ERROR2 "Ścieżka nie została odnaleziona - %s\n" STRING_REPLACE_ERROR3 "Nazwa pliku, katalogu lub napędu nie jest prawidłowa.\n"

1 0

[reactos] 01/01: [NTUSER] Improve SPI_SETWORKAREA setting (#3061)
by Katayama Hirofumi MZ 20 Aug '20

20 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dce62240f12e40736be23… commit dce62240f12e40736be2341e14ca7e8ba7fe2c26 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 20 11:31:57 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 20 11:31:57 2020 +0900 [NTUSER] Improve SPI_SETWORKAREA setting (#3061) CORE-12018, CORE-7237 --- win32ss/user/ntuser/sysparams.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 48fc5dd2085..3907b17aff7 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -1048,27 +1048,33 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) case SPI_SETWORKAREA: { - /* FIXME: We should set the work area of the monitor - that contains the specified rectangle */ - PMONITOR pmonitor = UserGetPrimaryMonitor(); - RECT rcWorkArea; + PMONITOR pmonitor; + RECTL rcWorkArea, rcIntersect; - if(!pmonitor) + if (!pvParam) + return 0; + + RtlCopyMemory(&rcWorkArea, pvParam, sizeof(rcWorkArea)); + + /* fail if empty */ + if (RECTL_bIsEmptyRect(&rcWorkArea)) return 0; - if (!SpiSet(&rcWorkArea, pvParam, sizeof(RECTL), fl)) + /* get the nearest monitor */ + pmonitor = UserMonitorFromRect(&rcWorkArea, MONITOR_DEFAULTTONEAREST); + if (!pmonitor) return 0; - /* Verify the new values */ - if (rcWorkArea.left < 0 || - rcWorkArea.top < 0 || - rcWorkArea.right > gpsi->aiSysMet[SM_CXSCREEN] || - rcWorkArea.bottom > gpsi->aiSysMet[SM_CYSCREEN] || - rcWorkArea.right <= rcWorkArea.left || - rcWorkArea.bottom <= rcWorkArea.top) + /* fail unless work area is completely in monitor */ + if (!RECTL_bIntersectRect(&rcIntersect, &pmonitor->rcMonitor, &rcWorkArea) || + !RtlEqualMemory(&rcIntersect, &rcWorkArea, sizeof(rcIntersect))) + { + return 0; + } + + if (!SpiSet(&pmonitor->rcWork, pvParam, sizeof(RECTL), fl)) return 0; - pmonitor->rcWork = rcWorkArea; if (fl & SPIF_UPDATEINIFILE) { // FIXME: What to do?

1 0

[reactos] 01/01: [CMD] Update Russian (ru-RU) translation
by Stanislav Motylkov 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa120ac0cdc2a178f870c… commit fa120ac0cdc2a178f870c76d864ce605e504f180 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 20 02:04:17 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 20 02:04:17 2020 +0300 [CMD] Update Russian (ru-RU) translation Addendum to 7c175d4. --- base/shell/cmd/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 1d2dd6ccaf0..fd62af6af8c 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -528,7 +528,7 @@ RESTORE восстанавливает окно\n\ STRING_ERROR_CANNOTPIPE "Ошибка! Невозможно использовать pipe! Невозможно создать временный файл!\n" STRING_ERROR_D_PAUSEMSG "Для продолжения нажмите любую клавишу . . . " STRING_ERROR_DRIVER_NOT_READY "Устройство не готово" - STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" + STRING_SET_ENV_ERROR "Переменная окружения '%s' не определена\n" STRING_REPLACE_ERROR1 "Неверный ключ - %s\n" STRING_REPLACE_ERROR2 "Путь не найден - %s\n" STRING_REPLACE_ERROR3 "Имя файла, папки или метка диска неверная.\n"

1 0

[reactos] 04/04: [CMD] Add mention of the /Y switch in MORE command help; re-position the STRING_PAUSE_HELP1 string.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6925ca37ab583807d8abf… commit 6925ca37ab583807d8abf9faa7b82aab4317c349 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jul 31 03:32:21 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 21:39:23 2020 +0200 [CMD] Add mention of the /Y switch in MORE command help; re-position the STRING_PAUSE_HELP1 string. --- base/shell/cmd/lang/cs-CZ.rc | 10 +++++----- base/shell/cmd/lang/de-DE.rc | 10 +++++----- base/shell/cmd/lang/el-GR.rc | 10 +++++----- base/shell/cmd/lang/en-US.rc | 10 +++++----- base/shell/cmd/lang/es-ES.rc | 12 ++++++------ base/shell/cmd/lang/fr-FR.rc | 12 ++++++------ base/shell/cmd/lang/hu-HU.rc | 10 +++++----- base/shell/cmd/lang/id-ID.rc | 10 +++++----- base/shell/cmd/lang/it-IT.rc | 10 +++++----- base/shell/cmd/lang/ja-JP.rc | 10 +++++----- base/shell/cmd/lang/no-NO.rc | 10 +++++----- base/shell/cmd/lang/pl-PL.rc | 10 +++++----- base/shell/cmd/lang/ro-RO.rc | 10 +++++----- base/shell/cmd/lang/ru-RU.rc | 10 +++++----- base/shell/cmd/lang/sk-SK.rc | 10 +++++----- base/shell/cmd/lang/sq-AL.rc | 10 +++++----- base/shell/cmd/lang/sv-SE.rc | 10 +++++----- base/shell/cmd/lang/tr-TR.rc | 10 +++++----- base/shell/cmd/lang/uk-UA.rc | 10 +++++----- base/shell/cmd/lang/zh-CN.rc | 10 +++++----- base/shell/cmd/lang/zh-TW.rc | 10 +++++----- 21 files changed, 107 insertions(+), 107 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 0f788899104..dc51d57a7b7 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -270,9 +270,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ -MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] destination\n\n\ To rename a directory:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n\n\ [drive:][path]filename1 Specifies the location and name of the file\n\ or files you want to move.\n\ /N Nothing. Do everything but move files or directories.\n\n\ @@ -293,6 +293,9 @@ PATH [[drive:]path[;...]]\nPATH ;\n\n\ Type PATH ; to clear all search-path settings and direct the command shell\n\ to search only in the current directory.\n\ Type PATH without parameters to display the current path.\n" + STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Changes the command prompt.\n\n\ PROMPT [text]\n\n\ text Specifies a new command prompt.\n\n\ @@ -315,9 +318,6 @@ Prompt can be made up of normal characters and the following special codes:\n\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ $$ $ (dollar sign)\n" - STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ -'Press any key to continue...' or a user defined message.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Displays the current depth of the directory stack" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index e9afa7eefb3..11d50747609 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -264,9 +264,9 @@ Wenn weder /H noch /J angegeben werden, wird eine symbolische Verknüpfung angel STRING_MOVE_HELP1 "Überschreiben %s (Ja/Nein/Alle)? " STRING_MOVE_HELP2 "Verschiebt Dateien und benennt Dateien sowie Verzeichnisse um.\n\n\ Um eine oder mehrere Dateien zu verschieben:\n\ -MOVE [/N][Laufwerk:][Pfad]Dateiname1[,...] Ziel\n\n\ +MOVE [/N][/Y|/-Y][Laufwerk:][Pfad]Dateiname1[,...] Ziel\n\n\ Um ein Verzeichnis umzubenennen:\n\ -MOVE [/N][Laufwerk:][Pfad]Verzeichnis1 Verzeichnis2\n\n\ +MOVE [/N][/Y|/-Y][Laufwerk:][Pfad]Verzeichnis1 Verzeichnis2\n\n\ [Laufwerk:][Pfad]Datei1 Bezeichnet den Pfad und den Namen der zu\n\ verschiebenden Datei(en).\n\ /N Nichts. Tut alles außer Dateien/Verzeichnisse verschieben.\n\n\ @@ -287,6 +287,9 @@ PATH [[Laufwerk:]Pfad[;...]]\nPATH ;\n\n\ PATH ; Löscht den Suchpfad und lässt CMD.EXE nur in dem aktuellen\n\ Verzeichnis suchen.\n\ PATH Ohne Parameter zeigt den aktuellen Pfad an.\n" + STRING_PAUSE_HELP1 "Hält die Ausführung einer Batchdatei an und zeigt folgende Meldung oder eine benutzerdefinierte Nachricht an:\n\ +'Drücken Sie eine beliebige Taste . . .'.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Ändert die Eingabeaufforderung.\n\n\ PROMPT [Text]\n\n\ Text Bezeichnet die neue Eingabeaufforderung.\n\n\ @@ -309,9 +312,6 @@ Sie kann aus normalen Zeichen und folgenden Sonderzeichen bestehen:\n\n\ $V Betriebssystem-Versionsnummer\n\ $_ Wagenrücklauf und Zeilenvorschub\n\ $$ $ (Dollarzeichen)" - STRING_PAUSE_HELP1 "Hält die Ausführung einer Batchdatei an und zeigt folgende Meldung oder eine benutzerdefinierte Nachricht an:\n\ -'Drücken Sie eine beliebige Taste . . .'.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Zeigt die aktuelle Tiefe des Verzeichnis-Stacks an" STRING_PROMPT_HELP3 "\n 'PROMPT' setzt die Prompt auf die Standardwerte zurück." STRING_REM_HELP "Leitet Kommentare in einer Batchdatei ein.\n\nREM [Kommentar]" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 1714f763af1..46afb8885b9 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -269,9 +269,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ -MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] destination\n\n\ To rename a directory:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n\n\ [drive:][path]filename1 Specifies the location and name of the file\n\ or files you want to move.\n\ /N Nothing. Do everything but move files or directories.\n\n\ @@ -292,6 +292,9 @@ PATH [[drive:]path[;...]]\nPATH ;\n\n\ Type PATH ; to clear all search-path settings and direct the command shell\n\ to search only in the current directory.\n\ Type PATH without parameters to display the current path.\n" + STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Changes the command prompt.\n\n\ PROMPT [text]\n\n\ text Specifies a new command prompt.\n\n\ @@ -314,9 +317,6 @@ Prompt can be made up of normal characters and the following special codes:\n\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ $$ $ (dollar sign)\n" - STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ -'Press any key to continue...' or a user defined message.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Displays the current depth of the directory stack" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 2286203a633..405fd9d36c4 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -265,9 +265,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ -MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] destination\n\n\ To rename a directory:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n\n\ [drive:][path]filename1 Specifies the location and name of the file\n\ or files you want to move.\n\ /N Nothing. Do everything but move files or directories.\n\n\ @@ -288,6 +288,9 @@ PATH [[drive:]path[;...]]\nPATH ;\n\n\ Type PATH ; to clear all search-path settings and direct the command shell\n\ to search only in the current directory.\n\ Type PATH without parameters to display the current path.\n" + STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Changes the command prompt.\n\n\ PROMPT [text]\n\n\ text Specifies a new command prompt.\n\n\ @@ -310,9 +313,6 @@ Prompt can be made up of normal characters and the following special codes:\n\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ $$ $ (dollar sign)\n" - STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ -'Press any key to continue...' or a user defined message.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Displays the current depth of the directory stack" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index cf18bec6044..6d8a4a48002 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -267,9 +267,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "¿Sobreescribir %s (Si/No/Todos)? " STRING_MOVE_HELP2 "Mueve archivos y renombra archivos y directorios.\n\n\ Para mover uno o más archivos:\n\ -MOVE [/N][unidad:][ruta]archivo1[,...] destino\n\n\ +MOVE [/N][/Y|/-Y][unidad:][ruta]archivo1[,...] destino\n\n\ Para renombrar un directorio:\n\ -MOVE [/N][unidad:][ruta]directorio1 directorio2\n\n\ +MOVE [/N][/Y|/-Y][unidad:][ruta]directorio1 directorio2\n\n\ [unidad:][ruta]archivo1 Especifica la localización y el nombre del archivo\n\ o archivos que quieres mover.\n\ /N Nada. Hace todo menos mover archivos o directorios.\n\n\ @@ -290,6 +290,10 @@ PATH [[unidad:]ruta[;...]]\nRuta ;\n\n\ Escribe PATH ; para limpiar todas las configuraciones de búsqueda y usar solo el\n\ directorio actual del interprete de comandos.\n\ Escribe PATH sin parámetros para mostrar la ruta actual.\n" + STRING_PAUSE_HELP1 "Detiene la ejecución del archivo por lotes actual y muestra el\n\ +siguiente mensaje:\n\ +'Pulsa cualquier tecla para continuar...' o un mensaje definido por el usuario.\n\n\ +PAUSE [mensaje]" STRING_PROMPT_HELP1 "Cambia el símbolo de comandos.\n\n\ PROMPT [texto]\n\n\ texto Epecifica un nuevo símbolo de comandos.\n\n\ @@ -313,10 +317,6 @@ códigos especiales:\n\n\ $V Número de versión del SO\n\ $_ Salto de linea\n\ $$ $ (signo del dolar)\n" - STRING_PAUSE_HELP1 "Detiene la ejecución del archivo por lotes actual y muestra el\n\ -siguiente mensaje:\n\ -'Pulsa cualquier tecla para continuar...' o un mensaje definido por el usuario.\n\n\ -PAUSE [mensaje]" STRING_PROMPT_HELP2 " $+ Muestra la profundidad actual de la pila de directorios" STRING_PROMPT_HELP3 "\nEscribe PROMPT sin parámetros para resetear el símbolo de\n\ comandos a su configuración por defecto." diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 92a32cf1fa2..cc68402bcf1 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -279,9 +279,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Ecraser %s (Oui/Non/Tous) ? " STRING_MOVE_HELP2 "Déplace des fichiers ou renomme des fichiers et des répertoires.\n\n\ Pouur déplacer un ou plusieurs fichiers:\n\ -MOVE [/N][lecteur:][nomfich1[,...] destination\n\n\ +MOVE [/N][/Y|/-Y][lecteur:][nomfich1[,...] destination\n\n\ Pour renommer un répertoire:\n\ -MOVE [/N][lecteur:][chemin]nomrep1 nomrep2\n\n\ +MOVE [/N][/Y|/-Y][lecteur:][chemin]nomrep1 nomrep2\n\n\ [lecteur:][chemin]nomfich1 Indique l'endroit et le nom du ou des fichiers\n\ que vous voulez déplacer.\n\ /N Nothing. Do everything but move files or directories.\n\n\ @@ -303,6 +303,10 @@ Taper PATH ; pour effacer tous les réglages courants\n\ et indiquer à l'interpréteur de commandes\n\ de chercher seulement dans le répertoire courant.\n\ Taper PATH sans paramètres pour afficher le chemin courant.\n" + STRING_PAUSE_HELP1 "Stoppe l'exécution d'un fichier batch et affiche le message suivant:\n\ +'Appuyer sur une touche pour continuer...' ou un message défini\n\ +par l'utilisateur.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Change l'invite de commandes.\n\n\ PROMPT [texte]\n\n\ texte Indique le nouvel invite de commandes.\n\n\ @@ -326,10 +330,6 @@ des caractères spéciaux suivants:\n\n\ $V Numéro de version de ReactOS\n\ $_ Retour chariot/saut de ligne\n\ $$ $ (signe dollar)" - STRING_PAUSE_HELP1 "Stoppe l'exécution d'un fichier batch et affiche le message suivant:\n\ -'Appuyer sur une touche pour continuer...' ou un message défini\n\ -par l'utilisateur.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Affiche la hauteur de la pile de répertoires" STRING_PROMPT_HELP3 "\nTaper PROMPT sans paramètres pour changer l'invite à celui défini par défaut." STRING_REM_HELP "Démarrer une ligne de commentaire dans un fichier batch.\n\nREM [Commentaire]" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 003cf0d6c96..67d763d09b4 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -251,9 +251,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Felülírja %s (Igen/Nem/Mind)? " STRING_MOVE_HELP2 "Áthelyezi és átnevezi az állományokat a mappákban.\n\n\ Egy vagy több állomány áthelyezéséhez:\n\ -MOVE [/N][meghajtó:][elérési_út]állomány1[,...] cél\n\n\ +MOVE [/N][/Y|/-Y][meghajtó:][elérési_út]állomány1[,...] cél\n\n\ Mappa átnevezése:\n\ -MOVE [/N][meghajtó:][elérési_út]mappa1 mappa2\n\n\ +MOVE [/N][/Y|/-Y][meghajtó:][elérési_út]mappa1 mappa2\n\n\ [meghajtó:][elérési_út]állomány1 Átnevezendõ állományok forrása.\n\ /N Nem helyez át semmit.\n\n\ Hiányosságok:\n\ @@ -274,6 +274,9 @@ PATH ; Keresési útvonalak törlése\n\n\ A PATH törléséhez a következõt írd be: PATH ;\n\ Így csak az aktuális mappában fog keresni a CMD.\ Paraméterek nélkül az érvényes keresési útvonalakat mutatja meg.\n" + STRING_PAUSE_HELP1 "Felfüggeszti a futást, és vár a felhasználóra. A következõ üzenet jelenik meg:\n\ +'A folytatáshoz nyomj meg egy billentyût . . .' vagy egy általad választott üzenet.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Parancssor beállítása.\n\n\ PROMPT [szöveg]\n\n\ szöveg Az új parancssor megadása.\n\n\ @@ -296,9 +299,6 @@ A parancssor speciális kódokat is tartalmazhat:\n\n\ $V OS verziószám\n\ $_ Újsor\n\ $$ $ (dollár jel)\n" - STRING_PAUSE_HELP1 "Felfüggeszti a futást, és vár a felhasználóra. A következõ üzenet jelenik meg:\n\ -'A folytatáshoz nyomj meg egy billentyût . . .' vagy egy általad választott üzenet.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Displays the current depth of the directory stack" STRING_PROMPT_HELP3 "\nHa paraméter nélkül beírod a PROMPT parancsot, vissza áll az alapértelmezettre a kijelzés." STRING_REM_HELP "Megjegyzést jelölõ sor batch fájlokban.\n\nREM [megjegyzés]" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index befdb9a16a2..7583f29b89d 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -266,9 +266,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Timpa %s (Ya/Tidak/Semua)? " STRING_MOVE_HELP2 "Memindahkan file dan mengganti nama file dan direktori.\n\n\ Untuk memindahkan satu atau lebih file:\n\ -MOVE [/N][drive:][path]filename1[,...] tujuan\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] tujuan\n\n\ Untuk mengganti nama direktori:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n\n\ [drive:][path]filename1 Menetapkan lokasi dan nama file\n\ yang ingin anda pindahkan.\n\ /N Tidak apapun. Lakukan apapun kecuali memindahkan file dan direktori.\n\n\ @@ -289,6 +289,9 @@ PATH [[drive:]path[;...]]\nPATH ;\n\n\ Ketik PATH ; untuk membersihkan semua setelan path-pencarian dan shell\n\ perintah langsung untuk mencari hanya dalam direktori saat ini.\n\ Ketik PATH tanpa parameter untuk menampilkan path saat ini.\n" + STRING_PAUSE_HELP1 "Menunda eksekusi file batch dan menampilkan pesan berikut:\n\ +'Tekan tombol untuk melanjutkan...' atau pesan yang dibuat pengguna.\n\n\ +PAUSE [pesan]" STRING_PROMPT_HELP1 "Mengubah prompt perintah.\n\n\ PROMPT [teks]\n\n\ teks Menetapkan prompt perintah baru.\n\n\ @@ -311,9 +314,6 @@ Prompt bisa dibuat dari karakter normal dan kode spesial berikut:\n\n\ $V Nomor versi OS\n\ $_ Carriage return dan linefeed\n\ $$ $ (tanda dolar)\n" - STRING_PAUSE_HELP1 "Menunda eksekusi file batch dan menampilkan pesan berikut:\n\ -'Tekan tombol untuk melanjutkan...' atau pesan yang dibuat pengguna.\n\n\ -PAUSE [pesan]" STRING_PROMPT_HELP2 " $+ Menampilkan kedalaman tumpukan direktori saat ini" STRING_PROMPT_HELP3 "\nKetik PROMPT tanpa parameter untuk mereset prompt ke setelan standar." STRING_REM_HELP "Memulai baris komentar dalam file batch.\n\nREM [Komentar]" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index e02ad50cbd0..1db834f53d0 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -267,9 +267,9 @@ MEMORY" STRING_MOVE_HELP1 "Sovrascrivi %s (Si/No/Tutti)? " STRING_MOVE_HELP2 "Sposta i file o cambia il nome a file e cartelle.\n\n\ Per spostare uno o più file:\n\ -MOVE [/N][disco:][percorso]nomefile1[,...] destinazione\n\n\ +MOVE [/N][/Y|/-Y][disco:][percorso]nomefile1[,...] destinazione\n\n\ Per rinominare una cartella:\n\ -MOVE [/N][disco:][percorso]]cartella1 cartella2\n\n\ +MOVE [/N][/Y|/-Y][disco:][percorso]]cartella1 cartella2\n\n\ [disco:][percorso]nomefile1 indica la posizione e il nome del file\n\ o dei file da spostare.\n\ /N Nulla. Effettua il comando ma senza alterare\n\ @@ -294,6 +294,9 @@ PATH ;\n\n\ Usa PATH ; per rimuovere tutti i percorsi di ricerca e indicare all'interprete\n\ dei comandi di cercare solo nella cartella corrente\n\ PATH senza parametri visualizza i percorsi attualmente impostati.\n" + STRING_PAUSE_HELP1 "Ferma l'esecuzione del batch e mostra il seguente messaggio:\n\ +'Premi un tasto per continuare...' o il messaggio indicato.\n\n\ +PAUSE [messaggio]" STRING_PROMPT_HELP1 "Modifica il messaggio di pronto a eseguire comandi.\n\n\ PROMPT [testo]\n\n\ testo Indica il nuovo messaggio.\n\n\ @@ -316,9 +319,6 @@ Può essere composto da un testo qualunque e dai seguenti codici speciali:\n\n\ $V Versione del sistema operativo\n\ $_ CR LF (a capo)\n\ $$ $ (simbolo dollaro)\n" - STRING_PAUSE_HELP1 "Ferma l'esecuzione del batch e mostra il seguente messaggio:\n\ -'Premi un tasto per continuare...' o il messaggio indicato.\n\n\ -PAUSE [messaggio]" STRING_PROMPT_HELP2 " $+ Mostra la profondità attuale dello stack delle cartelle" STRING_PROMPT_HELP3 "\nUsa PROMPT senza parametri per attivare quello predefinito." STRING_REM_HELP "Inizia una linea di commento.\n\n\ diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index 3bd1a7ea396..fad5b9d894b 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -273,9 +273,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "%s を上書きしますがよろしいですか (Yes/No/All)? " STRING_MOVE_HELP2 "ファイルを移動およびファイルとディレクトリ名を変更します。\n\n\ 1 つまたは複数のファイルを移動するには:\n\ -MOVE [/N][ドライブ:][パス]ファイル名1[,...] 移動先\n\n\ +MOVE [/N][/Y|/-Y][ドライブ:][パス]ファイル名1[,...] 移動先\n\n\ ディレクトリ名を変更するには:\n\ -MOVE [/N][ドライブ:][パス]変更前変更後\n\n\ +MOVE [/N][/Y|/-Y][ドライブ:][パス]変更前変更後\n\n\ [ドライブ:][パス]ファイル名1\n\ 移動するファイルの場所と名前を指定します。\n\ /N Nothing. ファイルとディレクトリの移動以外のすべてを行います。\n\n\ @@ -297,6 +297,9 @@ PATH [[ドライブ:]パス[;...]]\nPATH ;\n\n\ パラメータとして ; (セミコロン) だけを指定すると、すべての検索パスは\n\ クリアされて現在のディレクトリだけが検索されます。\n\ パラメータを指定せずに PATH と入力すると、現在のパスが表示されます。\n" + STRING_PAUSE_HELP1 "バッチプログラムの処理を一時停止し、次のメッセージを表示します。:\n\ +'続行するには何かキーを押してください ...' またはユーザーが定義したメッセージ。\n\n\ +PAUSE [メッセージ]" STRING_PROMPT_HELP1 "コマンドプロンプトを変更します。\n\n\ PROMPT [文字列]\n\n\ 文字列新しいコマンドプロンプトを指定します。\n\n\ @@ -319,9 +322,6 @@ PROMPT には通常の文字と次に示す特殊コードを使用できます: $V OS のバージョン番号\n\ $_ キャリッジリターンとラインフィード\n\ $$ $ (ドル記号)\n" - STRING_PAUSE_HELP1 "バッチプログラムの処理を一時停止し、次のメッセージを表示します。:\n\ -'続行するには何かキーを押してください ...' またはユーザーが定義したメッセージ。\n\n\ -PAUSE [メッセージ]" STRING_PROMPT_HELP2 " $+ 現在のディレクトリスタックの深さを表示します" STRING_PROMPT_HELP3 "\nパラメータを指定せずに PROMPT と入力すると、プロンプトの設定がデフォルトにリセットされます。" STRING_REM_HELP "バッチファイルにコメント (注釈) を記録します。\n\nREM [コメント]" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index c8577d88c55..03d3140e1e0 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -264,9 +264,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Overskrive %s (Ja/Nei/Alle)? " STRING_MOVE_HELP2 "Flytt filer, og gi nytt navn på filer og mapper.\n\n\ For å flytte en eller flere filer:\n\ -MOVE [/N][stasjon:][mappe]filnavn1[,...] destinasjon\n\n\ +MOVE [/N][/Y|/-Y][stasjon:][mappe]filnavn1[,...] destinasjon\n\n\ For å endre navn på en mappe:\n\ -MOVE [/N][stasjon:][mappe]mappenavn1 mappenavn2\n\n\ +MOVE [/N][/Y|/-Y][stasjon:][mappe]mappenavn1 mappenavn2\n\n\ [stasjon:][mappe]filnavn1 Spesifisere plassering og navn av fil\n\ eller filer du ønsker å flytte.\n\ /N Ingenting. Gjør alt unntatt å flytte filer eller mapper.\n\n\ @@ -287,6 +287,9 @@ PATH [[stasjon:]mappe[;...]]\nPATH ;\n\n\ Skriv PATH; for å tømme alle søkemapper innstillinger og angi at kommandoskallet\n\ kun skal søke gjeldende mappe.\n\ Skriv PATH uten parameter for å vise gjeldende søkesti.\n" + STRING_PAUSE_HELP1 "Stopp eksekvering av satsvis fil og vis følgende melding:\n\ +'Trykk en tast for å fortsette...' eller en bruker definert melding.\n\n\ +PAUSE [melding]" STRING_PROMPT_HELP1 "Endre kommandoledetekst.\n\n\ PROMPT [tekst]\n\n\ tekst Spesifisere en nytt kommandoledetekst.\n\n\ @@ -309,9 +312,6 @@ Ledeteksten kan bli satt sammen av normale tegn og følgende spesielle koder:\n\ $V Versjonsnummer for ReactOS\n\ $_ Retur og linjeskift\n\ $$ $ (dollar tegn)\n" - STRING_PAUSE_HELP1 "Stopp eksekvering av satsvis fil og vis følgende melding:\n\ -'Trykk en tast for å fortsette...' eller en bruker definert melding.\n\n\ -PAUSE [melding]" STRING_PROMPT_HELP2 " $+ Vis gjeldende dybde av mappestakken" STRING_PROMPT_HELP3 "\nSkriv PROMPT uten parameter for å resette ledeteksten." STRING_REM_HELP "Start en kommentarlinje i en satsvis fil.\n\nREM [Kommentar]" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 626696c546b..f079d3e3213 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -272,9 +272,9 @@ Jeśli nie zostały użyte zarówno /H jak i /J, zostanie utworzone dowiązanie STRING_MOVE_HELP1 "Nadpisać %s (Tak/Nie/Zawsze)? " STRING_MOVE_HELP2 "Przenosi, a także zmienia nazwy plików i katalogów.\n\n\ Aby przenieść jeden lub więcej plików:\n\ -MOVE [/N][napęd:][ścieżka]nazwa_pliku1[,...] cel\n\n\ +MOVE [/N][/Y|/-Y][napęd:][ścieżka]nazwa_pliku1[,...] cel\n\n\ Aby zmienić nazwę katalogu:\n\ -MOVE [/N][napęd:][ścieżka]nazwa1 nazwa2\n\n\ +MOVE [/N][/Y|/-Y][napęd:][ścieżka]nazwa1 nazwa2\n\n\ [napęd:][ścieżka]nazwa Wyznacza scieżkę dostępu do pliku lub\n\ plików, które chcesz przenieść.\n\ /N Nic. Zrób wszystko, oprócz przenoszenia plików/katalogów.\n\n\ @@ -295,6 +295,9 @@ PATH [[napęd:]ścieżka[;...]]\nPATH ;\n\n\ Wpisz PATH ; jeśli chcesz wyczyścić wszystkie zapisane ścieżki dostępu i zmusić konsolę\n\ do przeszukiwania wyłącznie katalogu bieżącego.\n\ Wpisz PATH bez żadnych parametrów, by wyświetlić zapisane ścieżki dostępu.\n" + STRING_PAUSE_HELP1 "Zatrzymuje wykonywanie programu wsadowego i pokazuje wiadomość:\n\ +'Naciśnij dowolny klawisz, aby kontynuować...' albo inną dowolną.\n\n\ +PAUSE [wiadomość]" STRING_PROMPT_HELP1 "Zmienia znak zachęty.\n\n\ PROMPT [tekst]\n\n\ tekst Definiuje nowy znak zachęty.\n\n\ @@ -317,9 +320,6 @@ Znak zachęty może składać się z normalnych znaków, a także poniższych sy $V Wersja systemu\n\ $_ Znak CR/LF\n\ $$ $ (dolar)\n" - STRING_PAUSE_HELP1 "Zatrzymuje wykonywanie programu wsadowego i pokazuje wiadomość:\n\ -'Naciśnij dowolny klawisz, aby kontynuować...' albo inną dowolną.\n\n\ -PAUSE [wiadomość]" STRING_PROMPT_HELP2 " $+ Wyświetla obecny poziom stosu katalogów" STRING_PROMPT_HELP3 "\nWpisz PROMPT bez żadnych parametrów, by powrócić do ustawień domyślnych." STRING_REM_HELP "Definiuje linię komentarza w pliku wsadowym.\n\nREM [komentarz]" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 2013f65d8d8..39536e6a1ad 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -296,9 +296,9 @@ legătură simbolică." STRING_MOVE_HELP1 "Suprascrieți «%s» (Da|Nu|Toate)?" STRING_MOVE_HELP2 "Mută sau redenumește fișiere și directoare.\n\n\ Pentru a muta unul sau mai multe fișiere:\n\ -MOVE [/N][unitate:][cale]fișier[,...] destinație\n\n\ +MOVE [/N][/Y|/-Y][unitate:][cale]fișier[,...] destinație\n\n\ Pentru a redenumi un director:\n\ -MOVE [/N][unitate:][cale]nume_director_1 nume_director_2\n\n\ +MOVE [/N][/Y|/-Y][unitate:][cale]nume_director_1 nume_director_2\n\n\ [unitate:][cale]fișier Specică locul și numele fișierului sau fișierelor\n\ pe care doriți să le mutați.\n\ /N Nimic. Execută orice în afară de mutarea fișiere\n\ @@ -323,6 +323,9 @@ PATH [[unitate:]cale[;...]]\nPATH ;\n\n\ Tastați PATH ; pentru a curăța toate căile de căutare și a impune mediul de\n\ comandă să caute doar în directorul curent.\n\ Tastați PATH fără argumente pentru a afișa căile curente.\n" + STRING_PAUSE_HELP1 "Oprește execuția unui fișier de comenzi și afișează următorul mesaj:\n\ +«Tastați pentru a continua...» sau un alt mesaj definit.\n\n\ +PAUSE [mesaj]\n" STRING_PROMPT_HELP1 "Modifică aspectul liniei de comandă.\n\n\ PROMPT [text]\n\n\ text Specifică textul liniei de comandă a consolei.\n\n\ @@ -345,9 +348,6 @@ PROMPT [text]\n\n\ $V Numărul versiunii SO\n\ $_ Sfârșit de linie și rând nou\n\ $$ $ (semnul dolar)\n" - STRING_PAUSE_HELP1 "Oprește execuția unui fișier de comenzi și afișează următorul mesaj:\n\ -«Tastați pentru a continua...» sau un alt mesaj definit.\n\n\ -PAUSE [mesaj]\n" STRING_PROMPT_HELP2 " $+ Afișează adâncimea curentă a stivei de directoare\n" STRING_PROMPT_HELP3 "\nTastați PROMPT fără argumente pentru a readuce consola în starea implicită.\n" STRING_REM_HELP "Începe o linie de comentariu într-un fișier de comenzi.\n\nREM [comentariu]\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 554b7e028ef..1d2dd6ccaf0 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -274,9 +274,9 @@ MKLINK [[/D] | [/H] | [/J]] ссылка назначение\n\n\ STRING_MOVE_HELP1 "Перезаписать %s (Yes/No/All)? " STRING_MOVE_HELP2 "Перемещение файлов и переименование файлов и каталогов.\n\n\ Перемещение одного или более файлов:\n\ -MOVE [/N][диск:][путь]имя_файла1[,...] назначение\n\n\ +MOVE [/N][/Y|/-Y][диск:][путь]имя_файла1[,...] назначение\n\n\ Переименование каталога:\n\ -MOVE [/N][диск:][путь]имя_каталога1 имя_каталога2\n\n\ +MOVE [/N][/Y|/-Y][диск:][путь]имя_каталога1 имя_каталога2\n\n\ [диск:][путь]имя_файла1 Указывает местоположение и имя файла или файлов\n\ которые необходимо переместить.\n\ /N Не выполнять перемещение файлов или каталогов.\n\n\ @@ -297,6 +297,9 @@ PATH [[диск:]путь[;...]]\nPATH ;\n\n\ Команда PATH ; очищает путь поиска используемых файлов, ограничив его\n\ текущим каталогом.\n\ Команда PATH без параметров отображает текущий путь поиска.\n" + STRING_PAUSE_HELP1 "Приостановка выполнения пакетного файла и вывод сообщения:\n\ +'Для продолжения нажмите любую клавишу...' или указанное сообщение.\n\n\ +PAUSE [сообщение]" STRING_PROMPT_HELP1 "Изменение приглашения командной строки.\n\n\ PROMPT [текст]\n\n\ текст Новое приглашение командной строки.\n\n\ @@ -319,9 +322,6 @@ PROMPT [текст]\n\n\ $V Номер версии операционной системы\n\ $_ Возврат каретки и перевод строки\n\ $$ $ (знак доллара)\n" - STRING_PAUSE_HELP1 "Приостановка выполнения пакетного файла и вывод сообщения:\n\ -'Для продолжения нажмите любую клавишу...' или указанное сообщение.\n\n\ -PAUSE [сообщение]" STRING_PROMPT_HELP2 " $+ Вывод глубины вложенности каталогов" STRING_PROMPT_HELP3 "\nPROMPT без параметров устанавливает приглашение командной строки по умолчанию." STRING_REM_HELP "Помещение комментариев в пакетные файлы.\n\nREM [комментарий]" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index c0a5673bd44..312ff25bfa6 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -271,9 +271,9 @@ If neither /H or /J is specified, a symbolic link is created." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ -MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] destination\n\n\ To rename a directory:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ +MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n\n\ [drive:][path]filename1 Specifies the location and name of the file\n\ or files you want to move.\n\ /N Nothing. Do everything but move files or directories.\n\n\ @@ -294,6 +294,9 @@ PATH [[drive:]path[;...]]\nPATH ;\n\n\ Type PATH ; to clear all search-path settings and direct the command shell\n\ to search only in the current directory.\n\ Type PATH without parameters to display the current path.\n" + STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ +'Pokračujte stlačením ľubovoľného klávesu ...' or a user defined message.\n\n\ +PAUSE [message]" STRING_PROMPT_HELP1 "Changes the command prompt.\n\n\ PROMPT [text]\n\n\ text Specifies a new command prompt.\n\n\ @@ -316,9 +319,6 @@ Prompt can be made up of normal characters and the following special codes:\n\n\ $V Číslo verzie OS\n\ $_ Carriage return and linefeed\n\ $$ $ (znak dolára)\n" - STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ -'Pokračujte stlačením ľubovoľného klávesu ...' or a user defined message.\n\n\ -PAUSE [message]" STRING_PROMPT_HELP2 " $+ Displays the current depth of the directory stack" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 42e2d5736f5..a41c6b635b8 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -269,9 +269,9 @@ Nëse anjëra nga /H ose /J nuk speficikohet, një lidhje simboli do të krijohe STRING_MOVE_HELP1 "Mbishkruaj %s (Po/Jo/Të Gjith)? " STRING_MOVE_HELP2 "Lëviz dokumentet dhe emero ato dhe skedat.\n\n\ Për të lëvizur një ose më shumë dokumenta:\n\ -MOVE [/N][drive:][rrugë]emri1[,...] destinacioni\n\n\ +MOVE [/N][/Y|/-Y][drive:][rrugë]emri1[,...] destinacioni\n\n\ Të emerosh skedat:\n\ -MOVE [/N][drive:][rrugë]dirname1 dirname2\n\n\ +MOVE [/N][/Y|/-Y][drive:][rrugë]dirname1 dirname2\n\n\ [drive:][rrugë]emri1 Përcakton vendndodhjen dhe emrin e skedës\n\ ose dokumentave që ju dëshironi për të lëvizur.\n\ /N Asgjë. Bëni gjithçka perveq zhvendosjen e dokumenta ose direktorives.\n\n\ @@ -292,6 +292,9 @@ rrugë [[drive:]rrugë[;...]]\nrrugë ;\n\n\ Tipi rrugë ; të pastrosh të gjitha kërkimet-rrugën në parametra dhe të drejtojë komanden shell\n\ që të kërkoj ne direktorine aktuale.\n\ Shkruaj RRUGE pa parametra që shfaqin rrugen aktuale.\n" + STRING_PAUSE_HELP1 "Ndalon ekzekutimin e një dokumenti batch dhe trego mesazhin në vazhdim:\n\ +'Shtypni një buton për të vazhduar...' ose një mesazh të përcaktuar për përdoruesin.\n\n\ +PAUSE [mesazhi]" STRING_PROMPT_HELP1 "Ndryshimet në komandën e shpejtë.\n\n\ PROMPT [teksti]\n\n\ tekst Specifiko një dritare të re komande.\n\n\ @@ -314,9 +317,6 @@ Komanda mund të përbëhet nga karaktere normale dhe Kodet e mëposhtme të ve $V Versioni i OS\n\ $_ Rikthimi i perzgjedhjeve dhe informacionit\n\ $$ $ (Shenja e dollarit)\n" - STRING_PAUSE_HELP1 "Ndalon ekzekutimin e një dokumenti batch dhe trego mesazhin në vazhdim:\n\ -'Shtypni një buton për të vazhduar...' ose një mesazh të përcaktuar për përdoruesin.\n\n\ -PAUZE [mesazhi]" STRING_PROMPT_HELP2 " $+ Shfaq thellësinë aktuale të directorive në rafte" STRING_PROMPT_HELP3 "\nSHFAQ pa parametra për të resetuar ne konfigurimet e automatizuara." STRING_REM_HELP "Nis një linjë koment në një dokument batch.\n\nREM [Koment" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index b9d857299f5..d59c44ea4ce 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -264,9 +264,9 @@ Om varken /H eller /J är angivna kommer en symbolisk länk att skapas." STRING_MOVE_HELP1 "Skriv över %s (Ja/Nej/Alla)? " STRING_MOVE_HELP2 "Flyttar filer, och byter namn på filer och mappar.\n\n\ för att flytte en eller flera filer:\n\ -MOVE [/N][enhet:][mapp]filnamn1[,...] destination\n\n\ +MOVE [/N][/Y|/-Y][enhet:][mapp]filnamn1[,...] destination\n\n\ för att ändra namn på en mapp:\n\ -MOVE [/N][enhet:][mapp]mappnamn1 mappnamn2\n\n\ +MOVE [/N][/Y|/-Y][enhet:][mapp]mappnamn1 mappnamn2\n\n\ [enhet:][mapp]filnamn1 Anger placering och namn på fil\n\ eller filer du önsker att flytta.\n\ /N Ingenting. Gör allt utom att flytta filer eller mappar.\n\n\ @@ -287,6 +287,9 @@ PATH [[enhet:]mapp[;...]]\nPATH ;\n\n\ Skriv PATH; för att tømme alle søkemappar inställninar och angi at kommandoskallet\n\ kun skal søke aktuell mapp.\n\ Skriv PATH uten parameter för att visa aktuell søkesti.\n" + STRING_PAUSE_HELP1 "Stoppar exekvering av batch-fil och visa följande mening:\n\ +'Tryck valfri tangent för att fortsätta...' eller en användaren definerad mening.\n\n\ +PAUSE [melding]" STRING_PROMPT_HELP1 "Ändra kommandoledetext.\n\n\ PROMPT [text]\n\n\ text Anger en nytt kommandoledetext.\n\n\ @@ -309,9 +312,6 @@ Ledetexten kan bli satt sammen av normale tegn och følgende spesielle koder:\n\ $V Versionsnummer för ReactOS\n\ $_ Retur och linjeskift\n\ $$ $ (dollar tegn)\n" - STRING_PAUSE_HELP1 "Stoppar exekvering av batch-fil och visa följande mening:\n\ -'Tryck valfri tangent för att fortsätta...' eller en användaren definerad mening.\n\n\ -PAUSE [melding]" STRING_PROMPT_HELP2 " $+ Visa aktuell dybde av mappstakken" STRING_PROMPT_HELP3 "\nSkriv PROMPT uten parameter för att resette ledetexten." STRING_REM_HELP "Start en kommentarlinje i en batch-fil.\n\nREM [Kommentar]" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 326bc16e907..ee4c481cdf0 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -272,9 +272,9 @@ MKLINK [/D | /H | /J] bağlantı adı varış\n\n\ STRING_MOVE_HELP1 "Üzerine yaz: %s (Evet/Hayır/Tümü)? " STRING_MOVE_HELP2 "Kütükleri taşır ve kütükleri ve dizinleri yeniden adlandırır.\n\n\ Bir ya da daha çok kütüğü taşımak için:\n\ -MOVE [/N][sürücü:][yol]kütük adı1[,...] varış\n\n\ +MOVE [/N][/Y|/-Y][sürücü:][yol]kütük adı1[,...] varış\n\n\ Bir dizini yeniden adlandırmak için:\n\ -MOVE [/N][sürücü:][yol]dizin adı1 dizin adı2\n\n\ +MOVE [/N][/Y|/-Y][sürücü:][yol]dizin adı1 dizin adı2\n\n\ [sürücü:][yol]kütük adı1 Taşımak istediğiniz kütüğün ya da kütüklerin\n\ konumunu ve adını belirtir.\n\ /N Hiçbir şey. Tüm şeyleri yapar ama kütükleri ve dizinleri taşır.\n\n\ @@ -295,6 +295,9 @@ PATH [[sürücü:]yol[;...]]\nPATH ;\n\n\ PATH yazınız, tüm arama yolu ayarlarını silmek ve komut kabuğunu yalnızca\n\ şimdiki dizinde aramaya yönlendirmek için.\n\ Şimdiki yolu görüntülemek için değişkensiz PATH yazınız.\n" + STRING_PAUSE_HELP1 "Bir toplu iş kütüğünün çalışmasını durdurur ve aşağıdaki iletiyi gösterir:\n\ +""Sürdürmek için bir düğmeye basınız..."" ya da kullanıcı tanımlı bir ileti.\n\n\ +PAUSE [ileti]" STRING_PROMPT_HELP1 "Komut istemini değiştirir.\n\n\ PROMPT [metin]\n\n\ metin Yeni bir komut istemi belirtir.\n\n\ @@ -317,9 +320,6 @@ PROMPT [metin]\n\n\ $V OS sürüm numarası\n\ $_ Yataç başı ve yataç sonu\n\ $$ $ (dolar imi)\n" - STRING_PAUSE_HELP1 "Bir toplu iş kütüğünün çalışmasını durdurur ve aşağıdaki iletiyi gösterir:\n\ -""Sürdürmek için bir düğmeye basınız..."" ya da kullanıcı tanımlı bir ileti.\n\n\ -PAUSE [ileti]" STRING_PROMPT_HELP2 " $+ Dizin yığınının şimdiki derinliğini görüntüler." STRING_PROMPT_HELP3 "\nÖn tanımlı ayarlamaya istemi sıfırlamak için değişkensiz PROMPT yazınız." STRING_REM_HELP "Bir toplu iş kütüğünde bir açıklama yatacı başlatır.\n\nREM [Açıklama]" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 4b34f727177..f5228fe8532 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -276,9 +276,9 @@ MKLINK [/D | /H | /J] назва_посилання цiль\n\n\ STRING_MOVE_HELP1 "Переписати %s (Yes/No/All)? " STRING_MOVE_HELP2 "Перемiщення файлiв i перейменування файлiв i каталогiв.\n\n\ Перемiщення одного та бiльше файлiв:\n\ -MOVE [/N][диск:][шлях]iм'я_файлу1[,...] призначення\n\n\ +MOVE [/N][/Y|/-Y][диск:][шлях]iм'я_файлу1[,...] призначення\n\n\ Перейменування каталогу:\n\ -MOVE [/N][диск:][шлях]iм'я_каталогу1 iм'я_каталогу2\n\n\ +MOVE [/N][/Y|/-Y][диск:][шлях]iм'я_каталогу1 iм'я_каталогу2\n\n\ [диск:][шлях]iм'я_файлу1 Вказує мiсце розташування й iм'я файлу або\n\ файлiв якi необхiдно перемiстити.\n\ /N Нiчого. Do everything but move files or directories.\n\n\ @@ -299,6 +299,9 @@ PATH [[диск:]шлях[;...]]\nPATH ;\n\n\ Команда PATH ; очищає шлях пошуку файлiв та обмежує його\n\ поточним каталогом.\n\ Команда PATH без параметрiв вiдображає поточний шлях пошуку.\n" + STRING_PAUSE_HELP1 "Призупинка обробки пакетного файлу i показ повiдомлення:\n\ +'Для продовження натиснiть будь-яку клавiшу...' чи задане повiдомлення.\n\n\ +PAUSE [повiдомлення]" STRING_PROMPT_HELP1 "Змiна запрошення командного рядка.\n\n\ PROMPT [текст]\n\n\ текст Нове запрошення командного рядка.\n\n\ @@ -321,9 +324,6 @@ PROMPT [текст]\n\n\ $V Номер версiї операцiйної системи\n\ $_ Повернення каретки та переведення рядка\n\ $$ $ (знак долара)\n" - STRING_PAUSE_HELP1 "Призупинка обробки пакетного файлу i показ повiдомлення:\n\ -'Для продовження натиснiть будь-яку клавiшу...' чи задане повiдомлення.\n\n\ -PAUSE [повiдомлення]" STRING_PROMPT_HELP2 " $+ Показує поточну глибину стека каталогiв" STRING_PROMPT_HELP3 "\nPROMPT без параметрiв встановлює запрошення командного рядка за замовчуванням." STRING_REM_HELP "Стартує рядок коментаря впакетному файлi.\n\nREM [Comment]" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index 7562413928b..682ac1e11e1 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -251,9 +251,9 @@ MKLINK [/D | /H | /J] 链接名目标\n\n\ STRING_MOVE_HELP1 "覆盖 %s 吗 (Yes/No/All)？" STRING_MOVE_HELP2 "移动文件并重命名文件和目录。\n\n\ 移动一个或多个文件：\n\ -MOVE [/N][驱动器:][路径]文件名1[,...] 目标\n\n\ +MOVE [/N][/Y|/-Y][驱动器:][路径]文件名1[,...] 目标\n\n\ 重命名一个目录：\n\ -MOVE [/N][驱动器:][路径]目录名1 目录名2\n\n\ +MOVE [/N][/Y|/-Y][驱动器:][路径]目录名1 目录名2\n\n\ [驱动器:][路径]文件名1 指定你想要移动的一个或多个文件的位置和名称。\n\ /N 执行除移动文件或目录之外的所有事情。\n\n\ 当前限制：\n\ @@ -272,6 +272,9 @@ OK : 10 | CANCEL : 12\n" PATH [[驱动器:]路径[;...]]\nPATH ;\n\n\ 执行 PATH ; 以清除所有的搜索路径设置并指示命令行外壳仅在当前目录搜索。\n\ 不带参数执行 PATH 将会显示当前路径。\n" + STRING_PAUSE_HELP1 "停止一个批处理文件的执行并显示以下信息：\n\ +'按任意键继续...' 或者一条用户定义的消息。\n\n\ +PAUSE [消息]" STRING_PROMPT_HELP1 "改变命令提示符。\n\n\ PROMPT [文本]\n\n\ 文本指定新的命令提示符。\n\n\ @@ -294,9 +297,6 @@ PROMPT [文本]\n\n\ $V 操作系统版本号\n\ $_ 回车和换行符\n\ $$ $ (美元符号)\n" - STRING_PAUSE_HELP1 "停止一个批处理文件的执行并显示以下信息：\n\ -'按任意键继续...' 或者一条用户定义的消息。\n\n\ -PAUSE [消息]" STRING_PROMPT_HELP2 " $+ 显示当前目录栈的深度" STRING_PROMPT_HELP3 "\n执行不带参数的 PROMPT 将会把提示符重置为默认设置。" STRING_REM_HELP "在批处理文件中开始一行注释。\n\nREM [注释]" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 4d59c824948..3d7faeecee6 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -252,9 +252,9 @@ MKLINK [/D | /H | /J] 連結名目標\n\n\ STRING_MOVE_HELP1 "覆蓋 %s 嗎 (Yes/No/All)？" STRING_MOVE_HELP2 "移動檔案並重新命名檔案和目錄。\n\n\ 移動一個或多個檔案：\n\ -MOVE [/N][驅動器:][路徑]檔名1[,...] 目標\n\n\ +MOVE [/N][/Y|/-Y][驅動器:][路徑]檔名1[,...] 目標\n\n\ 重新命名一個目錄：\n\ -MOVE [/N][驅動器:][路徑]目錄名1 目錄名2\n\n\ +MOVE [/N][/Y|/-Y][驅動器:][路徑]目錄名1 目錄名2\n\n\ [驅動器:][路徑]檔名1 指定你想要移動的一個或多個檔案的位置和名稱。\n\ /N 執行除移動檔案或目錄之外的所有事情。\n\n\ 當前限制：\n\ @@ -273,6 +273,9 @@ OK : 10 | CANCEL : 12\n" PATH [[驅動器:]路徑[;...]]\nPATH ;\n\n\ 執行 PATH ; 以清除所有的搜索路徑設定並指示命令列外殼僅在當前目錄搜索。\n\ 不帶參數執行 PATH 將會顯示當前路徑。\n" + STRING_PAUSE_HELP1 "停止一個批處理檔案的執行並顯示以下資訊：\n\ +'按任意鍵繼續...' 或者一條使用者定義的訊息。\n\n\ +PAUSE [訊息]" STRING_PROMPT_HELP1 "改變命令提示符。\n\n\ PROMPT [文字]\n\n\ 文字指定新的命令提示符。\n\n\ @@ -295,9 +298,6 @@ PROMPT [文字]\n\n\ $V 作業系統版本號\n\ $_ 回車和換行符\n\ $$ $ (美元符號)\n" - STRING_PAUSE_HELP1 "停止一個批處理檔案的執行並顯示以下資訊：\n\ -'按任意鍵繼續...' 或者一條使用者定義的訊息。\n\n\ -PAUSE [訊息]" STRING_PROMPT_HELP2 " $+ 顯示當前目錄棧的深度" STRING_PROMPT_HELP3 "\n執行不帶參數的 PROMPT 將會把提示符重置為默認設定。" STRING_REM_HELP "在批處理檔案中開始一行註釋。\n\nREM [註釋]"

1 0

[reactos] 03/04: [CMD] TYPE: Rewrite the command so as to fix some of its behaviour.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a8754c83ac51e8da4d31… commit 6a8754c83ac51e8da4d319215feaa2f48d2153df Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 25 01:06:05 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 21:39:22 2020 +0200 [CMD] TYPE: Rewrite the command so as to fix some of its behaviour. - Display the names of the files being TYPEd only if more than one file has been specified on the command-line, or if a file specification (with wildcards) is present (even just for one). These names are displayed on STDERR while the files are TYPEd on STDOUT, therefore allowing concatenating files by just redirecting STDOUT to a destination, without corrupting it with the displayed file names. Also, add a /N option to force not displaying these file names. - When file specifications (with wildcards) are being processed, silently ignore any directories matching them. If no corresponding files have been found, display a file-not-found error. - When explicitly directory names are specified, don't do any special treatment; the CreateFile() call will fail and return the appropriate error. - Fix the returned errorlevel values. See https://ss64.com/nt/type.html for more information. Fixes some cmd_winetests. - When reading from a file, retrieve its original size so that we can stop reading it once we are beyond its original ending. This allows avoiding an infinite read loop in case the output of the file is redirected back to it. Fixes CORE-17208 - Move the FileGetString() helper to the only file where it is actually used. --- base/shell/cmd/cmd.h | 1 - base/shell/cmd/misc.c | 39 ------ base/shell/cmd/type.c | 359 ++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 292 insertions(+), 107 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index c7a9f4db8b8..c4b4cca90ca 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -300,7 +300,6 @@ VOID StripQuotes(LPTSTR); BOOL IsValidPathName (LPCTSTR); BOOL IsExistingFile (LPCTSTR); BOOL IsExistingDirectory (LPCTSTR); -BOOL FileGetString (HANDLE, LPTSTR, INT); VOID GetPathCase(TCHAR *, TCHAR *); #define PROMPT_NO 0 diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index 8d5239949b6..cd7a08f7722 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -510,45 +510,6 @@ BOOL IsExistingDirectory (LPCTSTR pszPath) } -BOOL FileGetString (HANDLE hFile, LPTSTR lpBuffer, INT nBufferLength) -{ - LPSTR lpString; - DWORD dwRead; - INT len = 0; -#ifdef _UNICODE - lpString = cmd_alloc(nBufferLength); -#else - lpString = lpBuffer; -#endif - - if (ReadFile(hFile, lpString, nBufferLength - 1, &dwRead, NULL)) - { - /* break at new line*/ - CHAR *end = memchr(lpString, '\n', dwRead); - len = dwRead; - if (end) - { - len = (INT)(end - lpString) + 1; - SetFilePointer(hFile, len - dwRead, NULL, FILE_CURRENT); - } - } - - if (!len) - { -#ifdef _UNICODE - cmd_free(lpString); -#endif - return FALSE; - } - - lpString[len++] = '\0'; -#ifdef _UNICODE - MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); - cmd_free(lpString); -#endif - return TRUE; -} - // See r874 BOOL __stdcall PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) { diff --git a/base/shell/cmd/type.c b/base/shell/cmd/type.c index 2c8955d8695..450f2e49240 100644 --- a/base/shell/cmd/type.c +++ b/base/shell/cmd/type.c @@ -30,23 +30,211 @@ #ifdef INCLUDE_CMD_TYPE +static BOOL +FileGetString( + IN HANDLE hFile, + OUT LPTSTR lpBuffer, + IN LONG nBufferLength) +{ + PCHAR pString; + DWORD dwRead; + LONG len = 0; -INT cmd_type(LPTSTR param) +#ifdef _UNICODE + pString = cmd_alloc(nBufferLength); +#else + pString = lpBuffer; +#endif + + if (ReadFile(hFile, pString, nBufferLength - 1, &dwRead, NULL)) + { + /* Break at new line*/ + PCHAR end = memchr(pString, '\n', dwRead); + len = dwRead; + if (end) + { + len = (LONG)(end - pString) + 1; + SetFilePointer(hFile, len - dwRead, NULL, FILE_CURRENT); + } + } + + if (!len) + { +#ifdef _UNICODE + cmd_free(pString); +#endif + return FALSE; + } + + pString[len++] = '\0'; +#ifdef _UNICODE + MultiByteToWideChar(OutputCodePage, 0, pString, -1, lpBuffer, len); + cmd_free(pString); +#endif + return TRUE; +} + +static BOOL +DoTypeFile( + IN LPTSTR FileName, + IN HANDLE hConsoleOut, + IN BOOL bNoFileName, + IN BOOL bPaging) { - TCHAR buff[256]; - HANDLE hFile, hConsoleOut; + HANDLE hFile; + BOOL bIsFile; + DWORD dwFileSize; + DWORD dwFilePos; DWORD dwRet; - INT argc,i; - LPTSTR *argv; LPTSTR errmsg; - BOOL bPaging = FALSE; - BOOL bFirstTime = TRUE; + TCHAR buff[256]; - hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE); + hFile = CreateFile(FileName, + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + // FIXME: Use ErrorMessage() ? + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_IGNORE_INSERTS | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&errmsg, + 0, + NULL); + ConErrPrintf(_T("%s - %s"), FileName, errmsg); + LocalFree(errmsg); + nErrorLevel = 1; + return TRUE; + } + + /* + * When reading from a file, retrieve its original size, so that + * we can stop reading it once we are beyond its original ending. + * This allows avoiding an infinite read loop in case the output + * of the file is redirected back to it. + * If we read from somewhere else (device, ...) don't do anything; + * we will stop when ReadFile() fails (e.g. when Ctrl-Z is seen...). + */ + bIsFile = ((GetFileType(hFile) & ~FILE_TYPE_REMOTE) == FILE_TYPE_DISK); + if (bIsFile) + { + dwFileSize = GetFileSize(hFile, NULL); + if ((dwFileSize == INVALID_FILE_SIZE) && + (GetLastError() != ERROR_SUCCESS)) + { + WARN("Error when retrieving file size, or size too large (%d)\n", + dwFileSize); + dwFileSize = 0; + } + dwFilePos = SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + if ((dwFilePos == INVALID_SET_FILE_POINTER) && + (GetLastError() != ERROR_SUCCESS)) + { + WARN("Error when setting file pointer\n"); + dwFilePos = 0; + } + } + else + { + dwFileSize = dwFilePos = 0; + } + + /* + * Display the file name on StdErr if required, so that if StdOut + * alone is redirected, we can obtain the file contents only. + */ + if (!bNoFileName) + ConErrPrintf(_T("\n%s\n\n\n"), FileName); + + if (bPaging) + { + while (FileGetString(hFile, buff, ARRAYSIZE(buff))) + { + if (!ConOutPrintfPaging(FALSE, _T("%s"), buff)) + { + bCtrlBreak = FALSE; + CloseHandle(hFile); + nErrorLevel = 1; + return FALSE; + } + + /* + * If we read from a file, check where we are and stop + * once we are beyond the original end of the file. + */ + if (bIsFile) + { + dwFilePos = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); + if ((dwFilePos == INVALID_SET_FILE_POINTER) && + (GetLastError() != ERROR_SUCCESS)) + { + WARN("Error when getting file pointer\n"); + break; + } + if (dwFilePos >= dwFileSize) + break; + } + } + } + else + { + while (ReadFile(hFile, buff, sizeof(buff), &dwRet, NULL) && dwRet > 0) + { + WriteFile(hConsoleOut, buff, dwRet, &dwRet, NULL); + if (bCtrlBreak) + { + bCtrlBreak = FALSE; + CloseHandle(hFile); + nErrorLevel = 1; + return FALSE; + } + + /* + * If we read from a file, check where we are and stop + * once we are beyond the original end of the file. + */ + if (bIsFile) + { + dwFilePos = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); + if ((dwFilePos == INVALID_SET_FILE_POINTER) && + (GetLastError() != ERROR_SUCCESS)) + { + WARN("Error when getting file pointer\n"); + break; + } + if (dwFilePos >= dwFileSize) + break; + } + } + } + + CloseHandle(hFile); + return TRUE; +} + +INT cmd_type(LPTSTR param) +{ + INT argc, i; + LPTSTR* argv; + LPTSTR errmsg; + HANDLE hConsoleOut; + BOOL bNoFileName = FALSE; + BOOL bPaging = FALSE; + BOOL bFileFound; + DWORD dwLastError; + UINT nFileSpecs = 0; + HANDLE hFind; + WIN32_FIND_DATA FindData; if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_TYPE_HELP1); + ConOutResPaging(TRUE, STRING_TYPE_HELP1); return 0; } @@ -56,87 +244,124 @@ INT cmd_type(LPTSTR param) return 1; } - argv = split(param, &argc, TRUE, FALSE); + /* Parse the command line. We will manually expand any file specification present. */ + argv = split(param, &argc, FALSE, FALSE); - for (i = 0; i < argc; i++) + /* Loop through the options, count also the specified number of file specifications */ + for (i = 0; i < argc; ++i) { - if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P')) + if (argv[i][0] == _T('/')) { - bPaging = TRUE; - } - } + if (_tcslen(argv[i]) == 2) + { + switch (_totupper(argv[i][1])) + { + case _T('N'): + bNoFileName = TRUE; + continue; - for (i = 0; i < argc; i++) - { - if (argv[i][0] == _T('/') && _totupper(argv[i][1]) != _T('P')) - { + case _T('P'): + bPaging = TRUE; + continue; + } + } + + // error_invalid_switch(argv[i] + 1); ConErrResPrintf(STRING_TYPE_ERROR1, argv[i] + 1); - continue; - } - if (argv[i][0] == _T('/') && _tcslen(argv[i]) == 2 && _totupper(argv[i][1]) == _T('P')) - { - continue; + nErrorLevel = 1; + goto Quit; } - nErrorLevel = 0; + /* This should be a file specification */ + ++nFileSpecs; + } - hFile = CreateFile(argv[i], - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + nErrorLevel = 0; - if (hFile == INVALID_HANDLE_VALUE) - { - FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &errmsg, - 0, - NULL); - ConErrPrintf (_T("%s - %s"), argv[i], errmsg); - LocalFree (errmsg); - nErrorLevel = 1; + hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE); + + /* Reset paging state */ + if (bPaging) + ConOutPrintfPaging(TRUE, _T("")); + + /* Now loop through the files */ + for (i = 0; i < argc; ++i) + { + /* Skip the options */ + if (argv[i][0] == _T('/')) continue; - } - if (bPaging) + /* If wildcards are present in this file specification, perform a file enumeration */ + if (_tcschr(argv[i], _T('*')) || _tcschr(argv[i], _T('?'))) { - while (FileGetString(hFile, buff, ARRAYSIZE(buff))) + dwLastError = ERROR_SUCCESS; + bFileFound = FALSE; + + hFind = FindFirstFile(argv[i], &FindData); + + if (hFind != INVALID_HANDLE_VALUE) { - if (!ConOutPrintfPaging(bFirstTime, _T("%s"), buff)) + /* Loop through all the files */ + do { - bCtrlBreak = FALSE; - CloseHandle(hFile); - freep(argv); - return 0; - } - bFirstTime = FALSE; + /* Ignore any directory silently */ + if (!_tcscmp(FindData.cFileName, _T(".")) || + !_tcscmp(FindData.cFileName, _T("..")) || + (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + continue; + } + + bFileFound = TRUE; + if (!DoTypeFile(FindData.cFileName, hConsoleOut, bNoFileName, bPaging)) + { + FindClose(hFind); + goto Quit; + } + + } while (FindNextFile(hFind, &FindData)); + + FindClose(hFind); + } + + /* + * Return an error if the file specification could not be resolved, + * or no actual files were encountered (but only directories). + */ + if (hFind == INVALID_HANDLE_VALUE) + dwLastError = GetLastError(); + else if (!bFileFound) + dwLastError = ERROR_FILE_NOT_FOUND; + + if (dwLastError != ERROR_SUCCESS) + { + // FIXME: Use ErrorMessage() ? + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_IGNORE_INSERTS | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwLastError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&errmsg, + 0, + NULL); + ConErrPrintf(_T("%s - %s"), argv[i], errmsg); + LocalFree(errmsg); + nErrorLevel = 1; } } else { - while (ReadFile(hFile, buff, sizeof(buff), &dwRet, NULL) && dwRet > 0) - { - WriteFile(hConsoleOut, buff, dwRet, &dwRet, NULL); - if (bCtrlBreak) - { - bCtrlBreak = FALSE; - CloseHandle(hFile); - freep(argv); - return 0; - } - } + if (!DoTypeFile(argv[i], hConsoleOut, (bNoFileName || (nFileSpecs <= 1)), bPaging)) + goto Quit; } - CloseHandle(hFile); + /* Continue with the next file specification */ } +Quit: freep(argv); - return 0; + return nErrorLevel; } #endif

1 0

[reactos] 02/04: [CMD] CHDIR: Some features are available only when extensions are enabled. Update the SetRootPath() as well.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d4af223283e19eb308a5… commit 3d4af223283e19eb308a5c4d24e7f42887ce5ee5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 20:45:59 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 21:39:21 2020 +0200 [CMD] CHDIR: Some features are available only when extensions are enabled. Update the SetRootPath() as well. --- base/shell/cmd/internal.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 7e8a7367c02..87fe7df9d81 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -194,9 +194,22 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) goto Fail; } - /* Convert the full path to its correct case. - * Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32 */ - GetPathCase(OutPathTemp, OutPath); + if (bEnableExtensions) + { + /* + * Convert the full path to its correct case, and + * resolve any wilcard present as well in the path + * and retrieve the first result. + * Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32 + * Example: C:\WINDOWS\S* => C:\WINDOWS\System, + * or C:\WINDOWS\System32, depending on the user's OS. + */ + GetPathCase(OutPathTemp, OutPath); + } + else + { + _tcscpy(OutPath, OutPathTemp); + } /* Use _tchdir(), since unlike SetCurrentDirectory() it updates * the current-directory-on-drive environment variables. */ @@ -239,12 +252,27 @@ INT cmd_chdir(LPTSTR param) return 0; } - /* Remove extra quotes and strip trailing whitespace */ + // + // FIXME: Use the split() tokenizer if bEnableExtensions == FALSE, + // so as to cut the parameter at the first separator (space, ',', ';'): + // - When bEnableExtensions == FALSE, doing + // CD system32;winsxs + // will go into system32, (but: CD "system32;winsxs" will fail as below), while + // - When bEnableExtensions == TRUE, it will fail because the "system32;winsxs" + // directory does not exist. + // + + /* Remove extra quotes */ StripQuotes(param); - tmp = param + _tcslen(param) - 1; - while (tmp > param && _istspace(*tmp)) - --tmp; - *(tmp + 1) = _T('\0'); + + if (bEnableExtensions) + { + /* Strip trailing whitespace */ + tmp = param + _tcslen(param) - 1; + while (tmp > param && _istspace(*tmp)) + --tmp; + *(tmp + 1) = _T('\0'); + } /* Reset the error level */ nErrorLevel = 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs