Ros-diffs June 2022

ros-diffs@reactos.org

17 participants
236 discussions

[reactos] 01/01: [DISKPART] Add help text for the UNIQUEID DISK command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd2c7ea3ce05a74034e7c… commit dd2c7ea3ce05a74034e7cd98af6a61b579a78c5a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Jun 7 23:08:05 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Jun 7 23:08:05 2022 +0200 [DISKPART] Add help text for the UNIQUEID DISK command --- base/system/diskpart/diskpart_msg.mc | 288 +++++++++++++++++++++++++++++++++-- 1 file changed, 277 insertions(+), 11 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 7fc7419829b..15ccd2c3117 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -2979,7 +2979,29 @@ Syntax: SET ID={<BYTE> | <GUID>} [OVERRIDE] [NOERR] NOERR For scripting only. When an error is encountered, DiskPart continues to process commands as if the error did not occur. Without the NOERR parameter, an error causes DiskPart to exit - with an error code.\r\n\r\n Intended for Original Equipment Manufacturer (OEM) use only.\r\n\r\n A partition must be selected for this operation to succeed.\r\n\r\n Caution:\r\n\r\n Changing partition type fields with this parameter might cause your\r\n computer to fail or be unable to start up. Unless you are an OEM or an\r\n IT professional experienced with GPT disks, do not change partition\r\n type fields on GPT disks using this pa [...] + with an error code. + + Intended for Original Equipment Manufacturer (OEM) use only. + + A partition must be selected for this operation to succeed. + + Caution: + + Changing partition type fields with this parameter might cause your + computer to fail or be unable to start up. Unless you are an OEM or an + IT professional experienced with GPT disks, do not change partition + type fields on GPT disks using this parameter. Instead, always use the + CREATE PARTITION EFI command to create EFI System partitions, the + CREATE PARTITION MSR command to create Microsoft Reserved partitions, + and the CREATE PARTITION PRIMARY command without the ID parameter to + create primary partitions on GPT disks. + + This command does not work on dynamic disks nor on Microsoft Reserved + partitions. + +Example: + SET ID=07 OVERRIDE + SET ID=ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 . Language=German <Add SETID command help text here> @@ -3051,32 +3073,276 @@ SymbolicName=MSG_COMMAND_UNIQUEID_DISK Severity=Informational Facility=System Language=English -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=German -<Add UNIQUEID DISK command help text here> + Dient zum Anzeigen oder Festlegen des GPT-Bezeichners (GPT = + GUID-Partitionstabelle) oder der MBR-Signatur (Master Boot Record) + für den Datenträger, der den Fokus hat. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + Für MBR-Datenträger können Sie einen Wert mit einer + Länge von vier Bytes (DWORD) im Hexadezimalformat für die + Signatur angeben. + + Für GPT-Datenträger können Sie einen GUID für den + Bezeichner angeben. + + NOERR Nur für Skripting. Wenn ein Fehler auftritt, setzt DiskPart + die Verarbeitung von Befehlen fort, als sei der Fehler nicht + aufgetreten. Ohne den Parameter NOERR wird DiskPart bei + einem Fehler mit dem entsprechenden Fehlercode beendet. + + Damit dieser Vorgang erfolgreich ausgeführt werden kann, muss ein + Datenträger ausgewählt sein. Der Befehl kann für Basisdatenträger und + dynamische Datenträger verwendet werden. + +Beispiel: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Polish -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Portugese -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Romanian -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Russian -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Albanian -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Turkish -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Chinese -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Taiwanese -<Add UNIQUEID DISK command help text here> + Displays or sets the GUID partition table (GPT) identifier or master boot + record (MBR) signature for the disk with focus. + +Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] + + ID={<DWORD> | <GUID>} + + For MBR disks, you can specify a four-byte (DWORD) value in + hexadecimal form for the signature. + + For GPT disks, specify a GUID for the identifier. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A disk must be selected for this operation to succeed. This command works + on basic and dynamic disks. + +Example: + + UNIQUEID DISK + UNIQUEID DISK ID=5f1b2c36 + UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee .

2 years, 6 months

