[DISKPART] Prevent drive letter changes on boot or system volumes

EricKohl · EricKohl · commit 702f9c6f77c3 · 2026-01-12T19:35:38.000+01:00
diff --git a/base/system/diskpart/assign.c b/base/system/diskpart/assign.c
@@ -74,6 +74,12 @@ assign_main(
         }
     }
 
+    if (CurrentVolume->IsBoot || CurrentVolume->IsSystem)
+    {
+        ConResPuts(StdOut, IDS_ASSIGN_SYSTEM_VOLUME);
+        return EXIT_SUCCESS;
+    }
+
     if (nExclusive > 1)
     {
         ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS);
diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc
@@ -32,6 +32,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nDer angegebene Buchstabe wurde diesem Laufwerk bereits zugewiesen.\n"
     IDS_ASSIGN_INVALID_LETTER "\nDer angegebene Laufwerksbuchstabe ist kein gültiger Volumebuchstabe.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nEs ist kein freier Laufwerksbuchstabe vorhanden, der diesem Volume zugewiesen werden kann.\nGeben Sie einen Laufwerksbuchstaben frei, und wiederholen Sie den Vorgang.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDer Laufwerkbuchstabe einens System-, Start- oder Auslagerungsvolumes kann nicht neu zugeordnet werden.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc
@@ -32,6 +32,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/it-IT.rc b/base/system/diskpart/lang/it-IT.rc
@@ -39,6 +39,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc
@@ -32,6 +32,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc
@@ -34,6 +34,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc
@@ -40,6 +40,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc
@@ -34,6 +34,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc
@@ -36,6 +36,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc
@@ -42,6 +42,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc
@@ -41,6 +41,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc
@@ -41,6 +41,7 @@ BEGIN
     IDS_ASSIGN_ALREADY_ASSIGNED "\nThe specified letter has already been assigned to this drive.\n"
     IDS_ASSIGN_INVALID_LETTER "\nThe letter you specified is not a valid volume letter.\n"
     IDS_ASSIGN_NO_MORE_LETTER "\nThere are no free drive letters to assign to this volume.\nPlease free up a drive letter and try again.\n"
+    IDS_ASSIGN_SYSTEM_VOLUME "\nDiskPart cannot reassign the drive letter on a system, boot or pagefile volume.\n"
 END
 
 /* AUTOMOUNT command strings */
diff --git a/base/system/diskpart/remove.c b/base/system/diskpart/remove.c
@@ -88,6 +88,12 @@ remove_main(
         }
     }
 
+    if (CurrentVolume->IsBoot || CurrentVolume->IsSystem)
+    {
+        ConResPuts(StdOut, IDS_ASSIGN_SYSTEM_VOLUME);
+        return EXIT_SUCCESS;
+    }
+
     if (nExclusive > 1)
     {
         ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS);
diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h
@@ -32,6 +32,7 @@
 #define IDS_ASSIGN_ALREADY_ASSIGNED    1022
 #define IDS_ASSIGN_INVALID_LETTER      1023
 #define IDS_ASSIGN_NO_MORE_LETTER      1024
+#define IDS_ASSIGN_SYSTEM_VOLUME       1025
 
 #define IDS_CLEAN_FAIL                 1030
 #define IDS_CLEAN_SUCCESS              1031

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,12 @@ assign_main(`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ if (CurrentVolume->IsBoot \|\| CurrentVolume->IsSystem)`
	`78`	`+ {`
	`79`	`+ ConResPuts(StdOut, IDS_ASSIGN_SYSTEM_VOLUME);`
	`80`	`+ return EXIT_SUCCESS;`
	`81`	`+ }`
	`82`	`+`
`77`	`83`	`if (nExclusive > 1)`
`78`	`84`	`{`
`79`	`85`	`ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS);`