From 4cf877796b4308e27a7fc5454d16f27dce846355 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 4 Jan 2026 21:34:28 +0100 Subject: [PATCH] [DISKPART] Improve 'list volume' command Add output formats for the status and info columns. --- base/system/diskpart/lang/de-DE.rc | 6 +++--- base/system/diskpart/lang/en-US.rc | 6 +++--- base/system/diskpart/lang/it-IT.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/list.c | 3 ++- 12 files changed, 35 insertions(+), 34 deletions(-) diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index deeaaf8b4cc..1865c4be9f6 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -141,9 +141,9 @@ BEGIN 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_PARTITION_NONE "\nAuf dem Datenträger sind keine Partitionen vorhanden, die angezeigt werden können.\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" + 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 %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 53ea6f3b884..c36839b4db3 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -141,9 +141,9 @@ BEGIN 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_PARTITION_NONE "\nThere are no partitions on this disk to show.\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" + 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 %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/it-IT.rc b/base/system/diskpart/lang/it-IT.rc index 3e9c9de6af3..47ec62573a8 100644 --- a/base/system/diskpart/lang/it-IT.rc +++ b/base/system/diskpart/lang/it-IT.rc @@ -148,9 +148,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Partizione %-3lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNon c'è nessun disco per mostrare partizioni.\nSelezionare un disco e riprova.\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\n" - IDS_LIST_VOLUME_HEAD " Volume ### Ltr Etichetta FS Tipo Dimensione Stato Info\n" - IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ---------- ----- --------\n" - IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Etichetta FS Tipo Dimensione Stato Info\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ---------- --------- --------\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 628e12dbc8f..14cea6fee98 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -141,9 +141,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Partycja %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNie wybrano dysku do wyświetlenia partycji.\nWybierz dysk i spróbuj ponownie.\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\n" - IDS_LIST_VOLUME_HEAD " Wolumin ### Lit Etykieta FS Typ Rozmiar Stan Info\n" - IDS_LIST_VOLUME_LINE " ----------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT "%c Wolumin %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" + IDS_LIST_VOLUME_HEAD " Wolumin ### Lit Etykieta FS Typ Rozmiar Stan Info\n" + IDS_LIST_VOLUME_LINE " ----------- --- ----------- ----- ---------- ------- --------- --------\n" + IDS_LIST_VOLUME_FORMAT "%c Wolumin %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index a6c1554e770..5fb15965aa0 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -143,9 +143,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Partição %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nSem discos para listar Partições.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\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" + 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 %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 63a8ee5070b..84109f407ee 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -149,9 +149,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Partiție %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNu există niciun disc pentru a afișa partiții.\nSelectați un disc apoi reîncercați.\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\n" - IDS_LIST_VOLUME_HEAD " Volum ### Ltr Etichetă FS Tip Mărime Stare Informații\n" - IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT "%c Volum %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" + IDS_LIST_VOLUME_HEAD " Volum ### Ltr Etichetă FS Tip Mărime Stare Informații\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- --------- --------\n" + IDS_LIST_VOLUME_FORMAT "%c Volum %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index 57eaf51107e..ae3a4edcd2d 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -143,9 +143,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Раздел %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nДиск с разметкой элементов не выбран.\nУкажите диск и повторите попытку.\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\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" + 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 %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 98da182a974..b81becd2f36 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -145,9 +145,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT " Partition %2lu %-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_PARTITION_NONE "\nThere are no partitions on this disk to show.\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" + 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 %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index c21df6f7471..cab648ac4ac 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -151,9 +151,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Bölüm %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nBölümleri listelemek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\n" - IDS_LIST_VOLUME_HEAD " Birim ### Hrf Etiket DS Dür Boyut Durum Bilgi\n" - IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT "%c Birim %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" + IDS_LIST_VOLUME_HEAD " Birim ### Hrf Etiket DS Dür Boyut Durum Bilgi\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- --------- --------\n" + IDS_LIST_VOLUME_FORMAT "%c Birim %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 837286549f7..29ff9a90f85 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -150,9 +150,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n这里没有要列出分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\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" + 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 %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 68b4b60eb23..ba4f9c7188e 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -150,9 +150,9 @@ BEGIN IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n" IDS_LIST_PARTITION_NONE "\nThere are no partitions on this disk to show.\n" - IDS_LIST_VOLUME_HEAD " 磁碟區 ### Ltr 標籤 FS 類型 大小 狀態 資訊\n" - IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT "%c 磁碟區 %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" + IDS_LIST_VOLUME_HEAD " 磁碟區 ### Ltr 標籤 FS 類型 大小 狀態 資訊\n" + IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- --------- --------\n" + IDS_LIST_VOLUME_FORMAT "%c 磁碟區 %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s %-9s %-8s\n" END /* REMOVE command strings */ diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 7ba46b1ecda..a7293a3fe7e 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -521,7 +521,8 @@ PrintVolume( (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", pszVolumeType, - VolumeSize, pszSizeUnit); + VolumeSize, pszSizeUnit, + L"", L""); }