Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
Little Improvements:
  * Duplicate code removement regarding the simple list pages (and now everyone has pageup/down + selection via char)
  * Duplicate code removement regarding the partition type string
  * Document the pages

Patch my Michael Fritscher
#CORE-10012 #resolve #comment Thanks a lot!

svn path=/trunk/; revision=70283
This commit is contained in:
Eric Kohl 2015-12-06 20:14:29 +00:00
parent 219b86a07a
commit 1acc2401b3
4 changed files with 575 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

743
reactos/base/setup/usetup/interface/usetup.c
View file

File diff suppressed because it is too large Load diff

95
reactos/base/setup/usetup/partlist.c
View file

@ -1448,6 +1448,66 @@ PrintEmptyLine(
}
VOID
GetPartTypeStringFromPartitionTypeW(
UCHAR partitionType,
PWCHAR strPartType,
DWORD cchPartType)
{
CHAR partTypeString[32];
GetPartTypeStringFromPartitionTypeA(partitionType,
partTypeString,
30);
mbstowcs(strPartType,
partTypeString,
(30 < cchPartType) ? 30 : cchPartType);
}
VOID
GetPartTypeStringFromPartitionTypeA(
UCHAR partitionType,
PCHAR strPartType,
DWORD cchPartType)
{
/* Determine partition type */
if ((partitionType == PARTITION_FAT_12) ||
(partitionType == PARTITION_FAT_16) ||
(partitionType == PARTITION_HUGE) ||
(partitionType == PARTITION_XINT13))
{
StringCchCopy(strPartType, cchPartType, "FAT");
}
else if ((partitionType == PARTITION_FAT32) ||
(partitionType == PARTITION_FAT32_XINT13))
{
StringCchCopy(strPartType, cchPartType, "FAT32");
}
else if (partitionType == PARTITION_EXT2)
{
StringCchCopy(strPartType, cchPartType, "EXT2");
}
else if (partitionType == PARTITION_IFS)
{
StringCchCopy(strPartType, cchPartType, "NTFS"); /* FIXME: Not quite correct! */
}
else if (IsContainerPartition(partitionType))
{
StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_EXTENDED_PARTITION));
}
else if (partitionType == PARTITION_ENTRY_UNUSED)
{
StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED));
}
else
{
StringCchCopy(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN));
}
}
static
VOID
PrintPartitionData(
@ -1463,7 +1523,9 @@ PrintPartitionData(
LARGE_INTEGER PartSize;
PCHAR Unit;
UCHAR Attribute;
CHAR PartTypeString[32];
PCHAR PartType;
PartType = PartTypeString;
Width = List->Right - List->Left - 1;
Height = List->Bottom - List->Top - 2;
@ -1503,38 +1565,17 @@ PrintPartitionData(
else
{
/* Determine partition type */
PartType = NULL;
PartTypeString[0] = '\0';
if (PartEntry->New == TRUE)
{
PartType = MUIGetString(STRING_UNFORMATTED);
}
else if (PartEntry->IsPartitioned == TRUE)
{
if ((PartEntry->PartitionType == PARTITION_FAT_12) ||
(PartEntry->PartitionType == PARTITION_FAT_16) ||
(PartEntry->PartitionType == PARTITION_HUGE) ||
(PartEntry->PartitionType == PARTITION_XINT13))
{
PartType = "FAT";
}
else if ((PartEntry->PartitionType == PARTITION_FAT32) ||
(PartEntry->PartitionType == PARTITION_FAT32_XINT13))
{
PartType = "FAT32";
}
else if (PartEntry->PartitionType == PARTITION_EXT2)
{
PartType = "EXT2";
}
else if (PartEntry->PartitionType == PARTITION_IFS)
{
PartType = "NTFS"; /* FIXME: Not quite correct! */
}
else if ((PartEntry->PartitionType == PARTITION_EXTENDED) ||
(PartEntry->PartitionType == PARTITION_XINT13_EXTENDED))
{
PartType = MUIGetString(STRING_EXTENDED_PARTITION);
}
GetPartTypeStringFromPartitionTypeA(PartEntry->PartitionType,
PartTypeString,
30);
PartType = PartTypeString;
}
PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
@ -1557,7 +1598,7 @@ PrintPartitionData(
Unit = MUIGetString(STRING_KB);
}
if (PartType == NULL)
if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0)
{
sprintf(LineBuffer,
MUIGetString(STRING_HDDINFOUNK5),

12
reactos/base/setup/usetup/partlist.h
View file

@ -293,4 +293,16 @@ GetNextUncheckedPartition(
OUT PDISKENTRY *pDiskEntry,
OUT PPARTENTRY *pPartEntry);
VOID
GetPartTypeStringFromPartitionTypeA(
UCHAR partitionType,
PSTR strPartType,
DWORD cchPartType);
VOID
GetPartTypeStringFromPartitionTypeW(
UCHAR partitionType,
PWSTR strPartType,
DWORD cchPartType);
/* EOF */

2
reactos/base/setup/usetup/usetup.h
View file

@ -39,6 +39,8 @@
#include <winuser.h>
#include <wincon.h>
#include <strsafe.h>
#define NTOS_MODE_USER
#include <ndk/cmfuncs.h>
#include <ndk/exfuncs.h>