Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 31642: - Added ACP, OEMCP and MACCP keys to registry - Added ERROR_ADDING_CODEPAGE to all languages - Update Russian translation
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 17:51:42 2008 New Revision: 31642 URL: http://svn.reactos.org/svn/reactos?rev=31642&view=rev Log: - Added ACP, OEMCP and MACCP keys to registry - Added ERROR_ADDING_CODEPAGE to all languages - Update Russian translation Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c 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/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h (original) +++ trunk/reactos/base/setup/usetup/errorcode.h Mon Jan 7 17:51:42 2008 @@ -62,6 +62,7 @@ ERROR_CREATE_INSTALL_DIR, ERROR_FIND_SETUPDATA, ERROR_WRITE_PTABLE, + ERROR_ADDING_CODEPAGE, ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Jan 7 17:51:42 2008 @@ -3093,6 +3093,14 @@ return QUIT_PAGE; } + /* Add codepage information to registry */ + CONSOLE_SetStatusText(" Adding codepage information to registry..."); + if (!AddCodePage()) + { + MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + /* Update the mounted devices list */ SetMountedDeviceValues(PartitionList); 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 (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Mon Jan 7 17:51:42 2008 @@ -1458,6 +1458,11 @@ "ENTER = Computer neustarten" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } 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 (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Mon Jan 7 17:51:42 2008 @@ -1275,7 +1275,7 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Mon Jan 7 17:51:42 2008 @@ -1464,6 +1464,11 @@ "ENTER = Redemarrer l'ordinateur" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Mon Jan 7 17:51:42 2008 @@ -1458,6 +1458,11 @@ "INVIO = Riavviare il computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Mon Jan 7 17:51:42 2008 @@ -1460,6 +1460,11 @@ "ENTER = Restart komputera" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Jan 7 17:51:42 2008 @@ -6,37 +6,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Language Selection.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Please choose the language used for the installation process.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âûáîð ÿçûêà", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Ïîæàëóéñòà âûáåðèòå ÿçûê èñïîëüçóåìûé ïðè óñòàíîâêå.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "\x07 Ýòîò ÿçûê áóäåò óñòàíîâëåí ïî óìîë÷àíèþ â óñòàíîâëåííîé ñèñòåìå.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -52,55 +52,55 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "®¡à® ¯®¦ «®¢ âì ¢ ãáâ ®¢ªã ReactOS", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Äîáðî ïîæàëîâàòü â óñòàíîâêó ReactOS", TEXT_HIGHLIGHT }, { 6, 11, - " íâ®© áâ ¤¨¨ ãáâ ®¢ª¨ ¡ã¤ãâ áª®¯¨à®¢ ë ä ©«ë ®¯¥à æ¨®®© á¨áâ¥¬ë ReactOS", + "Íà ýòîé ñòàäèè óñòàíîâêè áóäóò ñêîïèðîâàíû ôàéëû îïåðàöèîííîé ñèñòåìû ReactOS", TEXT_NORMAL }, { 6, 12, - " ¢ è ª®¬¯ìîâ¥à ¨ ¯®¤£®â®¢«¥ ¢â®à ï áâ ¤¨ï ãáâ ®¢ª¨.", + "íà âàø êîìïüþòåð è ïîäãîòîâëåíà âòîðàÿ ñòàäèÿ óñòàíîâêè.", TEXT_NORMAL }, { 8, 15, - "\x07 ¦¬¨â¥ ¤«ï ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï ¢®áâ ®¢«¥¨ï ReactOS.", + "\x07 Íàæìèòå R äëÿ âîñòàíîâëåíèÿ ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ L ¤«ï ¯à®á¬®âà «¨æ¥§¨®®£® á®£« è¥¨ï ReactOS", + "\x07 Íàæìèòå L äëÿ ïðîñìîòðà ëèöåíçèîííîãî ñîãëàøåíèÿ ReactOS", TEXT_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 6, 23, - "«ï ¤®¯®«¨â¥«ì®© ¨ä®à¬ æ¨¨ ® ReactOS ¯®á¥â¨â¥:", + "Äëÿ äîïîëíèòåëüíîé èíôîðìàöèè î ReactOS ïîñåòèòå:", TEXT_NORMAL }, { @@ -112,7 +112,7 @@ { 0, 0, - " = à®¤®«¦¥¨¥ R = ®áâ ®¢«¥¨¥ F3 = ëå®¤", + " ENTER = Ïðîäîëæåíèå R = Âîñòàíîâëåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -128,85 +128,85 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS íàõîäèòñÿ â ðàííåé ñòàäèè ðàçðàáîòêè è íå ïîääåðæèâàåò âñå", TEXT_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© á®¢¬¥áâ¨¬®áâ¨ á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "ôóíêöèè äëÿ ïîëíîé ñîâìåñòèìîñòè ñ óòàíàâëèâàåìûìè ïðèëîæåíèÿìè.", TEXT_NORMAL }, { 6, 12, - "¬¥îâáï á«¥¤ãîé¨¥ ®£à ¨ç¥¨ï:", + "Èìåþòñÿ ñëåäóþùèå îãðàíè÷åíèÿ:", TEXT_NORMAL }, { 8, 13, - "- áâ ®¢ª ¢®§¬®¦ â®«ìª® ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- Óñòàíîâêà âîçìîæíà òîëüêî íà ïåðâè÷íûé ðàçäåë äèñêà", TEXT_NORMAL }, { 8, 14, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- Ïðè óñòàíîâêå íåëüçÿ óäàëèòü ïåðâè÷íûé ðàçäåë äèñêà", TEXT_NORMAL }, { 8, 15, - " ¯®ª ¨¬¥¥âáï à áè¨à¥ë© à §¤¥«.", + " ïîêà èìååòñÿ ðàñøèðåííûé ðàçäåë.", TEXT_NORMAL }, { 8, 16, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢ë© à áè¨à¥ë© à §¤¥« á ¤¨áª ", + "- Ïðè óñòàíîâêå íåëüçÿ óäàëèòü ïåðâûé ðàñøèðåííûé ðàçäåë ñ äèñêà", TEXT_NORMAL }, { 8, 17, - " ¯®ª áãé¥áâ¢ãîâ ¤àã£¨¥ à áè¨à¥ë¥ à §¤¥«ë.", + " ïîêà ñóùåñòâóþò äðóãèå ðàñøèðåííûå ðàçäåëû.", TEXT_NORMAL }, { 8, 18, - "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", + "- Ïðè óñòàíîâêå ïîääåðæèâàåòñÿ òîëüêî ôàéëîâàÿ ñèñòåìà FAT.", TEXT_NORMAL }, { 8, 19, - "- à®¢¥àª ä ©«®¢®© á¨áâ¥¬ë ¥ ®áãé¥áâ¢«ï¥âáï.", + "- Ïðîâåðêà ôàéëîâîé ñèñòåìû íå îñóùåñòâëÿåòñÿ.", TEXT_NORMAL }, { 8, 23, - "\x07 ¦¬¨â¥ ¢¢®¤ ¤«ï ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨ ReactOS.", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ F3 = ëå®¤", + "\x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -222,79 +222,79 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 6, - "¨æ¥§¨ï:", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 6, + "Ëèöåíçèÿ:", TEXT_HIGHLIGHT }, { 8, 8, - "ReactOS «¨æ¥§¨à®¢ ¢ á®®â¢¥âáâ¢¨¨ á âªàëâë¬ «¨æ¥§¨®ë¬", + "ReactOS ëèöåíçèðîâàíà â ñîîòâåòñòâèè ñ Îòêðûòûì ëèöåíçèîííûì", TEXT_NORMAL }, { 8, 9, - "á®£« è¥¨¥¬ GNU GPL ¨ á®¤¥à¦¨â ª®¬¯®¥âë à á¯à®áâà ï¥¬ë¥", - TEXT_NORMAL - }, - { - 8, - 10, - "á á®¢¬¥áâ¨¬ë¬¨ «¨æ¥§¨ï¬¨: X11, BSD ¨ GNU LGPL.", + "ñîãëàøåíèåì GNU GPL è ñîäåðæèò êîìïîíåíòû ðàñïðîñòðàíÿåìûå", + TEXT_NORMAL + }, + { + 8, + 10, + "ñ ñîâìåñòèìûìè ëèöåíçèÿìè: X11, BSD è GNU LGPL.", TEXT_NORMAL }, { 8, 11, - "á¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¢å®¤ïé¥¥ ¢ á¨áâ¥¬ã ReactOS ¢ë¯ãé¥®", + "Âñå ïðîãðàììíîå îáåñïå÷åíèå âõîäÿùåå â ñèñòåìó ReactOS âûïóùåíî", TEXT_NORMAL }, { 8, 12, - "¯®¤ âªàëâë¬ «¨æ¥§¨®ë¬ á®£« è¥¨¥¬ GNU GPL á á®åà ¥¨¥¬", + "ïîä Îòêðûòûì ëèöåíçèîííûì ñîãëàøåíèåì GNU GPL ñ ñîõðàíåíèåì", TEXT_NORMAL }, { 8, 13, - "¯¥à¢® ç «ì®© «¨æ¥§¨¨.", + "ïåðâîíà÷àëüíîé ëèöåíçèè.", TEXT_NORMAL }, { 8, 15, - " ®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¯®áâ ¢«ï¥âáï ¨ ¡¥§ ®£à ¨ç¥¨©", + "Äàííîå ïðîãðàììíîå îáåñïå÷åíèå ïîñòàâëÿåòñÿ ÁÅÇ ÃÀÐÀÍÒÈÈ è áåç îãðàíè÷åíèé", TEXT_NORMAL }, { 8, 16, - "¢ ¨á¯®«ì§®¢ ¨¨, ª ª ¢ ¬¥áâ®¬, â ª ¨ ¬¥¦¤ã à®¤®¬ ¯à ¢¥.", + "â èñïîëüçîâàíèè, êàê â ìåñòíîì, òàê è ìåæäóíàðîäíîì ïðàâå.", TEXT_NORMAL }, { 8, 17, - "¨æ¥§¨ï ReactOS à §à¥è ¥â ¯¥à¥¤ çã ¯à®¤ãªâ âà¥âì¨¬ «¨æ ¬.", + "Ëèöåíçèÿ ReactOS ðàçðåøàåò ïåðåäà÷ó ïðîäóêòà òðåòüèì ëèöàì.", TEXT_NORMAL }, { 8, 18, - "á«¨ ¯® ª ª®¬-«¨¡® ¯à¨ç¨ ¬ ¢ë ¥ ¯®«ãç¨«¨ ª®¯¨î âªàëâ®£®", + "Åñëè ïî êàêîì-ëèáî ïðè÷èíàì âû íå ïîëó÷èëè êîïèþ Îòêðûòîãî", TEXT_NORMAL }, { 8, 19, - "«¨æ¥§¨®®£® á®£« è¥¨ï GNU ¢¬¥áâ¥ á ReactOS, ¯®á¥â¨â¥", + "ëèöåíçèîííîãî ñîãëàøåíèÿ GNU âìåñòå ñ ReactOS, ïîñåòèòå", TEXT_NORMAL }, { @@ -306,31 +306,31 @@ { 8, 22, - " à â¨¨:", + "Ãàðàíòèè:", TEXT_HIGHLIGHT }, { 8, 24, - "â® á¢®¡®¤®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥; á¬. ¨áâ®ç¨ª ¤«ï ¯à®á¬®âà ¯à ¢.", + "Ýòî ñâîáîäíîå ïðîãðàììíîå îáåñïå÷åíèå; ñì. èñòî÷íèê äëÿ ïðîñìîòðà ïðàâ.", TEXT_NORMAL }, { 8, 25, - " ; ¥â £ à â¨¨ ¨«¨", + "ÍÅÒ ÍÈÊÀÊÈÕ ÃÀÐÀÍÒÈÉ; íåò ãàðàíòèè ÒÎÂÀÐÍÎÃÎ ÑÎÑÒÎßÍÈß èëè", TEXT_NORMAL }, { 8, 26, - " ", - TEXT_NORMAL - }, - { - 0, - 0, - " = ®§¢à â", + "ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ÊÎÍÊÐÅÒÍÛÕ ÖÅËÅÉ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Âîçâðàò", TEXT_STATUS }, { @@ -346,84 +346,84 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - " á¯¨áª¥ ¨¦¥ ¯à¨¢¥¤¥ë ãáâà®©áâ¢ ¨ ¨å ¯ à ¬¥âàë.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Â ñïèñêå íèæå ïðèâåäåíû óñòðîéñòâà è èõ ïàðàìåòðû.", TEXT_NORMAL }, { 8, 11, - " ®¬¯ìîâ¥à:", + " Êîìïüþòåð:", TEXT_NORMAL }, { 8, 12, - " ªà :", + " Ýêðàí:", TEXT_NORMAL, }, { 8, 13, - " « ¢¨ âãà :", + " Êëàâèàòóðà:", TEXT_NORMAL }, { 8, 14, - " áª« ¤ª ª« ¢¨ âãàë:", + "Ðàñêëàäêà êëàâèàòóðû:", TEXT_NORMAL }, { 8, 16, - " à¨¬¥¨âì:", + " Ïðèìåíèòü:", TEXT_NORMAL }, { 25, - 16, "à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢", + 16, "Ïðèìåíèòü äàííûå ïàðàìåòðû óñòðîéñòâ", TEXT_NORMAL }, { 6, 19, - "ë ¬®¦¥â¥ ¨§¬¥¨âì ¯ à ¬¥âàë ãáâà®©áâ¢ ¦¨¬ ï ª« ¢¨è¨ ¨ ", + "Âû ìîæåòå èçìåíèòü ïàðàìåòðû óñòðîéñòâ íàæèìàÿ êëàâèøè ÂÂÅÐÕ è ÂÍÈÇ", TEXT_NORMAL }, { 6, 20, - "¤«ï ¢ë¤¥«¥¨ï í«¥¬¥â ¨ ª« ¢¨èã ¤«ï ¢ë¡®à ¤àã£¨å ¢ à¨ â®¢", + "äëÿ âûäåëåíèÿ ýëåìåíòà è êëàâèøó ENTER äëÿ âûáîðà äðóãèõ âàðèàíòîâ", TEXT_NORMAL }, { 6, 21, - "¯ à ¬¥âà®¢.", + "ïàðàìåòðîâ.", TEXT_NORMAL }, { 6, 23, - "®£¤ ¢á¥ ¯ à ¬¥âàë ®¯à¥¤¥«¥ë, ¢ë¡¥à¨â¥ \"à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢\"", + "Êîãäà âñå ïàðàìåòðû îïðåäåëåíû, âûáåðèòå \"Ïðèìåíèòü äàííûå ïàðàìåòðû óñòðîéñòâ\"", TEXT_NORMAL }, { 6, 24, - "¨ ¦¬¨â¥ .", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ F3 = ëå®¤", + "è íàæìèòå ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -439,55 +439,55 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS íàõîäèòñÿ â ðàííåé ñòàäèè ðàçðàáîòêè è íå ïîääåðæèâàåò âñå", TEXT_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© á®¢¬¥áâ¨¬®áâ¨ á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "ôóíêöèè äëÿ ïîëíîé ñîâìåñòèìîñòè ñ óòàíàâëèâàåìûìè ïðèëîæåíèÿìè.", TEXT_NORMAL }, { 6, 12, - "ãªæ¨ï ¢®áâ ®¢«¥¨ï ¢ ¤ ë¬ ¬®¬¥â ®âáãâáâ¢ã¥â.", + "Ôóíêöèÿ âîñòàíîâëåíèÿ â äàííûì ìîìåíò îòñóòñòâóåò.", TEXT_NORMAL }, { 8, 15, - "\x07 ¦¬¨â¥ U ¤«ï ®¡®¢«¥¨ï .", + "\x07 Íàæìèòå U äëÿ îáíîâëåíèÿ ÎÑ.", TEXT_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï § ¯ãáª ª®á®«¨ ¢®áâ ®¢«¥¨ï.", + "\x07 Íàæìèòå R äëÿ çàïóñêà êîíñîëè âîñòàíîâëåíèÿ.", TEXT_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ ESC ¤«ï ¢®§¢à â £« ¢ãî áâà ¨æã.", + "\x07 Íàæìèòå ESC äëÿ âîçâðàòà íà ãëàâíóþ ñòðàíèöó.", TEXT_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = « ¢ ï áâà ¨æ = ¥à¥§ £àã§ª ", + "\x07 Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Ãëàâíàÿ ñòðàíèöà ENTER = Ïåðåçàãðóçêà", TEXT_STATUS }, { @@ -502,43 +502,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© â¨¯ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 ¦¬¨â¥ ª« ¢¨èã ¨«¨ ¤«ï ¢ë¡®à ¯à¥¤¯®çâ¨â¥«ì®£® â¨¯ ª®¬¯ìîâ¥à .", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû õîòèòå èçìåíèòü óñòàíàâëèâàåìûé òèï êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå êëàâèøó ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ïðåäïî÷òèòåëüíîãî òèïà êîìïüþòåðà.", TEXT_NORMAL }, { 8, 11, - " â¥¬ ¦¬¨â¥ .", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 ¦¬¨â¥ ª« ¢¨èã ESC ¤«ï ¢®§¢à â ª ¯à¥¤ë¤ãé¥© áâà ¨æ¥ ¡¥§ ¨§¬¥¥¨ï", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " â¨¯ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ ESC = â¬¥ F3 = ëå®¤", + " òèïà êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -554,31 +554,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "¨áâ¥¬ ¯à®¢¥àï¥â ¢á¥ «¨ ¤ ë¥ § ¯¨á ë ¤¨áª", - TEXT_NORMAL - }, - { - 10, - 8, - "â® ¬®¦¥â § ïâì ¬¨ãâã", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Ñèñòåìà ïðîâåðÿåò âñå ëè äàííûå çàïèñàíû íà äèñê", + TEXT_NORMAL + }, + { + 10, + 8, + "Ýòî ìîæåò çàíÿòü ìèíóòó", TEXT_NORMAL }, { 10, 9, - "®á«¥ § ¢¥àè¥¨ï ª®¬¯ìîâ¥à ¡ã¤¥â ¢â®¬ â¨ç¥áª¨ ¯¥à¥§ £àã¦¥", - TEXT_NORMAL - }, - { - 0, - 0, - " ç¨áâª ª¥è ", + "Ïîñëå çàâåðøåíèÿ êîìïüþòåð áóäåò àâòîìàòè÷åñêè ïåðåçàãðóæåí", + TEXT_NORMAL + }, + { + 0, + 0, + " Î÷èñòêà êåøà", TEXT_STATUS }, { @@ -594,37 +594,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "ReactOS ãáâ ®¢«¥ ¥ ¯®«®áâìî", - TEXT_NORMAL - }, - { - 10, - 8, - "§¢«¥ª¨â¥ £¨¡ª¨© ¤¨áª ¨§ ¤¨áª®¢®¤ A: ¨", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "ReactOS óñòàíîâëåí íå ïîëíîñòüþ", + TEXT_NORMAL + }, + { + 10, + 8, + "Èçâëåêèòå ãèáêèé äèñê èç äèñêîâîäà A: è", TEXT_NORMAL }, { 10, 9, - "¢á¥ CD-ROM ¨§ CD-¤¨áª®¢®¤®¢.", + "âñå CD-ROM èç CD-äèñêîâîäîâ.", TEXT_NORMAL }, { 10, 11, - " ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " ®¦ «ã©áâ ¯®¤®¦¤¨â¥ ...", + "Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîæàëóéñòà ïîäîæäèòå ...", TEXT_STATUS, }, { @@ -640,42 +640,42 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© â¨¯ íªà .", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû õîòèòå èçìåíèòü óñòàíàâëèâàåìûé òèï ýêðàíà.", TEXT_NORMAL }, { 8, 10, - "\x07 ¦¬¨â¥ ª« ¢¨è¨ ¨«¨ ¤«ï ¢ë¡®à â¨¯ íªà .", + "\x07 Íàæìèòå êëàâèøè ÂÂÎÐÕ èëè ÂÍÈÇ äëÿ âûáîðà òèïà ýêðàíà.", TEXT_NORMAL }, { 8, 11, - " â¥¬ ¦¬¨â¥ .", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 ¦¬¨â¥ ª« ¢¨èã ESC ¤«ï ¢®§¢à â ª ¯à¥¤ë¤ãé¥© áâà ¨æ¥ ¡¥§ ¨§¬¥¥¨ï", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " â¨¯ íªà .", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ ESC = â¬¥ F3 = ëå®¤", + " òèïà ýêðàíà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -691,37 +691,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "á®¢ë¥ ª®¬¯®¥âë ReactOS ¡ë«¨ ãá¯¥è® ãáâ ®¢«¥ë.", - TEXT_NORMAL - }, - { - 10, - 8, - "§¢«¥ª¨â¥ £¨¡ª¨© ¤¨áª ¨§ ¤¨áª®¢®¤ A: ¨", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Îñíîâíûå êîìïîíåíòû ReactOS áûëè óñïåøíî óñòàíîâëåíû.", + TEXT_NORMAL + }, + { + 10, + 8, + "Èçâëåêèòå ãèáêèé äèñê èç äèñêîâîäà A: è", TEXT_NORMAL }, { 10, 9, - "¢á¥ CD-ROM ¨§ CD-¤¨áª®¢®¤®¢.", + "âñå CD-ROM èç CD-äèñêîâîäîâ.", TEXT_NORMAL }, { 10, 11, - " ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " = ¥à¥§ £àã§¨âì ª®¬¯ìîâ¥à", + "Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïåðåçàãðóçèòü êîìïüþòåð", TEXT_STATUS }, { @@ -737,37 +737,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ãáâ ®¢¨âì § £àã§ç¨ª ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïðîãðàììà óñòàíîâêè íå ñìîãëà óñòàíîâèòü çàãðóç÷èê íà", TEXT_NORMAL }, { 6, 9, - "¦¥áâª¨© ¤¨áª ¢ è¥£® ª®¬¯ìîâ¥à .", + "æåñòêèé äèñê âàøåãî êîìïüþòåðà.", TEXT_NORMAL }, { 6, 13, - "®¦ «ã©áâ ¢áâ ¢â¥ ®âä®à¬ â¨à®¢ ë© £¨¡ª¨© ¤¨áª ¢ ¤¨áª®¢®¤ A: ¨", + "Ïîæàëóéñòà âñòàâòå îòôîðìàòèðîâàííûé ãèáêèé äèñê â äèñêîâîä A: è", TEXT_NORMAL }, { 6, 14, - " ¦¬¨â¥ .", + "íàæìèòå ENTER.", TEXT_NORMAL, }, { 0, 0, - " = à®¤®«¦¥¨¥ F3 = ëå®¤", + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -784,49 +784,49 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "The list below shows existing partitions and unused disk", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Â ñïèñêå íèæå ïîêàçàíû ñóùåñòâóþùèå ðàçäåëû è íåèñïîëüçóåìîå ïðîñòðàíñòâî", TEXT_NORMAL }, { 6, 9, - "space for new partitions.", + "äëÿ íîâîãî ðàçäåëà.", TEXT_NORMAL }, { 8, 11, - "\x07 Press UP or DOWN to select a list entry.", + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ýëåìåíòà.", TEXT_NORMAL }, { 8, 13, - "\x07 Press ENTER to install ReactOS onto the selected partition.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS íà âûäåëåííûé ðàçäåë.", TEXT_NORMAL }, { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 Íàæìèòå C äëÿ ñîçäàíèÿ íîâîãî ðàçäåëà.", TEXT_NORMAL }, { 8, 17, - "\x07 Press D to delete an existing partition.", - TEXT_NORMAL - }, - { - 0, - 0, - " Please wait...", + "\x07 Íàæìèòå D äëÿ óäàëåíèÿ ñóùåñòâóþùåãî ðàçäåëà.", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîæàëóéñòà ïîäîæäèòå...", TEXT_STATUS }, { @@ -842,25 +842,25 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Format partition", - TEXT_NORMAL - }, - { - 6, - 10, - "Setup will now format the partition. Press ENTER to continue.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ôîðìàòèðîâàíèå ðàçäåëà", + TEXT_NORMAL + }, + { + 6, + 10, + "Äëÿ óñòàíîâêè ðàçäåë áóäåò îòôîðìàòèðîâàí. Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -876,43 +876,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup installs ReactOS files onto the selected partition. Choose a", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Óñòàíîâêà ôàéëîâ ReactOS íà âûáðàííûé ðàçäåë. Âûáåðèòå äèðåêòîðèþ", TEXT_NORMAL }, { 6, 9, - "directory where you want ReactOS to be installed:", + "â êîòîðóþ áóäåò óñòàíîâëåíà ñèñòåìà:", TEXT_NORMAL }, { 6, 14, - "To change the suggested directory, press BACKSPACE to delete", + "×òîáû èçìåíèòü âûáðàííóþ äèðåêòîðèþ íàæìèòå BACKSPACE è óäàëèòå ñèìâîëû,", TEXT_NORMAL }, { 6, 15, - "characters and then type the directory where you want ReactOS to", + "à çà òåì íàáåðèòå íîâîå èìÿ äèðåêòîðèè äëÿ óñòàíîâêè ReactOS", TEXT_NORMAL }, { 6, 16, - "be installed.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -928,31 +928,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { 11, 12, - "Please wait while ReactOS Setup copies files to your ReactOS", + "Ïîæàëóéñòà ïîäîæäèòå ïîêà ïðîãðàììà óñòàíîâêè ñêîïèðóåò ôàéëû ReactOS", TEXT_NORMAL }, { 30, 13, - "installation folder.", + "â óñòàíîâî÷íóþ äèðåêòîðèþ.", TEXT_NORMAL }, { 20, 14, - "This may take several minutes to complete.", - TEXT_NORMAL - }, - { - 0, - 0, - " \xB3 Please wait... ", + "Ýòî ìîæåò çàíÿòü íåñêîëüêî ìèíóò.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Ïîæàëóéñòà ïîäîæäèòå... ", TEXT_STATUS }, { @@ -968,37 +968,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup is installing the boot loader", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Óñòàíîâêà çàãðóç÷èêà ReactOS", TEXT_NORMAL }, { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Óñòàíîâêà íà æåñòêèé äèñê (MBR).", TEXT_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "Óñòàíîâêà íà ãèáêèé äèñê.", TEXT_NORMAL }, { 8, 14, - "Skip install bootloader.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "Íå óñòàíàâëèâàòü çàãðóç÷èê.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -1014,43 +1014,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of keyboard to be installed.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard type.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Èçìåíåíèå òèïà êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà íóæíîãî òèïà êëàâèàòóðû.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " the keyboard type.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " òèïà êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1066,43 +1066,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You want to change the keyboard layout to be installed.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âûáîð óñòàíàâëèâàåìîé ðàñêëàäêè êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà íóæíîé ðàñêëàäêè", TEXT_NORMAL }, { 8, 11, - " layout. Then press ENTER.", + " êëàâèàòóðû. Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç", TEXT_NORMAL }, { 8, 14, - " the keyboard layout.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " èçìåíåíèÿ ðàñêëàäêè êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1119,19 +1119,19 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup prepares your computer for copying the ReactOS files. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Building the file copy list...", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïîäãîòîâêà âàøåãî êîìïüþòåðà ê êîïèðîâàíèþ ôàéëîâ ReactOS. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîäãîòîâêà ñïèñêà êîïèðóåìûõ ôàéëîâ...", TEXT_STATUS }, { @@ -1148,37 +1148,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { 6, 17, - "Select a file system from the list below.", + "Âûáåðèòå ôàéëîâóþ ñèñòåìó èç ñïèñêà íèæå.", 0 }, { 8, 19, - "\x07 Press UP or DOWN to select a file system.", + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ôàéëîâîé ñèñòåìû.", 0 }, { 8, 21, - "\x07 Press ENTER to format the partition.", + "\x07 Íàæìèòå ENTER äëÿ ôîðìàòèðîâàíèÿ ðàçäåëà.", 0 }, { 8, 23, - "\x07 Press ESC to select another partition.", - 0 - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + "\x07 Íàæìèòå ESC äëÿ âûáîðà äðóãîãî ðàçäåëà.", + 0 + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, @@ -1195,37 +1195,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You have chosen to delete the partition", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû âûáðàëè óäàëåíèå ðàçäåëà.", TEXT_NORMAL }, { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 Íàæìèòå D äëÿ óäàëåíèÿ ðàçäåëà.", TEXT_NORMAL }, { 11, 19, - "WARNING: All data on this partition will be lost!", + "ÂÍÈÌÀÍÈÅ: Âñå äàííûå ñ ýòîãî ðàçäåëà áóäóò ïîòåðÿíû!", TEXT_NORMAL }, { 8, 21, - "\x07 Press ESC to cancel.", - TEXT_NORMAL - }, - { - 0, - 0, - " D = Delete Partition ESC = Cancel F3 = Quit", + "\x07 Íàæìèòå ESC äëÿ îòìåíû.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Óäàëèòü ðàçäåë ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1241,19 +1241,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup is updating the system configuration. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Creating registry hives...", + "Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïðîãðàììà óñòàíîâêè îáíîâëÿåò êîíôèãóðàöèþ ñèñòåìû. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Ñîçäàíèå êóñòîâ ñèñòåìíîãî ðååñòðà...", TEXT_STATUS }, { @@ -1269,68 +1269,68 @@ { { //ERROR_NOT_INSTALLED - "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "ReactOS íå áûë ïîëíîñòüþ óñòàíîâëåí íà âàø\n" + "êîìïüþòåð. Åñëè âû âûéäèòå èç óñòàíîâêè ñåé÷àñ,\n" + "òî âàì íóæíî çàïóñòèòü ïðîãðàììó óñòàíîâêè ñíîâà,\n" + "åñëè âû õîòèòå óñòàíîâèòü ReactOS\n" + " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ óñòàíîâêè.\n" + " \x07 Íàæìèòå F3 âûõîäà èç óñòàíîâêè.", + "F3 = Âûõîä ENTER = Ïðîäîëæèòü" }, { //ERROR_NO_HDD - "Setup could not find a harddisk.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü íàéòè æåñòêèé äèñê.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_NO_SOURCE_DRIVE - "Setup could not find its source drive.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü íàéòè óñòàíîâî÷íûé äèñê.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_TXTSETUPSIF - "Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ôàéë TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_COMPUTER, - "Setup failed to load the computer type list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê òèïîâ êîìïüþòåðà.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_DISPLAY, - "Setup failed to load the display settings list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê ðåæèìîâ ýêðàíà.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_KEYBOARD, - "Setup failed to load the keyboard type list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê òèïîâ êëàâèàòóðû.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_KBLAYOUT, - "Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê ðàñêëàäîê êëàâèàòóðû.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_WARN_PARTITION, @@ -1339,123 +1339,129 @@ "\n" "Creating or deleting partitions can destroy the partiton table.\n" "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + " \x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè." + " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", + "F3 = Âûõîä ENTER = Ïðîäîëæèòü" }, { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" - " * Press any key to continue.", + " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", NULL }, { //ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" - " * Press any key to continue.", + " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", NULL }, { //ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_NO_FLOPPY, - "No disk in drive A:.", - "ENTER = Continue" + "Íåò äèñêà â äèñêîâîäå A:.", + "ENTER = Ïðîäîëæèòü" }, { //ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_INITIALIZE_REGISTRY, "Setup failed to set the initialize the registry.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CABINET_MISSING, - "Cabinet not found.\n", - "ENTER = Reboot computer" + "Cabinet íå íàéäåí.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", - "ENTER = Reboot computer" + "Cabinet íå ñìîã íàéòè óñòàíîâî÷íûé ñêðèïò.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CREATE_DIR, + "Íå óäàëîñü ñîçäàòü óñòàíîâî÷íûå äèðåêòîðèè.", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_TXTSETUP_SECTION, + "Íå óäàëîñü íàéòè ñåêöèþ 'Directories'\n" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CABINET_SECTION, + "Íå óäàëîñü íàéòè ñåêöèþ 'Directories'\n" + "â cabinet.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Íå óäàëîñü ñîçäàòü äèðåêòîðèþ äëÿ óñòàíîâêè.", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_FIND_SETUPDATA, + "Íå óäàëîñü íàéòè ñåêöèþ 'SetupData'\n" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_WRITE_PTABLE, + "Íå óäàëîñü çàïèñàòü òàáëèöó ðàçäåëîâ.\n" + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, - "Setup could not create install directories.", - "ENTER = Reboot computer" - }, - { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_CREATE_INSTALL_DIR - "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" - "ENTER = Reboot computer" - }, - { NULL, NULL } }; + MUI_PAGE ruRUPages[] = { @@ -1464,8 +1470,8 @@ ruRULanguagePageEntries }, { - START_PAGE, - ruRUWelcomePageEntries + START_PAGE, + ruRUWelcomePageEntries }, { INSTALL_INTRO_PAGE, 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 (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Mon Jan 7 17:51:42 2008 @@ -28,6 +28,9 @@ #include "errorcode.h" #include "mui.h" +#define NDEBUG +#include <debug.h> + #include "lang/en-US.h" #include "lang/de-DE.h" #include "lang/el-GR.h" @@ -308,4 +311,99 @@ WaitEvent); } +static BOOLEAN +AddCodepageToRegistry(PWCHAR ACPage, PWCHAR OEMCPage, PWCHAR MACCPage) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + + // Open the nls codepage key + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + // Set ANSI codepage + RtlInitUnicodeString(&ValueName, L"ACP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)ACPage, + 4 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + // Set OEM codepage + RtlInitUnicodeString(&ValueName, L"OEMCP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)OEMCPage, + 3 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + // Set MAC codepage + RtlInitUnicodeString(&ValueName, L"MACCP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)MACCPage, + 5 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + + return TRUE; +} + +BOOLEAN +AddCodePage(VOID) +{ + ULONG lngIndex = 0; + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + return AddCodepageToRegistry(LanguageList[lngIndex].ACPage, + LanguageList[lngIndex].OEMCPage, + LanguageList[lngIndex].MACCPage); + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + return FALSE; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Mon Jan 7 17:51:42 2008 @@ -53,5 +53,8 @@ VOID MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout); +BOOLEAN +AddCodePage(VOID); + #endif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Mon Jan 7 17:51:42 2008 @@ -821,7 +821,7 @@ 0, REG_SZ, (PVOID)(LanguageId + 4), - 8); + 8 * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -837,7 +837,7 @@ 0, REG_SZ, (PVOID)(LanguageId + 4), - 8); + 8 * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);

