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

[USETUP]

Browse source 
Remove obsolete partition creation checks and their corresponding error messages.

svn path=/trunk/; revision=64487
This commit is contained in:
Eric Kohl 2014-10-03 11:05:56 +00:00
parent 8a6c831120
commit 6b19e75efa
24 changed files with 4 additions and 337 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/setup/usetup/errorcode.h
View file

@ -67,12 +67,8 @@ typedef enum
ERROR_ADDING_KBLAYOUTS,
ERROR_UPDATE_GEOID,
ERROR_INSUFFICIENT_DISKSPACE,
ERROR_PARTITION_TABLE_FULL,
ERROR_ONLY_ONE_EXTENDED,
ERROR_NOT_BEHIND_EXTENDED,
ERROR_EXTENDED_NOT_LAST,
ERROR_LAST_ERROR_CODE
}ERROR_NUMBER;

13
reactos/base/setup/usetup/lang/bg-BG.h
View file

@ -1524,19 +1524,6 @@ MUI_ERROR bgBGErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/cs-CZ.h
View file

@ -1519,19 +1519,6 @@ MUI_ERROR csCZErrorEntries[] =
"\n"
" * PokraŸujte stisknut¡m libovoln‚ kl vesy."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"Nenˇ mo§n‚ vytvoýit oddˇl za rozçˇýeněm oddˇlem.\n"
"\n"
" * Pokraźujte stisknutˇm libovoln‚ kl vesy."
},
{
//ERROR_EXTENDED_NOT_LAST,
"Rozçˇýeně oddˇl musˇ bět v§dy poslednˇ oddˇl\n"
"v tabulce oddˇl….\n"
"\n"
" * Pokraźujte stisknutˇm libovoln‚ kl vesy."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/de-DE.h
View file

@ -1516,19 +1516,6 @@ MUI_ERROR deDEErrorEntries[] =
"\n"
" * Eine beliebige Taste zum Fortsetzen dr<64>cken."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"Sie k”nnen hinter einer erweiterten Partition keine weitere Partition anlegen.\n"
"\n"
" * Eine beliebige Taste zum Fortsetzen dr<64>cken."
},
{
//ERROR_EXTENDED_NOT_LAST,
"Eine erweiterte Partition muss immer die letzte Partition in \n"
"einer Partitionstabelle sein.\n"
"\n"
" * Eine beliebige Taste zum Fortsetzen dr<64>cken."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/el-GR.h
View file

@ -1536,19 +1536,6 @@ MUI_ERROR elGRErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/en-US.h
View file

@ -1511,19 +1511,6 @@ MUI_ERROR enUSErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/es-ES.h
View file

@ -1519,19 +1519,6 @@ MUI_ERROR esESErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/et-EE.h
View file

@ -1509,19 +1509,6 @@ MUI_ERROR etEEErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/fr-FR.h
View file

@ -1524,19 +1524,6 @@ MUI_ERROR frFRErrorEntries[] =
"\n"
" * Appuyer sur une touche pour continuer."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"Impossible de cr‚er une partition pr‚c‚dant une partition ‚tendue.\n"
"\n"
" * Appuyer sur une touche pour continuer."
},
{
//ERROR_EXTENDED_NOT_LAST,
"Une partition ‚tendue doit toujours ˆtre plac‚e en dernier\n"
"dans la table de partition.\n"
"\n"
" * Appuyer sur une touche pour continuer."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/he-IL.h
View file

@ -1512,19 +1512,6 @@ MUI_ERROR heILErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/it-IT.h
View file

@ -1513,19 +1513,6 @@ MUI_ERROR itITErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/ja-JP.h
View file

@ -1513,19 +1513,6 @@ MUI_ERROR jaJPErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/lt-LT.h
View file

@ -1521,19 +1521,6 @@ MUI_ERROR ltLTErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/nl-NL.h
View file

@ -1557,19 +1557,6 @@ MUI_ERROR nlNLErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/pl-PL.h
View file

@ -1521,19 +1521,6 @@ MUI_ERROR plPLErrorEntries[] =
"\n"
" * Naci<63>nij dowolny klawisz, aby kontynuowa†."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"Nie moľesz utworzy† partycji za partycjĄ rozszerzonĄ.\n"
"\n"
" * Naci<63>nij dowolny klawisz, aby kontynuowa†."
},
{
//ERROR_EXTENDED_NOT_LAST,
"Partycja rozszerzona musi by† zawsze ostatniĄ\n"
"partycjĄ w tabeli partycji.\n"
"\n"
" * Naci<63>nij dowolny klawisz, aby kontynuowa†."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/pt-BR.h
View file

@ -1549,19 +1549,6 @@ MUI_ERROR ptBRErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

21
reactos/base/setup/usetup/lang/ro-RO.h
View file

@ -1529,7 +1529,7 @@ MUI_ERROR roROErrorEntries[] =
{
//ERROR_CABINET_SECTION,
"Nu se poate gÇsi secîiunea de directoare\n"
"Śn fi­ierul cabinet.",
"Śn fi­ierul cabinet.",
"ENTER = Repornire calculator"
},
{
@ -1540,7 +1540,7 @@ MUI_ERROR roROErrorEntries[] =
{
//ERROR_FIND_SETUPDATA,
"Nu se poate gÇsi secîiunea pentru date de\n"
"instalare din fi­ierul TXTSETUP.SIF.",
"instalare din fi­ierul TXTSETUP.SIF.",
"ENTER = Repornire calculator"
},
{
@ -1561,7 +1561,7 @@ MUI_ERROR roROErrorEntries[] =
{
//ERROR_ADDING_KBLAYOUTS,
"A e­uat includerea Śn registre a configuraîiei\n"
"de tastaturÇ.",
"de tastaturÇ.",
"ENTER = Repornire calculator"
},
{
@ -1572,7 +1572,7 @@ MUI_ERROR roROErrorEntries[] =
{
//ERROR_INSUFFICIENT_DISKSPACE,
"Pe partiîia selectatÇ nu existÇ suficient\n"
"spaîiu liber."
"spaîiu liber."
" * Tastaîi pentru a continua.",
NULL
},
@ -1589,19 +1589,6 @@ MUI_ERROR roROErrorEntries[] =
"\n"
" * Tastaîi pentru a continua."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"Nu se poate crea o partiîie dupÇ o partiîie extinsÇ.\n"
"\n"
" * Tastaîi pentru a continua."
},
{
//ERROR_EXTENDED_NOT_LAST,
"O partiîie extinsÇ trebuie sÇ fie Śntotdeauna\n"
"ultima partiîie din tabela de partiîii.\n"
"\n"
" * Tastaîi pentru a continua."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/ru-RU.h
View file

@ -1513,19 +1513,6 @@ MUI_ERROR ruRUErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/sk-SK.h
View file

@ -1523,19 +1523,6 @@ MUI_ERROR skSKErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/sq-AL.h
View file

@ -1516,19 +1516,6 @@ MUI_ERROR sqALErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/sv-SE.h
View file

@ -1519,19 +1519,6 @@ MUI_ERROR svSEErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/tr-TR.h
View file

@ -1499,19 +1499,6 @@ MUI_ERROR trTRErrorEntries[] =
"\n"
" * S<>rd<72>rmek i‡in bir d<>§meye bas<61>n<EFBFBD>z."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"Bir geniŸletilmiŸ b”l<E2809D>m arkas<61>nda bir b”l<E2809D>m oluŸturamazs<7A>n<EFBFBD>z.\n"
"\n"
" * S<>rd<72>rmek i‡in bir d<>§meye bas<61>n<EFBFBD>z."
},
{
//ERROR_EXTENDED_NOT_LAST,
"Bir geniŸletilmiŸ b”l<E2809D>m, her zaman bir b”l<E2809D>m\n"
"tablosunda son b”l<E2809D>m olmal<61>d<EFBFBD>r.\n"
"\n"
" * S<>rd<72>rmek i‡in bir d<>§meye bas<61>n<EFBFBD>z."
},
{
NULL,
NULL

13
reactos/base/setup/usetup/lang/uk-UA.h
View file

@ -1519,19 +1519,6 @@ MUI_ERROR ukUAErrorEntries[] =
"\n"
" * Press any key to continue."
},
{
//ERROR_NOT_BEHIND_EXTENDED,
"You can not create a partition behind an extended partition.\n"
"\n"
" * Press any key to continue."
},
{
//ERROR_EXTENDED_NOT_LAST,
"An extended partition must always be the last\n"
"partition in a partition table.\n"
"\n"
" * Press any key to continue."
},
{
NULL,
NULL

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

@ -3003,41 +3003,6 @@ SetMountedDeviceValues(
}
static
BOOLEAN
IsLastPrimaryPartiton(
IN PPARTENTRY PartEntry)
{
return (PartEntry->ListEntry.Flink == &PartEntry->DiskEntry->PrimaryPartListHead);
}
static
BOOLEAN
IsPreviousPartitionExtended(
IN PPARTENTRY PartEntry,
IN PDISKENTRY DiskEntry)
{
PPARTENTRY PrevPartEntry;
PLIST_ENTRY Entry;
Entry = PartEntry->ListEntry.Blink;
while (Entry != &DiskEntry->PrimaryPartListHead)
{
PrevPartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
if (IsContainerPartition(PrevPartEntry->PartitionType))
return TRUE;
Entry = Entry->Blink;
}
return FALSE;
}
static
ULONG
GetPrimaryPartitionCount(
@ -3079,10 +3044,6 @@ PrimaryPartitionCreationChecks(
if (GetPrimaryPartitionCount(DiskEntry) > 4)
return ERROR_PARTITION_TABLE_FULL;
/* Fail if this partiton is located behind an extended partition */
if (IsPreviousPartitionExtended(PartEntry, DiskEntry))
return ERROR_NOT_BEHIND_EXTENDED;
return ERROR_SUCCESS;
}
@ -3109,10 +3070,6 @@ ExtendedPartitionCreationChecks(
if (DiskEntry->ExtendedPartition != NULL)
return ERROR_ONLY_ONE_EXTENDED;
/* Fail if the partition is not the last list entry */
if (!IsLastPrimaryPartiton(PartEntry))
return ERROR_EXTENDED_NOT_LAST;
return ERROR_SUCCESS;
}