Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CI] Increase operations-per-run for the stale script
by Mark Jansen 04 Jun '22

04 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b60408c9f15f36c53871e… commit b60408c9f15f36c53871ee0bd2308a05176dbc1f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 4 20:35:01 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 4 20:35:01 2022 +0200 [CI] Increase operations-per-run for the stale script --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index a243274f9f8..5ffbec47d18 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -29,4 +29,4 @@ jobs: stale-pr-message: 'This PR is stale because it received no updates in the last 4 months. Without removing the stale label, or commenting on this ticket it will be closed in 2 weeks.' stale-issue-label: 'no-issue-activity' stale-pr-label: 'no-pr-activity' - operations-per-run: 50 + operations-per-run: 100

1 0

[reactos] 01/01: [DISKPART] Report success or failure for CREATE PARTITION commands
by Eric Kohl 04 Jun '22

04 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c797bf86a00e554ca231… commit 6c797bf86a00e554ca231b235ceed0c5e0e8fcaf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 4 20:27:11 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 4 20:27:11 2022 +0200 [DISKPART] Report success or failure for CREATE PARTITION commands --- base/system/diskpart/create.c | 42 +++++- base/system/diskpart/diskpart_msg.mc | 261 +++++++++++++++++++++++++++++++++-- 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 | 4 + 13 files changed, 353 insertions(+), 14 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 9617b7c4e60..52526573d85 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -27,6 +27,7 @@ CreateExtendedPartition( #endif INT i; PWSTR pszSuffix = NULL; + NTSTATUS Status; if (CurrentDisk == NULL) { @@ -128,6 +129,7 @@ CreateExtendedPartition( PartEntry->FormatState = Unformatted; PartEntry->FileSystemName[0] = L'\0'; + CurrentPartition = PartEntry; CurrentDisk->Dirty = TRUE; } else @@ -140,6 +142,7 @@ CreateExtendedPartition( PartEntry->FormatState = Unformatted; PartEntry->FileSystemName[0] = L'\0'; + CurrentPartition = PartEntry; CurrentDisk->Dirty = TRUE; } else if (PartEntry->SectorCount.QuadPart > ullSectorCount) @@ -168,12 +171,21 @@ CreateExtendedPartition( InsertTailList(ListEntry, &NewPartEntry->ListEntry); + CurrentPartition = NewPartEntry; CurrentDisk->Dirty = TRUE; } } UpdateDiskLayout(CurrentDisk); - WritePartitions(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (!NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_CREATE_PARTITION_FAIL); + CurrentPartition = NULL; + return TRUE; + } + + ConResPuts(StdOut, IDS_CREATE_PARTITION_SUCCESS); return TRUE; } @@ -195,6 +207,7 @@ CreateLogicalPartition( UCHAR PartitionType = 6; INT i, length; PWSTR pszSuffix = NULL; + NTSTATUS Status; if (CurrentDisk == NULL) { @@ -312,6 +325,7 @@ CreateLogicalPartition( PartEntry->FormatState = Unformatted; PartEntry->FileSystemName[0] = L'\0'; + CurrentPartition = PartEntry; CurrentDisk->Dirty = TRUE; break; } @@ -325,6 +339,7 @@ CreateLogicalPartition( PartEntry->FormatState = Unformatted; PartEntry->FileSystemName[0] = L'\0'; + CurrentPartition = PartEntry; CurrentDisk->Dirty = TRUE; break; } @@ -354,6 +369,7 @@ CreateLogicalPartition( InsertTailList(ListEntry, &NewPartEntry->ListEntry); + CurrentPartition = NewPartEntry; CurrentDisk->Dirty = TRUE; break; } @@ -361,7 +377,15 @@ CreateLogicalPartition( } UpdateDiskLayout(CurrentDisk); - WritePartitions(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (!NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_CREATE_PARTITION_FAIL); + CurrentPartition = NULL; + return TRUE; + } + + ConResPuts(StdOut, IDS_CREATE_PARTITION_SUCCESS); return TRUE; } @@ -383,6 +407,7 @@ CreatePrimaryPartition( UCHAR PartitionType = 6; INT i, length; PWSTR pszSuffix = NULL; + NTSTATUS Status; if (CurrentDisk == NULL) { @@ -506,6 +531,7 @@ CreatePrimaryPartition( PartEntry->FormatState = Unformatted; PartEntry->FileSystemName[0] = L'\0'; + CurrentPartition = PartEntry; CurrentDisk->Dirty = TRUE; break; } @@ -519,6 +545,7 @@ CreatePrimaryPartition( PartEntry->FormatState = Unformatted; PartEntry->FileSystemName[0] = L'\0'; + CurrentPartition = PartEntry; CurrentDisk->Dirty = TRUE; break; } @@ -548,6 +575,7 @@ CreatePrimaryPartition( InsertTailList(ListEntry, &NewPartEntry->ListEntry); + CurrentPartition = NewPartEntry; CurrentDisk->Dirty = TRUE; break; } @@ -555,7 +583,15 @@ CreatePrimaryPartition( } UpdateDiskLayout(CurrentDisk); - WritePartitions(CurrentDisk); + Status = WritePartitions(CurrentDisk); + if (!NT_SUCCESS(Status)) + { + ConResPuts(StdOut, IDS_CREATE_PARTITION_FAIL); + CurrentPartition = NULL; + return TRUE; + } + + ConResPuts(StdOut, IDS_CREATE_PARTITION_SUCCESS); return TRUE; } diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index ea90f9d9a6a..248238e30ef 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -492,34 +492,216 @@ SymbolicName=MSG_COMMAND_CLEAN Severity=Informational Facility=System Language=English -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=German -<Add CLEAN command help text here> + Entfernt alle Partitions- oder Volumeformatierungen von dem Datenträger + mit dem Fokus. + +Syntax: CLEAN [ALL] + + ALL Gibt an, dass jedes Byte\jeder Sektor auf dem Datenträger + auf Null gesetzt wird. Damit werden alle auf dem Datenträger + enthaltenen Daten vollständig gelöscht. + + Auf MBR-Datenträgern (Master Boot Record) werden nur MBR- + Partitionierungsinformationen und Informationen zu ausgeblendeten + Sektoren überschrieben. Auf GUID-Partitionstabellen-Datenträgern + (GPT) werden die GPT-Partitionierungsinformationen (einschließlich + Schutz-MBR) überschrieben. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Polish -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Portugese -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Romanian -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Russian -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Albanian -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Turkish -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Chinese -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . Language=Taiwanese -<Add CLEAN command help text here> + Removes any and all partition or volume formatting from the disk with + focus. + +Syntax: CLEAN [ALL] + + ALL Specifies that each and every byte\sector on the disk is set to + zero, which completely deletes all data contained on the disk. + + On master boot record (MBR) disks, only the MBR partitioning information + and hidden sector information are overwritten. On GUID partition table + (GPT) disks, the GPT partitioning information, including the Protective + MBR, is overwritten. If the ALL parameter is not used, the first 1MB + and the last 1MB of the disk are zeroed. This erases any disk formatting + that had been previously applied to the disk. The disk's state after + cleaning the disk is 'UNINITIALIZED'. + +Example: + + CLEAN . @@ -2325,7 +2507,64 @@ SymbolicName=MSG_COMMAND_SETID Severity=Informational Facility=System Language=English -<Add SETID command help text here> + Changes the partition type field for the partition with focus. + +Syntax: SET ID={<BYTE> | <GUID>} [OVERRIDE] [NOERR] + + ID={<BYTE> | <GUID>} + + Specifies the new partition type. + For master boot record (MBR) disks, you can specify a partition + type byte, in hexadecimal form, for the partition. Any + partition type byte can be specified with this parameter except + for type 0x42 (LDM partition). Note that the leading '0x' is + omitted when specifying the hexadecimal partition type. + + For GUID partition table (GPT) disks you can specify a + partition type GUID for the partition. Recognized GUIDs + include: + + EFI System partition: + c12a7328-f81f-11d2-ba4b-00a0c93ec93b + + Basic data partition: + ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 + + Any partition type GUID can be specified with this parameter + except for the following: + + Microsoft Reserved partition: + e3c9e316-0b5c-4db8-817d-f92df00215a + + LDM Metadata partition on a dynamic disk: + 5808c8aa-7e8f-42e0-85d2-e1e90434cfb3 + + LDM Data partition on a dynamic disk: + af9b60a0-1431-4f62-bc68-3311714a69ad + + Cluster Metadata partition: + db97dba9-0840-4bae-97f0-ffb9a327c7e1 + + + Other than the limitations mentioned, DiskPart otherwise does + not check the partition type for validity except to ensure that + it is a byte in hexadecimal form or a GUID. + + OVERRIDE Enables DiskPart to force the file system on the volume to + dismount before changing the partition type. When changing + the partition type, DiskPart will attempt to lock and dismount + the file system on the volume. If this parameter is not specified, + and the call to lock the file system fails, (because some other + application has an open handle to the volume), the entire + operation will fail. When this parameter is specified, the + dismount is forced even if the call to lock the file system + fails. When a file system is dismounted, all opened handles to + the volume will become invalid. + + 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 [...] . Language=German <Add SETID command help text here> diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index 85a656dd066..4b7b5a2836d 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -15,6 +15,12 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDie angegebene Partition konnte nicht erstellt werden.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDie angegebene Partition wurde erfolgreich erstellt.\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 1554d37cee8..07f4c0a5fe7 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -15,6 +15,12 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 f392db0f256..662761d248c 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -15,6 +15,12 @@ Sposób użycia: DISKPART [/S nazwa_pliku] [/T limit_czasu] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 b39f2027624..176a551d0e6 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -17,6 +17,12 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 337dc506afb..b867bd0befe 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -17,6 +17,12 @@ Utilizare: DISKPART [/S numefișier] [/T timplimită] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 320aaa12620..9867d475e57 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -17,6 +17,12 @@ BEGIN IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 d03ea2b3522..9e6948e20a8 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -19,6 +19,12 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT, "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 61099db6c2e..45a8e740645 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -17,6 +17,12 @@ Kullanım: DISKPART [/S dosya adı] [/T zaman aşımı] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 ab86d06dc8e..810919c5b40 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -24,6 +24,12 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified 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 fbdbf64992e..bfc4599ee8d 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -18,6 +18,12 @@ Usage: DISKPART [/S 檔名] [/T 逾時] [/?]\n\n\ IDS_APP_PROMPT "DISKPART> " END +STRINGTABLE +BEGIN + IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n" +END + /* Disk Information Labels */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 51a3946af55..3081fc4ef87 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -18,6 +18,10 @@ #define IDS_APP_LEAVING 4 #define IDS_APP_PROMPT 5 +#define IDS_CREATE_PARTITION_FAIL 1050 +#define IDS_CREATE_PARTITION_SUCCESS 1051 + + #define IDS_DETAIL_INFO_DISK_ID 1107 #define IDS_DETAIL_INFO_TYPE 1108 #define IDS_DETAIL_INFO_STATUS 1109

1 0

[reactos] 01/01: [DISKPART] Add help texts for the ACTIVE and INACTIVE commands
by Eric Kohl 04 Jun '22

04 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e636b14d7ec29c4ec9c47… commit e636b14d7ec29c4ec9c471a39ade4181f97d845d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 4 13:36:17 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 4 13:36:17 2022 +0200 [DISKPART] Add help texts for the ACTIVE and INACTIVE commands --- base/system/diskpart/diskpart_msg.mc | 454 +++++++++++++++++++++++++++++++++-- 1 file changed, 434 insertions(+), 20 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index d635439fcd1..ea90f9d9a6a 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -28,34 +28,245 @@ SymbolicName=MSG_COMMAND_ACTIVE Severity=Informational Facility=System Language=English -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=German -<Add ACTIVE command help text here> + Markiert auf Datenträgern mit MBR-Datenträgerformat (Master Boot + Record) die Partition, die den Fokus hat, als aktive Partition. + +Syntax: ACTIVE + + Schreibt einen Wert auf den Datenträger, der Beim Start vom BIOS + (Basic Input/Output System) gelesen wird. Durch diesen Wert wird + angegeben, dass die Partition eine gültige Systempartition ist. + + Damit dieser Vorgang erfolgreich ausgeführt werden kann, muss eine + Partition ausgewählt sein. + + Vorsicht: + + DiskPart überprüft nur, ob die Partition in der Lage ist, die + Startdateien des Betriebssystems aufzunehmen. Der Inhalt der Partition + wird hierbei nicht überprüft. Falls versehentlich eine Partition als + aktiv markiert wird, die nicht die Startdateien des Betriebssystems + enthält, kann der Computer möglicherweise nicht gestartet werden. + +Beispiel: + + ACTIVE . Language=Polish -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Portugese -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Romanian -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Russian -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Albanian -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Turkish -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Chinese -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . Language=Taiwanese -<Add ACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as active. + +Syntax: ACTIVE + + Writes a value to the disk which is read by the basic input/output + system (BIOS) at boot. This value specifies that the partition is + a valid system partition. + + A partition must be selected for this operation to succeed. + + Caution: + + DiskPart verifies only that the partition is capable of containing the + operating system startup files. DiskPart does not check the contents of + the partition. If you mistakenly mark a partition as active and it does + not contain the operating system startup files, your computer might not + start. + +Example: + + ACTIVE . @@ -1167,34 +1378,237 @@ SymbolicName=MSG_COMMAND_INACTIVE Severity=Informational Facility=System Language=English -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=German -<Add INACTIVE command help text here> + Markiert auf Datenträgern mit MBR-Datenträgerformat (Master Boot + Record) die Partition, die den Fokus hat, als inaktive Partition. + +Syntax: INACTIVE + + Der Computer kann über die nächste im BIOS angegebene Option gestartet + werden, z.B. von einem CD-ROM-Laufwerk oder aus einer PXE-basierten + (Pre-Boot eXecution Environment) Startumgebung (z.B. + Remoteinstallationsdienste, RIS), wenn der Computer neu startet. + + Damit dieser Vorgang erfolgreich ausgeführt werden kann, muss eine + Partition ausgewählt sein. + + Vorsicht: + + Möglicherweise kann der Computer nicht gestartet werden, wenn es + keine aktive Partition gibt. Markieren Sie eine System- oder + Startpartition nur dann als inaktiv, wenn Sie ein erfahrener + Benutzer und mit der ReactOS-Speicherverwaltung umfassend vertraut + sind. + +Beispiel: + + INACTIVE . Language=Polish -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Portugese -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Romanian -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Russian -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Albanian -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Turkish -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Chinese -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE . Language=Taiwanese -<Add INACTIVE command help text here> + On disks with master boot record (MBR) disk formatting, marks + the partition with focus as inactive. + +Syntax: INACTIVE + + The computer may start from the next option specified in the BIOS such as a + CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot + environment (such as Remote Installation Services (RIS)) when you restart + the computer. + + A partition must be selected for this operation to succeed. + + Caution: + + Your computer might not start without an active partition. Do not mark + a system or boot partition as inactive unless you are an experienced + user with a thorough understanding of Windows storage management. + +Example: + + INACTIVE .

1 0

[reactos] 01/01: [DISKPART] German translation part 1
by Eric Kohl 04 Jun '22

04 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3ff7ddd092cb4c8b983f… commit f3ff7ddd092cb4c8b983fc34c8a8d4af5ba81f26 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 4 11:44:57 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 4 11:44:57 2022 +0200 [DISKPART] German translation part 1 --- base/system/diskpart/lang/de-DE.rc | 124 ++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index ab80dc0022a..85a656dd066 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -105,74 +105,74 @@ END /* Help Command Descriptions */ STRINGTABLE BEGIN - IDS_HELP_ACTIVE "Mark the selected partition as active.\n" - IDS_HELP_ADD "Add a mirror to a simple volume.\n" - IDS_HELP_ASSIGN "Assign a drive letter or mount point to the selected volume.\n" - IDS_HELP_ATTACH "Attaches a virtual disk file.\n" - IDS_HELP_ATTRIBUTES "Manipulate volume or disk attributes.\n" - IDS_HELP_AUTOMOUNT "Enable and Disable automatic mounting of basic volumes.\n" - IDS_HELP_BREAK "Break a mirror set.\n" - IDS_HELP_CLEAN "Clear the configuration information, or all information, off\n the disk.\n" - IDS_HELP_COMPACT "Attempts to reduce the physical size of the file.\n" - IDS_HELP_CONVERT "Convert between different disk formats.\n" - - IDS_HELP_CREATE "Create a volume, partition, or virtual disk.\n" - IDS_HELP_CREATE_PARTITION "Create a partition.\n" - IDS_HELP_CREATE_PARTITION_EFI "Create an EFI system partition.\n" - IDS_HELP_CREATE_PARTITION_EXTENDED "Create an extended partition.\n" - IDS_HELP_CREATE_PARTITION_LOGICAL "Create a logical drive.\n" - IDS_HELP_CREATE_PARTITION_MSR "Create an MSR partition.\n" - IDS_HELP_CREATE_PARTITION_PRIMARY "Create a primary partition.\n" - IDS_HELP_CREATE_VOLUME "Create a volume.\n" - IDS_HELP_CREATE_VDISK "Create a virtual disk file.\n" - - IDS_HELP_DELETE "Delete an object.\n" - IDS_HELP_DELETE_DISK "Delete a disk.\n" - IDS_HELP_DELETE_PARTITION "Delete a partition.\n" - IDS_HELP_DELETE_VOLUME "Delete a volume.\n" - - IDS_HELP_DETACH "Detaches a virtual disk file.\n" - - IDS_HELP_DETAIL "Provide details about an object.\n" - IDS_HELP_DETAIL_DISK "Print disk details.\n" - IDS_HELP_DETAIL_PARTITION "Print partition details.\n" - IDS_HELP_DETAIL_VOLUME "Print volume details.\n" - - IDS_HELP_EXIT "Exit DiskPart.\n" - IDS_HELP_EXPAND "Expands the maximum size available on a virtual disk.\n" - IDS_HELP_EXTEND "Extend a volume.\n" - IDS_HELP_FILESYSTEMS "Display current and supported file systems on the volume.\n" - IDS_HELP_FORMAT "Format the volume or partition.\n" - IDS_HELP_GPT "Assign attributes to the selected GPT partition.\n" - IDS_HELP_HELP "Display a list of commands.\n" - IDS_HELP_IMPORT "Import a disk group.\n" - IDS_HELP_INACTIVE "Mark the selected partition as inactive.\n" - - IDS_HELP_LIST "Display a list of objects.\n" - IDS_HELP_LIST_DISK "List disks.\n" - IDS_HELP_LIST_PARTITION "List partitions.\n" - IDS_HELP_LIST_VOLUME "List volumes.\n" - IDS_HELP_LIST_VDISK "List virtual disk files.\n" - - IDS_HELP_MERGE "Merges a child disk with its parents.\n" - IDS_HELP_OFFLINE "Offline an object that is currently marked as online.\n" - IDS_HELP_ONLINE "Online an object that is currently marked as offline.\n" + IDS_HELP_ACTIVE "Markiert die ausgewählte Partition als aktiv.\n" + IDS_HELP_ADD "Fügt eine Spiegelung einem einfachen Volume hinzu.\n" + IDS_HELP_ASSIGN "Weist dem gewählten Volume einen Laufwerksbuchstaben oder\n einen Bereitstellungspunkt zu.\n" + IDS_HELP_ATTACH "Fügt eine Datei für virtuelle Datenträger an.\n" + IDS_HELP_ATTRIBUTES "Ändert die Volume- oder Laufwerksattribute.\n" + IDS_HELP_AUTOMOUNT "Aktiviert oder deaktiviert die automatische Bereitstellung\n von Basisvolumes.\n" + IDS_HELP_BREAK "Teilt eine Spiegelung auf.\n" + IDS_HELP_CLEAN "Löscht die Konfigurationsinformationen oder alle\n Informationen vom Datenträger.\n" + IDS_HELP_COMPACT "Versucht, die physische Größe der Datei zu reduzieren.\n" + IDS_HELP_CONVERT "Konvertiert zwischen Datenträgerformaten.\n" + + IDS_HELP_CREATE "Erstellt ein Volume, eine Partition oder einen virtuellen\n Datenträger.\n" + IDS_HELP_CREATE_PARTITION "Erstellt eine Partition.\n" + IDS_HELP_CREATE_PARTITION_EFI "Erstellt eine EFI-Systempartition.\n" + IDS_HELP_CREATE_PARTITION_EXTENDED "Erstellt eine erweiterte Partition.\n" + IDS_HELP_CREATE_PARTITION_LOGICAL "Erstellt ein logisches Laufwerk.\n" + IDS_HELP_CREATE_PARTITION_MSR "Erstellt eine MSR-Partition.\n" + IDS_HELP_CREATE_PARTITION_PRIMARY "Erstellt eine primäre Partition.\n" + IDS_HELP_CREATE_VOLUME "Erstellt ein Volume.\n" + IDS_HELP_CREATE_VDISK "Erstellt eine Datei für virtuelle Datenträger.\n" + + IDS_HELP_DELETE "Löscht ein Objekt.\n" + IDS_HELP_DELETE_DISK "Löscht einen fehlenden Datenträger aus der Datenträgerliste.\n" + IDS_HELP_DELETE_PARTITION "Löscht die gewählte Partition.\n" + IDS_HELP_DELETE_VOLUME "Löscht das gewählte Volume.\n" + + IDS_HELP_DETACH "Trennt eine Datei für virtuelle Datenträger.\n" + + IDS_HELP_DETAIL "Zeigt Details über ein Objekt an.\n" + IDS_HELP_DETAIL_DISK "Zeigt die Eigenschaften des ausgewählten Datenträgers an.\n" + IDS_HELP_DETAIL_PARTITION "Zeigt die Eigenschaften der ausgewählten Partition an.\n" + IDS_HELP_DETAIL_VOLUME "Zeigt die Eigenschaften des ausgewählten Volumes an.\n" + + IDS_HELP_EXIT "Beendet die Datenträgerpartitionierung.\n" + IDS_HELP_EXPAND "Erweitert die maximal verfügbare Größe auf einem virtuellen\n Datenträger.\n" + IDS_HELP_EXTEND "Erweitert ein Volume.\n" + IDS_HELP_FILESYSTEMS "Zeigt das aktuelle Dateisystem und die unterstützten Dateisysteme\n auf dem Volume an.\n" + IDS_HELP_FORMAT "Formatiert das Volume oder die Partition.\n" + IDS_HELP_GPT "Weist der ausgewählten GPT-Partition Attribute zu.\n" + IDS_HELP_HELP "Zeigt eine Liste der Befehle an.\n" + IDS_HELP_IMPORT "Importiert eine Datenträgergruppe.\n" + IDS_HELP_INACTIVE "Markiert die ausgewählte Partition als inaktiv.\n" + + IDS_HELP_LIST "Zeigt eine Liste aller Objekte an.\n" + IDS_HELP_LIST_DISK "Zeigt eine Liste der Datenträger an.\n" + IDS_HELP_LIST_PARTITION "Zeigt eine Liste der Partitionen auf dem aktuellen Datenträger an.\n" + IDS_HELP_LIST_VOLUME "Zeigt eine Liste der Volumes an.\n" + IDS_HELP_LIST_VDISK "Zeigt eine Liste der virtuellen Datenträger an.\n" + + IDS_HELP_MERGE "Führt einen untergordneten Datenträger mit den übergeordneten\n Datenträgern zusammen.\n" + IDS_HELP_OFFLINE "Schaltet ein Objekt offline, das derzeit als online\n gekennzeichnet ist.\n" + IDS_HELP_ONLINE "Schaltet ein Objekt online, das derzeit als offline\n gekennzeichnet ist.\n" IDS_HELP_RECOVER "Refreshes the state of all disks in the invalid pack,\n and resynchronizes mirrored volumes and RAID5 volumes\n that have stale plex or parity data.\n" - IDS_HELP_REM "Does nothing. This is used to comment scripts.\n" - IDS_HELP_REMOVE "Remove a drive letter or mount point assignment.\n" - IDS_HELP_REPAIR "Repair a RAID-5 volume with a failed member.\n" - IDS_HELP_RESCAN "Rescan the computer looking for disks and volumes.\n" - IDS_HELP_RETAIN "Place a retained partition under a simple volume.\n" - IDS_HELP_SAN "Display or set the SAN policy for the currently booted OS.\n" - - IDS_HELP_SELECT "Shift the focus to an object.\n" + IDS_HELP_REM "Keine Aktion. Wird für Skriptkommentare verwendet.\n" + IDS_HELP_REMOVE "Entfernt einen Laufwerksbuchstaben oder eine\n Bereitstellungspunktzuordnung.\n" + IDS_HELP_REPAIR "Repariert ein RAID-5-Volume mit einem fehlerhaften Mitglied.\n" + IDS_HELP_RESCAN "Überprüft den Computer erneut auf Datenträger oder Volumes.\n" + IDS_HELP_RETAIN "Setzt eine beibehaltene Partition unter ein einfaches Volume.\n" + IDS_HELP_SAN "Zeigt die SAN-Richtlinie für das aktuell geladene Betriebssystem\n an oder legt sie fest.\n" + + IDS_HELP_SELECT "Verschiebt den Fokus auf ein Objekt.\n" IDS_HELP_SELECT_DISK "Moves the focus to the disk.\n" IDS_HELP_SELECT_PARTITION "Moves the focus to the partition.\n" IDS_HELP_SELECT_VOLUME "Moves the focus to the volume.\n" IDS_HELP_SELECT_VDISK "Moves the focus to the virtual disk.\n" - IDS_HELP_SETID "Change the partition type.\n" - IDS_HELP_SHRINK "Reduce the size of the selected volume.\n" + IDS_HELP_SETID "Ändert den Partitionstyp.\n" + IDS_HELP_SHRINK "Verkleinert die Größe des ausgewählten Volumes.\n" IDS_HELP_UNIQUEID "Displays or sets the GUID partition table (GPT) identifier\n or master boot record (MBR) signature of a disk.\n" IDS_HELP_UNIQUEID_DISK "Displays or sets the GUID partition table (GPT) identifier\n or master boot record (MBR) signature of a disk.\n"

1 0

[reactos] 01/01: [DISKPART] Fix build...
by Hermès Bélusca-Maïto 02 Jun '22

02 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79dbb73b6f6fb083c2805… commit 79dbb73b6f6fb083c28057133abf13cbad9f53eb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 2 14:03:11 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 2 14:03:11 2022 +0200 [DISKPART] Fix build... - Fix the LANGUAGE declaration in de-DE.rc (originally was copy-pasted from en-US, and thus caused the build break). - Include de-DE.rc in alphabetical order in diskpart.rc --- base/system/diskpart/diskpart.rc | 6 +++--- base/system/diskpart/lang/de-DE.rc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/diskpart/diskpart.rc b/base/system/diskpart/diskpart.rc index 7bc1272ae2a..4a7f8ee800d 100644 --- a/base/system/diskpart/diskpart.rc +++ b/base/system/diskpart/diskpart.rc @@ -13,12 +13,12 @@ /* UTF-8 */ #pragma code_page(65001) -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index 1554d37cee8..ab80dc0022a 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* Basic application information */ STRINGTABLE

1 0

[reactos] 01/01: [DISKPART] Add german translation
by Eric Kohl 01 Jun '22

01 Jun '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3a8fdc84bcbbce27e8f0… commit a3a8fdc84bcbbce27e8f0cf51ff3303fa524a9e1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jun 1 23:25:54 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jun 1 23:25:54 2022 +0200 [DISKPART] Add german translation --- base/system/diskpart/diskpart.rc | 3 + base/system/diskpart/diskpart_msg.mc | 314 +++++++++++++++++++++++++++++++++-- base/system/diskpart/lang/de-DE.rc | 187 +++++++++++++++++++++ 3 files changed, 486 insertions(+), 18 deletions(-) diff --git a/base/system/diskpart/diskpart.rc b/base/system/diskpart/diskpart.rc index f0d1dd71690..7bc1272ae2a 100644 --- a/base/system/diskpart/diskpart.rc +++ b/base/system/diskpart/diskpart.rc @@ -16,6 +16,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 669998227fd..d635439fcd1 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -11,6 +11,7 @@ FacilityNames=(System=0x0:FACILITY_SYSTEM ) LanguageNames=(English=0x409:MSG00409 + German=0x407:MSG00407 Polish=0x415:MSG00415 Portugese=0x816:MSG00416 Romanian=0x418:MSG00418 @@ -29,6 +30,9 @@ Facility=System Language=English <Add ACTIVE command help text here> . +Language=German +<Add ACTIVE command help text here> +. Language=Polish <Add ACTIVE command help text here> . @@ -62,6 +66,9 @@ Facility=System Language=English <Add ADD command help text here> . +Language=German +<Add ADD command help text here> +. Language=Polish <Add ADD command help text here> . @@ -95,6 +102,9 @@ Facility=System Language=English <Add ASSIGN command help text here> . +Language=German +<Add ASSIGN command help text here> +. Language=Polish <Add ASSIGN command help text here> . @@ -128,6 +138,9 @@ Facility=System Language=English <Add ATTACH command help text here> . +Language=German +<Add ATTACH command help text here> +. Language=Polish <Add ATTACH command help text here> . @@ -161,6 +174,9 @@ Facility=System Language=English <Add ATTRIBUTES command help text here> . +Language=German +<Add ATTRIBUTES command help text here> +. Language=Polish <Add ATTRIBUTES command help text here> . @@ -194,6 +210,9 @@ Facility=System Language=English <Add AUTOMOUNT command help text here> . +Language=German +<Add AUTOMOUNT command help text here> +. Language=Polish <Add AUTOMOUNT command help text here> . @@ -228,6 +247,9 @@ Facility=System Language=English <Add BREAK command help text here> . +Language=German +<Add BREAK command help text here> +. Language=Polish <Add BREAK command help text here> . @@ -261,6 +283,9 @@ Facility=System Language=English <Add CLEAN command help text here> . +Language=German +<Add CLEAN command help text here> +. Language=Polish <Add CLEAN command help text here> . @@ -294,6 +319,9 @@ Facility=System Language=English <Add COMPACT command help text here> . +Language=German +<Add COMPACT command help text here> +. Language=Polish <Add COMPACT command help text here> . @@ -327,6 +355,9 @@ Facility=System Language=English <Add CONVERT command help text here> . +Language=German +<Add CONVERT command help text here> +. Language=Polish <Add CONVERT command help text here> . @@ -360,6 +391,9 @@ Facility=System Language=English <Add CREATE PARTITION EFI command help text here> . +Language=German +<Add CREATE PARTITION EFI command help text here> +. Language=Polish <Add CREATE PARTITION EFI command help text here> . @@ -393,6 +427,9 @@ Facility=System Language=English <Add CREATE PARTITION EXTENDED command help text here> . +Language=German +<Add CREATE PARTITION EXTENDED command help text here> +. Language=Polish <Add CREATE PARTITION EXTENDED command help text here> . @@ -426,6 +463,9 @@ Facility=System Language=English <Add CREATE PARTITION LOGICAL command help text here> . +Language=German +<Add CREATE PARTITION LOGICAL command help text here> +. Language=Polish <Add CREATE PARTITION LOGICAL command help text here> . @@ -459,6 +499,9 @@ Facility=System Language=English <Add CREATE PARTITION MSR command help text here> . +Language=German +<Add CREATE PARTITION MSR command help text here> +. Language=Polish <Add CREATE PARTITION MSR command help text here> . @@ -492,6 +535,9 @@ Facility=System Language=English <Add CREATE PARTITION PRIMARY command help text here> . +Language=German +<Add CREATE PARTITION PRIMARY command help text here> +. Language=Polish <Add CREATE PARTITION PRIMARY command help text here> . @@ -525,6 +571,9 @@ Facility=System Language=English <Add DELETE DISK command help text here> . +Language=German +<Add DELETE DISK command help text here> +. Language=Polish <Add DELETE DISK command help text here> . @@ -558,6 +607,9 @@ Facility=System Language=English <Add DELETE PARTITION command help text here> . +Language=German +<Add DELETE PARTITION command help text here> +. Language=Polish <Add DELETE PARTITION command help text here> . @@ -591,6 +643,9 @@ Facility=System Language=English <Add DELETE VOLUME command help text here> . +Language=German +<Add DELETE VOLUME command help text here> +. Language=Polish <Add DELETE VOLUME command help text here> . @@ -624,6 +679,9 @@ Facility=System Language=English <Add DETAIL DISK command help text here> . +Language=German +<Add DETAIL DISK command help text here> +. Language=Polish <Add DETAIL DISK command help text here> . @@ -656,6 +714,9 @@ Facility=System Language=English <Add DETAIL PARTITION command help text here> . +Language=German +<Add DETAIL PARTITION command help text here> +. Language=Polish <Add DETAIL PARTITION command help text here> . @@ -688,6 +749,9 @@ Facility=System Language=English <Add DETAIL VOLUME command help text here> . +Language=German +<Add DETAIL VOLUME command help text here> +. Language=Polish <Add DETAIL VOLUME command help text here> . @@ -721,6 +785,9 @@ Facility=System Language=English <Add DETACH command help text here> . +Language=German +<Add DETACH command help text here> +. Language=Polish <Add DETACH command help text here> . @@ -752,31 +819,94 @@ SymbolicName=MSG_COMMAND_EXIT Severity=Informational Facility=System Language=English -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT +. +Language=German + Beendet den Befehlsinterpreter DiskPart. + +Syntax: EXIT + +Beispiel: + + EXIT . Language=Polish -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Portugese -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Romanian -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Russian -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Albanian -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Turkish -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Chinese -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . Language=Taiwanese -<Add EXIT command help text here> + Exits the DiskPart command interpreter. + +Syntax: EXIT + +Example: + + EXIT . @@ -787,6 +917,9 @@ Facility=System Language=English <Add EXPAND command help text here> . +Language=German +<Add EXPAND command help text here> +. Language=Polish <Add EXPAND command help text here> . @@ -820,6 +953,9 @@ Facility=System Language=English <Add EXTEND command help text here> . +Language=German +<Add EXTEND command help text here> +. Language=Polish <Add EXTEND command help text here> . @@ -853,6 +989,9 @@ Facility=System Language=English <Add FILESYSTEMS command help text here> . +Language=German +<Add FILESYSTEMS command help text here> +. Language=Polish <Add FILESYSTEMS command help text here> . @@ -886,6 +1025,9 @@ Facility=System Language=English <Add FORMAT command help text here> . +Language=German +<Add FORMAT command help text here> +. Language=Polish <Add FORMAT command help text here> . @@ -919,6 +1061,9 @@ Facility=System Language=English <Add GPT command help text here> . +Language=German +<Add GPT command help text here> +. Language=Polish <Add GPT command help text here> . @@ -952,6 +1097,9 @@ Facility=System Language=English <Add HELP command help text here> . +Language=German +<Add HELP command help text here> +. Language=Polish <Add HELP command help text here> . @@ -985,6 +1133,9 @@ Facility=System Language=English <Add IMPORT command help text here> . +Language=German +<Add IMPORT command help text here> +. Language=Polish <Add IMPORT command help text here> . @@ -1018,6 +1169,9 @@ Facility=System Language=English <Add INACTIVE command help text here> . +Language=German +<Add INACTIVE command help text here> +. Language=Polish <Add INACTIVE command help text here> . @@ -1051,6 +1205,9 @@ Facility=System Language=English <Add LIST DISK command help text here> . +Language=German +<Add LIST DISK command help text here> +. Language=Polish <Add LIST DISK command help text here> . @@ -1083,6 +1240,9 @@ Facility=System Language=English <Add LIST PARTITION command help text here> . +Language=German +<Add LIST PARTITION command help text here> +. Language=Polish <Add LIST PARTITION command help text here> . @@ -1116,6 +1276,9 @@ Facility=System Language=English <Add LIST VOLUME command help text here> . +Language=German +<Add LIST VOLUME command help text here> +. Language=Polish <Add LIST VOLUME command help text here> . @@ -1149,6 +1312,9 @@ Facility=System Language=English <Add LIST VDISK command help text here> . +Language=German +<Add LIST VDISK command help text here> +. Language=Polish <Add LIST VDISK command help text here> . @@ -1182,6 +1348,9 @@ Facility=System Language=English <Add MERGE command help text here> . +Language=German +<Add MERGE command help text here> +. Language=Polish <Add MERGE command help text here> . @@ -1215,6 +1384,9 @@ Facility=System Language=English <Add OFFLINE command help text here> . +Language=German +<Add OFFLINE command help text here> +. Language=Polish <Add OFFLINE command help text here> . @@ -1248,6 +1420,9 @@ Facility=System Language=English <Add ONLINE command help text here> . +Language=German +<Add ONLINE command help text here> +. Language=Polish <Add ONLINE command help text here> . @@ -1281,6 +1456,9 @@ Facility=System Language=English <Add RECOVER command help text here> . +Language=German +<Add RECOVER command help text here> +. Language=Polish <Add RECOVER command help text here> . @@ -1314,6 +1492,9 @@ Facility=System Language=English <Add REM command help text here> . +Language=German +<Add REM command help text here> +. Language=Polish <Add REM command help text here> . @@ -1347,6 +1528,9 @@ Facility=System Language=English <Add REMOVE command help text here> . +Language=German +<Add REMOVE command help text here> +. Language=Polish <Add REMOVE command help text here> . @@ -1380,6 +1564,9 @@ Facility=System Language=English <Add REPAIR command help text here> . +Language=German +<Add REPAIR command help text here> +. Language=Polish <Add REPAIR command help text here> . @@ -1411,31 +1598,95 @@ SymbolicName=MSG_COMMAND_RESCAN Severity=Informational Facility=System Language=English -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN +. +Language=German + Sucht nach neuen Datenträgern, die dem Computer möglicherweise + hinzugefügt wurden. + +Syntax: RESCAN + +Beispiel: + + RESCAN . Language=Polish -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Portugese -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Romanian -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Russian -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Albanian -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Turkish -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Chinese -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . Language=Taiwanese -<Add RESCAN command help text here> + Locates new disks that may have been added to the computer. + +Syntax: RESCAN + +Example: + + RESCAN . @@ -1446,6 +1697,9 @@ Facility=System Language=English <Add RETAIN command help text here> . +Language=German +<Add RETAIN command help text here> +. Language=Polish <Add RETAIN command help text here> . @@ -1479,6 +1733,9 @@ Facility=System Language=English <Add SAN command help text here> . +Language=German +<Add SAN command help text here> +. Language=Polish <Add SAN command help text here> . @@ -1512,6 +1769,9 @@ Facility=System Language=English <Add SELECT DISK command help text here> . +Language=German +<Add SELECT DISK command help text here> +. Language=Polish <Add SELECT DISK command help text here> . @@ -1545,6 +1805,9 @@ Facility=System Language=English <Add SELECT PARTITION command help text here> . +Language=German +<Add SELECT PARTITION command help text here> +. Language=Polish <Add SELECT PARTITION command help text here> . @@ -1578,6 +1841,9 @@ Facility=System Language=English <Add SELECT VOLUME command help text here> . +Language=German +<Add SELECT VOLUME command help text here> +. Language=Polish <Add SELECT VOLUME command help text here> . @@ -1611,6 +1877,9 @@ Facility=System Language=English <Add SELECT VDISK command help text here> . +Language=German +<Add SELECT VDISK command help text here> +. Language=Polish <Add SELECT VDISK command help text here> . @@ -1644,6 +1913,9 @@ Facility=System Language=English <Add SETID command help text here> . +Language=German +<Add SETID command help text here> +. Language=Polish <Add SETID command help text here> . @@ -1677,6 +1949,9 @@ Facility=System Language=English <Add SHRINK command help text here> . +Language=German +<Add SHRINK command help text here> +. Language=Polish <Add SHRINK command help text here> . @@ -1710,6 +1985,9 @@ Facility=System Language=English <Add UNIQUEID DISK command help text here> . +Language=German +<Add UNIQUEID DISK command help text here> +. Language=Polish <Add UNIQUEID DISK command help text here> . diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc new file mode 100644 index 00000000000..1554d37cee8 --- /dev/null +++ b/base/system/diskpart/lang/de-DE.rc @@ -0,0 +1,187 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/* Basic application information */ +STRINGTABLE +BEGIN + IDS_APP_HEADER "ReactOS DiskPart" + IDS_APP_USAGE "\nDisk Partitioning Interpreter.\n\n\ +Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ +/S filename\tRuns the given script.\n\ +/T timeout\tTimeout in seconds to prevent DiskPart usage overlap.\n\ +/?\t\tDisplay this help message.\n\n" + IDS_APP_LICENSE "Licensed under the GNU GPLv2\n" + IDS_APP_CURR_COMPUTER "On computer: %s\n\n" + IDS_APP_LEAVING "\nLeaving DiskPart...\n" + IDS_APP_PROMPT "DISKPART> " +END + +/* Disk Information Labels */ +STRINGTABLE +BEGIN + IDS_DETAIL_INFO_DISK_ID "Disk ID: %08lx\n" + IDS_DETAIL_INFO_TYPE "Type" + IDS_DETAIL_INFO_STATUS "Status" + IDS_DETAIL_INFO_PATH "Path : %hu\n" + IDS_DETAIL_INFO_TARGET "Target : %hu\n" + IDS_DETAIL_INFO_LUN_ID "Lun ID : %hu\n" + IDS_DETAIL_INFO_LOC_PATH "Location Path" + IDS_DETAIL_INFO_CURR_RO_STATE "Current Read-only State" + IDS_DETAIL_INFO_RO "Read-only" + IDS_DETAIL_INFO_BOOT_DSK "Boot Disk" + IDS_DETAIL_INFO_PAGE_FILE_DSK "Pagefile Disk" + IDS_DETAIL_INFO_HIBER_FILE_DSK "Hibernation File Disk" + IDS_DETAIL_INFO_CRASH_DSK "Crashdump Disk" + IDS_DETAIL_INFO_CLST_DSK "Clustered Disk" + IDS_DETAIL_PARTITION_NUMBER "Partition %lu\n" + IDS_DETAIL_PARTITION_TYPE "Type : %02x\n" + IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" + IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" + IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" +END + +STRINGTABLE +BEGIN + IDS_HELP_FORMAT_STRING "%-11.11s - %s" +END + +/* Detail header titles */ +STRINGTABLE +BEGIN + IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partition ### Type Size Offset\n" + IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %-3lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" +END + +/* RESCAN command string */ +STRINGTABLE +BEGIN + IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" + IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" +END + +/* Select command strings */ +STRINGTABLE +BEGIN + IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" + IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_VOLUME_INVALID "\nInvalid volume.\n\n" +END + +/* Disk Status */ +STRINGTABLE +BEGIN + IDS_STATUS_YES "Yes" + IDS_STATUS_NO "No" + IDS_STATUS_DISK_HEALTHY "Healthy" + IDS_STATUS_DISK_SICK "Sick" + IDS_STATUS_UNAVAILABLE "UNAVAILABLE" + IDS_STATUS_ONLINE "Online" + IDS_STATUS_OFFLINE "Offline" + IDS_STATUS_NO_MEDIA "No Media" +END + +/* CMD Messages for commands */ +STRINGTABLE +BEGIN + IDS_MSG_ARG_SYNTAX_ERROR "The argument(s) specified for this command are not valid.\nFor more information on the command type:" +END + +/* Help Command Descriptions */ +STRINGTABLE +BEGIN + IDS_HELP_ACTIVE "Mark the selected partition as active.\n" + IDS_HELP_ADD "Add a mirror to a simple volume.\n" + IDS_HELP_ASSIGN "Assign a drive letter or mount point to the selected volume.\n" + IDS_HELP_ATTACH "Attaches a virtual disk file.\n" + IDS_HELP_ATTRIBUTES "Manipulate volume or disk attributes.\n" + IDS_HELP_AUTOMOUNT "Enable and Disable automatic mounting of basic volumes.\n" + IDS_HELP_BREAK "Break a mirror set.\n" + IDS_HELP_CLEAN "Clear the configuration information, or all information, off\n the disk.\n" + IDS_HELP_COMPACT "Attempts to reduce the physical size of the file.\n" + IDS_HELP_CONVERT "Convert between different disk formats.\n" + + IDS_HELP_CREATE "Create a volume, partition, or virtual disk.\n" + IDS_HELP_CREATE_PARTITION "Create a partition.\n" + IDS_HELP_CREATE_PARTITION_EFI "Create an EFI system partition.\n" + IDS_HELP_CREATE_PARTITION_EXTENDED "Create an extended partition.\n" + IDS_HELP_CREATE_PARTITION_LOGICAL "Create a logical drive.\n" + IDS_HELP_CREATE_PARTITION_MSR "Create an MSR partition.\n" + IDS_HELP_CREATE_PARTITION_PRIMARY "Create a primary partition.\n" + IDS_HELP_CREATE_VOLUME "Create a volume.\n" + IDS_HELP_CREATE_VDISK "Create a virtual disk file.\n" + + IDS_HELP_DELETE "Delete an object.\n" + IDS_HELP_DELETE_DISK "Delete a disk.\n" + IDS_HELP_DELETE_PARTITION "Delete a partition.\n" + IDS_HELP_DELETE_VOLUME "Delete a volume.\n" + + IDS_HELP_DETACH "Detaches a virtual disk file.\n" + + IDS_HELP_DETAIL "Provide details about an object.\n" + IDS_HELP_DETAIL_DISK "Print disk details.\n" + IDS_HELP_DETAIL_PARTITION "Print partition details.\n" + IDS_HELP_DETAIL_VOLUME "Print volume details.\n" + + IDS_HELP_EXIT "Exit DiskPart.\n" + IDS_HELP_EXPAND "Expands the maximum size available on a virtual disk.\n" + IDS_HELP_EXTEND "Extend a volume.\n" + IDS_HELP_FILESYSTEMS "Display current and supported file systems on the volume.\n" + IDS_HELP_FORMAT "Format the volume or partition.\n" + IDS_HELP_GPT "Assign attributes to the selected GPT partition.\n" + IDS_HELP_HELP "Display a list of commands.\n" + IDS_HELP_IMPORT "Import a disk group.\n" + IDS_HELP_INACTIVE "Mark the selected partition as inactive.\n" + + IDS_HELP_LIST "Display a list of objects.\n" + IDS_HELP_LIST_DISK "List disks.\n" + IDS_HELP_LIST_PARTITION "List partitions.\n" + IDS_HELP_LIST_VOLUME "List volumes.\n" + IDS_HELP_LIST_VDISK "List virtual disk files.\n" + + IDS_HELP_MERGE "Merges a child disk with its parents.\n" + IDS_HELP_OFFLINE "Offline an object that is currently marked as online.\n" + IDS_HELP_ONLINE "Online an object that is currently marked as offline.\n" + IDS_HELP_RECOVER "Refreshes the state of all disks in the invalid pack,\n and resynchronizes mirrored volumes and RAID5 volumes\n that have stale plex or parity data.\n" + IDS_HELP_REM "Does nothing. This is used to comment scripts.\n" + IDS_HELP_REMOVE "Remove a drive letter or mount point assignment.\n" + IDS_HELP_REPAIR "Repair a RAID-5 volume with a failed member.\n" + IDS_HELP_RESCAN "Rescan the computer looking for disks and volumes.\n" + IDS_HELP_RETAIN "Place a retained partition under a simple volume.\n" + IDS_HELP_SAN "Display or set the SAN policy for the currently booted OS.\n" + + IDS_HELP_SELECT "Shift the focus to an object.\n" + IDS_HELP_SELECT_DISK "Moves the focus to the disk.\n" + IDS_HELP_SELECT_PARTITION "Moves the focus to the partition.\n" + IDS_HELP_SELECT_VOLUME "Moves the focus to the volume.\n" + IDS_HELP_SELECT_VDISK "Moves the focus to the virtual disk.\n" + + IDS_HELP_SETID "Change the partition type.\n" + IDS_HELP_SHRINK "Reduce the size of the selected volume.\n" + + IDS_HELP_UNIQUEID "Displays or sets the GUID partition table (GPT) identifier\n or master boot record (MBR) signature of a disk.\n" + IDS_HELP_UNIQUEID_DISK "Displays or sets the GUID partition table (GPT) identifier\n or master boot record (MBR) signature of a disk.\n" +END + +/* Common Error Messages */ +STRINGTABLE +BEGIN + IDS_ERROR_MSG_NO_SCRIPT "Error opening script: %s\n" + IDS_ERROR_MSG_BAD_ARG "Error processing argument: %s\n" + IDS_ERROR_INVALID_ARGS "Invalid arguments\n" +END

1 0

[reactos] 01/01: [DISKPART] Get rid of PrintMessageString()
by Eric Kohl 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca51f000495325be75153… commit ca51f000495325be75153238309cd4595a1e6d0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jun 1 00:46:45 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jun 1 00:46:45 2022 +0200 [DISKPART] Get rid of PrintMessageString() --- base/system/diskpart/diskpart.h | 4 ---- base/system/diskpart/help.c | 12 ++++++++++-- base/system/diskpart/misc.c | 12 ------------ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index e3b4c247861..755dc7b44c4 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -392,10 +392,6 @@ RoundingDivide( _In_ ULONGLONG Dividend, _In_ ULONGLONG Divisor); -VOID -PrintMessageString( - _In_ DWORD dwMessage); - /* offline.c */ BOOL offline_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index f2a23960ae0..2caf271e5f2 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -89,7 +89,11 @@ HelpCommand( (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && (cmdptr->help_detail != MSG_NONE)) { - PrintMessageString(cmdptr->help_detail); + ConMsgPuts(StdOut, + FORMAT_MESSAGE_FROM_HMODULE, + NULL, + cmdptr->help_detail, + LANG_USER_DEFAULT); bSubCommands = TRUE; } } @@ -97,7 +101,11 @@ HelpCommand( if ((bSubCommands == FALSE) && (pCommand->help_detail != MSG_NONE)) { - PrintMessageString(pCommand->help_detail); + ConMsgPuts(StdOut, + FORMAT_MESSAGE_FROM_HMODULE, + NULL, + pCommand->help_detail, + LANG_USER_DEFAULT); } ConPuts(StdOut, L"\n"); diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index ddb2946a840..b46651b670b 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -78,15 +78,3 @@ RoundingDivide( { return (Dividend + Divisor / 2) / Divisor; } - - -VOID -PrintMessageString( - _In_ DWORD dwMessage) -{ - ConMsgPuts(StdOut, - FORMAT_MESSAGE_FROM_HMODULE, - NULL, //hModuleNetMsg, - dwMessage, - LANG_USER_DEFAULT); -}

1 0

[reactos] 01/01: [WIN32SS][NTDDRAW][NTGDI] Implement some DxEng* callbacks (#3638)
by Oleg Dubinskiy 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31139c253f24b2577423d… commit 31139c253f24b2577423d4bc363e55caa5a9d8a0 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Tue May 31 23:58:35 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 1 00:58:35 2022 +0300 [WIN32SS][NTDDRAW][NTGDI] Implement some DxEng* callbacks (#3638) Implement the following DxEng* functions: - DxEngAltLockSurface - DxEngDeleteSurface - DxEngReferenceHdev - DxEngSelectBitmap - DxEngSetBitmapOwner - DxEngUnreferenceHdev Update their prototypes and call the appropriate win32k functions inside them, since they are already implemented. Also get rid of now unused IntGdi(Un)ReferencePdev, whose were called only by dxeng, and whose are not used anymore. In Windows, DxEng(Un)ReferenceHdev calls PDEVOBJ_vReferencePDEV and PDEVOBJ_vDeferencePDEV directly (those correspond to our PDEVOBJ_vReference and PDEVOBJ_vRelease accordingly). Required by MS DirectDraw stack (ddraw.dll & dxg.sys). CORE-17561 --- sdk/include/reactos/drivers/directx/dxeng.h | 8 ++++---- win32ss/gdi/ntgdi/dc.h | 2 -- win32ss/gdi/ntgdi/device.c | 12 ----------- win32ss/reactx/ntddraw/dxeng.c | 32 ++++++++++++++++------------- 4 files changed, 22 insertions(+), 32 deletions(-) diff --git a/sdk/include/reactos/drivers/directx/dxeng.h b/sdk/include/reactos/drivers/directx/dxeng.h index c4ddf18c0c5..8a349ce6507 100644 --- a/sdk/include/reactos/drivers/directx/dxeng.h +++ b/sdk/include/reactos/drivers/directx/dxeng.h @@ -107,11 +107,11 @@ DWORD NTAPI DxEngSpSpritesVisible(DWORD x1); HDC NTAPI DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); BOOLEAN NTAPI DxEngDeleteDC(HDC hdc, BOOL Force); BOOLEAN NTAPI DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set); -DWORD NTAPI DxEngSelectBitmap(DWORD x1, DWORD x2); -DWORD NTAPI DxEngSetBitmapOwner(DWORD x1, DWORD x2); -DWORD NTAPI DxEngDeleteSurface(DWORD x1); +HBITMAP NTAPI DxEngSelectBitmap(HDC hdc, HBITMAP hbmp); +BOOLEAN NTAPI DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner); +BOOLEAN NTAPI DxEngDeleteSurface(HSURF hsurf); DWORD NTAPI DxEngGetSurfaceData(DWORD x1, DWORD x2); -DWORD NTAPI DxEngAltLockSurface(DWORD x1); +SURFOBJ * NTAPI DxEngAltLockSurface(HSURF hsurf); DWORD NTAPI DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); DWORD NTAPI DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); DWORD NTAPI DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); diff --git a/win32ss/gdi/ntgdi/dc.h b/win32ss/gdi/ntgdi/dc.h index f18480c5a94..358527103aa 100644 --- a/win32ss/gdi/ntgdi/dc.h +++ b/win32ss/gdi/ntgdi/dc.h @@ -200,8 +200,6 @@ VOID NTAPI DC_vRestoreDC(IN PDC pdc, INT iSaveLevel); VOID NTAPI DC_vFreeDcAttr(PDC pdc); VOID NTAPI DC_vInitDc(PDC pdc, DCTYPE dctype, PPDEVOBJ ppdev); -VOID FASTCALL IntGdiReferencePdev(PPDEVOBJ pPDev); -VOID FASTCALL IntGdiUnreferencePdev(PPDEVOBJ pPDev, DWORD CleanUpType); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); diff --git a/win32ss/gdi/ntgdi/device.c b/win32ss/gdi/ntgdi/device.c index 9a8bf433374..b9684fe9c9a 100644 --- a/win32ss/gdi/ntgdi/device.c +++ b/win32ss/gdi/ntgdi/device.c @@ -13,18 +13,6 @@ PDC defaultDCstate = NULL; -VOID FASTCALL -IntGdiReferencePdev(PPDEVOBJ ppdev) -{ - UNIMPLEMENTED; -} - -VOID FASTCALL -IntGdiUnreferencePdev(PPDEVOBJ ppdev, DWORD CleanUpType) -{ - UNIMPLEMENTED; -} - BOOL FASTCALL IntCreatePrimarySurface(VOID) { diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index 2b1fe1cbd66..a096bf5f350 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -587,7 +587,7 @@ BOOLEAN APIENTRY DxEngReferenceHdev(HDEV hDev) { - IntGdiReferencePdev((PPDEVOBJ) hDev); + PDEVOBJ_vReference((PPDEVOBJ)hDev); /* ALWAYS return true */ return TRUE; } @@ -689,7 +689,7 @@ BOOLEAN APIENTRY DxEngUnreferenceHdev(HDEV hDev) { - IntGdiUnreferencePdev((PPDEVOBJ) hDev, 0); + PDEVOBJ_vRelease((PPDEVOBJ)hDev); return TRUE; // Always true. } @@ -762,28 +762,31 @@ DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set) /************************************************************************/ /* DxEngSelectBitmap */ /************************************************************************/ -DWORD APIENTRY DxEngSelectBitmap(DWORD x1, DWORD x2) +HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngSelectBitmap \n"); + + return NtGdiSelectBitmap(hdc, hbmp); } /************************************************************************/ /* DxEngSetBitmapOwner */ /************************************************************************/ -DWORD APIENTRY DxEngSetBitmapOwner(DWORD x1, DWORD x2) +BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngSetBitmapOwner \n"); + + return GreSetBitmapOwner(hbmp, ulOwner); } /************************************************************************/ /* DxEngDeleteSurface */ /************************************************************************/ -DWORD APIENTRY DxEngDeleteSurface(DWORD x1) +BOOLEAN APIENTRY DxEngDeleteSurface(HSURF hsurf) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngDeleteSurface \n"); + + return EngDeleteSurface(hsurf); } /************************************************************************/ @@ -798,10 +801,11 @@ DWORD APIENTRY DxEngGetSurfaceData(DWORD x1, DWORD x2) /************************************************************************/ /* DxEngAltLockSurface */ /************************************************************************/ -DWORD APIENTRY DxEngAltLockSurface(DWORD x1) +SURFOBJ * APIENTRY DxEngAltLockSurface(HSURF hsurf) { - UNIMPLEMENTED; - return FALSE; + DPRINT1("ReactX Calling : DxEngAltLockSurface \n"); + + return EngLockSurface(hsurf); } /************************************************************************/

1 0

[reactos] 01/01: [ROSAPPS] Remove 'theme/dump' reference code
by Mark Jansen 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=491dae17082ff86251d5e… commit 491dae17082ff86251d5e691f1b2eab093fab6f3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 3 17:33:55 2021 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue May 31 23:24:16 2022 +0300 [ROSAPPS] Remove 'theme/dump' reference code --- .../sysutils/utils/theme/dump/themedump.bpr | 116 ---- .../sysutils/utils/theme/dump/themedump.cpp | 642 --------------------- .../sysutils/utils/theme/dump/themedump.rc | 6 - 3 files changed, 764 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr b/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr deleted file mode 100644 index 5a4195652b9..00000000000 --- a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> - -<PROJECT> - <MACROS> - <VERSION value="BCB.06.00"/> - <PROJECT value="themedump.exe"/> - <OBJFILES value="themedump.obj"/> - <RESFILES value="themedump.res"/> - <IDLFILES value=""/> - <IDLGENFILES value=""/> - <DEFFILE value=""/> - <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value=""/> - <LIBRARIES value=""/> - <SPARELIBS value=""/> - <PACKAGES value="vcl.bpi rtl.bpi dbrtl.bpi adortl.bpi vcldb.bpi vclx.bpi bdertl.bpi - ibxpress.bpi cds.bpi dsnap.bpi bdecds.bpi qrpt.bpi teeui.bpi teedb.bpi - tee.bpi vcldbx.bpi dss.bpi teeqr.bpi visualclx.bpi visualdbclx.bpi - dsnapcrba.bpi dsnapcon.bpi bcbsmp.bpi dbexpress.bpi dbxcds.bpi indy.bpi"/> - <PATHCPP value=".;"/> - <PATHPAS value=".;"/> - <PATHRC value=".;"/> - <PATHASM value=".;"/> - <DEBUGLIBPATH value="$(BCB)\lib\debug"/> - <RELEASELIBPATH value="$(BCB)\lib\release"/> - <LINKER value="ilink32"/> - <USERDEFINES value="_DEBUG"/> - <SYSDEFINES value="NO_STRICT;_NO_VCL;USEPACKAGES"/> - <MAINSOURCE value="themedump.cpp"/> - <INCLUDEPATH value=".;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value=".;$(BCB)\lib\obj;$(BCB)\lib"/> - <WARNINGS value="-w-pch -w-par"/> - <OTHERFILES value=""/> - </MACROS> - <OPTIONS> - <IDLCFLAGS value="-I. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/> - <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC - -tWM -c"/> - <PFLAGS value="-$YD -$W -$O- -$A8 -v -JPHNE -M"/> - <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zd"/> - <LFLAGS value="-D"" -ap -Tpe -x -Gn -v"/> - <OTHERFILES value=""/> - </OPTIONS> - <LINKER> - <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/> - <ALLRES value="$(RESFILES)"/> - <ALLLIB value="$(LIBFILES) $(LIBRARIES) uxtheme.lib import32.lib cw32mt.lib"/> - <OTHERFILES value=""/> - </LINKER> - <FILELIST> - <FILE FILENAME="themedump.cpp" FORMNAME="" UNITNAME="themedump" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="themedump.rc" FORMNAME="" UNITNAME="themedump.rc" CONTAINERID="RCCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - </FILELIST> - <BUILDTOOLS> - </BUILDTOOLS> - - <IDEOPTIONS> -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1040 -CodePage=1252 - -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= - -[Debugging] -DebugSourceDirs=$(BCB)\source\vcl - -[Parameters] -RunParams= -Launcher= -UseLauncher=0 -DebugCWD= -HostApplication= -RemoteHost= -RemotePath= -RemoteLauncher= -RemoteCWD= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[CORBA] -AddServerUnit=1 -AddClientUnit=1 -PrecompiledHeaders=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - </IDEOPTIONS> -</PROJECT> \ No newline at end of file diff --git a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp b/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp deleted file mode 100644 index 7cf284b4e6c..00000000000 --- a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp +++ /dev/null @@ -1,642 +0,0 @@ -#include <cstdlib> -#include <cstdio> -#include <cwchar> -#include <iostream> -#include <exception> -#include <algorithm> -#include <functional> -#include <list> -#include <string> -#include <map> - -#define WIN32_LEAN_AND_MEAN -#define UNICODE -#include <windows.h> -#include <commctrl.h> -#include <uxtheme.h> -#include <tmschema.h> - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#define SCHEMA_STRINGS -#define TMT_ENUMDEF (0x0D) // undocumented -#define TMT_ENUMVAL (0x0E) // undocumented -#define TMT_ENUM (0x0F) // undocumented -#include <tmschema.h> - -namespace tmdump -{ - typedef std::map<int, std::wstring> tm_enum_t; - typedef std::map<std::wstring, tm_enum_t> tm_enums_t; - - struct tm_property_t - { - std::wstring name; - int id; - int type; - tm_enums_t::iterator enum_type; - }; - - static tm_enums_t tm_enums; - - typedef std::list<tm_property_t> tm_properties_t; - - static tm_properties_t tm_properties; - - typedef std::map<int, std::wstring> tm_states_t; - typedef std::map<std::wstring, tm_states_t> tm_state_enums_t; - - static tm_state_enums_t tm_state_enums; - - struct tm_part_t - { - std::wstring name; - tm_state_enums_t::iterator states; - }; - - typedef std::map<int, tm_part_t> tm_parts_t; - - typedef std::map<std::wstring, tm_parts_t> tm_classes_t; - - static tm_classes_t tm_classes; - - class print - { - protected: - std::FILE * m_out; - - public: - print(std::FILE * out_): m_out(out_) { } - }; - - class property_print: - public print, - public std::unary_function<tm_property_t, void> - { - private: - wchar_t const * type_name(const tm_property_t& property_) - { - switch(property_.type) - { - case TMT_STRING: return L"LPWSTR"; - case TMT_INT: return L"int"; - case TMT_BOOL: return L"BOOL"; - case TMT_COLOR: return L"COLORREF"; - case TMT_MARGINS: return L"MARGINS"; - case TMT_FILENAME: return L"LPWSTR"; - case TMT_SIZE: return L"SIZE"; - case TMT_POSITION: return L"POINT"; - case TMT_RECT: return L"RECT"; - case TMT_FONT: return L"LOGFONT"; - case TMT_INTLIST: return L"INTLIST"; - case TMT_ENUM: return property_.enum_type->first.c_str(); - default: return L"<unknown>"; - } - } - - public: - property_print(std::FILE * out_): print(out_) { } - - void operator()(const tm_property_t& property_) - { - std::fwprintf - ( - m_out, - L"%s\t%s\t%d\n", - type_name(property_), - property_.name.c_str(), - property_.id - ); - } - }; - - class part_print: - public print, - public std::unary_function<tm_parts_t::value_type, void> - { - public: - part_print(std::FILE * out_): print(out_) { } - - void operator()(const tm_parts_t::value_type& part_) - { - std::fwprintf - ( - m_out, - L"\t%s\t%d\t%s\n", - part_.second.name.c_str(), - part_.first, - part_.second.states == tm_state_enums.end() ? - L"-" : - part_.second.states->first.c_str() - ); - } - }; - - class class_print: - public print, - public std::unary_function<tm_classes_t::value_type, void> - { - public: - class_print(std::FILE * out_): print(out_) { } - - void operator()(const tm_classes_t::value_type& class_) - { - std::fwprintf(m_out, L"%s\n", class_.first.c_str()); - - std::for_each - ( - class_.second.begin(), - class_.second.end(), - part_print(m_out) - ); - } - }; - - class schema_scan: public std::unary_function<struct TMPROPINFO, void> - { - private: - enum - { - at_none, - at_enum, - at_parts, - at_states - } - m_state; - - union - { - void * p_none; - tm_enum_t * p_enum; - tm_parts_t * p_class; - tm_states_t * p_states; - } - m_cur; - - bool has_suffix(const std::wstring& name_, const std::wstring& suffix_) - { - if(name_.length() <= suffix_.length()) return false; - - return std::equal - ( - name_.end() - suffix_.length(), - name_.end(), - suffix_.begin() - ); - } - - public: - schema_scan(): m_state(at_none) { } - - void operator()(const struct TMPROPINFO& prop_) - { - static const std::wstring parts_suffix(L"PARTS"); - static const std::wstring states_suffix(L"STATES"); - - std::wstring name(prop_.pszName); - - // Compound declaration - if(prop_.sEnumVal == TMT_ENUMDEF && prop_.bPrimVal == TMT_ENUMDEF) - { - // class - if(has_suffix(name, parts_suffix)) - { - m_state = at_parts; - m_cur.p_class = & - ( - tm_classes - [ - std::wstring(name.begin(), name.end() - parts_suffix.length()) - ] = tm_parts_t() - ); - } - // states - else if(has_suffix(name, states_suffix)) - { - m_state = at_states; - m_cur.p_states = & - ( - tm_state_enums - [ - std::wstring(name.begin(), name.end() - states_suffix.length()) - ] = tm_states_t() - ); - } - // enumeration - else - { - m_state = at_enum; - m_cur.p_enum = &(tm_enums[name] = tm_enum_t()); - } - } - // Enumeration member - else if(prop_.bPrimVal == TMT_ENUMVAL) switch(m_state) - { - // enumeration member - case at_enum: - { - (*m_cur.p_enum)[prop_.sEnumVal] = name; - break; - } - - // class part - case at_parts: - { - tm_part_t part; - part.name = name; - part.states = tm_state_enums.end(); - (*m_cur.p_class)[prop_.sEnumVal] = part; - break; - } - - // state - case at_states: - { - (*m_cur.p_states)[prop_.sEnumVal] = name; - break; - } - } - // Primitive type - else if(prop_.sEnumVal == prop_.bPrimVal) - { - m_state = at_none; - m_cur.p_none = NULL; - } - // Property - else - { - m_state = at_none; - m_cur.p_none = NULL; - - tm_property_t property; - - property.name = name; - property.id = prop_.sEnumVal; - property.type = prop_.bPrimVal; - - if(prop_.bPrimVal == TMT_ENUM) - property.enum_type = tm_enums.find(name); - - tm_properties.push_back(property); - } - } - }; - - struct state_mapping_t - { - LPWSTR classname; - int partid; - LPWSTR states; - }; - - static const tmdump::state_mapping_t state_map[] = - { - { L"BUTTON", 0, NULL }, - { NULL, BP_CHECKBOX, L"CHECKBOX" }, - { NULL, BP_GROUPBOX, L"GROUPBOX" }, - { NULL, BP_PUSHBUTTON, L"PUSHBUTTON" }, - { NULL, BP_RADIOBUTTON, L"RADIOBUTTON" }, - { L"CLOCK", CLP_TIME, L"CLOCK" }, - { L"COMBOBOX", CP_DROPDOWNBUTTON, L"COMBOBOX" }, - { L"EDIT", EP_EDITTEXT, L"EDITTEXT" }, - { L"EXPLORERBAR", 0, NULL }, - { NULL, EBP_HEADERCLOSE, L"HEADERCLOSE" }, - { NULL, EBP_HEADERPIN, L"HEADERPIN" }, - { NULL, EBP_IEBARMENU, L"IEBARMENU" }, - { NULL, EBP_NORMALGROUPCOLLAPSE, L"NORMALGROUPCOLLAPSE" }, - { NULL, EBP_NORMALGROUPEXPAND, L"NORMALGROUPEXPAND" }, - { NULL, EBP_SPECIALGROUPCOLLAPSE, L"SPECIALGROUPCOLLAPSE"}, - { NULL, EBP_SPECIALGROUPEXPAND, L"SPECIALGROUPEXPAND" }, - { L"HEADER", 0, NULL }, - { NULL, HP_HEADERITEM, L"HEADERITEM" }, - { NULL, HP_HEADERITEMLEFT, L"HEADERITEMLEFT" }, - { NULL, HP_HEADERITEMRIGHT, L"HEADERITEMRIGHT" }, - { NULL, HP_HEADERSORTARROW, L"HEADERSORTARROW" }, - { L"LISTVIEW", LVP_LISTITEM, L"LISTITEM " }, - { L"MENU", 0, NULL }, - { NULL, MP_MENUBARDROPDOWN, L"MENU" }, - { NULL, MP_MENUBARITEM, L"MENU" }, - { NULL, MP_CHEVRON, L"MENU" }, - { NULL, MP_MENUDROPDOWN, L"MENU" }, - { NULL, MP_MENUITEM, L"MENU" }, - { NULL, MP_SEPARATOR, L"MENU" }, - { L"MENUBAND", MDP_NEWAPPBUTTON, L"MENUBAND" }, - { L"PAGE", 0, NULL }, - { NULL, PGRP_DOWN, L"DOWN" }, - { NULL, PGRP_DOWNHORZ, L"DOWNHORZ" }, - { NULL, PGRP_UP, L"UP" }, - { NULL, PGRP_UPHORZ, L"UPHORZ" }, - { L"REBAR", RP_CHEVRON, L"CHEVRON" }, - { L"SCROLLBAR", 0, NULL }, - { NULL, SBP_ARROWBTN, L"ARROWBTN" }, - { NULL, SBP_LOWERTRACKHORZ, L"SCROLLBAR" }, - { NULL, SBP_LOWERTRACKVERT, L"SCROLLBAR" }, - { NULL, SBP_THUMBBTNHORZ, L"SCROLLBAR" }, - { NULL, SBP_THUMBBTNVERT, L"SCROLLBAR" }, - { NULL, SBP_UPPERTRACKHORZ, L"SCROLLBAR" }, - { NULL, SBP_UPPERTRACKVERT, L"SCROLLBAR" }, - { NULL, SBP_SIZEBOX, L"SIZEBOX" }, - { L"SPIN", 0, NULL }, - { NULL, SPNP_DOWN, L"DOWN" }, - { NULL, SPNP_DOWNHORZ, L"DOWNHORZ" }, - { NULL, SPNP_UP, L"UP" }, - { NULL, SPNP_UPHORZ, L"UPHORZ" }, - { L"STARTPANEL", 0, NULL }, - { NULL, SPP_LOGOFFBUTTONS, L"LOGOFFBUTTONS" }, - { NULL, SPP_MOREPROGRAMSARROW, L"MOREPROGRAMSARROW" }, - { L"TAB", 0, NULL }, - { NULL, TABP_TABITEM, L"TABITEM" }, - { NULL, TABP_TABITEMBOTHEDGE, L"TABITEMBOTHEDGE" }, - { NULL, TABP_TABITEMLEFTEDGE, L"TABITEMLEFTEDGE" }, - { NULL, TABP_TABITEMRIGHTEDGE, L"TABITEMRIGHTEDGE" }, - { NULL, TABP_TOPTABITEM, L"TOPTABITEM" }, - { NULL, TABP_TOPTABITEMBOTHEDGE, L"TOPTABITEMBOTHEDGE" }, - { NULL, TABP_TOPTABITEMLEFTEDGE, L"TOPTABITEMLEFTEDGE" }, - { NULL, TABP_TOPTABITEMRIGHTEDGE, L"TOPTABITEMRIGHTEDGE" }, - { L"TOOLBAR", 0, NULL }, - { NULL, TP_BUTTON, L"TOOLBAR" }, - { NULL, TP_DROPDOWNBUTTON, L"TOOLBAR" }, - { NULL, TP_SPLITBUTTON, L"TOOLBAR" }, - { NULL, TP_SPLITBUTTONDROPDOWN, L"TOOLBAR" }, - { NULL, TP_SEPARATOR, L"TOOLBAR" }, - { NULL, TP_SEPARATORVERT, L"TOOLBAR" }, - { L"TOOLTIP", 0, NULL }, - { NULL, TTP_BALLOON, L"BALLOON" }, - { NULL, TTP_BALLOONTITLE, L"BALLOON" }, - { NULL, TTP_CLOSE, L"CLOSE" }, - { NULL, TTP_STANDARD, L"STANDARD" }, - { NULL, TTP_STANDARDTITLE, L"STANDARD" }, - { L"TRACKBAR", 0, NULL }, - { NULL, TKP_THUMB, L"THUMB" }, - { NULL, TKP_THUMBBOTTOM, L"THUMBBOTTOM" }, - { NULL, TKP_THUMBLEFT, L"THUMBLEFT" }, - { NULL, TKP_THUMBRIGHT, L"THUMBRIGHT" }, - { NULL, TKP_THUMBTOP, L"THUMBTOP" }, - { NULL, TKP_THUMBVERT, L"THUMBVERT" }, - { NULL, TKP_TICS, L"TICS" }, - { NULL, TKP_TICSVERT, L"TICSVERT" }, - { NULL, TKP_TRACK, L"TRACK" }, - { NULL, TKP_TRACKVERT, L"TRACKVERT" }, - { L"TREEVIEW", 0, NULL }, - { NULL, TVP_GLYPH, L"GLYPH" }, - { NULL, TVP_TREEITEM, L"TREEITEM" }, - { L"WINDOW", 0, NULL }, - { NULL, WP_CAPTION, L"CAPTION" }, - { NULL, WP_CLOSEBUTTON, L"CLOSEBUTTON" }, - { NULL, WP_FRAMEBOTTOM, L"FRAME" }, - { NULL, WP_FRAMELEFT, L"FRAME" }, - { NULL, WP_FRAMERIGHT, L"FRAME" }, - { NULL, WP_HELPBUTTON, L"HELPBUTTON" }, - { NULL, WP_HORZSCROLL, L"HORZSCROLL" }, - { NULL, WP_HORZTHUMB, L"HORZTHUMB" }, - { NULL, WP_MAXBUTTON, L"MAXBUTTON" }, - { NULL, WP_MAXCAPTION, L"MAXCAPTION" }, - { NULL, WP_MDICLOSEBUTTON, L"CLOSEBUTTON" }, - { NULL, WP_MDIHELPBUTTON, L"HELPBUTTON" }, - { NULL, WP_MDIMINBUTTON, L"MINBUTTON" }, - { NULL, WP_MDIRESTOREBUTTON, L"RESTOREBUTTON" }, - { NULL, WP_MDISYSBUTTON, L"SYSBUTTON" }, - { NULL, WP_MINBUTTON, L"MINBUTTON" }, - { NULL, WP_MINCAPTION, L"MINCAPTION" }, - { NULL, WP_RESTOREBUTTON, L"RESTOREBUTTON" }, - { NULL, WP_SMALLCAPTION, L"CAPTION" }, - { NULL, WP_SMALLCLOSEBUTTON, L"CLOSEBUTTON" }, - { NULL, WP_SMALLFRAMEBOTTOM, L"FRAME" }, - { NULL, WP_SMALLFRAMELEFT, L"FRAME" }, - { NULL, WP_SMALLFRAMERIGHT, L"FRAME" }, - { NULL, WP_SMALLMAXCAPTION, L"MAXCAPTION" }, - { NULL, WP_SMALLMINCAPTION, L"MINCAPTION" }, - { NULL, WP_SYSBUTTON, L"SYSBUTTON" }, - { NULL, WP_VERTSCROLL, L"HORZSCROLL" }, - { NULL, WP_VERTTHUMB, L"HORZTHUMB" }, - }; - - class state_link: public std::unary_function<struct state_mapping_t, void> - { - private: - tm_classes_t::iterator m_class; - - public: - void operator()(const struct state_mapping_t& mapping_) - { - // switch to a new class - if(mapping_.classname) - m_class = tm_classes.find(std::wstring(mapping_.classname)); - - // no mapping, or class not found - if(mapping_.states == NULL || m_class == tm_classes.end()) return; - - tm_state_enums_t::iterator states = - tm_state_enums.find(std::wstring(mapping_.states)); - - // unknown set of states - if(states == tm_state_enums.end()) return; - - tm_parts_t::iterator part = m_class->second.find(mapping_.partid); - - // unknown part - if(part == m_class->second.end()) return; - - // success - part->second.states = states; - } - }; -} - -int main(int argc, char * argv[]) -{ - try - { - struct TMSCHEMAINFO const & schema = *GetSchemaInfo(); - - // build the tables of properties, classes, parts and states - std::for_each - ( - schema.pPropTable, - schema.pPropTable + schema.iPropCount, - tmdump::schema_scan() - ); - - // link parts to states - std::for_each - ( - tmdump::state_map, - tmdump::state_map + sizeof(tmdump::state_map) / sizeof(tmdump::state_map[0]), - tmdump::state_link() - ); - - ::InitCommonControls(); - ::SetThemeAppProperties(STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS); - - // dump the current values of all properties - for - ( - tmdump::tm_classes_t::iterator p = tmdump::tm_classes.begin(); - p != tmdump::tm_classes.end(); - ++ p - ) - { - const std::wstring& class_name = p->first; - - // open the theme data for the current class - class htheme_t - { - public: - HTHEME m_handle; - - htheme_t(HTHEME handle_): m_handle(handle_) { } - ~htheme_t() { ::CloseThemeData(m_handle); } - - operator HTHEME() { return m_handle; } - } - data = ::OpenThemeData(NULL, class_name.c_str()); - - // failure - if(data == NULL) - { - std::fwprintf - ( - stderr, - L"OpenThemeData(\"%s\") failed, error %d\n", - class_name.c_str(), - GetLastError() - ); - - continue; - } - - // class name - std::fwprintf(stdout, L"%s\n", p->first.c_str()); - - // dump system properties - for - ( - tmdump::tm_properties_t::iterator p = tmdump::tm_properties.begin(); - p != tmdump::tm_properties.end(); - ++ p - ) - { - switch(p->type) - { - case TMT_POSITION: - case TMT_MARGINS: - case TMT_RECT: - case TMT_INTLIST: - continue; - } - - // property name - std::fwprintf(stdout, L"\t%s = ", p->name.c_str()); - - HRESULT hres; - - switch(p->type) - { - // string - case TMT_STRING: - case TMT_FILENAME: // FIXME - { - WCHAR buffer[256]; - if(FAILED(hres = GetThemeSysString(data, p->id, buffer, 256))) break; - std::fwprintf(stdout, L"string: \"%s\"", buffer); - break; - } - - // integer - case TMT_INT: - { - int val; - if(FAILED(hres = GetThemeSysInt(data, p->id, &val))) break; - std::fwprintf(stdout, L"int: %d", val); - break; - } - - // boolean - case TMT_BOOL: - { - SetLastError(0); - BOOL val = GetThemeSysBool(data, p->id); - if(FAILED(hres = GetLastError())) break; - std::fwprintf(stdout, L"bool: %s", val ? L"true" : L"false"); - break; - } - - // color - case TMT_COLOR: - { - SetLastError(0); - - COLORREF val = GetThemeSysColor(data, p->id); - - if(FAILED(hres = GetLastError())) break; - - std::fwprintf - ( - stdout, - L"rgb: %d, %d, %d", - GetRValue(val), - GetGValue(val), - GetBValue(val) - ); - - break; - } - - // size - case TMT_SIZE: - { - SetLastError(0); - int val = GetThemeSysSize(data, p->id); - if(FAILED(hres = GetLastError())) break; - std::fwprintf(stdout, L"size: %d", val); - break; - } - - // font - case TMT_FONT: - { - LOGFONTW val; - if(FAILED(hres = GetThemeSysFont(data, p->id, &val))) break; - std::fwprintf(stdout, L"font: %s", val.lfFaceName); - break; - } - - // enumerated integer - case TMT_ENUM: - { - int val; - if(FAILED(hres = GetThemeSysInt(data, p->id, &val))) break; - - std::fwprintf(stdout, L"enum(%s): ", p->enum_type->first.c_str()); - - tmdump::tm_enum_t::iterator enumval = p->enum_type->second.find(val); - - if(enumval == p->enum_type->second.end()) - std::fwprintf(stdout, L"<%d>", val); - else - std::fwprintf(stdout, L"%s", enumval->second.c_str()); - - break; - } - } - - if(FAILED(hres)) std::fwprintf(stdout, L"<error %08X>", hres); - - std::fputwc(L'\n', stdout); - } - - } - } - catch(std::exception e) - { - std::cerr << e.what() << std::endl; - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} - -// EOF - diff --git a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.rc b/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.rc deleted file mode 100644 index 8877498af39..00000000000 --- a/modules/rosapps/applications/sysutils/utils/theme/dump/themedump.rc +++ /dev/null @@ -1,6 +0,0 @@ -#define WIN32_LEAN_AND_MEAN -#include <winuser.h> - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" - -// EOF

1 0

[reactos] 01/01: [ROSAPPS] Remove 'stats' utility
by Mark Jansen 31 May '22

31 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e1199713e5960c0eee6a… commit 9e1199713e5960c0eee6a5190515b98dda2908bd Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 3 17:33:38 2021 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue May 31 23:24:01 2022 +0300 [ROSAPPS] Remove 'stats' utility --- .../applications/sysutils/utils/CMakeLists.txt | 1 - .../sysutils/utils/stats/CMakeLists.txt | 5 - .../applications/sysutils/utils/stats/stats.c | 478 --------------------- 3 files changed, 484 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/CMakeLists.txt index 9bc33cc6efc..980239620e2 100644 --- a/modules/rosapps/applications/sysutils/utils/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/utils/CMakeLists.txt @@ -5,5 +5,4 @@ add_subdirectory(objdir) add_subdirectory(partinfo) add_subdirectory(ps) add_subdirectory(rosperf) -add_subdirectory(stats) add_subdirectory(tickcount) diff --git a/modules/rosapps/applications/sysutils/utils/stats/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/stats/CMakeLists.txt deleted file mode 100644 index 43787a6827e..00000000000 --- a/modules/rosapps/applications/sysutils/utils/stats/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -add_executable(stats stats.c) -set_module_type(stats win32cui UNICODE) -add_importlibs(stats ntdll msvcrt kernel32) -add_cd_file(TARGET stats DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/utils/stats/stats.c b/modules/rosapps/applications/sysutils/utils/stats/stats.c deleted file mode 100644 index 0a8c45f3c34..00000000000 --- a/modules/rosapps/applications/sysutils/utils/stats/stats.c +++ /dev/null @@ -1,478 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS project statistics - * FILE: stats.c - * PURPOSE: Main program file - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/01-2002 Created - */ -#include <windows.h> -#include <tchar.h> -#include <stdio.h> - -typedef struct _EXTENSION_INFO -{ - struct _EXTENSION_INFO * Next; - struct _FILE_INFO * StatInfoList; - TCHAR ExtName[16]; - TCHAR ExpandedExtName[128]; - DWORD nExtensions; - TCHAR Description[256]; - DWORD FileCount; - DWORD LineCount; - DWORD EmptyLines; -} EXTENSION_INFO, *PEXTENSION_INFO; - -typedef struct _FILE_INFO -{ - struct _FILE_INFO * Next; - struct _FILE_INFO * StatInfoListNext; - PEXTENSION_INFO ExtInfo; - TCHAR FileName[MAX_PATH]; - DWORD LineCount; - DWORD EmptyLines; - DWORD FunctionCount; -} FILE_INFO, *PFILE_INFO; - -HANDLE FileHandle; -PEXTENSION_INFO ExtInfoList; -PFILE_INFO StatInfoList; -BOOLEAN SkipEmptyLines, BeSilent; - -#define MAX_OPTIONS 2 -TCHAR *Options[MAX_OPTIONS]; - - -VOID -Initialize(VOID) -{ - ExtInfoList = NULL; - StatInfoList = NULL; -} - - -VOID -Cleanup(VOID) -{ - PEXTENSION_INFO ExtInfo; - PEXTENSION_INFO NextExtInfo; - - ExtInfo = ExtInfoList; - while (ExtInfo != NULL) - { - NextExtInfo = ExtInfo->Next; - HeapFree (GetProcessHeap(), 0, ExtInfo); - ExtInfo = NextExtInfo; - } -} - - -PEXTENSION_INFO -AddExtension(LPTSTR ExtName, - LPTSTR Description) -{ - PEXTENSION_INFO ExtInfo; - PEXTENSION_INFO Info; - TCHAR *t; - DWORD ln; - - ExtInfo = (PEXTENSION_INFO) HeapAlloc (GetProcessHeap(), 0, sizeof (EXTENSION_INFO)); - if (!ExtInfo) - return NULL; - - for(t = ExtName; *t != _T('\0'); t += _tcslen(t) + 1); - ln = (DWORD_PTR)t - (DWORD_PTR)ExtName; - - ZeroMemory (ExtInfo, sizeof (EXTENSION_INFO)); - memcpy (ExtInfo->ExtName, ExtName, ln); - _tcscpy (ExtInfo->Description, Description); - - for(t = ExtInfo->ExtName; *t != _T('\0'); t += _tcslen(t) + 1) - { - if(ExtInfo->nExtensions++ != 0) - _tcscat (ExtInfo->ExpandedExtName, _T(";")); - _tcscat (ExtInfo->ExpandedExtName, _T("*.")); - _tcscat (ExtInfo->ExpandedExtName, t); - } - - if (ExtInfoList) - { - Info = ExtInfoList; - while (Info->Next != NULL) - { - Info = Info->Next; - } - Info->Next = ExtInfo; - } - else - { - ExtInfoList = ExtInfo; - } - - return ExtInfo; -} - - -PFILE_INFO -AddFile(LPTSTR FileName, - PEXTENSION_INFO ExtInfo) -{ - PFILE_INFO StatInfo; - PFILE_INFO Info; - - StatInfo = (PFILE_INFO) HeapAlloc (GetProcessHeap(), 0, sizeof (FILE_INFO)); - if (!StatInfo) - return NULL; - ZeroMemory (StatInfo, sizeof (FILE_INFO)); - _tcscpy (StatInfo->FileName, FileName); - StatInfo->ExtInfo = ExtInfo; - - if (ExtInfo->StatInfoList) - { - Info = ExtInfo->StatInfoList; - while (Info->StatInfoListNext != NULL) - { - Info = Info->StatInfoListNext; - } - Info->StatInfoListNext = StatInfo; - } - else - { - ExtInfo->StatInfoList = StatInfo; - } - - if (StatInfoList) - { - Info = StatInfoList; - while (Info->Next != NULL) - { - Info = Info->Next; - } - Info->Next = StatInfo; - } - else - { - StatInfoList = StatInfo; - } - - return StatInfo; -} - - -VOID -CleanupAfterFile(VOID) -{ - if(FileHandle != INVALID_HANDLE_VALUE) - CloseHandle (FileHandle); -} - - -BOOL -LoadFile(LPTSTR FileName) -{ - LONG FileSize; - - FileHandle = CreateFile (FileName, // Create this file - GENERIC_READ, // Open for reading - 0, // No sharing - NULL, // No security - OPEN_EXISTING, // Open the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - return FALSE; - - FileSize = GetFileSize (FileHandle, NULL); - if (FileSize <= 0) - { - CloseHandle (FileHandle); - return FALSE; - } - - return TRUE; -} - - -VOID -ReadLines(PFILE_INFO StatInfo) -{ - DWORD ReadBytes, LineLen; - static char FileBuffer[1024]; - char LastChar = '\0'; - char *Current; - - LineLen = 0; - while(ReadFile (FileHandle, FileBuffer, sizeof(FileBuffer), &ReadBytes, NULL) && ReadBytes >= sizeof(char)) - { - for(Current = FileBuffer; ReadBytes > 0; ReadBytes -= sizeof(char), Current++) - { - if(*Current == '\n' && LastChar == '\r') - { - LastChar = '\0'; - if(!SkipEmptyLines || (LineLen > 0)) - StatInfo->LineCount++; - if(LineLen == 0) - StatInfo->EmptyLines++; - LineLen = 0; - continue; - } - LastChar = *Current; - if(SkipEmptyLines && (*Current == ' ' || *Current == '\t')) - { - continue; - } - if(*Current != '\r') - LineLen++; - } - } - - StatInfo->LineCount += (LineLen > 0); - StatInfo->EmptyLines += ((LastChar != '\0') && (LineLen == 0)); -} - - -VOID -PrintStatistics(VOID) -{ - PEXTENSION_INFO Info; - DWORD TotalFileCount; - DWORD TotalLineCount; - DWORD TotalAvgLF; - DWORD TotalEmptyLines; - - TotalFileCount = 0; - TotalLineCount = 0; - TotalEmptyLines = 0; - Info = ExtInfoList; - - for (Info = ExtInfoList; Info != NULL; Info = Info->Next) - { - TotalFileCount += Info->FileCount; - TotalLineCount += Info->LineCount; - TotalEmptyLines += Info->EmptyLines; - } - - TotalAvgLF = (TotalFileCount ? TotalLineCount / TotalFileCount : 0); - - for (Info = ExtInfoList; Info != NULL; Info = Info->Next) - { - DWORD AvgLF; - - if (Info->FileCount != 0) - { - AvgLF = (Info->FileCount ? Info->LineCount / Info->FileCount : 0); - } - else - { - AvgLF = 0; - } - - _tprintf (_T("\n")); - _tprintf (_T("File extension%c : %s\n"), ((Info->nExtensions > 1) ? _T('s') : _T(' ')), Info->ExpandedExtName); - _tprintf (_T("File ext. description : %s\n"), Info->Description); - _tprintf (_T("Number of files : %lu\n"), Info->FileCount); - _tprintf (_T("Number of lines : %lu\n"), Info->LineCount); - if(SkipEmptyLines) - _tprintf (_T("Number of empty lines : %lu\n"), Info->EmptyLines); - _tprintf (_T("Proportion of lines : %.2f %%\n"), (float)(TotalLineCount ? (((float)Info->LineCount * 100) / (float)TotalLineCount) : 0)); - _tprintf (_T("Average no. lines/file : %lu\n"), AvgLF); - } - - _tprintf (_T("\n")); - _tprintf (_T("Total number of files : %lu\n"), TotalFileCount); - _tprintf (_T("Total number of lines : %lu\n"), TotalLineCount); - if(SkipEmptyLines) - _tprintf (_T("Total number of empty lines : %lu\n"), TotalEmptyLines); - _tprintf (_T("Average no. lines/file : %lu\n"), TotalAvgLF); -} - - -BOOL -ProcessFiles(LPTSTR Path) -{ - WIN32_FIND_DATA FindFile; - PEXTENSION_INFO Info; - TCHAR SearchPath[256]; - TCHAR FileName[256]; - TCHAR *Ext; - HANDLE SearchHandle; - BOOL More; - - Info = ExtInfoList; - while (Info != NULL) - { - Ext = Info->ExtName; - do - { - ZeroMemory (&FindFile, sizeof (FindFile)); - _tcscpy (SearchPath, Path); - _tcscat (SearchPath, _T("\\*.")); - _tcscat (SearchPath, Ext); - _tcscpy (FindFile.cFileName, SearchPath); - SearchHandle = FindFirstFile (SearchPath, &FindFile); - if (SearchHandle != INVALID_HANDLE_VALUE) - { - More = TRUE; - while (More) - { - if (!(FindFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - { - _tcscpy (FileName, Path); - _tcscat (FileName, _T("\\")); - _tcscat (FileName, FindFile.cFileName); - - if (LoadFile (FileName)) - { - PFILE_INFO StatInfo; - - StatInfo = AddFile (FindFile.cFileName, Info); - if (!StatInfo) - { - _tprintf (_T("Not enough free memory.\n")); - return FALSE; - } - - ReadLines (StatInfo); - - Info->FileCount++; - Info->LineCount += StatInfo->LineCount; - Info->EmptyLines += StatInfo->EmptyLines; - - CleanupAfterFile(); - } - } - More = FindNextFile (SearchHandle, &FindFile); - } - FindClose (SearchHandle); - } - Ext += _tcslen(Ext) + 1; - } while(*Ext != _T('\0')); - Info = Info->Next; - } - return TRUE; -} - - -BOOL -ProcessDirectories(LPTSTR Path) -{ - WIN32_FIND_DATA FindFile; - TCHAR SearchPath[MAX_PATH]; - HANDLE SearchHandle; - BOOL More; - - if(!BeSilent) - { - _tprintf (_T("Processing %s ...\n"), Path); - } - - _tcscpy (SearchPath, Path); - _tcscat (SearchPath, _T("\\*.*")); - - SearchHandle = FindFirstFileEx (SearchPath, - FindExInfoStandard, - &FindFile, - FindExSearchLimitToDirectories, - NULL, - 0); - if (SearchHandle != INVALID_HANDLE_VALUE) - { - More = TRUE; - while (More) - { - if ((FindFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - && (_tcscmp (FindFile.cFileName, _T(".")) != 0) - && (_tcscmp (FindFile.cFileName, _T("..")) != 0) - && (_tcscmp (FindFile.cFileName, _T("CVS")) != 0) - && (_tcscmp (FindFile.cFileName, _T(".svn")) != 0)) - { - _tcscpy (SearchPath, Path); - _tcscat (SearchPath, _T("\\")); - _tcscat (SearchPath, FindFile.cFileName); - if (!ProcessDirectories (SearchPath)) - return FALSE; - if (!ProcessFiles (SearchPath)) - return FALSE; - } - More = FindNextFile (SearchHandle, &FindFile); - } - FindClose (SearchHandle); - } - return TRUE; -} - - -VOID -Execute(LPTSTR Path) -{ - if (!ExtInfoList) - { - _tprintf (_T("No extensions specified.\n")); - return; - } - - if (!ProcessDirectories (Path)) - { - _tprintf (_T("Failed to process directories.\n")); - return; - } - - if (!ProcessFiles (Path)) - { - _tprintf (_T("Failed to process files.\n")); - return; - } - - PrintStatistics(); -} - -BOOLEAN -IsOptionSet(TCHAR *Option) -{ - int i; - for(i = 0; i < MAX_OPTIONS; i++) - { - if(!Options[i]) - continue; - - if(!_tcscmp(Options[i], Option)) - return TRUE; - } - return FALSE; -} - - -int _tmain(int argc, _TCHAR * argv[]) -{ - int a; - - _tprintf (_T("ReactOS Project Statistics\n")); - _tprintf (_T("==========================\n\n")); - - if (argc < 2 || argc > 2 + MAX_OPTIONS) - { - _tprintf(_T("Usage: stats [-e] [-s] directory\n")); - _tprintf(_T(" -e: don't count empty lines\n")); - _tprintf(_T(" -s: be silent, don't print directories while processing\n")); - return 1; - } - - Initialize(); - AddExtension (_T("c\0\0"), _T("Ansi C Source files")); - AddExtension (_T("cpp\0cxx\0\0"), _T("C++ Source files")); - AddExtension (_T("h\0\0"), _T("Header files")); - - for(a = 1; a < argc - 1; a++) - { - Options[a - 1] = argv[a]; - } - - SkipEmptyLines = IsOptionSet(_T("-e")); - BeSilent = IsOptionSet(_T("-s")); - - Execute (argv[argc - 1]); - Cleanup(); - - return 0; -}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs