Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 32036: Update translations of wordpad by syncin to wine 0.9.54
by dreimer＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: dreimer Date: Mon Jan 28 18:08:37 2008 New Revision: 32036 URL: http://svn.reactos.org/svn/reactos?rev=32036&view=rev Log: Update translations of wordpad by syncin to wine 0.9.54 Modified: trunk/reactos/base/applications/winhelp/hlpfile.c trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h Modified: trunk/reactos/base/applications/winhelp/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/hlpfile.c (original) +++ trunk/reactos/base/applications/winhelp/hlpfile.c Mon Jan 28 18:08:37 2008 @@ -119,7 +119,7 @@ * As of today, we only return the page... we should also return * a paragraph, and then, while opening a new page, compute the * y-offset of the paragraph to be shown and scroll the window - * accordinly + * accordingly */ /****************************************************************** * HLPFILE_PageByOffset Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc (original) +++ trunk/reactos/base/applications/wordpad/De.rc Mon Jan 28 18:08:37 2008 @@ -22,31 +22,31 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu\tCtrl+N", ID_FILE_NEW - MENUITEM "&Öffnen...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Speichern\tCtrl+S", ID_FILE_SAVE - MENUITEM "Speichern &unter...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "&Beenden", ID_FILE_EXIT + MENUITEM "&Neu\tStrg+N", ID_FILE_NEW + MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE + MENUITEM "Speichern &unter...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Drucken...\tStrg+P", ID_PRINT + MENUITEM "Seitenansi&cht", ID_PREVIEW + MENUITEM "Seite ein&richten...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Beenden", ID_FILE_EXIT END POPUP "&Bearbeiten" BEGIN - MENUITEM "Rü&ckgängig\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Wiederholen\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "Aus&schneiden\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Einfügen\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Löschen\tDEL", ID_EDIT_CLEAR - MENUITEM "&Alles markieren\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND - MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO + MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT + MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY + MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE + MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR + MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Suchen...\tStrg+F", ID_FIND + MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT + MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY MENUITEM "&Geändert", ID_EDIT_MODIFIED @@ -60,33 +60,34 @@ MENUITEM "&Get text", ID_EDIT_GETTEXT END END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR - MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR - MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES - END - POPUP "&Insert" - BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + POPUP "&Ansicht" + BEGIN + MENUITEM "&Symbolleiste", ID_TOGGLE_TOOLBAR + MENUITEM "&Formatierungsleiste", ID_TOGGLE_FORMATBAR + MENUITEM "L&ineal", ID_TOGGLE_RULER + MENUITEM "Status&leiste", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Optionen...", ID_VIEWPROPERTIES + END + POPUP "&Einfügen" + BEGIN + MENUITEM "&Datum und Uhrzeit...", ID_DATETIME + END + POPUP "Forma&t" + BEGIN + MENUITEM "Sch&riftart...", ID_FONTSETTINGS + MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "&Absatz..." ID_PARAFORMAT + MENUITEM "&Tabsstopps..." ID_TABSTOPS POPUP "&Hintergrund" BEGIN - MENUITEM "&System\tCtrl+1", ID_BACK_1 - MENUITEM "&PostIt-Notiz\tCtrl+2", ID_BACK_2 + MENUITEM "&System\tStrg+1", ID_BACK_1 + MENUITEM "&PostIt-Notiz\tStrg+2", ID_BACK_2 END END - POPUP "&Help" - BEGIN - MENUITEM "&About Wine Wordpad" ID_ABOUT + POPUP "&?" + BEGIN + MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT END END @@ -98,63 +99,63 @@ MENUITEM "&Kopieren", ID_EDIT_COPY MENUITEM "&Einfügen", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "&Absatz..." ID_PARAFORMAT END END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" +CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Verfügbare Formate",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 + PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" +CAPTION "Neu" FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "Neuer Dokumenttyp",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 + PUSHBUTTON "A&bbrechen",IDCANCEL,97,26,40,12 END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" +Caption "Absatz" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "Einzug", 0, 10, 10, 120, 68 + LTEXT "Links", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Rechts", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "Erste Zeile", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Ausrichtung", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" +Caption "Tabstopps" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 + DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 + PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -162,56 +163,57 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + GROUPBOX "Zeilenumbruch", 0, 10, 10, 130, 85 + RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "Symbolleisten", 0, 150, 10, 120, 85 + CHECKBOX "&Symbolleiste", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatierungsleiste", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "L&ineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Status&leiste", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich-Text-Format (*.rtf)" - STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" + STRING_RICHTEXT_FILES_RTF, "RTF-Format (*.rtf)" + STRING_TEXT_FILES_TXT, "Textdokumente (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode-Textdokumente (*.txt)" STRING_ALL_FILES, "Alle Dokumente (*.*)" END STRINGTABLE DISCARDABLE BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Options" + STRING_ALIGN_LEFT, "Links" + STRING_ALIGN_RIGHT, "Rechts" + STRING_ALIGN_CENTER, "Zentriert" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "RTF-Dokument" + STRING_NEWFILE_TXT, "Textdokument" + STRING_NEWFILE_TXT_UNICODE, "Unicode-Textdokument" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Druckerdateien (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Optionen" STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_CLOSE, "Close" + STRING_VIEWPROPS_RICHTEXT, "Rich Text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "&Drucken" + STRING_PREVIEW_NEXTPAGE, "&Nächste" + STRING_PREVIEW_PREVPAGE, "&Vorherige" + STRING_PREVIEW_CLOSE, "&Schließen" END STRINGTABLE DISCARDABLE @@ -221,13 +223,13 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?" + STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." + STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." + STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ + "Dadurch geht die Formatierung verloren. " \ + "Möchten Sie den Vorgang trotzdem fortsetzen?" + STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt." +END Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc (original) +++ trunk/reactos/base/applications/wordpad/En.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Barre d'outils", ID_TOGGLE_TOOLBAR MENUITEM "&Barre de format", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Barre d'état", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options...", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Barres d'outils", 0, 150, 10, 120, 85 CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc Mon Jan 28 18:08:37 2008 @@ -66,6 +66,7 @@ BEGIN MENUITEM "µµ±¸¹Ù(&T)", ID_TOGGLE_TOOLBAR MENUITEM "Çü½Ä¹Ù(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "»óÅÂ¹Ù(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM " ¿É¼Ç(&O) . . .", ID_VIEWPROPERTIES @@ -170,7 +171,8 @@ GROUPBOX " µµ±¸¹Ù", 0, 150, 10, 120, 85 CHECKBOX "µµ±¸¹Ù(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Çü½Ä¹Ù(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "»óÅÂ¹Ù(&S)", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "»óÅÂ¹Ù(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc (original) +++ trunk/reactos/base/applications/wordpad/No.rc Mon Jan 28 18:08:37 2008 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 by Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2006-2008 by Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,6 +64,7 @@ BEGIN MENUITEM "Verk&tøylinje", ID_TOGGLE_TOOLBAR MENUITEM "&Formatlinje", ID_TOGGLE_FORMATBAR + MENUITEM "&Linjal", ID_TOGGLE_RULER MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Alternativer . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85 CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc Mon Jan 28 18:08:37 2008 @@ -65,6 +65,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -169,7 +170,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc Mon Jan 28 18:08:37 2008 @@ -27,11 +27,11 @@ MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT + MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð . . .", ID_PREVIEW - MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "Â&ûõîä", ID_FILE_EXIT + MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Â&ûõîä", ID_FILE_EXIT END POPUP "&Ïðàâêà" BEGIN @@ -41,11 +41,11 @@ MENUITEM SEPARATOR MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND - MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT - MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND + MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT + MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED @@ -59,24 +59,25 @@ MENUITEM "Ï&îëó÷èòü òåêñò", ID_EDIT_GETTEXT END END - POPUP "&View" - BEGIN - MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR - MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR - MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES + POPUP "&Âèä" + BEGIN + MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR + MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR + MENUITEM "&Ëèíåéêà", ID_TOGGLE_RULER + MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES END POPUP "Âñò&àâêà" BEGIN - MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME + MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME END POPUP "Ôîð&ìàò" BEGIN - MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö . . ." ID_PARAFORMAT - MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS + MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS + MENUITEM "&Ìàðêåð" ID_BULLET + MENUITEM "&Àáçàö . . ." ID_PARAFORMAT + MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS POPUP "&Ôîí" BEGIN MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 @@ -95,10 +96,10 @@ BEGIN MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö . . ." ID_PARAFORMAT + MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Ìàðêåð" ID_BULLET + MENUITEM "&Àáçàö . . ." ID_PARAFORMAT END END @@ -167,7 +168,8 @@ GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85 CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ëèíåéêà", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -176,7 +178,7 @@ STRING_RICHTEXT_FILES_RTF, "Ôàéëû RTF (*.rtf)" STRING_TEXT_FILES_TXT, "Òåêñòîâûå äîêóìåíòû (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Äîêóìåíòû Unicode (*.txt)" - STRING_ALL_FILES, "Âñå äîêóìíòû (*.*)" + STRING_ALL_FILES, "Âñå äîêóìåíòû (*.*)" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc Mon Jan 28 18:08:37 2008 @@ -67,6 +67,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -171,7 +172,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c Mon Jan 28 18:08:37 2008 @@ -2,7 +2,7 @@ * Wordpad implementation * * Copyright 2004 by Krzysztof Foltman - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * Copyright 2007-2008 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -600,7 +600,7 @@ SendMessageW(hwndReBar, RB_SETBANDINFO, index, (LPARAM)&rbbinfo); } - if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR) + if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR || bandId == BANDID_RULER) store_bar_state(bandId, show); } @@ -618,6 +618,7 @@ set_toolbar_state(BANDID_FONTLIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_SIZELIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_FORMATBAR, is_bar_visible(BANDID_FORMATBAR)); + set_toolbar_state(BANDID_RULER, is_bar_visible(BANDID_RULER)); set_statusbar_state(is_bar_visible(BANDID_STATUSBAR)); update_window(); @@ -912,7 +913,9 @@ CheckDlgButton(hWnd, IDC_PAGEFMT_TB, TRUE); if(barState[ps->lParam] & (1 << BANDID_FORMATBAR)) CheckDlgButton(hWnd, IDC_PAGEFMT_FB, TRUE); - if(barState[ps->lParam] & (BANDID_STATUSBAR)) + if(barState[ps->lParam] & (1 << BANDID_RULER)) + CheckDlgButton(hWnd, IDC_PAGEFMT_RU, TRUE); + if(barState[ps->lParam] & (1 << BANDID_STATUSBAR)) CheckDlgButton(hWnd, IDC_PAGEFMT_SB, TRUE); } break; @@ -928,6 +931,7 @@ case IDC_PAGEFMT_TB: case IDC_PAGEFMT_FB: + case IDC_PAGEFMT_RU: case IDC_PAGEFMT_SB: CheckDlgButton(hWnd, LOWORD(wParam), !IsDlgButtonChecked(hWnd, LOWORD(wParam))); @@ -960,6 +964,11 @@ else barState[id] &= ~(1 << BANDID_FORMATBAR); + if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_RU)) + barState[id] |= (1 << BANDID_RULER); + else + barState[id] &= ~(1 << BANDID_RULER); + if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_SB)) barState[id] |= (1 << BANDID_STATUSBAR); else @@ -1182,7 +1191,7 @@ static int current_units_to_twips(float number) { - int twips = (int)(number * 567); + int twips = (int)(number * TWIPS_PER_CM); return twips; } @@ -1195,7 +1204,7 @@ static void number_with_units(LPWSTR buffer, int number) { - float converted = (float)number / 567; + float converted = (float)number / TWIPS_PER_CM; char string[MAX_STRING_LEN]; sprintf(string, "%.2f ", converted); @@ -1547,7 +1556,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { - HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd; + HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); HANDLE hDLL; TBADDBITMAP ab; @@ -1648,6 +1657,16 @@ rbb.hwndChild = hFormatBarWnd; rbb.wID = BANDID_FORMATBAR; + + SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + + hRulerWnd = CreateWindowExW(0, WC_STATICW, NULL, WS_VISIBLE | WS_CHILD, + 0, 0, 200, 10, hReBarWnd, (HMENU)IDC_RULER, hInstance, NULL); + + + rbb.hwndChild = hRulerWnd; + rbb.wID = BANDID_RULER; + rbb.fStyle |= RBBS_BREAK; SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); @@ -2133,6 +2152,11 @@ update_window(); break; + case ID_TOGGLE_RULER: + set_toolbar_state(BANDID_RULER, !is_bar_visible(BANDID_RULER)); + update_window(); + break; + case ID_DATETIME: { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); @@ -2216,6 +2240,8 @@ CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_TOGGLE_RULER, MF_BYCOMMAND|(is_bar_visible(BANDID_RULER)) ? MF_CHECKED : MF_UNCHECKED); + gt.flags = GTL_NUMCHARS; gt.codepage = 1200; textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); @@ -2241,6 +2267,7 @@ HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); + HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); int rebarHeight = 0; int rebarRows = 2; @@ -2273,6 +2300,8 @@ GetClientRect(hWnd, &rc); MoveWindow(hwndEditor, 0, rebarHeight, rc.right, rc.bottom-nStatusSize-rebarHeight, TRUE); } + + redraw_ruler(hRulerWnd); return DefWindowProcW(hWnd, WM_SIZE, wParam, lParam); } @@ -2364,6 +2393,9 @@ WNDCLASSW wc; MSG msg; RECT rc; + UINT_PTR hPrevRulerProc; + HWND hRulerWnd; + POINTL EditPoint; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -2395,6 +2427,11 @@ get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); + hRulerWnd = GetDlgItem(GetDlgItem(hMainWnd, IDC_REBAR), IDC_RULER); + SendMessageW(GetDlgItem(hMainWnd, IDC_EDITOR), EM_POSFROMCHAR, (WPARAM)&EditPoint, 0); + hPrevRulerProc = SetWindowLongPtrW(hRulerWnd, GWLP_WNDPROC, (UINT_PTR)ruler_proc); + SendMessageW(hRulerWnd, WM_USER, (WPARAM)&EditPoint, hPrevRulerProc); + HandleCommandLine(GetCommandLineW()); while(GetMessageW(&msg,0,0,0)) Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h Mon Jan 28 18:08:37 2008 @@ -1,6 +1,6 @@ /* * Copyright 2004 by Krzysztof Foltman - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * Copyright 2007-2008 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ #define MAX_STRING_LEN 255 +#define TWIPS_PER_CM 567 + #define ID_FILE_EXIT 1000 #define ID_FILE_OPEN 1001 #define ID_FILE_SAVE 1002 @@ -75,6 +77,7 @@ #define ID_TOGGLE_TOOLBAR 1500 #define ID_TOGGLE_FORMATBAR 1501 #define ID_TOGGLE_STATUSBAR 1502 +#define ID_TOGGLE_RULER 1503 #define PREVIEW_BUTTONS 4 @@ -106,10 +109,11 @@ #define IDC_PAGEFMT_TB 100 #define IDC_PAGEFMT_FB 101 -#define IDC_PAGEFMT_SB 102 -#define IDC_PAGEFMT_WW 103 -#define IDC_PAGEFMT_WM 104 -#define IDC_PAGEFMT_ID 105 +#define IDC_PAGEFMT_RU 102 +#define IDC_PAGEFMT_SB 103 +#define IDC_PAGEFMT_WW 104 +#define IDC_PAGEFMT_WM 105 +#define IDC_PAGEFMT_ID 106 #define ID_DATETIME 1600 #define ID_PARAFORMAT 1601 @@ -133,6 +137,7 @@ #define IDC_TABSTOPS 2012 #define IDC_FONTLIST 2013 #define IDC_SIZELIST 2014 +#define IDC_RULER 2015 #define IDD_DATETIME 2100 #define IDD_NEWFILE 2101 @@ -199,6 +204,8 @@ void get_default_printer_opts(void); void registry_set_pagemargins(HKEY); void registry_read_pagemargins(HKEY); +LRESULT CALLBACK ruler_proc(HWND, UINT, WPARAM, LPARAM); +void redraw_ruler(HWND); int reg_formatindex(WPARAM); void registry_read_filelist(HWND);

