[DISKPART] Replace the hardcoded volume type strings

EricKohl · EricKohl · commit df01aa624109 · 2026-01-13T23:30:42.000+01:00
diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc
@@ -347,3 +347,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unbekannt"
     IDS_PARTITION_TYPE_UNUSED "Nicht verwendet"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Wechselmedium"
+    IDS_VOLUME_TYPE_UNKNOWN "Unbekannt"
+END
diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc
@@ -347,3 +347,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/it-IT.rc b/base/system/diskpart/lang/it-IT.rc
@@ -354,3 +354,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc
@@ -347,3 +347,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc
@@ -349,3 +349,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc
@@ -355,3 +355,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc
@@ -349,3 +349,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc
@@ -351,3 +351,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc
@@ -357,3 +357,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc
@@ -356,3 +356,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc
@@ -356,3 +356,11 @@ BEGIN
     IDS_PARTITION_TYPE_UNKNOWN "Unknown"
     IDS_PARTITION_TYPE_UNUSED "Unused"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_VOLUME_TYPE_DVD "DVD"
+    IDS_VOLUME_TYPE_PARTITION "Partition"
+    IDS_VOLUME_TYPE_REMOVABLE "Removable"
+    IDS_VOLUME_TYPE_UNKNOWN "Unknown"
+END
diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c
@@ -489,7 +489,8 @@ PrintVolume(
 {
     ULONGLONG VolumeSize;
     PWSTR pszSizeUnit;
-    PWSTR pszVolumeType;
+    INT nVolumeType;
+    WCHAR szVolumeTypeBuffer[30];
     WCHAR szInfoBuffer[16];
 
     VolumeSize = VolumeEntry->Size.QuadPart;
@@ -517,20 +518,25 @@ PrintVolume(
     switch (VolumeEntry->VolumeType)
     {
         case VOLUME_TYPE_CDROM:
-            pszVolumeType = L"DVD";
+            nVolumeType = IDS_VOLUME_TYPE_DVD;
             break;
+
         case VOLUME_TYPE_PARTITION:
-            pszVolumeType = L"Partition";
+            nVolumeType = IDS_VOLUME_TYPE_PARTITION;
             break;
+
         case VOLUME_TYPE_REMOVABLE:
-            pszVolumeType = L"Removable";
+            nVolumeType = IDS_VOLUME_TYPE_REMOVABLE;
             break;
+
         case VOLUME_TYPE_UNKNOWN:
         default:
-            pszVolumeType = L"Unknown";
+            nVolumeType = IDS_VOLUME_TYPE_UNKNOWN;
             break;
     }
 
+    LoadStringW(GetModuleHandle(NULL), nVolumeType, szVolumeTypeBuffer, ARRAYSIZE(szVolumeTypeBuffer));
+
     szInfoBuffer[0] = UNICODE_NULL;
     if (VolumeEntry->IsSystem)
         LoadStringW(GetModuleHandle(NULL), IDS_INFO_SYSTEM, szInfoBuffer, ARRAYSIZE(szInfoBuffer));
@@ -543,7 +549,7 @@ PrintVolume(
                  VolumeEntry->DriveLetter,
                  (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"",
                  (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"",
-                 pszVolumeType,
+                 szVolumeTypeBuffer,
                  VolumeSize, pszSizeUnit,
                  L"",
                  szInfoBuffer);
diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h
@@ -263,3 +263,8 @@
 #define IDS_PARTITION_TYPE_SYSTEM     5204
 #define IDS_PARTITION_TYPE_UNKNOWN    5205
 #define IDS_PARTITION_TYPE_UNUSED     5206
+
+#define IDS_VOLUME_TYPE_DVD           5250
+#define IDS_VOLUME_TYPE_PARTITION     5251
+#define IDS_VOLUME_TYPE_REMOVABLE     5252
+#define IDS_VOLUME_TYPE_UNKNOWN       5253
