Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[ekohl] 70437: [MSGINA] Improve msgina's text in ReactOS. Patch by Henry Tang Ih. CORE-10720 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 27 16:36:32 2015 New Revision: 70437 URL: http://svn.reactos.org/svn/reactos?rev=70437&view=rev Log: [MSGINA] Improve msgina's text in ReactOS. Patch by Henry Tang Ih. CORE-10720 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Dec 27 16:36:32 2015 @@ -33,7 +33,7 @@ COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 @@ -46,11 +46,11 @@ LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "What do you want to do?", IDC_STATIC, 10, 119, 255, 8 - PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14 - PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 - PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14 + PUSHBUTTON "Loc&k Computer", IDC_LOCK, 10, 135, 76, 14 + PUSHBUTTON "&Log Off...", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "&Shut Down", IDC_SHUTDOWN, 189, 135, 76, 14 + PUSHBUTTON "&Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "&Task Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Cancel", IDCANCEL, 189, 154, 76, 14 END

8 years, 12 months

[hbelusca] 70436: [USETUP]: Fix some localization problems.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 15:22:39 2015 New Revision: 70436 URL: http://svn.reactos.org/svn/reactos?rev=70436&view=rev Log: [USETUP]: Fix some localization problems. Modified: 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/ms-MY.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 Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -481,6 +481,7 @@ 0 } }; + static MUI_ENTRY bgBGComputerPageEntries[] = { { @@ -839,7 +840,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " « £ ¥ ¥ ªâ " KERNEL_VERSION_STR " . ", TEXT_STYLE_UNDERLINE }, { @@ -1614,7 +1615,6 @@ NULL } }; - MUI_PAGE bgBGPages[] = { @@ -1759,7 +1759,7 @@ {STRING_CHECKINGPART, "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."}, {STRING_QUITCONTINUE, - "F3= §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, + "F3 = §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_REBOOTCOMPUTER, "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà "}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -472,6 +472,7 @@ 0 } }; + static MUI_ENTRY bnBDComputerPageEntries[] = { { @@ -1432,7 +1433,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1743,7 +1744,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -480,6 +480,7 @@ 0 } }; + static MUI_ENTRY csCZComputerPageEntries[] = { { @@ -837,7 +838,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalace ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1440,7 +1441,7 @@ "\n" " \x07 Stisknut¡m F3 ukon¡te instalaci.\n" " \x07 Stisknut¡m ENTER budete pokraovat v instalaci.", - "F3= Ukonit ENTER = Pokraovat" + "F3 = Ukonit ENTER = Pokraovat" }, { //ERROR_NEW_PARTITION, @@ -1609,7 +1610,6 @@ NULL } }; - MUI_PAGE csCZPages[] = { @@ -1752,7 +1752,7 @@ {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."}, {STRING_QUITCONTINUE, - "F3= Ukonit ENTER = Pokraovat"}, + "F3 = Ukonit ENTER = Pokraovat"}, {STRING_REBOOTCOMPUTER, "ENTER = Restartovat po¡ta"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY deDEComputerPageEntries[] = { { @@ -1605,7 +1606,6 @@ NULL } }; - MUI_PAGE deDEPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY elGRComputerPageEntries[] = { { @@ -842,7 +843,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1391,7 +1392,7 @@ "\n" " \x07 «ã©« ENTER ¤ ©¬¤®å©« «¤ ¡«á©«©.\n" " \x07 «ã©« F3 ¤ §¦®à¨ã©« §æ «¤ ¡«á©«©.", - "F3= §¦®é¨© ENTER = ¬¤â® " + "F3 = §¦®é¨© ENTER = ¬¤â® " }, { //ERROR_NO_HDD @@ -1457,7 +1458,7 @@ "\n" " \x07 «ã©« F3 ¤ §¦®à¨ã©« §æ «¤ ¡«á©«©.\n" " \x07 «ã©« ENTER ¤ ©¬¤®å©«.", - "F3= §¦®é¨© ENTER = ¬¤â® " + "F3 = §¦®é¨© ENTER = ¬¤â® " }, { //ERROR_NEW_PARTITION, @@ -1618,7 +1619,6 @@ NULL } }; - MUI_PAGE elGRPages[] = { @@ -1763,7 +1763,7 @@ {STRING_CHECKINGPART, " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."}, {STRING_QUITCONTINUE, - "F3= §¦®é¨© ENTER = ¬¤â® "}, + "F3 = §¦®é¨© ENTER = ¬¤â® "}, {STRING_REBOOTCOMPUTER, "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -1433,7 +1433,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1744,7 +1744,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -481,6 +481,7 @@ 0 } }; + static MUI_ENTRY esESComputerPageEntries[] = { { @@ -1442,7 +1443,7 @@ "\n" " \x07 Presione F3 para salir del instalador.\n" " \x07 Presione INTRO para continuar.", - "F3= Salir INTRO = Continuar" + "F3 = Salir INTRO = Continuar" }, { //ERROR_NEW_PARTITION, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -69,7 +69,7 @@ { 6, 11, - "Selles paigaldamise osas kopeeritakse ReactOSi failid arvutisse ja", + "Selles paigaldamise osas kopeeritakse ReactOSi failid arvutisse ja", TEXT_STYLE_NORMAL }, { @@ -472,6 +472,7 @@ 0 } }; + static MUI_ENTRY etEEComputerPageEntries[] = { { @@ -730,7 +731,7 @@ { 6, 13, - "Sisesta vormindatud flopiketas draivi A:", + "Sisesta vormindatud flopiketas draivi A:", TEXT_STYLE_NORMAL }, { @@ -830,7 +831,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", TEXT_STYLE_UNDERLINE }, { @@ -970,7 +971,7 @@ { 6, 9, - "Vali kaust, kuhu ReactOS paigaldada:", + "Vali kaust, kuhu ReactOS paigaldada:", TEXT_STYLE_NORMAL }, { @@ -1433,7 +1434,7 @@ "\n" " \x07 Vajuta F3, et vljuda paigaldusest..\n" " \x07 Vajuta ENTER, et jtkata.", - "F3= Vlju ENTER = Jtka" + "F3 = Vlju ENTER = Jtka" }, { //ERROR_NEW_PARTITION, @@ -1517,7 +1518,7 @@ }, { //ERROR_TXTSETUP_SECTION, - "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", + "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", "ENTER = Taaskivita arvuti" }, { @@ -1599,7 +1600,6 @@ NULL } }; - MUI_PAGE etEEPages[] = { @@ -1744,7 +1744,7 @@ {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."}, {STRING_QUITCONTINUE, - "F3= Vlju ENTER = Jtka"}, + "F3 = Vlju ENTER = Jtka"}, {STRING_REBOOTCOMPUTER, "ENTER = Taaskivita arvuti"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -485,6 +485,7 @@ 0 } }; + static MUI_ENTRY frFRComputerPageEntries[] = { { @@ -842,7 +843,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1379,7 +1380,7 @@ "\n" " \x07 Appuyer sur ENTRE pour continuer Setup.\n" " \x07 Appuyer sur F3 pour quitter Setup.", - "F3= Quitter ENTRE = Continuer" + "F3 = Quitter ENTRE = Continuer" }, { //ERROR_NO_HDD @@ -1445,7 +1446,7 @@ "\n" " \x07 Appuyer sur F3 pour quitter Setup.\n" " \x07 Appuyer sur ENTRE pour continuer Setup.", - "F3= Quitter ENTRE = Continuer" + "F3 = Quitter ENTRE = Continuer" }, { //ERROR_NEW_PARTITION, @@ -1614,7 +1615,6 @@ NULL } }; - MUI_PAGE frFRPages[] = { @@ -1757,7 +1757,7 @@ {STRING_CHECKINGPART, "Setup vrifie la partition slectionne."}, {STRING_QUITCONTINUE, - "F3= Quitter ENTRE = Continuer"}, + "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER, "ENTRE = Redmarrer l'ordinateur"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY heILComputerPageEntries[] = { { @@ -1433,7 +1434,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1745,7 +1746,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= ENTER = "}, + "F3 = ENTER = "}, {STRING_REBOOTCOMPUTER, "ENTER = "}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY itITComputerPageEntries[] = { { @@ -835,9 +836,9 @@ static MUI_ENTRY itITConfirmDeletePartitionEntries[] = { { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1308,7 +1309,7 @@ { 11, 19, - "ATTENZIONE: Tutti i dati di questa partizione saranno persi!!", + "ATTENZIONE: Tutti i dati di questa partizione saranno persi!!", TEXT_STYLE_NORMAL }, { @@ -1374,7 +1375,7 @@ "\n" " \x07 Premere INVIO per continuare il setup.\n" " \x07 Premere F3 per uscire.", - "F3= Uscire INVIO = Continuare" + "F3 = Uscire INVIO = Continuare" }, { //ERROR_NO_HDD @@ -1440,7 +1441,7 @@ "\n" " \x07 Premere F3 per uscire dal Setup.\n" " \x07 Premere INVIO per continuare.", - "F3= Uscire INVIO = Continuare" + "F3 = Uscire INVIO = Continuare" }, { //ERROR_NEW_PARTITION, @@ -1609,7 +1610,6 @@ NULL } }; - MUI_PAGE itITPages[] = { @@ -1754,7 +1754,7 @@ {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."}, {STRING_QUITCONTINUE, - "F3= Esci INVIO = Continua"}, + "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER, "INVIO = Riavvia il computer"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY jaJPComputerPageEntries[] = { { @@ -831,7 +832,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", TEXT_STYLE_UNDERLINE }, { @@ -1434,7 +1435,7 @@ "\n" " \x07 ¾¯Ä±¯Ìß¦ Á³¼ ½ÙÆÊ F3 ·°¦ µ¼Ã ¸ÀÞ»²¡\n" " \x07 ¿Þ¯º³ ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", - "F3= Á³¼ ENTER = ¿Þ¯º³" + "F3 = Á³¼ ENTER = ¿Þ¯º³" }, { //ERROR_NEW_PARTITION, @@ -1747,7 +1748,7 @@ {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"}, {STRING_QUITCONTINUE, - "F3= Á³¼ ENTER = ¿Þ¯º³"}, + "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER, "ENTER = ºÝËß°ÀÉ »²·ÄÞ³"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -482,6 +482,7 @@ 0 } }; + static MUI_ENTRY ltLTComputerPageEntries[] = { { @@ -839,7 +840,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", TEXT_STYLE_UNDERLINE }, { @@ -1442,7 +1443,7 @@ "\n" " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1611,7 +1612,6 @@ NULL } }; - MUI_PAGE ltLTPages[] = { @@ -1754,7 +1754,7 @@ {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Sun Dec 27 15:22:39 2015 @@ -472,6 +472,7 @@ 0 } }; + static MUI_ENTRY msMYComputerPageEntries[] = { { @@ -1332,7 +1333,7 @@ "\n" " \x07 Tekan F3 untuk keluar persediaan.\n" " \x07 Tekan ENTER untuk teruskan.", - "F3= Keluar ENTER = Teruskan" + "F3 = Keluar ENTER = Teruskan" }, { //ERROR_NEW_PARTITION, @@ -1632,7 +1633,7 @@ {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."}, {STRING_QUITCONTINUE, - "F3= Keluar ENTER = Teruskan"}, + "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, "ENTER = Memulakan semuala komputer"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -500,6 +500,7 @@ 0 } }; + static MUI_ENTRY nlNLComputerPageEntries[] = { { @@ -1641,7 +1642,6 @@ NULL } }; - MUI_PAGE nlNLPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -483,6 +483,7 @@ 0 } }; + static MUI_ENTRY plPLComputerPageEntries[] = { { @@ -840,7 +841,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalator ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1377,7 +1378,7 @@ "\n" " \x07 Nacinij ENTER, aby kontynuowa instalacj©.\n" " \x07 Nacinij F3, aby wyj z instalatora.", - "F3= Wyjcie ENTER = Kontynuacja" + "F3 = Wyjcie ENTER = Kontynuacja" }, { //ERROR_NO_HDD @@ -1443,7 +1444,7 @@ "\n" " \x07 Nacinij F3, aby wyj z instalatora.\n" " \x07 Nacinij ENTER, aby kontynuowa.", - "F3= Wyjcie ENTER = Kontynuacja" + "F3 = Wyjcie ENTER = Kontynuacja" }, { //ERROR_NEW_PARTITION, @@ -1754,7 +1755,7 @@ {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."}, {STRING_QUITCONTINUE, - "F3= Wyjcie ENTER = Kontynuacja"}, + "F3 = Wyjcie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY ptBRComputerPageEntries[] = { { @@ -849,7 +850,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " InstalaÆo do ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -528,6 +528,7 @@ 0 } }; + static MUI_ENTRY roROComputerPageEntries[] = { { @@ -885,7 +886,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalare ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1418,7 +1419,7 @@ //ERROR_NOT_INSTALLED "ReactOS nu a fost instalat complet în calculatorul\n" "dumneavoastrã. Dacã abandonaþi instalarea ReactOS\n" - "acum, va fi nevoie sã o reluaþi din nou altã datã.\n" + "acum, va fi nevoie sã o reluaþi din nou altã datã.\n" "\n" " \x07 Apãsaþi ENTER pentru a continua instalarea.\n" " \x07 Apãsaþi F3 pentru a abandona instalarea.", @@ -1452,37 +1453,37 @@ { //ERROR_DRIVE_INFORMATION "Nu se pot obþine informaþii despre dispozitiv(ele)\n" - "din calculator.\n", + "din calculator.\n", "ENTER = Repornire calculator" }, { //ERROR_WRITE_BOOT, "Nu s-a reuºit instalarea codului FAT de iniþializare\n" - "pe partiþia de sistem.", + "pe partiþia de sistem.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_COMPUTER, "A eºuat încãrcarea listei cu arhitecturi de\n" - "calcul disponibile.", + "calcul disponibile.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_DISPLAY, "A eºuat încãrcarea listei cu parametri de\n" - "afiºare pentru ecran.", + "afiºare pentru ecran.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_KEYBOARD, "A eºuat încãrcarea listei cu tipuri\n" - "disponibile de tastaturã.", + "disponibile de tastaturã.", "ENTER = Repornire calculator" }, { //ERROR_LOAD_KBLAYOUT, "A eºuat încãrcarea listei de configuraþii\n" - "ale tastaturii.", + "ale tastaturii.", "ENTER = Repornire calculator" }, { @@ -1491,11 +1492,11 @@ "nerecunoscutã, ce nu pot fi gestionatã corespunzãtor!\n" "\n" "Crearea sau ºtergerea de partiþii poate astfel cauza\n" - "distrugerea tabelei de partiþii." + "distrugerea tabelei de partiþii." "\n" " \x07 Apãsaþi F3 pentru a abandona instalarea.\n" " \x07 Apãsaþi ENTER pentru a continua.", - "F3= Ieºire ENTER = Continuare" + "F3 = Ieºire ENTER = Continuare" }, { //ERROR_NEW_PARTITION, @@ -1516,7 +1517,7 @@ { //ERROR_INSTALL_BOOTCODE, "Nu s-a reuºit instalarea codului FAT de iniþializare\n" - "pe partiþia de sistem.", + "pe partiþia de sistem.", "ENTER = Repornire calculator" }, { @@ -1532,18 +1533,18 @@ { //ERROR_UPDATE_DISPLAY_SETTINGS, "Nu s-a reuºit actualizarea registrului cu\n" - "parametrii grafici ai ecranului!", + "parametrii grafici ai ecranului!", "ENTER = Repornire calculator" }, { //ERROR_IMPORT_HIVE, - "Nu s-a reuºit importarea registrului.", + "Nu s-a reuºit importarea registrului.", "ENTER = Repornire calculator" }, { //ERROR_FIND_REGISTRY "Fiºierele cu datele registrului\n" - "nu au putut fi localizate.", + "nu au putut fi localizate.", "ENTER = Repornire calculator" }, { @@ -1559,7 +1560,7 @@ { //ERROR_INVALID_CABINET_INF, "Fiºierul cabinet nu conþine nici un fiºier\n" - "valid de tip inf.", + "valid de tip inf.", "ENTER = Repornire calculator" }, { @@ -1570,13 +1571,13 @@ { //ERROR_CABINET_SCRIPT, "Fiºierul cabinet nu conþine nici un script\n" - "de instalare.", + "de instalare.", "ENTER = Repornire calculator" }, { //ERROR_COPY_QUEUE, "Nu se poate deschide lista de fiºiere\n" - "pentru copiere.", + "pentru copiere.", "ENTER = Repornire calculator" }, { @@ -1587,7 +1588,7 @@ { //ERROR_TXTSETUP_SECTION, "Nu se poate gãsi secþiunea de directoare\n" - "în fiºierul TXTSETUP.SIF.", + "în fiºierul TXTSETUP.SIF.", "ENTER = Repornire calculator" }, { @@ -1814,7 +1815,7 @@ {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."}, {STRING_QUITCONTINUE, - "F3= Ieºire ENTER = Continuare"}, + "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER, "ENTER = Repornire calculator"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -473,6 +473,7 @@ 0 } }; + static MUI_ENTRY ruRUComputerPageEntries[] = { { @@ -1602,7 +1603,6 @@ NULL } }; - MUI_PAGE ruRUPages[] = { Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -480,6 +480,7 @@ 0 } }; + static MUI_ENTRY skSKComputerPageEntries[] = { { @@ -838,7 +839,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1613,7 +1614,6 @@ NULL } }; - MUI_PAGE skSKPages[] = { @@ -1758,7 +1758,7 @@ {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblas."}, {STRING_QUITCONTINUE, - "F3= Skoni ENTER = Pokraova"}, + "F3 = Skoni ENTER = Pokraova"}, {STRING_REBOOTCOMPUTER, "ENTER = Reçtart po¡taa"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -476,6 +476,7 @@ 0 } }; + static MUI_ENTRY sqALComputerPageEntries[] = { { @@ -834,7 +835,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1437,7 +1438,7 @@ "\n" " \x07 Kliko F3 pr daljen nga instalimi.\n" " \x07 Kliko ENTER pr t vazhduar.", - "F3= Dil ENTER = Vazhdo" + "F3 = Dil ENTER = Vazhdo" }, { //ERROR_NEW_PARTITION, @@ -1750,7 +1751,7 @@ {STRING_CHECKINGPART, "Instalimi tani sht duke kontrolluar particionin e przgjedhur."}, {STRING_QUITCONTINUE, - "F3= Dil ENTER = Vazhdo"}, + "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER, "ENTER = Ristarto kompjuterin"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -479,6 +479,7 @@ 0 } }; + static MUI_ENTRY svSEComputerPageEntries[] = { { @@ -1374,7 +1375,7 @@ "\n" " \x07 Tryck ENTER fr att fortstta Setup.\n" " \x07 Tryck F3 fr att avsluta Setup.", - "F3= Avsluta ENTER = Fortstta" + "F3 = Avsluta ENTER = Fortstta" }, { //ERROR_NO_HDD @@ -1440,7 +1441,7 @@ "\n" " \x07 Tryck F3 fr att avsluta Setup." " \x07 Tryck ENTER fr att fortstta.", - "F3= Avsluta ENTER = Fortstt" + "F3 = Avsluta ENTER = Fortstt" }, { //ERROR_NEW_PARTITION, @@ -1753,7 +1754,7 @@ {STRING_CHECKINGPART, "Setup undersker nu den valda partitionen."}, {STRING_QUITCONTINUE, - "F3= Avsluta ENTER = Fortstt"}, + "F3 = Avsluta ENTER = Fortstt"}, {STRING_REBOOTCOMPUTER, "ENTER = Starta om datorn"}, {STRING_TXTSETUPFAILED, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -361,7 +361,7 @@ { 25, 16, - "Bu aygt ayarlarn do§rula.", + "Bu aygt ayarlarn do§rula.", TEXT_STYLE_NORMAL }, { @@ -376,7 +376,7 @@ "basarak de§itirebilirsiniz. Sonra baka ayarlar semek iin Giri", TEXT_STYLE_NORMAL }, - { + { 6, 21, "d§mesine basnz.", @@ -920,7 +920,7 @@ "Blm Biimlendirme", TEXT_STYLE_NORMAL }, - { + { 6, 10, "Kur, imdi blm biimlendirecek. Srdrmek iin Giri'e basnz.", @@ -1000,7 +1000,7 @@ "ReactOS Kur, ReactOS kurulum dizininize ktkleri o§altrken", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, - { + { 0, 13, " ltfen bekleyiniz.", @@ -1408,7 +1408,7 @@ { //ERROR_WARN_PARTITION, "Kur, dzgn ynetilemeyen bir uyumsuz blm tablosu ieren en az\n" - "bir sbit disk buldu!\n" + "bir sbit disk buldu!\n" "\n" "Blmleri oluturmak vey silmek blm tablosunu yok edebilir.\n" "\n" Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- 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 Dec 27 15:22:39 2015 @@ -478,6 +478,7 @@ 0 } }; + static MUI_ENTRY ukUAComputerPageEntries[] = { { @@ -836,7 +837,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { @@ -1440,7 +1441,7 @@ "\n" " \x07 â¨áiâì F3 ¤«ï ¢¨å®¤ã § ¢áâ ®¢«î¢ ç .\n" " \x07 â¨áiâì ENTER é®¡ ¯à®¤®¢¦¨â¨.", - "F3= ¨©â¨ ENTER = à®¤®¢¦¨â¨" + "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨" }, { //ERROR_NEW_PARTITION, @@ -1753,7 +1754,7 @@ {STRING_CHECKINGPART, "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."}, {STRING_QUITCONTINUE, - "F3= ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, + "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER, "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"}, {STRING_TXTSETUPFAILED,