1 0

[fireball] 32035: - Properly fill ACPI BIOS configuration entry (a couple of ACPI specification structures were added, which should be moved to another header in future). This makes Windows 2003 initialize HAL (ACPI version) properly and be able to connect to the debugger. - Make harddisk identifiers lowercase.
by fireball＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: fireball Date: Mon Jan 28 16:29:45 2008 New Revision: 32035 URL: http://svn.reactos.org/svn/reactos?rev=32035&view=rev Log: - Properly fill ACPI BIOS configuration entry (a couple of ACPI specification structures were added, which should be moved to another header in future). This makes Windows 2003 initialize HAL (ACPI version) properly and be able to connect to the debugger. - Make harddisk identifiers lowercase. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Mon Jan 28 16:29:45 2008 @@ -79,7 +79,7 @@ /* Timeout in ms for sending to keyboard controller. */ #define CONTROLLER_TIMEOUT 250 -static CHAR Hex[] = "0123456789ABCDEF"; +static CHAR Hex[] = "0123456789abcdef"; static unsigned int delay_count = 1; extern ULONG reactos_disk_count; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Mon Jan 28 16:29:45 2008 @@ -23,7 +23,7 @@ BOOLEAN AcpiPresent = FALSE; -static BOOLEAN +static PRSDP_DESCRIPTOR FindAcpiBios(VOID) { PUCHAR Ptr; @@ -36,7 +36,7 @@ { DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); - return TRUE; + return (PRSDP_DESCRIPTOR)Ptr; } Ptr = (PUCHAR)((ULONG)Ptr + 0x10); @@ -44,7 +44,7 @@ DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); - return FALSE; + return NULL; } @@ -52,9 +52,16 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PRSDP_DESCRIPTOR Rsdp; + PACPI_BIOS_DATA AcpiBiosData; + BIOS_MEMORY_MAP BiosMemoryMap[32]; + ULONG BiosMemoryMapEntryCount, TableSize; - if (FindAcpiBios()) + Rsdp = FindAcpiBios(); + + if (Rsdp) { AcpiPresent = TRUE; @@ -65,31 +72,57 @@ AdapterClass, MultiFunctionAdapter, &BiosKey); - + /* Set 'Component Information' */ FldrSetComponentInformation(BiosKey, 0x0, 0x0, 0xFFFFFFFF); - + + /* Get BIOS memory map */ + RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); + BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, + sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); + + /* Calculate the table size */ + TableSize = BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP) + + sizeof(ACPI_BIOS_DATA) - sizeof(BIOS_MEMORY_MAP); + /* Set 'Configuration Data' value */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 0; - PartialResourceList.Revision = 0; - PartialResourceList.Count = 0; + PartialResourceList = + MmHeapAlloc(sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); + memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); + PartialResourceList->Version = 0; + PartialResourceList->Revision = 0; + PartialResourceList->Count = 1; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeDeviceSpecific; + PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; + PartialDescriptor->u.DeviceSpecificData.DataSize = TableSize; + + /* Fill the table */ + AcpiBiosData = (PACPI_BIOS_DATA)&PartialResourceList->PartialDescriptors[1]; + AcpiBiosData->RSDTAddress.LowPart = Rsdp->rsdt_physical_address; + AcpiBiosData->Count = BiosMemoryMapEntryCount; + memcpy(AcpiBiosData->MemoryMap, BiosMemoryMap, + BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); + + DbgPrint((DPRINT_HWDETECT, "RSDT %p, data size %x\n", Rsdp->rsdt_physical_address, + TableSize)); + FldrSetConfigurationData(BiosKey, - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize + ); /* Increment bus number */ (*BusNumber)++; - + /* Set 'Identifier' value */ FldrSetIdentifier(BiosKey, "ACPI BIOS"); + MmFreeMemory(PartialResourceList); } - - /* FIXME: Add congiguration data */ } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h Mon Jan 28 16:29:45 2008 @@ -1,83 +1,107 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __WINLDR_H -#define __WINLDR_H - - -/////////////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Loading Functions -// -/////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); - -/* Entry-point to kernel */ -typedef -VOID -NTAPI -(*KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); - - -// Some definitions -#define SECTOR_SIZE 512 - -// Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 - -// conversion.c -PVOID VaToPa(PVOID Va); -PVOID PaToVa(PVOID Pa); -VOID List_PaToVa(LIST_ENTRY *ListEntry); -VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); - -// peloader.c -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA); - - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry); - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE); - -// wlmemory.c -BOOLEAN -WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - ULONG PcrBasePage, - ULONG TssBasePage, - PVOID GdtIdt); - -// wlregistry.c -BOOLEAN WinLdrLoadAndScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); - - -#endif // defined __WINLDR_H +/* + * FreeLoader + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __WINLDR_H +#define __WINLDR_H + + +/////////////////////////////////////////////////////////////////////////////////////// +// +// ReactOS Loading Functions +// +/////////////////////////////////////////////////////////////////////////////////////// +VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); + +/* Entry-point to kernel */ +typedef +VOID +NTAPI +(*KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); + + +// Some definitions +#define SECTOR_SIZE 512 + +// Descriptors +#define NUM_GDT 128 // Must be 128 +#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 + +// conversion.c +PVOID VaToPa(PVOID Va); +PVOID PaToVa(PVOID Pa); +VOID List_PaToVa(LIST_ENTRY *ListEntry); +VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); + +// peloader.c +BOOLEAN +WinLdrLoadImage(IN PCHAR FileName, + TYPE_OF_MEMORY MemoryType, + OUT PVOID *ImageBasePA); + + +BOOLEAN +WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry); + +BOOLEAN +WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE); + +// wlmemory.c +BOOLEAN +WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + ULONG PcrBasePage, + ULONG TssBasePage, + PVOID GdtIdt); + +// wlregistry.c +BOOLEAN WinLdrLoadAndScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath); + + +/* FIXME: Should be moved to NDK, and respective ACPI header files */ +typedef struct _ACPI_BIOS_DATA +{ + PHYSICAL_ADDRESS RSDTAddress; + ULONGLONG Count; + BIOS_MEMORY_MAP MemoryMap[1]; /* Count of BIOS memory map entries */ +} ACPI_BIOS_DATA, *PACPI_BIOS_DATA; + +#include <pshpack1.h> +typedef struct /* Root System Descriptor Pointer */ +{ + CHAR signature [8]; /* contains "RSD PTR " */ + UCHAR checksum; /* to make sum of struct == 0 */ + CHAR oem_id [6]; /* OEM identification */ + UCHAR revision; /* Must be 0 for 1.0, 2 for 2.0 */ + ULONG rsdt_physical_address; /* 32-bit physical address of RSDT */ + ULONG length; /* XSDT Length in bytes including hdr */ + ULONGLONG xsdt_physical_address; /* 64-bit physical address of XSDT */ + UCHAR extended_checksum; /* Checksum of entire table */ + CHAR reserved [3]; /* reserved field must be 0 */ +} RSDP_DESCRIPTOR, *PRSDP_DESCRIPTOR; +#include <poppack.h> + + +#endif // defined __WINLDR_H Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Mon Jan 28 16:29:45 2008 @@ -77,7 +77,6 @@ #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); - //VerifyHeap(); #endif // DBG // Now return the pointer @@ -174,7 +173,6 @@ #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); - //VerifyHeap(); #endif // DBG // Now return the pointer @@ -228,7 +226,6 @@ #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); - //VerifyHeap(); #endif // DBG // Now return the pointer

1 0

[dreimer] 32034: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010
by dreimer＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: dreimer Date: Mon Jan 28 15:24:05 2008 New Revision: 32034 URL: http://svn.reactos.org/svn/reactos?rev=32034&view=rev Log: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010 Removed: trunk/reactos/base/applications/charmap/manifest.xml trunk/reactos/base/applications/games/winemine/manifest.xml trunk/reactos/base/applications/mmc/manifest.xml trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml trunk/reactos/base/applications/mscutils/servman/manifest.xml trunk/reactos/base/applications/mstsc/manifest.xml trunk/reactos/base/applications/sndvol32/manifest.xml trunk/reactos/base/setup/vmwinst/manifest.xml trunk/reactos/base/shell/explorer-new/manifest.xml trunk/reactos/dll/cpl/access/manifest.xml trunk/reactos/dll/cpl/appwiz/manifest.xml trunk/reactos/dll/cpl/desk/manifest.xml trunk/reactos/dll/cpl/hdwwiz/manifest.xml trunk/reactos/dll/cpl/input/manifest.xml trunk/reactos/dll/cpl/intl/manifest.xml trunk/reactos/dll/cpl/joy/manifest.xml trunk/reactos/dll/cpl/liccpa/manifest.xml trunk/reactos/dll/cpl/main/manifest.xml trunk/reactos/dll/cpl/mmsys/manifest.xml trunk/reactos/dll/cpl/ncpa/manifest.xml trunk/reactos/dll/cpl/powercfg/manifest.xml trunk/reactos/dll/cpl/sysdm/manifest.xml trunk/reactos/dll/cpl/telephon/manifest.xml trunk/reactos/dll/cpl/timedate/manifest.xml trunk/reactos/dll/cpl/usrmgr/manifest.xml trunk/reactos/dll/win32/rasdlg/manifest.xml Modified: trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/mmc/mmc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/joy/joy.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/telephon/telephon.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc Removed: trunk/reactos/base/applications/charmap/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/manifest.xml (original) +++ trunk/reactos/base/applications/charmap/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Character Map</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_ICON ICON "res/charmap.ico" Removed: trunk/reactos/base/applications/games/winemine/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/manifest.xml (original) +++ trunk/reactos/base/applications/games/winemine/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.WineMine" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS WineMine</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -14,11 +14,6 @@ IDB_FACES BITMAP MOVEABLE "rc/faces.bmp" IDB_LEDS BITMAP MOVEABLE "rc/leds.bmp" IDB_MINES BITMAP MOVEABLE "rc/mines.bmp" - -// Common Controls 6.0 for GCC -#if defined(__GNUC__) - 1 24 "manifest.xml" -#endif /* include localised resources */ #include "lang/bg-BG.rc" Removed: trunk/reactos/base/applications/mmc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mani… ============================================================================== --- trunk/reactos/base/applications/mmc/manifest.xml (original) +++ trunk/reactos/base/applications/mmc/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.Management.Console" - type="win32" - /> - <description>ReactOS System Management Console</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/base/applications/mmc/mmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… ============================================================================== --- trunk/reactos/base/applications/mmc/mmc.rc (original) +++ trunk/reactos/base/applications/mmc/mmc.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -1 24 DISCARDABLE "manifest.xml" - IDI_MAINAPP ICON DISCARDABLE resources/mmc.ico #include "rsrc.rc" Removed: trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Device Manager</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_MAIN_ICON ICON "res/computer.ico" IDB_ROOT_IMAGE BITMAP "res/root.bmp" Removed: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS EventLog Viewer</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" // Shared icons IDI_EVENTVWR ICON "res/eventvwr.ico" Removed: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml (original) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Service Manager</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_SM_ICON ICON "res/system.ico" Removed: trunk/reactos/base/applications/mstsc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ma… ============================================================================== --- trunk/reactos/base/applications/mstsc/manifest.xml (original) +++ trunk/reactos/base/applications/mstsc/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Service Manager</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_MSTSC ICON "res/mstsc.ico" IDI_LOGON ICON "res/logon.ico" Removed: trunk/reactos/base/applications/sndvol32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/manifest.xml (original) +++ trunk/reactos/base/applications/sndvol32/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Sound.Volume.Control" - type="win32" - /> - <description>ReactOS Volume Control</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico Removed: trunk/reactos/base/setup/vmwinst/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/manifes… ============================================================================== --- trunk/reactos/base/setup/vmwinst/manifest.xml (original) +++ trunk/reactos/base/setup/vmwinst/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.VMware.SVGA.Installer" - type="win32" - /> - <description>ReactOS VMware(r) SVGA driver Installer</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "vmwinst.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" /* Bitmaps */ IDB_WATERMARK BITMAP "resources/watermark.bmp" Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Mon Jan 28 15:24:05 2008 @@ -7,8 +7,6 @@ #include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -1 24 DISCARDABLE "manifest.xml" IDI_START ICON DISCARDABLE res/start.ico IDB_STARTMENU BITMAP DISCARDABLE res/logov.bmp Removed: trunk/reactos/base/shell/explorer-new/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ma… ============================================================================== --- trunk/reactos/base/shell/explorer-new/manifest.xml (original) +++ trunk/reactos/base/shell/explorer-new/manifest.xml (removed) @@ -1,22 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Explorer" - type="win32" -/> -<description>ROS Explorer</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "access.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLACCESS ICON "resources/applet.ico" #include "rsrc.rc" Removed: trunk/reactos/dll/cpl/access/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/access/manifest.xml (original) +++ trunk/reactos/dll/cpl/access/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_APPICO ICON "resources/1501.ico" IDI_INSTICO ICON "resources/1502.ico" Removed: trunk/reactos/dll/cpl/appwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/manifest.xml (original) +++ trunk/reactos/dll/cpl/appwiz/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "desk.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" Removed: trunk/reactos/dll/cpl/desk/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/desk/manifest.xml (original) +++ trunk/reactos/dll/cpl/desk/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLICON ICON "resources/applet.ico" #include "rsrc.rc" Removed: trunk/reactos/dll/cpl/hdwwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/manifest.xml (original) +++ trunk/reactos/dll/cpl/hdwwiz/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_KEYBOARD_ICO ICON "resources/keyboard.ico" IDI_MARKER_ICO ICON "resources/marker.ico" IDI_MIC_ICO ICON "resources/microphone.ico" Removed: trunk/reactos/dll/cpl/input/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/input/manifest.xml (original) +++ trunk/reactos/dll/cpl/input/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "intl.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON ICON "resources/applet.ico" #include "rsrc.rc" Removed: trunk/reactos/dll/cpl/intl/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/intl/manifest.xml (original) +++ trunk/reactos/dll/cpl/intl/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/joy/joy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rc?rev=320… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.rc (original) +++ trunk/reactos/dll/cpl/joy/joy.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" #include "rsrc.rc" Removed: trunk/reactos/dll/cpl/joy/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/manifest.xml?r… ============================================================================== --- trunk/reactos/dll/cpl/joy/manifest.xml (original) +++ trunk/reactos/dll/cpl/joy/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rc (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rc Mon Jan 28 15:24:05 2008 @@ -11,8 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" #include "rsrc.rc" Removed: trunk/reactos/dll/cpl/liccpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/manifest.xml (original) +++ trunk/reactos/dll/cpl/liccpa/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Mon Jan 28 15:24:05 2008 @@ -11,8 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "main.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" IDI_FOLDER_OPEN ICON "resources/folder_open.ico" Removed: trunk/reactos/dll/cpl/main/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/main/manifest.xml (original) +++ trunk/reactos/dll/cpl/main/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Removed: trunk/reactos/dll/cpl/mmsys/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/manifest.xml (original) +++ trunk/reactos/dll/cpl/mmsys/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "mmsys.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLICON ICON "resources/mmsys.ico" IDI_MUTED_ICON ICON "resources/muted.ico" IDI_MICROPHONE_ICON ICON "resources/microphone.ico" Removed: trunk/reactos/dll/cpl/ncpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/manifest.xml (original) +++ trunk/reactos/dll/cpl/ncpa/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_INTERNAL_NAME "ncpa\0" #define REACTOS_STR_ORIGINAL_FILENAME "ncpa.cpl\0" -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_HORIZONTAL ICON "resources/HORIZ.ICO" IDI_VERTICAL ICON "resources/VERTIC.ICO" Removed: trunk/reactos/dll/cpl/powercfg/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/manifest.xml (original) +++ trunk/reactos/dll/cpl/powercfg/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Mon Jan 28 15:24:05 2008 @@ -11,8 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "powercfg.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_AC ICON "resources/ac.ico" IDI_ACDC ICON "resources/acdc.ico" IDI_DC ICON "resources/dc.ico" Removed: trunk/reactos/dll/cpl/sysdm/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/manifest.xml (original) +++ trunk/reactos/dll/cpl/sysdm/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sysdm.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_USERPROF ICON "resources/devmgr.ico" IDI_HARDPROF ICON "resources/devmgr.ico" Removed: trunk/reactos/dll/cpl/telephon/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/manifest.xml (original) +++ trunk/reactos/dll/cpl/telephon/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rc (original) +++ trunk/reactos/dll/cpl/telephon/telephon.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" #include "rsrc.rc" Removed: trunk/reactos/dll/cpl/timedate/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/manifest.xml (original) +++ trunk/reactos/dll/cpl/timedate/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "timedate.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON ICON "resources/applet.ico" IDC_WORLD BITMAP "resources/world.bmp" Removed: trunk/reactos/dll/cpl/usrmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/manifest.xml (original) +++ trunk/reactos/dll/cpl/usrmgr/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "usrmgr.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_USRMGR_ICON ICON "resources/applet.ico" IDI_USRMGR_ICON2 ICON "resources/applet.ico" Removed: trunk/reactos/dll/win32/rasdlg/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/manifest.… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/manifest.xml (original) +++ trunk/reactos/dll/win32/rasdlg/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.Net.rasdlg" - type="win32" - /> - <description>ReactOS Ras dialog</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/rasdlg.rc (original) +++ trunk/reactos/dll/win32/rasdlg/rasdlg.rc Mon Jan 28 15:24:05 2008 @@ -6,8 +6,6 @@ #define REACTOS_STR_INTERNAL_NAME "rasdlg\0" #define REACTOS_STR_ORIGINAL_FILENAME "rasdlg.dll\0" #include <reactos/version.rc> - -128 24 DISCARDABLE "manifest.xml" 50 ICON "res/icons/50.ico" 51 ICON "res/icons/51.ico"

