[DISKPART] Replace the hardcoded volume type strings

This commit is contained in:
Eric Kohl
2026-01-13 23:30:42 +01:00
parent b5097211c8
commit df01aa6241
13 changed files with 105 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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);

View File

@@ -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