Author: ekohl
Date: Sat Dec 27 12:33:59 2014
New Revision: 65847
URL: http://svn.reactos.org/svn/reactos?rev=65847&view=rev
Log:
[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.
Modified:
trunk/reactos/base/setup/usetup/errorcode.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/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.c
trunk/reactos/base/setup/usetup/mui.h
trunk/reactos/boot/bootdata/txtsetup.sif
Modified: trunk/reactos/base/setup/usetup/errorcode.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcode.h?rev=65847&r1=65846&r2=65847&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Sat Dec 27
12:33:59 2014
@@ -66,7 +66,7 @@
ERROR_UPDATE_LOCALESETTINGS,
ERROR_ADDING_KBLAYOUTS,
ERROR_UPDATE_GEOID,
- ERROR_INSUFFICIENT_DISKSPACE,
+ ERROR_INSUFFICIENT_PARTITION_SIZE,
ERROR_PARTITION_TABLE_FULL,
ERROR_ONLY_ONE_EXTENDED,
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1425,36 +1425,25 @@
}
-#if 0
static BOOL
IsDiskSizeValid(PPARTENTRY PartEntry)
{
- ULONGLONG m1, m2;
-
- /* check for unpartitioned space */
- m1 = PartEntry->UnpartitionedLength;
- m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */
-
- if( m1 > RequiredPartitionDiskSpace)
+ ULONGLONG size;
+
+ size = PartEntry->SectorCount.QuadPart *
PartEntry->DiskEntry->BytesPerSector;
+ size = (size + 524288) / 1048576; /* in MBytes */
+
+ if (size < RequiredPartitionDiskSpace)
+ {
+ /* partition is too small so ask for another partion */
+ DPRINT1("Partition is too small (size: %I64u MB), required disk space
is %lu MB\n", size, RequiredPartitionDiskSpace);
+ return FALSE;
+ }
+ else
{
return TRUE;
}
-
- /* check for partitioned space */
- m2 = PartEntry->PartInfo[0].PartitionLength.QuadPart;
- m2 = (m2 + (1 << 19)) >> 20; /* in MBytes (rounded) */
- if (m2 < 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);
- return FALSE;
- }
- else
- {
- return TRUE;
- }
-}
-#endif
+}
static PAGE_NUMBER
@@ -1513,17 +1502,17 @@
{
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 @@
}
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 @@
}
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;
@@ -1625,6 +1607,13 @@
CreatePrimaryPartition(PartitionList,
0ULL,
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;
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1506,8 +1506,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1493,8 +1493,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1501,8 +1501,10 @@
"ENTER = Restartovat po¡ta"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Na zvolenm odd¡lu nen¡ dost volnho 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"
" * Pokraujte stisknut¡m libovoln kl vesy.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1497,9 +1497,10 @@
"EINGABETASTE = Computer neu starten"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Es ist nicht gengend Speicherplatz auf der\n"
- "gewhlten Partition vorhanden.\n"
+ //ERROR_INSUFFICIENT_PARTITION_SIZE,
+ "Die gewhlten 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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1493,8 +1493,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1501,8 +1501,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1491,8 +1491,10 @@
"ENTER = Taaskivita 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 jtkata.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1506,8 +1506,10 @@
"ENTRE = Redmarrer l'ordinateur"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Pas assez d'espace libre dans la partition slectionne.\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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1494,8 +1494,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1495,8 +1495,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1495,8 +1495,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1503,8 +1503,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1539,8 +1539,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1503,8 +1503,10 @@
"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"
" * Nacinij dowolny klawisz, aby kontynuowa.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1531,8 +1531,10 @@
"ENTER=Reiniciar"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "NÆo h espao 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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1570,9 +1570,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1495,8 +1495,10 @@
"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
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1505,8 +1505,10 @@
"ENTER = Reçtart po¡taa"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Na zvolenej part¡cii nie je dostatok vonho 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"
" * Pokraujte stlaen¡m ubovonho kl vesu.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1498,8 +1498,10 @@
"ENTER = Ristarto kompjuterin"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Jo mjaft hapesir e lir n particionin e przgjedhur.\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 cfardo pr t vazhduar.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1501,8 +1501,10 @@
"ENTER = Starta om datorn"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Inte tillrckligt 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 fr att fortstta.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1481,8 +1481,10 @@
"Giri = Bilgisayar Yeniden Balat"
},
{
- //ERROR_INSUFFICIENT_DISKSPACE,
- "Seili blmde 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 iin bir d§meye basnz.",
NULL
},
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=65847&r1=65846&r2=65847&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] Sat Dec 27
12:33:59 2014
@@ -1501,8 +1501,10 @@
"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
},
Modified: trunk/reactos/base/setup/usetup/mui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?rev=65847&r1=65846&r2=65847&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sat Dec 27
12:33:59 2014
@@ -213,9 +213,12 @@
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 @@
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);
Modified: trunk/reactos/base/setup/usetup/mui.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?rev=65847&r1=65846&r2=65847&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sat Dec 27
12:33:59 2014
@@ -69,7 +69,8 @@
MUIDisplayError(
ULONG ErrorNum,
PINPUT_RECORD Ir,
- ULONG WaitEvent);
+ ULONG WaitEvent,
+ ...);
LPCWSTR
MUIDefaultKeyboardLayout(VOID);
Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?rev=65847&r1=65846&r2=65847&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Dec 27
12:33:59 2014
@@ -13,7 +13,7 @@
[DiskSpaceRequirements]
; Required free system partition disk space in MB
-FreeSysPartDiskSpace=350
+FreeSysPartDiskSpace=550
[SourceDisksFiles]
acpi.sys=,,,,,,,,,,,,4
