Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 31915: - Fix formating
by dchapyshev＠svn.reactos.org 21 Jan '08

21 Jan '08

Author: dchapyshev Date: Mon Jan 21 16:37:05 2008 New Revision: 31915 URL: http://svn.reactos.org/svn/reactos?rev=31915&view=rev Log: - Fix formating Modified: trunk/rosapps/downloader/download.c trunk/rosapps/downloader/downloader.rc trunk/rosapps/downloader/lang/de-DE.rc trunk/rosapps/downloader/lang/en-US.rc trunk/rosapps/downloader/lang/es-ES.rc trunk/rosapps/downloader/lang/fr-FR.rc trunk/rosapps/downloader/lang/id-ID.rc trunk/rosapps/downloader/lang/it-IT.rc trunk/rosapps/downloader/lang/ru-RU.rc trunk/rosapps/downloader/lang/uk-UA.rc trunk/rosapps/downloader/main.c trunk/rosapps/downloader/resources.h trunk/rosapps/downloader/rsrc.rc trunk/rosapps/downloader/structures.h trunk/rosapps/downloader/xml.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rosapps/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/download.c?rev=… Modified: trunk/rosapps/downloader/downloader.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rc?r… Modified: trunk/rosapps/downloader/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/de-DE.rc?r… Modified: trunk/rosapps/downloader/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/en-US.rc?r… Modified: trunk/rosapps/downloader/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r… Modified: trunk/rosapps/downloader/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/fr-FR.rc?r… Modified: trunk/rosapps/downloader/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/id-ID.rc?r… Modified: trunk/rosapps/downloader/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/it-IT.rc?r… Modified: trunk/rosapps/downloader/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/ru-RU.rc?r… Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=3191… Modified: trunk/rosapps/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources.h?rev… Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=319… Modified: trunk/rosapps/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/structures.h?re… Modified: trunk/rosapps/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/xml.c?rev=31915…

1 0

[cfinck] 31914: - Add a codepage 850 font imported from DragonFlyBSD / FreeBSD (original URL is http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp850-8x8.fnt) - Change the german translation to use umlauts - Pass a codepage to blue.sys now, not a language ID. According to the comments, this is the right way. TODO for the translators: Change the other codepage 850 languages to use the new available latin characters if needed.
by cfinck＠svn.reactos.org 21 Jan '08

21 Jan '08

Author: cfinck Date: Mon Jan 21 16:33:52 2008 New Revision: 31914 URL: http://svn.reactos.org/svn/reactos?rev=31914&view=rev Log: - Add a codepage 850 font imported from DragonFlyBSD / FreeBSD (original URL is http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp850-8x8.fnt) - Change the german translation to use umlauts - Pass a codepage to blue.sys now, not a language ID. According to the comments, this is the right way. TODO for the translators: Change the other codepage 850 languages to use the new available latin characters if needed. Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/setup/blue/font.c Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.c (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c Mon Jan 21 16:33:52 2008 @@ -520,13 +520,4 @@ } } -VOID -CONSOLE_SetFont( - IN ULONG LangId) -{ - // It should look up what codepage should be used - // but for now we just pass the lang id there - SetConsoleOutputCP((UINT)LangId); -} - /* EOF */ Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.h (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h Mon Jan 21 16:33:52 2008 @@ -94,10 +94,6 @@ IN LPCSTR fmt, ...); VOID -CONSOLE_SetFont( - IN ULONG LangId); - -VOID CONSOLE_SetCursorType( IN BOOL bInsert, IN BOOL bVisible); 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 21 16:33:52 2008 @@ -597,8 +597,6 @@ static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) { - DWORD LangId; - /* Initialize the computer settings list */ if (LanguageList == NULL) { @@ -657,8 +655,7 @@ } // Load the font - LangId = wcstoul(SelectedLanguageId, NULL, 16); - CONSOLE_SetFont(LangId); + SetConsoleCodePage(); return INTRO_PAGE; } 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 21 16:33:52 2008 @@ -18,19 +18,19 @@ { 8, 10, - "\x07 Bitte waehlen Sie die Sprache, die Sie waehrend des Setups verwenden wollen.", + "\x07 Bitte whlen Sie die Sprache, die Sie whrend des Setups verwenden wollen.", TEXT_NORMAL }, { 8, 11, - " Dann druecken Sie ENTER.", + " Dann drcken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Diese Sprache wird spaeter als Standardsprache im System verwendet.", + "\x07 Diese Sprache wird spter als Standardsprache im System verwendet.", TEXT_NORMAL }, { @@ -76,31 +76,31 @@ { 8, 15, - "\x07 Druecken Sie ENTER, um ReactOS zu installieren.", + "\x07 Drcken Sie ENTER, um ReactOS zu installieren.", TEXT_NORMAL }, { 8, 17, - "\x07 Druecken Sie R, um ReactOS zu reparieren.", + "\x07 Drcken Sie R, um ReactOS zu reparieren.", TEXT_NORMAL }, { 8, 19, - "\x07 Druecken Sie L, um die Lizenzabkommen von ReactOS zu lesen.", + "\x07 Drcken Sie L, um die Lizenzabkommen von ReactOS zu lesen.", TEXT_NORMAL }, { 8, 21, - "\x07 Druecken Sie F3, um das Setup zu beenden.", + "\x07 Drcken Sie F3, um das Setup zu beenden.", TEXT_NORMAL }, { 6, 23, - "Fuer weitere Informationen, besuchen Sie bitte:", + "Fr weitere Informationen, besuchen Sie bitte:", TEXT_NORMAL }, { @@ -140,31 +140,31 @@ { 6, 8, - "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", + "Das ReactOS Setup ist noch in einer frhen Entwicklungsphase. Es unter-", TEXT_NORMAL }, { 6, 9, - "stuetzt noch nicht alle Funktionen eines vollstaendig nutzbaren Setups.", + "sttzt noch nicht alle Funktionen eines vollstndig nutzbaren Setups.", TEXT_NORMAL }, { 6, 12, - "Es gibt folgende Beschraenkungen:", + "Es gibt folgende Beschrnkungen:", TEXT_NORMAL }, { 8, 13, - "- Setup kann nur eine primaere Partition auf einer HDD verwalten.", + "- Setup kann nur eine primre Partition auf einer HDD verwalten.", TEXT_NORMAL }, { 8, 14, - "- Setup kann keine primaere Partition von einer HDD loeschen", + "- Setup kann keine primre Partition von einer HDD lschen", TEXT_NORMAL }, { @@ -176,7 +176,7 @@ { 8, 16, - "- Setup kann die erste erweiterte Partition nicht von der HDD loeschen", + "- Setup kann die erste erweiterte Partition nicht von der HDD lschen", TEXT_NORMAL }, { @@ -188,25 +188,25 @@ { 8, 18, - "- Setup unterstuetzt nur FAT Dateisysteme.", + "- Setup untersttzt nur FAT Dateisysteme.", TEXT_NORMAL }, { 8, 19, - "- Dateisystemueberpruefung ist noch nicht implementiert.", + "- Dateisystemberprfung ist noch nicht implementiert.", TEXT_NORMAL }, { 8, 23, - "\x07 Druecken Sie ENTER, um ReactOS zu installieren.", + "\x07 Drcken Sie ENTER, um ReactOS zu installieren.", TEXT_NORMAL }, { 8, 25, - "\x07 Druecken Sie F3, um das Setup zu beenden.", + "\x07 Drcken Sie F3, um das Setup zu beenden.", TEXT_NORMAL }, { @@ -336,7 +336,7 @@ { 0, 0, - " ENTER = Zurueck", + " ENTER = Zurck", TEXT_STATUS }, { @@ -358,7 +358,7 @@ { 6, 8, - "Die untere Liste zeigt die derzeitigen Geraeteeinstellungen.", + "Die untere Liste zeigt die derzeitigen Gerteeinstellungen.", TEXT_NORMAL }, { @@ -393,19 +393,19 @@ }, { 25, - 16, "Diese Geraeteeinstellungen akzeptieren", + 16, "Diese Gerteeinstellungen akzeptieren", TEXT_NORMAL }, { 6, 19, - "Sie koennen die Einstellungen durch die Pfeiltasten auswaehlen.", + "Sie knnen die Einstellungen durch die Pfeiltasten auswhlen.", TEXT_NORMAL }, { 6, 20, - "Dann druecken Sie die Eingabetaste, um eine Einstellung abzuaendern.", + "Dann drcken Sie die Eingabetaste, um eine Einstellung abzundern.", TEXT_NORMAL }, { @@ -417,13 +417,13 @@ { 6, 23, - "Wenn alle Einstellungen korrekt sind, waehlen Sie \"Diese Geraete-", + "Wenn alle Einstellungen korrekt sind, whlen Sie \"Diese Gerte-", TEXT_NORMAL }, { 6, 24, - "einstellungen akzeptieren\" und druecken danach die Eingabetaste.", + "einstellungen akzeptieren\" und drcken danach die Eingabetaste.", TEXT_NORMAL }, { @@ -451,13 +451,13 @@ { 6, 8, - "Das ReactOS Setup ist noch in einer fruehen Entwicklungsphase. Es unter-", + "Das ReactOS Setup ist noch in einer frhen Entwicklungsphase. Es unter-", TEXT_NORMAL }, { 6, 9, - "stuetzt noch nicht alle Funktionen eines vollstaendig nutzbaren Setups.", + "sttzt noch nicht alle Funktionen eines vollstndig nutzbaren Setups.", TEXT_NORMAL }, { @@ -469,25 +469,25 @@ { 8, 15, - "\x07 Druecken Sie U, um ReactOS zu aktualisieren.", + "\x07 Drcken Sie U, um ReactOS zu aktualisieren.", TEXT_NORMAL }, { 8, 17, - "\x07 Druecken Sie R, fuer die Wiederherstellungskonsole.", + "\x07 Drcken Sie R, fr die Wiederherstellungskonsole.", TEXT_NORMAL }, { 8, 19, - "\x07 Druecken Sie ESC, um zur Hauptseite zurueckzukehren.", + "\x07 Drcken Sie ESC, um zur Hauptseite zurckzukehren.", TEXT_NORMAL }, { 8, 21, - "\x07 Druecken Sie ENTER, um den Computer neuzustarten.", + "\x07 Drcken Sie ENTER, um den Computer neuzustarten.", TEXT_NORMAL }, { @@ -514,31 +514,31 @@ { 6, 8, - "Sie wollen den Computertyp aendern, der installiert wird.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", + "Sie wollen den Computertyp ndern, der installiert wird.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Drcken Sie die HOCH- oder RUNTER-Taste, um den gewnschten", TEXT_NORMAL }, { 8, 11, - " Typ zu waehlen. Dann druecken Sie ENTER.", + " Typ zu whlen. Dann drcken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie ESC, um zur vorherigen Seite zurueckzukehren,", + "\x07 Drcken Sie ESC, um zur vorherigen Seite zurckzukehren,", TEXT_NORMAL }, { 8, 14, - " ohne den Computertyp zu aendern.", + " ohne den Computertyp zu ndern.", TEXT_NORMAL }, { @@ -606,7 +606,7 @@ { 10, 6, - "ReactOS wurde nicht vollstaendig installiert", + "ReactOS wurde nicht vollstndig installiert", TEXT_NORMAL }, { @@ -624,7 +624,7 @@ { 10, 11, - "Druecken Sie ENTER, um den Computer neuzustarten.", + "Drcken Sie ENTER, um den Computer neuzustarten.", TEXT_NORMAL }, { @@ -652,30 +652,30 @@ { 6, 8, - "Sie wollen den Bildschirmtyp aendern, der installiert wird.", + "Sie wollen den Bildschirmtyp ndern, der installiert wird.", TEXT_NORMAL }, { 8, 10, - "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", + "\x07 Drcken Sie die HOCH- oder RUNTER-Taste, um den gewnschten", TEXT_NORMAL }, { 8, 11, - " Typ zu waehlen. Dann druecken Sie ENTER.", + " Typ zu whlen. Dann drcken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie ESC, um zur vorherigen Seite zurueckzukehren, ohne", + "\x07 Drcken Sie ESC, um zur vorherigen Seite zurckzukehren, ohne", TEXT_NORMAL }, { 8, 14, - " den Bildschirmtyp zu aendern.", + " den Bildschirmtyp zu ndern.", TEXT_NORMAL }, { @@ -721,7 +721,7 @@ { 10, 11, - "Druecken Sie ENTER, um den Computer neuzustarten.", + "Drcken Sie ENTER, um den Computer neuzustarten.", TEXT_NORMAL }, { @@ -767,7 +767,7 @@ { 6, 14, - "druecken Sie ENTER.", + "drcken Sie ENTER.", TEXT_NORMAL, }, { @@ -802,31 +802,31 @@ { 6, 9, - "Speicherplatz fuer neue Partitionen.", + "Speicherplatz fr neue Partitionen.", TEXT_NORMAL }, { 8, 11, - "\x07 Druecken Sie die Pfeiltasten, um eine Partition auszuwaehlen.", + "\x07 Drcken Sie die Pfeiltasten, um eine Partition auszuwhlen.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie die Eingabetaste, um die Auswahl zu bestaetigen.", + "\x07 Drcken Sie die Eingabetaste, um die Auswahl zu besttigen.", TEXT_NORMAL }, { 8, 15, - "\x07 Druecken Sie C, um eine neue Partition zu erstellen.", + "\x07 Drcken Sie C, um eine neue Partition zu erstellen.", TEXT_NORMAL }, { 8, 17, - "\x07 Druecken Sie D, um eine vorhandene Partition zu loeschen.", + "\x07 Drcken Sie D, um eine vorhandene Partition zu lschen.", TEXT_NORMAL }, { @@ -860,13 +860,13 @@ { 6, 10, - "Setup wird nun die gewuenschte Partition formatieren.", + "Setup wird nun die gewnschte Partition formatieren.", TEXT_NORMAL }, { 6, 11, - "Druecken Sie die Eingabetaste, um fortzufahren.", + "Drcken Sie die Eingabetaste, um fortzufahren.", TEXT_NORMAL }, { @@ -894,25 +894,25 @@ { 6, 8, - "Setup installiert die ReactOS Installationsdateien in die ausgewaehlte", + "Setup installiert die ReactOS Installationsdateien in die ausgewhlte", TEXT_NORMAL }, { 6, 9, - "Partition. Waehlen Sie ein Installationsverzeichnis fuer ReactOS:", + "Partition. Whlen Sie ein Installationsverzeichnis fr ReactOS:", TEXT_NORMAL }, { 6, 14, - "Um den Vorschlag zu aendern druecken sie die 'Entf' Taste um", + "Um den Vorschlag zu ndern drcken sie die 'Entf' Taste um", TEXT_NORMAL }, { 6, 15, - "Zeichen zu loeschen und gegeben sie dann den Namen des Verzeichnis ein", + "Zeichen zu lschen und gegeben sie dann den Namen des Verzeichnis ein", TEXT_NORMAL }, { @@ -940,7 +940,7 @@ { 11, 12, - "Bitte warten Sie waehrend ReactOS Setup die ReactOS Dateien", + "Bitte warten Sie whrend ReactOS Setup die ReactOS Dateien", TEXT_NORMAL }, { @@ -1026,31 +1026,31 @@ { 6, 8, - "Sie wollen den Tastaturtyp aendern, der installiert wird.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", + "Sie wollen den Tastaturtyp ndern, der installiert wird.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Drcken Sie die HOCH- oder RUNTER-Taste, um den gewnschten", TEXT_NORMAL }, { 8, 11, - " Typ zu waehlen. Dann druecken Sie ENTER.", + " Typ zu whlen. Dann drcken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie ESC, um zur vorherigen Seite zurueckzukehren,", + "\x07 Drcken Sie ESC, um zur vorherigen Seite zurckzukehren,", TEXT_NORMAL }, { 8, 14, - " ohne den Tastaturtyp zu aendern.", + " ohne den Tastaturtyp zu ndern.", TEXT_NORMAL }, { @@ -1078,31 +1078,31 @@ { 6, 8, - "Sie wollen das Tastaturlayout aendern, der installiert wird.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Druecken Sie die HOCH- oder RUNTER-Taste, um den gewuenschten", + "Sie wollen das Tastaturlayout ndern, der installiert wird.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Drcken Sie die HOCH- oder RUNTER-Taste, um den gewnschten", TEXT_NORMAL }, { 8, 11, - " Typ zu waehlen. Dann druecken Sie ENTER.", + " Typ zu whlen. Dann drcken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Druecken Sie ESC, um zur vorherigen Seite zurueckzukehren,", + "\x07 Drcken Sie ESC, um zur vorherigen Seite zurckzukehren,", TEXT_NORMAL }, { 8, 14, - " ohne das Tastaturlayout zu aendern.", + " ohne das Tastaturlayout zu ndern.", TEXT_NORMAL }, { @@ -1131,7 +1131,7 @@ { 6, 8, - "Setup bereitet ihren Computer fuer die Installation vor.", + "Setup bereitet ihren Computer fr die Installation vor.", TEXT_NORMAL }, { @@ -1160,25 +1160,25 @@ { 6, 17, - "Waehlen Sie ein Dateisystem von der folgenden Liste.", + "Whlen Sie ein Dateisystem von der folgenden Liste.", 0 }, { 8, 19, - "\x07 Druecken Sie die Pfeiltasten, um das Dateisystem zu aendern.", + "\x07 Drcken Sie die Pfeiltasten, um das Dateisystem zu ndern.", 0 }, { 8, 21, - "\x07 Druecken Sie die Eingabetaste, um die Partition zu formatieren.", + "\x07 Drcken Sie die Eingabetaste, um die Partition zu formatieren.", 0 }, { 8, 23, - "\x07 Druecken Sie ESC, um eine andere Partition auszuwaehlen.", + "\x07 Drcken Sie ESC, um eine andere Partition auszuwhlen.", 0 }, { @@ -1207,19 +1207,19 @@ { 6, 8, - "Sie haben sich entschieden diese Partition zu loeschen", + "Sie haben sich entschieden diese Partition zu lschen", TEXT_NORMAL }, { 8, 18, - "\x07 Druecken Sie D, um die Partition zu loeschen.", + "\x07 Drcken Sie D, um die Partition zu lschen.", TEXT_NORMAL }, { 11, 19, - "Warnung: Alle Daten auf dieser Partition werden geloescht!", + "Warnung: Alle Daten auf dieser Partition werden gelscht!", TEXT_NORMAL }, { @@ -1231,7 +1231,7 @@ { 0, 0, - " D = Loesche Partition ESC = Abbrechen F3 = Beenden", + " D = Lsche Partition ESC = Abbrechen F3 = Beenden", TEXT_STATUS }, { @@ -1275,12 +1275,12 @@ { { //ERROR_NOT_INSTALLED - "ReactOS ist nicht vollstaendig auf Ihrem System installiert.\n" - "Wenn Sie das Setup jetzt beenden, muessen Sie das\n" + "ReactOS ist nicht vollstndig auf Ihrem System installiert.\n" + "Wenn Sie das Setup jetzt beenden, mssen Sie das\n" "Setup erneut starten, um ROS zu installieren.\n" "\n" - " \x07 Druecken Sie ENTER um das Setup Fortzusetzen.\n" - " \x07 Druecken Sie F3 um das Setup zu beenden.", + " \x07 Drcken Sie ENTER um das Setup Fortzusetzen.\n" + " \x07 Drcken Sie F3 um das Setup zu beenden.", "F3 = Beenden ENTER = Fortsetzen" }, { @@ -1305,7 +1305,7 @@ }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "Setup fand eine ungueltige Signatur in TXTSETUP.SIF.\n", + "Setup fand eine ungltige Signatur in TXTSETUP.SIF.\n", "ENTER = Computer neustarten" }, { @@ -1341,27 +1341,27 @@ { //ERROR_WARN_PARTITION, "Setup hat mindestens eine Festplatte mit einer inkompatiblen Partitionstabelle\n" - "welche nicht richtig verwendet werden koennen!\n" + "welche nicht richtig verwendet werden knnen!\n" "\n" - "Partitionen zu erstellen/loeschen kann die Partitionstabelle zerstoeren.\n" + "Partitionen zu erstellen/lschen kann die Partitionstabelle zerstren.\n" "\n" - " \x07 Druecken Sie F3, um das Setup zu beenden." - " \x07 Druecken Sie ENTER, um das Setup Fortzusetzen.", + " \x07 Drcken Sie F3, um das Setup zu beenden." + " \x07 Drcken Sie ENTER, um das Setup Fortzusetzen.", "F3 = Beenden ENTER = Fortsetzen" }, { //ERROR_NEW_PARTITION, - "Sie koennen keine neue Partition in einer bereits\n" + "Sie knnen keine neue Partition in einer bereits\n" "vohandenen Partition erstellen!\n" "\n" - " * * Eine beliebige Taste zum Fortsetzen druecken.", + " * * Eine beliebige Taste zum Fortsetzen drcken.", NULL }, { //ERROR_DELETE_SPACE, - "Sie koennen unpartitionieren Speicher nicht loeschen!\n" + "Sie knnen unpartitionieren Speicher nicht lschen!\n" "\n" - " * Eine beliebige Taste zum Fortsetzen druecken.", + " * Eine beliebige Taste zum Fortsetzen drcken.", NULL }, { @@ -1406,7 +1406,7 @@ }, { //ERROR_INVALID_CABINET_INF, - "Cabinet hat keine gueltige .inf Datei.\n", + "Cabinet hat keine gltige .inf Datei.\n", "ENTER = Computer neustarten" }, { @@ -1416,7 +1416,7 @@ }, { //ERROR_CABINET_SCRIPT, - "Cabinet enthält kein Setup Skript.\n", + "Cabinet enthlt kein Setup Skript.\n", "ENTER = Computer neustarten" }, { @@ -1459,7 +1459,7 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup konnte den CodePage-Eintrag nicht hinzufuegen.\n" + "Setup konnte den CodePage-Eintrag nicht hinzufgen.\n" "ENTER = Computer neustarten" }, { 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 21 16:33:52 2008 @@ -568,4 +568,24 @@ return FALSE; } +VOID +SetConsoleCodePage(VOID) +{ + ULONG lngIndex = 0; + UINT wCodePage; + + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + wCodePage = (UINT) wcstoul(LanguageList[lngIndex].OEMCPage, NULL, 10); + SetConsoleOutputCP(wCodePage); + return; + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); +} + /* 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 21 16:33:52 2008 @@ -56,5 +56,7 @@ BOOLEAN AddCodePage(VOID); +VOID +SetConsoleCodePage(VOID); #endif Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c (original) +++ trunk/reactos/drivers/setup/blue/blue.c Mon Jan 21 16:33:52 2008 @@ -726,15 +726,10 @@ case IOCTL_CONSOLE_LOADFONT: { - ULONG LangId = (ULONG)*(PULONG)Irp->AssociatedIrp.SystemBuffer; - - // Upload the cyrillic font into the fontgenerator, if needed - if (LangId == MAKELANGID(LANG_BULGARIAN, SUBLANG_DEFAULT) || - LangId == MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT) || - LangId == MAKELANGID(LANG_UKRAINIAN, SUBLANG_DEFAULT)) - { - ScrLoadFontTable(); - } + UINT CodePage = (UINT)*(PULONG)Irp->AssociatedIrp.SystemBuffer; + + // Upload a font for the codepage if needed + ScrLoadFontTable(CodePage); Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h (original) +++ trunk/reactos/drivers/setup/blue/blue.h Mon Jan 21 16:33:52 2008 @@ -58,4 +58,4 @@ #define PELINDEX (PUCHAR)0x3c8 #define PELDATA (PUCHAR)0x3c9 -VOID ScrLoadFontTable(); +void ScrLoadFontTable(UINT CodePage); Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c (original) +++ trunk/reactos/drivers/setup/blue/font.c Mon Jan 21 16:33:52 2008 @@ -4,6 +4,7 @@ * FILE: drivers/setup/blue/font.c * PURPOSE: Loading specific fonts into VGA * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) +* Colin Finck (mail(a)colinfinck.de) */ /* INCLUDES ***************************************************************/ @@ -16,17 +17,19 @@ VOID OpenBitPlane(); VOID CloseBitPlane(); -VOID LoadFont(PBYTE Bitplane); - -static UCHAR font8x8[2048]; +VOID LoadFont(PBYTE Bitplane, PUCHAR FontBitfield); + +static UCHAR Cp850Font[2048]; +static UCHAR Cp866Font[2048]; /* FUNCTIONS ****************************************************************/ VOID -ScrLoadFontTable() +ScrLoadFontTable(UINT CodePage) { PHYSICAL_ADDRESS BaseAddress; PBYTE Bitplane; + PUCHAR FontBitfield = NULL; /* open bit plane for font table access */ OpenBitPlane(); @@ -35,7 +38,14 @@ BaseAddress.QuadPart = BITPLANE_BASE; Bitplane = (PBYTE)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); - LoadFont(Bitplane); + switch(CodePage) + { + case 850: FontBitfield = Cp850Font; break; + case 866: FontBitfield = Cp866Font; break; + } + + if(FontBitfield) + LoadFont(Bitplane, FontBitfield); MmUnmapIoSpace(Bitplane, 0xFFFF); @@ -89,7 +99,7 @@ } VOID -LoadFont(PBYTE Bitplane) +LoadFont(PBYTE Bitplane, PUCHAR FontBitfield) { UINT i,j; @@ -97,7 +107,7 @@ { for (j=0; j<8; j++) { - *Bitplane = font8x8[i*8+j]; + *Bitplane = FontBitfield[i*8+j]; Bitplane++; } @@ -110,9 +120,269 @@ } } +/* This font has been imported from DragonFlyBSD / FreeBSD + Original URL is: http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/ (2008/01/21) */ +static UCHAR Cp850Font[2048] = { +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x7E,0x81,0xA5,0x81,0xBD,0x99,0x81,0x7E, +0x7E,0xFF,0xDB,0xFF,0xC3,0xE7,0xFF,0x7E, +0x6C,0xFE,0xFE,0xFE,0x7C,0x38,0x10,0x00, +0x10,0x38,0x7C,0xFE,0x7C,0x38,0x10,0x00, +0x38,0x7C,0x38,0xFE,0xFE,0xD6,0x10,0x38, +0x10,0x38,0x7C,0xFE,0xFE,0x7C,0x10,0x38, +0x00,0x00,0x18,0x3C,0x3C,0x18,0x00,0x00, +0xFF,0xFF,0xE7,0xC3,0xC3,0xE7,0xFF,0xFF, +0x00,0x3C,0x66,0x42,0x42,0x66,0x3C,0x00, +0xFF,0xC3,0x99,0xBD,0xBD,0x99,0xC3,0xFF, +0x0F,0x07,0x0F,0x7D,0xCC,0xCC,0xCC,0x78, +0x3C,0x66,0x66,0x66,0x3C,0x18,0x7E,0x18, +0x3F,0x33,0x3F,0x30,0x30,0x70,0xF0,0xE0, +0x7F,0x63,0x7F,0x63,0x63,0x67,0xE6,0xC0, +0x18,0xDB,0x3C,0xE7,0xE7,0x3C,0xDB,0x18, +0x80,0xE0,0xF8,0xFE,0xF8,0xE0,0x80,0x00, +0x02,0x0E,0x3E,0xFE,0x3E,0x0E,0x02,0x00, +0x18,0x3C,0x7E,0x18,0x18,0x7E,0x3C,0x18, +0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x00, +0x7F,0xDB,0xDB,0x7B,0x1B,0x1B,0x1B,0x00, +0x3E,0x61,0x3C,0x66,0x66,0x3C,0x86,0x7C, +0x00,0x00,0x00,0x00,0x7E,0x7E,0x7E,0x00, +0x18,0x3C,0x7E,0x18,0x7E,0x3C,0x18,0xFF, +0x18,0x3C,0x7E,0x18,0x18,0x18,0x18,0x00, +0x18,0x18,0x18,0x18,0x7E,0x3C,0x18,0x00, +0x00,0x18,0x0C,0xFE,0x0C,0x18,0x00,0x00, +0x00,0x30,0x60,0xFE,0x60,0x30,0x00,0x00, +0x00,0x00,0xC0,0xC0,0xC0,0xFE,0x00,0x00, +0x00,0x24,0x66,0xFF,0x66,0x24,0x00,0x00, +0x00,0x18,0x3C,0x7E,0xFF,0xFF,0x00,0x00, +0x00,0xFF,0xFF,0x7E,0x3C,0x18,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x18,0x3C,0x3C,0x18,0x18,0x00,0x18,0x00, +0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00, +0x6C,0x6C,0xFE,0x6C,0xFE,0x6C,0x6C,0x00, +0x18,0x3E,0x60,0x3C,0x06,0x7C,0x18,0x00, +0x00,0xC6,0xCC,0x18,0x30,0x66,0xC6,0x00, +0x38,0x6C,0x38,0x76,0xDC,0xCC,0x76,0x00, +0x18,0x18,0x30,0x00,0x00,0x00,0x00,0x00, +0x0C,0x18,0x30,0x30,0x30,0x18,0x0C,0x00, +0x30,0x18,0x0C,0x0C,0x0C,0x18,0x30,0x00, +0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00, +0x00,0x18,0x18,0x7E,0x18,0x18,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x30, +0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00, +0x06,0x0C,0x18,0x30,0x60,0xC0,0x80,0x00, +0x38,0x6C,0xC6,0xD6,0xC6,0x6C,0x38,0x00, +0x18,0x38,0x18,0x18,0x18,0x18,0x7E,0x00, +0x7C,0xC6,0x06,0x1C,0x30,0x66,0xFE,0x00, +0x7C,0xC6,0x06,0x3C,0x06,0xC6,0x7C,0x00, +0x1C,0x3C,0x6C,0xCC,0xFE,0x0C,0x1E,0x00, +0xFE,0xC0,0xC0,0xFC,0x06,0xC6,0x7C,0x00, +0x38,0x60,0xC0,0xFC,0xC6,0xC6,0x7C,0x00, +0xFE,0xC6,0x0C,0x18,0x30,0x30,0x30,0x00, +0x7C,0xC6,0xC6,0x7C,0xC6,0xC6,0x7C,0x00, +0x7C,0xC6,0xC6,0x7E,0x06,0x0C,0x78,0x00, +0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x00, +0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x30, +0x06,0x0C,0x18,0x30,0x18,0x0C,0x06,0x00, +0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00, +0x60,0x30,0x18,0x0C,0x18,0x30,0x60,0x00, +0x7C,0xC6,0x0C,0x18,0x18,0x00,0x18,0x00, +0x7C,0xC6,0xDE,0xDE,0xDE,0xC0,0x78,0x00, +0x38,0x6C,0xC6,0xFE,0xC6,0xC6,0xC6,0x00, +0xFC,0x66,0x66,0x7C,0x66,0x66,0xFC,0x00, +0x3C,0x66,0xC0,0xC0,0xC0,0x66,0x3C,0x00, +0xF8,0x6C,0x66,0x66,0x66,0x6C,0xF8,0x00, +0xFE,0x62,0x68,0x78,0x68,0x62,0xFE,0x00, +0xFE,0x62,0x68,0x78,0x68,0x60,0xF0,0x00, +0x3C,0x66,0xC0,0xC0,0xCE,0x66,0x3A,0x00, +0xC6,0xC6,0xC6,0xFE,0xC6,0xC6,0xC6,0x00, +0x3C,0x18,0x18,0x18,0x18,0x18,0x3C,0x00, +0x1E,0x0C,0x0C,0x0C,0xCC,0xCC,0x78,0x00, +0xE6,0x66,0x6C,0x78,0x6C,0x66,0xE6,0x00, +0xF0,0x60,0x60,0x60,0x62,0x66,0xFE,0x00, +0xC6,0xEE,0xFE,0xFE,0xD6,0xC6,0xC6,0x00, +0xC6,0xE6,0xF6,0xDE,0xCE,0xC6,0xC6,0x00, +0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, +0xFC,0x66,0x66,0x7C,0x60,0x60,0xF0,0x00, +0x7C,0xC6,0xC6,0xC6,0xC6,0xCE,0x7C,0x0E, +0xFC,0x66,0x66,0x7C,0x6C,0x66,0xE6,0x00, +0x3C,0x66,0x30,0x18,0x0C,0x66,0x3C,0x00, +0x7E,0x7E,0x5A,0x18,0x18,0x18,0x3C,0x00, +0xC6,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, +0xC6,0xC6,0xC6,0xC6,0xC6,0x6C,0x38,0x00, +0xC6,0xC6,0xC6,0xD6,0xD6,0xFE,0x6C,0x00, +0xC6,0xC6,0x6C,0x38,0x6C,0xC6,0xC6,0x00, +0x66,0x66,0x66,0x3C,0x18,0x18,0x3C,0x00, +0xFE,0xC6,0x8C,0x18,0x32,0x66,0xFE,0x00, +0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00, +0xC0,0x60,0x30,0x18,0x0C,0x06,0x02,0x00, +0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00, +0x10,0x38,0x6C,0xC6,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF, +0x30,0x18,0x0C,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x78,0x0C,0x7C,0xCC,0x76,0x00, +0xE0,0x60,0x7C,0x66,0x66,0x66,0xDC,0x00, +0x00,0x00,0x7C,0xC6,0xC0,0xC6,0x7C,0x00, +0x1C,0x0C,0x7C,0xCC,0xCC,0xCC,0x76,0x00, +0x00,0x00,0x7C,0xC6,0xFE,0xC0,0x7C,0x00, +0x3C,0x66,0x60,0xF8,0x60,0x60,0xF0,0x00, +0x00,0x00,0x76,0xCC,0xCC,0x7C,0x0C,0xF8, +0xE0,0x60,0x6C,0x76,0x66,0x66,0xE6,0x00, +0x18,0x00,0x38,0x18,0x18,0x18,0x3C,0x00, +0x06,0x00,0x06,0x06,0x06,0x66,0x66,0x3C, +0xE0,0x60,0x66,0x6C,0x78,0x6C,0xE6,0x00, +0x38,0x18,0x18,0x18,0x18,0x18,0x3C,0x00, +0x00,0x00,0xEC,0xFE,0xD6,0xD6,0xD6,0x00, +0x00,0x00,0xDC,0x66,0x66,0x66,0x66,0x00, +0x00,0x00,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, +0x00,0x00,0xDC,0x66,0x66,0x7C,0x60,0xF0, +0x00,0x00,0x76,0xCC,0xCC,0x7C,0x0C,0x1E, +0x00,0x00,0xDC,0x76,0x60,0x60,0xF0,0x00, +0x00,0x00,0x7E,0xC0,0x7C,0x06,0xFC,0x00, +0x30,0x30,0xFC,0x30,0x30,0x36,0x1C,0x00, +0x00,0x00,0xCC,0xCC,0xCC,0xCC,0x76,0x00, +0x00,0x00,0xC6,0xC6,0xC6,0x6C,0x38,0x00, +0x00,0x00,0xC6,0xD6,0xD6,0xFE,0x6C,0x00, +0x00,0x00,0xC6,0x6C,0x38,0x6C,0xC6,0x00, +0x00,0x00,0xC6,0xC6,0xC6,0x7E,0x06,0xFC, +0x00,0x00,0x7E,0x4C,0x18,0x32,0x7E,0x00, +0x0E,0x18,0x18,0x70,0x18,0x18,0x0E,0x00, +0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00, +0x70,0x18,0x18,0x0E,0x18,0x18,0x70,0x00, +0x76,0xDC,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x10,0x38,0x6C,0xC6,0xC6,0xFE,0x00, +0x7C,0xC6,0xC0,0xC0,0xC6,0x7C,0x0C,0x78, +0xCC,0x00,0xCC,0xCC,0xCC,0xCC,0x76,0x00, +0x0C,0x18,0x7C,0xC6,0xFE,0xC0,0x7C,0x00, +0x7C,0x82,0x78,0x0C,0x7C,0xCC,0x76,0x00, +0xC6,0x00,0x78,0x0C,0x7C,0xCC,0x76,0x00, +0x30,0x18,0x78,0x0C,0x7C,0xCC,0x76,0x00, +0x30,0x30,0x78,0x0C,0x7C,0xCC,0x76,0x00, +0x00,0x00,0x7E,0xC0,0xC0,0x7E,0x0C,0x38, +0x7C,0x82,0x7C,0xC6,0xFE,0xC0,0x7C,0x00, +0xC6,0x00,0x7C,0xC6,0xFE,0xC0,0x7C,0x00, +0x30,0x18,0x7C,0xC6,0xFE,0xC0,0x7C,0x00, +0x66,0x00,0x38,0x18,0x18,0x18,0x3C,0x00, +0x7C,0x82,0x38,0x18,0x18,0x18,0x3C,0x00, +0x30,0x18,0x00,0x38,0x18,0x18,0x3C,0x00, +0xC6,0x38,0x6C,0xC6,0xFE,0xC6,0xC6,0x00, +0x38,0x6C,0x7C,0xC6,0xFE,0xC6,0xC6,0x00, +0x18,0x30,0xFE,0xC0,0xF8,0xC0,0xFE,0x00, +0x00,0x00,0x7E,0x12,0xFE,0x90,0xFE,0x00, +0x3E,0x6C,0xCC,0xFE,0xCC,0xCC,0xCE,0x00, +0x7C,0x82,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, +0xC6,0x00,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, +0x30,0x18,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, +0x78,0x84,0x00,0xCC,0xCC,0xCC,0x76,0x00, +0x60,0x30,0xCC,0xCC,0xCC,0xCC,0x76,0x00, +0xC6,0x00,0xC6,0xC6,0xC6,0x7E,0x06,0xFC, +0xC6,0x38,0x6C,0xC6,0xC6,0x6C,0x38,0x00, +0xC6,0x00,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, +0x00,0x02,0x7C,0xCE,0xD6,0xE6,0x7C,0x80, +0x38,0x6C,0x64,0xF0,0x60,0x66,0xFC,0x00, +0x3A,0x6C,0xCE,0xD6,0xE6,0x6C,0xB8,0x00, +0x00,0xC6,0x6C,0x38,0x6C,0xC6,0x00,0x00, +0x0E,0x1B,0x18,0x3C,0x18,0xD8,0x70,0x00, +0x18,0x30,0x78,0x0C,0x7C,0xCC,0x76,0x00, +0x0C,0x18,0x00,0x38,0x18,0x18,0x3C,0x00, +0x0C,0x18,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, +0x18,0x30,0xCC,0xCC,0xCC,0xCC,0x76,0x00, +0x76,0xDC,0x00,0xDC,0x66,0x66,0x66,0x00, +0x76,0xDC,0x00,0xE6,0xF6,0xDE,0xCE,0x00, +0x3C,0x6C,0x6C,0x3E,0x00,0x7E,0x00,0x00, +0x38,0x6C,0x6C,0x38,0x00,0x7C,0x00,0x00, +0x18,0x00,0x18,0x18,0x30,0x63,0x3E,0x00, +0x7E,0x81,0xB9,0xA5,0xB9,0xA5,0x81,0x7E, +0x00,0x00,0x00,0xFE,0x06,0x06,0x00,0x00, +0x63,0xE6,0x6C,0x7E,0x33,0x66,0xCC,0x0F, +0x63,0xE6,0x6C,0x7A,0x36,0x6A,0xDF,0x06, +0x18,0x00,0x18,0x18,0x3C,0x3C,0x18,0x00, +0x00,0x33,0x66,0xCC,0x66,0x33,0x00,0x00, +0x00,0xCC,0x66,0x33,0x66,0xCC,0x00,0x00, +0x22,0x88,0x22,0x88,0x22,0x88,0x22,0x88, +0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA, +0x77,0xDD,0x77,0xDD,0x77,0xDD,0x77,0xDD, +0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, +0x18,0x18,0x18,0x18,0xF8,0x18,0x18,0x18, +0x30,0x60,0x38,0x6C,0xC6,0xFE,0xC6,0x00, +0x7C,0x82,0x38,0x6C,0xC6,0xFE,0xC6,0x00, +0x18,0x0C,0x38,0x6C,0xC6,0xFE,0xC6,0x00, +0x7E,0x81,0x9D,0xA1,0xA1,0x9D,0x81,0x7E, +0x36,0x36,0xF6,0x06,0xF6,0x36,0x36,0x36, +0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, +0x00,0x00,0xFE,0x06,0xF6,0x36,0x36,0x36, +0x36,0x36,0xF6,0x06,0xFE,0x00,0x00,0x00, +0x18,0x18,0x7E,0xC0,0xC0,0x7E,0x18,0x18, +0x66,0x66,0x3C,0x7E,0x18,0x7E,0x18,0x18, +0x00,0x00,0x00,0x00,0xF8,0x18,0x18,0x18, +0x18,0x18,0x18,0x18,0x1F,0x00,0x00,0x00, +0x18,0x18,0x18,0x18,0xFF,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0xFF,0x18,0x18,0x18, +0x18,0x18,0x18,0x18,0x1F,0x18,0x18,0x18, +0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00, +0x18,0x18,0x18,0x18,0xFF,0x18,0x18,0x18, +0x76,0xDC,0x7C,0x06,0x7E,0xC6,0x7E,0x00, +0x76,0xDC,0x38,0x6C,0xC6,0xFE,0xC6,0x00, +0x36,0x36,0x37,0x30,0x3F,0x00,0x00,0x00, +0x00,0x00,0x3F,0x30,0x37,0x36,0x36,0x36, +0x36,0x36,0xF7,0x00,0xFF,0x00,0x00,0x00, +0x00,0x00,0xFF,0x00,0xF7,0x36,0x36,0x36, +0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36, +0x00,0x00,0xFF,0x00,0xFF,0x00,0x00,0x00, +0x36,0x36,0xF7,0x00,0xF7,0x36,0x36,0x36, +0x00,0xC6,0x7C,0xC6,0xC6,0x7C,0xC6,0x00, +0x30,0x7E,0x0C,0x7C,0xCC,0xCC,0x78,0x00, +0xF8,0x6C,0x66,0xF6,0x66,0x6C,0xF8,0x00, +0x7C,0x82,0xFE,0xC0,0xFC,0xC0,0xFE,0x00, +0xC6,0x00,0xFE,0xC0,0xFC,0xC0,0xFE,0x00, +0x30,0x18,0xFE,0xC0,0xFC,0xC0,0xFE,0x00, +0x00,0x00,0x38,0x18,0x18,0x18,0x3C,0x00, +0x0C,0x18,0x3C,0x18,0x18,0x18,0x3C,0x00, +0x3C,0x42,0x3C,0x18,0x18,0x18,0x3C,0x00, +0x66,0x00,0x3C,0x18,0x18,0x18,0x3C,0x00, +0x18,0x18,0x18,0x18,0xF8,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x1F,0x18,0x18,0x18, +0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, +0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF, +0x18,0x18,0x18,0x00,0x00,0x18,0x18,0x18, +0x30,0x18,0x3C,0x18,0x18,0x18,0x3C,0x00, +0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00, +0x30,0x60,0x38,0x6C,0xC6,0x6C,0x38,0x00, +0x78,0xCC,0xCC,0xD8,0xCC,0xC6,0xCC,0x00, +0x7C,0x82,0x38,0x6C,0xC6,0x6C,0x38,0x00, +0x0C,0x06,0x38,0x6C,0xC6,0x6C,0x38,0x00, +0x76,0xDC,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, +0x76,0xDC,0x38,0x6C,0xC6,0x6C,0x38,0x00, +0x00,0x00,0x66,0x66,0x66,0x66,0x7C,0xC0, +0xE0,0x60,0x7C,0x66,0x66,0x7C,0x60,0xF0, +0xF0,0x60,0x7C,0x66,0x7C,0x60,0xF0,0x00, +0x18,0x30,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, +0x7C,0x82,0x00,0xC6,0xC6,0xC6,0x7C,0x00, +0x60,0x30,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, +0x18,0x30,0xC6,0xC6,0xC6,0x7E,0x06,0xFC, +0x0C,0x18,0x66,0x66,0x3C,0x18,0x3C,0x00, +0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x0C,0x18,0x30,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00, +0x18,0x18,0x7E,0x18,0x18,0x00,0x7E,0x00, +0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0xFF, +0xE1,0x32,0xE4,0x3A,0xF6,0x2A,0x5F,0x86, +0x7F,0xDB,0xDB,0x7B,0x1B,0x1B,0x1B,0x00, +0x3E,0x61,0x3C,0x66,0x66,0x3C,0x86,0x7C, +0x00,0x18,0x00,0x7E,0x00,0x18,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x18,0x0C,0x38, +0x38,0x6C,0x6C,0x38,0x00,0x00,0x00,0x00, +0x00,0xC6,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00, +0x18,0x38,0x18,0x18,0x3C,0x00,0x00,0x00, +0x78,0x0C,0x38,0x0C,0x78,0x00,0x00,0x00, +0x78,0x0C,0x18,0x30,0x7C,0x00,0x00,0x00, +0x00,0x00,0x3C,0x3C,0x3C,0x3C,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +}; /* This font was provided by ??? */ -static UCHAR font8x8[2048] = { +static UCHAR Cp866Font[2048] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x7E,0x81,0xA5,0x81,0xBD,0x99,0x81,0x7E, 0x7E,0xFF,0xDB,0xFF,0xC3,0xE7,0xFF,0x7E,

1 0

[dchapyshev] 31913: - Delete non-translated files - Fix typo in Russian translation
by dchapyshev＠svn.reactos.org 21 Jan '08

21 Jan '08

Author: dchapyshev Date: Mon Jan 21 14:16:19 2008 New Revision: 31913 URL: http://svn.reactos.org/svn/reactos?rev=31913&view=rev Log: - Delete non-translated files - Fix typo in Russian translation Removed: trunk/reactos/base/setup/usetup/lang/ca-ES.h trunk/reactos/base/setup/usetup/lang/da-DK.h trunk/reactos/base/setup/usetup/lang/fi-FI.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/hu-HU.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/ko-KR.h trunk/reactos/base/setup/usetup/lang/nb-NO.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pt-PT.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/th-TH.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/zh-CN.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/mui.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/setup/usetup/lang/ca-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ca-… Removed: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… Removed: trunk/reactos/base/setup/usetup/lang/fi-FI.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fi-… Removed: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… Removed: trunk/reactos/base/setup/usetup/lang/hu-HU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/hu-… Removed: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… Removed: trunk/reactos/base/setup/usetup/lang/ko-KR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ko-… Removed: trunk/reactos/base/setup/usetup/lang/nb-NO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nb-… Removed: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… Removed: trunk/reactos/base/setup/usetup/lang/pt-PT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… Removed: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… Removed: trunk/reactos/base/setup/usetup/lang/th-TH.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/th-… Removed: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… Removed: trunk/reactos/base/setup/usetup/lang/zh-CN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/zh-… Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re…

1 0

[cwittich] 31912: display Delphi library exceptions in debug log
by cwittich＠svn.reactos.org 21 Jan '08

21 Jan '08

Author: cwittich Date: Mon Jan 21 14:02:14 2008 New Revision: 31912 URL: http://svn.reactos.org/svn/reactos?rev=31912&view=rev Log: display Delphi library exceptions in debug log Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Mon Jan 21 14:02:14 2008 @@ -391,6 +391,12 @@ } } + if (dwExceptionCode == 0xeedface) + { + DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); + DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]); + } + /* Raise the exception */ RtlRaiseException(&ExceptionRecord); }

1 0

[fireball] 31911: - Fix warnings.
by fireball＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: fireball Date: Mon Jan 21 00:33:56 2008 New Revision: 31911 URL: http://svn.reactos.org/svn/reactos?rev=31911&view=rev Log: - Fix warnings. Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Mon Jan 21 00:33:56 2008 @@ -35,6 +35,7 @@ #include "shlwapi.h" #include "shlobj.h" #include "shresdef.h" +#include "pidl.h" #include "wine/debug.h" #include "shell32_main.h" Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Mon Jan 21 00:33:56 2008 @@ -52,6 +52,8 @@ #endif #endif /* defined __VALIST */ +int __cdecl _wtoi (const wchar_t *); +long __cdecl _wtol (const wchar_t *); int __cdecl swprintf (wchar_t*, const wchar_t*, ...); int __cdecl _snwprintf (wchar_t*, size_t, const wchar_t*, ...); int __cdecl _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST);

1 0

[fireball] 31910: - Fix warnings.
by fireball＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: fireball Date: Mon Jan 21 00:24:32 2008 New Revision: 31910 URL: http://svn.reactos.org/svn/reactos?rev=31910&view=rev Log: - Fix warnings. Modified: trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Mon Jan 21 00:24:32 2008 @@ -246,4 +246,5 @@ HPROPSHEETPAGE SH_CreatePropertySheetPage(LPSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle); BOOL SH_ShowDriveProperties(WCHAR * drive); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); +BOOL SH_ShowPropertiesDialog(WCHAR * lpf); #endif Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Mon Jan 21 00:24:32 2008 @@ -44,7 +44,17 @@ #define WINE_UNICODE_API __attribute__((dllimport)) #endif +#ifndef __VALIST +#ifdef __GNUC__ +#define __VALIST __gnuc_va_list +#else +#define __VALIST char* +#endif +#endif /* defined __VALIST */ + int __cdecl swprintf (wchar_t*, const wchar_t*, ...); +int __cdecl _snwprintf (wchar_t*, size_t, const wchar_t*, ...); +int __cdecl _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); static __inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) {

1 0

[fireball] 31909: - Add swprintf prototype, since oleaut32 needs it.
by fireball＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: fireball Date: Sun Jan 20 23:29:42 2008 New Revision: 31909 URL: http://svn.reactos.org/svn/reactos?rev=31909&view=rev Log: - Add swprintf prototype, since oleaut32 needs it. Modified: trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h (original) +++ trunk/reactos/include/reactos/wine/unicode.h Sun Jan 20 23:29:42 2008 @@ -44,6 +44,8 @@ #define WINE_UNICODE_API __attribute__((dllimport)) #endif +int __cdecl swprintf (wchar_t*, const wchar_t*, ...); + static __inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str;

1 0

[cwittich] 31908: stdole2.tlb doesn't have an entrypoint
by cwittich＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: cwittich Date: Sun Jan 20 20:28:56 2008 New Revision: 31908 URL: http://svn.reactos.org/svn/reactos?rev=31908&view=rev Log: stdole2.tlb doesn't have an entrypoint Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (original) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Sun Jan 20 20:28:56 2008 @@ -8,7 +8,7 @@ <define name="WINVER">0x501</define> <file>std_ole_v2.idl</file> </module> -<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb"> +<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb" entrypoint="0"> <importlibrary definition="stdole2.tlb.spec.def" /> <include base="stdole2">.</include> <include base="stdole2" root="intermediate">.</include>

1 0

[cwittich] 31907: fix process token leaks
by cwittich＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: cwittich Date: Sun Jan 20 20:01:42 2008 New Revision: 31907 URL: http://svn.reactos.org/svn/reactos?rev=31907&view=rev Log: fix process token leaks Modified: trunk/reactos/dll/win32/msi/registry.c Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c (original) +++ trunk/reactos/dll/win32/msi/registry.c Sun Jan 20 20:01:42 2008 @@ -479,11 +479,19 @@ size = sizeof(buf); if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) - return ERROR_FUNCTION_FAILED; + { + CloseHandle(token); + return ERROR_FUNCTION_FAILED; + } user = (PTOKEN_USER)buf; if (!ConvertSidToStringSidW(user->User.Sid, usersid)) - return ERROR_FUNCTION_FAILED; + { + CloseHandle(token); + return ERROR_FUNCTION_FAILED; + } + + CloseHandle(token); return ERROR_SUCCESS; }

1 0

[navaraf] 31906: Remove redundant memset call.
by navaraf＠svn.reactos.org 20 Jan '08

20 Jan '08

Author: navaraf Date: Sun Jan 20 18:41:49 2008 New Revision: 31906 URL: http://svn.reactos.org/svn/reactos?rev=31906&view=rev Log: Remove redundant memset call. Modified: trunk/reactos/base/shell/cmd/batch.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Sun Jan 20 18:41:49 2008 @@ -284,7 +284,6 @@ bc->raw_params = (TCHAR*) cmd_alloc((_tcslen(param)+1) * sizeof(TCHAR)); if (bc->raw_params != NULL) { - memset (bc->raw_params, 0, (_tcslen(param)+1) * sizeof(TCHAR)); _tcscpy(bc->raw_params,param); } else

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