[reactos] 01/01: [DISKPART] Implement the UNIQUEID command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da0bff2a50ed0ed3bf624… commit da0bff2a50ed0ed3bf624abbbc974481eba456dd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Jun 7 19:42:09 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Jun 7 19:42:09 2022 +0200 [DISKPART] Implement the UNIQUEID command --- base/system/diskpart/uniqueid.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/base/system/diskpart/uniqueid.c b/base/system/diskpart/uniqueid.c index 0637112cdb9..712ca56a96f 100644 --- a/base/system/diskpart/uniqueid.c +++ b/base/system/diskpart/uniqueid.c @@ -48,7 +48,7 @@ UniqueIdDisk( } if ((pszSuffix == NULL) || - (wcslen(pszSuffix) > 8) || + (wcslen(pszSuffix) != 8) || (IsHexString(pszSuffix) == FALSE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); @@ -62,12 +62,11 @@ UniqueIdDisk( return TRUE; } - ConPrintf(StdOut, L"Setting the disk signature is not implemented yet!\n"); -#if 0 - DPRINT1("New Signature: %lx\n", ulValue); + DPRINT("New Signature: 0x%08lx\n", ulValue); CurrentDisk->LayoutBuffer->Signature = ulValue; -// SetDiskLayout(CurrentDisk); -#endif + CurrentDisk->Dirty = TRUE; + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; }

2 years, 6 months

[reactos] 01/01: [DISKPART] Implement the ACTIVE and INACTIVE commands

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8f6440a78c45721b11b0… commit c8f6440a78c45721b11b06902f3be9eb2ea7ade2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Jun 6 11:22:48 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jun 6 11:23:11 2022 +0200 [DISKPART] Implement the ACTIVE and INACTIVE commands --- base/system/diskpart/active.c | 45 ++++++++++++++++++++++++++++++++++++-- base/system/diskpart/inactive.c | 44 ++++++++++++++++++++++++++++++++++++- base/system/diskpart/lang/de-DE.rc | 14 ++++++++++++ base/system/diskpart/lang/en-US.rc | 14 ++++++++++++ base/system/diskpart/lang/pl-PL.rc | 14 ++++++++++++ base/system/diskpart/lang/pt-PT.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/lang/ro-RO.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/lang/ru-RU.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/lang/sq-AL.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/lang/tr-TR.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/lang/zh-CN.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/lang/zh-TW.rc | 40 ++++++++++++++++++++++----------- base/system/diskpart/resource.h | 20 ++++++++++++----- 13 files changed, 331 insertions(+), 100 deletions(-) diff --git a/base/system/diskpart/active.c b/base/system/diskpart/active.c index 77b9d062781..deba7cef705 100644 --- a/base/system/diskpart/active.c +++ b/base/system/diskpart/active.c @@ -8,8 +8,49 @@ #include "diskpart.h" -BOOL active_main(INT argc, LPWSTR *argv) +#define NDEBUG +#include <debug.h> + + +BOOL +active_main( + _In_ INT argc, + _In_ PWSTR *argv) { - ConPuts(StdOut, L"\nActive\n"); + NTSTATUS Status; + + DPRINT("Active()\n"); + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + if (CurrentPartition == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); + return TRUE; + } + + if (CurrentPartition->BootIndicator) + { + ConResPuts(StdOut, IDS_ACTIVE_ALREADY); + return TRUE; + } + + CurrentPartition->BootIndicator = TRUE; + CurrentDisk->Dirty = TRUE; + UpdateDiskLayout(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_ACTIVE_SUCCESS); + } + else + { + ConResPuts(StdOut, IDS_ACTIVE_FAIL); + } + return TRUE; } diff --git a/base/system/diskpart/inactive.c b/base/system/diskpart/inactive.c index 0376bc79d32..e5e85edd9a1 100644 --- a/base/system/diskpart/inactive.c +++ b/base/system/diskpart/inactive.c @@ -8,7 +8,49 @@ #include "diskpart.h" -BOOL inactive_main(INT argc, LPWSTR *argv) +#define NDEBUG +#include <debug.h> + + +BOOL +inactive_main( + _In_ INT argc, + _In_ PWSTR *argv) { + NTSTATUS Status; + + DPRINT("Inactive()\n"); + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + if (CurrentPartition == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); + return TRUE; + } + + if (!CurrentPartition->BootIndicator) + { + ConResPuts(StdOut, IDS_INACTIVE_ALREADY); + return TRUE; + } + + CurrentPartition->BootIndicator = FALSE; + CurrentDisk->Dirty = TRUE; + UpdateDiskLayout(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_INACTIVE_SUCCESS); + } + else + { + ConResPuts(StdOut, IDS_INACTIVE_FAIL); + } + return TRUE; } diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index 6265a226f9a..97378fd99fe 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -15,6 +15,13 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDie Partition konnte nicht als aktiv markiert werden.\nVergewissern Sie sich, dass diese Partition gültig ist.\n" + IDS_ACTIVE_SUCCESS "\nDie aktuelle Partition wurde als aktiv markiert.\n" + IDS_ACTIVE_ALREADY "\nDie aktuelle Partition wurde bereits als aktiv markiert.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDie angegebene Partition konnte nicht erstellt werden.\n" @@ -66,6 +73,13 @@ BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" END +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDie Partition konnte nicht als inaktiv markiert werden.\nVergewissern Sie sich, dass diese Partition gültig ist.\n" + IDS_INACTIVE_SUCCESS "\nDie aktuelle Partition wurde als inaktiv markiert.\n" + IDS_INACTIVE_ALREADY "\nDie aktuelle Partition wurde bereits als inaktiv markiert.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index a52b7a65b51..8b3222d2de7 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -15,6 +15,13 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -66,6 +73,13 @@ BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" END +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index db7010f8a56..10c96c15d8e 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -15,6 +15,13 @@ Sposób użycia: DISKPART [/S nazwa_pliku] [/T limit_czasu] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -66,6 +73,13 @@ BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" END +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index dce4306f7d4..b3ea79004d2 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -17,6 +17,13 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -55,6 +62,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -70,19 +97,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 61163ea77bd..de6dcf2e770 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -17,6 +17,13 @@ Utilizare: DISKPART [/S numefișier] [/T timplimită] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -55,6 +62,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -70,19 +97,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index a5b1261311a..acc78d19517 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -17,6 +17,13 @@ BEGIN IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -55,6 +62,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -70,19 +97,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 3ba5d1c51af..495b4b13913 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -19,6 +19,13 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT, "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -57,6 +64,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -72,19 +99,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 1e2728f2ff1..94579802b28 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -17,6 +17,13 @@ Kullanım: DISKPART [/S dosya adı] [/T zaman aşımı] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -55,6 +62,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -70,19 +97,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 6d5d13322a1..e35519e0d37 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -24,6 +24,13 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -62,6 +69,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -77,19 +104,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index b3c84a90ee7..9ff8b00064c 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -18,6 +18,13 @@ Usage: DISKPART [/S 檔名] [/T 逾時] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n" + IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n" + IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n" +END + STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" @@ -56,6 +63,26 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +STRINGTABLE +BEGIN + IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n" + IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n" + IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n" +END + /* Detail header titles */ STRINGTABLE BEGIN @@ -71,19 +98,6 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END -STRINGTABLE -BEGIN - IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" - IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" - IDS_FILESYSTEMS_TYPE "Type : %s\n" - IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" -END - -STRINGTABLE -BEGIN - IDS_HELP_FORMAT_STRING "%-11.11s - %s" -END - /* RESCAN command string */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index dbf28649036..fd5899887c8 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -18,18 +18,16 @@ #define IDS_APP_LEAVING 4 #define IDS_APP_PROMPT 5 +#define IDS_ACTIVE_FAIL 1000 +#define IDS_ACTIVE_SUCCESS 1001 +#define IDS_ACTIVE_ALREADY 1002 + #define IDS_CREATE_PARTITION_FAIL 1050 #define IDS_CREATE_PARTITION_SUCCESS 1051 #define IDS_DELETE_PARTITION_FAIL 1070 #define IDS_DELETE_PARTITION_SUCCESS 1071 -#define IDS_FILESYSTEMS_CURRENT 1090 -#define IDS_FILESYSTEMS_FORMATTING 1091 -#define IDS_FILESYSTEMS_TYPE 1092 -#define IDS_FILESYSTEMS_CLUSTERSIZE 1093 - - #define IDS_DETAIL_INFO_DISK_ID 1107 #define IDS_DETAIL_INFO_TYPE 1108 #define IDS_DETAIL_INFO_STATUS 1109 @@ -54,8 +52,18 @@ #define IDS_DETAIL_NO_DISKS 1135 #define IDS_DETAIL_NO_VOLUME 1136 +#define IDS_FILESYSTEMS_CURRENT 1180 +#define IDS_FILESYSTEMS_FORMATTING 1181 +#define IDS_FILESYSTEMS_TYPE 1182 +#define IDS_FILESYSTEMS_CLUSTERSIZE 1183 + #define IDS_HELP_FORMAT_STRING 1200 +#define IDS_INACTIVE_FAIL 1210 +#define IDS_INACTIVE_SUCCESS 1211 +#define IDS_INACTIVE_ALREADY 1212 + + #define IDS_LIST_DISK_HEAD 3300 #define IDS_LIST_DISK_LINE 3301 #define IDS_LIST_DISK_FORMAT 3302

2 years, 6 months

[reactos] 01/01: [PCI][HALX86] Support PCI debugging devices

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=734cd5e8428c3d57955b6… commit 734cd5e8428c3d57955b64b4c0c467d32a2690ff Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Sep 7 00:42:23 2021 +0600 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Mon Jun 6 01:47:21 2022 +0300 [PCI][HALX86] Support PCI debugging devices Also optimize the PCI bus scanning CORE-17360 --- drivers/bus/pci/fdo.c | 55 +++- drivers/bus/pci/pci.c | 52 ++++ drivers/bus/pci/pci.h | 19 ++ hal/halx86/generic.cmake | 1 + hal/halx86/generic/kdpci.c | 578 +++++++++++++++++++++++++++++++++++++++++ hal/halx86/include/bus.h | 41 ++- hal/halx86/legacy/bus/pcibus.c | 216 ++++++++++----- hal/halx86/pc98.cmake | 1 + hal/halx86/xbox.cmake | 1 + 9 files changed, 880 insertions(+), 84 deletions(-) diff --git a/drivers/bus/pci/fdo.c b/drivers/bus/pci/fdo.c index 2eb5ef2012f..879fbd7a086 100644 --- a/drivers/bus/pci/fdo.c +++ b/drivers/bus/pci/fdo.c @@ -49,6 +49,30 @@ FdoLocateChildDevice( return STATUS_UNSUCCESSFUL; } +static +BOOLEAN +PciIsDebuggingDevice( + _In_ ULONG Bus, + _In_ PCI_SLOT_NUMBER SlotNumber) +{ + ULONG i; + + if (!HasDebuggingDevice) + return FALSE; + + for (i = 0; i < RTL_NUMBER_OF(PciDebuggingDevice); ++i) + { + if (PciDebuggingDevice[i].InUse && + PciDebuggingDevice[i].BusNumber == Bus && + PciDebuggingDevice[i].DeviceNumber == SlotNumber.u.bits.DeviceNumber && + PciDebuggingDevice[i].FunctionNumber == SlotNumber.u.bits.FunctionNumber) + { + return TRUE; + } + } + + return FALSE; +} static NTSTATUS FdoEnumerateDevices( @@ -92,7 +116,9 @@ FdoEnumerateDevices( &PciConfig, PCI_COMMON_HDR_LENGTH); DPRINT("Size %lu\n", Size); - if (Size < PCI_COMMON_HDR_LENGTH) + if (Size != PCI_COMMON_HDR_LENGTH || + PciConfig.VendorID == PCI_INVALID_VENDORID || + PciConfig.VendorID == 0) { if (FunctionNumber == 0) { @@ -111,12 +137,6 @@ FdoEnumerateDevices( PciConfig.VendorID, PciConfig.DeviceID); - if (PciConfig.VendorID == 0 && PciConfig.DeviceID == 0) - { - DPRINT("Filter out devices with null vendor and device ID\n"); - continue; - } - Status = FdoLocateChildDevice(&Device, DeviceExtension, SlotNumber, &PciConfig); if (!NT_SUCCESS(Status)) { @@ -132,6 +152,27 @@ FdoEnumerateDevices( Device->BusNumber = DeviceExtension->BusNumber; + if (PciIsDebuggingDevice(DeviceExtension->BusNumber, SlotNumber)) + { + Device->IsDebuggingDevice = TRUE; + + /* + * ReactOS-specific: apply a hack + * to prevent driver installation for the debugging device. + * NOTE: Nothing to do for IEEE 1394 devices; NT5.1 and NT5.2 + * support IEEE 1394 debugging. + * + * FIXME: We should set the device problem code + * CM_PROB_USED_BY_DEBUGGER instead. + */ + if (PciConfig.BaseClass != PCI_CLASS_SERIAL_BUS_CTLR || + PciConfig.SubClass != PCI_SUBCLASS_SB_IEEE1394) + { + PciConfig.VendorID = 0xDEAD; + PciConfig.DeviceID = 0xBEEF; + } + } + RtlCopyMemory(&Device->SlotNumber, &SlotNumber, sizeof(PCI_SLOT_NUMBER)); diff --git a/drivers/bus/pci/pci.c b/drivers/bus/pci/pci.c index 5245ccb12cf..22ec3823ad1 100644 --- a/drivers/bus/pci/pci.c +++ b/drivers/bus/pci/pci.c @@ -29,6 +29,8 @@ static NTSTATUS NTAPI PciPnpControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) /*** PUBLIC ******************************************************************/ PPCI_DRIVER_EXTENSION DriverExtension = NULL; +BOOLEAN HasDebuggingDevice = FALSE; +PCI_TYPE1_CFG_CYCLE_BITS PciDebuggingDevice[2] = {0}; /*** PRIVATE *****************************************************************/ @@ -194,6 +196,54 @@ PciUnload( UNREFERENCED_PARAMETER(DriverObject); } +static +CODE_SEG("INIT") +VOID +PciLocateKdDevices(VOID) +{ + ULONG i; + NTSTATUS Status; + WCHAR KeyNameBuffer[16]; + ULONG BusNumber, SlotNumber; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].Name = L"Bus"; + QueryTable[0].EntryContext = &BusNumber; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[1].Name = L"Slot"; + QueryTable[1].EntryContext = &SlotNumber; + + for (i = 0; i < RTL_NUMBER_OF(PciDebuggingDevice); ++i) + { + PCI_SLOT_NUMBER PciSlot; + + RtlStringCbPrintfW(KeyNameBuffer, sizeof(KeyNameBuffer), L"PCI\\Debug\\%d", i); + + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + KeyNameBuffer, + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + return; + + HasDebuggingDevice = TRUE; + + PciSlot.u.AsULONG = SlotNumber; + PciDebuggingDevice[i].DeviceNumber = PciSlot.u.bits.DeviceNumber; + PciDebuggingDevice[i].FunctionNumber = PciSlot.u.bits.FunctionNumber; + PciDebuggingDevice[i].BusNumber = BusNumber; + PciDebuggingDevice[i].InUse = TRUE; + + DPRINT1("PCI debugging device %02x:%02x.%x\n", + BusNumber, + PciSlot.u.bits.DeviceNumber, + PciSlot.u.bits.FunctionNumber); + } +} + CODE_SEG("INIT") NTSTATUS NTAPI @@ -224,6 +274,8 @@ DriverEntry( InitializeListHead(&DriverExtension->BusListHead); KeInitializeSpinLock(&DriverExtension->BusListLock); + PciLocateKdDevices(); + return STATUS_SUCCESS; } diff --git a/drivers/bus/pci/pci.h b/drivers/bus/pci/pci.h index 94d9ffe31c6..23288494592 100644 --- a/drivers/bus/pci/pci.h +++ b/drivers/bus/pci/pci.h @@ -3,6 +3,7 @@ #include <ntifs.h> #include <cmreslist.h> +#include <ntstrsafe.h> #define TAG_PCI '0ICP' @@ -24,6 +25,8 @@ typedef struct _PCI_DEVICE BOOLEAN EnableIoSpace; // Enable bus master BOOLEAN EnableBusMaster; + // Whether the device is owned by the KD + BOOLEAN IsDebuggingDevice; } PCI_DEVICE, *PPCI_DEVICE; @@ -105,12 +108,28 @@ typedef struct _PCI_DRIVER_EXTENSION KSPIN_LOCK BusListLock; } PCI_DRIVER_EXTENSION, *PPCI_DRIVER_EXTENSION; +typedef union _PCI_TYPE1_CFG_CYCLE_BITS +{ + struct + { + ULONG InUse:2; + ULONG RegisterNumber:6; + ULONG FunctionNumber:3; + ULONG DeviceNumber:5; + ULONG BusNumber:8; + ULONG Reserved2:8; + }; + ULONG AsULONG; +} PCI_TYPE1_CFG_CYCLE_BITS, *PPCI_TYPE1_CFG_CYCLE_BITS; /* We need a global variable to get the driver extension, * because at least InterfacePciDevicePresent has no * other way to get it... */ extern PPCI_DRIVER_EXTENSION DriverExtension; +extern BOOLEAN HasDebuggingDevice; +extern PCI_TYPE1_CFG_CYCLE_BITS PciDebuggingDevice[2]; + /* fdo.c */ NTSTATUS diff --git a/hal/halx86/generic.cmake b/hal/halx86/generic.cmake index 4948e111fb6..e9e60264e2b 100644 --- a/hal/halx86/generic.cmake +++ b/hal/halx86/generic.cmake @@ -6,6 +6,7 @@ list(APPEND HAL_GENERIC_SOURCE generic/dma.c generic/drive.c generic/halinit.c + generic/kdpci.c generic/memory.c generic/misc.c generic/nmi.c diff --git a/hal/halx86/generic/kdpci.c b/hal/halx86/generic/kdpci.c new file mode 100644 index 00000000000..057a649514c --- /dev/null +++ b/hal/halx86/generic/kdpci.c @@ -0,0 +1,578 @@ +/* + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel debugger PCI configurator + * COPYRIGHT: Copyright 2022 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* + * FIXME: We don't use a PCI resource allocator and rely on firmware to + * have configured PCI devices properly. The KD PCI configurator should + * allocate and assign PCI resources for all PCI buses + * before the debugging device can be enabled. + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> + +/* GLOBALS ********************************************************************/ + +#if defined(EARLY_DEBUG) +ULONG (*DPRINT0)(_In_ _Printf_format_string_ PCSTR Format, ...); +#else +#if defined(_MSC_VER) +#define DPRINT0 __noop +#else +#define DPRINT0 +#endif +#endif + +PCI_TYPE1_CFG_CYCLE_BITS HalpPciDebuggingDevice[2] = {0}; + +/* FUNCTIONS ******************************************************************/ + +static +CODE_SEG("INIT") +ULONG +HalpPciBarLength( + _In_ ULONG CurrentBar, + _In_ ULONG NextBar) +{ + ULONG64 Bar; + ULONG Length; + + Bar = CurrentBar; + + if (CurrentBar & PCI_ADDRESS_IO_SPACE) + { + Length = 1 << 2; + } + else + { + if ((CurrentBar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + Bar = ((ULONG64)NextBar << 32) | CurrentBar; + } + + Length = 1 << 4; + } + + while (!(Bar & Length) && Length) + { + Length <<= 1; + } + + return Length; +} + +static +CODE_SEG("INIT") +BOOLEAN +HalpConfigureDebuggingDevice( + _In_ PDEBUG_DEVICE_DESCRIPTOR PciDevice, + _In_ ULONG PciBus, + _In_ PCI_SLOT_NUMBER PciSlot, + _Inout_ PPCI_COMMON_HEADER PciConfig) +{ + ULONG i, Register; + + Register = PciConfig->Command & ~(PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_IO_SPACE); + HalpPhase0SetPciDataByOffset(PciBus, + PciSlot, + &Register, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + /* Fill out the device descriptor */ + for (i = 0; i < MAXIMUM_DEBUG_BARS; ++i) + { + ULONG Length, NextBar; + PDEBUG_DEVICE_ADDRESS DeviceAddress; + + DeviceAddress = &PciDevice->BaseAddress[i]; + DeviceAddress->Valid = FALSE; + + Register = 0xFFFFFFFF; + HalpPhase0SetPciDataByOffset(PciBus, + PciSlot, + &Register, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type0.BaseAddresses[i]), + sizeof(ULONG)); + HalpPhase0GetPciDataByOffset(PciBus, + PciSlot, + &Register, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type0.BaseAddresses[i]), + sizeof(ULONG)); + HalpPhase0SetPciDataByOffset(PciBus, + PciSlot, + &PciConfig->u.type0.BaseAddresses[i], + FIELD_OFFSET(PCI_COMMON_HEADER, u.type0.BaseAddresses[i]), + sizeof(ULONG)); + + if (i < MAXIMUM_DEBUG_BARS - 1) + NextBar = PciConfig->u.type0.BaseAddresses[i + 1]; + else + NextBar = 0; + + Length = HalpPciBarLength(Register, NextBar); + if (Register == 0 || Length == 0) + continue; + + /* I/O space */ + if (Register & PCI_ADDRESS_IO_SPACE) + { + DeviceAddress->Type = CmResourceTypePort; + DeviceAddress->Length = Length; + DeviceAddress->Valid = TRUE; + DeviceAddress->TranslatedAddress = + UlongToPtr(PciConfig->u.type0.BaseAddresses[i] & PCI_ADDRESS_IO_ADDRESS_MASK); + + DPRINT0("BAR[%u] IO %lx, length 0x%lx, 0x%lx\n", + i, + DeviceAddress->TranslatedAddress, + Length, + Register); + } + else + { + PHYSICAL_ADDRESS PhysicalAddress; + BOOLEAN SkipBar = FALSE; + + DeviceAddress->Type = CmResourceTypeMemory; + DeviceAddress->Length = Length; + DeviceAddress->Valid = TRUE; + + /* 32-bit memory space */ + PhysicalAddress.HighPart = 0; + PhysicalAddress.LowPart = + PciConfig->u.type0.BaseAddresses[i] & PCI_ADDRESS_MEMORY_ADDRESS_MASK; + + /* 64-bit memory space */ + if (((Register & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT)) + { + PhysicalAddress.HighPart = NextBar; + SkipBar = TRUE; + } + + DPRINT0("BAR[%u] MEM %I64x, length 0x%lx, 0x%lx\n", + i, + PhysicalAddress.QuadPart, + Length, + Register); + + if (SkipBar) + { + ++i; + } + + DeviceAddress->TranslatedAddress = + HalpMapPhysicalMemory64(PhysicalAddress, BYTES_TO_PAGES(Length)); + } + } + PciDevice->Bus = PciBus; + PciDevice->Slot = PciSlot.u.AsULONG; + PciDevice->VendorID = PciConfig->VendorID; + PciDevice->DeviceID = PciConfig->DeviceID; + PciDevice->BaseClass = PciConfig->BaseClass; + PciDevice->SubClass = PciConfig->SubClass; + PciDevice->ProgIf = PciConfig->ProgIf; + + /* Enable decodes */ + PciConfig->Command |= (PCI_ENABLE_MEMORY_SPACE | + PCI_ENABLE_IO_SPACE | + PCI_ENABLE_BUS_MASTER); + HalpPhase0SetPciDataByOffset(PciBus, + PciSlot, + &PciConfig->Command, + FIELD_OFFSET(PCI_COMMON_HEADER, Command), + sizeof(USHORT)); + + return TRUE; +} + +static +CODE_SEG("INIT") +BOOLEAN +HalpMatchDebuggingDevice( + _In_ PDEBUG_DEVICE_DESCRIPTOR PciDevice, + _In_ ULONG PciBus, + _In_ PCI_SLOT_NUMBER PciSlot, + _In_ PPCI_COMMON_HEADER PciConfig) +{ + /* Check if we weren't given a specific device location */ + if (PciDevice->Bus == 0xFFFFFFFF && PciDevice->Slot == 0xFFFFFFFF) + { + if (PciDevice->DeviceID == 0xFFFF && PciDevice->VendorID == 0xFFFF) + { + if (PciDevice->BaseClass == PciConfig->BaseClass && + PciDevice->SubClass == PciConfig->SubClass) + { + if (PciDevice->ProgIf == 0xFF || + PciDevice->ProgIf == PciConfig->ProgIf) + { + return TRUE; + } + } + } + else if (PciDevice->DeviceID == PciConfig->DeviceID && + PciDevice->VendorID == PciConfig->VendorID) + { + return TRUE; + } + } + else if (PciDevice->Bus == PciBus && + PciDevice->Slot == PciSlot.u.AsULONG) + { + return TRUE; + } + + return FALSE; +} + +static +CODE_SEG("INIT") +BOOLEAN +HalpFindMatchingDebuggingDevice( + _In_ PDEBUG_DEVICE_DESCRIPTOR PciDevice) +{ + ULONG BusNumber, DeviceNumber, FunctionNumber; + + for (BusNumber = 0; BusNumber < 0xFF; ++BusNumber) + { + for (DeviceNumber = 0; DeviceNumber < PCI_MAX_DEVICES; ++DeviceNumber) + { + for (FunctionNumber = 0; FunctionNumber < PCI_MAX_FUNCTION; ++FunctionNumber) + { + ULONG Bytes; + PCI_SLOT_NUMBER PciSlot; + PCI_COMMON_HEADER PciConfig; + + PciSlot.u.bits.DeviceNumber = DeviceNumber; + PciSlot.u.bits.FunctionNumber = FunctionNumber; + PciSlot.u.bits.Reserved = 0; + Bytes = HalpPhase0GetPciDataByOffset(BusNumber, + PciSlot, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + if (Bytes != PCI_COMMON_HDR_LENGTH || + PciConfig.VendorID == PCI_INVALID_VENDORID || + PciConfig.VendorID == 0) + { + if (FunctionNumber == 0) + { + /* This slot has no single- or a multi-function device */ + break; + } + else + { + /* Continue scanning the functions */ + continue; + } + } + + DPRINT0("Check %02x:%02x.%x [%04x:%04x]\n", + BusNumber, DeviceNumber, FunctionNumber, + PciConfig.VendorID, PciConfig.DeviceID); + + switch (PCI_CONFIGURATION_TYPE(&PciConfig)) + { + case PCI_DEVICE_TYPE: + { + if (HalpMatchDebuggingDevice(PciDevice, BusNumber, PciSlot, &PciConfig)) + { + DPRINT0("Found device\n"); + + if (HalpConfigureDebuggingDevice(PciDevice, + BusNumber, + PciSlot, + &PciConfig)) + { + DPRINT0("Device is ready\n"); + return TRUE; + } + } + break; + } + + case PCI_BRIDGE_TYPE: + { + /* FIXME: Implement PCI resource allocator */ + break; + } + + case PCI_CARDBUS_BRIDGE_TYPE: + { + /* FIXME: Implement PCI resource allocator */ + break; + } + + default: + break; + } + + if (!PCI_MULTIFUNCTION_DEVICE(&PciConfig)) + { + /* The device is a single function device */ + break; + } + } + } + } + + return FALSE; +} + +CODE_SEG("INIT") +VOID +NTAPI +HalpRegisterPciDebuggingDeviceInfo(VOID) +{ + ULONG i; + NTSTATUS Status; + WCHAR StringBuffer[16]; + BOOLEAN HasDebuggingDevice = FALSE; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\" + L"CurrentControlSet\\Services\\PCI\\Debug"); + HANDLE Handle, KeyHandle; + + PAGED_CODE(); + + for (i = 0; i < RTL_NUMBER_OF(HalpPciDebuggingDevice); ++i) + { + if (HalpPciDebuggingDevice[i].InUse) + { + HasDebuggingDevice = TRUE; + break; + } + } + if (!HasDebuggingDevice) + { + /* Nothing to register */ + return; + } + + Status = HalpOpenRegistryKey(&Handle, 0, &KeyName, KEY_ALL_ACCESS, TRUE); + if (!NT_SUCCESS(Status)) + return; + + for (i = 0; i < RTL_NUMBER_OF(HalpPciDebuggingDevice); ++i) + { + ULONG Value; + PCI_SLOT_NUMBER PciSlot; + + if (!HalpPciDebuggingDevice[i].InUse) + continue; + + RtlInitEmptyUnicodeString(&KeyName, StringBuffer, sizeof(StringBuffer)); + RtlIntegerToUnicodeString(i, 10, &KeyName); + Status = HalpOpenRegistryKey(&KeyHandle, + Handle, + &KeyName, + KEY_ALL_ACCESS, + TRUE); + if (!NT_SUCCESS(Status)) + continue; + + Value = HalpPciDebuggingDevice[i].BusNumber; + RtlInitUnicodeString(&KeyName, L"Bus"); + ZwSetValueKey(KeyHandle, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + + PciSlot.u.AsULONG = 0; + PciSlot.u.bits.DeviceNumber = HalpPciDebuggingDevice[i].DeviceNumber; + PciSlot.u.bits.FunctionNumber = HalpPciDebuggingDevice[i].FunctionNumber; + Value = PciSlot.u.AsULONG; + RtlInitUnicodeString(&KeyName, L"Slot"); + ZwSetValueKey(KeyHandle, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + + ZwClose(KeyHandle); + } + + ZwClose(Handle); +} + +/** + * @brief + * Releases the PCI device MMIO mappings + * previously allocated with HalpSetupPciDeviceForDebugging(). + * + * This is used to release resources when a device specific initialization fails. + * + * @param[in,out] PciDevice + * Pointer to the debug device descriptor, whose mappings are to be released. + * + * @return STATUS_SUCCESS. + */ +CODE_SEG("INIT") +NTSTATUS +NTAPI +HalpReleasePciDeviceForDebugging( + _Inout_ PDEBUG_DEVICE_DESCRIPTOR PciDevice) +{ + ULONG i; + + DPRINT0("%s(%p) called\n", __FUNCTION__, PciDevice); + + for (i = 0; i < MAXIMUM_DEBUG_BARS; ++i) + { + PDEBUG_DEVICE_ADDRESS DeviceAddress = &PciDevice->BaseAddress[i]; + + if (DeviceAddress->Type == CmResourceTypeMemory && DeviceAddress->Valid) + { + HalpUnmapVirtualAddress(DeviceAddress->TranslatedAddress, + BYTES_TO_PAGES(DeviceAddress->Length)); + + DeviceAddress->Valid = FALSE; + } + } + + return STATUS_SUCCESS; +} + +/** + * @brief + * Finds and fully initializes the PCI device + * associated with the supplied debug device descriptor. + * + * @param[in] LoaderBlock + * Pointer to the Loader parameter block. Can be NULL. + * + * @param[in,out] PciDevice + * Pointer to the debug device descriptor. + * + * @return Status. + * + * This routine is used to match devices to debug device descriptors during + * boot phase of the system. This function will search the first device that + * matches the criteria given by the fields of the debug device descriptor. + * A value of all 1's for the field will indicate that the function + * should ignore that field in the search criteria. + * The @c Length field of the debug memory requirements optionally specifies + * library-determined number of bytes to be allocated for the device context. + * + * Example: + * @code + * RtlZeroMemory(&PciDevice, sizeof(DEBUG_DEVICE_DESCRIPTOR)); + * PciDevice.VendorID = 0xFFFF; + * PciDevice.DeviceID = 0xFFFF; + * PciDevice.Bus = 0xFFFFFFFF; + * PciDevice.Slot = 0xFFFFFFFF; + * PciDevice.BaseClass = PCI_CLASS_SERIAL_BUS_CTLR; + * PciDevice.SubClass = PCI_SUBCLASS_SB_USB; + * PciDevice.ProgIf = 0x30; + * PciDevice.Memory.Length = sizeof(HW_EXTENSION); + * @endcode + * + * @sa HalpReleasePciDeviceForDebugging + */ +CODE_SEG("INIT") +NTSTATUS +NTAPI +HalpSetupPciDeviceForDebugging( + _In_opt_ PVOID LoaderBlock, + _Inout_ PDEBUG_DEVICE_DESCRIPTOR PciDevice) +{ + ULONG i; + ULONG64 MaxAddress; + PFN_NUMBER PageCount; + PCI_SLOT_NUMBER PciSlot; + PHYSICAL_ADDRESS PhysicalAddress; + PPCI_TYPE1_CFG_CYCLE_BITS DebuggingDevice; + +#if defined(EARLY_DEBUG) + if (LoaderBlock) + { + /* Define your own function or use the trick with FreeLoader */ + DPRINT0 = ((PLOADER_PARAMETER_BLOCK)LoaderBlock)->u.I386.CommonDataArea; + } +#endif + + DPRINT0("%s(%p, %p) called\n", __FUNCTION__, LoaderBlock, PciDevice); + + if (!HalpFindMatchingDebuggingDevice(PciDevice)) + { + DPRINT0("No device found matching given device descriptor!\n"); + return STATUS_DEVICE_DOES_NOT_EXIST; + } + + if (PciDevice->Initialized) + return STATUS_SUCCESS; + + PciSlot.u.AsULONG = PciDevice->Slot; + + /* Check if the device is already present */ + for (i = 0; i < RTL_NUMBER_OF(HalpPciDebuggingDevice); ++i) + { + DebuggingDevice = &HalpPciDebuggingDevice[i]; + + if (DebuggingDevice->InUse && + DebuggingDevice->DeviceNumber == PciSlot.u.bits.DeviceNumber && + DebuggingDevice->FunctionNumber == PciSlot.u.bits.FunctionNumber && + DebuggingDevice->BusNumber == PciDevice->Bus) + { + DPRINT0("Device %p(0x%lx) is already in use!\n", PciDevice, PciDevice->Slot); + return STATUS_UNSUCCESSFUL; + } + } + + /* Save the device location */ + for (i = 0; i < RTL_NUMBER_OF(HalpPciDebuggingDevice); ++i) + { + DebuggingDevice = &HalpPciDebuggingDevice[i]; + + if (!DebuggingDevice->InUse) + { + DebuggingDevice->DeviceNumber = PciSlot.u.bits.DeviceNumber; + DebuggingDevice->FunctionNumber = PciSlot.u.bits.FunctionNumber; + DebuggingDevice->BusNumber = PciDevice->Bus; + DebuggingDevice->InUse = TRUE; + + PciDevice->Initialized = TRUE; + break; + } + } + if (i == RTL_NUMBER_OF(HalpPciDebuggingDevice)) + { + DPRINT0("Maximum device count reached!\n"); + return STATUS_UNSUCCESSFUL; + } + + if (!PciDevice->Memory.Length) + return STATUS_SUCCESS; + + if (!LoaderBlock) + return STATUS_INVALID_PARAMETER_1; + + if (!PciDevice->Memory.MaxEnd.QuadPart) + { + PciDevice->Memory.MaxEnd.QuadPart = (ULONG64)-1; + } + MaxAddress = min(PciDevice->Memory.MaxEnd.QuadPart, 0xFFFFFFFF); + PageCount = BYTES_TO_PAGES(PciDevice->Memory.Length); + + /* Allocate the device context */ + PhysicalAddress.QuadPart = HalpAllocPhysicalMemory(LoaderBlock, + MaxAddress, + PageCount, + FALSE); + PciDevice->Memory.Start = PhysicalAddress; + if (!PhysicalAddress.QuadPart) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + PciDevice->Memory.VirtualAddress = HalpMapPhysicalMemory64(PhysicalAddress, PageCount); + + return STATUS_SUCCESS; +} diff --git a/hal/halx86/include/bus.h b/hal/halx86/include/bus.h index 75a106a4328..3e8fa82e13e 100644 --- a/hal/halx86/include/bus.h +++ b/hal/halx86/include/bus.h @@ -244,21 +244,18 @@ typedef struct _PCI_TYPE0_CFG_CYCLE_BITS } u; } PCI_TYPE0_CFG_CYCLE_BITS, *PPCI_TYPE0_CFG_CYCLE_BITS; -typedef struct _PCI_TYPE1_CFG_CYCLE_BITS +typedef union _PCI_TYPE1_CFG_CYCLE_BITS { - union + struct { - struct - { - ULONG Reserved1:2; - ULONG RegisterNumber:6; - ULONG FunctionNumber:3; - ULONG DeviceNumber:5; - ULONG BusNumber:8; - ULONG Reserved2:8; - } bits; - ULONG AsULONG; - } u; + ULONG InUse:2; + ULONG RegisterNumber:6; + ULONG FunctionNumber:3; + ULONG DeviceNumber:5; + ULONG BusNumber:8; + ULONG Reserved2:8; + }; + ULONG AsULONG; } PCI_TYPE1_CFG_CYCLE_BITS, *PPCI_TYPE1_CFG_CYCLE_BITS; typedef struct _ARRAY @@ -396,6 +393,24 @@ HalpAssignPCISlotResources( IN OUT PCM_RESOURCE_LIST *pAllocatedResources ); +CODE_SEG("INIT") +ULONG +HalpPhase0GetPciDataByOffset( + _In_ ULONG Bus, + _In_ PCI_SLOT_NUMBER PciSlot, + _Out_writes_bytes_all_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); + +CODE_SEG("INIT") +ULONG +HalpPhase0SetPciDataByOffset( + _In_ ULONG Bus, + _In_ PCI_SLOT_NUMBER PciSlot, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); + /* NON-LEGACY */ ULONG diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index 402f60b66d9..1098eb0629c 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -17,8 +17,6 @@ extern BOOLEAN HalpPciLockSettings; ULONG HalpBusType; -PCI_TYPE1_CFG_CYCLE_BITS HalpPciDebuggingDevice[2] = {{{{0}}}}; - BOOLEAN HalpPCIConfigInitialized; ULONG HalpMinPciBus, HalpMaxPciBus; KSPIN_LOCK HalpPCIConfigLock; @@ -302,21 +300,23 @@ HalpWritePCIConfig(IN PBUS_HANDLER BusHandler, } #ifdef SARCH_XBOX +static BOOLEAN -NTAPI -HalpXboxBlacklistedPCISlot(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot) +HalpXboxBlacklistedPCISlot( + _In_ ULONG BusNumber, + _In_ PCI_SLOT_NUMBER Slot) { /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely * hang the Xbox. Also, the device number doesn't seem to be decoded for the * video card, so it appears to be present on 1:0:0 - 1:31:0. * We hack around these problems by indicating "device not present" for devices * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + if ((BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + (BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) { - DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", + BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); return TRUE; } @@ -339,7 +339,8 @@ HalpValidPCISlot(IN PBUS_HANDLER BusHandler, if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; #ifdef SARCH_XBOX - if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) return FALSE; + if (HalpXboxBlacklistedPCISlot(BusHandler->BusNumber, Slot)) + return FALSE; #endif /* Function 0 doesn't need checking */ @@ -362,6 +363,143 @@ HalpValidPCISlot(IN PBUS_HANDLER BusHandler, return TRUE; } +CODE_SEG("INIT") +ULONG +HalpPhase0GetPciDataByOffset( + _In_ ULONG Bus, + _In_ PCI_SLOT_NUMBER PciSlot, + _Out_writes_bytes_all_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) +{ + ULONG BytesLeft = Length; + PUCHAR BufferPtr = Buffer; + PCI_TYPE1_CFG_BITS PciCfg; + +#ifdef SARCH_XBOX + if (HalpXboxBlacklistedPCISlot(Bus, PciSlot)) + { + RtlFillMemory(Buffer, Length, 0xFF); + return Length; + } +#endif + + PciCfg.u.AsULONG = 0; + PciCfg.u.bits.BusNumber = Bus; + PciCfg.u.bits.DeviceNumber = PciSlot.u.bits.DeviceNumber; + PciCfg.u.bits.FunctionNumber = PciSlot.u.bits.FunctionNumber; + PciCfg.u.bits.Enable = TRUE; + + while (BytesLeft) + { + ULONG i; + + PciCfg.u.bits.RegisterNumber = Offset / sizeof(ULONG); + WRITE_PORT_ULONG((PULONG)PCI_TYPE1_ADDRESS_PORT, PciCfg.u.AsULONG); + + i = PCIDeref[Offset % sizeof(ULONG)][BytesLeft % sizeof(ULONG)]; + switch (i) + { + case 0: + { + *(PULONG)BufferPtr = READ_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT); + + /* Number of bytes read */ + i = sizeof(ULONG); + break; + } + case 1: + { + *BufferPtr = READ_PORT_UCHAR((PUCHAR)(PCI_TYPE1_DATA_PORT + + Offset % sizeof(ULONG))); + break; + } + case 2: + { + *(PUSHORT)BufferPtr = READ_PORT_USHORT((PUSHORT)(PCI_TYPE1_DATA_PORT + + Offset % sizeof(ULONG))); + break; + } + + DEFAULT_UNREACHABLE; + } + + Offset += i; + BufferPtr += i; + BytesLeft -= i; + } + + return Length; +} + +CODE_SEG("INIT") +ULONG +HalpPhase0SetPciDataByOffset( + _In_ ULONG Bus, + _In_ PCI_SLOT_NUMBER PciSlot, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) +{ + ULONG BytesLeft = Length; + PUCHAR BufferPtr = Buffer; + PCI_TYPE1_CFG_BITS PciCfg; + +#ifdef SARCH_XBOX + if (HalpXboxBlacklistedPCISlot(Bus, PciSlot)) + { + return 0; + } +#endif + + PciCfg.u.AsULONG = 0; + PciCfg.u.bits.BusNumber = Bus; + PciCfg.u.bits.DeviceNumber = PciSlot.u.bits.DeviceNumber; + PciCfg.u.bits.FunctionNumber = PciSlot.u.bits.FunctionNumber; + PciCfg.u.bits.Enable = TRUE; + + while (BytesLeft) + { + ULONG i; + + PciCfg.u.bits.RegisterNumber = Offset / sizeof(ULONG); + WRITE_PORT_ULONG((PULONG)PCI_TYPE1_ADDRESS_PORT, PciCfg.u.AsULONG); + + i = PCIDeref[Offset % sizeof(ULONG)][BytesLeft % sizeof(ULONG)]; + switch (i) + { + case 0: + { + WRITE_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT, *(PULONG)BufferPtr); + + /* Number of bytes written */ + i = sizeof(ULONG); + break; + } + case 1: + { + WRITE_PORT_UCHAR((PUCHAR)(PCI_TYPE1_DATA_PORT + Offset % sizeof(ULONG)), + *BufferPtr); + break; + } + case 2: + { + WRITE_PORT_USHORT((PUSHORT)(PCI_TYPE1_DATA_PORT + Offset % sizeof(ULONG)), + *(PUSHORT)BufferPtr); + break; + } + + DEFAULT_UNREACHABLE; + } + + Offset += i; + BufferPtr += i; + BytesLeft -= i; + } + + return Length; +} + /* HAL PCI CALLBACKS *********************************************************/ ULONG @@ -380,14 +518,10 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX - if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) + if (HalpXboxBlacklistedPCISlot(BusHandler->BusNumber, Slot)) { - if (Offset == 0 && Length >= sizeof(USHORT)) - { - *(PUSHORT)Buffer = PCI_INVALID_VENDORID; - return sizeof(USHORT); - } - return 0; + RtlFillMemory(Buffer, Length, 0xFF); + return Length; } #endif @@ -464,7 +598,8 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX - if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) return 0; + if (HalpXboxBlacklistedPCISlot(BusHandler->BusNumber, Slot)) + return 0; #endif /* Normalize the length */ @@ -607,53 +742,6 @@ HalpGetISAFixedPCIIrq(IN PBUS_HANDLER BusHandler, (*Range)->Limit = PciData.u.type0.InterruptLine; return STATUS_SUCCESS; } - -CODE_SEG("INIT") -NTSTATUS -NTAPI -HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock, - IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) -{ - DPRINT1("Unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; -} - -CODE_SEG("INIT") -NTSTATUS -NTAPI -HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) -{ - DPRINT1("Unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; -} - -CODE_SEG("INIT") -VOID -NTAPI -HalpRegisterPciDebuggingDeviceInfo(VOID) -{ - BOOLEAN Found = FALSE; - ULONG i; - PAGED_CODE(); - - /* Loop PCI debugging devices */ - for (i = 0; i < 2; i++) - { - /* Reserved bit is set if we found one */ - if (HalpPciDebuggingDevice[i].u.bits.Reserved1) - { - Found = TRUE; - break; - } - } - - /* Bail out if there aren't any */ - if (!Found) return; - - /* FIXME: TODO */ - UNIMPLEMENTED_DBGBREAK("You have implemented the KD routines for searching PCI debugger" - "devices, but you have forgotten to implement this routine\n"); -} #endif // _MINIHAL_ static ULONG NTAPI diff --git a/hal/halx86/pc98.cmake b/hal/halx86/pc98.cmake index b88fbe87ddb..3a46043df3a 100644 --- a/hal/halx86/pc98.cmake +++ b/hal/halx86/pc98.cmake @@ -13,6 +13,7 @@ list(APPEND HAL_PC98_SOURCE generic/dma.c generic/drive.c generic/halinit.c + generic/kdpci.c generic/memory.c generic/misc.c generic/nmi.c diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index 9b4a6dfc20f..90db5a730b3 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -12,6 +12,7 @@ list(APPEND HAL_XBOX_SOURCE generic/dma.c generic/drive.c generic/halinit.c + generic/kdpci.c generic/memory.c generic/misc.c generic/nmi.c

2 years, 6 months

[reactos] 01/01: [DISKPART] Add help text for the DETAIL DISK command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=216d69c59e8809eb56880… commit 216d69c59e8809eb56880be15b7605ec662d3871 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 5 22:22:16 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 5 22:22:16 2022 +0200 [DISKPART] Add help text for the DETAIL DISK command --- base/system/diskpart/diskpart_msg.mc | 115 +++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 12 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index d079e2dc190..7fc7419829b 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -531,7 +531,7 @@ Syntax: CLEAN [ALL] that had been previously applied to the disk. The disk's state after cleaning the disk is 'UNINITIALIZED'. -Example: +Beispiel: CLEAN . @@ -1047,7 +1047,7 @@ Syntax: DELETE PARTITION [NOERR] [OVERRIDE] Partitionen könnnen nicht von dynamischen Datenträgern gelöscht oder auf dynamischen Datenträgern erstellt werden. -Example: +Beispiel: DELETE PARTITION . @@ -1302,34 +1302,125 @@ SymbolicName=MSG_COMMAND_DETAIL_DISK Severity=Informational Facility=System Language=English -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=German -<Add DETAIL DISK command help text here> + Zeigt die Eigenschaften des ausgewählten Datenträgers und die Liste der + Volumes auf dem Datenträger an. + +Syntax: DETAIL DISK + + Damit dieser Vorgang erfolgreich ausgeführt werden kann, muss ein + Datenträger ausgewählt sein. + +Beispiel: + + DETAIL DISK . Language=Polish -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Portugese -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Romanian -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Russian -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Albanian -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Turkish -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Chinese -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . Language=Taiwanese -<Add DETAIL DISK command help text here> + Displays the properties of the selected disk and the list of volumes on + the disk. + +Syntax: DETAIL DISK + + A disk must be selected for this operation to succeed. + +Example: + + DETAIL DISK . MessageId=10020

2 years, 6 months

[reactos] 01/01: [DISKPART] Implements part of the FILESYSTEMS command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be88af54e7382703334ef… commit be88af54e7382703334efc89f0fccaa45e8dc86e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 5 18:23:08 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 5 18:23:08 2022 +0200 [DISKPART] Implements part of the FILESYSTEMS command --- base/system/diskpart/diskpart_msg.mc | 364 +++++++++++++++++++++++++++++++++-- base/system/diskpart/filesystems.c | 25 ++- base/system/diskpart/lang/de-DE.rc | 8 + base/system/diskpart/lang/en-US.rc | 8 + base/system/diskpart/lang/pl-PL.rc | 8 + base/system/diskpart/lang/pt-PT.rc | 8 + base/system/diskpart/lang/ro-RO.rc | 8 + base/system/diskpart/lang/ru-RU.rc | 8 + base/system/diskpart/lang/sq-AL.rc | 8 + base/system/diskpart/lang/tr-TR.rc | 8 + base/system/diskpart/lang/zh-CN.rc | 8 + base/system/diskpart/lang/zh-TW.rc | 8 + base/system/diskpart/resource.h | 6 + 13 files changed, 454 insertions(+), 21 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 248238e30ef..d079e2dc190 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -998,34 +998,266 @@ SymbolicName=MSG_COMMAND_DELETE_PARTITION Severity=Informational Facility=System Language=English -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=German -<Add DELETE PARTITION command help text here> +Löscht die Partition, die den Fokus hat. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR Nur für Skripting. Bei einem Fehler setzt DiskPart die + Verarbeitung von Befehlen fort, als sei der Fehler nicht + aufgetreten. Ohne den Parameter NOERR wird DiskPart bei + einem Fehler mit dem entsprechenden Fehlercode beendet. + + OVERRIDE Ermöglicht DiskPart das Löschen einer beliebigen Partition + unabhängig von deren Typ. Normalerweise gestattet DiskPart + nur das Löschen bekannter Datenpartitionen. + + Sie können keine Systempartition, Startpartition oder Partition löschen, + die eine aktive Auslagerungsdatei oder ein Absturzabbild (Speicherabbild) + enthält. + + Damit dieser Vorgang erfolgreich ausgeführt werden kann, muss eine + Partition ausgewählt sein. + + Partitionen könnnen nicht von dynamischen Datenträgern gelöscht oder auf + dynamischen Datenträgern erstellt werden. + +Example: + + DELETE PARTITION . Language=Polish -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Portugese -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Romanian -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Russian -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Albanian -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Turkish -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Chinese -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . Language=Taiwanese -<Add DELETE PARTITION command help text here> +Deletes the partition with focus. + +Syntax: DELETE PARTITION [NOERR] [OVERRIDE] + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + OVERRIDE Enables DiskPart to delete any partition regardless of type. + Typically, DiskPart only permits you to delete known data + partitions. + + You cannot delete the system partition, boot partition, or any partition + that contains the active paging file or crash dump (memory dump) filed. + + A partition must be selected for this operation to succeed. + + Partitions cannot be deleted from dynamic disks or created on dynamic + disks. + +Example: + + DELETE PARTITION . @@ -1380,34 +1612,126 @@ SymbolicName=MSG_COMMAND_FILESYSTEMS Severity=Informational Facility=System Language=English -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=German -<Add FILESYSTEMS command help text here> + Zeigt Informationen zum aktuelle Dateisystem für das ausgewählte + Volume und die unterstützten Dateisysteme zum Formatieren des + Volumes an. + +Syntax: FILESYSTEMS + + Damit diesr Vorgang erfolgreich ausgeführt werden kann, muss ein + Volume ausgewählt sein. + +Beispiel: + + FILESYSTEMS . Language=Polish -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Portugese -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Romanian -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Russian -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Albanian -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Turkish -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Chinese -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . Language=Taiwanese -<Add FILESYSTEMS command help text here> + Displays information about the current file system for the selected + volume, and the supported file systems for formatting the volume. + +Syntax: FILESYSTEMS + + A volume must be selected for this operation to succeed. + +Example: + + FILESYSTEMS . diff --git a/base/system/diskpart/filesystems.c b/base/system/diskpart/filesystems.c index 835b77c4ea8..9257068746a 100644 --- a/base/system/diskpart/filesystems.c +++ b/base/system/diskpart/filesystems.c @@ -8,7 +8,30 @@ #include "diskpart.h" -BOOL filesystems_main(INT argc, LPWSTR *argv) +#define NDEBUG +#include <debug.h> + + +BOOL +filesystems_main( + _In_ INT argc, + _In_ PWSTR *argv) { + if (CurrentVolume == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_VOLUME); + return TRUE; + } + + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_FILESYSTEMS_CURRENT); + ConPuts(StdOut, L"\n"); + ConResPrintf(StdOut, IDS_FILESYSTEMS_TYPE, (CurrentVolume->pszFilesystem == NULL) ? L"RAW" : CurrentVolume->pszFilesystem); + ConResPrintf(StdOut, IDS_FILESYSTEMS_CLUSTERSIZE); + + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_FILESYSTEMS_FORMATTING); + ConPuts(StdOut, L"\n"); + return TRUE; } diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index 545a3550203..6265a226f9a 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -53,6 +53,14 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Aktuelles Dateisystem\n" + IDS_FILESYSTEMS_FORMATTING "Zur Formatierung unterstützte Dateisysteme\n" + IDS_FILESYSTEMS_TYPE "Typ : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Größe der Zuordnungseinheit: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 6657371ba78..a52b7a65b51 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -53,6 +53,14 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 296bbf2162b..db7010f8a56 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -53,6 +53,14 @@ BEGIN IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index fbeb8f17e51..dce4306f7d4 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -70,6 +70,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index aef9208a70e..61163ea77bd 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -70,6 +70,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index a567169c125..a5b1261311a 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -70,6 +70,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 1be40265462..3ba5d1c51af 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -72,6 +72,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 1e65d05eff2..1e2728f2ff1 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -70,6 +70,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 67df9b92f1c..6d5d13322a1 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -77,6 +77,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 7e51bc5d8c8..b3c84a90ee7 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -71,6 +71,14 @@ BEGIN IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END +STRINGTABLE +BEGIN + IDS_FILESYSTEMS_CURRENT "Current Filesystem\n" + IDS_FILESYSTEMS_FORMATTING "Filesystems available for formatting\n" + IDS_FILESYSTEMS_TYPE "Type : %s\n" + IDS_FILESYSTEMS_CLUSTERSIZE "Cluster size: \n" +END + STRINGTABLE BEGIN IDS_HELP_FORMAT_STRING "%-11.11s - %s" diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 44329febfdf..dbf28649036 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -24,6 +24,12 @@ #define IDS_DELETE_PARTITION_FAIL 1070 #define IDS_DELETE_PARTITION_SUCCESS 1071 +#define IDS_FILESYSTEMS_CURRENT 1090 +#define IDS_FILESYSTEMS_FORMATTING 1091 +#define IDS_FILESYSTEMS_TYPE 1092 +#define IDS_FILESYSTEMS_CLUSTERSIZE 1093 + + #define IDS_DETAIL_INFO_DISK_ID 1107 #define IDS_DETAIL_INFO_TYPE 1108 #define IDS_DETAIL_INFO_STATUS 1109

2 years, 6 months

[reactos] 01/01: [DISKPART] Add the SET command as a SETID alias

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3d5eae19e1f6890e6390… commit d3d5eae19e1f6890e6390fab0d6f8f044bf61835 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 5 17:36:32 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 5 17:36:32 2022 +0200 [DISKPART] Add the SET command as a SETID alias --- base/system/diskpart/interpreter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 08be9411fdb..34fdd034d68 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -86,6 +86,7 @@ COMMAND cmds[] = {L"SELECT", L"VOLUME", NULL, SelectVolume, IDS_HELP_SELECT_VOLUME, MSG_COMMAND_SELECT_VOLUME}, // {L"SELECT", L"VDISK", NULL, SelectVirtualDisk, IDS_HELP_SELECT_VDISK, MSG_COMMAND_SELECT_VDISK}, + {L"SET", NULL, NULL, setid_main, IDS_HELP_SETID, MSG_COMMAND_SETID}, {L"SETID", NULL, NULL, setid_main, IDS_HELP_SETID, MSG_COMMAND_SETID}, {L"SHRINK", NULL, NULL, shrink_main, IDS_HELP_SHRINK, MSG_COMMAND_SHRINK},

2 years, 6 months

[reactos] 01/01: [DISKPART] Implement the OVERRIDE option for the DELETE PARTITION command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c70f5033ec01c8a9bed5b… commit c70f5033ec01c8a9bed5b71f12b184db135daf95 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 5 10:30:55 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 5 10:30:55 2022 +0200 [DISKPART] Implement the OVERRIDE option for the DELETE PARTITION command --- base/system/diskpart/delete.c | 46 +++++++++++++++++++++++++++++++++++++++++ base/system/diskpart/diskpart.h | 1 + 2 files changed, 47 insertions(+) diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c index 6841b3d9a27..feb66e58c9a 100644 --- a/base/system/diskpart/delete.c +++ b/base/system/diskpart/delete.c @@ -11,6 +11,19 @@ #define NDEBUG #include <debug.h> +static +BOOL +IsKnownPartition( + _In_ PPARTENTRY PartEntry) +{ + if (IsRecognizedPartition(PartEntry->PartitionType) || + IsContainerPartition(PartEntry->PartitionType)) + return TRUE; + + return FALSE; +} + + BOOL DeleteDisk( _In_ INT argc, @@ -29,6 +42,8 @@ DeletePartition( PPARTENTRY NextPartEntry; PPARTENTRY LogicalPartEntry; PLIST_ENTRY Entry; + INT i; + BOOL bOverride = FALSE; NTSTATUS Status; DPRINT("DeletePartition()\n"); @@ -47,6 +62,31 @@ DeletePartition( ASSERT(CurrentPartition->PartitionType != PARTITION_ENTRY_UNUSED); + for (i = 2; i < argc; i++) + { + if (_wcsicmp(argv[i], L"noerr") == 0) + { + /* noerr */ + DPRINT("NOERR\n"); + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif + } + else if (_wcsicmp(argv[i], L"override") == 0) + { + /* noerr */ + DPRINT("OVERRIDE\n"); + bOverride = TRUE; + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + + /* Clear the system partition if it is being deleted */ #if 0 if (List->SystemPartition == PartEntry) @@ -56,6 +96,12 @@ DeletePartition( } #endif + if ((bOverride == FALSE) && (IsKnownPartition(CurrentPartition) == FALSE)) + { + ConResPuts(StdOut, IDS_DELETE_PARTITION_FAIL); + return FALSE; + } + /* Check which type of partition (primary/logical or extended) is being deleted */ if (CurrentDisk->ExtendedPartition == CurrentPartition) { diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 755dc7b44c4..fbf63bc7dc4 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -19,6 +19,7 @@ #include <winbase.h> #include <winreg.h> #include <wincon.h> +#include <winioctl.h> #include <errno.h>

2 years, 6 months

[reactos] 01/01: [DISKPART] Add success and failure messages for the DELETE PARTITION command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58eb4e5bde8df108ab4b9… commit 58eb4e5bde8df108ab4b91ba319c343257e21204 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 5 08:47:22 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 5 08:47:46 2022 +0200 [DISKPART] Add success and failure messages for the DELETE PARTITION command --- base/system/diskpart/delete.c | 10 +++++++++- base/system/diskpart/lang/de-DE.rc | 6 ++++++ base/system/diskpart/lang/en-US.rc | 6 ++++++ base/system/diskpart/lang/pl-PL.rc | 6 ++++++ base/system/diskpart/lang/pt-PT.rc | 6 ++++++ base/system/diskpart/lang/ro-RO.rc | 6 ++++++ base/system/diskpart/lang/ru-RU.rc | 6 ++++++ base/system/diskpart/lang/sq-AL.rc | 6 ++++++ base/system/diskpart/lang/tr-TR.rc | 6 ++++++ base/system/diskpart/lang/zh-CN.rc | 6 ++++++ base/system/diskpart/lang/zh-TW.rc | 6 ++++++ base/system/diskpart/resource.h | 2 ++ 12 files changed, 71 insertions(+), 1 deletion(-) diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c index c17498bd863..6841b3d9a27 100644 --- a/base/system/diskpart/delete.c +++ b/base/system/diskpart/delete.c @@ -29,6 +29,7 @@ DeletePartition( PPARTENTRY NextPartEntry; PPARTENTRY LogicalPartEntry; PLIST_ENTRY Entry; + NTSTATUS Status; DPRINT("DeletePartition()\n"); @@ -139,7 +140,14 @@ DeletePartition( CurrentPartition = NULL; UpdateDiskLayout(CurrentDisk); - WritePartitions(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (!NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_DELETE_PARTITION_FAIL); + return TRUE; + } + + ConResPuts(StdOut, IDS_DELETE_PARTITION_SUCCESS); return TRUE; } diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index 4b7b5a2836d..545a3550203 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -21,6 +21,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDie angegebene Partition wurde erfolgreich erstellt.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDie gewählte Partition konnte nicht gelöscht werden.\nVergewissern Sie sich, dass die Partition wirklich gelöscht werden kann.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDer gewählte Partition wurde erfolgreich gelöscht.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 07f4c0a5fe7..6657371ba78 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -21,6 +21,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 662761d248c..296bbf2162b 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -21,6 +21,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 176a551d0e6..fbeb8f17e51 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -23,6 +23,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index b867bd0befe..aef9208a70e 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -23,6 +23,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index 9867d475e57..a567169c125 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -23,6 +23,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 9e6948e20a8..1be40265462 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -25,6 +25,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 45a8e740645..1e65d05eff2 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -23,6 +23,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 810919c5b40..67df9b92f1c 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -30,6 +30,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index bfc4599ee8d..7e51bc5d8c8 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -24,6 +24,12 @@ BEGIN IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" END +STRINGTABLE +BEGIN + IDS_DELETE_PARTITION_FAIL "\nDiskPart failed to delete the selected partition.\nPlease make sure the selected partition is valid to delete.\n" + IDS_DELETE_PARTITION_SUCCESS "\nDiskPart successfully deleted the selected partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 3081fc4ef87..44329febfdf 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -21,6 +21,8 @@ #define IDS_CREATE_PARTITION_FAIL 1050 #define IDS_CREATE_PARTITION_SUCCESS 1051 +#define IDS_DELETE_PARTITION_FAIL 1070 +#define IDS_DELETE_PARTITION_SUCCESS 1071 #define IDS_DETAIL_INFO_DISK_ID 1107 #define IDS_DETAIL_INFO_TYPE 1108

2 years, 6 months

[reactos] 01/01: [NTOS:MM] Fix memory leak in NtAllocateVirtualMemory

by Tuur Martens

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d31642c712a2b35ff0247… commit d31642c712a2b35ff024707a32c2783f15d16215 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Fri Jun 3 17:46:28 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Jun 4 22:44:27 2022 +0200 [NTOS:MM] Fix memory leak in NtAllocateVirtualMemory When an allocated VAD's insertion fails, the VAD is not freed. This commit attempts to fix this behaviour. --- ntoskrnl/mm/ARM3/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index c5c5a5283b0..4f5cd1b016b 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -4787,6 +4787,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the VAD!\n"); + ExFreePoolWithTag(Vad, 'SdaV'); goto FailPathNoLock; }

2 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2022