1 0

[fireball] 31641: - WIDL Wine vs. ReactOS differences.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 17:23:35 2008 New Revision: 31641 URL: http://svn.reactos.org/svn/reactos?rev=31641&view=rev Log: - WIDL Wine vs. ReactOS differences. Added: trunk/reactos/tools/widl_20080105/widl_ros.diff (with props) Added: trunk/reactos/tools/widl_20080105/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_20080105/widl_r… ============================================================================== --- trunk/reactos/tools/widl_20080105/widl_ros.diff (added) +++ trunk/reactos/tools/widl_20080105/widl_ros.diff Mon Jan 7 17:23:35 2008 @@ -1,0 +1,59 @@ +--- hash.c Fri Sep 29 17:48:44 2006 ++++ hash.c Sat Jan 05 21:25:37 2008 +@@ -533,17 +533,24 @@ + case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: + case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: + case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: + case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: + case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: ++#ifndef __REACTOS__ + case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE: + case LANG_TAJIK: case LANG_ROMANSH: case LANG_IRISH: + case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: + case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: + case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: + case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: + case LANG_BRETON: ++#else ++ case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: ++ case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: ++ case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: ++ case LANG_BRETON: ++#endif + nOffset = 16; + pnLookup = Lookup_16; + break; + case LANG_CZECH: case LANG_HUNGARIAN: case LANG_POLISH: + case LANG_SLOVAK: case LANG_SPANISH: +--- server.c Sat Jan 05 20:48:36 2008 ++++ server.c Sat Jan 05 22:44:57 2008 +@@ -388,10 +388,11 @@ + error("Could not open %s for output\n", server_name); + + print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); + print_server("#include <string.h>\n"); + fprintf(server, "\n"); ++ print_server("#define _SEH_NO_NATIVE_NLG\n"); + print_server("#include \"%s\"\n", header_name); + fprintf(server, "\n"); + } + + +--- widl.c Sat Jan 05 20:48:36 2008 ++++ widl.c Sat Jan 05 23:44:29 2008 +@@ -547,10 +547,15 @@ + return 1; + } + } + + if(do_header) { ++ if (strrchr(header_name, '\\')) ++ header_token = make_token(strrchr(header_name, '\\') + 1); ++ else if (strrchr(header_name, '/')) ++ header_token = make_token(strrchr(header_name, '/') + 1); ++ else + header_token = make_token(header_name); + + if(!(header = fopen(header_name, "w"))) { + fprintf(stderr, "Could not open %s for output\n", header_name); + return 1; Propchange: trunk/reactos/tools/widl_20080105/widl_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 31640: - Change incorrect rpcrt4's synchronous operation back to asynchronous (which was in Wine back in 0.9.5). - Update corresponding patch file, increasing context to 5 lines for better merging.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 17:16:27 2008 New Revision: 31640 URL: http://svn.reactos.org/svn/reactos?rev=31640&view=rev Log: - Change incorrect rpcrt4's synchronous operation back to asynchronous (which was in Wine back in 0.9.5). - Update corresponding patch file, increasing context to 5 lines for better merging. Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_t… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c Mon Jan 7 17:16:27 2008 @@ -90,7 +90,7 @@ { RpcConnection common; HANDLE pipe; - OVERLAPPED ovl; + OVERLAPPED ovl[2]; BOOL listening; } RpcConnection_np; @@ -112,11 +112,11 @@ return RPC_S_OK; npc->listening = TRUE; - if (ConnectNamedPipe(npc->pipe, &npc->ovl)) + if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) return RPC_S_OK; if (GetLastError() == ERROR_PIPE_CONNECTED) { - SetEvent(npc->ovl.hEvent); + SetEvent(npc->ovl[0].hEvent); return RPC_S_OK; } if (GetLastError() == ERROR_IO_PENDING) { @@ -146,7 +146,8 @@ } memset(&npc->ovl, 0, sizeof(npc->ovl)); - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ @@ -209,7 +210,9 @@ /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->pipe = pipe; return RPC_S_OK; @@ -315,7 +318,8 @@ * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; - new_npc->ovl = old_npc->ovl; + new_npc->ovl[0] = old_npc->ovl[0]; + new_npc->ovl[1] = old_npc->ovl[1]; old_npc->pipe = 0; memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); old_npc->listening = FALSE; @@ -366,9 +370,14 @@ while (bytes_left) { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); - if (!ret || !bytes_read) + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); + if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); + if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) + break; + bytes_left -= bytes_read; buf += bytes_read; } @@ -386,9 +395,14 @@ while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); - if (!ret || !bytes_written) + ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); + if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); + if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) + break; + bytes_left -= bytes_written; buf += bytes_written; } @@ -403,10 +417,15 @@ CloseHandle(npc->pipe); npc->pipe = 0; } - if (npc->ovl.hEvent) { - CloseHandle(npc->ovl.hEvent); - npc->ovl.hEvent = 0; - } + if (npc->ovl[0].hEvent) { + CloseHandle(npc->ovl[0].hEvent); + npc->ovl[0].hEvent = 0; + } + if (npc->ovl[1].hEvent) { + CloseHandle(npc->ovl[1].hEvent); + npc->ovl[1].hEvent = 0; + } + return 0; } @@ -554,7 +573,7 @@ conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); - if (conn->ovl.hEvent) + if (conn->ovl[0].hEvent) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -575,7 +594,7 @@ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if ((objs[*count] = conn->ovl.hEvent)) + if ((objs[*count] = conn->ovl[0].hEvent)) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -622,7 +641,7 @@ EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if (b_handle == conn->ovl.hEvent) break; + if (b_handle == conn->ovl[0].hEvent) break; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } cconn = NULL; Modified: trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpcrt… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff Mon Jan 7 17:16:27 2008 @@ -1,6 +1,8 @@ --- H:\Working Copies\wine\dlls\rpcrt4\rpc_transport.c Sun Jan 06 19:27:38 2008 -+++ H:\Working Copies\ReactOS\trunk\reactos\dll\win32\rpcrt4\rpc_transport.c Sun Jan 06 19:28:07 2008 -@@ -56,6 +56,9 @@ ++++ H:\Working Copies\ReactOS\trunk\reactos\dll\win32\rpcrt4\rpc_transport.c Mon Jan 07 16:02:15 2008 +@@ -54,10 +54,13 @@ + #endif + #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif @@ -10,7 +12,11 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -@@ -73,6 +76,8 @@ + #include "winerror.h" + #include "winternl.h" +@@ -71,10 +74,12 @@ + #include "rpc_binding.h" + #include "rpc_message.h" #include "rpc_server.h" #include "epm_towers.h" @@ -19,7 +25,42 @@ #ifndef SOL_TCP # define SOL_TCP IPPROTO_TCP #endif -@@ -128,7 +133,7 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); +@@ -83,11 +88,11 @@ + + typedef struct _RpcConnection_np + { + RpcConnection common; + HANDLE pipe; +- OVERLAPPED ovl; ++ OVERLAPPED ovl[2]; + BOOL listening; + } RpcConnection_np; + + static RpcConnection *rpcrt4_conn_np_alloc(void) + { +@@ -105,15 +110,15 @@ + { + if (npc->listening) + return RPC_S_OK; + + npc->listening = TRUE; +- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) ++ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) + return RPC_S_OK; + + if (GetLastError() == ERROR_PIPE_CONNECTED) { +- SetEvent(npc->ovl.hEvent); ++ SetEvent(npc->ovl[0].hEvent); + return RPC_S_OK; + } + if (GetLastError() == ERROR_IO_PENDING) { + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; +@@ -126,11 +131,11 @@ + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) + { RpcConnection_np *npc = (RpcConnection_np *) Connection; TRACE("listening on %s\n", pname); @@ -28,7 +69,158 @@ PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); -@@ -715,12 +720,14 @@ + if (npc->pipe == INVALID_HANDLE_VALUE) { + WARN("CreateNamedPipe failed with error %d\n", GetLastError()); +@@ -139,11 +144,12 @@ + else + return RPC_S_CANT_CREATE_ENDPOINT; + } + + memset(&npc->ovl, 0, sizeof(npc->ovl)); +- npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* Note: we don't call ConnectNamedPipe here because it must be done in the + * server thread as the thread must be alertable */ + return RPC_S_OK; + } +@@ -202,11 +208,13 @@ + /* success */ + memset(&npc->ovl, 0, sizeof(npc->ovl)); + /* pipe is connected; change to message-read mode. */ + dwMode = PIPE_READMODE_MESSAGE; + SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); +- npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ + npc->pipe = pipe; + + return RPC_S_OK; + } + +@@ -308,11 +316,12 @@ + { + /* because of the way named pipes work, we'll transfer the connected pipe + * to the child, then reopen the server binding to continue listening */ + + new_npc->pipe = old_npc->pipe; +- new_npc->ovl = old_npc->ovl; ++ new_npc->ovl[0] = old_npc->ovl[0]; ++ new_npc->ovl[1] = old_npc->ovl[1]; + old_npc->pipe = 0; + memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); + old_npc->listening = FALSE; + } + +@@ -359,13 +368,18 @@ + unsigned int bytes_left = count; + + while (bytes_left) + { + DWORD bytes_read; +- ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); +- if (!ret || !bytes_read) ++ ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); ++ if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) + break; ++ ++ ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); ++ if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) ++ break; ++ + bytes_left -= bytes_read; + buf += bytes_read; + } + return ret ? count : -1; + } +@@ -379,13 +393,18 @@ + unsigned int bytes_left = count; + + while (bytes_left) + { + DWORD bytes_written; +- ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); +- if (!ret || !bytes_written) ++ ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); ++ if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) + break; ++ ++ ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); ++ if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) ++ break; ++ + bytes_left -= bytes_written; + buf += bytes_written; + } + return ret ? count : -1; + } +@@ -396,14 +415,19 @@ + if (npc->pipe) { + FlushFileBuffers(npc->pipe); + CloseHandle(npc->pipe); + npc->pipe = 0; + } +- if (npc->ovl.hEvent) { +- CloseHandle(npc->ovl.hEvent); +- npc->ovl.hEvent = 0; ++ if (npc->ovl[0].hEvent) { ++ CloseHandle(npc->ovl[0].hEvent); ++ npc->ovl[0].hEvent = 0; ++ } ++ if (npc->ovl[1].hEvent) { ++ CloseHandle(npc->ovl[1].hEvent); ++ npc->ovl[1].hEvent = 0; + } ++ + return 0; + } + + static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) + { +@@ -547,11 +571,11 @@ + /* open and count connections */ + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { + rpcrt4_conn_listen_pipe(conn); +- if (conn->ovl.hEvent) ++ if (conn->ovl[0].hEvent) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + + /* make array of connections */ +@@ -568,11 +592,11 @@ + + objs[0] = npps->mgr_event; + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { +- if ((objs[*count] = conn->ovl.hEvent)) ++ if ((objs[*count] = conn->ovl[0].hEvent)) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + LeaveCriticalSection(&protseq->cs); + return objs; +@@ -615,11 +639,11 @@ + b_handle = objs[res - WAIT_OBJECT_0]; + /* find which connection got a RPC */ + EnterCriticalSection(&protseq->cs); + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { +- if (b_handle == conn->ovl.hEvent) break; ++ if (b_handle == conn->ovl[0].hEvent) break; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + cconn = NULL; + if (conn) + RPCRT4_SpawnConnection(&cconn, &conn->common); +@@ -713,16 +737,18 @@ + RpcConnection_tcp *tcpc; + tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); if (tcpc == NULL) return NULL; tcpc->sock = -1; @@ -43,7 +235,11 @@ return &tcpc->common; } -@@ -785,8 +792,7 @@ + static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) + { +@@ -783,12 +809,11 @@ + continue; + } /* RPC depends on having minimal latency so disable the Nagle algorithm */ val = 1; @@ -53,7 +249,11 @@ tcpc->sock = sock; -@@ -808,6 +814,7 @@ + freeaddrinfo(ai); + TRACE("connected\n"); +@@ -806,10 +831,11 @@ + int sock; + int ret; struct addrinfo *ai; struct addrinfo *ai_cur; struct addrinfo hints; @@ -61,7 +261,11 @@ RpcConnection *first_connection = NULL; TRACE("(%p, %s)\n", protseq, endpoint); -@@ -859,7 +866,7 @@ + + hints.ai_flags = AI_PASSIVE /* for non-localhost addresses */; +@@ -857,11 +883,11 @@ + ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); + if (ret < 0) { WARN("bind failed: %s\n", strerror(errno)); close(sock); @@ -70,7 +274,11 @@ status = RPC_S_DUPLICATE_ENDPOINT; else status = RPC_S_CANT_CREATE_ENDPOINT; -@@ -888,7 +895,8 @@ + continue; + } +@@ -886,11 +912,12 @@ + } + /* need a non-blocking socket, otherwise accept() has a potential * race-condition (poll() says it is readable, connection drops, * and accept() blocks until the next connection comes...) */ @@ -80,7 +288,11 @@ if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); -@@ -931,6 +939,7 @@ + RPCRT4_DestroyConnection(&tcpc->common); + status = RPC_S_OUT_OF_RESOURCES; +@@ -929,10 +956,11 @@ + static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) + { int ret; struct sockaddr_in address; socklen_t addrsize; @@ -88,7 +300,11 @@ RpcConnection_tcp *server = (RpcConnection_tcp*) old_conn; RpcConnection_tcp *client = (RpcConnection_tcp*) new_conn; -@@ -942,7 +951,8 @@ + addrsize = sizeof(address); + ret = accept(server->sock, (struct sockaddr*) &address, &addrsize); +@@ -940,11 +968,12 @@ + { + ERR("Failed to accept a TCP connection: error %d\n", ret); return RPC_S_OUT_OF_RESOURCES; } /* reset to blocking behaviour */ @@ -98,7 +314,11 @@ client->sock = ret; TRACE("Accepted a new TCP connection\n"); return RPC_S_OK; -@@ -1189,10 +1199,12 @@ + } + +@@ -1187,14 +1216,16 @@ + { + RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); if (ps) { int fds[2]; @@ -113,3 +333,5 @@ ps->mgr_event_rcv = fds[0]; ps->mgr_event_snd = fds[1]; } + else + {

1 0

[hpoussin] 31639: Use kernel facilities to change debug level at runtime
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Mon Jan 7 15:57:32 2008 New Revision: 31639 URL: http://svn.reactos.org/svn/reactos?rev=31639&view=rev Log: Use kernel facilities to change debug level at runtime Modified: trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/readmouse.c trunk/reactos/drivers/serial/serenum/detect.c trunk/reactos/drivers/serial/serial/create.c trunk/reactos/drivers/serial/serial/rw.c Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c (original) +++ trunk/reactos/drivers/input/sermouse/detect.c Mon Jan 7 15:57:32 2008 @@ -141,14 +141,14 @@ if (!NT_SUCCESS(Status)) return mtNone; /* Reset UART */ - CHECKPOINT; + TRACE_(SERMOUSE, "Reset UART\n"); Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Mcr, sizeof(Mcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set communications parameters */ - CHECKPOINT; + TRACE_(SERMOUSE, "Set communications parameters\n"); /* DLAB off */ Fcr = 0; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, @@ -168,7 +168,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Flush receive buffer */ - CHECKPOINT; + TRACE_(SERMOUSE, "Flush receive buffer\n"); Command = SERIAL_PURGE_RXCLEAR; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Command, sizeof(Command), NULL, NULL); @@ -177,7 +177,7 @@ Wait(100); /* Enable DTR/RTS */ - CHECKPOINT; + TRACE_(SERMOUSE, "Enable DTR/RTS\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -186,7 +186,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Set timeout to 500 microseconds */ - CHECKPOINT; + TRACE_(SERMOUSE, "Set timeout to 500 microseconds\n"); Timeouts.ReadIntervalTimeout = 100; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 500; @@ -196,7 +196,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Fill the read buffer */ - CHECKPOINT; + TRACE_(SERMOUSE, "Fill the read buffer\n"); Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count); if (!NT_SUCCESS(Status)) goto ByeBye; Modified: trunk/reactos/drivers/input/sermouse/readmouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/rea… ============================================================================== --- trunk/reactos/drivers/input/sermouse/readmouse.c (original) +++ trunk/reactos/drivers/input/sermouse/readmouse.c Mon Jan 7 15:57:32 2008 @@ -149,8 +149,8 @@ &ioStatus); if (!Irp) { - /* no memory actually, try later */ - CHECKPOINT; + /* No memory actually, try later */ + INFO_(SERMOUSE, "No memory actually, trying again\n"); KeStallExecutionProcessor(10); continue; } Modified: trunk/reactos/drivers/serial/serenum/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/det… ============================================================================== --- trunk/reactos/drivers/serial/serenum/detect.c (original) +++ trunk/reactos/drivers/serial/serenum/detect.c Mon Jan 7 15:57:32 2008 @@ -248,7 +248,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* 1. COM port initialization, check for device enumerate */ - CHECKPOINT; + TRACE_(SERENUM, "COM port initialization, check for device enumerate\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -263,7 +263,7 @@ if ((Msr & SERIAL_DSR_STATE) == 0) goto DisconnectIdle; /* 2. COM port setup, 1st phase */ - CHECKPOINT; + TRACE_(SERENUM, "COM port setup, 1st phase\n"); BaudRate = 1200; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, 0); @@ -287,7 +287,7 @@ Wait(200); /* 3. Wait for response, 1st phase */ - CHECKPOINT; + TRACE_(SERENUM, "Wait for response, 1st phase\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -303,7 +303,7 @@ if (Size != 0) goto CollectPnpComDeviceId; /* 4. COM port setup, 2nd phase */ - CHECKPOINT; + TRACE_(SERENUM, "COM port setup, 2nd phase\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -317,7 +317,7 @@ Wait(200); /* 5. Wait for response, 2nd phase */ - CHECKPOINT; + TRACE_(SERENUM, "Wait for response, 2nd phase\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -335,7 +335,7 @@ /* 6. Collect PnP COM device ID */ CollectPnpComDeviceId: - CHECKPOINT; + TRACE_(SERENUM, "Collect PnP COM device ID\n"); Timeouts.ReadIntervalTimeout = 200; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 2200; @@ -374,7 +374,7 @@ /* 7. Verify disconnect */ VerifyDisconnect: - CHECKPOINT; + TRACE_(SERENUM, "Verify disconnect\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -386,7 +386,7 @@ /* 8. Connect idle */ ConnectIdle: - CHECKPOINT; + TRACE_(SERENUM, "Connect idle\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -411,7 +411,7 @@ /* 9. Disconnect idle */ DisconnectIdle: - CHECKPOINT; + TRACE_(SERENUM, "Disconnect idle\n"); /* FIXME: report to OS device removal, if it was present */ Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); @@ -476,14 +476,14 @@ if (!NT_SUCCESS(Status)) return Status; /* Reset UART */ - CHECKPOINT; + TRACE_(SERENUM, "Reset UART\n"); Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Mcr, sizeof(Mcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set communications parameters */ - CHECKPOINT; + TRACE_(SERENUM, "Set communications parameters\n"); /* DLAB off */ Fcr = 0; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, @@ -503,7 +503,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Flush receive buffer */ - CHECKPOINT; + TRACE_(SERENUM, "Flush receive buffer\n"); Command = SERIAL_PURGE_RXCLEAR; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Command, sizeof(Command), NULL, NULL); @@ -512,7 +512,7 @@ Wait(100); /* Enable DTR/RTS */ - CHECKPOINT; + TRACE_(SERENUM, "Enable DTR/RTS\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -521,7 +521,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Set timeout to 500 microseconds */ - CHECKPOINT; + TRACE_(SERENUM, "Set timeout to 500 microseconds\n"); Timeouts.ReadIntervalTimeout = 100; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 500; @@ -531,7 +531,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Fill the read buffer */ - CHECKPOINT; + TRACE_(SERENUM, "Fill the read buffer\n"); Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count); if (!NT_SUCCESS(Status)) goto ByeBye; Modified: trunk/reactos/drivers/serial/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/crea… ============================================================================== --- trunk/reactos/drivers/serial/serial/create.c (original) +++ trunk/reactos/drivers/serial/serial/create.c Mon Jan 7 15:57:32 2008 @@ -24,7 +24,7 @@ if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) { - CHECKPOINT; + INFO_(SERIAL, "Not a directory\n"); Status = STATUS_NOT_A_DIRECTORY; goto ByeBye; } Modified: trunk/reactos/drivers/serial/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/rw.c… ============================================================================== --- trunk/reactos/drivers/serial/serial/rw.c (original) +++ trunk/reactos/drivers/serial/serial/rw.c Mon Jan 7 15:57:32 2008 @@ -227,8 +227,8 @@ return STATUS_PENDING; } - /* insufficient resources, we can't pend the Irp */ - CHECKPOINT; + /* Insufficient resources, we can't pend the Irp */ + INFO_(SERIAL, "Insufficient resources\n"); Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) {

1 0

[dchapyshev] 31638: - Add ANSI, OEM and MAC codepage to MUI_LANGUAGE structure
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 15:34:54 2008 New Revision: 31638 URL: http://svn.reactos.org/svn/reactos?rev=31638&view=rev Log: - Add ANSI, OEM and MAC codepage to MUI_LANGUAGE structure Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Mon Jan 7 15:34:54 2008 @@ -44,6 +44,9 @@ { L"00000409", /* The Language ID */ L"00000409", /* Default Keyboard Layout for this language */ + L"1252", /* ANSI Codepage */ + L"437", /* OEM Codepage */ + L"10000", /* MAC Codepage */ L"English", /* Language Name , not used just to make things easier when updating this file */ enUSPages, /* Translated page strings */ enUSErrorEntries /* Translated error strings */ @@ -51,6 +54,9 @@ { L"0000040C", L"0000040C", + L"1252", + L"850", + L"10000", L"French", frFRPages, frFRErrorEntries @@ -58,6 +64,9 @@ { L"00000407", L"00000407", + L"1252", + L"850", + L"10000", L"German", deDEPages, deDEErrorEntries @@ -65,6 +74,9 @@ { L"00000408", L"00000409", + L"1253", + L"737", + L"10006", L"Greek", elGRPages, elGRErrorEntries @@ -72,6 +84,9 @@ { L"00000410", L"00000410", + L"1252", + L"850", + L"10000", L"Italian", itITPages, itITErrorEntries @@ -79,6 +94,9 @@ { L"00000419", L"00000419", + L"1251", + L"866", + L"10007", L"Russian", ruRUPages, ruRUErrorEntries @@ -86,6 +104,9 @@ { L"0000040A", L"0000040A", + L"1252", + L"850", + L"10000", L"Spanish", esESPages, esESErrorEntries @@ -93,6 +114,9 @@ { L"00000415", L"00000415", + L"1250", + L"852", + L"10029", L"Polish", plPLPages, plPLErrorEntries @@ -100,6 +124,9 @@ { L"0000041D", L"0000041D", + L"1252", + L"850", + L"10000", L"Swedish", svSEPages, svSEErrorEntries @@ -107,11 +134,16 @@ { L"00000422", L"00000422", + L"1251", + L"866", + L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries }, { + NULL, + NULL, NULL, NULL, NULL Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Mon Jan 7 15:34:54 2008 @@ -25,6 +25,9 @@ { PWCHAR LanguageID; PWCHAR LanguageKeyboardLayoutID; + PWCHAR ACPage; + PWCHAR OEMCPage; + PWCHAR MACCPage; PWCHAR LanguageDescriptor; MUI_PAGE * MuiPages; MUI_ERROR * MuiErrors;

1 0

[cwittich] 31637: create obj and output dir when they don't exist
by cwittich＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: cwittich Date: Mon Jan 7 12:24:52 2008 New Revision: 31637 URL: http://svn.reactos.org/svn/reactos?rev=31637&view=rev Log: create obj and output dir when they don't exist Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Mon Jan 7 12:24:52 2008 @@ -11,6 +11,22 @@ #include "options.h" HINSTANCE hInstance; + +BOOL CreateDir(HWND hwnd, WCHAR* dir) +{ + WCHAR msgerror[256]; + + if (0 > (LONG)GetFileAttributes(dir)) + { + if (CreateDirectory(dir, NULL) == 0) + { + LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); + MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); + return FALSE; + } + } + return TRUE; +} INT WriteSettings(HWND hwnd) @@ -36,13 +52,16 @@ GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) - if (0 > (LONG)GetFileAttributes(logdir)) - if (CreateDirectory(logdir, NULL) == 0) - { - LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); - MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); - return FALSE; - } + if (!CreateDir(hwnd, logdir)) + return FALSE; + + if (objstate && (objdir[0] != 0)) + if (!CreateDir(hwnd, objdir)) + return FALSE; + + if (outstate && (outdir[0] != 0)) + if (!CreateDir(hwnd, outdir)) + return FALSE; wcscpy(checkmgw, mingwpath); if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH)

1 0

[janderwald] 31636: - alter keyboard layout when a non default language is chosen - fix typo
by janderwald＠svn.reactos.org 06 Jan '08

06 Jan '08

Author: janderwald Date: Mon Jan 7 02:36:01 2008 New Revision: 31636 URL: http://svn.reactos.org/svn/reactos?rev=31636&view=rev Log: - alter keyboard layout when a non default language is chosen - fix typo Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/settings.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Jan 7 02:36:01 2008 @@ -45,6 +45,8 @@ LONG AutoPartition = 0; WCHAR UnattendInstallationDirectory[MAX_PATH]; PWCHAR SelectedLanguageId; +WCHAR DefaultLanguage[20]; +WCHAR DefaultKBLayout[20]; BOOLEAN RepairUpdateFlag = FALSE; HANDLE hPnpThread = INVALID_HANDLE_VALUE; @@ -543,13 +545,39 @@ DPRINT("Running unattended setup\n"); } +void +UpdateKBLayout() +{ + PLIST_ENTRY Entry; + PGENERIC_LIST_ENTRY ListEntry; + WCHAR szNewLayout[20]; + + MUIDefaultKeyboardLayout(szNewLayout); + + if (LayoutList == NULL) + { + LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + } + Entry = LayoutList->ListHead.Flink; + while (Entry != &LayoutList->ListHead) + { + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + if (!wcscmp(szNewLayout, ListEntry->UserData)) + { + LayoutList->CurrentEntry = ListEntry; + break; + } + Entry = Entry->Flink; + } +} + static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) { /* Initialize the computer settings list */ if (LanguageList == NULL) { - LanguageList = CreateLanguageList(SetupInf); + LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); if (LanguageList == NULL) { PopupError("Setup failed to initialize available translations", NULL, NULL, POPUP_WAIT_NONE); @@ -572,7 +600,7 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { -#if 0 //Dinamically update user interface +#if 0 //Dynamically update user interface SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; MUIDisplayPage(LANGUAGE_PAGE); #endif @@ -596,6 +624,10 @@ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; + if (wcscmp(SelectedLanguageId, DefaultLanguage)) + { + UpdateKBLayout(); + } return INTRO_PAGE; } } @@ -713,8 +745,8 @@ ComputerList = CreateComputerTypeList(SetupInf); DisplayList = CreateDisplayDriverList(SetupInf); KeyboardList = CreateKeyboardDriverList(SetupInf); - LayoutList = CreateKeyboardLayoutList(SetupInf); - LanguageList = CreateLanguageList(SetupInf); + LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); return INSTALL_INTRO_PAGE; } @@ -937,7 +969,7 @@ /* Initialize the keyboard layout list */ if (LayoutList == NULL) { - LayoutList = CreateKeyboardLayoutList(SetupInf); + LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); if (LayoutList == NULL) { /* FIXME: report error */ Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Mon Jan 7 02:36:01 2008 @@ -182,6 +182,27 @@ } VOID +MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout) +{ + ULONG lngIndex = 0; + do + { + /* First we search the language list till we find current selected language messages */ + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + /* Get all available error messages for this language */ + wcscpy(KeyboardLayout, LanguageList[lngIndex].LanguageKeyboardLayoutID); + return; + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + + KeyboardLayout[0] = L'\0'; +} + +VOID MUIDisplayPage(ULONG page) { MUI_ENTRY * entry; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Mon Jan 7 02:36:01 2008 @@ -47,4 +47,8 @@ VOID MUIDisplayError (ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); +VOID +MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout); + + #endif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Mon Jan 7 02:36:01 2008 @@ -656,7 +656,7 @@ } PGENERIC_LIST -CreateLanguageList(HINF InfFile) +CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) { CHAR Buffer[128]; PGENERIC_LIST List; @@ -664,7 +664,6 @@ PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; - WCHAR DefaultLanguage[20]; /* Get default language id */ if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) @@ -718,7 +717,7 @@ } PGENERIC_LIST -CreateKeyboardLayoutList(HINF InfFile) +CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout) { CHAR Buffer[128]; PGENERIC_LIST List; @@ -726,7 +725,6 @@ PWCHAR KeyName; PWCHAR KeyValue; PWCHAR UserData; - WCHAR DefaultLayout[20]; /* Get default layout id */ if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) @@ -735,7 +733,7 @@ if (!INF_GetData (&Context, NULL, &KeyValue)) return NULL; - wcscpy(DefaultLayout, KeyValue); + wcscpy(DefaultKBLayout, KeyValue); List = CreateGenericList(); if (List == NULL) @@ -753,6 +751,7 @@ { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); + DestroyGenericList(List, FALSE); break; } @@ -770,7 +769,7 @@ AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(KeyName, DefaultLayout) ? FALSE : TRUE); + _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); } while (SetupFindNextLine(&Context, &Context)); Modified: trunk/reactos/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.h (original) +++ trunk/reactos/base/setup/usetup/settings.h Mon Jan 7 02:36:01 2008 @@ -46,10 +46,10 @@ CreateKeyboardDriverList(HINF InfFile); PGENERIC_LIST -CreateKeyboardLayoutList(HINF InfFile); +CreateKeyboardLayoutList(HINF InfFile, WCHAR *DefaultKBLayout); PGENERIC_LIST -CreateLanguageList(HINF InfFile); +CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage); BOOLEAN ProcessKeyboardLayoutRegistry(PGENERIC_LIST List);

1 0

[weiden] 31635: Fix handling of WM_COMMAND messages
by weiden＠svn.reactos.org 06 Jan '08

06 Jan '08

Author: weiden Date: Mon Jan 7 01:28:28 2008 New Revision: 31635 URL: http://svn.reactos.org/svn/reactos?rev=31635&view=rev Log: Fix handling of WM_COMMAND messages Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c (original) +++ trunk/reactos/dll/win32/shell32/fprop.c Mon Jan 7 01:28:28 2008 @@ -540,9 +540,13 @@ SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)str); return TRUE; } + break; + case WM_DESTROY: buf = (LPVOID)GetWindowLong(hwndDlg, DWL_USER); HeapFree(GetProcessHeap(), 0, buf); + break; + default: break; }

1 0

[cfinck] 31634: Make it possible to choose the "Paste history: No" option under FF by removing the wrong <label> tag
by cfinck＠svn.reactos.org 06 Jan '08

06 Jan '08

Author: cfinck Date: Mon Jan 7 00:47:49 2008 New Revision: 31634 URL: http://svn.reactos.org/svn/reactos?rev=31634&view=rev Log: Make it possible to choose the "Paste history: No" option under FF by removing the wrong <label> tag Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Mon Jan 7 00:47:49 2008 @@ -370,12 +370,11 @@ <tr> <td bgcolor="#EEEEEE">Paste history: </td> <td bgcolor="#EEEEEE"> - <label> <input name="optpub" type="radio" value="1" checked="checked" /> Yes (list the paste on "recent pastes" page) <input name="optpub" type="radio" value="2" /> - No</label> + No </td> </tr> <tr>

1 0

[fireball] 31633: - Add a sample, commented out line to simplify enabling debug channels in usermode applications.
by fireball＠svn.reactos.org 06 Jan '08

06 Jan '08

Author: fireball Date: Sun Jan 6 19:37:44 2008 New Revision: 31633 URL: http://svn.reactos.org/svn/reactos?rev=31633&view=rev Log: - Add a sample, commented out line to simplify enabling debug channels in usermode applications. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Jan 6 19:37:44 2008 @@ -795,4 +795,8 @@ HKLM,"SYSTEM\Setup","SetupType",0x00010001,0x00000001 HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Partition1" HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 + +; Debug channels +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" + ; EOF

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs