[DIKPART]

Implement the RESCAN command.

svn path=/trunk/; revision=68569

reactos/base/system/diskpart/lang/en-US.rc

@@ -43,10 +43,17 @@ BEGIN
     IDS_LIST_PARTITION_HEAD "\n  Partition      Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
-    IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\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\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

reactos/base/system/diskpart/lang/ro-RO.rc

@@ -44,11 +44,18 @@ BEGIN
     IDS_LIST_PARTITION_HEAD "\n  Partition      Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
-    IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\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 "Volum ###\tLtr\tEtichetă\n"
 END
 
-/* Select command strings */
+/* 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"

reactos/base/system/diskpart/lang/ru-RU.rc

@@ -45,11 +45,18 @@ BEGIN
     IDS_LIST_PARTITION_HEAD "\n  Partition      Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
-    IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\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 "Том ###\tИмя\tМетка\n"
 END
 
-/* Select command strings */
+/* 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"

reactos/base/system/diskpart/lang/sq-AL.rc

@@ -47,11 +47,18 @@ BEGIN
     IDS_LIST_PARTITION_HEAD "\n  Partition      Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "%c -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "  Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
-    IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\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 ###\tLtr\tLabel\n"
 END
 
-/* Select command strings */
+/* 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"

reactos/base/system/diskpart/lang/tr-TR.rc

@@ -45,11 +45,18 @@ BEGIN
     IDS_LIST_PARTITION_HEAD "\n  Partition      Type              Size     Offset\n"
     IDS_LIST_PARTITION_LINE "  -------------  ----------------  -------  -------\n"
     IDS_LIST_PARTITION_FORMAT "%c Partition %2lu   %-16s  %4I64u %-2s  %4I64u %-2s\n"
-    IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\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 "Birim ###\tHarf\tEtiket\n"
 END
 
-/* Select command strings */
+/* 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"

reactos/base/system/diskpart/partlist.c

@@ -1137,6 +1137,9 @@ DestroyPartitionList(VOID)
     PPARTENTRY PartEntry;
     PLIST_ENTRY Entry;
 
+    CurrentDisk = NULL;
+    CurrentPartition = NULL;
+
     /* Release disk and partition info */
     while (!IsListEmpty(&DiskListHead))
     {

reactos/base/system/diskpart/rescan.c

@@ -2,8 +2,7 @@
  * PROJECT:         ReactOS DiskPart
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base/system/diskpart/rescan.c
- * PURPOSE:         Manages all the partitions of the OS in
+ * PURPOSE:         Manages all the partitions of the OS in an interactive way
- *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
 
@@ -11,5 +10,10 @@
 
 BOOL rescan_main(INT argc, LPWSTR *argv)
 {
+    PrintResourceString(IDS_RESCAN_START);
+    DestroyPartitionList();
+    CreatePartitionList();
+    PrintResourceString(IDS_RESCAN_END);
+
     return TRUE;
 }

reactos/base/system/diskpart/resource.h

@@ -41,6 +41,9 @@
 #define IDS_LIST_PARTITION_NO_DISK     3306
 #define IDS_LIST_VOLUME_HEAD           3307
 
+#define IDS_RESCAN_START               4100
+#define IDS_RESCAN_END                 4101
+
 #define IDS_SELECT_NO_DISK             4400
 #define IDS_SELECT_DISK                4401
 #define IDS_SELECT_DISK_INVALID        4402