Display logical partitions. They cannot be selected or modified yet.
svn path=/trunk/; revision=63403
{STRING_HDINFOPARTEXISTS,
" â¢êठ¤¨áª %lu (%I64u %s), \88§¢®¤=%hu, \98¨ =%hu, \8e\93=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c ¢¨¤ %-3u %6lu %s"},
+ "%c%c %s¢¨¤ %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s â¢êठ¤¨áª %lu (\88§¢®¤=%hu, \98¨ =%hu, \8e\93=%hu) %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"\81¥ áꧤ ¤¥ ®¢ ¤ï« "},
{STRING_UNPSPACE,
- " \8d¥à §¯à¥¤¥«¥® ¬ïáâ® %6lu %s"},
+ " %s\8d¥à §¯à¥¤¥«¥® ¬ïáâ®%s %6lu %s"},
{STRING_MAXSIZE,
"\8c\81 (¤® %lu \8c\81)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Typ %-3u %6lu %s"},
+ "%c%c %sTyp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Instalace vytvoýila novì odd¡l na"},
{STRING_UNPSPACE,
- " M¡sto bez odd¡l\85 %6lu %s"},
+ " %sM¡sto bez odd¡l\85%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Typ %-3u %6lu %s"},
+ "%c%c %sTyp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup erstellte eine neue Partition auf"},
{STRING_UNPSPACE,
- " Unpartitionierter Speicher %6lu %s"},
+ " %sUnpartitionierter Speicher%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"©«¦ ©¡¢\9e¨æ \9bå©¡¦ %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s \91¡¢\9e¨æª \9bå©¡¦ª %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"\86 \9c\9a¡\98«á©«\98©\9e \9b\9e£ ¦ç¨\9a\9e©\9c â¤\98 ¤â¦ partition ©«¦"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (£\9c\9a. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipo %-3u %6lu %s"},
+ "%c%c %sTipo %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"El instalador a creado una nueva partici¢n en"},
{STRING_UNPSPACE,
- " Espacio sin particionar %6lu %s"},
+ " %sEspacio sin particionar%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c T\81\81p %-3u %6lu %s"},
+ "%c%c %sT\81\81p %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Loodi uus partitsioon"},
{STRING_UNPSPACE,
- " Kasutamata kettaruum %6lu %s"},
+ " %sKasutamata kettaruum%s %6lu %s"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup a cr\82\82 une nouvelle partition sur"},
{STRING_UNPSPACE,
- " Espace non partitionn\82 %6lu %s"},
+ " %sEspace non partitionn\82%s %6lu %s"},
{STRING_MAXSIZE,
"Mo (max. %lu Mo)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipo %-3u %6lu %s"},
+ "%c%c %sTipo %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup ha creato una nuova partizione su"},
{STRING_UNPSPACE,
- " Spazio non partizionato %6lu %s"},
+ " %sSpazio non partizionato%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_UNFORMATTED,
{STRING_HDINFOPARTEXISTS,
"on Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c ¼Ù² %-3u %6lu %s"},
+ "%c%c %s¼Ù² %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"¾¯Ä±¯ÌßÊ ±À×¼² Ê߰輮ݦ ·ÞÆ »¸¾²¼Ï¼À:"},
{STRING_UNPSPACE,
- " ÐÌÞݶÂÉ ½Íß°½ %6lu %s"},
+ " %sÐÌÞݶÂÉ ½Íß°½%s %6lu %s"},
{STRING_MAXSIZE,
"MB (»²ÀÞ². %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " Unpartitioned space %6lu %s"},
+ " %sUnpartitioned space%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup heeft een nieuwe partitie aangemaakt op"},
{STRING_UNPSPACE,
- " Niet gepartitioneerde ruimte %6lu %s"},
+ " %sNiet gepartitioneerde ruimte%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c 09Typ %-3u %6lu %s"},
+ "%c%c %s09Typ %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Dysk Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Instalator utworzy\88 now¥ partycj©"},
{STRING_UNPSPACE,
- " Miejsce poza partycjami %6lu %s"},
+ " %sMiejsce poza partycjami%s %6lu %s"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_UNFORMATTED,
{STRING_HDINFOPARTEXISTS,
"em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipo %-3u %6lu %s"},
+ "%c%c %sTipo %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"O instalador criou uma nova parti\87Æo em"},
{STRING_UNPSPACE,
- " Espa\87o nÆo particionado %6lu %s"},
+ " %sEspa\87o nÆo particionado%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tip %-3u %6lu %s"},
+ "%c%c %sTip %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"O nouÇ partiîie a fost creatÇ \8cn"},
{STRING_UNPSPACE,
- " Spaîiu nepartiîionat %6lu %s"},
+ " %sSpaîiu nepartiîionat%s %6lu %s"},
{STRING_MAXSIZE,
"Mo (max. %lu Mo)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
" ¦¥á⪮¬ ¤¨áª¥ %lu (%I64u %s), \8f®àâ=%hu, \98¨ =%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c \87 ¯¨áì %-3u %6lu %s"},
+ "%c%c %s\87 ¯¨áì %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s \86¥á⪨© ¤¨áª %lu (\8f®àâ=%hu, \98¨ =%hu, Id=%hu) %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"\8fà®£à ¬¬ ãáâ ®¢ª¨ ᮧ¤ « ®¢ë© à §¤¥« :"},
{STRING_UNPSPACE,
- " \8d¥à §¬¥ç¥®¥ ¯à®áâà á⢮ %6lu %s"},
+ " %s\8d¥à §¬¥ç¥®¥ ¯à®áâà á⢮%s %6lu %s"},
{STRING_MAXSIZE,
"\8c\81 (¬ ªá. %lu \8c\81)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c typ %-3u %6lu %s"},
+ "%c%c %styp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s pevnì disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Inçtal tor vytvoril nov£ oblas\9c na"},
{STRING_UNPSPACE,
- " Miesto bez oblast¡ %6lu %s"},
+ " %sMiesto bez oblast¡%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Tipi %-3u %6lu %s"},
+ "%c%c %sTipi %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Instalimi krijoj nj\89 particion t\89 ri n\89"},
{STRING_UNPSPACE,
- " Hap\89sire e papjesesezuar %6lu %s"},
+ " %sHap\89sire e papjesesezuar%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"p\86 H\86rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Typ %-3u %6lu %s"},
+ "%c%c %sTyp %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s H\86rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\86 %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Setup skapade en ny partition p\86"},
{STRING_UNPSPACE,
- " Opartitionerat utrymme %6lu %s"},
+ " %sOpartitionerat utrymme%s %6lu %s"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
"\9azerinde: Disk %lu (%I64u %s), Giri\9f=%hu, Veri Yolu=%hu, Kimlik=%hu, %wZ \81zerinde."},
{STRING_HDDINFOUNK5,
- "%c%c T\81r %-3u %6lu %s"},
+ "%c%c %sT\81r %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s Disk %lu (Giri\9f=%hu, Veri Yolu=%hu, Kimlik=%hu), %S \81zerinde"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"Kur, \9fu b\94l\81m\81 olu\9fturdu:"},
{STRING_UNPSPACE,
- " Kullan\8dlmayan Bo\9fluk %6lu %s"},
+ " %sKullan\8dlmayan Bo\9fluk%s %6lu %s"},
{STRING_MAXSIZE,
"MB (En \87ok %lu MB)"},
{STRING_EXTENDED_PARTITION,
{STRING_HDINFOPARTEXISTS,
" \86®àá⪮¬ã ¤¨áªã %lu (%I64u %s), \8f®àâ=%hu, \98¨ =%hu, Id=%hu (%wZ)."},
{STRING_HDDINFOUNK5,
- "%c%c Type %-3u %6lu %s"},
+ "%c%c %sType %-3u%s %6lu %s"},
{STRING_HDINFOPARTSELECT,
"%6lu %s \86®àá⪨© ¤¨áª %lu (\8f®àâ=%hu, \98¨ =%hu, Id=%hu) on %S"},
{STRING_HDDINFOUNK6,
{STRING_NEWPARTITION,
"\82áâ ®¢«î¢ ç á⢮ਢ ®¢¨© ஧¤i« "},
{STRING_UNPSPACE,
- " \8d¥à®§¬iç¥ ®¡« áâì %6lu %s"},
+ " %s\8d¥à®§¬iç¥ ®¡« áâì%s %6lu %s"},
{STRING_MAXSIZE,
"MB (¬ ªá. %lu MB)"},
{STRING_EXTENDED_PARTITION,
static
VOID
-AddPrimaryPartitionToDisk(
+AddPartitionToDisk(
ULONG DiskNumber,
PDISKENTRY DiskEntry,
- ULONG PartitionIndex)
+ ULONG PartitionIndex,
+ BOOLEAN ExtendedPartition)
{
PPARTITION_INFORMATION PartitionInfo;
PPARTENTRY PartEntry;
PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex];
+ if (PartitionInfo->PartitionType == 0)
+ return;
PartEntry = RtlAllocateHeap(ProcessHeap,
HEAP_ZERO_MEMORY,
PartEntry->PartitionType = PartitionInfo->PartitionType;
PartEntry->HiddenSectors = PartitionInfo->HiddenSectors;
+ PartEntry->ExtendedPartition = ExtendedPartition;
PartEntry->IsPartitioned = TRUE;
PartEntry->PartitionNumber = PartitionInfo->PartitionNumber;
PartEntry->PartitionIndex = PartitionIndex;
PartEntry->FormatState = UnknownFormat;
}
- InsertTailList(&DiskEntry->PrimaryPartListHead,
- &PartEntry->ListEntry);
+ if (ExtendedPartition)
+ InsertTailList(&DiskEntry->ExtendedPartListHead,
+ &PartEntry->ListEntry);
+ else
+ InsertTailList(&DiskEntry->PrimaryPartListHead,
+ &PartEntry->ListEntry);
}
{
for (i = 0; i < 4; i++)
{
- if (DiskEntry->LayoutBuffer->PartitionEntry[i].PartitionType != 0)
- {
- AddPrimaryPartitionToDisk(DiskNumber,
- DiskEntry,
- i);
- }
+ AddPartitionToDisk(DiskNumber,
+ DiskEntry,
+ i,
+ FALSE);
}
- for (i = 4; i < DiskEntry->LayoutBuffer->PartitionCount; i++)
+ for (i = 4; i < DiskEntry->LayoutBuffer->PartitionCount; i += 4)
{
- if (DiskEntry->LayoutBuffer->PartitionEntry[i].PartitionType != 0)
- {
-#if 0
- AddExtendedPartitionToDisk(DiskNumber,
- DiskEntry,
- i);
-#endif
- }
+ AddPartitionToDisk(DiskNumber,
+ DiskEntry,
+ i,
+ TRUE);
}
}
}
sprintf(LineBuffer,
MUIGetString(STRING_UNPSPACE),
+ PartEntry->ExtendedPartition ? " " : "",
+ PartEntry->ExtendedPartition ? "" : " ",
PartSize.u.LowPart,
Unit);
}
MUIGetString(STRING_HDDINFOUNK5),
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':',
+ PartEntry->ExtendedPartition ? " " : "",
PartEntry->PartitionType,
+ PartEntry->ExtendedPartition ? "" : " ",
PartSize.u.LowPart,
Unit);
}
else
{
sprintf(LineBuffer,
- "%c%c %-24s %6lu %s",
+ "%c%c %s%-24s%s %6lu %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':',
+ PartEntry->ExtendedPartition ? " " : "",
PartType,
+ PartEntry->ExtendedPartition ? "" : " ",
PartSize.u.LowPart,
Unit);
}
PPARTLIST List,
PDISKENTRY DiskEntry)
{
- PPARTENTRY PartEntry;
- PLIST_ENTRY Entry;
+ PPARTENTRY PrimaryPartEntry, ExtendedPartEntry;
+ PLIST_ENTRY PrimaryEntry, ExtendedEntry;
CHAR LineBuffer[128];
COORD coPos;
DWORD Written;
PrintEmptyLine(List);
/* Print partition lines*/
- Entry = DiskEntry->PrimaryPartListHead.Flink;
- while (Entry != &DiskEntry->PrimaryPartListHead)
+ PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink;
+ while (PrimaryEntry != &DiskEntry->PrimaryPartListHead)
{
- PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
+ PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry);
PrintPartitionData(List,
DiskEntry,
- PartEntry);
+ PrimaryPartEntry);
- Entry = Entry->Flink;
+ if (IsContainerPartition(PrimaryPartEntry->PartitionType))
+ {
+ ExtendedEntry = DiskEntry->ExtendedPartListHead.Flink;
+ while (ExtendedEntry != &DiskEntry->ExtendedPartListHead)
+ {
+ ExtendedPartEntry = CONTAINING_RECORD(ExtendedEntry, PARTENTRY, ListEntry);
+
+ PrintPartitionData(List,
+ DiskEntry,
+ ExtendedPartEntry);
+
+ ExtendedEntry = ExtendedEntry->Flink;
+ }
+ }
+
+ PrimaryEntry = PrimaryEntry->Flink;
}
/* Print separator line */
CHAR VolumeLabel[17];
CHAR FileSystemName[9];
+ BOOLEAN ExtendedPartition;
+
/* Partition is partitioned disk space */
BOOLEAN IsPartitioned;