Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 18:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB] Remove a deprecated error number (that gets merged with ERROR_TXTSETUP_SECTION).

Browse source 
[USETUP] Improve usage of ERROR_TXTSETUP_SECTION and ERROR_CABINET_SECTION error codes, correctly display associated error message, and remove a deprecated string.
This commit is contained in:
Hermès Bélusca-Maïto 2017-12-30 18:21:42 +01:00
parent 4b148bcaf2
commit a7afba7703
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
29 changed files with 1130 additions and 1314 deletions
Download patch file Download diff file Expand all files Collapse all files

1
base/setup/lib/errorcode.h
View file

@ -46,7 +46,6 @@ typedef enum _ERROR_NUMBER
ERROR_TXTSETUP_SECTION,
ERROR_CABINET_SECTION,
ERROR_CREATE_INSTALL_DIR,
ERROR_FIND_SETUPDATA,
ERROR_WRITE_PTABLE,
ERROR_ADDING_CODEPAGE,
ERROR_UPDATE_LOCALESETTINGS,

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

@ -1597,13 +1597,13 @@ MUI_ERROR bgBGErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"<EFBFBD> §¤¥«êâ 'Directories' ­¥ ¡¥ ®âªà¨â\n"
"摺ｧ､･ｫ<EFBFBD> '%S' ｭ･ ｡･ ｮ筱爲秉n"
"¢ TXTSETUP.SIF.\n",
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
},
{
// ERROR_CABINET_SECTION,
"<EFBFBD> §¤¥«êâ 'Directories' ­¥ ¡¥ ®âªà¨â\n"
"摺ｧ､･ｫ<EFBFBD> '%S' ｭ･ ｡･ ｮ筱爲秉n"
"¢ cab ä ©« .\n",
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
},
@ -1612,12 +1612,6 @@ MUI_ERROR bgBGErrorEntries[] =
"<EFBFBD>¥ãᯥ譮 áꧤ ¢ ­¥ ­  ¯ ¯ª â  §  á« £ ­¥.",
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
},
{
//ERROR_FIND_SETUPDATA,
"<EFBFBD> §¤¥«êâ 'SetupData' ­¥ ¡¥ ®âªà¨â\n"
"¢ TXTSETUP.SIF.\n",
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
},
{
// ERROR_WRITE_PTABLE,
"<EFBFBD>¥ãᯥ譮 § ¯¨á¢ ­¥ ­  ¤ï«®¢¨â¥ â ¡«¨æ¨.\n"
@ -1835,8 +1829,6 @@ MUI_STRING bgBGStrings[] =
"F3 = ˆ§å®¤ ENTER = <20>தꫦ ¢ ­¥"},
{STRING_REBOOTCOMPUTER,
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "},
{STRING_TXTSETUPFAILED,
"<EFBFBD>¥ ¡¥ ­ ¬¥à¥­ à §¤¥« '%S'\n¢ TXTSETUP.SIF.\n"},
{STRING_COPYING,
" ‡ ¯¨á ­  ä ©«: %S"},
{STRING_SETUPCOPYINGFILES,

12
base/setup/usetup/lang/bn-BD.h
View file

@ -1587,13 +1587,13 @@ MUI_ERROR bnBDErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_CABINET_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in the cabinet.\n",
"ENTER = Reboot computer"
},
@ -1602,12 +1602,6 @@ MUI_ERROR bnBDErrorEntries[] =
"Setup could not create the install directory.",
"ENTER = Reboot computer"
},
{
//ERROR_FIND_SETUPDATA,
"Setup failed to find the 'SetupData' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_WRITE_PTABLE,
"Setup failed to write partition tables.\n"
@ -1823,8 +1817,6 @@ MUI_STRING bnBDStrings[] =
"F3 = Quit ENTER = Continue"},
{STRING_REBOOTCOMPUTER,
"ENTER = Reboot computer"},
{STRING_TXTSETUPFAILED,
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copying file: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1593,13 +1593,13 @@ MUI_ERROR csCZErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Nepodaýilo se nal‚zt sekci 'Directories' v souboru\n"
"Nepodaýilo se nal‚zt sekci '%S' v souboru\n"
"TXTSETUP.SIF.\n",
"ENTER = Restartovat poŸ¡taŸ"
},
{
// ERROR_CABINET_SECTION,
"Nepodaýilo se nal‚zt sekci 'Directories' v archivu.\n"
"Nepodaýilo se nal‚zt sekci '%S' v archivu.\n"
"\n",
"ENTER = Restartovat poŸ¡taŸ"
},
@ -1608,12 +1608,6 @@ MUI_ERROR csCZErrorEntries[] =
"Nepodaýilo se vytvoýit instalaŸn¡ adres ý.",
"ENTER = Restartovat poŸ¡taŸ"
},
{
//ERROR_FIND_SETUPDATA,
"Nepodaýilo se nal‚zt sekci 'SetupData' v souboru\n"
"TXTSETUP.SIF.\n",
"ENTER = Restartovat poźˇtaź"
},
{
// ERROR_WRITE_PTABLE,
"Nepodaýilo se zapsat tabulky odd¡l….\n"
@ -1829,8 +1823,6 @@ MUI_STRING csCZStrings[] =
"F3 = UkonŸit ENTER = PokraŸovat"},
{STRING_REBOOTCOMPUTER,
"ENTER = Restartovat poŸ¡taŸ"},
{STRING_TXTSETUPFAILED,
"Nepodaýilo se najˇt sekci '%S' v souboru\n TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kop¡ruji soubor: %S"},
{STRING_SETUPCOPYINGFILES,

14
base/setup/usetup/lang/da-DK.h
View file

@ -1600,13 +1600,13 @@ MUI_ERROR daDKErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Installationen kunne ikke finde 'Directories'-sektionen\n"
"in TXTSETUP.SIF.\n",
"Installationen kunne ikke finde '%S'-sektionen\n"
"i TXTSETUP.SIF.\n",
"ENTER = Genstart"
},
{
// ERROR_CABINET_SECTION,
"Installationen kunne ikke finde 'Directories'-sektionen\n"
"Installationen kunne ikke finde '%S'-sektionen\n"
"i cabinet-filen.\n",
"ENTER = Genstart"
},
@ -1615,12 +1615,6 @@ MUI_ERROR daDKErrorEntries[] =
"Installationen kunne ikke lave installationsmappen.",
"ENTER = Genstart"
},
{
//ERROR_FIND_SETUPDATA,
"Installationen kunne ikkde finde 'SetupData'-sektionen\n"
"i TXTSETUP.SIF.\n",
"ENTER = Genstart"
},
{
// ERROR_WRITE_PTABLE,
"Installationen kunne ikke skrive partitionstabllerne.\n"
@ -1837,8 +1831,6 @@ MUI_STRING daDKStrings[] =
"F3 = Afslut ENTER = Forts‘t"},
{STRING_REBOOTCOMPUTER,
"ENTER = Genstart"},
{STRING_TXTSETUPFAILED,
"Installationen kunne ikke finde '%S'-sektionen\ni TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kopiere filen: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1589,14 +1589,14 @@ MUI_ERROR deDEErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Der Abschnitt 'Ordner' konnte in\n"
"TXTSETUP.SIF nicht gefunden werden.\n",
"Setup konnte die '%S'-Sektion in\n"
"TXTSETUP.SIF nicht finden.\n",
"EINGABETASTE = Computer neu starten"
},
{
// ERROR_CABINET_SECTION,
"Der Abschnitt 'Ordner' konnte\n"
"im im CAB-Archiv nicht gefunden werden.\n",
"Setup konnte die '%S'-Sektion im\n"
"CAB-Archiv nicht finden.\n",
"EINGABETASTE = Computer neu starten"
},
{
@ -1604,12 +1604,6 @@ MUI_ERROR deDEErrorEntries[] =
"Setup konnte den Installationspfad nicht erstellen.",
"EINGABETASTE = Computer neu starten"
},
{
//ERROR_FIND_SETUPDATA,
"Setup konnte die 'SetupData'-Sektion in\n"
"TXTSETUP.SIF nicht finden.\n",
"EINGABETASTE = Computer neu starten"
},
{
// ERROR_WRITE_PTABLE,
"Die Partitionstabellen konnten nicht geschrieben werden.\n"
@ -1826,8 +1820,6 @@ MUI_STRING deDEStrings[] =
"F3 = Beenden EINGABETASTE = Fortsetzen"},
{STRING_REBOOTCOMPUTER,
"EINGABETASTE = Computer neu starten"},
{STRING_TXTSETUPFAILED,
"Der Abschnitt '%S'in TXTSETUP.SIF\nkonnte nicht gefunden werden.\n"},
{STRING_COPYING,
" Kopiere Datei: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1611,13 +1611,13 @@ MUI_ERROR elGRErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ 'Directories'\n"
"† њљЎ<EFBFBD>«б©«<EFBFBD>©ћ <20>§в«¬®њ ¤<> ™Ёњ  «¦¤ «¦Јв<D088> '%S'\n"
"©«¦ TXTSETUP.SIF.\n",
"ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
},
{
// ERROR_CABINET_SECTION,
"† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ 'Directories'\n"
"† њљЎ<EFBFBD>«б©«<EFBFBD>©ћ <20>§в«¬®њ ¤<> ™Ёњ  «¦¤ «¦Јв<D088> '%S'\n"
"©«¦ cabinet.\n",
"ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
},
@ -1626,12 +1626,6 @@ MUI_ERROR elGRErrorEntries[] =
"† œš¡˜«á©«˜©ž ›œ £§æ¨œ©œ ¤˜ ›ž£ ¦¬¨šã©œ  «¦¤ ¡˜«á¢¦š¦ œš¡˜«á©«˜©žª.",
"ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
},
{
//ERROR_FIND_SETUPDATA,
"† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ ™¨œ  «¦¤ «¦£â˜ 'SetupData'\n"
"©«¦ TXTSETUP.SIF.\n",
"ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"
},
{
// ERROR_WRITE_PTABLE,
"† œš¡˜«á©«˜©ž ˜§â«¬®œ ¤˜ š¨á¯œ  «˜ partition tables.\n"
@ -1841,8 +1835,6 @@ MUI_STRING elGRStrings[] =
"F3 = €§¦®é¨ž©ž ENTER = ‘¬¤â®œ ˜"},
{STRING_REBOOTCOMPUTER,
"ENTER = „§˜¤œ¡¡å¤ž©ž ¬§¦¢¦š ©«ã"},
{STRING_TXTSETUPFAILED,
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" €¤« š¨á­œ«˜  «¦ ˜¨®œå¦: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1588,13 +1588,13 @@ MUI_ERROR enUSErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_CABINET_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in the cabinet.\n",
"ENTER = Reboot computer"
},
@ -1603,12 +1603,6 @@ MUI_ERROR enUSErrorEntries[] =
"Setup could not create the install directory.",
"ENTER = Reboot computer"
},
{
//ERROR_FIND_SETUPDATA,
"Setup failed to find the 'SetupData' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_WRITE_PTABLE,
"Setup failed to write partition tables.\n"
@ -1824,8 +1818,6 @@ MUI_STRING enUSStrings[] =
"F3 = Quit ENTER = Continue"},
{STRING_REBOOTCOMPUTER,
"ENTER = Reboot computer"},
{STRING_TXTSETUPFAILED,
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copying file: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1590,13 +1590,13 @@ MUI_ERROR esESErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"El instalador fall¢ al buscar la secci¢n 'Directorios'\n"
"El instalador fall¢ al buscar la secci¢n '%S'\n"
"en TXTSETUP.SIF.\n",
"INTRO = Reiniciar el equipo"
},
{
// ERROR_CABINET_SECTION,
"El instalador fall¢ al buscar la secci¢n 'Directorios'\n"
"El instalador fall¢ al buscar la secci¢n '%S'\n"
"en el cabinet.\n",
"INTRO = Reiniciar el equipo"
},
@ -1605,12 +1605,6 @@ MUI_ERROR esESErrorEntries[] =
"El instalador no puede crear el directorio de instalaci¢n.",
"INTRO = Reiniciar el equipo"
},
{
//ERROR_FIND_SETUPDATA,
"El instalador fall¢ al buscar la secci¢n 'SetupData'\n"
"en TXTSETUP.SIF.\n",
"INTRO = Reiniciar el equipo"
},
{
// ERROR_WRITE_PTABLE,
"El instalador fall¢ al escribir la tabla de particiones.\n"
@ -1826,8 +1820,6 @@ MUI_STRING esESStrings[] =
"F3 = Salir INTRO = Continuar"},
{STRING_REBOOTCOMPUTER,
"INTRO = Reiniciar el equipo"},
{STRING_TXTSETUPFAILED,
"El instalador fall¢ al buscar la secci¢n\nen TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copiando archivo: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1588,12 +1588,12 @@ MUI_ERROR etEEErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.",
"TXTSETUP.SIF failist ei leitud '%S' sektsiooni.",
"ENTER = Taask„ivita arvuti"
},
{
// ERROR_CABINET_SECTION,
"Kapifailist ei leitud 'Directories' sektsiooni.",
"Kapifailist ei leitud '%S' sektsiooni.",
"ENTER = Taask„ivita arvuti"
},
{
@ -1601,11 +1601,6 @@ MUI_ERROR etEEErrorEntries[] =
"Paigalduskausta ei ännestunud luua.",
"ENTER = Taask„ivita arvuti"
},
{
//ERROR_FIND_SETUPDATA,
"TXTSETUP.SIF failist ei leitud 'SetupData' sektsiooni",
"ENTER = Taask„ivita arvuti"
},
{
// ERROR_WRITE_PTABLE,
"Partitsioonitabeleid ei ännestunud kirjutada.\n"
@ -1823,8 +1818,6 @@ MUI_STRING etEEStrings[] =
"F3 = V„lju ENTER = J„tka"},
{STRING_REBOOTCOMPUTER,
"ENTER = Taask„ivita arvuti"},
{STRING_TXTSETUPFAILED,
"TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"},
{STRING_COPYING,
" Kopeerimine: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1605,13 +1605,13 @@ MUI_ERROR frFRErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup n'a pu trouver la section 'Directories'\n"
"Setup n'a pu trouver la section '%S'\n"
"dans TXTSETUP.SIF.\n",
"ENTR<EFBFBD>E = Red‚marrer l'ordinateur"
},
{
// ERROR_CABINET_SECTION,
"Setup n'a pu trouver la section 'Directories\n"
"Setup n'a pu trouver la section '%S\n"
"dans le cabinet.\n",
"ENTR<EFBFBD>E = Red‚marrer l'ordinateur"
},
@ -1620,12 +1620,6 @@ MUI_ERROR frFRErrorEntries[] =
"Setup n'a pu cr‚er le r‚pertoire d'installation.",
"ENTR<EFBFBD>E = Red‚marrer l'ordinateur"
},
{
//ERROR_FIND_SETUPDATA,
"Setup n'a pu trouver la section 'SetupData'\n"
"dans TXTSETUP.SIF.\n",
"ENTR<EFBFBD>E = Red‚marrer l'ordinateur"
},
{
// ERROR_WRITE_PTABLE,
"Setup n'a pu ‚crire les tables de partition.\n"
@ -1841,8 +1835,6 @@ MUI_STRING frFRStrings[] =
"F3 = Quitter ENTR<54>E = Continuer"},
{STRING_REBOOTCOMPUTER,
"ENTR<EFBFBD>E = Red‚marrer l'ordinateur"},
{STRING_TXTSETUPFAILED,
"Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copie du fichier: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1587,13 +1587,13 @@ MUI_ERROR heILErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_CABINET_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in the cabinet.\n",
"ENTER = Reboot computer"
},
@ -1602,12 +1602,6 @@ MUI_ERROR heILErrorEntries[] =
"Setup could not create the install directory.",
"ENTER = Reboot computer"
},
{
//ERROR_FIND_SETUPDATA,
"Setup failed to find the 'SetupData' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_WRITE_PTABLE,
"Setup failed to write partition tables.\n"
@ -1824,8 +1818,6 @@ MUI_STRING heILStrings[] =
"F3 = <20>ˆŒ „š—<C5A1>„ ENTER = „Ž™Š"},
{STRING_REBOOTCOMPUTER,
"ENTER = „”’Œ Ž‡ƒ™ €š „Ž‡™<E280A1>"},
{STRING_TXTSETUPFAILED,
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Ž’š‰— —…<E28094>•: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1593,13 +1593,13 @@ MUI_ERROR itITErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup non ha potuto trovare le sezioni 'Cartelle'\n"
"Setup non ha potuto trovare le sezioni '%S'\n"
"in TXTSETUP.SIF.\n",
"INVIO = Riavviare il computer"
},
{
// ERROR_CABINET_SECTION,
"Setup non ha potuto trovare le sezioni 'Cartelle'\n"
"Setup non ha potuto trovare le sezioni '%S'\n"
"nel cabinet.\n",
"INVIO = Riavviare il computer"
},
@ -1608,12 +1608,6 @@ MUI_ERROR itITErrorEntries[] =
"Setup non ha potuto creare la cartella d'installazione.",
"INVIO = Riavviare il computer"
},
{
//ERROR_FIND_SETUPDATA,
"Setup non ha trovato la sezione 'SetupData'\n"
"in TXTSETUP.SIF.\n",
"INVIO = Riavviare il computer"
},
{
// ERROR_WRITE_PTABLE,
"Setup non ha potuto scrivere le tabelle delle partizioni.\n"
@ -1829,8 +1823,6 @@ MUI_STRING itITStrings[] =
"F3 = Esci INVIO = Continua"},
{STRING_REBOOTCOMPUTER,
"INVIO = Riavvia il computer"},
{STRING_TXTSETUPFAILED,
"Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copia di: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1588,13 +1588,13 @@ MUI_ERROR jaJPErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'Directories' ¾¸¼®ÝÉ ¹Ý»¸Æ\n"
"ｾｯﾄｱｯﾌﾟﾊ TXTSETUP.SIF ﾅｲﾉ '%S' ｾｸｼｮﾝﾉ ｹﾝｻｸﾆ\n"
"¼¯Êß² ¼Ï¼À¡\n",
"ENTER = ºÝËß­°ÀÉ »²·ÄÞ³"
},
{
// ERROR_CABINET_SECTION,
"¾¯Ä±¯ÌßÊ ·¬ËÞȯÄÅ²É 'Directories' ¾¸¼®ÝÉ ¹Ý»¸Æ\n"
"ｾｯﾄｱｯﾌﾟﾊ ｷｬﾋﾞﾈｯﾄﾅｲﾉ '%S' ｾｸｼｮﾝﾉ ｹﾝｻｸﾆ\n"
"¼¯Êß² ¼Ï¼À¡\n",
"ENTER = ºÝËß­°ÀÉ »²·ÄÞ³"
},
@ -1603,12 +1603,6 @@ MUI_ERROR jaJPErrorEntries[] =
"¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸Äئ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡",
"ENTER = ºÝËß­°ÀÉ »²·ÄÞ³"
},
{
//ERROR_FIND_SETUPDATA,
"¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'SetupData' ¾¸¼®ÝÉ ¹Ý»¸Æ\n"
"¼¯Êß² ¼Ï¼À¡\n",
"ENTER = ºÝËß­°ÀÉ »²·ÄÞ³"
},
{
// ERROR_WRITE_PTABLE,
"¾¯Ä±¯ÌßÊ Ê߰è¼®Ý ðÌÞÙÉ ¶·ºÐÆ ¼¯Êß² ¼Ï¼À¡\n"
@ -1826,8 +1820,6 @@ MUI_STRING jaJPStrings[] =
"F3 = Á­³¼ ENTER = ¿Þ¯º³"},
{STRING_REBOOTCOMPUTER,
"ENTER = ºÝËß­°ÀÉ »²·ÄÞ³"},
{STRING_TXTSETUPFAILED,
"¾¯Ä±¯ÌßÊ TXTSETUP.SIF É '%S' ¾¸¼®ÝÉ ¹Ý¼­ÂÆ\n¼¯Êß² ¼Ï¼À¡\n"},
{STRING_COPYING,
" ºËß° Á­³É ̧²Ù: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1596,13 +1596,13 @@ MUI_ERROR ltLTErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_CABINET_SECTION,
"Setup failed to find the 'Directories' section\n"
"Setup failed to find the '%S' section\n"
"in the cabinet.\n",
"ENTER = Reboot computer"
},
@ -1611,12 +1611,6 @@ MUI_ERROR ltLTErrorEntries[] =
"Setup could not create the install directory.",
"ENTER = Reboot computer"
},
{
//ERROR_FIND_SETUPDATA,
"Setup failed to find the 'SetupData' section\n"
"in TXTSETUP.SIF.\n",
"ENTER = Reboot computer"
},
{
// ERROR_WRITE_PTABLE,
"Setup failed to write partition tables.\n"
@ -1832,8 +1826,6 @@ MUI_STRING ltLTStrings[] =
"F3 = Quit ENTER = Continue"},
{STRING_REBOOTCOMPUTER,
"ENTER = Reboot computer"},
{STRING_TXTSETUPFAILED,
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copying file: %S"},
{STRING_SETUPCOPYINGFILES,

12
base/setup/usetup/lang/ms-MY.h
View file

@ -1487,13 +1487,13 @@ MUI_ERROR msMYErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Persediaan gagal untuk mencari bahagian 'Direktori'\n"
"Persediaan gagal untuk mencari bahagian '%S'\n"
"dalam TXTSETUP. SIF.\n",
"ENTER = Memulakan semula komputer"
},
{
// ERROR_CABINET_SECTION,
"Persediaan gagal menemui bahagian 'Direktori'\n"
"Persediaan gagal menemui bahagian '%S'\n"
"dalam kabinet.\n",
"ENTER = Memulakan semula komputer"
},
@ -1502,12 +1502,6 @@ MUI_ERROR msMYErrorEntries[] =
"Persediaan tidak dapat mencipta direktori pasang.",
"ENTER = Memulakan semula komputer"
},
{
//ERROR_FIND_SETUPDATA,
"Persediaan gagal untuk mencari bahagian 'SetupData'\n"
"dalam TXTSETUP.SIF.\n",
"ENTER = Memulakan semula komputer"
},
{
// ERROR_WRITE_PTABLE,
"Persediaan gagal menulis jadual partition.\n"
@ -1712,8 +1706,6 @@ MUI_STRING msMYStrings[] =
"F3 = Keluar ENTER = Teruskan"},
{STRING_REBOOTCOMPUTER,
"ENTER = Memulakan semuala komputer"},
{STRING_TXTSETUPFAILED,
"Persediaan yang gagal menemui bahagian '%S'\ndalam TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Menyalin fail: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1613,13 +1613,13 @@ MUI_ERROR nlNLErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup kan de 'Directories' sectie niet vinden\n"
"Setup kan de '%S' sectie niet vinden\n"
"in TXTSETUP.SIF.\n",
"ENTER = Computer opnieuw opstarten"
},
{
// ERROR_CABINET_SECTION,
"Setup kan de 'Directories' sectie niet vinden\n"
"Setup kan de '%S' sectie niet vinden\n"
"in het cabinet bestand.\n",
"ENTER = Computer opnieuw opstarten"
},
@ -1628,12 +1628,6 @@ MUI_ERROR nlNLErrorEntries[] =
"Setup kan de installatiemap niet aanmaken.",
"ENTER = Computer opnieuw opstarten"
},
{
//ERROR_FIND_SETUPDATA,
"Setup kan de 'SetupData' sectie niet vinden\n"
"in TXTSETUP.SIF.\n",
"ENTER = Computer opnieuw opstarten"
},
{
// ERROR_WRITE_PTABLE,
"Setup kan de partitietabellen niet schrijven.\n"
@ -1851,8 +1845,6 @@ MUI_STRING nlNLStrings[] =
"F3 = Afsluiten ENTER = Doorgaan"},
{STRING_REBOOTCOMPUTER,
"ENTER = Computer opnieuw opstarten"},
{STRING_TXTSETUPFAILED,
"Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kopi\x89ren bestand: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1596,13 +1596,13 @@ MUI_ERROR plPLErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Instalator nie by<62> w stanie znaleǠ sekcji 'Directories'\n"
"Instalator nie by<62> w stanie znaleǠ sekcji '%S'\n"
"w pliku TXTSETUP.SIF.\n",
"ENTER = Restart komputera"
},
{
// ERROR_CABINET_SECTION,
"Instalator nie by<62> w stanie znaleǠ sekcji 'Directories'\n"
"Instalator nie by<62> w stanie znaleǠ sekcji '%S'\n"
"w pliku cabinet.\n",
"ENTER = Restart komputera"
},
@ -1611,12 +1611,6 @@ MUI_ERROR plPLErrorEntries[] =
"Instalator nie m¢gˆ stworzy† katalogu instalacji.",
"ENTER = Restart komputera"
},
{
//ERROR_FIND_SETUPDATA,
"Instalator nie by<62> w stanie znaleǠ sekcji 'SetupData'\n"
"w pliku TXTSETUP.SIF.\n",
"ENTER = Restart komputera"
},
{
// ERROR_WRITE_PTABLE,
"Instalator nie m¢gˆ zapisa† zmian w tablicy partycji.\n"
@ -1832,8 +1826,6 @@ MUI_STRING plPLStrings[] =
"F3 = Wyj˜cie ENTER = Kontynuacja"},
{STRING_REBOOTCOMPUTER,
"ENTER = Restart komputera"},
{STRING_TXTSETUPFAILED,
"Instalator nie by<62> w stanie odnaleǠ sekcji '%S'\nw pliku TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kopiowanie plik¢w: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1618,13 +1618,13 @@ MUI_ERROR ptBRErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"N釅 foi poss」el encontrar a se䄱o 'Directories' no\n"
"N釅 foi poss」el encontrar a se䄱o '%S' no\n"
"arquivo TXTSETUP.SIF.\n",
"ENTER=Reiniciar"
},
{
// ERROR_CABINET_SECTION,
"N釅 foi poss」el encontrar a se䄱o 'Directories' no\n"
"N釅 foi poss」el encontrar a se䄱o '%S' no\n"
"arquivo cab.\n",
"ENTER=Reiniciar"
},
@ -1633,12 +1633,6 @@ MUI_ERROR ptBRErrorEntries[] =
"NÆo foi poss¡vel criar o diret¢rio de instala‡Æo.",
"ENTER=Reiniciar"
},
{
//ERROR_FIND_SETUPDATA,
"N釅 foi poss」el encontrar a se䄱o 'SetupData' no\n"
"arquivo TXTSETUP.SIF.\n",
"ENTER=Reiniciar"
},
{
// ERROR_WRITE_PTABLE,
"NÆo foi poss¡vel escrever a tabela de parti‡äes.\n"
@ -1856,8 +1850,6 @@ MUI_STRING ptBRStrings[] =
"F3=Sair ENTER=Continuar"},
{STRING_REBOOTCOMPUTER,
"ENTER=Reiniciar"},
{STRING_TXTSETUPFAILED,
"N釅 foi poss」el econtrar a se䄱o '%S' no\narquivo TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Copiando arquivo: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1633,14 +1633,14 @@ MUI_ERROR roROErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Eşec la identificarea secţiunii de\n"
"directoare în fişierul TXTSETUP.SIF.",
"Eşec la identificarea secţiunii\n"
"'%S' în fişierul TXTSETUP.SIF.",
"ENTER = Repornire calculator"
},
{
// ERROR_CABINET_SECTION,
"Eşec la identificarea secţiunii de\n"
"directoare în fişierul cabinet.",
"Eşec la identificarea secţiunii\n"
"'%S' în fişierul cabinet.",
"ENTER = Repornire calculator"
},
{
@ -1648,12 +1648,6 @@ MUI_ERROR roROErrorEntries[] =
"Eşec la crearea directorului de instalare.",
"ENTER = Repornire calculator"
},
{
//ERROR_FIND_SETUPDATA,
"Eşec la localizarea secţiunii pentru date\n"
"de instalare din fişierul TXTSETUP.SIF.",
"ENTER = Repornire calculator"
},
{
// ERROR_WRITE_PTABLE,
"Eşec la scrierea tabelelor de partiţii.\n",
@ -1870,8 +1864,6 @@ MUI_STRING roROStrings[] =
"F3 = Ieşire ENTER = Continuare"},
{STRING_REBOOTCOMPUTER,
"ENTER = Repornire calculator"},
{STRING_TXTSETUPFAILED,
"Nu s-a reuşit găsirea sesiunii\n'%S' în TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Fişierul curent: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1587,13 +1587,13 @@ MUI_ERROR ruRUErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"<EFBFBD>¥ 㤠«®áì ­ ©â¨ ᥪæ¨î 'Directories'\n"
"چ¥ م¤ «®لى ­ ©â¨ ل¥ھو¨î '%S'\n"
"¢ ä ©«¥ TXTSETUP.SIF.\n",
"ENTER = <20>¥à¥§ £à㧪 "
},
{
// ERROR_CABINET_SECTION,
"<EFBFBD>¥ 㤠«®áì ­ ©â¨ ᥪæ¨î 'Directories'\n"
"چ¥ م¤ «®لى ­ ©â¨ ل¥ھو¨î '%S'\n"
"¢ cabinet.\n",
"ENTER = <20>¥à¥§ £à㧪 "
},
@ -1602,12 +1602,6 @@ MUI_ERROR ruRUErrorEntries[] =
"<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ¤¨à¥ªâ®à¨î ¤«ï ãáâ ­®¢ª¨.",
"ENTER = <20>¥à¥§ £à㧪 "
},
{
//ERROR_FIND_SETUPDATA,
"<EFBFBD>¥ 㤠«®áì ­ ©â¨ ᥪæ¨î 'SetupData'\n"
"¢ ä ©«¥ TXTSETUP.SIF.\n",
"ENTER = <20>¥à¥§ £à㧪 "
},
{
// ERROR_WRITE_PTABLE,
"<EFBFBD>¥ 㤠«®áì § ¯¨á âì â ¡«¨æã à §¤¥«®¢.\n"
@ -1823,8 +1817,6 @@ MUI_STRING ruRUStrings[] =
"F3 = ‚ë室 ENTER = <20>த®«¦¨âì"},
{STRING_REBOOTCOMPUTER,
"ENTER = <20>¥à¥§ £à㧪 "},
{STRING_TXTSETUPFAILED,
"<EFBFBD>ணࠬ¬  ãáâ ­®¢ª¨ ­¥ ᬮ£«  ­ ©â¨ ᥪæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Š®¯¨à®¢ ­¨¥ ä ©« : %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1597,14 +1597,14 @@ MUI_ERROR skSKErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup failed to find the 'Directories' section\n"
"in TXTSETUP.SIF.\n",
"Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\n"
"v s£bore TXTSETUP.SIF.\n",
"ENTER = Reçtart poŸ¡taŸa"
},
{
// ERROR_CABINET_SECTION,
"Setup failed to find the 'Directories' section\n"
"in the cabinet.\n",
"Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\n"
"v s£bore cabinet.\n",
"ENTER = Reçtart poŸ¡taŸa"
},
{
@ -1612,12 +1612,6 @@ MUI_ERROR skSKErrorEntries[] =
"Inçtal tor nemohol vytvoriœ inçtalaŸnì adres r.", //could not = nemohol
"ENTER = Reçtart poŸ¡taŸa"
},
{
//ERROR_FIND_SETUPDATA,
"Inçtal tor zlyhal pri h–adan¡ sekcie 'SetupData'\n"
"v s£bore TXTSETUP.SIF.\n",
"ENTER = Reçtart poŸ¡taŸa"
},
{
// ERROR_WRITE_PTABLE,
"Inçtal tor zlyhal pri z pise do tabuliek oblast¡.\n"
@ -1835,8 +1829,6 @@ MUI_STRING skSKStrings[] =
"F3 = SkonŸiœ ENTER = PokraŸovaœ"},
{STRING_REBOOTCOMPUTER,
"ENTER = Reçtart poŸ¡taŸa"},
{STRING_TXTSETUPFAILED,
"Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kop¡ruje sa s£bor: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1592,13 +1592,13 @@ MUI_ERROR sqALErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Instalimi d‰shtoi p‰r t‰ gjetur seksionin e 'sked‰s'\n"
"Instalimi d‰shtoi p‰r t‰ gjetur '%S' seksionin\n"
"ne TXTSETUP.SIF.\n",
"ENTER = Ristarto kompjuterin"
},
{
// ERROR_CABINET_SECTION,
"Instalimi d‰shtoi p‰r t‰ gjetur seksionin e 'sked‰s'\n"
"Instalimi d‰shtoi p‰r t‰ gjetur '%S' seksionin\n"
"ne kabinet.\n",
"ENTER = Ristarto kompjuterin"
},
@ -1830,8 +1830,6 @@ MUI_STRING sqALStrings[] =
"F3 = Dil ENTER = Vazhdo"},
{STRING_REBOOTCOMPUTER,
"ENTER = Ristarto kompjuterin"},
{STRING_TXTSETUPFAILED,
"Instalimi d‰shtoj p‰r t‰ gjetur '%S' sectorin\nne TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kopjo dokumentat: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1594,13 +1594,13 @@ MUI_ERROR svSEErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Setup misslyckades att hitta 'Directories' sektionen\n"
"Setup misslyckades att hitta '%S' sektionen\n"
"i TXTSETUP.SIF.\n",
"ENTER = Starta om datorn"
},
{
// ERROR_CABINET_SECTION,
"Setup misslyckades att hitta 'Directories' sektionen\n"
"Setup misslyckades att hitta '%S' sektionen\n"
"i kabinettet.\n",
"ENTER = Starta om datorn"
},
@ -1609,12 +1609,6 @@ MUI_ERROR svSEErrorEntries[] =
"Setup kunnde inte skapa installationsmappen.",
"ENTER = Starta om datorn"
},
{
//ERROR_FIND_SETUPDATA,
"Setup misslyckades att hitta 'SetupData' sektionen\n"
"i TXTSETUP.SIF.\n",
"ENTER = Starta om datorn"
},
{
// ERROR_WRITE_PTABLE,
"Setup misslyckades att skriva partitionstabellen.\n"
@ -1832,8 +1826,6 @@ MUI_STRING svSEStrings[] =
"F3 = Avsluta ENTER = Forts„tt"},
{STRING_REBOOTCOMPUTER,
"ENTER = Starta om datorn"},
{STRING_TXTSETUPFAILED,
"Setup misslyckades att hitta '%S' sektionen\ni TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Kopierar fil: %S"},
{STRING_SETUPCOPYINGFILES,

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

@ -1566,13 +1566,13 @@ MUI_ERROR trTRErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"Kur, TXTSETUP.SIF'de ""Directories"" b”l<E2809D>m<EFBFBD>n<EFBFBD>\n"
"Kur, TXTSETUP.SIF'de '%S' b”l<E2809D>m<EFBFBD>n<EFBFBD>\n"
"bulmada baŸar<61>s<EFBFBD>z oldu.\n",
"GiriŸ = Bilgisayar<61> Yeniden BaŸlat"
},
{
// ERROR_CABINET_SECTION,
"Kur, dolapta ""Directories"" b”l<E2809D>m<EFBFBD>n<EFBFBD>\n"
"Kur, dolapta '%S' b”l<E2809D>m<EFBFBD>n<EFBFBD>\n"
"bulmada baŸar<61>s<EFBFBD>z oldu.\n",
"GiriŸ = Bilgisayar<61> Yeniden BaŸlat"
},
@ -1581,12 +1581,6 @@ MUI_ERROR trTRErrorEntries[] =
"Kur, kurulum dizinini oluŸturamad<61>.",
"GiriŸ = Bilgisayar<61> Yeniden BaŸlat"
},
{
//ERROR_FIND_SETUPDATA,
"Kur, TXTSETUP.SIF'de ""SetupData"" b”l<E2809D>m<EFBFBD>n<EFBFBD>\n"
"bulmada baŸar<61>s<EFBFBD>z oldu.\n",
"GiriŸ = Bilgisayar<61> Yeniden BaŸlat"
},
{
// ERROR_WRITE_PTABLE,
"Kur, b”l<E2809D>m tablolar<61> yazmada baŸar<61>s<EFBFBD>z oldu.\n"
@ -1802,8 +1796,6 @@ MUI_STRING trTRStrings[] =
"F3 = €<>k GiriŸ = S<>rd<72>r"},
{STRING_REBOOTCOMPUTER,
"GiriŸ = Bilgisayar<61> Yeniden BaŸlat"},
{STRING_TXTSETUPFAILED,
"Kur, TXTSETUP.SIF'de ""%S"" b”l<E2809D>m<EFBFBD>n<EFBFBD>\nbulmada baŸar<61>s<EFBFBD>z oldu.\n"},
{STRING_COPYING,
" K<>t<EFBFBD>k ‡o§alt<6C>l<EFBFBD>yor: %S..."},
{STRING_SETUPCOPYINGFILES,

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

@ -1594,13 +1594,13 @@ MUI_ERROR ukUAErrorEntries[] =
},
{
// ERROR_TXTSETUP_SECTION,
"<EFBFBD>¥ ¢¤ «®áì §­ ©â¨ ᥪæiî 'Directories'\n"
"چ¥ ¢¤ «®لى §­ ©â¨ ل¥ھوiî '%S'\n"
"¢ ä ©«i TXTSETUP.SIF.\n",
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
},
{
// ERROR_CABINET_SECTION,
"<EFBFBD>¥ ¢¤ «®áì §­ ©â¨ ᥪæiî 'Directories'\n"
"چ¥ ¢¤ «®لى §­ ©â¨ ل¥ھوiî '%S'\n"
"¢ cabinet.\n",
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
},
@ -1609,12 +1609,6 @@ MUI_ERROR ukUAErrorEntries[] =
"<EFBFBD>¥ ¢¤ «®áì á⢮à¨â¨ ¤¨à¥ªâ®àiî ¤«ï ¢áâ ­®¢«­­ï.",
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
},
{
//ERROR_FIND_SETUPDATA,
"<EFBFBD>¥ ¢¤ «®áì §­ ©â¨ ᥪæiî 'SetupData'\n"
"¢ ä ©«i TXTSETUP.SIF.\n",
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
},
{
// ERROR_WRITE_PTABLE,
"<EFBFBD>¥ ¢¤ «®áì § ¯¨á â¨ â ¡«¨æi ஧¤i«i¢.\n"
@ -1832,8 +1826,6 @@ MUI_STRING ukUAStrings[] =
"F3 = ‚¨©â¨ ENTER = <20>த®¢¦¨â¨"},
{STRING_REBOOTCOMPUTER,
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"},
{STRING_TXTSETUPFAILED,
"‚áâ ­®¢«î¢ ç ­¥ §¬i£ §­ ©â¨ ᥪæiî '%S' \n¢ ä ©«i TXTSETUP.SIF.\n"},
{STRING_COPYING,
" Š®¯i­­ï: %S"},
{STRING_SETUPCOPYINGFILES,

25
base/setup/usetup/mui.c
View file

@ -175,15 +175,14 @@ MUIDisplayPage(
}
VOID
MUIDisplayError(
MUIDisplayErrorV(
IN ULONG ErrorNum,
OUT PINPUT_RECORD Ir,
IN ULONG WaitEvent,
...)
IN va_list args)
{
const MUI_ERROR* entry;
CHAR Buffer[2048];
va_list ap;
if (ErrorNum >= ERROR_LAST_ERROR_CODE)
{
@ -191,7 +190,6 @@ MUIDisplayError(
"Press ENTER to continue",
Ir,
POPUP_WAIT_ENTER);
return;
}
@ -205,9 +203,7 @@ MUIDisplayError(
return;
}
va_start(ap, WaitEvent);
vsprintf(Buffer, entry[ErrorNum].ErrorText, ap);
va_end(ap);
vsprintf(Buffer, entry[ErrorNum].ErrorText, args);
PopupError(Buffer,
entry[ErrorNum].ErrorStatus,
@ -215,6 +211,21 @@ MUIDisplayError(
WaitEvent);
}
VOID
__cdecl
MUIDisplayError(
IN ULONG ErrorNum,
OUT PINPUT_RECORD Ir,
IN ULONG WaitEvent,
...)
{
va_list arg_ptr;
va_start(arg_ptr, WaitEvent);
MUIDisplayErrorV(ErrorNum, Ir, WaitEvent, arg_ptr);
va_end(arg_ptr);
}
LPSTR
MUIGetString(
ULONG Number)

9
base/setup/usetup/mui.h
View file

@ -50,6 +50,14 @@ MUIClearPage(
ULONG PageNumber);
VOID
MUIDisplayErrorV(
IN ULONG ErrorNum,
OUT PINPUT_RECORD Ir,
IN ULONG WaitEvent,
IN va_list args);
VOID
__cdecl
MUIDisplayError(
ULONG ErrorNum,
PINPUT_RECORD Ir,
@ -83,7 +91,6 @@ MUIGetString(
#define STRING_CONTINUE 12
#define STRING_QUITCONTINUE 13
#define STRING_REBOOTCOMPUTER 14
#define STRING_TXTSETUPFAILED 15
#define STRING_COPYING 16
#define STRING_SETUPCOPYINGFILES 17
#define STRING_REGHIVEUPDATE 20

16
base/setup/usetup/usetup.c
View file

@ -3499,9 +3499,7 @@ AddSectionToCopyQueueCab(HINF InfFile,
/* Search for the SectionName section */
if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext))
{
CHAR Buffer[128];
sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName);
PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER);
MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, SectionName);
return FALSE;
}
@ -3593,9 +3591,7 @@ AddSectionToCopyQueue(HINF InfFile,
/* Search for the SectionName section */
if (!SetupFindFirstLineW(InfFile, SectionName, NULL, &FilesContext))
{
CHAR Buffer[128];
sprintf(Buffer, MUIGetString(STRING_TXTSETUPFAILED), SectionName);
PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER);
MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, SectionName);
return FALSE;
}
@ -3759,13 +3755,9 @@ PrepareCopyPageInfFile(HINF InfFile,
if (!SetupFindFirstLineW(InfFile, L"Directories", NULL, &DirContext))
{
if (SourceCabinet)
{
MUIDisplayError(ERROR_CABINET_SECTION, Ir, POPUP_WAIT_ENTER);
}
MUIDisplayError(ERROR_CABINET_SECTION, Ir, POPUP_WAIT_ENTER, L"Directories");
else
{
MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER);
}
MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, L"Directories");
return FALSE;
}