From 27ff04d62b967876c307d9a0bd1775cdb91bd359 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 27 Dec 2014 12:33:59 +0000 Subject: [PATCH] [USETUP] - Re-enable the partition size check and display a warning if the install partition is too small. - Update the required install partition size to 550MB. svn path=/trunk/; revision=65847 --- reactos/base/setup/usetup/errorcode.h | 2 +- reactos/base/setup/usetup/interface/usetup.c | 55 ++++++++------------ reactos/base/setup/usetup/lang/bg-BG.h | 6 ++- reactos/base/setup/usetup/lang/bn-BD.h | 6 ++- reactos/base/setup/usetup/lang/cs-CZ.h | 6 ++- reactos/base/setup/usetup/lang/de-DE.h | 7 +-- reactos/base/setup/usetup/lang/en-US.h | 6 ++- reactos/base/setup/usetup/lang/es-ES.h | 6 ++- reactos/base/setup/usetup/lang/et-EE.h | 6 ++- reactos/base/setup/usetup/lang/fr-FR.h | 6 ++- reactos/base/setup/usetup/lang/he-IL.h | 6 ++- reactos/base/setup/usetup/lang/it-IT.h | 6 ++- reactos/base/setup/usetup/lang/ja-JP.h | 6 ++- reactos/base/setup/usetup/lang/lt-LT.h | 6 ++- reactos/base/setup/usetup/lang/nl-NL.h | 6 ++- reactos/base/setup/usetup/lang/pl-PL.h | 6 ++- reactos/base/setup/usetup/lang/pt-BR.h | 6 ++- reactos/base/setup/usetup/lang/ro-RO.h | 7 +-- reactos/base/setup/usetup/lang/ru-RU.h | 6 ++- reactos/base/setup/usetup/lang/sk-SK.h | 6 ++- reactos/base/setup/usetup/lang/sq-AL.h | 6 ++- reactos/base/setup/usetup/lang/sv-SE.h | 6 ++- reactos/base/setup/usetup/lang/tr-TR.h | 6 ++- reactos/base/setup/usetup/lang/uk-UA.h | 6 ++- reactos/base/setup/usetup/mui.c | 11 +++- reactos/base/setup/usetup/mui.h | 3 +- reactos/boot/bootdata/txtsetup.sif | 2 +- 27 files changed, 123 insertions(+), 84 deletions(-) diff --git a/reactos/base/setup/usetup/errorcode.h b/reactos/base/setup/usetup/errorcode.h index b845b3502d0..2c8b943be0d 100644 --- a/reactos/base/setup/usetup/errorcode.h +++ b/reactos/base/setup/usetup/errorcode.h @@ -66,7 +66,7 @@ typedef enum ERROR_UPDATE_LOCALESETTINGS, ERROR_ADDING_KBLAYOUTS, ERROR_UPDATE_GEOID, - ERROR_INSUFFICIENT_DISKSPACE, + ERROR_INSUFFICIENT_PARTITION_SIZE, ERROR_PARTITION_TABLE_FULL, ERROR_ONLY_ONE_EXTENDED, diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index 58976c4f6c9..5789b5ba09f 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -1425,28 +1425,18 @@ LayoutSettingsPage(PINPUT_RECORD Ir) } -#if 0 static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) { - ULONGLONG m1, m2; + ULONGLONG size; - /* check for unpartitioned space */ - m1 = PartEntry->UnpartitionedLength; - m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */ + size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; + size = (size + 524288) / 1048576; /* in MBytes */ - if( m1 > RequiredPartitionDiskSpace) - { - return TRUE; - } - - /* check for partitioned space */ - m2 = PartEntry->PartInfo[0].PartitionLength.QuadPart; - m2 = (m2 + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (m2 < RequiredPartitionDiskSpace) + if (size < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small(unpartitioned: %I64u MB, partitioned: %I64u MB), required disk space is %lu MB\n", m1, m2, RequiredPartitionDiskSpace); + DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, RequiredPartitionDiskSpace); return FALSE; } else @@ -1454,7 +1444,6 @@ IsDiskSizeValid(PPARTENTRY PartEntry) return TRUE; } } -#endif static PAGE_NUMBER @@ -1513,17 +1502,17 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (AutoPartition) { -#if 0 - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ - } -#endif CreatePrimaryPartition(PartitionList, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; @@ -1531,13 +1520,13 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else { -#if 0 if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } -#endif + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; @@ -1609,13 +1598,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { -#if 0 - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ - } -#endif if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) continue; //return SELECT_PARTITION_PAGE; @@ -1627,6 +1609,13 @@ SelectPartitionPage(PINPUT_RECORD Ir) TRUE); } + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; diff --git a/reactos/base/setup/usetup/lang/bg-BG.h b/reactos/base/setup/usetup/lang/bg-BG.h index 7118904c6ee..23dc0bf4d85 100644 --- a/reactos/base/setup/usetup/lang/bg-BG.h +++ b/reactos/base/setup/usetup/lang/bg-BG.h @@ -1506,8 +1506,10 @@ MUI_ERROR bgBGErrorEntries[] = "ENTER = १ ¯ã᪠­¥ ­  ª®¬¯îâêà " }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "  ¨§¡à ­¨ï ¤ï« ­ï¬  ¤®áâ âêç­® ᢮¡®¤­® ¯à®áâà ­á⢮.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " *  â¨á­¥â¥ ª« ¢¨è, §  ¤  ¯à®¤ê«¦¨â¥.", NULL }, diff --git a/reactos/base/setup/usetup/lang/bn-BD.h b/reactos/base/setup/usetup/lang/bn-BD.h index 8a6b39b90fb..4218262d319 100644 --- a/reactos/base/setup/usetup/lang/bn-BD.h +++ b/reactos/base/setup/usetup/lang/bn-BD.h @@ -1493,8 +1493,10 @@ MUI_ERROR bnBDErrorEntries[] = "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, diff --git a/reactos/base/setup/usetup/lang/cs-CZ.h b/reactos/base/setup/usetup/lang/cs-CZ.h index 7574918e241..f9612b8917d 100644 --- a/reactos/base/setup/usetup/lang/cs-CZ.h +++ b/reactos/base/setup/usetup/lang/cs-CZ.h @@ -1501,8 +1501,10 @@ MUI_ERROR csCZErrorEntries[] = "ENTER = Restartovat poŸ¡taŸ" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Na zvolen‚m odd¡lu nen¡ dost voln‚ho m¡sta.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * PokraŸujte stisknut¡m libovoln‚ kl vesy.", NULL }, diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index abab18f05e3..7f1e3cc9cc5 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -1497,9 +1497,10 @@ MUI_ERROR deDEErrorEntries[] = "EINGABETASTE = Computer neu starten" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Es ist nicht gengend Speicherplatz auf der\n" - "gew„hlten Partition vorhanden.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "Die gew„hlten Partition ist nicht groá genug, um ReactOS zu installieren.\n" + "Die Installationspartition muss mindestens %lu MB groá sein.\n" + "\n" " * Eine beliebige Taste zum Fortsetzen drcken.", NULL }, diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index 5cf7020283c..4cdbb45f6b4 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -1493,8 +1493,10 @@ MUI_ERROR enUSErrorEntries[] = "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, diff --git a/reactos/base/setup/usetup/lang/es-ES.h b/reactos/base/setup/usetup/lang/es-ES.h index fca24eefe71..efc77c6f275 100644 --- a/reactos/base/setup/usetup/lang/es-ES.h +++ b/reactos/base/setup/usetup/lang/es-ES.h @@ -1501,8 +1501,10 @@ MUI_ERROR esESErrorEntries[] = "ENTER = Reiniciar el equipo" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "No hay suficiente espacio disponible en la partici¢n seleccionada.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Presione una tecla para continuar.", NULL }, diff --git a/reactos/base/setup/usetup/lang/et-EE.h b/reactos/base/setup/usetup/lang/et-EE.h index 984af2219cf..4104224b58c 100644 --- a/reactos/base/setup/usetup/lang/et-EE.h +++ b/reactos/base/setup/usetup/lang/et-EE.h @@ -1491,8 +1491,10 @@ MUI_ERROR etEEErrorEntries[] = "ENTER = Taask„ivita arvuti" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Valitud partitsioonil pole piisavalt ruumi.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Vajuta suvalist klahvi, et j„tkata.", NULL }, diff --git a/reactos/base/setup/usetup/lang/fr-FR.h b/reactos/base/setup/usetup/lang/fr-FR.h index 8a2b46156c7..b83f658ebb1 100644 --- a/reactos/base/setup/usetup/lang/fr-FR.h +++ b/reactos/base/setup/usetup/lang/fr-FR.h @@ -1506,8 +1506,10 @@ MUI_ERROR frFRErrorEntries[] = "ENTRE = Red‚marrer l'ordinateur" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Pas assez d'espace libre dans la partition s‚lectionn‚e.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Appuyer sur une touche pour continuer.", NULL }, diff --git a/reactos/base/setup/usetup/lang/he-IL.h b/reactos/base/setup/usetup/lang/he-IL.h index de05585cce7..8e779f8f62f 100644 --- a/reactos/base/setup/usetup/lang/he-IL.h +++ b/reactos/base/setup/usetup/lang/he-IL.h @@ -1494,8 +1494,10 @@ MUI_ERROR heILErrorEntries[] = "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, diff --git a/reactos/base/setup/usetup/lang/it-IT.h b/reactos/base/setup/usetup/lang/it-IT.h index d229bef2921..185f91dba15 100644 --- a/reactos/base/setup/usetup/lang/it-IT.h +++ b/reactos/base/setup/usetup/lang/it-IT.h @@ -1495,8 +1495,10 @@ MUI_ERROR itITErrorEntries[] = "INVIO = Riavviare il computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Lo spazio disponibile nella partizione selezionata Š insufficiente.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, diff --git a/reactos/base/setup/usetup/lang/ja-JP.h b/reactos/base/setup/usetup/lang/ja-JP.h index 1d0b4913315..4d11d82a293 100644 --- a/reactos/base/setup/usetup/lang/ja-JP.h +++ b/reactos/base/setup/usetup/lang/ja-JP.h @@ -1495,8 +1495,10 @@ MUI_ERROR jaJPErrorEntries[] = "ENTER = ºÝËß­°ÀÉ »²·ÄÞ³" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, diff --git a/reactos/base/setup/usetup/lang/lt-LT.h b/reactos/base/setup/usetup/lang/lt-LT.h index bf3241c6224..f24c844c6b4 100644 --- a/reactos/base/setup/usetup/lang/lt-LT.h +++ b/reactos/base/setup/usetup/lang/lt-LT.h @@ -1503,8 +1503,10 @@ MUI_ERROR ltLTErrorEntries[] = "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, diff --git a/reactos/base/setup/usetup/lang/nl-NL.h b/reactos/base/setup/usetup/lang/nl-NL.h index 336d3978163..e1e9d45708c 100644 --- a/reactos/base/setup/usetup/lang/nl-NL.h +++ b/reactos/base/setup/usetup/lang/nl-NL.h @@ -1539,8 +1539,10 @@ MUI_ERROR nlNLErrorEntries[] = "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Onvoldoende vrije ruimte in de geselecteerde partitie.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Druk op een toets om door te gaan.", NULL }, diff --git a/reactos/base/setup/usetup/lang/pl-PL.h b/reactos/base/setup/usetup/lang/pl-PL.h index 77d3c06bacc..c212ae50326 100644 --- a/reactos/base/setup/usetup/lang/pl-PL.h +++ b/reactos/base/setup/usetup/lang/pl-PL.h @@ -1503,8 +1503,10 @@ MUI_ERROR plPLErrorEntries[] = "ENTER = Restart komputera" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Brak wystarczaj¥cej wolnej przestrzeni w wybranej partycji.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Naci˜nij dowolny klawisz, aby kontynuowa†.", NULL }, diff --git a/reactos/base/setup/usetup/lang/pt-BR.h b/reactos/base/setup/usetup/lang/pt-BR.h index 6e70b9a25b2..9b32c9ab36f 100644 --- a/reactos/base/setup/usetup/lang/pt-BR.h +++ b/reactos/base/setup/usetup/lang/pt-BR.h @@ -1531,8 +1531,10 @@ MUI_ERROR ptBRErrorEntries[] = "ENTER=Reiniciar" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "NÆo h  espa‡o suficiente na parti‡Æo selecionada.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pressione qualquer tecla para continuar.", NULL }, diff --git a/reactos/base/setup/usetup/lang/ro-RO.h b/reactos/base/setup/usetup/lang/ro-RO.h index f98db122c23..d8049e75f0a 100644 --- a/reactos/base/setup/usetup/lang/ro-RO.h +++ b/reactos/base/setup/usetup/lang/ro-RO.h @@ -1570,9 +1570,10 @@ MUI_ERROR roROErrorEntries[] = "ENTER = Repornire calculator" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Pe partiîia selectatÇ nu existÇ suficient\n" - "spaîiu liber." + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Tastaîi pentru a continua.", NULL }, diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index 692489bf02b..3c5e824ccbf 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -1495,8 +1495,10 @@ MUI_ERROR ruRUErrorEntries[] = "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index ebd7a9354a8..f030e282c07 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -1505,8 +1505,10 @@ MUI_ERROR skSKErrorEntries[] = "ENTER = Reçtart poŸ¡taŸa" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Na zvolenej part¡cii nie je dostatok vo–n‚ho miesta.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * PokraŸujte stlaŸen¡m –ubovo–n‚ho kl vesu.", NULL }, diff --git a/reactos/base/setup/usetup/lang/sq-AL.h b/reactos/base/setup/usetup/lang/sq-AL.h index e8f0366a38d..e34084161ca 100644 --- a/reactos/base/setup/usetup/lang/sq-AL.h +++ b/reactos/base/setup/usetup/lang/sq-AL.h @@ -1498,8 +1498,10 @@ MUI_ERROR sqALErrorEntries[] = "ENTER = Ristarto kompjuterin" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Jo mjaft hapesir‰ e lir‰ n‰ particionin e p‰rzgjedhur.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Shtypni nj‰ tast cfar‰do p‰r t‰ vazhduar.", NULL }, diff --git a/reactos/base/setup/usetup/lang/sv-SE.h b/reactos/base/setup/usetup/lang/sv-SE.h index 33f7eca25d6..6f1f2fe27a6 100644 --- a/reactos/base/setup/usetup/lang/sv-SE.h +++ b/reactos/base/setup/usetup/lang/sv-SE.h @@ -1501,8 +1501,10 @@ MUI_ERROR svSEErrorEntries[] = "ENTER = Starta om datorn" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Inte tillr„ckligt mycket fritt utrymme p† den valda partitionen.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Tryck valfri tangent f”r att forts„tta.", NULL }, diff --git a/reactos/base/setup/usetup/lang/tr-TR.h b/reactos/base/setup/usetup/lang/tr-TR.h index 0ed41826b62..7bb8f98548b 100644 --- a/reactos/base/setup/usetup/lang/tr-TR.h +++ b/reactos/base/setup/usetup/lang/tr-TR.h @@ -1481,8 +1481,10 @@ MUI_ERROR trTRErrorEntries[] = "GiriŸ = Bilgisayar Yeniden BaŸlat" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Se‡ili b”lmde yeterli boŸ alan yok.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Srdrmek i‡in bir d§meye basnz.", NULL }, diff --git a/reactos/base/setup/usetup/lang/uk-UA.h b/reactos/base/setup/usetup/lang/uk-UA.h index 7293763e204..e83dd37de7e 100644 --- a/reactos/base/setup/usetup/lang/uk-UA.h +++ b/reactos/base/setup/usetup/lang/uk-UA.h @@ -1501,8 +1501,10 @@ MUI_ERROR ukUAErrorEntries[] = "ENTER = ¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "¥¤®áâ â­ì® ¢i«ì­®£® ¬iáæï ­  ®¡à ­®¬ã ஧¤i«i.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " *  â¨á­iâì ¡ã¤ì-ïªã ª« ¢ièã ¤«ï ¯à®¤®¢¦¥­­ï.", NULL }, diff --git a/reactos/base/setup/usetup/mui.c b/reactos/base/setup/usetup/mui.c index 1ebcf4a31b4..0f8c4c14f2b 100644 --- a/reactos/base/setup/usetup/mui.c +++ b/reactos/base/setup/usetup/mui.c @@ -213,9 +213,12 @@ VOID MUIDisplayError( IN ULONG ErrorNum, OUT PINPUT_RECORD Ir, - IN ULONG WaitEvent) + IN ULONG WaitEvent, + ...) { const MUI_ERROR * entry; + CHAR Buffer[2048]; + va_list ap; if (ErrorNum >= ERROR_LAST_ERROR_CODE) { @@ -237,7 +240,11 @@ MUIDisplayError( return; } - PopupError(entry[ErrorNum].ErrorText, + va_start(ap, WaitEvent); + vsprintf(Buffer, entry[ErrorNum].ErrorText, ap); + va_end(ap); + + PopupError(Buffer, entry[ErrorNum].ErrorStatus, Ir, WaitEvent); diff --git a/reactos/base/setup/usetup/mui.h b/reactos/base/setup/usetup/mui.h index d8b0f1bf289..b950a0e9d1b 100644 --- a/reactos/base/setup/usetup/mui.h +++ b/reactos/base/setup/usetup/mui.h @@ -69,7 +69,8 @@ VOID MUIDisplayError( ULONG ErrorNum, PINPUT_RECORD Ir, - ULONG WaitEvent); + ULONG WaitEvent, + ...); LPCWSTR MUIDefaultKeyboardLayout(VOID); diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif index a2050b84183..6f18bfa4fcc 100644 --- a/reactos/boot/bootdata/txtsetup.sif +++ b/reactos/boot/bootdata/txtsetup.sif @@ -13,7 +13,7 @@ Signature = "$ReactOS$" [DiskSpaceRequirements] ; Required free system partition disk space in MB -FreeSysPartDiskSpace=350 +FreeSysPartDiskSpace=550 [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4