1 0

[dreimer] 32033: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010
by dreimer＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: dreimer Date: Mon Jan 28 15:24:03 2008 New Revision: 32033 URL: http://svn.reactos.org/svn/reactos?rev=32033&view=rev Log: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010 Removed: trunk/rosapps/downloader/manifest.xml trunk/rosapps/imagesoft/manifest.xml trunk/rosapps/old_wordpad/manifest.xml trunk/rosapps/roscalc/manifest.xml Modified: trunk/rosapps/downloader/downloader.rc trunk/rosapps/imagesoft/imagesoft.rc trunk/rosapps/old_wordpad/wordpad.rc trunk/rosapps/roscalc/resource.rc Modified: trunk/rosapps/downloader/downloader.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rc?r… ============================================================================== --- trunk/rosapps/downloader/downloader.rc (original) +++ trunk/rosapps/downloader/downloader.rc Mon Jan 28 15:24:03 2008 @@ -7,6 +7,4 @@ #include <reactos/version.rc> -1 24 DISCARDABLE "manifest.xml" - #include "rsrc.rc" Removed: trunk/rosapps/downloader/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/manifest.xml?re… ============================================================================== --- trunk/rosapps/downloader/manifest.xml (original) +++ trunk/rosapps/downloader/manifest.xml (removed) @@ -1,22 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Application.Downloader" - type="win32" - /> - <description>ReactOS Downloader</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> Modified: trunk/rosapps/imagesoft/imagesoft.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/imagesoft.rc?rev… ============================================================================== --- trunk/rosapps/imagesoft/imagesoft.rc (original) +++ trunk/rosapps/imagesoft/imagesoft.rc Mon Jan 28 15:24:03 2008 @@ -8,8 +8,6 @@ //#include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -1 24 DISCARDABLE "manifest.xml" IDI_IMAGESOFTICON ICON "res/imagesoft.ico" Removed: trunk/rosapps/imagesoft/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/manifest.xml?rev… ============================================================================== --- trunk/rosapps/imagesoft/manifest.xml (original) +++ trunk/rosapps/imagesoft/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.VMware.SVGA.Installer" - type="win32" - /> - <description>ReactOS VMware(r) SVGA driver Installer</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Removed: trunk/rosapps/old_wordpad/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/old_wordpad/manifest.xml?r… ============================================================================== --- trunk/rosapps/old_wordpad/manifest.xml (original) +++ trunk/rosapps/old_wordpad/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.VMware.SVGA.Installer" - type="win32" - /> - <description>ReactOS VMware(r) SVGA driver Installer</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/rosapps/old_wordpad/wordpad.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/old_wordpad/wordpad.rc?rev… ============================================================================== --- trunk/rosapps/old_wordpad/wordpad.rc (original) +++ trunk/rosapps/old_wordpad/wordpad.rc Mon Jan 28 15:24:03 2008 @@ -6,8 +6,6 @@ #define REACTOS_STR_INTERNAL_NAME "wordpad\0" #define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0" //#include <reactos/version.rc> - -1 24 DISCARDABLE "manifest.xml" STRINGTABLE DISCARDABLE BEGIN Removed: trunk/rosapps/roscalc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/manifest.xml?rev=3… ============================================================================== --- trunk/rosapps/roscalc/manifest.xml (original) +++ trunk/rosapps/roscalc/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Calculator</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=32… ============================================================================== --- trunk/rosapps/roscalc/resource.rc (original) +++ trunk/rosapps/roscalc/resource.rc Mon Jan 28 15:24:03 2008 @@ -30,8 +30,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1 24 DISCARDABLE "manifest.xml" - // Icons IDI_CALC_BIG ICON DISCARDABLE "res/calc.ico"

1 0

[greatlrd] 32032: revert codepage 862 changes from rev 31935 Now swedish should work again in usetup
by greatlrd＠svn.reactos.org 27 Jan '08

27 Jan '08