8 years, 12 months

[hbelusca] 70435: Fix build.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 02:04:09 2015 New Revision: 70435 URL: http://svn.reactos.org/svn/reactos?rev=70435&view=rev Log: Fix build. Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 02:04:09 2015 @@ -376,7 +376,7 @@ // NOTE: Returning the value of fs_close looks suspicious. // return fs_close(FALSE); ret = fs_close(FALSE); - DPRINT1("No need to check FS; fs_close returning %d\n", ret); + DPRINT1("No need to check FS; fs_close returning %d\n", (unsigned int)ret); return STATUS_SUCCESS; } @@ -439,8 +439,8 @@ /* Close the volume */ // NOTE: Returning the value of fs_close looks suspicious. // return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - res = fs_close(FixErrors); - DPRINT1("fs_close returning %d\n", ret); + ret = fs_close(FixErrors); + DPRINT1("fs_close returning %d\n", (unsigned int)ret); return STATUS_SUCCESS; }

8 years, 12 months

[hbelusca] 70434: [VFATLIB] It seems suspicious to directly return the value of fs_close as the NTSTATUS code of the check-disk operation (for FAT32 volumes it happens to return 1 whereas for FAT16...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 02:01:52 2015 New Revision: 70434 URL: http://svn.reactos.org/svn/reactos?rev=70434&view=rev Log: [VFATLIB] It seems suspicious to directly return the value of fs_close as the NTSTATUS code of the check-disk operation (for FAT32 volumes it happens to return 1 whereas for FAT16 volumes it returns 0). The documentation of this function says that it "returns a non-zero integer if the file system has been changed since the last fs_open, zero otherwise." Maybe somebody has a more precise idea on that subject? In the meantime I also add some DPRINTs to attempt to diagnose the conditions where this problem occurs. Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 02:01:52 2015 @@ -351,6 +351,7 @@ BOOLEAN salvage_files; ULONG free_clusters; DOS_FS fs; + int ret; /* Store callback pointer */ ChkdskCallback = Callback; @@ -372,7 +373,11 @@ if (CheckOnlyIfDirty && !fs_isdirty()) { /* No need to check FS */ - return fs_close(FALSE); + // NOTE: Returning the value of fs_close looks suspicious. + // return fs_close(FALSE); + ret = fs_close(FALSE); + DPRINT1("No need to check FS; fs_close returning %d\n", ret); + return STATUS_SUCCESS; } read_boot(&fs); @@ -404,6 +409,8 @@ if (fs_changed()) { + DPRINT1("fs_changed is TRUE!\n"); + if (FixErrors) { if (FsCheckFlags & FSCHECK_INTERACTIVE) @@ -430,7 +437,11 @@ } /* Close the volume */ - return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + // NOTE: Returning the value of fs_close looks suspicious. + // return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + res = fs_close(FixErrors); + DPRINT1("fs_close returning %d\n", ret); + return STATUS_SUCCESS; } /* EOF */

8 years, 12 months

[hbelusca] 70433: [VFATLIB] - Gather common code in one file instead of duplicating it everywhere. - Implement full format for FAT12 and FAT16 (using the same function Fat1216WipeSectors), based on...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 00:57:51 2015 New Revision: 70433 URL: http://svn.reactos.org/svn/reactos?rev=70433&view=rev Log: [VFATLIB] - Gather common code in one file instead of duplicating it everywhere. - Implement full format for FAT12 and FAT16 (using the same function Fat1216WipeSectors), based on similar code for FAT32 implemented by Eric Kohl in revision 63693. Added: trunk/reactos/lib/fslib/vfatlib/common.c (with props) trunk/reactos/lib/fslib/vfatlib/common.h (with props) Modified: trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/CMakeLis… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -7,6 +7,7 @@ check/file.c check/io.c check/lfn.c + common.c fat12.c fat16.c fat32.c Added: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c (added) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -0,0 +1,136 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VFAT filesystem library + * FILE: lib\fslib\vfatlib\common.c + * PURPOSE: Common code for Fat support + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Eric Kohl + */ + +/* INCLUDES *******************************************************************/ + +#include "vfatlib.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +ULONG +GetShiftCount(IN ULONG Value) +{ + ULONG i = 1; + + while (Value > 0) + { + i++; + Value /= 2; + } + + return i - 2; +} + +ULONG +CalcVolumeSerialNumber(VOID) +{ + LARGE_INTEGER SystemTime; + TIME_FIELDS TimeFields; + ULONG Serial; + PUCHAR Buffer; + + NtQuerySystemTime(&SystemTime); + RtlTimeToTimeFields(&SystemTime, &TimeFields); + + Buffer = (PUCHAR)&Serial; + Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); + Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); + Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); + Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); + + return Serial; +} + +/***** Wipe function for FAT12 and FAT16 formats, adapted from FAT32 code *****/ +NTSTATUS +Fat1216WipeSectors( + IN HANDLE FileHandle, + IN PFAT16_BOOT_SECTOR BootSector, + IN OUT PFORMAT_CONTEXT Context) +{ + IO_STATUS_BLOCK IoStatusBlock; + PUCHAR Buffer; + LARGE_INTEGER FileOffset; + ULONGLONG Sector; + ULONG SectorsHuge; + ULONG Length; + NTSTATUS Status; + + /* Allocate buffer for the cluster */ + Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + BootSector->SectorsPerCluster * BootSector->BytesPerSector); + if (Buffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Sector = 0; + Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; + + SectorsHuge = (BootSector->SectorsHuge != 0 ? BootSector->SectorsHuge : BootSector->Sectors); + + while (Sector + BootSector->SectorsPerCluster < SectorsHuge) + { + FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + Length, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); + + Sector += BootSector->SectorsPerCluster; + } + + if (Sector + BootSector->SectorsPerCluster > SectorsHuge) + { + DPRINT("Remaining sectors %lu\n", SectorsHuge - Sector); + + FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + Length = (SectorsHuge - Sector) * BootSector->BytesPerSector; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + Length, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, SectorsHuge - Sector); + } + +done: + /* Free the buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/lib/fslib/vfatlib/common.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/fslib/vfatlib/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.h… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.h (added) +++ trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VFAT filesystem library + * FILE: lib\fslib\vfatlib\common.h + * PURPOSE: Common code for Fat support + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Eric Kohl + */ + +#ifndef _VFATCOMMON_H_ +#define _VFATCOMMON_H_ + +ULONG GetShiftCount(IN ULONG Value); +ULONG CalcVolumeSerialNumber(VOID); + +NTSTATUS +Fat1216WipeSectors( + IN HANDLE FileHandle, + IN PFAT16_BOOT_SECTOR BootSector, + IN OUT PFORMAT_CONTEXT Context); + +#endif /* _VFATCOMMON_H_ */ + +/* EOF */ Propchange: trunk/reactos/lib/fslib/vfatlib/common.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -5,49 +5,17 @@ * PURPOSE: Fat12 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime(&SystemTime); - RtlTimeToTimeFields(&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat12WriteBootSector(IN HANDLE FileHandle, @@ -323,7 +291,7 @@ BootSector.Heads = DiskGeometry->TracksPerCylinder; BootSector.HiddenSectors = PartitionInfo->HiddenSectors; BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -357,6 +325,20 @@ Context->TotalSectorCount = 1 + (BootSector.FATSectors * 2) + RootDirSectors; + if (!QuickFormat) + { + Context->TotalSectorCount += SectorCount; + + Status = Fat1216WipeSectors(FileHandle, + &BootSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("Fat12WipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat12WriteBootSector(FileHandle, &BootSector, Context); @@ -396,10 +378,5 @@ DPRINT("Fat12WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -5,49 +5,17 @@ * PURPOSE: Fat16 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat16WriteBootSector(IN HANDLE FileHandle, @@ -330,7 +298,7 @@ BootSector.Heads = DiskGeometry->TracksPerCylinder; BootSector.HiddenSectors = PartitionInfo->HiddenSectors; BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0; - BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00; + BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) @@ -365,6 +333,20 @@ Context->TotalSectorCount = 1 + (BootSector.FATSectors * 2) + RootDirSectors; + if (!QuickFormat) + { + Context->TotalSectorCount += SectorCount; + + Status = Fat1216WipeSectors(FileHandle, + &BootSector, + Context); + if (!NT_SUCCESS(Status)) + { + DPRINT("Fat16WipeSectors() failed with status 0x%.08x\n", Status); + return Status; + } + } + Status = Fat16WriteBootSector(FileHandle, &BootSector, Context); @@ -404,10 +386,5 @@ DPRINT("Fat16WriteRootDirectory() failed with status 0x%.08x\n", Status); } - if (!QuickFormat) - { - /* FIXME: Fill remaining sectors */ - } - return Status; } Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -5,49 +5,17 @@ * PURPOSE: Fat32 support * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Eric Kohl - * REVISIONS: - * EK 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> -static ULONG -GetShiftCount(IN ULONG Value) -{ - ULONG i = 1; - - while (Value > 0) - { - i++; - Value /= 2; - } - - return i - 2; -} - - -static ULONG -CalcVolumeSerialNumber(VOID) -{ - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - ULONG Serial; - PUCHAR Buffer; - - NtQuerySystemTime (&SystemTime); - RtlTimeToTimeFields (&SystemTime, &TimeFields); - - Buffer = (PUCHAR)&Serial; - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); - - return Serial; -} - + +/* FUNCTIONS ******************************************************************/ static NTSTATUS Fat32WriteBootSector(IN HANDLE FileHandle, @@ -490,7 +458,7 @@ BootSector.BootBackup = 6; BootSector.Drive = (DiskGeometry->MediaType == FixedMedia) ? 0x80 : 0x00; BootSector.ExtBootSignature = 0x29; - BootSector.VolumeID = CalcVolumeSerialNumber (); + BootSector.VolumeID = CalcVolumeSerialNumber(); if ((Label == NULL) || (Label->Buffer == NULL)) { memcpy(&BootSector.VolumeLabel[0], "NO NAME ", 11); Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -4,13 +4,17 @@ * FILE: lib\fslib\vfatlib\vfatlib.c * PURPOSE: Main API * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 05/04-2003 Created */ + +/* INCLUDES *******************************************************************/ + #include "vfatlib.h" #define NDEBUG #include <debug.h> + + +/* GLOBALS & FUNCTIONS ********************************************************/ PFMIFSCALLBACK ChkdskCallback = NULL; PVOID FsCheckMemQueue; @@ -282,7 +286,7 @@ if (Callback != NULL) { Context.Success = (BOOLEAN)(NT_SUCCESS(Status)); - Callback (DONE, 0, (PVOID)&Context.Success); + Callback(DONE, 0, (PVOID)&Context.Success); } DPRINT("VfatFormat() done. Status 0x%.08x\n", Status); @@ -307,7 +311,7 @@ Context->Percent = NewPercent; if (Context->Callback != NULL) { - Context->Callback (PROGRESS, 0, &Context->Percent); + Context->Callback(PROGRESS, 0, &Context->Percent); } } } Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Sun Dec 27 00:57:51 2015 @@ -57,7 +57,6 @@ unsigned long Signature1; // 508 } FAT16_BOOT_SECTOR, *PFAT16_BOOT_SECTOR; - typedef struct _FAT32_BOOT_SECTOR { unsigned char magic0; // 0 @@ -114,6 +113,8 @@ ULONG Percent; } FORMAT_CONTEXT, *PFORMAT_CONTEXT; +#include "common.h" + NTSTATUS Fat12Format(HANDLE FileHandle,

8 years, 12 months

[hbelusca] 70432: [BOOTSECTORS] - fat.asm: remove trailing whitespace. - fat32.asm: backport the fixes from fat32.S introduced a long time ago. - fat32.S/faty.S: use .space 12, 0 instead of the lon...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 26 21:28:01 2015 New Revision: 70432 URL: http://svn.reactos.org/svn/reactos?rev=70432&view=rev Log: [BOOTSECTORS] - fat.asm: remove trailing whitespace. - fat32.asm: backport the fixes from fat32.S introduced a long time ago. - fat32.S/faty.S: use .space 12, 0 instead of the long .byte array (generates the same code, but is better readable). - isoboot/btrt: whitespace fix only. Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/fat32.asm trunk/reactos/boot/freeldr/bootsect/faty.S trunk/reactos/boot/freeldr/bootsect/isoboot.asm trunk/reactos/boot/freeldr/bootsect/isobtrt.asm Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.asm [iso-8859-1] Sat Dec 26 21:28:01 2015 @@ -133,8 +133,8 @@ xor cx,cx mov al,[BYTE bp+NumberOfFats] ; Number of fats mul WORD [BYTE bp+SectorsPerFat] ; Times sectors per fat - add ax,WORD [BYTE bp+HiddenSectors] - adc dx,WORD [BYTE bp+HiddenSectors+2] ; Add the number of hidden sectors + add ax,WORD [BYTE bp+HiddenSectors] + adc dx,WORD [BYTE bp+HiddenSectors+2] ; Add the number of hidden sectors add ax,WORD [BYTE bp+ReservedSectors] ; Add the number of reserved sectors adc dx,cx ; Add carry bit mov WORD [BYTE bp-DataAreaStartLow],ax ; Save the starting sector of the root directory @@ -225,7 +225,7 @@ Reboot: ; mov si,msgAnyKey ; Press any key message ; call PutChars ; Display it - xor ax,ax + xor ax,ax int 16h ; Wait for a keypress int 19h ; Reboot @@ -270,7 +270,7 @@ ; DX:AX has logical sector number to read ; CX has number of sectors to read ReadSectors: - + ; We can't just check if the start sector is ; in the BIOS CHS range. We have to check if ; the start sector + length is in that range. @@ -314,8 +314,8 @@ ; jz PrintDiskError ; Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported - ; Good, we're here so the computer supports LBA disk access - ; So finish the extended read + ; Good, we're here so the computer supports LBA disk access + ; So finish the extended read mov dl,[BYTE bp+BootDrive] ; Drive number mov ah,42h ; Int 13h, AH = 42h - Extended Read int 13h ; Call BIOS @@ -333,10 +333,10 @@ add bx,byte 20h ; Increment read buffer for next sector mov es,bx pop bx - + loop ReadSectorsLBALoop ; Read next sector - ret + ret ; Reads logical sectors into [ES:BX] @@ -351,7 +351,7 @@ xchg ax,dx xor dx,dx div WORD [BYTE bp+SectorsPerTrack] - xchg ax,cx + xchg ax,cx div WORD [BYTE bp+SectorsPerTrack] ; Divide logical by SectorsPerTrack inc dx ; Sectors numbering starts at 1 not 0 xchg cx,dx @@ -385,7 +385,7 @@ ; Increment read buffer for next sector loop ReadSectorsCHSLoop ; Read next sector - ret + ret msgDiskError db 'Disk error',0dh,0ah,0 Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sat Dec 26 21:28:01 2015 @@ -62,9 +62,9 @@ BackupBootSector: .word 6 Reserved1: - .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - + .space 12, 0 // End FAT32 Inserted Info + BootDrive: .byte 0 Reserved: @@ -355,8 +355,8 @@ jmp PrintFileNotFound FindFile: - mov ax, es // We didn't find it in the previous dir entry - add ax, 2 // So lets move to the next one + mov ax, es // We didn't find it in the previous dir entry + add ax, 2 // So lets move to the next one mov es, ax // And search again xor di, di mov si, offset filename Modified: trunk/reactos/boot/freeldr/bootsect/fat32.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.asm [iso-8859-1] Sat Dec 26 21:28:01 2015 @@ -108,7 +108,7 @@ ; First we have to load our extra boot code at ; sector 14 into memory at [0000:7e00h] mov eax,0eh - add eax,DWORD [BYTE bp+HiddenSectors] ; Add the number of hidden sectors + add eax,DWORD [BYTE bp+HiddenSectors] ; Add the number of hidden sectors mov cx,1 xor bx,bx mov es,bx ; Read sector to [0000:7e00h] @@ -122,6 +122,7 @@ ; EAX has logical sector number to read ; CX has number of sectors to read ReadSectors: + push es cmp eax,DWORD [BiosCHSDriveSize] ; Check if they are reading a sector outside CHS range jae ReadSectorsLBA ; Yes - go to the LBA routine ; If at all possible we want to use LBA routines because @@ -181,6 +182,7 @@ sub cx,[LBASectorsRead] jnz ReadSectorsLBA ; Read next sector + pop es ret LBASectorsRead: @@ -227,7 +229,7 @@ loop ReadSectorsCHSLoop ; Read next sector - ret + ret @@ -249,7 +251,7 @@ Reboot: mov si,msgAnyKey ; Press any key message call PutChars ; Display it - xor ax,ax + xor ax,ax int 16h ; Wait for a keypress int 19h ; Reboot @@ -279,7 +281,7 @@ BootSignature: dw 0aa55h ; BootSector signature - + ; End of bootsector ; @@ -326,7 +328,7 @@ add ax,2 ; So lets move to the next one mov es,ax ; And search again xor di,di - mov si,filename + mov si,filename mov cx,11 rep cmpsb ; Compare filenames jz FoundFile ; If same we found it @@ -340,7 +342,6 @@ jmp StartSearch FoundFile: - ; Display "Loading FreeLoader..." message mov si,msgLoading ; Loading message call PutChars ; Display it @@ -437,21 +438,21 @@ LoadFatSector: push ecx + + mov bx, 9000h ; We will load it to [9000:0000h] + mov es, bx + ; EAX holds logical FAT sector number ; Check if we have already loaded it cmp eax,DWORD [FatSectorInCache] je LoadFatSectorAlreadyLoaded mov DWORD [FatSectorInCache],eax - mov bx,9000h - mov es,bx - xor bx,bx ; We will load it to [9000:0000h] + xor bx,bx mov cx,1 call ReadSectors LoadFatSectorAlreadyLoaded: - mov bx,9000h - mov es,bx pop ecx mov eax,DWORD [es:ecx] ; Get FAT entry and eax,0fffffffh ; Mask off reserved bits Modified: trunk/reactos/boot/freeldr/bootsect/faty.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/faty… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/faty.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/faty.S [iso-8859-1] Sat Dec 26 21:28:01 2015 @@ -112,7 +112,7 @@ BackupBootSector: .word 6 Reserved1: - .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + .space 12, 0 #endif // FAT32 BootDrive: Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Sat Dec 26 21:28:01 2015 @@ -14,7 +14,7 @@ ; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, ; USA; either version 2 of the License, or (at your option) any later ; version; incorporated herein by reference. -; +; ; **************************************************************************** ; ; THIS FILE IS A MODIFIED VERSION OF ISOLINUX.ASM @@ -158,7 +158,7 @@ mov byte [TimeoutCount], 5 .next_second: mov eax, [BIOS_timer] ; load current tick counter - add eax, 19 ; + add eax, 19 ; .poll_again: call pollchar_and_empty Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Sat Dec 26 21:28:01 2015 @@ -14,7 +14,7 @@ ; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, ; USA; either version 2 of the License, or (at your option) any later ; version; incorporated herein by reference. -; +; ; **************************************************************************** ; ; THIS FILE IS A MODIFIED VERSION OF ISOLINUX.ASM

8 years, 12 months

[hbelusca] 70431: [BOOTSECTORS]: Sync the .asm files with their .S counterparts (make easier for diff'ing).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 26 20:43:50 2015 New Revision: 70431 URL: http://svn.reactos.org/svn/reactos?rev=70431&view=rev Log: [BOOTSECTORS]: Sync the .asm files with their .S counterparts (make easier for diff'ing). Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat.asm trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/fat32.asm trunk/reactos/boot/freeldr/bootsect/isoboot.asm trunk/reactos/boot/freeldr/bootsect/isobtrt.asm Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sat Dec 26 20:43:50 2015 @@ -29,7 +29,7 @@ // of the PutChars function in the boot sector. // // When it locates freeldr.sys on the disk it will -// load the first sector of the file to 0000:8000 +// load the first sector of the file to 0000:F800 // With the help of this sector we should be able // to load the entire file off the disk, no matter // how fragmented it is. Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.asm [iso-8859-1] Sat Dec 26 20:43:50 2015 @@ -29,7 +29,7 @@ ; of the PutChars function in the boot sector. ; ; When it locates freeldr.sys on the disk it will -; load the first sector of the file to 0000:8000 +; load the first sector of the file to 0000:F800 ; With the help of this sector we should be able ; to load the entire file off the disk, no matter ; how fragmented it is. @@ -187,12 +187,12 @@ FoundFreeLoader: ; We found freeldr.sys on the disk ; so we need to load the first 512 - ; bytes of it to 0000:8000 + ; bytes of it to 0000:F800 ; ES:DI has dir entry (ES:DI == 07E0:XXXX) mov ax,WORD [es:di+1ah] ; Get start cluster push ax ; Save start cluster - push WORD 800h ; Put 800h on the stack and load it - pop es ; Into ES so that we load the cluster at 0000:8000 + push WORD 0F80h ; FREELDR_BASE / 16 ; Put load segment on the stack and load it + pop es ; Into ES so that we load the cluster at 0000:F800 call ReadCluster ; Read the cluster pop ax ; Restore start cluster of FreeLoader @@ -204,16 +204,14 @@ ; Now AX has start cluster of FreeLoader and we ; have loaded the helper code in the first 512 bytes - ; of FreeLoader to 0000:8000. Now transfer control + ; of FreeLoader to 0000:F800. Now transfer control ; to the helper code. Skip the first three bytes ; because they contain a jump instruction to skip ; over the helper code in the FreeLoader image. - ;jmp 0000:9003h - push 0 ; push segment (0x0000) - mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add bx, 0x8003 ; RVA -> VA and skip 3 bytes (jump to fathelper code) - push bx ; push offset - retf ; Transfer control to FreeLoader + ;ljmp16 0, FREELDR_BASE + 3 + db 0EAh + dw 0F803h + dw 0 @@ -225,8 +223,8 @@ call PutChars ; Display it Reboot: - mov si,msgAnyKey ; Press any key message - call PutChars ; Display it + ; mov si,msgAnyKey ; Press any key message + ; call PutChars ; Display it xor ax,ax int 16h ; Wait for a keypress int 19h ; Reboot Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sat Dec 26 20:43:50 2015 @@ -400,7 +400,7 @@ cmp eax, HEX(0ffffff8) // Check to see if this is the last cluster in the chain jae LoadFileDone // If so continue, if not then read the next one push eax - xor bx, bx // Load ROSLDR starting at 0000:8000h + xor bx, bx // Load ROSLDR starting at 0000:F800h push es call ReadCluster pop es Modified: trunk/reactos/boot/freeldr/bootsect/fat32.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.asm [iso-8859-1] Sat Dec 26 20:43:50 2015 @@ -361,14 +361,14 @@ jmp PrintFileSystemError ; If so exit with error InitializeLoadSegment: - mov bx,800h + mov bx,0F80h ; FREELDR_BASE / 16 mov es,bx LoadFile: cmp eax,0ffffff8h ; Check to see if this is the last cluster in the chain jae LoadFileDone ; If so continue, if not then read the next one push eax - xor bx,bx ; Load ROSLDR starting at 0000:8000h + xor bx,bx ; Load ROSLDR starting at 0000:F800h push es call ReadCluster pop es @@ -391,11 +391,11 @@ mov dl,[BYTE bp+BootDrive] ; Load boot drive into DL mov dh,[BootPartition] ; Load boot partition into DH - push 0 ; push segment (0x0000) - mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add eax, 0x8000 ; RVA -> VA - push ax ; push offset - retf ; Transfer control to FreeLoader + ; Transfer execution to the bootloader + ;ljmp16 0, FREELDR_BASE + db 0EAh + dw 0F800h + dw 0 ; Returns the FAT entry for a given cluster number ; On entry EAX has cluster number Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Sat Dec 26 20:43:50 2015 @@ -360,7 +360,10 @@ call crlf %endif - mov bx, 0x8000 ; bx = load address +; use high segment, as some bios can fail, when offset is too big + mov bx, 0x0F80 ; FREELDR_BASE / 16 ; es = load segment + mov es, bx + xor ebx, ebx ; bx = load offset mov si, di ; restore file pointer mov cx, 0xFFFF ; load the whole file call getfssec ; get the whole file @@ -373,13 +376,12 @@ mov dl, [DriveNo] ; dl = boot drive mov dh, 0 ; dh = boot partition - push 0 ; push segment (0x0000) - mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add eax, 0x8000 ; RVA -> VA - push ax ; push offset - retf ; Transfer control to ROSLDR - - + + ; Transfer execution to the bootloader + ;ljmp16 0, FREELDR_BASE + db 0xEA + dw 0xF800 + dw 0 ; ; searchdir: @@ -944,7 +946,7 @@ startldr_msg: db 'Starting SETUPLDR.SYS', 0 %endif -nosecsize_msg: db 'No sector size, assume 0800', CR, LF, 0 +; nosecsize_msg: db 'No sector size, assume 0800', CR, LF, 0 spec_err_msg: db 'Load spec failed, trying wing ...', CR, LF, 0 maybe_msg: db 'Found smth at drive = ', 0 alright_msg: db 'might be ok, continuing...', CR, LF, 0 Modified: trunk/reactos/boot/freeldr/bootsect/isobtrt.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Sat Dec 26 20:43:50 2015 @@ -332,7 +332,10 @@ call crlf %endif - mov bx, 0x8000 ; bx = load address +; use high segment, as some bios can fail, when offset is too big + mov bx, 0x0F80 ; FREELDR_BASE / 16 ; es = load segment + mov es, bx + xor ebx, ebx ; bx = load offset mov si, di ; restore file pointer mov cx, 0xFFFF ; load the whole file call getfssec ; get the whole file @@ -345,13 +348,12 @@ mov dl, [DriveNo] ; dl = boot drive mov dh, 0 ; dh = boot partition - push 0 ; push segment (0x0000) - mov eax, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add eax, 0x8000 ; RVA -> VA - push ax ; push offset - retf ; Transfer control to ROSLDR - - + + ; Transfer execution to the bootloader + ;ljmp16 0, FREELDR_BASE + db 0xEA + dw 0xF800 + dw 0 ; ; searchdir: @@ -892,7 +894,7 @@ isolinux_banner db CR, LF, 'Loading IsoBoot...', CR, LF, 0 -copyright_str db ' Copyright (C) 1994-2002 H. Peter Anvin', CR, LF, 0 +copyright_str db ' (C) 1994-2002 H. Peter Anvin', CR, LF, 0 presskey_msg db 'Press any key to boot from CD', 0 dot_msg db '.',0 @@ -910,7 +912,7 @@ startldr_msg: db 'Starting SETUPLDR.SYS', 0 %endif -nosecsize_msg: db 'Failed to get sector size, assuming 0800', CR, LF, 0 +; nosecsize_msg: db 'Failed to get sector size, assuming 0800', CR, LF, 0 spec_err_msg: db 'Loading spec packet failed, trying to wing it...', CR, LF, 0 maybe_msg: db 'Found something at drive = ', 0 alright_msg: db 'Looks like it might be right, continuing...', CR, LF, 0

8 years, 12 months

[tkreuzer] 70430: [CRT] Fix x86 asm implementation of strlen / wcslen.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 26 20:34:15 2015 New Revision: 70430 URL: http://svn.reactos.org/svn/reactos?rev=70430&view=rev Log: [CRT] Fix x86 asm implementation of strlen / wcslen. Modified: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc Modified: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] Sat Dec 26 20:34:15 2015 @@ -7,23 +7,34 @@ FUNC _tcslen FPO 0, 1, 1, 1, 0, FRAME_FPO + + /* Save edi and eflags (according to the x86 ABI, we don't need to do that + but since the native function doesn't change the direction flag, we don't + either */ push edi - mov edi, [esp + 8] + pushfd + + /* Load the string pointer into edi */ + mov edi, [esp + 12] + + /* Set eax to 0, since we want to compare with 0 */ xor eax, eax - test edi, edi - jz _tcslen_end + /* Set ecx to -1 (i.e. 0xFFFFFFFF) */ mov ecx, -1 + + /* Clear direction flag */ cld + /* Now compare the characters until a 0 is found */ repne _tscas + /* Calculate the count (eax = -ecx - 1) */ not ecx - dec ecx + lea eax, [ecx-1] - mov eax, ecx - -_tcslen_end: + /* Restore eflags/edi and return the result */ + popfd pop edi ret ENDFUNC

8 years, 12 months

[tkreuzer] 70429: [CRT_APITEST] Add another test for strlen, that tests, whether the direction flag in ELFAGS has been modified. While clearing it is legitimate to do according to the ABI, the nati...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 26 20:32:31 2015 New Revision: 70429 URL: http://svn.reactos.org/svn/reactos?rev=70429&view=rev Log: [CRT_APITEST] Add another test for strlen, that tests, whether the direction flag in ELFAGS has been modified. While clearing it is legitimate to do according to the ABI, the native implementation does not change it, so we don't want to do it either. Modified: trunk/rostests/apitests/crt/strlen.c Modified: trunk/rostests/apitests/crt/strlen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strlen.c?rev… ============================================================================== --- trunk/rostests/apitests/crt/strlen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/strlen.c [iso-8859-1] Sat Dec 26 20:32:31 2015 @@ -23,12 +23,18 @@ } #endif +#define EFLAGS_DF 0x400L + typedef size_t (*PFN_STRLEN)(const char *); void Test_strlen(PFN_STRLEN pstrlen) { size_t len; +#if defined(_M_IX86) || defined(_M_AMD64) + volatile uintptr_t eflags; + char *teststr = "a\0bcdefghijk"; +#endif /* basic parameter tests */ StartSeh() @@ -37,6 +43,21 @@ (void)len; ok_int((int)pstrlen("test"), 4); + +#if defined(_M_IX86) || defined(_M_AMD64) + eflags = __readeflags(); + __writeeflags(eflags | EFLAGS_DF); + len = pstrlen(teststr + 4); + eflags = __readeflags(); + ok((eflags & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); + + /* Only test this for the exported versions, intrinsics might do it + differently. It's up to us to not do fishy stuff! */ + if (pstrlen == strlen) + { + ok(len == 8, "Should not have gone backwards (got len %i)", (int)len); + } +#endif } START_TEST(strlen)

8 years, 12 months

[hbelusca] 70428: [FATxxx BOOTSECTORS]: Whitespace changes mainly (makes easier for diffing). No code changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 26 20:13:27 2015 New Revision: 70428 URL: http://svn.reactos.org/svn/reactos?rev=70428&view=rev Log: [FATxxx BOOTSECTORS]: Whitespace changes mainly (makes easier for diffing). No code changes. Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat.asm trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/fat32.asm trunk/reactos/boot/freeldr/bootsect/faty.S [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… Modified: trunk/reactos/boot/freeldr/bootsect/fat32.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… Modified: trunk/reactos/boot/freeldr/bootsect/faty.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/faty…

8 years, 12 months

← Newer
1
2
3
4
5
6
7
8
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015