Author: ekohl
Date: Sun Jan 4 13:53:45 2015
New Revision: 65969
URL: http://svn.reactos.org/svn/reactos?rev=65969&view=rev
Log:
[USETUP]
- Revert partiton code to pre-r65855.
Modified:
trunk/reactos/base/setup/usetup/fslist.c
trunk/reactos/base/setup/usetup/fslist.h
trunk/reactos/base/setup/usetup/host.h
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/base/setup/usetup/lang/bg-BG.h
trunk/reactos/base/setup/usetup/lang/bn-BD.h
trunk/reactos/base/setup/usetup/lang/cs-CZ.h
trunk/reactos/base/setup/usetup/lang/de-DE.h
trunk/reactos/base/setup/usetup/lang/el-GR.h
trunk/reactos/base/setup/usetup/lang/en-US.h
trunk/reactos/base/setup/usetup/lang/es-ES.h
trunk/reactos/base/setup/usetup/lang/et-EE.h
trunk/reactos/base/setup/usetup/lang/fr-FR.h
trunk/reactos/base/setup/usetup/lang/he-IL.h
trunk/reactos/base/setup/usetup/lang/it-IT.h
trunk/reactos/base/setup/usetup/lang/ja-JP.h
trunk/reactos/base/setup/usetup/lang/lt-LT.h
trunk/reactos/base/setup/usetup/lang/nl-NL.h
trunk/reactos/base/setup/usetup/lang/pl-PL.h
trunk/reactos/base/setup/usetup/lang/pt-BR.h
trunk/reactos/base/setup/usetup/lang/ro-RO.h
trunk/reactos/base/setup/usetup/lang/ru-RU.h
trunk/reactos/base/setup/usetup/lang/sk-SK.h
trunk/reactos/base/setup/usetup/lang/sq-AL.h
trunk/reactos/base/setup/usetup/lang/sv-SE.h
trunk/reactos/base/setup/usetup/lang/tr-TR.h
trunk/reactos/base/setup/usetup/lang/uk-UA.h
trunk/reactos/base/setup/usetup/mui.h
trunk/reactos/base/setup/usetup/native/fslist.c
trunk/reactos/base/setup/usetup/partlist.c
trunk/reactos/base/setup/usetup/partlist.h
trunk/reactos/base/setup/usetup/usetup.h
Modified: trunk/reactos/base/setup/usetup/fslist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -71,8 +71,7 @@
IN SHORT Left,
IN SHORT Top,
IN BOOLEAN ForceFormat,
- IN LPCWSTR ForceFileSystem,
- IN UCHAR PartitionType)
+ IN LPCWSTR ForceFileSystem)
{
PFILE_SYSTEM_LIST List;
PFILE_SYSTEM_ITEM Item;
@@ -87,7 +86,7 @@
List->Selected = NULL;
InitializeListHead(&List->ListHead);
- HOST_CreateFileSystemList(List, PartitionType);
+ HOST_CreateFileSystemList(List);
if (!ForceFormat)
{
Modified: trunk/reactos/base/setup/usetup/fslist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -57,8 +57,7 @@
IN SHORT Left,
IN SHORT Top,
IN BOOLEAN ForceFormat,
- IN LPCWSTR ForceFileSystem,
- IN UCHAR PartitionType);
+ IN LPCWSTR ForceFileSystem);
VOID
DestroyFileSystemList(
Modified: trunk/reactos/base/setup/usetup/host.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/host.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/host.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/host.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -22,8 +22,7 @@
BOOLEAN
HOST_CreateFileSystemList(
- IN PFILE_SYSTEM_LIST List,
- IN UCHAR PartitionType);
+ IN PFILE_SYSTEM_LIST List);
BOOLEAN
HOST_FormatPartition(
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface/usetup.c?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -46,7 +46,6 @@
UNICODE_STRING SourceRootDir;
UNICODE_STRING SourcePath;
BOOLEAN IsUnattendedSetup = FALSE;
-BOOLEAN InstallShortcut = FALSE;
LONG UnattendDestinationDiskNumber;
LONG UnattendDestinationPartitionNumber;
LONG UnattendMBRInstallType = -1;
@@ -1602,6 +1601,14 @@
if
(IsContainerPartition(PartitionList->CurrentPartition->PartitionType))
continue; //return SELECT_PARTITION_PAGE;
+ if (PartitionList->CurrentPartition == NULL ||
+ PartitionList->CurrentPartition->IsPartitioned == FALSE)
+ {
+ CreatePrimaryPartition(PartitionList,
+ 0ULL,
+ TRUE);
+ }
+
if (!IsDiskSizeValid(PartitionList->CurrentPartition))
{
MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir,
POPUP_WAIT_ANY_KEY,
@@ -1609,20 +1616,9 @@
return SELECT_PARTITION_PAGE; /* let the user select another
partition */
}
- if (PartitionList->CurrentPartition == NULL ||
- PartitionList->CurrentPartition->IsPartitioned == FALSE)
- {
- CreatePrimaryPartition(PartitionList,
- 0ULL,
- TRUE);
- InstallShortcut = TRUE;
-
- return SELECT_FILE_SYSTEM_PAGE;
- }
-
DestinationDriveLetter =
(WCHAR)PartitionList->CurrentPartition->DriveLetter;
- return PRE_INSTALL_SELECT_FORMAT_PAGE;
+ return SELECT_FILE_SYSTEM_PAGE;
}
else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */
{
@@ -1964,7 +1960,7 @@
SectorCount,
FALSE);
- return SELECT_FILE_SYSTEM_PAGE;
+ return SELECT_PARTITION_PAGE;
}
}
@@ -1985,7 +1981,6 @@
ULONGLONG DiskSize;
ULONGLONG SectorCount;
PCHAR Unit;
- NTSTATUS Status;
if (PartitionList == NULL ||
PartitionList->CurrentDisk == NULL ||
@@ -2110,14 +2105,6 @@
CreateExtendedPartition(PartitionList,
SectorCount);
-
- Status = WriteDirtyPartitions(PartitionList);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("WriteDirtyPartitions() failed\n");
- MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER);
- return QUIT_PAGE;
- }
return SELECT_PARTITION_PAGE;
}
@@ -2265,7 +2252,7 @@
CreateLogicalPartition(PartitionList,
SectorCount);
- return SELECT_FILE_SYSTEM_PAGE;
+ return SELECT_PARTITION_PAGE;
}
}
@@ -2281,8 +2268,7 @@
ULONGLONG DiskSize;
ULONGLONG PartSize;
PCHAR Unit;
- PCHAR PartType = NULL;
- NTSTATUS Status;
+ PCHAR PartType;
if (PartitionList == NULL ||
PartitionList->CurrentDisk == NULL ||
@@ -2298,29 +2284,37 @@
MUIDisplayPage(DELETE_PARTITION_PAGE);
/* Determine partition type */
- 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 (IsContainerPartition(PartEntry->PartitionType))
- {
- PartType = MUIGetString(STRING_EXTENDED_PARTITION);
+ PartType = NULL;
+ 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 (IsContainerPartition(PartEntry->PartitionType))
+ {
+ PartType = MUIGetString(STRING_EXTENDED_PARTITION);
+ }
}
PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
@@ -2427,80 +2421,11 @@
{
DeleteCurrentPartition(PartitionList);
- Status = WriteDirtyPartitions(PartitionList);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("WriteDirtyPartitions() failed\n");
- MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER);
- return QUIT_PAGE;
- }
-
return SELECT_PARTITION_PAGE;
}
}
return DELETE_PARTITION_PAGE;
-}
-
-
-static
-VOID
-UpdatePartitionType(
- PPARTENTRY PartEntry,
- LPCWSTR FileSystem)
-{
- if (wcscmp(FileSystem, L"FAT") == 0)
- {
- if (PartEntry->SectorCount.QuadPart < 8192)
- {
- /* FAT12 CHS partition (disk is smaller than 4.1MB) */
- PartEntry->PartitionType = PARTITION_FAT_12;
- }
- else if (PartEntry->StartSector.QuadPart < 1450560)
- {
- /* Partition starts below the 8.4GB boundary ==> CHS partition */
-
- if (PartEntry->SectorCount.QuadPart < 65536)
- {
- /* FAT16 CHS partition (partiton size < 32MB) */
- PartEntry->PartitionType = PARTITION_FAT_16;
- }
- else if (PartEntry->SectorCount.QuadPart < 1048576)
- {
- /* FAT16 CHS partition (partition size < 512MB) */
- PartEntry->PartitionType = PARTITION_HUGE;
- }
- else
- {
- /* FAT32 CHS partition (partition size >= 512MB) */
- PartEntry->PartitionType = PARTITION_FAT32;
- }
- }
- else
- {
- /* Partition starts above the 8.4GB boundary ==> LBA partition */
-
- if (PartEntry->SectorCount.QuadPart < 1048576)
- {
- /* FAT16 LBA partition (partition size < 512MB) */
- PartEntry->PartitionType = PARTITION_XINT13;
- }
- else
- {
- /* FAT32 LBA partition (partition size >= 512MB) */
- PartEntry->PartitionType = PARTITION_FAT32_XINT13;
- }
- }
-
-
PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType
= PartEntry->PartitionType;
- }
-#if 0
- else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0)
- {
- PartEntry->PartitionType = PARTITION_EXT2;
-
PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType
= PartEntry->PartitionType;
- }
-#endif
}
@@ -2514,7 +2439,6 @@
PCHAR DiskUnit;
PCHAR PartUnit;
PCHAR PartType;
- NTSTATUS Status;
if (PartitionList == NULL ||
PartitionList->CurrentDisk == NULL ||
@@ -2609,16 +2533,14 @@
PartEntry->AutoCreate = FALSE;
}
-#if 0
else if (PartEntry->New == TRUE)
{
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART));
CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT));
}
-#endif
else
{
- CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_FORMATPART));
+ CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART));
if (PartType == NULL)
{
@@ -2655,12 +2577,14 @@
if (FileSystemList == NULL)
{
- FileSystemList = CreateFileSystemList(6, 26, TRUE, L"FAT",
PARTITION_ENTRY_UNUSED);
+ FileSystemList = CreateFileSystemList(6, 26, PartEntry->New, L"FAT");
if (FileSystemList == NULL)
{
/* FIXME: show an error dialog */
return QUIT_PAGE;
}
+
+ /* FIXME: Add file systems to list */
}
DrawFileSystemList(FileSystemList);
@@ -2675,19 +2599,6 @@
{
if (UnattendFormatPartition)
{
- UpdatePartitionType(PartEntry,
- FileSystemList->Selected->FileSystem);
-
- Status = WriteDirtyPartitions(PartitionList);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("WriteDirtyPartitions() failed (Status 0x%08lx)\n",
Status);
- MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER);
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
- return QUIT_PAGE;
- }
-
return FORMAT_PARTITION_PAGE;
}
@@ -2703,8 +2614,6 @@
{
if (ConfirmQuit(Ir) == TRUE)
{
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
return QUIT_PAGE;
}
@@ -2713,8 +2622,6 @@
else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
(Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */
{
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
return SELECT_PARTITION_PAGE;
}
else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
@@ -2735,19 +2642,6 @@
}
else
{
- UpdatePartitionType(PartEntry,
- FileSystemList->Selected->FileSystem);
-
- CheckActiveBootPartition(PartitionList);
-
- Status = WriteDirtyPartitions(PartitionList);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("WriteDirtyPartitions() failed (Status 0x%08lx)\n",
Status);
- MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER);
- return QUIT_PAGE;
- }
-
return FORMAT_PARTITION_PAGE;
}
}
@@ -2761,7 +2655,7 @@
FormatPartitionPage(PINPUT_RECORD Ir)
{
WCHAR PathBuffer[MAX_PATH];
-// PDISKENTRY DiskEntry;
+ PDISKENTRY DiskEntry;
PPARTENTRY PartEntry;
NTSTATUS Status;
@@ -2778,12 +2672,10 @@
PartitionList->CurrentPartition == NULL)
{
/* FIXME: show an error dialog */
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
return QUIT_PAGE;
}
-// DiskEntry = PartitionList->CurrentDisk;
+ DiskEntry = PartitionList->CurrentDisk;
PartEntry = PartitionList->CurrentPartition;
while (TRUE)
@@ -2798,8 +2690,6 @@
{
if (ConfirmQuit(Ir) == TRUE)
{
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
return QUIT_PAGE;
}
@@ -2809,12 +2699,60 @@
{
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
- if (!FileSystemList->Selected->FormatFunc)
- {
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
+ if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0)
+ {
+ if (PartEntry->SectorCount.QuadPart < 8192)
+ {
+ /* FAT12 CHS partition (disk is smaller than 4.1MB) */
+ PartEntry->PartitionType = PARTITION_FAT_12;
+ }
+ else if (PartEntry->StartSector.QuadPart < 1450560)
+ {
+ /* Partition starts below the 8.4GB boundary ==> CHS
partition */
+
+ if (PartEntry->SectorCount.QuadPart < 65536)
+ {
+ /* FAT16 CHS partition (partiton size < 32MB) */
+ PartEntry->PartitionType = PARTITION_FAT_16;
+ }
+ else if (PartEntry->SectorCount.QuadPart < 1048576)
+ {
+ /* FAT16 CHS partition (partition size < 512MB) */
+ PartEntry->PartitionType = PARTITION_HUGE;
+ }
+ else
+ {
+ /* FAT32 CHS partition (partition size >= 512MB) */
+ PartEntry->PartitionType = PARTITION_FAT32;
+ }
+ }
+ else
+ {
+ /* Partition starts above the 8.4GB boundary ==> LBA
partition */
+
+ if (PartEntry->SectorCount.QuadPart < 1048576)
+ {
+ /* FAT16 LBA partition (partition size < 512MB) */
+ PartEntry->PartitionType = PARTITION_XINT13;
+ }
+ else
+ {
+ /* FAT32 LBA partition (partition size >= 512MB) */
+ PartEntry->PartitionType = PARTITION_FAT32_XINT13;
+ }
+ }
+
+
DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType
= PartEntry->PartitionType;
+ }
+#if 0
+ else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") ==
0)
+ {
+ PartEntry->PartitionType = PARTITION_EXT2;
+
DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType
= PartEntry->PartitionType;
+ }
+#endif
+ else if (!FileSystemList->Selected->FormatFunc)
return QUIT_PAGE;
- }
#ifndef NDEBUG
CONSOLE_PrintTextXY(6, 12,
@@ -2852,6 +2790,15 @@
PartEntry = PartitionList->CurrentPartition;
#endif
+ CheckActiveBootPartition(PartitionList);
+
+ if (WritePartitionsToDisk(PartitionList) == FALSE)
+ {
+ DPRINT("WritePartitionsToDisk() failed\n");
+ MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER);
+ return QUIT_PAGE;
+ }
+
/* Set DestinationRootPath */
RtlFreeUnicodeString(&DestinationRootPath);
swprintf(PathBuffer,
@@ -2870,12 +2817,11 @@
{
DPRINT1("FormatPartition() failed with status 0x%08lx\n",
Status);
/* FIXME: show an error dialog */
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
return QUIT_PAGE;
}
- PartEntry->FormatState = Formatted;
+ PartEntry->New = FALSE;
+
}
#ifndef NDEBUG
@@ -2885,11 +2831,7 @@
DestroyFileSystemList(FileSystemList);
FileSystemList = NULL;
-
- if (IsUnattendedSetup || InstallShortcut)
- return INSTALL_DIRECTORY_PAGE;
- else
- return SELECT_PARTITION_PAGE;
+ return INSTALL_DIRECTORY_PAGE;
}
}
@@ -2974,347 +2916,6 @@
}
-
-
-static PAGE_NUMBER
-PreInstallSelectFormatPage(PINPUT_RECORD Ir)
-{
- PDISKENTRY DiskEntry;
- PPARTENTRY PartEntry;
- ULONGLONG DiskSize;
- ULONGLONG PartSize;
- PCHAR DiskUnit;
- PCHAR PartUnit;
- PCHAR PartType;
-
- if (PartitionList == NULL ||
- PartitionList->CurrentDisk == NULL ||
- PartitionList->CurrentPartition == NULL)
- {
- /* FIXME: show an error dialog */
- return QUIT_PAGE;
- }
-
- DiskEntry = PartitionList->CurrentDisk;
- PartEntry = PartitionList->CurrentPartition;
-
- if (PartEntry->FormatState == Formatted)
- return INSTALL_DIRECTORY_PAGE;
-
- /* adjust disk size */
- DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- if (DiskSize >= 10737418240) /* 10 GB */
- {
- DiskSize = DiskSize / 1073741824;
- DiskUnit = MUIGetString(STRING_GB);
- }
- else
- {
- DiskSize = DiskSize / 1048576;
- DiskUnit = MUIGetString(STRING_MB);
- }
-
- /* adjust partition size */
- PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- if (PartSize >= 10737418240) /* 10 GB */
- {
- PartSize = PartSize / 1073741824;
- PartUnit = MUIGetString(STRING_GB);
- }
- else
- {
- PartSize = PartSize / 1048576;
- PartUnit = MUIGetString(STRING_MB);
- }
-
- /* adjust partition type */
- 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_ENTRY_UNUSED)
- {
- PartType = MUIGetString(STRING_FORMATUNUSED);
- }
- else
- {
- PartType = MUIGetString(STRING_FORMATUNKNOWN);
- }
-
- if (PartEntry->AutoCreate == TRUE)
- {
- CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION));
-
-#if 0
- CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of",
- PartEntry->PartitionNumber,
- PartSize,
- PartUnit,
- PartType);
-#endif
-
- CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED),
- DiskEntry->DiskNumber,
- DiskSize,
- DiskUnit,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName);
-
- CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
-
-
- PartEntry->AutoCreate = FALSE;
- }
-#if 0
- else if (PartEntry->New == TRUE)
- {
- CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART));
- CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT));
- }
-#endif
- else
- {
- CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART));
-
- if (PartType == NULL)
- {
- CONSOLE_PrintTextXY(8, 10,
- MUIGetString(STRING_HDDINFOUNK4),
- (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' : ':',
- PartEntry->PartitionType,
- PartSize,
- PartUnit);
- }
- else
- {
- CONSOLE_PrintTextXY(8, 10,
- "%c%c %s %I64u %s",
- (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' : ':',
- PartType,
- PartSize,
- PartUnit);
- }
-
- CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS),
- DiskEntry->DiskNumber,
- DiskSize,
- DiskUnit,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName);
- }
-
- MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE);
-
- if (FileSystemList != NULL)
- {
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
- }
-
- FileSystemList = CreateFileSystemList(6, 26, FALSE, L"FAT",
- PartEntry->PartitionType);
- if (FileSystemList == NULL)
- {
- /* FIXME: show an error dialog */
- return QUIT_PAGE;
- }
-
- DrawFileSystemList(FileSystemList);
-
- while (TRUE)
- {
- CONSOLE_ConInKey(Ir);
-
- if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
- (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
- {
- if (ConfirmQuit(Ir) == TRUE)
- {
- return QUIT_PAGE;
- }
-
- break;
- }
- else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
- (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */
- {
- return SELECT_PARTITION_PAGE;
- }
- else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
- (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */
- {
- ScrollDownFileSystemList(FileSystemList);
- }
- else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
- (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */
- {
- ScrollUpFileSystemList(FileSystemList);
- }
- else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */
- {
- if (FileSystemList->Selected->FormatFunc)
- {
- return PRE_INSTALL_FORMAT_PAGE;
- }
- }
- }
-
- return PRE_INSTALL_SELECT_FORMAT_PAGE;
-}
-
-
-static ULONG
-PreInstallFormatPage(PINPUT_RECORD Ir)
-{
- WCHAR PathBuffer[MAX_PATH];
-// PDISKENTRY DiskEntry;
- PPARTENTRY PartEntry;
- NTSTATUS Status;
-
-#ifndef NDEBUG
- ULONG Line;
- ULONG i;
- PLIST_ENTRY Entry;
-#endif
-
- MUIDisplayPage(FORMAT_PARTITION_PAGE);
-
- if (PartitionList == NULL ||
- PartitionList->CurrentDisk == NULL ||
- PartitionList->CurrentPartition == NULL)
- {
- /* FIXME: show an error dialog */
- return QUIT_PAGE;
- }
-
-// DiskEntry = PartitionList->CurrentDisk;
- PartEntry = PartitionList->CurrentPartition;
-
- while (TRUE)
- {
- if (!IsUnattendedSetup)
- {
- CONSOLE_ConInKey(Ir);
- }
-
- if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
- (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
- {
- if (ConfirmQuit(Ir) == TRUE)
- {
- return QUIT_PAGE;
- }
-
- break;
- }
- else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN ||
IsUnattendedSetup) /* ENTER */
- {
- CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
-
- if (!FileSystemList->Selected->FormatFunc)
- return QUIT_PAGE;
-
-#ifndef NDEBUG
- CONSOLE_PrintTextXY(6, 12,
- "Disk: %I64u Cylinder: %I64u Track: %I64u",
- DiskEntry->DiskSize,
- DiskEntry->CylinderSize,
- DiskEntry->TrackSize);
-
- Line = 13;
- DiskEntry = PartitionList->CurrentDisk;
- Entry = DiskEntry->PartListHead.Flink;
-
- while (Entry != &DiskEntry->PrimaryPartListHead)
- {
- PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
-
- if (PartEntry->IsPartitioned == TRUE)
- {
- CONSOLE_PrintTextXY(6, Line,
- "%2u: %2u %c %12I64u %12I64u %2u
%c",
- i,
- PartEntry->PartitionNumber,
- PartEntry->BootIndicator ? 'A' : '-',
- PartEntry->StartSector.QuadPart,
- PartEntry->SectorCount.QuadPart,
- PartEntry->PartitionType,
- PartEntry->Dirty ? '*' : ' ');
- Line++;
- }
-
- Entry = Entry->Flink;
- }
-
- /* Restore the old entry */
- PartEntry = PartitionList->CurrentPartition;
-#endif
-
- /* Set DestinationRootPath */
- RtlFreeUnicodeString(&DestinationRootPath);
- swprintf(PathBuffer,
- L"\\Device\\Harddisk%lu\\Partition%lu",
- PartitionList->CurrentDisk->DiskNumber,
- PartitionList->CurrentPartition->PartitionNumber);
- RtlCreateUnicodeString(&DestinationRootPath,
- PathBuffer);
- DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath);
-
- if (FileSystemList->Selected->FormatFunc)
- {
- Status = FormatPartition(&DestinationRootPath,
- FileSystemList->Selected);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("FormatPartition() failed with status 0x%08lx\n",
Status);
- /* FIXME: show an error dialog */
- return QUIT_PAGE;
- }
-
- PartEntry->FormatState = Formatted;
- }
-
-#ifndef NDEBUG
- CONSOLE_SetStatusText(" Done. Press any key ...");
- CONSOLE_ConInKey(Ir);
-#endif
-
- DestroyFileSystemList(FileSystemList);
- FileSystemList = NULL;
-
- return INSTALL_DIRECTORY_PAGE;
- }
- }
-
- return PRE_INSTALL_FORMAT_PAGE;
-}
-
-
-
-
-
static PAGE_NUMBER
InstallDirectoryPage1(PWCHAR InstallDir,
PDISKENTRY DiskEntry,
@@ -3326,16 +2927,6 @@
RtlFreeUnicodeString(&InstallPath);
RtlCreateUnicodeString(&InstallPath,
InstallDir);
-
- /* Set DestinationRootPath */
- RtlFreeUnicodeString(&DestinationRootPath);
- swprintf(PathBuffer,
- L"\\Device\\Harddisk%lu\\Partition%lu",
- DiskEntry->DiskNumber,
- PartEntry->PartitionNumber);
- RtlCreateUnicodeString(&DestinationRootPath,
- PathBuffer);
- DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath);
/* Create 'DestinationPath' string */
RtlFreeUnicodeString(&DestinationPath);
@@ -4115,7 +3706,6 @@
BOOLEAN InstallOnFloppy;
USHORT Line = 12;
WCHAR PathBuffer[MAX_PATH];
- NTSTATUS Status;
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
@@ -4123,10 +3713,9 @@
CheckActiveBootPartition(PartitionList);
/* Update the partition table because we may have changed the active
partition */
- Status = WriteDirtyPartitions(PartitionList);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("WriteDirtyPartitions() failed\n");
+ if (WritePartitionsToDisk(PartitionList) == FALSE)
+ {
+ DPRINT("WritePartitionsToDisk() failed\n");
MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
@@ -4626,19 +4215,11 @@
break;
case FORMAT_PARTITION_PAGE:
- Page = FormatPartitionPage(&Ir);
+ Page = (PAGE_NUMBER) FormatPartitionPage(&Ir);
break;
case CHECK_FILE_SYSTEM_PAGE:
- Page = CheckFileSystemPage(&Ir);
- break;
-
- case PRE_INSTALL_SELECT_FORMAT_PAGE:
- Page = PreInstallSelectFormatPage(&Ir);
- break;
-
- case PRE_INSTALL_FORMAT_PAGE:
- Page = PreInstallFormatPage(&Ir);
+ Page = (PAGE_NUMBER) CheckFileSystemPage(&Ir);
break;
case INSTALL_DIRECTORY_PAGE:
Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-BG.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1753,7 +1753,5 @@
""},
{STRING_ADDKBLAYOUTS,
"®¡ ¢ï¥ ª« ¢¨ âãਠ¯®¤à¥¤¡¨"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-BD.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1737,7 +1737,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Adding keyboard layouts"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-CZ.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1746,7 +1746,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Pýid v m rozlo§en¡ kl ves"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-DE.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1742,7 +1742,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Tastaturlayout hinzufgen"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-GR.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1763,7 +1763,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"夫 §¨¦©ã¡ «à¤ «á¥à¤ §¢¡«¨¦¢¦å¦¬"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-US.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1737,7 +1737,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Adding keyboard layouts"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-ES.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1745,7 +1745,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"A¤adiendo distribuci¢n de teclado"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-EE.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1738,7 +1738,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Klaviatuuriasetuste lisamine"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-FR.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1751,7 +1751,5 @@
"Go"},
{STRING_ADDKBLAYOUTS,
"Ajout des dispositions clavier"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-IL.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1739,7 +1739,5 @@
""},
{STRING_ADDKBLAYOUTS,
"Adding keyboard layouts"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-IT.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1740,7 +1740,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Aggiunta delle nazionalit
di tastiera"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-JP.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1741,7 +1741,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"·°ÎÞ°ÄÞ Ú²±³ÄÉ Â²¶ Á³"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-LT.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1748,7 +1748,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Adding keyboard layouts"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-NL.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1786,7 +1786,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Toevoegen toetsenbordindelingen"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-PL.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1746,7 +1746,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Dodawanie ukad¢w klawiatury"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-BR.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1777,7 +1777,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Adicionando leiautes de teclado"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-RO.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1814,7 +1814,5 @@
"Go"},
{STRING_ADDKBLAYOUTS,
"AdÇugare configuraîii de tastaturÇ"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-RU.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1742,7 +1742,5 @@
""},
{STRING_ADDKBLAYOUTS,
"Adding keyboard layouts"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-SK.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1752,7 +1752,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Prid vam rozlo§enia kl vesnice"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-AL.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1744,7 +1744,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Shtim e przgjedhjes s tastiers"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-SE.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1747,7 +1747,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"Lgger till tangentbordslayouter"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-TR.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1725,7 +1725,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"D§me takm dzenleri ekleniyor..."},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-UA.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -1747,7 +1747,5 @@
"GB"},
{STRING_ADDKBLAYOUTS,
"®¤ ¢ ï ஧ª« ¤®ª ª« ¢i âãà¨"},
- {STRING_FORMATPART,
- "Setup formats Partition"},
{0, 0}
};
Modified: trunk/reactos/base/setup/usetup/mui.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -156,5 +156,3 @@
#define STRING_MB 54
#define STRING_GB 55
#define STRING_ADDKBLAYOUTS 56
-#define STRING_FORMATPART 62
-
Modified: trunk/reactos/base/setup/usetup/native/fslist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/fslist.c?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -2,36 +2,12 @@
BOOLEAN
NATIVE_CreateFileSystemList(
- IN PFILE_SYSTEM_LIST List,
- IN UCHAR PartitionType)
+ IN PFILE_SYSTEM_LIST List)
{
- if (PartitionType == PARTITION_ENTRY_UNUSED ||
- PartitionType == PARTITION_FAT_12 ||
- PartitionType == PARTITION_FAT_16 ||
- PartitionType == PARTITION_HUGE ||
- PartitionType == PARTITION_XINT13 ||
- PartitionType == PARTITION_FAT32 ||
- PartitionType == PARTITION_FAT32_XINT13)
- {
- FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk);
- }
-
+ FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk);
#if 0
- if (PartitionType == PARTITION_ENTRY_UNUSED ||
- PartitionType == PARTITION_EXT2)
- {
- FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk);
- }
+ FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk);
#endif
-
-#if 0
- if (PartitionType == PARTITION_ENTRY_UNUSED ||
- PartitionType == PARTITION_IFS)
- {
- FS_AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk);
- }
-#endif
-
return TRUE;
}
Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.c?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -558,7 +558,7 @@
if (IsContainerPartition(PartEntry->PartitionType))
{
- PartEntry->FormatState = Formatted;
+ PartEntry->FormatState = Unformatted;
if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL)
DiskEntry->ExtendedPartition = PartEntry;
@@ -1499,7 +1499,11 @@
{
/* Determine partition type */
PartType = NULL;
- if (PartEntry->IsPartitioned == TRUE)
+ if (PartEntry->New == TRUE)
+ {
+ PartType = MUIGetString(STRING_UNFORMATTED);
+ }
+ else if (PartEntry->IsPartitioned == TRUE)
{
if ((PartEntry->PartitionType == PARTITION_FAT_12) ||
(PartEntry->PartitionType == PARTITION_FAT_16) ||
@@ -2382,6 +2386,7 @@
PartEntry->PartitionType = PARTITION_ENTRY_UNUSED;
PartEntry->FormatState = Unformatted;
PartEntry->AutoCreate = AutoCreate;
+ PartEntry->New = TRUE;
PartEntry->BootIndicator = FALSE;
DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart);
@@ -2415,13 +2420,12 @@
DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart +
NewPartEntry->SectorCount.QuadPart - 1);
DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
+ NewPartEntry->New = TRUE;
NewPartEntry->FormatState = Unformatted;
NewPartEntry->BootIndicator = FALSE;
PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart +
NewPartEntry->SectorCount.QuadPart;
PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart -
NewPartEntry->StartSector.QuadPart);
-
- List->CurrentPartition = NewPartEntry;
}
UpdateDiskLayout(DiskEntry);
@@ -2499,6 +2503,7 @@
PartEntry->IsPartitioned = TRUE;
PartEntry->FormatState = Formatted;
PartEntry->AutoCreate = FALSE;
+ PartEntry->New = FALSE;
PartEntry->BootIndicator = FALSE;
if (PartEntry->StartSector.QuadPart < 1450560)
@@ -2540,6 +2545,7 @@
NewPartEntry->SectorCount.QuadPart =
Align(NewPartEntry->StartSector.QuadPart + SectorCount,
DiskEntry->SectorAlignment) -
NewPartEntry->StartSector.QuadPart;
+ NewPartEntry->New = FALSE;
NewPartEntry->FormatState = Formatted;
NewPartEntry->BootIndicator = FALSE;
@@ -2562,8 +2568,6 @@
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart +
NewPartEntry->SectorCount.QuadPart - 1);
DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
-
- List->CurrentPartition = NewPartEntry;
}
AddLogicalDiskSpace(DiskEntry);
@@ -2927,16 +2931,15 @@
}
-NTSTATUS
-WriteDirtyPartitions(
+BOOLEAN
+WritePartitionsToDisk(
PPARTLIST List)
{
PLIST_ENTRY Entry;
PDISKENTRY DiskEntry;
- NTSTATUS Status;
if (List == NULL)
- return STATUS_SUCCESS;
+ return TRUE;
Entry = List->DiskListHead.Flink;
while (Entry != &List->DiskListHead)
@@ -2945,17 +2948,13 @@
if (DiskEntry->Dirty == TRUE)
{
- Status = WritePartitons(List, DiskEntry);
- if (!NT_SUCCESS(Status))
- return Status;
-
- DiskEntry->Dirty = FALSE;
+ WritePartitons(List, DiskEntry);
}
Entry = Entry->Flink;
}
- return STATUS_SUCCESS;
+ return TRUE;
}
Modified: trunk/reactos/base/setup/usetup/partlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -63,7 +63,7 @@
BOOLEAN IsPartitioned;
/* Partition is new. Table does not exist on disk yet */
-// BOOLEAN New;
+ BOOLEAN New;
/* Partition was created automatically. */
BOOLEAN AutoCreate;
@@ -247,8 +247,8 @@
CheckForLinuxFdiskPartitions(
PPARTLIST List);
-NTSTATUS
-WriteDirtyPartitions(
+BOOLEAN
+WritePartitionsToDisk(
PPARTLIST List);
ULONG
Modified: trunk/reactos/base/setup/usetup/usetup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?rev=65969&r1=65968&r2=65969&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Jan 4
13:53:45 2015
@@ -138,11 +138,8 @@
FORMAT_PARTITION_PAGE,
CHECK_FILE_SYSTEM_PAGE,
- PRE_INSTALL_SELECT_FORMAT_PAGE,
- PRE_INSTALL_FORMAT_PAGE,
-
+ PREPARE_COPY_PAGE,
INSTALL_DIRECTORY_PAGE,
- PREPARE_COPY_PAGE,
FILE_COPY_PAGE,
REGISTRY_PAGE,
BOOT_LOADER_PAGE,