Author: greatlrd Date: Sun Jan 27 22:21:53 2008 New Revision: 32032 URL: http://svn.reactos.org/svn/reactos?rev=32032&view=rev Log: revert codepage 862 changes from rev 31935 Now swedish should work again in usetup Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h 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 Sun Jan 27 22:21:53 2008 @@ -58,7 +58,7 @@ { 6, 8, - "Vlkommen till ReactOS Setup!", + "Välkommen till ReactOS Setup!", TEXT_HIGHLIGHT }, { @@ -70,37 +70,37 @@ { 6, 12, - "dator och frbereder den andra delen av installationen.", + "dator och förbereder den andra delen av installationen.", TEXT_NORMAL }, { 8, 15, - "\x07 Tryck p ENTER fr att installera ReactOS.", + "\x07 Tryck på ENTER för att installera ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 Tryck p R fr att reparera ReactOS.", + "\x07 Tryck på R för att reparera ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 Tryck p L fr att lsa licensavtalet till ReactOS.", + "\x07 Tryck på L för att läsa licensavtalet till ReactOS.", TEXT_NORMAL }, { 8, 21, - "\x07 Tryck p F3 fr att avbryta installationen av ReactOS.", + "\x07 Tryck på F3 för att avbryta installationen av ReactOS.", TEXT_NORMAL }, { 6, 23, - "Fr mer information om ReactOS, besk:", + "För mer information om ReactOS, besök:", TEXT_NORMAL }, { @@ -112,7 +112,7 @@ { 0, 0, - " ENTER = Fortstt R = Reparera F3 = Avbryt", + " ENTER = Fortsätt R = Reparera F3 = Avbryt", TEXT_STATUS }, { @@ -134,79 +134,79 @@ { 6, 8, - "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", + "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", TEXT_NORMAL }, { 6, 9, - "funktioner som kan frvntas av ett fullt anvndbart setup-program.", + "funktioner som kan förväntas av ett fullt användbart setup-program.", TEXT_NORMAL }, { 6, 12, - "Fljande begrnsningar gller:", + "Följande begränsningar gäller:", TEXT_NORMAL }, { 8, 13, - "- Setup kan ej hantera mer n 1 primr partition per hrddisk.", + "- Setup kan ej hantera mer än 1 primär partition per hårddisk.", TEXT_NORMAL }, { 8, 14, - "- Setup kan ej radera en primr partition frn en hrddisk", + "- Setup kan ej radera en primär partition från en hårddisk", TEXT_NORMAL }, { 8, 15, - " om utkade partitioner existerar p hrddisken.", + " om utökade partitioner existerar på hårddisken.", TEXT_NORMAL }, { 8, 16, - "- Setup kan ej radera den frsta utkade partitionen frn en hrddisk", + "- Setup kan ej radera den första utökade partitionen från en hårddisk", TEXT_NORMAL }, { 8, 17, - " om andra utkade partitioner existerar p hrddisken.", + " om andra utökade partitioner existerar på hårddisken.", TEXT_NORMAL }, { 8, 18, - "- Setup stder endast filsystem av typen FAT.", + "- Setup stöder endast filsystem av typen FAT.", TEXT_NORMAL }, { 8, 19, - "- Kontrollering av hrddiskens filsystem stds (nnu) ej.", + "- Kontrollering av hårddiskens filsystem stöds (ännu) ej.", TEXT_NORMAL }, { 8, 23, - "\x07 Tryck p ENTER fr att installera ReactOS.", + "\x07 Tryck på ENTER för att installera ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 Tryck p F3 fr att avbryta installationen.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt F3 = Avbryt", + "\x07 Tryck på F3 för att avbryta installationen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", TEXT_STATUS }, { @@ -234,67 +234,67 @@ { 8, 8, - "ReactOS r licenserad under GNU GPL med delar", + "ReactOS är licenserad under GNU GPL med delar", TEXT_NORMAL }, { 8, 9, - "av den medfljande koden licenserad under GPL-frenliga", - TEXT_NORMAL - }, - { - 8, - 10, - "licenser ssom X11-, BSD- och GNU LGPL-licenserna.", + "av den medföljande koden licenserad under GPL-förenliga", + TEXT_NORMAL + }, + { + 8, + 10, + "licenser såsom X11-, BSD- och GNU LGPL-licenserna.", TEXT_NORMAL }, { 8, 11, - "All mjukvara som r del av ReactOS r publicerad", + "All mjukvara som är del av ReactOS är publicerad", TEXT_NORMAL }, { 8, 12, - "under GNU GPL, men ven den ursprungliga", + "under GNU GPL, men även den ursprungliga", TEXT_NORMAL }, { 8, 13, - "licensen r upprtthllen.", + "licensen är upprätthållen.", TEXT_NORMAL }, { 8, 15, - "Denna mjukvara har INGEN GARANTI eller begrnsing p anvndning", + "Denna mjukvara har INGEN GARANTI eller begränsing på användning", TEXT_NORMAL }, { 8, 16, - "bortsett frn tillmplig lokal och internationell lag. Licenseringen av", + "bortsett från tillämplig lokal och internationell lag. Licenseringen av", TEXT_NORMAL }, { 8, 17, - "ReactOS tcker endast distrubering till tredje part.", + "ReactOS täcker endast distrubering till tredje part.", TEXT_NORMAL }, { 8, 18, - "Om Ni av ngon anledning ej ftt en kopia av", + "Om Ni av någon anledning ej fått en kopia av", TEXT_NORMAL }, { 8, 19, - "GNU General Public License med ReactOS, besk", + "GNU General Public License med ReactOS, besök", TEXT_NORMAL }, { @@ -312,25 +312,25 @@ { 8, 24, - "Detta r gratis mjukvara; se kllkoden fr restriktioner angende kopiering.", + "Detta är gratis mjukvara; se källkoden för restriktioner angående kopiering.", TEXT_NORMAL }, { 8, 25, - "INGEN GARANTI ges; inte ens fr SLJBARHET eller PASSANDE FR ETT", + "INGEN GARANTI ges; inte ens för SÄLJBARHET eller PASSANDE FÖR ETT", TEXT_NORMAL }, { 8, 26, - "SPECIELLT SYFTE. ALL ANVNDNING SKER P EGEN RISK!", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = tervnd", + "SPECIELLT SYFTE. ALL ANVÄNDNING SKER PÅ EGEN RISK!", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Återvänd", TEXT_STATUS }, { @@ -352,7 +352,7 @@ { 6, 8, - "Listan nedanfr visar instllningarna fr maskinvaran.", + "Listan nedanför visar inställningarna för maskinvaran.", TEXT_NORMAL }, { @@ -364,7 +364,7 @@ { 8, 12, - " Bildskrm:", + " Bildskärm:", TEXT_NORMAL, }, { @@ -387,43 +387,43 @@ }, { 25, - 16, "Acceptera dessa maskinvaruinstllningar", + 16, "Acceptera dessa maskinvaruinställningar", TEXT_NORMAL }, { 6, 19, - "ndra instllningarna genom att trycka p UPP- och NED-piltangenterna", + "Ändra inställningarna genom att trycka på UPP- och NED-piltangenterna", TEXT_NORMAL }, { 6, 20, - "fr att markera en instllning, och tryck p ENTER fr att vlja", + "för att markera en inställning, och tryck på ENTER för att välja", TEXT_NORMAL }, { 6, 21, - "instllningen.", + "inställningen.", TEXT_NORMAL }, { 6, 23, - "Nr alla instllningar r korrekta, vlj \"Acceptera dessa maskinvaruinstllningar\"", + "När alla inställningar är korrekta, välj \"Acceptera dessa maskinvaruinställningar\"", TEXT_NORMAL }, { 6, 24, - "och tryck p ENTER.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt F3 = Avbryt", + "och tryck på ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", TEXT_STATUS }, { @@ -445,13 +445,13 @@ { 6, 8, - "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", + "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", TEXT_NORMAL }, { 6, 9, - "funktioner som kan frvntas av ett fullt anvndbart setup-program.", + "funktioner som kan förväntas av ett fullt användbart setup-program.", TEXT_NORMAL }, { @@ -463,31 +463,31 @@ { 8, 15, - "\x07 Tryck p U fr att uppdatera ReactOS.", + "\x07 Tryck på U för att uppdatera ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 Tryck p R fr terstllningskonsolen.", + "\x07 Tryck på R för Återställningskonsolen.", TEXT_NORMAL }, { 8, 19, - "\x07 Tryck p ESC fr att tervnda till fregende sida.", + "\x07 Tryck på ESC för att återvända till föregående sida.", TEXT_NORMAL }, { 8, 21, - "\x07 Tryck p ENTER fr att starta om datorn.", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = G till fregende sida ENTER = Starta om datorn", + "\x07 Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Gå till föregående sida ENTER = Starta om datorn", TEXT_STATUS }, { @@ -508,37 +508,37 @@ { 6, 8, - "ndra vilken typ av dator som ska installeras.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Anvnd UPP- och NED-piltangenterna fr att vlja nskad datortyp.", + "Ändra vilken typ av dator som ska installeras.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Använd UPP- och NED-piltangenterna för att välja önskad datortyp.", TEXT_NORMAL }, { 8, 11, - " Tryck sen p ENTER.", + " Tryck sen på ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Tryck p ESC fr att tervnda till den fregende sidan utan", + "\x07 Tryck på ESC för att återvända till den föregående sidan utan", TEXT_NORMAL }, { 8, 14, - " att ndra datortypen.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt ESC = tervnd F3 = Avbryt", + " att ändra datortypen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", TEXT_STATUS }, { @@ -560,7 +560,7 @@ { 10, 6, - "Datorn frskrar sig om att all data r lagrad p hrdisken.", + "Datorn försäkrar sig om att all data är lagrad på hårdisken.", TEXT_NORMAL }, { @@ -572,7 +572,7 @@ { 10, 9, - "Nr detta r frdigt kommer datorn att startas om automatiskt.", + "När detta är färdigt kommer datorn att startas om automatiskt.", TEXT_NORMAL }, { @@ -600,31 +600,31 @@ { 10, 6, - "Installationen av ReactOS har inte slutfrts.", - TEXT_NORMAL - }, - { - 10, - 8, - "Se till att ingen floppy-disk finns i floppy-lsare A:", + "Installationen av ReactOS har inte slutförts.", + TEXT_NORMAL + }, + { + 10, + 8, + "Se till att ingen floppy-disk finns i floppy-läsare A:", TEXT_NORMAL }, { 10, 9, - "och tag ur alla skivor frn CD/DVD-lsarna.", + "och tag ur alla skivor från CD/DVD-läsarna.", TEXT_NORMAL }, { 10, 11, - "Tryck p ENTER fr att starta om datorn.", - TEXT_NORMAL - }, - { - 0, - 0, - " Var god vnta ...", + "Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " Var god vänta ...", TEXT_STATUS, }, { @@ -646,36 +646,36 @@ { 6, 8, - "ndra vilken typ av bildskrmsinstllning som ska installeras.", + "Ändra vilken typ av bildskärmsinställning som ska installeras.", TEXT_NORMAL }, { 8, 10, - "\x07 Anvnd UPP- och NED-piltangenterna fr att vlja nskad instllning.", + "\x07 Använd UPP- och NED-piltangenterna för att välja önskad inställning.", TEXT_NORMAL }, { 8, 11, - " Tryck sedan p ENTER.", + " Tryck sedan på ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Tryck p ESC fr att tervnda till den fregende sidan utan", + "\x07 Tryck på ESC för att återvända till den föregående sidan utan", TEXT_NORMAL }, { 8, 14, - " att ndra bildskrmsinstllningen.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt ESC = tervnd F3 = Avbryt", + " att ändra bildskärmsinställningen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", TEXT_STATUS }, { @@ -697,25 +697,25 @@ { 10, 6, - "ReactOS har nu installerats p datorn.", - TEXT_NORMAL - }, - { - 10, - 8, - "Se till att ingen floppy-disk finns i floppy-lsare A:", + "ReactOS har nu installerats på datorn.", + TEXT_NORMAL + }, + { + 10, + 8, + "Se till att ingen floppy-disk finns i floppy-läsare A:", TEXT_NORMAL }, { 10, 9, - "och tag ur alla skivor frn CD/DVD-lsarna.", + "och tag ur alla skivor från CD/DVD-läsarna.", TEXT_NORMAL }, { 10, 11, - "Tryck p ENTER fr att starta om datorn.", + "Tryck på ENTER för att starta om datorn.", TEXT_NORMAL }, { @@ -743,31 +743,31 @@ { 6, 8, - "Setup misslyckades med att installera bootloadern p datorns", + "Setup misslyckades med att installera bootloadern på datorns", TEXT_NORMAL }, { 6, 9, - "hrddisk", + "hårddisk", TEXT_NORMAL }, { 6, 13, - "Var god stt in en formatterad floppy-disk i lsare A: och", + "Var god sätt in en formatterad floppy-disk i läsare A: och", TEXT_NORMAL }, { 6, 14, - "tryck p ENTER.", + "tryck på ENTER.", TEXT_NORMAL, }, { 0, 0, - " ENTER = Fortstt F3 = Avbryt", + " ENTER = Fortsätt F3 = Avbryt", TEXT_STATUS }, {

1 0

[fireball] 32031: - Finally switch to the new memory manager, which is compatible both with ReactOS and NT-style boot types. - Added: memory types for each allocation request, ability to alloc and free memory from the heap, ability to use 1 megabyte of low memory too (which was just wasted previously). - Removed: a bunch of hacky stuff.
by fireball＠svn.reactos.org 27 Jan '08

27 Jan '08

Author: fireball Date: Sun Jan 27 20:38:15 2008 New Revision: 32031 URL: http://svn.reactos.org/svn/reactos?rev=32031&view=rev Log: - Finally switch to the new memory manager, which is compatible both with ReactOS and NT-style boot types. - Added: memory types for each allocation request, ability to alloc and free memory from the heap, ability to use 1 megabyte of low memory too (which was just wasted previously). - Removed: a bunch of hacky stuff. Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Sun Jan 27 20:38:15 2008 @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,6 +43,9 @@ ULONG FreePagesInLookupTable = 0; ULONG LastFreePageHint = 0; +extern ULONG_PTR MmHeapPointer; +extern ULONG_PTR MmHeapStart; + BOOLEAN MmInitializeMemoryManager(VOID) { BIOS_MEMORY_MAP BiosMemoryMap[32]; @@ -93,10 +96,56 @@ MmInitPageLookupTable(PageLookupTableAddress, TotalPagesInLookupTable, BiosMemoryMap, BiosMemoryMapEntryCount); MmUpdateLastFreePageHint(PageLookupTableAddress, TotalPagesInLookupTable); + // Add machine-dependent stuff + // FIXME: this is only for i386 + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // realmode int vectors + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // freeldr stack + cmdline + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x08, 0x70, LoaderLoadedProgram); // freeldr image (roughly max. 0x64 pages) + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x78, 8, LoaderOsloaderStack); // prot mode stack. BIOSCALLBUFFER + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x80, 0x10, LoaderOsloaderHeap); // File system read buffer. FILESYSBUFFER + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x90, 0x10, LoaderOsloaderHeap); // Disk read buffer for int 13h. DISKREADBUFFER + MmMarkPagesInLookupTable(PageLookupTableAddress, 0xA0, 0x60, LoaderFirmwarePermanent); // ROM / Video + MmMarkPagesInLookupTable(PageLookupTableAddress, 0xFFF, 1, LoaderSpecialMemory); // unusable memory + + // This one is strange, without it WinNT crashes with PHASE0_EXCEPTION + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x59, 0x5, LoaderFirmwarePermanent); + FreePagesInLookupTable = MmCountFreePagesInLookupTable(PageLookupTableAddress, TotalPagesInLookupTable); + + MmInitializeHeap(PageLookupTableAddress); DbgPrint((DPRINT_MEMORY, "Memory Manager initialized. %d pages available.\n", FreePagesInLookupTable)); return TRUE; +} + +VOID MmInitializeHeap(PVOID PageLookupTable) +{ + ULONG PagesNeeded; + ULONG HeapStart; + + // HACK: Make it so it doesn't overlap kernel space + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, LoaderSystemCode); + + // Find contigious memory block for HEAP:STACK + PagesNeeded = HEAP_PAGES + STACK_PAGES; + HeapStart = MmFindAvailablePages(PageLookupTable, TotalPagesInLookupTable, PagesNeeded, FALSE); + + // Unapply the hack + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, LoaderFree); + + if (HeapStart == 0) + { + UiMessageBox("Critical error: Can't allocate heap!"); + return; + } + + // Initialize BGET + bpool(HeapStart << MM_PAGE_SHIFT, PagesNeeded << MM_PAGE_SHIFT); + + // Mark those pages as used + MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded, LoaderOsloaderHeap); + + DbgPrint((DPRINT_MEMORY, "Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded)); } #ifdef DBG @@ -188,13 +237,21 @@ RtlCopyMemory(TempBiosMemoryMap, BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); MmSortBiosMemoryMap(TempBiosMemoryMap, MapCount); + // Find a place, starting from the highest memory + // (thus leaving low memory for kernel/drivers) for (Index=(MapCount-1); Index>=0; Index--) { // If this is usable memory with a big enough length // then we'll put our page lookup table here - if (TempBiosMemoryMap[Index].Type == BiosMemoryUsable && TempBiosMemoryMap[Index].Length >= PageLookupTableSize) - { - PageLookupTableMemAddress = (PVOID)(ULONG)(TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); + + // skip if this is not usable region + if (TempBiosMemoryMap[Index].Type != BiosMemoryUsable) + continue; + + if (TempBiosMemoryMap[Index].Length >= PageLookupTableSize) + { + PageLookupTableMemAddress = (PVOID)(ULONG) + (TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); break; } } @@ -241,7 +298,7 @@ // Mark every page as allocated initially // We will go through and mark pages again according to the memory map // But this will mark any holes not described in the map as allocated - MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, 1); + MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, LoaderFirmwarePermanent); for (Index=0; Index<MapCount; Index++) { @@ -254,8 +311,9 @@ } // Mark the low memory region below 1MB as reserved (256 pages in region) - DbgPrint((DPRINT_MEMORY, "Marking the low 1MB region as reserved.\n")); - MmMarkPagesInLookupTable(PageLookupTable, 0, 256, LoaderFirmwarePermanent); + //FIXME: Not needed now since we mark low 1Mb with really used and free areas + //DbgPrint((DPRINT_MEMORY, "Marking the low 1MB region as reserved.\n")); + //MmMarkPagesInLookupTable(PageLookupTable, 0, 256, LoaderFirmwarePermanent); // Mark the pages that the lookup table occupies as reserved PageLookupTableStartPage = MmGetPageNumberFromAddress(PageLookupTable); @@ -271,10 +329,12 @@ for (Index=StartPage; Index<(StartPage+PageCount); Index++) { +#if 0 if ((Index <= (StartPage + 16)) || (Index >= (StartPage+PageCount-16))) { DbgPrint((DPRINT_MEMORY, "Index = %d StartPage = %d PageCount = %d\n", Index, StartPage, PageCount)); } +#endif RealPageLookupTable[Index].PageAllocated = PageAllocated; RealPageLookupTable[Index].PageAllocationLength = (PageAllocated != LoaderFree) ? 1 : 0; } @@ -288,7 +348,7 @@ for (Index=StartPage; Index<(StartPage+PageCount); Index++) { - RealPageLookupTable[Index].PageAllocated = LoaderSystemCode; + RealPageLookupTable[Index].PageAllocated = MemoryType; RealPageLookupTable[Index].PageAllocationLength = (Index == StartPage) ? PageCount : 0; } } @@ -326,7 +386,8 @@ if (FromEnd) { /* Allocate "high" (from end) pages */ - for (Index=LastFreePageHint-1; Index>0; Index--) + for (Index=/*LastFreePageHint-1*/LOADER_HIGH_ZONE-1; Index>0; Index--) + //for (Index=LastFreePageHint-1; Index>0; Index--) { if (RealPageLookupTable[Index].PageAllocated != LoaderFree) { Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Sun Jan 27 20:38:15 2008 @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,35 +20,10 @@ #include <freeldr.h> #include <debug.h> -ULONG AllocationCount = 0; - -#ifdef DBG -VOID VerifyHeap(VOID); +#ifdef DBG VOID DumpMemoryAllocMap(VOID); -VOID IncrementAllocationCount(VOID); -VOID DecrementAllocationCount(VOID); VOID MemAllocTest(VOID); #endif // DBG - -/* - * Hack alert - * Normally, we allocate whole pages. This is ofcourse wastefull for small - * allocations (a few bytes). So, for small allocations (smaller than a page) - * we sub-allocate. When the first small allocation is done, a page is - * requested. We keep a pointer to that page in SubAllocationPage. The alloc - * is satisfied by returning a pointer to the beginning of the page. We also - * keep track of how many bytes are still available in the page in SubAllocationRest. - * When the next small request comes in, we try to allocate it just after the - * memory previously allocated. If it won't fit, we allocate a new page and - * the whole process starts again. - * Note that suballocations are done back-to-back, there's no bookkeeping at all. - * That also means that we cannot really free suballocations. So, when a free is - * done and it is determined that this might be a free of a sub-allocation, we - * just no-op the free. - * Perhaps we should use the heap routines from ntdll here. - */ -static PVOID SubAllocationPage = NULL; -static unsigned SubAllocationRest = 0; BOOLEAN AllocateFromEnd = TRUE; @@ -71,12 +46,6 @@ } MemorySize = ROUND_UP(MemorySize, 4); - if (MemorySize <= SubAllocationRest) - { - MemPointer = (PVOID)((ULONG_PTR)SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest); - SubAllocationRest -= MemorySize; - return MemPointer; - } // Find out how many blocks it will take to // satisfy this allocation @@ -86,7 +55,7 @@ // then return NULL if (FreePagesInLookupTable < PagesNeeded) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -95,7 +64,7 @@ if (FirstFreePageFromEnd == (ULONG)-1) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -105,22 +74,47 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); - if (MemorySize < MM_PAGE_SIZE) - { - SubAllocationPage = MemPointer; - SubAllocationRest = MM_PAGE_SIZE - MemorySize; - } - - -#ifdef DBG - IncrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); +#ifdef DBG + DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); #endif // DBG // Now return the pointer return MemPointer; +} + +PVOID MmHeapAlloc(ULONG MemorySize) +{ + PVOID Result; + LONG CurAlloc, TotalFree, MaxFree, NumberOfGets, NumberOfRels; + + if (MemorySize > MM_PAGE_SIZE) + { + DbgPrint((DPRINT_MEMORY, "Consider using other functions to allocate %d bytes of memory!\n", MemorySize)); + } + + // Get the buffer from BGET pool + Result = bget(MemorySize); + + if (Result == NULL) + { + DbgPrint((DPRINT_MEMORY, "Heap allocation for %d bytes failed\n", MemorySize)); + } + + // Gather some stats + bstats(&CurAlloc, &TotalFree, &MaxFree, &NumberOfGets, &NumberOfRels); + + DbgPrint((DPRINT_MEMORY, "Current alloced %d bytes, free %d bytes, allocs %d, frees %d\n", + CurAlloc, TotalFree, NumberOfGets, NumberOfRels)); + + return Result; +} + +VOID MmHeapFree(PVOID MemoryPointer) +{ + // Release the buffer to the pool + brel(MemoryPointer); } PVOID MmAllocateMemory(ULONG MemorySize) @@ -155,7 +149,7 @@ { DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemoryAtAddress(). " "Not enough free memory to allocate %d bytes (requesting %d pages but have only %d). " - "AllocationCount: %d\n", MemorySize, PagesNeeded, FreePagesInLookupTable, AllocationCount)); + "\n", MemorySize, PagesNeeded, FreePagesInLookupTable)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -163,8 +157,8 @@ if (MmAreMemoryPagesAvailable(PageLookupTableAddress, TotalPagesInLookupTable, DesiredAddress, PagesNeeded) == FALSE) { DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemoryAtAddress(). " - "Not enough free memory to allocate %d bytes at address %p. AllocationCount: %d\n", - MemorySize, DesiredAddress, AllocationCount)); + "Not enough free memory to allocate %d bytes at address %p.\n", + MemorySize, DesiredAddress)); // Don't tell this to user since caller should try to alloc this memory // at a different address @@ -178,8 +172,7 @@ MemPointer = (PVOID)(StartPageNumber * MM_PAGE_SIZE); #ifdef DBG - IncrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, StartPageNumber, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); #endif // DBG @@ -213,7 +206,7 @@ // then return NULL if (FreePagesInLookupTable < PagesNeeded) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -222,7 +215,7 @@ if (FirstFreePageFromEnd == 0) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -233,8 +226,7 @@ MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); #ifdef DBG - IncrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); #endif // DBG @@ -245,141 +237,9 @@ VOID MmFreeMemory(PVOID MemoryPointer) { - ULONG PageNumber; - ULONG PageCount; - ULONG Idx; - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; - -#ifdef DBG - - // Make sure we didn't get a bogus pointer - if (MemoryPointer >= (PVOID)(TotalPagesInLookupTable * MM_PAGE_SIZE)) - { - BugCheck((DPRINT_MEMORY, "Bogus memory pointer (0x%x) passed to MmFreeMemory()\n", MemoryPointer)); - } -#endif // DBG - - // Find out the page number of the first - // page of memory they allocated - PageNumber = MmGetPageNumberFromAddress(MemoryPointer); - PageCount = RealPageLookupTable[PageNumber].PageAllocationLength; - -#ifdef DBG - // Make sure we didn't get a bogus pointer - if ((PageCount < 1) || (PageCount > (TotalPagesInLookupTable - PageNumber))) - { - BugCheck((DPRINT_MEMORY, "Invalid page count in lookup table. PageLookupTable[%d].PageAllocationLength = %d\n", PageNumber, RealPageLookupTable[PageNumber].PageAllocationLength)); - } - - // Loop through our array check all the pages - // to make sure they are allocated with a length of 0 - for (Idx=PageNumber+1; Idx<(PageNumber + PageCount); Idx++) - { - if ((RealPageLookupTable[Idx].PageAllocated == LoaderFree) || - (RealPageLookupTable[Idx].PageAllocationLength != 0)) - { - BugCheck((DPRINT_MEMORY, "Invalid page entry in lookup table, PageAllocated should = 1 and PageAllocationLength should = 0 because this is not the first block in the run. PageLookupTable[%d].PageAllocated = %d PageLookupTable[%d].PageAllocationLength = %d\n", PageNumber, RealPageLookupTable[PageNumber].PageAllocated, PageNumber, RealPageLookupTable[PageNumber].PageAllocationLength)); - } - } - -#endif - - /* If this allocation is only a single page, it could be a sub-allocated page. - * Just don't free it */ - if (1 == PageCount) - { - return; - } - - // Loop through our array and mark all the - // blocks as free - for (Idx=PageNumber; Idx<(PageNumber + PageCount); Idx++) - { - RealPageLookupTable[Idx].PageAllocated = LoaderFree; - RealPageLookupTable[Idx].PageAllocationLength = 0; - } - - FreePagesInLookupTable += PageCount; - -#ifdef DBG - DecrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Freed %d pages of memory starting at page %d. AllocationCount: %d\n", PageCount, PageNumber, AllocationCount)); - //VerifyHeap(); -#endif // DBG -} - -PVOID MmHeapAlloc(ULONG MemorySize) -{ - // Temporary forwarder... - return MmAllocateMemoryWithType(MemorySize, LoaderOsloaderHeap); -} - -VOID MmHeapFree(PVOID MemoryPointer) -{ - // Stub for WinLdr -} - - -#ifdef DBG -VOID VerifyHeap(VOID) -{ - ULONG Idx; - ULONG Idx2; - ULONG Count; - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; - - if (DUMP_MEM_MAP_ON_VERIFY) - { - DumpMemoryAllocMap(); - } - - // Loop through the array and verify that - // everything is kosher - for (Idx=0; Idx<TotalPagesInLookupTable; Idx++) - { - // Check if this block is allocated - if (RealPageLookupTable[Idx].PageAllocated != LoaderFree) - { - // This is the first block in the run so it - // had better have a length that is within range - if ((RealPageLookupTable[Idx].PageAllocationLength < 1) || (RealPageLookupTable[Idx].PageAllocationLength > (TotalPagesInLookupTable - Idx))) - { - BugCheck((DPRINT_MEMORY, "Allocation length out of range in heap table. PageLookupTable[Idx].PageAllocationLength = %d\n", RealPageLookupTable[Idx].PageAllocationLength)); - } - - // Now go through and verify that the rest of - // this run has the blocks marked allocated - // with a length of zero but don't check the - // first one because we already did - Count = RealPageLookupTable[Idx].PageAllocationLength; - for (Idx2=1; Idx2<Count; Idx2++) - { - // Make sure it's allocated - if (RealPageLookupTable[Idx + Idx2].PageAllocated == LoaderFree) - { - BugCheck((DPRINT_MEMORY, "Lookup table indicates hole in memory allocation. RealPageLookupTable[Idx + Idx2].PageAllocated == 0\n")); - } - - // Make sure the length is zero - if (RealPageLookupTable[Idx + Idx2].PageAllocationLength != 0) - { - BugCheck((DPRINT_MEMORY, "Allocation chain has non-zero value in non-first block in lookup table. RealPageLookupTable[Idx + Idx2].PageAllocationLength != 0\n")); - } - } - - // Move on to the next run - Idx += (Count - 1); - } - else - { - // Nope, not allocated so make sure the length is zero - if (RealPageLookupTable[Idx].PageAllocationLength != 0) - { - BugCheck((DPRINT_MEMORY, "Free block is start of memory allocation. RealPageLookupTable[Idx].PageAllocationLength != 0\n")); - } - } - } -} +} + +#ifdef DBG VOID DumpMemoryAllocMap(VOID) { @@ -393,7 +253,7 @@ if ((Idx % 32) == 0) { DbgPrint((DPRINT_MEMORY, "\n")); - DbgPrint((DPRINT_MEMORY, "%x:\t", (Idx * MM_PAGE_SIZE))); + DbgPrint((DPRINT_MEMORY, "%08x:\t", (Idx * MM_PAGE_SIZE))); } else if ((Idx % 4) == 0) { @@ -455,47 +315,6 @@ DbgPrint((DPRINT_MEMORY, "\n")); } - -VOID IncrementAllocationCount(VOID) -{ - AllocationCount++; -} - -VOID DecrementAllocationCount(VOID) -{ - AllocationCount--; -} - -VOID MemAllocTest(VOID) -{ - PVOID MemPtr1; - PVOID MemPtr2; - PVOID MemPtr3; - PVOID MemPtr4; - PVOID MemPtr5; - - MemPtr1 = MmAllocateMemory(4096); - printf("MemPtr1: 0x%x\n", (int)MemPtr1); - MachConsGetCh(); - MemPtr2 = MmAllocateMemory(4096); - printf("MemPtr2: 0x%x\n", (int)MemPtr2); - MachConsGetCh(); - MemPtr3 = MmAllocateMemory(4096); - printf("MemPtr3: 0x%x\n", (int)MemPtr3); - DumpMemoryAllocMap(); - VerifyHeap(); - MachConsGetCh(); - - MmFreeMemory(MemPtr2); - MachConsGetCh(); - - MemPtr4 = MmAllocateMemory(2048); - printf("MemPtr4: 0x%x\n", (int)MemPtr4); - MachConsGetCh(); - MemPtr5 = MmAllocateMemory(4096); - printf("MemPtr5: 0x%x\n", (int)MemPtr5); - MachConsGetCh(); -} #endif // DBG ULONG GetSystemMemorySize(VOID)

1 0

[fireball] 32030: - Map APIC pages, if they are present. - Set the size of the memory new MM uses to 24Mb. - Set heap size to 4Mb. - Misc code cleanup.
by fireball＠svn.reactos.org 27 Jan '08

27 Jan '08

Author: fireball Date: Sun Jan 27 20:22:57 2008 New Revision: 32030 URL: http://svn.reactos.org/svn/reactos?rev=32030&view=rev Log: - Map APIC pages, if they are present. - Set the size of the memory new MM uses to 24Mb. - Set heap size to 4Mb. - Misc code cleanup. Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h Sun Jan 27 20:22:57 2008 @@ -50,10 +50,10 @@ // // This is the zone which is used by the OS loader // -#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page +#define LOADER_HIGH_ZONE ((24*1024*1024) >> MM_PAGE_SHIFT) // 24Mb // HEAP and STACK size -#define HEAP_PAGES 0x100//0x18 +#define HEAP_PAGES 0x400 #define STACK_PAGES 0x00 typedef struct Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Sun Jan 27 20:22:57 2008 @@ -41,6 +41,7 @@ #define STARTUP_BASE 0xC0000000 #define HYPERSPACE_BASE 0xC0400000 #define HAL_BASE 0xFFC00000 +#define APIC_BASE 0xFFFE0000 #define LowMemPageTableIndex 0 #define StartupPageTableIndex (STARTUP_BASE >> 22) Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sun Jan 27 20:22:57 2008 @@ -100,7 +100,7 @@ /* GLOBALS ***************************************************************/ PHARDWARE_PTE PDE; -PHARDWARE_PTE HalPT; +PHARDWARE_PTE HalPageTable; PUCHAR PhysicalPageTablesBuffer; PUCHAR KernelPageTablesBuffer; @@ -151,10 +151,10 @@ PDE[HYPER_SPACE_ENTRY].Write = 1; // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) - HalPT = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; + HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; // Map it - PDE[1023].PageFrameNumber = (ULONG)HalPT >> MM_PAGE_SHIFT; + PDE[1023].PageFrameNumber = (ULONG)HalPageTable >> MM_PAGE_SHIFT; PDE[1023].Valid = 1; PDE[1023].Write = 1; @@ -387,6 +387,52 @@ } } } + +#ifdef _M_IX86 + +BOOLEAN LocalAPIC = FALSE; +ULONG_PTR APICAddress = 0; + +VOID +WinLdrpMapApic() +{ + /* Check if we have a local APIC */ + asm(".intel_syntax noprefix\n"); + asm("mov eax, 1\n"); + asm("cpuid\n"); + asm("shr edx, 9\n"); + asm("and edx, 0x1\n"); + asm("mov _LocalAPIC, edx\n"); + asm(".att_syntax\n"); + + /* If there is no APIC, just return */ + if (!LocalAPIC) + return; + + asm(".intel_syntax noprefix\n"); + asm("mov ecx, 0x1B\n"); + asm("rdmsr\n"); + asm("mov edx, eax\n"); + asm("and edx, 0xFFFFF000\n"); + asm("mov _APICAddress, edx"); + asm(".att_syntax\n"); + + DbgPrint((DPRINT_WINDOWS, "Local APIC detected at address 0x%x\n", + APICAddress)); + + /* Map it */ + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber + = APICAddress >> MM_PAGE_SHIFT; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; +} +#else +VOID +WinLdrpMapApic() +{ + /* Implement it for another arch */ +} +#endif BOOLEAN WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, @@ -525,17 +571,20 @@ }*/ //VideoDisplayString(L"Hello from VGA, going into the kernel\n"); - DbgPrint((DPRINT_WINDOWS, "HalPT: 0x%X\n", HalPT)); + DbgPrint((DPRINT_WINDOWS, "HalPageTable: 0x%X\n", HalPageTable)); // Page Tables have been setup, make special handling for PCR and TSS // (which is done in BlSetupFotNt in usual ntldr) - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; + HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + + HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; + HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + + // Map APIC + WinLdrpMapApic(); // Map VGA memory //VideoMemoryBase = MmMapIoSpace(0xb8000, 4000, MmNonCached); @@ -775,7 +824,7 @@ pGdt[7].HighWord.Bytes.BaseHi = 0; // - // Some BIOS fuck (0x40) + // Some BIOS stuff (0x40) // pGdt[8].LimitLow = 0xFFFF; pGdt[8].BaseLow = 0x400; @@ -828,7 +877,7 @@ // Video buffer Selector (0x68) // pGdt[13].LimitLow = 0x3FFF; - pGdt[13].BaseLow = 0x8000; //FIXME: I guess not correct for UGA + pGdt[13].BaseLow = 0x8000; pGdt[13].HighWord.Bytes.BaseMid = 0x0B; pGdt[13].HighWord.Bytes.Flags1 = 0x92; pGdt[13].HighWord.Bytes.Flags2 = 0; @@ -846,7 +895,7 @@ // // Some unused descriptors should go here - // ... + // // Copy the old IDT RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit);

1 0

[fireball] 32029: - Make small allocations from the heap.
by fireball＠svn.reactos.org 27 Jan '08

27 Jan '08

Author: fireball Date: Sun Jan 27 17:18:30 2008 New Revision: 32029 URL: http://svn.reactos.org/svn/reactos?rev=32029&view=rev Log: - Make small allocations from the heap. Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Sun Jan 27 17:18:30 2008 @@ -98,7 +98,7 @@ // We will need to add the block to the // drive's list of cached blocks. So allocate // the block memory. - CacheBlock = MmAllocateMemory(sizeof(CACHE_BLOCK)); + CacheBlock = MmHeapAlloc(sizeof(CACHE_BLOCK)); if (CacheBlock == NULL) { return NULL; @@ -111,7 +111,7 @@ CacheBlock->BlockData = MmAllocateMemory(CacheDrive->BlockSize * CacheDrive->BytesPerSector); if (CacheBlock->BlockData ==NULL) { - MmFreeMemory(CacheBlock); + MmHeapFree(CacheBlock); return NULL; } @@ -119,7 +119,7 @@ if (!MachDiskReadLogicalSectors(CacheDrive->DriveNumber, (BlockNumber * CacheDrive->BlockSize), CacheDrive->BlockSize, (PVOID)DISKREADBUFFER)) { MmFreeMemory(CacheBlock->BlockData); - MmFreeMemory(CacheBlock); + MmHeapFree(CacheBlock); return NULL; } RtlCopyMemory(CacheBlock->BlockData, (PVOID)DISKREADBUFFER, CacheDrive->BlockSize * CacheDrive->BytesPerSector); @@ -162,7 +162,7 @@ // Free the block memory and the block structure MmFreeMemory(CacheBlockToFree->BlockData); - MmFreeMemory(CacheBlockToFree); + MmHeapFree(CacheBlockToFree); // Update the cache data CacheBlockCount--; Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c Sun Jan 27 17:18:30 2008 @@ -71,7 +71,7 @@ ListEntry); MmFreeMemory(NextCacheBlock->BlockData); - MmFreeMemory(NextCacheBlock); + MmHeapFree(NextCacheBlock); } }

1 0

[fireball] 32028: - Add cache enable switch to fat.c. Comment out #define CACHE_ENABLED if you don't want freeldr to cache peripheral devices access.
by fireball＠svn.reactos.org 27 Jan '08

27 Jan '08

Author: fireball Date: Sun Jan 27 17:13:20 2008 New Revision: 32028 URL: http://svn.reactos.org/svn/reactos?rev=32028&view=rev Log: - Add cache enable switch to fat.c. Comment out #define CACHE_ENABLED if you don't want freeldr to cache peripheral devices access. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Sun Jan 27 17:13:20 2008 @@ -21,6 +21,8 @@ #define NDEBUG #include <debug.h> + +#define CACHE_ENABLED ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ @@ -334,6 +336,7 @@ } MmHeapFree(FatVolumeBootSector); +#ifdef CACHE_ENABLED // // Initialize the disk cache for this drive // @@ -354,6 +357,20 @@ return FALSE; } } +#else + { + GEOMETRY DriveGeometry; + ULONG BlockSize; + + // Initialize drive by getting its geometry + if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) + { + return FALSE; + } + + BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); + } +#endif return TRUE; } @@ -1405,7 +1422,21 @@ BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { +#ifdef CACHE_ENABLED return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); +#else + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { + return FALSE; + } + + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + + // Return success + return TRUE; +#endif } const FS_VTBL FatVtbl = {

1 0

[pschweitzer] 32027: Get back DO_DIRECT_IO flag that has been removed in r31747
by pschweitzer＠svn.reactos.org 27 Jan '08

27 Jan '08

Author: pschweitzer Date: Sun Jan 27 16:51:48 2008 New Revision: 32027 URL: http://svn.reactos.org/svn/reactos?rev=32027&view=rev Log: Get back DO_DIRECT_IO flag that has been removed in r31747 Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Sun Jan 27 16:51:48 2008 @@ -89,6 +89,8 @@ WARN_(NTFS, "IoCreateDevice failed with status: %lx\n", Status); goto ErrorEnd; } + + NtfsGlobalData->DeviceObject->Flags |= DO_DIRECT_IO; /* Register file system */ IoRegisterFileSystem(NtfsGlobalData->DeviceObject);

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