Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[dreimer] 32142: Move and rename all rc files of rosapps according to our standards.
by dreimer＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: dreimer Date: Tue Feb 5 20:00:30 2008 New Revision: 32142 URL: http://svn.reactos.org/svn/reactos?rev=32142&view=rev Log: Move and rename all rc files of rosapps according to our standards. Added: trunk/rosapps/packmgr/gui/lang/ trunk/rosapps/packmgr/gui/lang/cs-CZ.rc (with props) trunk/rosapps/packmgr/gui/lang/de-DE.rc (with props) trunk/rosapps/packmgr/gui/lang/en-US.rc (with props) trunk/rosapps/packmgr/gui/lang/es-ES.rc (with props) trunk/rosapps/packmgr/gui/lang/fr-FR.rc (with props) trunk/rosapps/packmgr/gui/lang/pl-PL.rc (with props) trunk/rosapps/packmgr/gui/lang/ru-RU.rc (with props) trunk/rosapps/packmgr/gui/lang/uk-UA.rc (with props) trunk/rosapps/packmgr/lib/lang/ trunk/rosapps/packmgr/lib/lang/cs-CZ.rc (with props) trunk/rosapps/packmgr/lib/lang/de-DE.rc (with props) trunk/rosapps/packmgr/lib/lang/en-US.rc (with props) trunk/rosapps/packmgr/lib/lang/es-ES.rc (with props) trunk/rosapps/packmgr/lib/lang/fr-FR.rc (with props) trunk/rosapps/packmgr/lib/lang/pl-PL.rc (with props) trunk/rosapps/packmgr/lib/lang/ru-RU.rc (with props) trunk/rosapps/packmgr/lib/lang/uk-UA.rc (with props) trunk/rosapps/sysutils/ctm/lang/ trunk/rosapps/sysutils/ctm/lang/de-DE.rc (with props) trunk/rosapps/sysutils/ctm/lang/el-GR.rc (with props) trunk/rosapps/sysutils/ctm/lang/en-US.rc (with props) trunk/rosapps/sysutils/ctm/lang/fr-FR.rc (with props) trunk/rosapps/sysutils/ctm/lang/ru-RU.rc (with props) trunk/rosapps/sysutils/ctm/lang/uk-UA.rc (with props) trunk/rosapps/write/lang/ trunk/rosapps/write/lang/de-DE.rc (with props) trunk/rosapps/write/lang/en-US.rc (with props) trunk/rosapps/write/lang/fr-FR.rc (with props) trunk/rosapps/write/lang/ko-KO.rc (with props) trunk/rosapps/write/lang/pl-PL.rc (with props) trunk/rosapps/write/lang/sk-SK.rc (with props) trunk/rosapps/write/lang/uk-UA.rc (with props) Removed: trunk/rosapps/packmgr/gui/cz.rc trunk/rosapps/packmgr/gui/de.rc trunk/rosapps/packmgr/gui/en.rc trunk/rosapps/packmgr/gui/es.rc trunk/rosapps/packmgr/gui/fr.rc trunk/rosapps/packmgr/gui/pl.rc trunk/rosapps/packmgr/gui/ru.rc trunk/rosapps/packmgr/gui/uk.rc trunk/rosapps/packmgr/lib/cz.rc trunk/rosapps/packmgr/lib/de.rc trunk/rosapps/packmgr/lib/en.rc trunk/rosapps/packmgr/lib/es.rc trunk/rosapps/packmgr/lib/fr.rc trunk/rosapps/packmgr/lib/pl.rc trunk/rosapps/packmgr/lib/ru.rc trunk/rosapps/packmgr/lib/uk.rc trunk/rosapps/sysutils/ctm/De.rc trunk/rosapps/sysutils/ctm/En.rc trunk/rosapps/sysutils/ctm/Fr.rc trunk/rosapps/sysutils/ctm/Gr.rc trunk/rosapps/sysutils/ctm/Ru.rc trunk/rosapps/sysutils/ctm/Uk.rc trunk/rosapps/write/De.rc trunk/rosapps/write/En.rc trunk/rosapps/write/Fr.rc trunk/rosapps/write/Ko.rc trunk/rosapps/write/Pl.rc trunk/rosapps/write/Sk.rc trunk/rosapps/write/Uk.rc Modified: trunk/rosapps/packmgr/gui/packmgr.rc trunk/rosapps/packmgr/lib/package.rc trunk/rosapps/sysutils/ctm/ctm.rc trunk/rosapps/write/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/rosapps/packmgr/gui/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/cz.rc?rev=3214… Removed: trunk/rosapps/packmgr/gui/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/de.rc?rev=3214… Removed: trunk/rosapps/packmgr/gui/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/en.rc?rev=3214… Removed: trunk/rosapps/packmgr/gui/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/es.rc?rev=3214… Removed: trunk/rosapps/packmgr/gui/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/fr.rc?rev=3214… Added: trunk/rosapps/packmgr/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/cs-CZ.rc?… Added: trunk/rosapps/packmgr/gui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/de-DE.rc?… Added: trunk/rosapps/packmgr/gui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/en-US.rc?… Added: trunk/rosapps/packmgr/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/es-ES.rc?… Added: trunk/rosapps/packmgr/gui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/fr-FR.rc?… Added: trunk/rosapps/packmgr/gui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/pl-PL.rc?… Added: trunk/rosapps/packmgr/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/ru-RU.rc?… Added: trunk/rosapps/packmgr/gui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/uk-UA.rc?… Modified: trunk/rosapps/packmgr/gui/packmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/packmgr.rc?rev… Removed: trunk/rosapps/packmgr/gui/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/pl.rc?rev=3214… Removed: trunk/rosapps/packmgr/gui/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/ru.rc?rev=3214… Removed: trunk/rosapps/packmgr/gui/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/uk.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/cz.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/de.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/en.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/es.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/fr.rc?rev=3214… Added: trunk/rosapps/packmgr/lib/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/cs-CZ.rc?… Added: trunk/rosapps/packmgr/lib/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/de-DE.rc?… Added: trunk/rosapps/packmgr/lib/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/en-US.rc?… Added: trunk/rosapps/packmgr/lib/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/es-ES.rc?… Added: trunk/rosapps/packmgr/lib/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/fr-FR.rc?… Added: trunk/rosapps/packmgr/lib/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/pl-PL.rc?… Added: trunk/rosapps/packmgr/lib/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/ru-RU.rc?… Added: trunk/rosapps/packmgr/lib/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/uk-UA.rc?… Modified: trunk/rosapps/packmgr/lib/package.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/package.rc?rev… Removed: trunk/rosapps/packmgr/lib/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/pl.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/ru.rc?rev=3214… Removed: trunk/rosapps/packmgr/lib/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/uk.rc?rev=3214… Removed: trunk/rosapps/sysutils/ctm/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/De.rc?rev=321… Removed: trunk/rosapps/sysutils/ctm/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/En.rc?rev=321… Removed: trunk/rosapps/sysutils/ctm/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Fr.rc?rev=321… Removed: trunk/rosapps/sysutils/ctm/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Gr.rc?rev=321… Removed: trunk/rosapps/sysutils/ctm/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Ru.rc?rev=321… Removed: trunk/rosapps/sysutils/ctm/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Uk.rc?rev=321… Modified: trunk/rosapps/sysutils/ctm/ctm.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.rc?rev=32… Added: trunk/rosapps/sysutils/ctm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/lang/de-DE.rc… Added: trunk/rosapps/sysutils/ctm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/lang/el-GR.rc… Added: trunk/rosapps/sysutils/ctm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/lang/en-US.rc… Added: trunk/rosapps/sysutils/ctm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/lang/fr-FR.rc… Added: trunk/rosapps/sysutils/ctm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/lang/ru-RU.rc… Added: trunk/rosapps/sysutils/ctm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/lang/uk-UA.rc… Removed: trunk/rosapps/write/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/De.rc?rev=32141&view… Removed: trunk/rosapps/write/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/En.rc?rev=32141&view… Removed: trunk/rosapps/write/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Fr.rc?rev=32141&view… Removed: trunk/rosapps/write/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Ko.rc?rev=32141&view… Removed: trunk/rosapps/write/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Pl.rc?rev=32141&view… Removed: trunk/rosapps/write/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Sk.rc?rev=32141&view… Removed: trunk/rosapps/write/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Uk.rc?rev=32141&view… Added: trunk/rosapps/write/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/de-DE.rc?rev=32… Added: trunk/rosapps/write/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/en-US.rc?rev=32… Added: trunk/rosapps/write/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/fr-FR.rc?rev=32… Added: trunk/rosapps/write/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/ko-KO.rc?rev=32… Added: trunk/rosapps/write/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/pl-PL.rc?rev=32… Added: trunk/rosapps/write/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/sk-SK.rc?rev=32… Added: trunk/rosapps/write/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/uk-UA.rc?rev=32… Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=32142&r1…

1 0

[dreimer] 32141: Fix whatever TortoiseSVN made wrong here again... Build fixed
by dreimer＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: dreimer Date: Tue Feb 5 19:33:47 2008 New Revision: 32141 URL: http://svn.reactos.org/svn/reactos?rev=32141&view=rev Log: Fix whatever TortoiseSVN made wrong here again... Build fixed Modified: trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc trunk/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc trunk/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc trunk/rosapps/applications/screensavers/matrix/lang/pl-PL.rc trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc trunk/rosapps/applications/screensavers/starfield/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/downloader/lang/pl-PL.rc trunk/rosapps/fontview/lang/pl-PL.rc trunk/rosapps/fontview/lang/uk-UA.rc trunk/rosapps/imagesoft/lang/pl-PL.rc trunk/rosapps/magnify/lang/pl-PL.rc trunk/rosapps/roscalc/lang/pl-PL.rc trunk/rosapps/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/write/Pl.rc Modified: trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -13,18 +13,3 @@ IDS_TITLE "O programie" IDS_TEXT "Brak opcji do ustawiania." END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Puste" - IDS_TITLE "O programie" - IDS_TEXT "Brak opcji do ustawiania." -END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -39,44 +39,3 @@ BEGIN IDS_DESCRIPTION "Motylki" END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 172, 57 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ustawienia wygaszacza Motylki" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK",IDOK,7,35,50,14 - PUSHBUTTON "Anuluj",IDCANCEL,61,35,50,14 - CONTROL "Obracaj Motylkami",ROTATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,56,15,70,8 - PUSHBUTTON "O programie",IDABOUT,115,35,50,14 -END - -IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 149, 79 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK",IDOK,48,58,56,14 - CTEXT "Wygaszacz ekranu Motylki",IDC_STATIC,7,7,135,9 - CTEXT "Demo autorstwa: NeHe ",IDC_STATIC,7,20,135,8 - CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | - NOT WS_GROUP - CTEXT "Wygaszacz autorstwa: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT - WS_GROUP - CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | - NOT WS_GROUP -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Motylki" -END Modified: trunk/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -13,18 +13,3 @@ IDS_TITLE "O programie" IDS_TEXT "Fraktale cylindryczne autorstwa unC0Rr.\nWersja dedykowana dla ReactOS." END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Fraktale cylindryczne" - IDS_TITLE "O programie" - IDS_TEXT "Fraktale cylindryczne autorstwa unC0Rr.\nWersja dedykowana dla ReactOS." -END Modified: trunk/rosapps/applications/screensavers/matrix/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/matrix/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -58,63 +58,3 @@ BEGIN IDS_DESCRIPTION "Matrix" END -#include "resource.h" - -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDD_CONFIG DIALOGEX DISCARDABLE 0, 0, 340, 183 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Konfiguracja wygaszacza Matrix" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Prêdkoæ &dekodowania",IDC_STATIC,7,7,128,36 - LTEXT "Wolniej",IDC_STATIC,13,24,22,8 - CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,17,62,22 - LTEXT "Szybciej",IDC_STATIC,104,24,20,8 - GROUPBOX "Gêstoæ &znaków",IDC_STATIC,7,50,128,36 - LTEXT "Mniej",IDC_STATIC,13,67,19,8 - CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,60,62,22 - LTEXT "Wiêcej",IDC_STATIC,104,67,23,8 - GROUPBOX "Prêdkoæ &wywietlania",IDC_MSGSPEEDGRP,7,93,127,36 - LTEXT "Wolniej",IDC_STATIC,13,110,22,8 - CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,103,62,22 - LTEXT "Szybciej",IDC_STATIC,104,110,22,8 - GROUPBOX "Rozmiar &czcionki",IDC_STATIC,7,137,127,36 - LTEXT "Mniejsza",IDC_STATIC,13,153,24,8 - CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,146,62,22 - LTEXT "Wiêksza",IDC_STATIC,104,153,25,8 - GROUPBOX "Wiadomoæ w&ywietlana",IDC_STATIC,145,7,188,142 - COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | - SS_CENTERIMAGE | WS_GROUP,154,39,116,72 - PUSHBUTTON "D&odaj",IDC_ADD,280,41,44,18 - PUSHBUTTON "&Usuñ",IDC_REMOVE,280,66,44,18 - CONTROL "Wiadomoæ &Losowa",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,134,85,10 - DEFPUSHBUTTON "OK",IDOK,222,162,50,14 - PUSHBUTTON "Anuluj",IDCANCEL,283,162,50,14 - LTEXT "&Nazwa czcionki:",IDC_STATIC,151,118,38,8 - COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - CONTROL "Wy&t³uszczona",IDC_BOLD,"Button",BS_AUTOCHECKBOX | - BS_MULTILINE | WS_TABSTOP,247,134,46,10 - CTEXT "Wygaszacz ekranu Matrix www.catch22.org.uk",IDC_ABOUT,140, - 158,75,18 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Matrix" -END Modified: trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -13,18 +13,3 @@ IDS_TITLE "O programie" IDS_TEXT "Brak opcji do ustawiania." END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Wygaszacz Labirynt" - IDS_TITLE "O programie" - IDS_TEXT "Brak opcji do ustawiania." -END Modified: trunk/rosapps/applications/screensavers/starfield/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/starfield/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -13,18 +13,3 @@ IDS_TITLE "O programie" IDS_TEXT "Brak opcji do ustawiania." END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Wygaszacz Gwiazdy" - IDS_TITLE "O programie" - IDS_TEXT "Brak opcji do ustawiania." -END Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -80,85 +80,3 @@ IDS_TOOLTIP_SAVE, "Zapisz" IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify" END -/* - * PROJECT: Edytor czczionek VGA dla ReactOS - * LICENSE: GNU General Public License Version 2.0 or any later version - * FILE: devutils/vgafontedit/lang/pl-PL.rc - * PURPOSE: Polish resource file - * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> - * TRANSLATOR: Olaf Siejka (Feb, 2008) - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDD_ABOUT DIALOGEX 10, 10, 130, 62 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "O programie" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "Edytor czczionek VGA dla ReactOS", IDC_STATIC, 37, 10, 93, 10 - LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 - DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 -END - -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Edycja Glifów" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 - CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 - CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 - - DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 125, 177, 70, 14 -END - -IDM_MAINMENU MENU -BEGIN - POPUP "&Plik" - BEGIN - MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW - MENUITEM "&Otwórz.\tCtrl+O", ID_FILE_OPEN - MENUITEM "Zamknij", ID_FILE_CLOSE - MENUITEM SEPARATOR - MENUITEM "Zapisz\tCtrl+S", ID_FILE_SAVE - MENUITEM "Zapisz jako", ID_FILE_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Wyjd\tAlt+F4", ID_FILE_EXIT - END - - POPUP "&Okna" - BEGIN - MENUITEM "&Kaskadowo", ID_WINDOW_CASCADE - MENUITEM "Ustaw &poziomo", ID_WINDOW_TILE_HORZ - MENUITEM "Ustaw pio&nowo", ID_WINDOW_TILE_VERT - MENUITEM "&Uporz¹dkuj ikony", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nas&têpne\tCtrl+F6", ID_WINDOW_NEXT - END - - POPUP "&Pomoc" - BEGIN - MENUITEM "O p&rogramie", ID_HELP_ABOUT - END -END - -STRINGTABLE -BEGIN - IDS_OPENFILTER, "Wszystkie obs³ugiwane (*.bin,*.psf)|*.bin;*.psf|Czcionki binarne (*.bin)|*.bin|Czcionki PSF V1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Czcionki binarne (*.bin)|*.bin|" - IDS_OPENERROR, "B³¹d poczas otwierania pliku! (B³¹d nr. %1!u!)" - IDS_READERROR, "B³¹d poczas wczytywania pliku! (B³¹d nr. %1!u!)" - IDS_WRITEERROR, "B³¹d podczas zapisu do pliku! (B³¹d nr. %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Nieobs³ugiwany format czcionki!" - IDS_UNSUPPORTEDPSF, "Nieobs³ugiwana wersja PSF! Edytor obs³uguje wy³¹cznie czcionki rozmiaru 8x8, bez dodatków." - IDS_DOCNAME, "Czcionka %1!u!" - IDS_SAVEPROMPT, "Plik ""%1"" zosta³ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaæ zmiany?" - - IDS_TOOLTIP_NEW, "Nowy" - IDS_TOOLTIP_OPEN, "Otwórz" - IDS_TOOLTIP_SAVE, "Zapisz" - IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify" -END Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Tue Feb 5 19:33:47 2008 @@ -7,7 +7,7 @@ * TRANSLATOR: Artem Reznikov */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Modified: trunk/rosapps/downloader/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/pl-PL.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/pl-PL.rc (original) +++ trunk/rosapps/downloader/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -66,71 +66,3 @@ TTT_UPDATEBUTTON "Niedostêpne" TTT_PROFBUTTON "Ustawienia Mened¿era pobierania" END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDD_DOWNLOAD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "ci¹gaj..." -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Anuluj", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -END - -IDD_PROF DIALOGEX 6, 6, 267, 110 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "Ustawienia" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Katalog do ci¹gania:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Wybierz...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Skasuj ci¹gniête pliki po zainstalowaniu programu", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Uaktualnij:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Anuluj", IDCANCEL, 207, 90, 54, 15 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_WINDOW_TITLE "ci¹gnij ! - Mened¿er pobierania dla ReactOS" - IDS_WELCOME_TITLE "Witamy w ci¹gnij dla ReactOS" - IDS_WELCOME "Proszê wybraæ kategoriê po lewej. Wersja programu: 1.1." - IDS_NO_APP_TITLE "Nie wybrano programu" - IDS_NO_APP "Proszê wybraæ program, przed klikniêciem w przycisk ci¹gnij. W razie problemów kliknij w znak zapytania, w prawym górnym rogu okna." - IDS_UPDATE_TITLE "Uaktualnij" - IDS_UPDATE "Przepraszamy, ta opcja nie jest jeszcze dostêpna." - IDS_HELP_TITLE "Pomoc" - IDS_HELP "Wybierz kategoriê po lewej, nastêpnie wybierz program i kliknij w przycisk ci¹gnij. Aby uaktualniæ listê programów, nacinij przycisk obok przycisku Pomocy." - IDS_NO_APPS "Przepraszamy, nie ma programów w tej kategorii. Mo¿esz pomóc nam w wyborze nowych programów." - IDS_CHOOSE_APP "Proszê wybraæ program." - IDS_CHOOSE_SUB "Proszê wybraæ podkategoriê." - IDS_CHOOSE_CATEGORY "Proszê wybraæ kategoriê." - IDS_CHOOSE_BOTH "Proszê wybraæ podkategoriê albo program." - IDS_XMLERROR_1 "Plik XML nie zosta³ znaleziony !" - IDS_XMLERROR_2 "Nie uda³o siê przetworzyæ pliku XML !" - IDS_DOWNLOAD_ERROR "Sci¹ganie pliku nieudane.\nProszê sprawdziæ po³¹czenie z internetem." - IDS_VERSION "Wersja: " - IDS_LICENCE "Licenccja: " - IDS_MAINTAINER "Opiekun: " - IDS_APPS_TITLE "Programy" - IDS_CATS_TITLE "Kategorie" - IDS_CHOOSE_FOLDER "Proszê wybraæ katalog..." - IDS_NOTCREATE_REGKEY "Nie uda³o siê utworzyæ kluczy rejestru." - IDS_DOWNLOAD_FOLDER "Pobrane" - IDS_UNABLECREATE_FOLDER "Nie uda³o siê stworzyæ katalogu o tej nazwie!" - IDS_UPDATE_URL "http://svn.reactos.org" - IDS_INSTALL_DEP "%s jest wymagany do uruchomienia %s. Czy chcesz zainstalowaæ %s w tej chwili?" - TTT_HELPBUTTON "Pomoc Mened¿era pobierania" - TTT_UPDATEBUTTON "Niedostêpne" - TTT_PROFBUTTON "Ustawienia Mened¿era pobierania" -END Modified: trunk/rosapps/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/pl-PL.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/pl-PL.rc (original) +++ trunk/rosapps/fontview/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -18,28 +18,3 @@ IDS_ERROR_NOCLASS, "Nie uda³o siê zainicjowaæ klasy window." IDS_ERROR_BADCMD, "Brak pliku czcionki.\nSk³adnia:\n fontview.exe <plik czcionki>" END - - -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_QUIT, "Wyjcie" - IDS_PRINT, "Drukuj" - IDS_STRING, "W Szczebrzeszynie chrz¹szcz brzmi w trzcinie. 1234567890" - IDS_ERROR, "B³¹d" - IDS_ERROR_NOMEM, "Brakuje pamiêci do ukoñczenia tej operacji." - IDS_ERROR_NOFONT, "Plik %1 nie jest poprawnym plikiem czcionki." - IDS_ERROR_NOCLASS, "Nie uda³o siê zainicjowaæ klasy window." - IDS_ERROR_BADCMD, "Brak pliku czcionki.\nSk³adnia:\n fontview.exe <plik czcionki>" -END - - - Modified: trunk/rosapps/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/uk-UA.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/uk-UA.rc (original) +++ trunk/rosapps/fontview/lang/uk-UA.rc Tue Feb 5 19:33:47 2008 @@ -19,5 +19,3 @@ IDS_ERROR_NOCLASS, "Íåìîæëèâî ³í³ö³àë³çóâàòè â³êîííèé êëàñ." IDS_ERROR_BADCMD, "Íå âêàçàíèé ôàéë øðèôòó.\nÑèíòàêñèñ:\n fontview.exe <ôàéë øðèôòó>" END - - Modified: trunk/rosapps/imagesoft/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/pl-PL.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/pl-PL.rc (original) +++ trunk/rosapps/imagesoft/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -239,244 +239,3 @@ IDS_HINT_SYS_MINIMIZE " Zamyka okno do ikony." IDS_HINT_SYS_MAXIMIZE " Rozszerza okno na pe³en ekran." END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&Plik" - BEGIN - MENUITEM "&Nowy...", ID_NEW - MENUITEM "&Otwórz...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Zamknij\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "Za&knij wszystko", ID_CLOSEALL,GRAYED - MENUITEM SEPARATOR - MENUITEM "Za&pisz", ID_SAVE, GRAYED - MENUITEM "Zapisz &jako...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pod&gl¹d drukowania", ID_PRINTPRE,GRAYED - MENUITEM "&Drukuj...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "&W³aciwoci", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "W&yjcie\tAlt+F4", ID_EXIT - END - POPUP "&Edycja" - BEGIN - MENUITEM "&Cofnij", ID_UNDO, GRAYED - MENUITEM "&Ponów", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Wy&tnij", ID_CUT, GRAYED - MENUITEM "&Kopiuj", ID_COPY, GRAYED - MENUITEM "Wk&lej", ID_PASTE, GRAYED - MENUITEM "Wklej jako nowy &obraz", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Wybierz w&szystko", ID_SELALL, GRAYED - END - POPUP "&Podgl¹d" - BEGIN - MENUITEM "&Narzêdzia", ID_TOOLS - MENUITEM "&Kolory", ID_COLOR - MENUITEM "&Historia", ID_HISTORY - MENUITEM "&Pasek stanu", ID_STATUSBAR - END - POPUP "&Zmieñ" - BEGIN - MENUITEM "Jasnoæ...", ID_BRIGHTNESS - MENUITEM "Kontrast...", ID_CONTRAST - MENUITEM "Barwa/Nasycenie...", -1, GRAYED - POPUP "Kolor" - BEGIN - MENUITEM "Czarnobia³y" ID_BLACKANDWHITE - MENUITEM "Odwróæ kolory" ID_INVERTCOLORS - END - MENUITEM SEPARATOR - MENUITEM "Zmiêkczenie", ID_BLUR - MENUITEM "Wyostrzenie", ID_SHARPEN - MENUITEM "Zmiêkcz kontury", -1, GRAYED - MENUITEM "Dodaj cieñ", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Rozmiar obrazu...", -1, GRAYED - MENUITEM "Odwróæ", -1, GRAYED - MENUITEM "Lustrzane odbicie", -1, GRAYED - MENUITEM "Obrót", -1, GRAYED - - END - POPUP "&Kolory" - BEGIN - MENUITEM "&Edytuj kolory...", ID_EDITCOLOURS - END - POPUP "&Okna" - BEGIN - MENUITEM "&Kaskadowo", ID_WINDOW_CASCADE - MENUITEM "Ustaw &poziomo", ID_WINDOW_TILE_HORZ - MENUITEM "Ustaw pio&nowo", ID_WINDOW_TILE_VERT - MENUITEM "&Uporz¹dkuj ikony", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nas&têpne\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Pomoc" - BEGIN - MENUITEM "&O programie...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - - MENUITEM SEPARATOR - - END -END - - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Jasnoæ" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Uk³ad kolorów:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Pe³ny (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Czerwony", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Zielony", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Niebieski", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Anuluj", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "O ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "W³aciwoci obrazu" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Nazwa:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "W³aciwoci", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Typ obrazu:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Szerokoæ:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Wysokoæ:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Rozdzielczoæ:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Jednostka:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Rozmiar obrazu:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Anuluj", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "Ten program jest darmowy; mo¿esz go redystrybuowaæ i/lub modyfikowaæ zgodnie z warunkami licencji GNU General Public, publikowanymi przez Free Software Foundation; albo wersjê 2, albo dowoln¹ póniejsz¹.\r\n\r\nMamy nadziejê, ¿e ten program bêdzie u¿yteczny, ale nie dajemy na niego ¯ADNEJ GWARANCJI; nawet bez gwarancji jego KOMERCYJNOCI czy te¿ PRZYDATNOCI DO OKRELONEGO CELU. Szczegó³y w tekcie Licencji GNU General Public.\r\n\r\nKopie licencji GNU GP powiniene otrzymaæ z niniejszym programem; jeli nie, skontaktuj siê z Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." - IDS_READY " Gotów." - IDS_TOOLBAR_STANDARD "Standardowy" - IDS_TOOLBAR_TEST "Test" - IDS_IMAGE_NAME "Obraz %1!u!" - IDS_FLT_TOOLS "Narzêdzia" - IDS_FLT_COLORS "Kolory" - IDS_FLT_HISTORY "Historia" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monochromatyczny (1 bit)" - IDS_IMAGE_GREYSCALE "256 odcieni szaroci (8 bitów)" - IDS_IMAGE_PALETTE "256 kolorów (8 bitów)" - IDS_IMAGE_TRUECOLOR "True color (24 bity)" - - IDS_UNIT_PIXELS "Pikseli" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Cali" - IDS_UNIT_DOTSCM "Punktów / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d KB" - IDS_UNIT_MB "%d MB" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Nowy" - IDS_TOOLTIP_OPEN "Otwórz" - IDS_TOOLTIP_SAVE "Zapisz" - IDS_TOOLTIP_PRINTPRE "Podgl¹d drukowania" - IDS_TOOLTIP_PRINT "Drukuj" - IDS_TOOLTIP_CUT "Wytnij" - IDS_TOOLTIP_COPY "Kopiuj" - IDS_TOOLTIP_PASTE "Wklej" - IDS_TOOLTIP_UNDO "Cofnij" - IDS_TOOLTIP_REDO "Ponów" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Tworzy nowy dokument." - IDS_HINT_OPEN " Otwiera istniej¹cy dokument." - IDS_HINT_CLOSE " Zamyka bierz¹ce okno." - IDS_HINT_CLOSEALL " Zamyka wszystkie okno." - IDS_HINT_SAVE " Zapisuje bierz¹cy dokument." - IDS_HINT_SAVEAS " Zapisuje bierz¹cy dokument z now¹ nazw¹." - IDS_HINT_PRINTPRE " Podgl¹d dokumentu do wydrukowania." - IDS_HINT_PRINT " Drukuje bierz¹cy dokument." - IDS_HINT_PROP " Pokazuje w³aciwoci danego obrazu." - IDS_HINT_EXIT " Wyjcie z programu." - - IDS_HINT_TOOLS " Pokazuje lub chowa pasek narzêdzi." - IDS_HINT_COLORS " Pokazuje lub chowa pasek kolorów." - IDS_HINT_HISTORY " Pokazuje lub chowa okno historii ." - IDS_HINT_STATUS " Pokazuje lub chowa pasek stanu." - - IDS_HINT_CASCADE " Ustawia okna tak by wszystkie by³y widoczne." - IDS_HINT_TILE_HORZ " Ustawia okna jeden obok drugiego." - IDS_HINT_TILE_VERT " Ustawia okna jeden pod drugim." - IDS_HINT_ARRANGE " Ustawia ikony w kolejnoci, na spodzie okna." - IDS_HINT_NEXT " Uaktywnia nastêpne okno." - - IDS_HINT_SYS_RESTORE " Przywraca okno do normalnego rozmiaru." - IDS_HINT_SYS_MOVE " Przesuwa okno." - IDS_HINT_SYS_SIZE " Zmienia wielkoæ okna." - IDS_HINT_SYS_MINIMIZE " Zamyka okno do ikony." - IDS_HINT_SYS_MAXIMIZE " Rozszerza okno na pe³en ekran." -END Modified: trunk/rosapps/magnify/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/pl-PL.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/pl-PL.rc (original) +++ trunk/rosapps/magnify/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -69,74 +69,3 @@ BEGIN IDS_APP_TITLE "Lupa" END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDC_MAGNIFIER MENU -BEGIN - POPUP "&Plik" - BEGIN - MENUITEM "&Wyjcie", IDM_EXIT - MENUITEM "&Opcje", IDM_OPTIONS - MENUITEM SEPARATOR - MENUITEM "O p&rogramie ...", IDM_ABOUT - END -END - -IDC_MAGNIFIER ACCELERATORS -BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT -END - -IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU -CAPTION "O programie" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_ICON,IDC_MYICON,14,9,20,20 - LTEXT "Lupa, wersja 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 - PUSHBUTTON "OK",IDOK,162,48,50,14 -END - -IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ustawienia" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Wyjcie",IDOK,96,161,50,14 - PUSHBUTTON "Pomoc",IDOK,38,161,50,14 - LTEXT "Stopieñ powiêkszenia:",IDC_STATIC,6,8,68,8 - COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "ledzenia",IDC_STATIC,7,25,139,59 - GROUPBOX "Prezentacja",IDC_STATIC,7,87,139,57 - CONTROL "Pod¹¿aj za kursorem myszki",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 - CONTROL "Pod¹¿aj za aktywnym oknem",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 - CONTROL "Pod¹¿aj za tekstem",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 - CONTROL "Odwróæ kolory",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 - CONTROL "Uruchom zminimalizowan¹",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 - CONTROL "Poka¿ Lupê",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 -END - -IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "Lupa ReactOS" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,193,76,50,14 - ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "Lupa ma za zadanie dostarczyæ podstawowy poziom funkcjonalnoci dla osób z niewielkimi problemami ze wzrokiem. U¿ytkownicy ze znaczniejszymi problemami ze wzrokiem mog¹ byæ zmuszeni u¿yæ bardziej zaawansowanego narzêdzia.",IDC_STATIC,36,7,207,33 - CONTROL "Nie pokazuj wiêcej tej wiadomoci",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 -END - -STRINGTABLE -BEGIN - IDS_APP_TITLE "Lupa" -END Modified: trunk/rosapps/roscalc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/pl-PL.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/pl-PL.rc (original) +++ trunk/rosapps/roscalc/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -369,377 +369,3 @@ IDS_MATH_ERROR "B³¹d" IDS_QUICKHELP "Szybka pomoc" END - -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -// Dialog - -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" -MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 - GROUPBOX "",IDC_STATIC,4,36,76,21 - CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,8,44,26,10 - CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,40,44,29,10 - CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, - WS_EX_CLIENTEDGE - CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, - WS_EX_CLIENTEDGE - PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - GROUPBOX "",IDC_STATIC,140,16,172,21 - CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | - NOT WS_VISIBLE,148,24,37,10 - CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | - NOT WS_VISIBLE,188,24,37,10 - CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE,232,24,33,10 - CONTROL "Bajt",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE,272,24,30,10 - CONTROL "Stopni",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, - 42,10 - CONTROL "Radianów",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, - 24,42,10 - CONTROL "Gradianów",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, - 236,24,44,10 - PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Wstecz",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, - WS_EX_CLIENTEDGE - DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE -END - -IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" -MENU IDR_MENU_STANDARD -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, - WS_EX_CLIENTEDGE - PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Pierw",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | - BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, - WS_EX_CLIENTEDGE - PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE -END - -IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "O Kalkulatorze ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK",IDOK,105,148,52,16 - CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 - LTEXT "Kalkulator ReactOS",IDC_STATIC,120,12,132,8, - SS_CENTERIMAGE - LTEXT "Wersja ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE - LTEXT "Autorstwa: Carlo Bramini",IDC_STATIC,120,32,132,8, - SS_CENTERIMAGE - GROUPBOX "",IDC_STATIC,112,0,148,52 - GROUPBOX "",IDC_STATIC,4,56,256,88 - EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | - WS_VSCROLL -END - -IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Statystyka" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 - PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 - PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 - PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 - CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | - SS_SUNKEN -END - - -// Menus - -IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE -BEGIN - POPUP "Edycja" - BEGIN - MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE - END - POPUP "Wygl¹d" - BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Szesnastkowo\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Dziesiêtnie\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Ósemkowo\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binarnie\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Stopni\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radianów\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradianów\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED - END - POPUP "Pomoc" - BEGIN - MENUITEM "Tematy pomocy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT - END -END - -IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE -BEGIN - POPUP "Edycja" - BEGIN - MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE - END - POPUP "Wygl¹d" - BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Szesnastkowo\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Dziesiêtnie\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Ósemkowo\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binarnie\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "Bajt\tF4", IDM_VIEW_BYTE, CHECKED - MENUITEM SEPARATOR - MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED - END - POPUP "Pomoc" - BEGIN - MENUITEM "Tematy pomocy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT - END -END - -IDR_MENU_STANDARD MENU DISCARDABLE -BEGIN - POPUP "Edycja" - BEGIN - MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE - END - POPUP "Wygl¹d" - BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED - END - POPUP "Pomoc" - BEGIN - MENUITEM "Tematy pomocy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O Kalkulatorze ReactOS", IDM_HELP_ABOUT - END -END - -// String Tables - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STRING_LICENSE "Kalkulator ReactOS jest darmowym programem, publikowanym zgodnie z licencj¹ GNU GPL.\r\n\r\nMo¿esz otrzymaæ kopiê licencji GNU GPL tutaj:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nT³umaczenie licencji GNU GPL znajdziesz tutaj:\r\nhttp://www.gnu.org/licenses/translations.html" - IDS_MATH_ERROR "B³¹d" - IDS_QUICKHELP "Szybka pomoc" -END - - Modified: trunk/rosapps/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/p… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/pl-PL.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/pl-PL.rc Tue Feb 5 19:33:47 2008 @@ -69,74 +69,3 @@ IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" END -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - -IDS_USAGE, "SYSTEMINFO [/S system [/U nazwa u¿ytkownika [/P [has³o]]]] [/FO format] [/NH]\n\n\ -Opis:\n\ - Ten konsolowy program umo¿liwia administratorowi sprawdzenie podstawowych\n\ - informacji o konfiguracji systemu.\n\n\ -Lista parametrów:\n\ - /S system Wyznacza nazwê systemu zdalnego do po³¹czenia.\n\n\ - /U [domain\\]user Wyznacza u¿ytkownika (domenê) z którego konta\n\ - komenda bêdzie wywo³ana.\n\n\ - /P [password] Wyznacza has³o do u¿ytego konta u¿ytkownika\n\ - Program sam zapyta o has³o, jeli nie jest podane.\n\n\ - /FO format Wyznacza format w którym wywietlone zostan¹\n\ - informacje o systemie.\n\ - Dostêpne formaty: \"TABLE\", \"LIST\", \"CSV\".\n\n\ - /NH Blokuje wywietlanie kolumny \"Column Header\" w\n\ - informacjach systemowych.\n\ - Dzia³a tylko z formatami \"TABLE\" i \"CSV\".\n\n\ - /? Wywietla niniejszy tekst pomocy.\n\n\ -Przyk³ady:\n\ - SYSTEMINFO\n\ - SYSTEMINFO /?\n\ - SYSTEMINFO /S system\n\ - SYSTEMINFO /S system /U nazwa u¿ytkownika\n\ - SYSTEMINFO /S system /U domena\\nazwa u¿ytkownika /P has³o /FO TABLE\n\ - SYSTEMINFO /S system /FO LIST\n\ - SYSTEMINFO /S system /FO CSV /NH\n" - -IDS_OS_NAME, "Nazwa Systemu: %s\n" -IDS_OS_VERSION, "Wersja: %d.%d.%d %s" -IDS_OS_BUILD, " Kompilacja %s\n" -IDS_OS_BUILD_TYPE, "Rodzaj kompilacji: %s\n" -IDS_REG_OWNER, "U¿ytkownik: %s\n" -IDS_REG_ORG, "Organizacja: %s\n" -IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "Data instalacji: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Rodzaj systemu: Unknown\n" -IDS_SYS_TYPE_X86, "Architektura: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Architektura: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Rodzaj systemu: AMD64-based PC\n" -IDS_PROCESSORS, "Iloæ Procesorów: %u .\n" -IDS_ROS_DIR, "Katalog ReactOS: %s\n" -IDS_SYS_DIR, "Katalog Systemowy: %s\n" -IDS_BOOT_DEV, "Urz¹dzenie ród³owe: %s\n" -IDS_SYS_LOCALE, "Wersja lokalizacji: %s\n" -IDS_INPUT_LOCALE, "Lokalizacja klawiatury: %s\n" -IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: Maksymalnie: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: Dostêpne: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: W u¿yciu: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Nazwa hosta: %s\n" -IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany %s\n" -IDS_TIME_ZONE, "Strefa czasowa: %s\n" -IDS_DOMINE, "Domena: %s\n" -IDS_BIOS_DATE, "Data BIOSu: %s\n" -IDS_BIOS_VERSION, "Wersja BIOSu: %s\n" -IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" - -END Modified: trunk/rosapps/write/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Pl.rc?rev=32141&r1=3… ============================================================================== --- trunk/rosapps/write/Pl.rc (original) +++ trunk/rosapps/write/Pl.rc Tue Feb 5 19:33:47 2008 @@ -27,32 +27,3 @@ BEGIN IDS_FAILED, "B³¹d podczas uruchamiania Wordpad" END -/* - * Copyright (C) 2007 Mikolaj Zalewski - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE -BEGIN - IDS_FAILED, "B³¹d podczas uruchamiania Wordpad" -END

1 0

[dreimer] 32140: Bug 3037: Rosapps polish translation patch (olaf_siejka@o2.pl) Bug 3038: Ukrainian translation update (temarez@yandex.ru) RC Files resorting like in the Bug reports before these will be done later this day.
by dreimer＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: dreimer Date: Tue Feb 5 18:50:59 2008 New Revision: 32140 URL: http://svn.reactos.org/svn/reactos?rev=32140&view=rev Log: Bug 3037: Rosapps polish translation patch (olaf_siejka(a)o2.pl) Bug 3038: Ukrainian translation update (temarez(a)yandex.ru) RC Files resorting like in the Bug reports before these will be done later this day. Added: trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc (with props) trunk/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc (with props) trunk/rosapps/applications/screensavers/matrix/lang/pl-PL.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc (with props) trunk/rosapps/applications/screensavers/starfield/lang/pl-PL.rc (with props) trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (with props) trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (with props) trunk/rosapps/downloader/lang/pl-PL.rc (with props) trunk/rosapps/fontview/lang/pl-PL.rc (with props) trunk/rosapps/imagesoft/lang/pl-PL.rc (with props) trunk/rosapps/magnify/lang/pl-PL.rc (with props) trunk/rosapps/packmgr/gui/pl.rc (with props) trunk/rosapps/packmgr/lib/pl.rc (with props) trunk/rosapps/roscalc/lang/pl-PL.rc (with props) trunk/rosapps/sysutils/systeminfo/lang/pl-PL.rc (with props) trunk/rosapps/write/Pl.rc (with props) Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc trunk/rosapps/applications/screensavers/starfield/starfield.rc trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/downloader/lang/uk-UA.rc trunk/rosapps/downloader/rsrc.rc trunk/rosapps/fontview/fontview.rc trunk/rosapps/fontview/lang/en-US.rc trunk/rosapps/imagesoft/rsrc.rc trunk/rosapps/magnify/rsrc.rc trunk/rosapps/packmgr/gui/packmgr.rc trunk/rosapps/packmgr/lib/de.rc trunk/rosapps/packmgr/lib/package.rc trunk/rosapps/roscalc/resource.rc trunk/rosapps/sysutils/systeminfo/rsrc.rc trunk/rosapps/write/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Added: trunk/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Added: trunk/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Added: trunk/rosapps/applications/screensavers/matrix/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Added: trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Added: trunk/rosapps/applications/screensavers/starfield/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… Added: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… Added: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… Added: trunk/rosapps/downloader/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/pl-PL.rc?r… Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=321… Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=3… Modified: trunk/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/en-US.rc?rev… Added: trunk/rosapps/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/pl-PL.rc?rev… Added: trunk/rosapps/imagesoft/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/pl-PL.rc?re… Modified: trunk/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/rsrc.rc?rev=3214… Added: trunk/rosapps/magnify/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/pl-PL.rc?rev=… Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=32140&… Modified: trunk/rosapps/packmgr/gui/packmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/packmgr.rc?rev… Added: trunk/rosapps/packmgr/gui/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/pl.rc?rev=3214… Modified: trunk/rosapps/packmgr/lib/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/de.rc?rev=3214… Modified: trunk/rosapps/packmgr/lib/package.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/package.rc?rev… Added: trunk/rosapps/packmgr/lib/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/pl.rc?rev=3214… Added: trunk/rosapps/roscalc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/pl-PL.rc?rev=… Modified: trunk/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=32… Added: trunk/rosapps/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/p… Modified: trunk/rosapps/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/rsrc.r… Added: trunk/rosapps/write/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Pl.rc?rev=32140&view… Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=32140&r1…

1 0

[cfinck] 32139: - Handle the different slashes correctly, also in combination (like "../..\*.txt") by using the ConvertPath() function - Only compare file names, not the whole pathes, in the Unix code path using MatchFileNamePattern - Small change to the Usage text
by cfinck＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: cfinck Date: Tue Feb 5 18:31:12 2008 New Revision: 32139 URL: http://svn.reactos.org/svn/reactos?rev=32139&view=rev Log: - Handle the different slashes correctly, also in combination (like "../..\*.txt") by using the ConvertPath() function - Only compare file names, not the whole pathes, in the Unix code path using MatchFileNamePattern - Small change to the Usage text Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Tue Feb 5 18:31:12 2008 @@ -375,10 +375,10 @@ char* CCabinet::ConvertPath(char* Path, bool Allocate) /* - * FUNCTION: Replaces \ or / with the one used be the host environment + * FUNCTION: Replaces \ or / with the one used by the host environment * ARGUMENTS: * Path = Pointer to string with pathname - * Allocate = Specifies wther to allocate memory for the new + * Allocate = Specifies whether to allocate memory for the new * string or to change the existing buffer * RETURNS: * Pointer to new path @@ -2100,17 +2100,33 @@ while(Criteria) { // Store the file path with a trailing slash in szFilePath + ConvertPath(Criteria->Search, false); + +#if defined(WIN32) + pszFile = strrchr(Criteria->Search, '\\'); +#else pszFile = strrchr(Criteria->Search, '/'); - if(!pszFile) - pszFile = strrchr(Criteria->Search, '\\'); +#endif if(pszFile) { - strncpy(szFilePath, Criteria->Search, pszFile - Criteria->Search + 1); - szFilePath[pszFile - Criteria->Search + 1] = 0; + // Set the pointer to the start of the file name, not the slash + pszFile++; + + strncpy(szFilePath, Criteria->Search, pszFile - Criteria->Search); + szFilePath[pszFile - Criteria->Search] = 0; } else + { + pszFile = Criteria->Search; + +#if defined(WIN32) szFilePath[0] = 0; +#else + // needed for opendir() + strcpy(szFilePath, "./"); +#endif + } #if defined(WIN32) // Windows: Use the easy FindFirstFile/FindNextFile API for getting all files and checking them against the pattern @@ -2144,9 +2160,6 @@ FindClose(hFind); #else // Unix: Use opendir/readdir to loop through all entries, stat to check if it's a file and MatchFileNamePattern to match the file against the pattern - if(szFilePath[0] == 0) - strcpy(szFilePath, "./"); - dirp = opendir(szFilePath); if(dirp) @@ -2160,14 +2173,7 @@ { if(stbuf.st_mode != S_IFDIR) { - // As we added "./" to szFilePath above, szFile might contain "./test.txt" now and Criteria->Search "test.txt". - // Therefore they won't match using MatchFileNamePattern. By using pszFile here, we can avoid this problem. - if(szFile[0] == '.' && szFile[1] == '/') - pszFile = szFile + 2; - else - pszFile = szFile; - - if(MatchFileNamePattern(pszFile, Criteria->Search)) + if(MatchFileNamePattern(dp->d_name, pszFile)) { Status = AddFile(szFile); @@ -2188,7 +2194,6 @@ closedir(dirp); } - #endif Criteria = Criteria->Next; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Tue Feb 5 18:31:12 2008 @@ -192,9 +192,9 @@ printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); printf("CABMAN [-M mode] -C dirfile [-I] [-RC file] [-P dir]\n"); - printf("CABMAN [-M mode] -S cabinet filename ...\n"); + printf("CABMAN [-M mode] -S cabinet filename [...]\n"); printf(" cabinet Cabinet file.\n"); - printf(" filename Name of the file to extract from the cabinet.\n"); + printf(" filename Name of the file to add to or extract from the cabinet.\n"); printf(" Wild cards and multiple filenames\n"); printf(" (separated by blanks) may be used.\n\n");

1 0

[cfinck] 32138: - Don't set a fixed size for the application name, allocate the needed memory dynamically using AllocAndLoadString - Small fixes to the german translation
by cfinck＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: cfinck Date: Tue Feb 5 18:12:35 2008 New Revision: 32138 URL: http://svn.reactos.org/svn/reactos?rev=32138&view=rev Log: - Don't set a fixed size for the application name, allocate the needed memory dynamically using AllocAndLoadString - Small fixes to the german translation Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/main.c trunk/rosapps/devutils/vgafontedit/mainwnd.c trunk/rosapps/devutils/vgafontedit/precomp.h Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Tue Feb 5 18:12:35 2008 @@ -11,7 +11,7 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Über" +CAPTION "Info" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 @@ -22,7 +22,7 @@ IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Glyphen bearbeiten" +CAPTION "Schriftzeichen bearbeiten" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -39,7 +39,7 @@ BEGIN MENUITEM "&Neu\tStrg+N", ID_FILE_NEW MENUITEM "&Öffnen...\tStrg+O", ID_FILE_OPEN - MENUITEM "Schliessen", ID_FILE_CLOSE + MENUITEM "Schließen", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern unter...", ID_FILE_SAVE_AS @@ -59,19 +59,19 @@ POPUP "&Hilfe" BEGIN - MENUITEM "&Über...", ID_HELP_ABOUT + MENUITEM "&Info...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binary Font Files (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Binäre Font Dateien (*.bin)|*.bin|" + IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binäre Schriftdateien (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Binäre Schriftdateien (*.bin)|*.bin|" IDS_OPENERROR, "Fehler beim Öffnen der Datei! (Fehlernummer %1!u!)" IDS_READERROR, "Fehler beim Lesen der Datei! (Fehlernummer %1!u!)" IDS_WRITEERROR, "Fehler beim Schreiben der Datei! (Fehlernummer %1!u!)" IDS_UNSUPPORTEDFORMAT, "Nicht unterstütztes Dateiformat!" - IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF Font Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." + IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF-Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" IDS_APPTITLE, "ReactOS VGA Font Editor" @@ -79,5 +79,5 @@ IDS_TOOLTIP_NEW, "Neu" IDS_TOOLTIP_OPEN, "Öffnen" IDS_TOOLTIP_SAVE, "Speichern" - IDS_TOOLTIP_EDIT_GLYPH, "Glyphen bearbeiten" + IDS_TOOLTIP_EDIT_GLYPH, "Schriftzeichen bearbeiten" END Modified: trunk/rosapps/devutils/vgafontedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.c (original) +++ trunk/rosapps/devutils/vgafontedit/main.c Tue Feb 5 18:12:35 2008 @@ -10,6 +10,7 @@ HINSTANCE hInstance; HANDLE hProcessHeap; +PWSTR szAppName; INT WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) @@ -24,6 +25,8 @@ hInstance = hInst; hProcessHeap = GetProcessHeap(); + + AllocAndLoadString(&szAppName, IDS_APPTITLE); hAccel = LoadAcceleratorsW( hInstance, MAKEINTRESOURCEW(IDA_MAINACCELERATORS) ); @@ -45,6 +48,8 @@ } } + HeapFree(hProcessHeap, 0, szAppName); + // Just unregister our window classes, don't care whether they were created or not UnInitEditGlyphWndClasses(); UnInitFontBoxesWndClass(); Modified: trunk/rosapps/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/mainw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/mainwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/mainwnd.c Tue Feb 5 18:12:35 2008 @@ -433,8 +433,6 @@ { (*Info)->nCmdShow = nCmdShow; - LoadString(hInstance, IDS_APPTITLE, szAppName, MAX_STRING); - hMainWnd = CreateWindowExW(0, szMainWndClass, szAppName, Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/preco… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Tue Feb 5 18:12:35 2008 @@ -14,8 +14,6 @@ #include <commctrl.h> #include "resource.h" #include "customwndclasses.h" - -#define MAX_STRING 128 // Forward declarations typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO; @@ -139,7 +137,7 @@ VOID UnInitFontWndClass(VOID); // main.c -WCHAR szAppName[MAX_STRING]; +extern PWSTR szAppName; extern HINSTANCE hInstance; extern HANDLE hProcessHeap;

1 0

[dchapyshev] 32137: - Add Russian translation - Move application title to resources
by dchapyshev＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: dchapyshev Date: Tue Feb 5 17:50:02 2008 New Revision: 32137 URL: http://svn.reactos.org/svn/reactos?rev=32137&view=rev Log: - Add Russian translation - Move application title to resources Added: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (with props) Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/lang/en-US.rc trunk/rosapps/devutils/vgafontedit/main.c trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/devutils/vgafontedit/mainwnd.c trunk/rosapps/devutils/vgafontedit/precomp.h trunk/rosapps/devutils/vgafontedit/resource.h Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Tue Feb 5 17:50:02 2008 @@ -74,6 +74,7 @@ IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF Font Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" + IDS_APPTITLE, "ReactOS VGA Font Editor" IDS_TOOLTIP_NEW, "Neu" IDS_TOOLTIP_OPEN, "Öffnen" Modified: trunk/rosapps/devutils/vgafontedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/en-US.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/en-US.rc Tue Feb 5 17:50:02 2008 @@ -74,6 +74,7 @@ IDS_UNSUPPORTEDPSF, "Unsupported PSF font format! The editor only supports 8x8 fonts with no special modes." IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "The file ""%1"" was modified, but not saved.\n\nDo you want to save it?" + IDS_APPTITLE, "ReactOS VGA Font Editor" IDS_TOOLTIP_NEW, "New" IDS_TOOLTIP_OPEN, "Open" Added: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (added) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Tue Feb 5 17:50:02 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/lang/ru-RU.rc + * PURPOSE: Russian resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + * TRANSLATOR: Dmitry Chapyshev + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_ABOUT DIALOGEX 10, 10, 130, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Î ïðîãðàììå" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 + LTEXT "Ðåäàêòîð VGA-øðèôòîâ ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Àâòîðñêèå ïðàâà 2008 Êîëèí Ôèíê", IDC_STATIC, 37, 20, 93, 17 + DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 +END + +IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ðåäàêòèðîâàíèå ñèìâîëà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 + CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 + CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 + + DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 125, 177, 70, 14 +END + +IDM_MAINMENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Íîâûé\tCtrl+N", ID_FILE_NEW + MENUITEM "&Îòêðûòü...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Çàêðûòü", ID_FILE_CLOSE + MENUITEM SEPARATOR + MENUITEM "Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE + MENUITEM "Ñîõðàíèòü êàê...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Âûõîä\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Îêíà" + BEGIN + MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE + MENUITEM "&Ïî ãîðèçîíòàëè", ID_WINDOW_TILE_HORZ + MENUITEM "Ï&î âåðòèêàëè", ID_WINDOW_TILE_VERT + MENUITEM "&Óïîðÿäî÷èòü çíà÷êè", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "&Ñëåäóþùåå\tCtrl+F6", ID_WINDOW_NEXT + END + + POPUP "&Ñïðàâêà" + BEGIN + MENUITEM "&Î ïðîãðàììå...", ID_HELP_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_OPENFILTER, "Âñå ïîääåðæèâàåìûå ôîðìàòû (*.bin,*.psf)|*.bin;*.psf|Äâîè÷íûå ôàéëû øðèôòîâ (*.bin)|*.bin|Ýêðàííûå øðèôòû PC âåðñèè 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Äâîè÷íûå ôàéëû øðèôòîâ (*.bin)|*.bin|" + IDS_OPENERROR, "Îøèáêà îòêðûòèÿ ôàéëà! (Îøèáêà íîìåð %1!u!)" + IDS_READERROR, "Îøèáêà ÷òåíèÿ ôàéëà! (Îøèáêà íîìåð %1!u!)" + IDS_WRITEERROR, "Îøèáêà çàïèñè ôàéëà! (Îøèáêà íîìåð %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Íåïîääåðæèâàåìûé ôîðìàò ôàéëà!" + IDS_UNSUPPORTEDPSF, "Íåïîääåðæèâàåìûé PSF-ôîðìàò øðèôòà! Ðåäàêòîð ïîääåðæèâàåò òîëüêî øðèôòû ðàçìåðîì 8x8 áåç ñïåöèàëüíûõ ðåæèìîâ." + IDS_DOCNAME, "Øðèôò %1!u!" + IDS_SAVEPROMPT, "Ôàéë ""%1"" áûë èçìåíåí è èçìåíåíèÿ íå áûëè ñîõðàíåíû.\n\nÑîõðàíèòü?" + IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôòîâ ReactOS" + + IDS_TOOLTIP_NEW, "Íîâûé" + IDS_TOOLTIP_OPEN, "Îòêðûòü" + IDS_TOOLTIP_SAVE, "Ñîõðàíèòü" + IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàêòèðîâàòü ñèìâîë" +END Propchange: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/vgafontedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.c (original) +++ trunk/rosapps/devutils/vgafontedit/main.c Tue Feb 5 17:50:02 2008 @@ -7,8 +7,6 @@ */ #include "precomp.h" - -const WCHAR szAppName[] = L"ReactOS VGA Font Editor"; HINSTANCE hInstance; HANDLE hProcessHeap; Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Tue Feb 5 17:50:02 2008 @@ -31,3 +31,4 @@ // Languages #include "lang/en-US.rc" #include "lang/de-DE.rc" +#include "lang/ru-RU.rc" Modified: trunk/rosapps/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/mainw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/mainwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/mainwnd.c Tue Feb 5 17:50:02 2008 @@ -433,6 +433,8 @@ { (*Info)->nCmdShow = nCmdShow; + LoadString(hInstance, IDS_APPTITLE, szAppName, MAX_STRING); + hMainWnd = CreateWindowExW(0, szMainWndClass, szAppName, Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/preco… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Tue Feb 5 17:50:02 2008 @@ -14,6 +14,8 @@ #include <commctrl.h> #include "resource.h" #include "customwndclasses.h" + +#define MAX_STRING 128 // Forward declarations typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO; @@ -137,7 +139,7 @@ VOID UnInitFontWndClass(VOID); // main.c -extern const WCHAR szAppName[]; +WCHAR szAppName[MAX_STRING]; extern HINSTANCE hInstance; extern HANDLE hProcessHeap; Modified: trunk/rosapps/devutils/vgafontedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/resou… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/resource.h (original) +++ trunk/rosapps/devutils/vgafontedit/resource.h Tue Feb 5 17:50:02 2008 @@ -64,6 +64,7 @@ #define IDS_UNSUPPORTEDPSF 10007 #define IDS_DOCNAME 10008 #define IDS_SAVEPROMPT 10009 +#define IDS_APPTITLE 10010 #define IDS_TOOLTIP_NEW 11001 #define IDS_TOOLTIP_OPEN 11002

1 0

[ros-arm-bringup] 32136: On ARM, it seems first = "true" parsing doesn't actually work in .rbuild files -- the object is not properly placed in the beginning of the FreeLDR text section. As a workaround, a special "startup" section is now used to contain the boot.s code, and a linker flag is used to set this section as the entrypoint section at 0x8000. FreeLDR for ARM now links properly, with _start at 0x8000.
by ros-arm-bringup＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: ros-arm-bringup Date: Tue Feb 5 14:15:59 2008 New Revision: 32136 URL: http://svn.reactos.org/svn/reactos?rev=32136&view=rev Log: On ARM, it seems first = "true" parsing doesn't actually work in .rbuild files -- the object is not properly placed in the beginning of the FreeLDR text section. As a workaround, a special "startup" section is now used to contain the boot.s code, and a linker flag is used to set this section as the entrypoint section at 0x8000. FreeLDR for ARM now links properly, with _start at 0x8000. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Feb 5 14:15:59 2008 @@ -3546,12 +3546,24 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); - fprintf ( fMakefile, - "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s %s\n", - backend->GetFullName ( junk_tmp ).c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str (), - GetLinkerMacro ().c_str ()); + if (Environment::GetArch() == "arm") + { + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,--section-start,startup=0x8000 -o %s %s %s %s\n", + backend->GetFullName ( junk_tmp ).c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); + } + else + { + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s %s\n", + backend->GetFullName ( junk_tmp ).c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); + } fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", backend->GetFullName ( junk_tmp ).c_str () );

1 0

[ros-arm-bringup] 32135: Fix a couple of problems with FreeLDR portability. beep is now MachBeep since the code is not portable. A variety of portable PE loading routines were in arch/loader.c for no reason. These are now in reactos/imageldr.c. arch/loader.c now only contains the architecture-specific ReactOS initialization code. AcpiPresent was used on all builds, even though it's a non-portable x86-only flag. Now, ACPI detection itself, if present, will set the appropriate ACPI flag directly i
by ros-arm-bringup＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: ros-arm-bringup Date: Tue Feb 5 14:13:17 2008 New Revision: 32135 URL: http://svn.reactos.org/svn/reactos?rev=32135&view=rev Log: Fix a couple of problems with FreeLDR portability. beep is now MachBeep since the code is not portable. A variety of portable PE loading routines were in arch/loader.c for no reason. These are now in reactos/imageldr.c. arch/loader.c now only contains the architecture-specific ReactOS initialization code. AcpiPresent was used on all builds, even though it's a non-portable x86-only flag. Now, ACPI detection itself, if present, will set the appropriate ACPI flag directly in the loader blog, so other architectures don't have to worry about exporting AcpiPresent; DiskStopFloppyMotor is only relevant to x86, as is preparing for Video. MachVideoPrepareForReactOS has therefore been replaced by MachPrepareForReactOS as a generic pre-boot preparation routine. Implemented MachPrepareForReactOS across current architectures to preserve functionality. Added: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/include/rtl.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Tue Feb 5 14:13:17 2008 @@ -8,16 +8,14 @@ /* INCLUDES *******************************************************************/ -//#include <ksarm.h> //#include <kxarm.h> /* GLOBALS ********************************************************************/ -.globl _start -.globl _bss +.global _start +.section startup /* BOOT CODE ******************************************************************/ -.extern ArmInit _start: b . Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Tue Feb 5 14:13:17 2008 @@ -15,7 +15,7 @@ /* FUNCTIONS ******************************************************************/ VOID -ArmMachInit(const char *CmdLine) +MachInit(IN PCCH CommandLine) { // // Setup ARM routines Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Tue Feb 5 14:13:17 2008 @@ -12,4 +12,14 @@ /* GLOBALS ********************************************************************/ +ULONG PageDirectoryStart, PageDirectoryEnd; + /* FUNCTIONS ******************************************************************/ + +VOID +FrLdrStartup(IN ULONG Magic) +{ + // + // Start the OS + // +} 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 Tue Feb 5 14:13:17 2008 @@ -63,7 +63,9 @@ if (Rsdp) { + /* Set up the flag in the loader block */ AcpiPresent = TRUE; + LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; /* Create new bus key */ FldrCreateComponentKey(SystemKey, Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c Tue Feb 5 14:13:17 2008 @@ -19,7 +19,7 @@ #include <freeldr.h> -void beep(void) +void PcBeep(void) { sound(700); delay(200); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Tue Feb 5 14:13:17 2008 @@ -23,18 +23,6 @@ #define NDEBUG #include <debug.h> #undef DbgPrint - -/* Load Address of Next Module */ -ULONG_PTR NextModuleBase = KERNEL_BASE_PHYS; - -/* Currently Opened Module */ -PLOADER_MODULE CurrentModule = NULL; - -/* Unrelocated Kernel Base in Virtual Memory */ -ULONG_PTR KernelBase; - -/* Kernel Entrypoint in Virtual Memory */ -ROS_KERNEL_ENTRY_POINT KernelEntryPoint; /* Page Directory and Tables for non-PAE Systems */ extern PAGE_DIRECTORY_X86 startup_pagedirectory; @@ -44,13 +32,8 @@ extern PAGE_DIRECTORY_X86 apic_pagetable; extern PAGE_DIRECTORY_X86 kpcr_pagetable; extern PAGE_DIRECTORY_X86 kuser_pagetable; - -PVOID -NTAPI -LdrPEGetExportByName(PVOID BaseAddress, - PUCHAR SymbolName, - USHORT Hint); - +extern ULONG_PTR KernelBase; +extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; /* FUNCTIONS *****************************************************************/ /*++ @@ -221,524 +204,3 @@ PageDir->Pde[0x1FF].PageFrameNumber = 1; } -PLOADER_MODULE -NTAPI -LdrGetModuleObject(PCHAR ModuleName) -{ - ULONG i; - - for (i = 0; i < LoaderBlock.ModsCount; i++) - { - if (strstr(_strupr((PCHAR)reactos_modules[i].String), _strupr(ModuleName))) - { - return &reactos_modules[i]; - } - } - - return NULL; -} - -PVOID -NTAPI -LdrPEFixupForward(IN PCHAR ForwardName) -{ - CHAR NameBuffer[128]; - PCHAR p; - PLOADER_MODULE ModuleObject; - - strcpy(NameBuffer, ForwardName); - p = strchr(NameBuffer, '.'); - if (p == NULL) return NULL; - *p = 0; - - ModuleObject = LdrGetModuleObject(NameBuffer); - if (!ModuleObject) - { - DbgPrint("LdrPEFixupForward: failed to find module %s\n", NameBuffer); - return NULL; - } - - return LdrPEGetExportByName((PVOID)ModuleObject->ModStart, (PUCHAR)(p + 1), 0xffff); -} - -PVOID -NTAPI -LdrPEGetExportByName(PVOID BaseAddress, - PUCHAR SymbolName, - USHORT Hint) -{ - PIMAGE_EXPORT_DIRECTORY ExportDir; - PULONG * ExFunctions; - PULONG * ExNames; - USHORT * ExOrdinals; - PVOID ExName; - ULONG Ordinal; - PVOID Function; - LONG minn, maxn, mid, res; - ULONG ExportDirSize; - - /* HAL and NTOS use a virtual address, switch it to physical mode */ - if ((ULONG_PTR)BaseAddress & KSEG0_BASE) - { - BaseAddress = RVA(BaseAddress, -KSEG0_BASE); - } - - ExportDir = (PIMAGE_EXPORT_DIRECTORY) - RtlImageDirectoryEntryToData(BaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportDirSize); - if (!ExportDir) - { - DbgPrint("LdrPEGetExportByName(): no export directory!\n"); - return NULL; - } - - /* The symbol names may be missing entirely */ - if (!ExportDir->AddressOfNames) - { - DbgPrint("LdrPEGetExportByName(): symbol names missing entirely\n"); - return NULL; - } - - /* - * Get header pointers - */ - ExNames = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); - ExOrdinals = (USHORT *)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals); - ExFunctions = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); - - /* - * Check the hint first - */ - if (Hint < ExportDir->NumberOfNames) - { - ExName = RVA(BaseAddress, ExNames[Hint]); - if (strcmp(ExName, (PCHAR)SymbolName) == 0) - { - Ordinal = ExOrdinals[Hint]; - Function = RVA(BaseAddress, ExFunctions[Ordinal]); - if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && - (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) - { - Function = LdrPEFixupForward((PCHAR)Function); - if (Function == NULL) - { - DbgPrint("LdrPEGetExportByName(): failed to find %s\n", Function); - } - return Function; - } - - if (Function != NULL) return Function; - } - } - - /* - * Binary search - */ - minn = 0; - maxn = ExportDir->NumberOfNames - 1; - while (minn <= maxn) - { - mid = (minn + maxn) / 2; - - ExName = RVA(BaseAddress, ExNames[mid]); - res = strcmp(ExName, (PCHAR)SymbolName); - if (res == 0) - { - Ordinal = ExOrdinals[mid]; - Function = RVA(BaseAddress, ExFunctions[Ordinal]); - if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && - (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) - { - Function = LdrPEFixupForward((PCHAR)Function); - if (Function == NULL) - { - DbgPrint("1: failed to find %s\n", Function); - } - return Function; - } - if (Function != NULL) - { - return Function; - } - } - else if (res > 0) - { - maxn = mid - 1; - } - else - { - minn = mid + 1; - } - } - - ExName = RVA(BaseAddress, ExNames[mid]); - DbgPrint("2: failed to find %s\n",SymbolName); - return (PVOID)NULL; -} - -NTSTATUS -NTAPI -LdrPEProcessImportDirectoryEntry(PVOID DriverBase, - PLOADER_MODULE LoaderModule, - PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory) -{ - PVOID* ImportAddressList; - PULONG FunctionNameList; - - if (ImportModuleDirectory == NULL || ImportModuleDirectory->Name == 0) - { - return STATUS_UNSUCCESSFUL; - } - - /* Get the import address list. */ - ImportAddressList = (PVOID*)RVA(DriverBase, ImportModuleDirectory->FirstThunk); - - /* Get the list of functions to import. */ - if (ImportModuleDirectory->OriginalFirstThunk != 0) - { - FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); - } - else - { - FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->FirstThunk); - } - - /* Walk through function list and fixup addresses. */ - while (*FunctionNameList != 0L) - { - if ((*FunctionNameList) & 0x80000000) - { - DbgPrint("Failed to import ordinal from %s\n", LoaderModule->String); - return STATUS_UNSUCCESSFUL; - } - else - { - IMAGE_IMPORT_BY_NAME *pe_name; - pe_name = RVA(DriverBase, *FunctionNameList); - *ImportAddressList = LdrPEGetExportByName((PVOID)LoaderModule->ModStart, pe_name->Name, pe_name->Hint); - - /* Fixup the address to be virtual */ - *ImportAddressList = RVA(*ImportAddressList, KSEG0_BASE); - - //DbgPrint("Looked for: %s and found: %p\n", pe_name->Name, *ImportAddressList); - if ((*ImportAddressList) == NULL) - { - DbgPrint("Failed to import %s from %s\n", pe_name->Name, LoaderModule->String); - return STATUS_UNSUCCESSFUL; - } - } - ImportAddressList++; - FunctionNameList++; - } - return STATUS_SUCCESS; -} - -extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); - -NTSTATUS -NTAPI -LdrPEGetOrLoadModule(IN PCHAR ModuleName, - IN PCHAR ImportedName, - IN PLOADER_MODULE* ImportedModule) -{ - NTSTATUS Status = STATUS_SUCCESS; - - *ImportedModule = LdrGetModuleObject(ImportedName); - if (*ImportedModule == NULL) - { - if (!FrLdrLoadDriver(ImportedName, 0)) - { - return STATUS_UNSUCCESSFUL; - } - else - { - return LdrPEGetOrLoadModule - (ModuleName, ImportedName, ImportedModule); - } - } - - return Status; -} - -NTSTATUS -NTAPI -LdrPEFixupImports(IN PVOID DllBase, - IN PCHAR DllName) -{ - PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory; - PCHAR ImportedName; - NTSTATUS Status; - PLOADER_MODULE ImportedModule; - ULONG Size; - - /* Process each import module */ - ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) - RtlImageDirectoryEntryToData(DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, - &Size); - while (ImportModuleDirectory && ImportModuleDirectory->Name) - { - /* Check to make sure that import lib is kernel */ - ImportedName = (PCHAR) DllBase + ImportModuleDirectory->Name; - //DbgPrint("Processing imports for file: %s into file: %s\n", DllName, ImportedName); - - Status = LdrPEGetOrLoadModule(DllName, ImportedName, &ImportedModule); - if (!NT_SUCCESS(Status)) return Status; - - Status = LdrPEProcessImportDirectoryEntry(DllBase, ImportedModule, ImportModuleDirectory); - if (!NT_SUCCESS(Status)) return Status; - - //DbgPrint("Imports for file: %s into file: %s complete\n", DllName, ImportedName); - ImportModuleDirectory++; - } - - return STATUS_SUCCESS; -} - -ULONG -NTAPI -FrLdrReMapImage(IN PVOID Base, - IN PVOID LoadBase) -{ - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_SECTION_HEADER Section; - ULONG i, Size, DriverSize = 0; - - /* Get the first section */ - NtHeader = RtlImageNtHeader(Base); - Section = IMAGE_FIRST_SECTION(NtHeader); - - /* Allocate memory for the driver */ - DriverSize = NtHeader->OptionalHeader.SizeOfImage; - LoadBase = MmAllocateMemoryAtAddress(DriverSize, LoadBase, LoaderSystemCode); - ASSERT(LoadBase); - - /* Copy headers over */ - RtlMoveMemory(LoadBase, Base, NtHeader->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Get the size of this section and check if it's valid */ - Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - if (Size <= DriverSize) - { - if (Section[i].SizeOfRawData) - { - /* Copy the data from the disk to the image */ - RtlCopyMemory((PVOID)((ULONG_PTR)LoadBase + - Section[i].VirtualAddress), - (PVOID)((ULONG_PTR)Base + - Section[i].PointerToRawData), - Section[i].Misc.VirtualSize > - Section[i].SizeOfRawData ? - Section[i].SizeOfRawData : - Section[i].Misc.VirtualSize); - } - else - { - /* Clear the BSS area */ - RtlZeroMemory((PVOID)((ULONG_PTR)LoadBase + - Section[i].VirtualAddress), - Section[i].Misc.VirtualSize); - } - } - } - - /* Return the size of the mapped driver */ - return DriverSize; -} - -PVOID -NTAPI -FrLdrMapImage(IN FILE *Image, - IN PCHAR Name, - IN ULONG ImageType) -{ - PVOID ImageBase, LoadBase, ReadBuffer; - ULONG ImageId = LoaderBlock.ModsCount; - ULONG ImageSize; - NTSTATUS Status = STATUS_SUCCESS; - - /* Try to see, maybe it's loaded already */ - if (LdrGetModuleObject(Name) != NULL) - { - /* It's loaded, return NULL. It would be wise to return - correct LoadBase, but it seems to be ignored almost everywhere */ - return NULL; - } - - /* Set the virtual (image) and physical (load) addresses */ - LoadBase = (PVOID)NextModuleBase; - ImageBase = RVA(LoadBase, KSEG0_BASE); - - /* Save the Image Size */ - ImageSize = FsGetFileSize(Image); - - /* Set the file pointer to zero */ - FsSetFilePointer(Image, 0); - - /* Allocate a temporary buffer for the read */ - ReadBuffer = MmHeapAlloc(ImageSize); - - /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, ReadBuffer); - - /* Map it into virtual memory */ - ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); - - /* Free the temporary buffer */ - MmHeapFree(ReadBuffer); - - /* Calculate Difference between Real Base and Compiled Base*/ - Status = LdrRelocateImageWithBias(LoadBase, - (ULONG_PTR)ImageBase - - (ULONG_PTR)LoadBase, - "FreeLdr", - STATUS_SUCCESS, - STATUS_UNSUCCESSFUL, - STATUS_UNSUCCESSFUL); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - DbgPrint("Failed to relocate image: %s\n", Name); - return NULL; - } - - /* Fill out Module Data Structure */ - reactos_modules[ImageId].ModStart = (ULONG_PTR)ImageBase; - reactos_modules[ImageId].ModEnd = (ULONG_PTR)ImageBase + ImageSize; - strcpy(reactos_module_strings[ImageId], Name); - reactos_modules[ImageId].String = (ULONG_PTR)reactos_module_strings[ImageId]; - LoaderBlock.ModsCount++; - - /* Increase the next Load Base */ - NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); - - /* Perform import fixups */ - if (!NT_SUCCESS(LdrPEFixupImports(LoadBase, Name))) - { - /* Fixup failed, just don't include it in the list */ - // NextModuleBase = OldNextModuleBase; - LoaderBlock.ModsCount = ImageId; - return NULL; - } - - /* Return the final mapped address */ - return LoadBase; -} - -ULONG_PTR -NTAPI -FrLdrLoadModule(FILE *ModuleImage, - LPCSTR ModuleName, - PULONG ModuleSize) -{ - ULONG LocalModuleSize; - PLOADER_MODULE ModuleData; - LPSTR NameBuffer; - LPSTR TempName; - - /* Get current module data structure and module name string array */ - ModuleData = &reactos_modules[LoaderBlock.ModsCount]; - - /* Get only the Module Name */ - do { - - TempName = strchr(ModuleName, '\\'); - - if(TempName) { - ModuleName = TempName + 1; - } - - } while(TempName); - NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; - - /* Get Module Size */ - LocalModuleSize = FsGetFileSize(ModuleImage); - - /* Fill out Module Data Structure */ - ModuleData->ModStart = NextModuleBase; - ModuleData->ModEnd = NextModuleBase + LocalModuleSize; - - /* Save name */ - strcpy(NameBuffer, ModuleName); - ModuleData->String = (ULONG_PTR)NameBuffer; - - /* Load the file image */ - FsReadFile(ModuleImage, LocalModuleSize, NULL, (PVOID)NextModuleBase); - - /* Move to next memory block and increase Module Count */ - NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); - LoaderBlock.ModsCount++; -// DbgPrint("NextBase, ImageSize, ModStart, ModEnd %p %p %p %p\n", - // NextModuleBase, LocalModuleSize, ModuleData->ModStart, ModuleData->ModEnd); - - /* Return Module Size if required */ - if (ModuleSize != NULL) { - *ModuleSize = LocalModuleSize; - } - - return(ModuleData->ModStart); -} - -ULONG_PTR -NTAPI -FrLdrCreateModule(LPCSTR ModuleName) -{ - PLOADER_MODULE ModuleData; - LPSTR NameBuffer; - - /* Get current module data structure and module name string array */ - ModuleData = &reactos_modules[LoaderBlock.ModsCount]; - NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; - - /* Set up the structure */ - ModuleData->ModStart = NextModuleBase; - ModuleData->ModEnd = -1; - - /* Copy the name */ - strcpy(NameBuffer, ModuleName); - ModuleData->String = (ULONG_PTR)NameBuffer; - - /* Set the current Module */ - CurrentModule = ModuleData; - - /* Return Module Base Address */ - return(ModuleData->ModStart); -} - -BOOLEAN -NTAPI -FrLdrCloseModule(ULONG_PTR ModuleBase, - ULONG ModuleSize) -{ - PLOADER_MODULE ModuleData = CurrentModule; - - /* Make sure a module is opened */ - if (ModuleData) { - - /* Make sure this is the right module and that it hasn't been closed */ - if ((ModuleBase == ModuleData->ModStart) && (ModuleData->ModEnd == (ULONG_PTR)-1)) { - - /* Close the Module */ - ModuleData->ModEnd = ModuleData->ModStart + ModuleSize; - - /* Set the next Module Base and increase the number of modules */ - NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); - LoaderBlock.ModsCount++; - - /* Close the currently opened module */ - CurrentModule = NULL; - - /* Success */ - return(TRUE); - } - } - - /* Failure path */ - return(FALSE); -} Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Tue Feb 5 14:13:17 2008 @@ -22,39 +22,49 @@ VOID PcMachInit(const char *CmdLine) { - EnableA20(); - - /* Setup vtbl */ - MachVtbl.ConsPutChar = PcConsPutChar; - MachVtbl.ConsKbHit = PcConsKbHit; - MachVtbl.ConsGetCh = PcConsGetCh; - MachVtbl.VideoClearScreen = PcVideoClearScreen; - MachVtbl.VideoSetDisplayMode = PcVideoSetDisplayMode; - MachVtbl.VideoGetDisplaySize = PcVideoGetDisplaySize; - MachVtbl.VideoGetBufferSize = PcVideoGetBufferSize; - MachVtbl.VideoSetTextCursorPosition = PcVideoSetTextCursorPosition; - MachVtbl.VideoSetTextCursorPosition = PcVideoSetTextCursorPosition; - MachVtbl.VideoHideShowTextCursor = PcVideoHideShowTextCursor; - MachVtbl.VideoPutChar = PcVideoPutChar; - MachVtbl.VideoCopyOffScreenBufferToVRAM = PcVideoCopyOffScreenBufferToVRAM; - MachVtbl.VideoIsPaletteFixed = PcVideoIsPaletteFixed; - MachVtbl.VideoSetPaletteColor = PcVideoSetPaletteColor; - MachVtbl.VideoGetPaletteColor = PcVideoGetPaletteColor; - MachVtbl.VideoSync = PcVideoSync; - MachVtbl.VideoPrepareForReactOS = PcVideoPrepareForReactOS; - MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; - MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = PcDiskGetPartitionEntry; - MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; - MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; - MachVtbl.HwDetect = PcHwDetect; + EnableA20(); + + /* Setup vtbl */ + MachVtbl.ConsPutChar = PcConsPutChar; + MachVtbl.ConsKbHit = PcConsKbHit; + MachVtbl.ConsGetCh = PcConsGetCh; + MachVtbl.VideoClearScreen = PcVideoClearScreen; + MachVtbl.VideoSetDisplayMode = PcVideoSetDisplayMode; + MachVtbl.VideoGetDisplaySize = PcVideoGetDisplaySize; + MachVtbl.VideoGetBufferSize = PcVideoGetBufferSize; + MachVtbl.VideoSetTextCursorPosition = PcVideoSetTextCursorPosition; + MachVtbl.VideoSetTextCursorPosition = PcVideoSetTextCursorPosition; + MachVtbl.VideoHideShowTextCursor = PcVideoHideShowTextCursor; + MachVtbl.VideoPutChar = PcVideoPutChar; + MachVtbl.VideoCopyOffScreenBufferToVRAM = PcVideoCopyOffScreenBufferToVRAM; + MachVtbl.VideoIsPaletteFixed = PcVideoIsPaletteFixed; + MachVtbl.VideoSetPaletteColor = PcVideoSetPaletteColor; + MachVtbl.VideoGetPaletteColor = PcVideoGetPaletteColor; + MachVtbl.VideoSync = PcVideoSync; + MachVtbl.Beep = PcBeep; + MachVtbl.PrepareForReactOS = PcPrepareForReactOS; + MachVtbl.GetMemoryMap = PcMemGetMemoryMap; + MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = i386DiskGetBootPath; + MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; + MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; + MachVtbl.DiskGetPartitionEntry = PcDiskGetPartitionEntry; + MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; + MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; + MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; + MachVtbl.HwDetect = PcHwDetect; } +VOID +PcPrepareForReactOS(IN BOOLEAN Setup) +{ + // + // On PC, prepare video and turn off the floppy motor + // + PcVideoPrepareForReactOS(Setup); + DiskStopFloppyMotor(); +} /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Tue Feb 5 14:13:17 2008 @@ -44,7 +44,8 @@ MachVtbl.VideoSetPaletteColor = XboxVideoSetPaletteColor; MachVtbl.VideoGetPaletteColor = XboxVideoGetPaletteColor; MachVtbl.VideoSync = XboxVideoSync; - MachVtbl.VideoPrepareForReactOS = XboxVideoPrepareForReactOS; + MachVtbl.Beep = PcBeep; + MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; @@ -62,3 +63,13 @@ /* Set LEDs to orange after init */ XboxSetLED("oooo"); } + +VOID +XboxPrepareForReactOS(IN BOOLEAN Setup) +{ + // + // On XBOX, prepare video and turn off the floppy motor + // + XboxVideoPrepareForReactOS(Setup); + DiskStopFloppyMotor(); +} Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Tue Feb 5 14:13:17 2008 @@ -234,6 +234,13 @@ } VOID +XboxBeep() +{ + /* Call PC version */ + PcBeep(); +} + +VOID XboxVideoPrepareForReactOS(IN BOOLEAN Setup) { XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE); Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Tue Feb 5 14:13:17 2008 @@ -44,6 +44,7 @@ <file>archwsup.c</file> <file>binhive.c</file> <file>reactos.c</file> + <file>imageldr.c</file> </directory> <directory name="rtl"> <file>bget.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h Tue Feb 5 14:13:17 2008 @@ -45,6 +45,7 @@ VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID PcVideoSync(VOID); VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); +VOID PcPrepareForReactOS(IN BOOLEAN Setup); ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h Tue Feb 5 14:13:17 2008 @@ -46,6 +46,7 @@ VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID XboxVideoSync(VOID); VOID XboxVideoPrepareForReactOS(IN BOOLEAN Setup); +VOID XboxPrepareForReactOS(IN BOOLEAN Setup); VOID XboxMemInit(VOID); PVOID XboxMemReserveMemory(ULONG MbToReserve); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h Tue Feb 5 14:13:17 2008 @@ -52,7 +52,8 @@ VOID (*VideoSetPaletteColor)(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID (*VideoGetPaletteColor)(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID (*VideoSync)(VOID); - VOID (*VideoPrepareForReactOS)(IN BOOLEAN Setup); + VOID (*Beep)(VOID); + VOID (*PrepareForReactOS)(IN BOOLEAN Setup); ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); @@ -91,7 +92,7 @@ VOID MachVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue); VOID MachVideoSync(VOID); -VOID MachVideoPrepareForReactOS(IN BOOLEAN Setup); +VOID MachBeep(VOID); ULONG MachGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); BOOLEAN MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); BOOLEAN @@ -112,6 +113,7 @@ ULONG MachDiskGetCacheableBlockCount(ULONG DriveNumber); VOID MachRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); VOID MachHwDetect(VOID); +VOID MachPrepareForReactOS(IN BOOLEAN Setup); #define MachConsPutChar(Ch) MachVtbl.ConsPutChar(Ch) #define MachConsKbHit() MachVtbl.ConsKbHit() @@ -128,7 +130,8 @@ #define MachVideoSetPaletteColor(Col, R, G, B) MachVtbl.VideoSetPaletteColor((Col), (R), (G), (B)) #define MachVideoGetPaletteColor(Col, R, G, B) MachVtbl.VideoGetPaletteColor((Col), (R), (G), (B)) #define MachVideoSync() MachVtbl.VideoSync() -#define MachVideoPrepareForReactOS(a) MachVtbl.VideoPrepareForReactOS(a) +#define MachBeep() MachVtbl.Beep() +#define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) #define MachGetMemoryMap(MMap, Size) MachVtbl.GetMemoryMap((MMap), (Size)) #define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) #define MachDiskGetSystemVolume(SysPath, RemPath, Dev, Drv, Start, Cnt, FsType) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev), (Drv), (Start), (Cnt), (FsType)) Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/rtl.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h Tue Feb 5 14:13:17 2008 @@ -25,7 +25,7 @@ char * convert_to_ascii(char *buf, int c, int num); char * convert_i64_to_ascii(char *buf, int c, unsigned long long num); -void beep(void); +void PcBeep(void); void delay(unsigned msec); void sound(int freq); Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c Tue Feb 5 14:13:17 2008 @@ -34,7 +34,8 @@ #undef MachVideoSetPaletteColor #undef MachVideoGetPaletteColor #undef MachVideoSync -#undef MachVideoPrepareForReactOS +#undef MachBeep +#undef MachPrepareForReactOS #undef MachGetMemoryMap #undef MachDiskGetBootVolume #undef MachDiskGetSystemVolume @@ -142,9 +143,15 @@ } VOID -MachVideoPrepareForReactOS(IN BOOLEAN Setup) -{ - MachVtbl.VideoPrepareForReactOS(Setup); +MachBeep(VOID) +{ + MachVtbl.Beep(); +} + +VOID +MachPrepareForReactOS(IN BOOLEAN Setup) +{ + MachVtbl.PrepareForReactOS(Setup); } ULONG Added: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c (added) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c Tue Feb 5 14:13:17 2008 @@ -1,0 +1,543 @@ +#include <freeldr.h> +#include <debug.h> +#undef DbgPrint + +extern BOOLEAN FrLdrBootType; + +ULONG_PTR NextModuleBase = KERNEL_BASE_PHYS; +PLOADER_MODULE CurrentModule = NULL; + +PVOID +NTAPI +LdrPEGetExportByName( + IN PVOID BaseAddress, + IN PUCHAR SymbolName, + IN USHORT Hint +); + +extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); + +/* MODULE MANAGEMENT **********************************************************/ + +PLOADER_MODULE +NTAPI +LdrGetModuleObject(IN PCHAR ModuleName) +{ + ULONG i; + + for (i = 0; i < LoaderBlock.ModsCount; i++) + { + if (strstr(_strupr((PCHAR)reactos_modules[i].String), _strupr(ModuleName))) + { + return &reactos_modules[i]; + } + } + + return NULL; +} + +NTSTATUS +NTAPI +LdrPEGetOrLoadModule(IN PCHAR ModuleName, + IN PCHAR ImportedName, + IN PLOADER_MODULE* ImportedModule) +{ + NTSTATUS Status = STATUS_SUCCESS; + + *ImportedModule = LdrGetModuleObject(ImportedName); + if (*ImportedModule == NULL) + { + if (!FrLdrLoadDriver(ImportedName, 0)) + { + return STATUS_UNSUCCESSFUL; + } + else + { + return LdrPEGetOrLoadModule(ModuleName, ImportedName, ImportedModule); + } + } + + return Status; +} + +ULONG_PTR +NTAPI +FrLdrLoadModule(FILE *ModuleImage, + LPCSTR ModuleName, + PULONG ModuleSize) +{ + ULONG LocalModuleSize; + PLOADER_MODULE ModuleData; + LPSTR NameBuffer; + LPSTR TempName; + + /* Get current module data structure and module name string array */ + ModuleData = &reactos_modules[LoaderBlock.ModsCount]; + + /* Get only the Module Name */ + do { + + TempName = strchr(ModuleName, '\\'); + + if(TempName) { + ModuleName = TempName + 1; + } + + } while(TempName); + NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; + + /* Get Module Size */ + LocalModuleSize = FsGetFileSize(ModuleImage); + + /* Fill out Module Data Structure */ + ModuleData->ModStart = NextModuleBase; + ModuleData->ModEnd = NextModuleBase + LocalModuleSize; + + /* Save name */ + strcpy(NameBuffer, ModuleName); + ModuleData->String = (ULONG_PTR)NameBuffer; + + /* Load the file image */ + FsReadFile(ModuleImage, LocalModuleSize, NULL, (PVOID)NextModuleBase); + + /* Move to next memory block and increase Module Count */ + NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); + LoaderBlock.ModsCount++; + // DbgPrint("NextBase, ImageSize, ModStart, ModEnd %p %p %p %p\n", + // NextModuleBase, LocalModuleSize, ModuleData->ModStart, ModuleData->ModEnd); + + /* Return Module Size if required */ + if (ModuleSize != NULL) { + *ModuleSize = LocalModuleSize; + } + + return(ModuleData->ModStart); +} + +ULONG_PTR +NTAPI +FrLdrCreateModule(LPCSTR ModuleName) +{ + PLOADER_MODULE ModuleData; + LPSTR NameBuffer; + + /* Get current module data structure and module name string array */ + ModuleData = &reactos_modules[LoaderBlock.ModsCount]; + NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; + + /* Set up the structure */ + ModuleData->ModStart = NextModuleBase; + ModuleData->ModEnd = -1; + + /* Copy the name */ + strcpy(NameBuffer, ModuleName); + ModuleData->String = (ULONG_PTR)NameBuffer; + + /* Set the current Module */ + CurrentModule = ModuleData; + + /* Return Module Base Address */ + return(ModuleData->ModStart); +} + +BOOLEAN +NTAPI +FrLdrCloseModule(ULONG_PTR ModuleBase, + ULONG ModuleSize) +{ + PLOADER_MODULE ModuleData = CurrentModule; + + /* Make sure a module is opened */ + if (ModuleData) { + + /* Make sure this is the right module and that it hasn't been closed */ + if ((ModuleBase == ModuleData->ModStart) && (ModuleData->ModEnd == (ULONG_PTR)-1)) { + + /* Close the Module */ + ModuleData->ModEnd = ModuleData->ModStart + ModuleSize; + + /* Set the next Module Base and increase the number of modules */ + NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); + LoaderBlock.ModsCount++; + + /* Close the currently opened module */ + CurrentModule = NULL; + + /* Success */ + return(TRUE); + } + } + + /* Failure path */ + return(FALSE); +} + +/* PE IMAGE LOADER ***********************************************************/ + +PVOID +NTAPI +LdrPEFixupForward(IN PCHAR ForwardName) +{ + CHAR NameBuffer[128]; + PCHAR p; + PLOADER_MODULE ModuleObject; + + strcpy(NameBuffer, ForwardName); + p = strchr(NameBuffer, '.'); + if (p == NULL) return NULL; + *p = 0; + + ModuleObject = LdrGetModuleObject(NameBuffer); + if (!ModuleObject) + { + DbgPrint("LdrPEFixupForward: failed to find module %s\n", NameBuffer); + return NULL; + } + + return LdrPEGetExportByName((PVOID)ModuleObject->ModStart, (PUCHAR)(p + 1), 0xffff); +} + +PVOID +NTAPI +LdrPEGetExportByName(PVOID BaseAddress, + PUCHAR SymbolName, + USHORT Hint) +{ + PIMAGE_EXPORT_DIRECTORY ExportDir; + PULONG * ExFunctions; + PULONG * ExNames; + USHORT * ExOrdinals; + PVOID ExName; + ULONG Ordinal; + PVOID Function; + LONG minn, maxn, mid, res; + ULONG ExportDirSize; + + /* HAL and NTOS use a virtual address, switch it to physical mode */ + if ((ULONG_PTR)BaseAddress & KSEG0_BASE) + { + BaseAddress = RVA(BaseAddress, -KSEG0_BASE); + } + + ExportDir = (PIMAGE_EXPORT_DIRECTORY) + RtlImageDirectoryEntryToData(BaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportDirSize); + if (!ExportDir) + { + DbgPrint("LdrPEGetExportByName(): no export directory!\n"); + return NULL; + } + + /* The symbol names may be missing entirely */ + if (!ExportDir->AddressOfNames) + { + DbgPrint("LdrPEGetExportByName(): symbol names missing entirely\n"); + return NULL; + } + + /* + * Get header pointers + */ + ExNames = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); + ExOrdinals = (USHORT *)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals); + ExFunctions = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); + + /* + * Check the hint first + */ + if (Hint < ExportDir->NumberOfNames) + { + ExName = RVA(BaseAddress, ExNames[Hint]); + if (strcmp(ExName, (PCHAR)SymbolName) == 0) + { + Ordinal = ExOrdinals[Hint]; + Function = RVA(BaseAddress, ExFunctions[Ordinal]); + if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && + (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) + { + Function = LdrPEFixupForward((PCHAR)Function); + if (Function == NULL) + { + DbgPrint("LdrPEGetExportByName(): failed to find %s\n", Function); + } + return Function; + } + + if (Function != NULL) return Function; + } + } + + /* + * Binary search + */ + minn = 0; + maxn = ExportDir->NumberOfNames - 1; + while (minn <= maxn) + { + mid = (minn + maxn) / 2; + + ExName = RVA(BaseAddress, ExNames[mid]); + res = strcmp(ExName, (PCHAR)SymbolName); + if (res == 0) + { + Ordinal = ExOrdinals[mid]; + Function = RVA(BaseAddress, ExFunctions[Ordinal]); + if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && + (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) + { + Function = LdrPEFixupForward((PCHAR)Function); + if (Function == NULL) + { + DbgPrint("1: failed to find %s\n", Function); + } + return Function; + } + if (Function != NULL) + { + return Function; + } + } + else if (res > 0) + { + maxn = mid - 1; + } + else + { + minn = mid + 1; + } + } + + ExName = RVA(BaseAddress, ExNames[mid]); + DbgPrint("2: failed to find %s\n",SymbolName); + return (PVOID)NULL; +} + +NTSTATUS +NTAPI +LdrPEProcessImportDirectoryEntry(PVOID DriverBase, + PLOADER_MODULE LoaderModule, + PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory) +{ + PVOID* ImportAddressList; + PULONG FunctionNameList; + + if (ImportModuleDirectory == NULL || ImportModuleDirectory->Name == 0) + { + return STATUS_UNSUCCESSFUL; + } + + /* Get the import address list. */ + ImportAddressList = (PVOID*)RVA(DriverBase, ImportModuleDirectory->FirstThunk); + + /* Get the list of functions to import. */ + if (ImportModuleDirectory->OriginalFirstThunk != 0) + { + FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); + } + else + { + FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->FirstThunk); + } + + /* Walk through function list and fixup addresses. */ + while (*FunctionNameList != 0L) + { + if ((*FunctionNameList) & 0x80000000) + { + DbgPrint("Failed to import ordinal from %s\n", LoaderModule->String); + return STATUS_UNSUCCESSFUL; + } + else + { + IMAGE_IMPORT_BY_NAME *pe_name; + pe_name = RVA(DriverBase, *FunctionNameList); + *ImportAddressList = LdrPEGetExportByName((PVOID)LoaderModule->ModStart, pe_name->Name, pe_name->Hint); + + /* Fixup the address to be virtual */ + *ImportAddressList = RVA(*ImportAddressList, KSEG0_BASE); + + //DbgPrint("Looked for: %s and found: %p\n", pe_name->Name, *ImportAddressList); + if ((*ImportAddressList) == NULL) + { + DbgPrint("Failed to import %s from %s\n", pe_name->Name, LoaderModule->String); + return STATUS_UNSUCCESSFUL; + } + } + ImportAddressList++; + FunctionNameList++; + } + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +LdrPEFixupImports(IN PVOID DllBase, + IN PCHAR DllName) +{ + PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory; + PCHAR ImportedName; + NTSTATUS Status; + PLOADER_MODULE ImportedModule; + ULONG Size; + + /* Process each import module */ + ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) + RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &Size); + while (ImportModuleDirectory && ImportModuleDirectory->Name) + { + /* Check to make sure that import lib is kernel */ + ImportedName = (PCHAR) DllBase + ImportModuleDirectory->Name; + //DbgPrint("Processing imports for file: %s into file: %s\n", DllName, ImportedName); + + Status = LdrPEGetOrLoadModule(DllName, ImportedName, &ImportedModule); + if (!NT_SUCCESS(Status)) return Status; + + Status = LdrPEProcessImportDirectoryEntry(DllBase, ImportedModule, ImportModuleDirectory); + if (!NT_SUCCESS(Status)) return Status; + + //DbgPrint("Imports for file: %s into file: %s complete\n", DllName, ImportedName); + ImportModuleDirectory++; + } + + return STATUS_SUCCESS; +} + +ULONG +NTAPI +FrLdrReMapImage(IN PVOID Base, + IN PVOID LoadBase) +{ + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER Section; + ULONG i, Size, DriverSize = 0; + + /* Get the first section */ + NtHeader = RtlImageNtHeader(Base); + Section = IMAGE_FIRST_SECTION(NtHeader); + + /* Allocate memory for the driver */ + DriverSize = NtHeader->OptionalHeader.SizeOfImage; + LoadBase = MmAllocateMemoryAtAddress(DriverSize, LoadBase, LoaderSystemCode); + ASSERT(LoadBase); + + /* Copy headers over */ + RtlMoveMemory(LoadBase, Base, NtHeader->OptionalHeader.SizeOfHeaders); + + /* Copy image sections into virtual section */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Get the size of this section and check if it's valid */ + Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; + if (Size <= DriverSize) + { + if (Section[i].SizeOfRawData) + { + /* Copy the data from the disk to the image */ + RtlCopyMemory((PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress), + (PVOID)((ULONG_PTR)Base + + Section[i].PointerToRawData), + Section[i].Misc.VirtualSize > + Section[i].SizeOfRawData ? + Section[i].SizeOfRawData : + Section[i].Misc.VirtualSize); + } + else + { + /* Clear the BSS area */ + RtlZeroMemory((PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress), + Section[i].Misc.VirtualSize); + } + } + } + + /* Return the size of the mapped driver */ + return DriverSize; +} + +PVOID +NTAPI +FrLdrMapImage(IN FILE *Image, + IN PCHAR Name, + IN ULONG ImageType) +{ + PVOID ImageBase, LoadBase, ReadBuffer; + ULONG ImageId = LoaderBlock.ModsCount; + ULONG ImageSize; + NTSTATUS Status = STATUS_SUCCESS; + + /* Try to see, maybe it's loaded already */ + if (LdrGetModuleObject(Name) != NULL) + { + /* It's loaded, return NULL. It would be wise to return + correct LoadBase, but it seems to be ignored almost everywhere */ + return NULL; + } + + /* Set the virtual (image) and physical (load) addresses */ + LoadBase = (PVOID)NextModuleBase; + ImageBase = RVA(LoadBase, KSEG0_BASE); + + /* Save the Image Size */ + ImageSize = FsGetFileSize(Image); + + /* Set the file pointer to zero */ + FsSetFilePointer(Image, 0); + + /* Allocate a temporary buffer for the read */ + ReadBuffer = MmHeapAlloc(ImageSize); + + /* Load the file image */ + FsReadFile(Image, ImageSize, NULL, ReadBuffer); + + /* Map it into virtual memory */ + ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); + + /* Free the temporary buffer */ + MmHeapFree(ReadBuffer); + + /* Calculate Difference between Real Base and Compiled Base*/ + Status = LdrRelocateImageWithBias(LoadBase, + (ULONG_PTR)ImageBase - + (ULONG_PTR)LoadBase, + "FreeLdr", + STATUS_SUCCESS, + STATUS_UNSUCCESSFUL, + STATUS_UNSUCCESSFUL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("Failed to relocate image: %s\n", Name); + return NULL; + } + + /* Fill out Module Data Structure */ + reactos_modules[ImageId].ModStart = (ULONG_PTR)ImageBase; + reactos_modules[ImageId].ModEnd = (ULONG_PTR)ImageBase + ImageSize; + strcpy(reactos_module_strings[ImageId], Name); + reactos_modules[ImageId].String = (ULONG_PTR)reactos_module_strings[ImageId]; + LoaderBlock.ModsCount++; + + /* Increase the next Load Base */ + NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); + + /* Perform import fixups */ + if (!NT_SUCCESS(LdrPEFixupImports(LoadBase, Name))) + { + /* Fixup failed, just don't include it in the list */ + // NextModuleBase = OldNextModuleBase; + LoaderBlock.ModsCount = ImageId; + return NULL; + } + + /* Return the final mapped address */ + return LoadBase; +} + +/* EOF */ Propchange: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue Feb 5 14:13:17 2008 @@ -42,8 +42,8 @@ CHAR SystemRoot[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; -extern ULONG_PTR KernelBase; -extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; +ULONG_PTR KernelBase; +ROS_KERNEL_ENTRY_POINT KernelEntryPoint; BOOLEAN FrLdrLoadDriver(PCHAR szFileName, @@ -574,11 +574,8 @@ ULONG SectionId; PIMAGE_NT_HEADERS NtHeader; PVOID LoadBase; - ULONG_PTR Base; ULONG Size; - - extern BOOLEAN AcpiPresent; // // Open the operating system section @@ -702,7 +699,6 @@ LoaderBlock.ArchExtra = (ULONG)MachHwDetect(); UiDrawProgressBarCenter(5, 100, szLoadingMsg); - if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; LoaderBlock.DrivesCount = reactos_disk_count; UiDrawStatusText("Loading..."); @@ -864,11 +860,14 @@ FrLdrLoadBootDrivers(szBootPath, 40); //UiUnInitialize("Booting ReactOS..."); - /* - * Now boot the kernel - */ - DiskStopFloppyMotor(); - MachVideoPrepareForReactOS(FALSE); + // + // Perform architecture-specific pre-boot configuration + // + MachPrepareForReactOS(FALSE); + + // + // Setup paging and jump to kernel + // FrLdrStartup(0x2badb002); } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Feb 5 14:13:17 2008 @@ -427,10 +427,15 @@ UiUnInitialize("Booting ReactOS..."); - /* Now boot the kernel */ - DiskStopFloppyMotor(); - MachVideoPrepareForReactOS(TRUE); - FrLdrStartup(0x2badb002); + // + // Perform architecture-specific pre-boot configuration + // + MachPrepareForReactOS(FALSE); + + // + // Setup paging and jump to kernel + // + FrLdrStartup(0x2badb002); } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c Tue Feb 5 14:13:17 2008 @@ -935,7 +935,7 @@ } else { - beep(); + MachBeep(); } } else // Add this key to the buffer @@ -948,7 +948,7 @@ } else { - beep(); + MachBeep(); } } } Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Tue Feb 5 14:13:17 2008 @@ -1,589 +1,588 @@ -/* - * 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. - */ - -#include <freeldr.h> - -#include <ndk/ldrtypes.h> -#include <debug.h> - -//FIXME: Do a better way to retrieve Arc disk information -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern char reactos_arc_strings[32][256]; - -extern BOOLEAN UseRealHeap; -extern ULONG LoaderPagesSpanned; - -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); - -// debug stuff -VOID DumpMemoryAllocMap(VOID); -VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); -VOID WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock); -VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); - - -// Init "phase 0" -VOID -AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) -{ - PLOADER_PARAMETER_BLOCK LoaderBlock; - - /* Allocate and zero-init the LPB */ - LoaderBlock = MmHeapAlloc(sizeof(LOADER_PARAMETER_BLOCK)); - RtlZeroMemory(LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); - - /* Init three critical lists, used right away */ - InitializeListHead(&LoaderBlock->LoadOrderListHead); - InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); - InitializeListHead(&LoaderBlock->BootDriverListHead); - - /* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */ - LoaderBlock->NlsData = MmHeapAlloc(sizeof(NLS_DATA_BLOCK)); - if (LoaderBlock->NlsData == NULL) - { - UiMessageBox("Failed to allocate memory for NLS table data!"); - return; - } - RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK)); - - *OutLoaderBlock = LoaderBlock; -} - -// Init "phase 1" -VOID -WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - PCHAR Options, - PCHAR SystemPath, - WORD VersionToBoot) -{ - /* Examples of correct options and paths */ - //CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; - //CHAR Options[] = "/NODEBUG"; - //CHAR SystemRoot[] = "\\WINNT\\"; - //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; - - CHAR HalPath[] = "\\"; - CHAR SystemRoot[256]; - CHAR ArcBoot[256]; - ULONG i, PathSeparator; - PLOADER_PARAMETER_EXTENSION Extension; - - LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support - - /* Construct SystemRoot and ArcBoot from SystemPath */ - PathSeparator = strstr(SystemPath, "\\") - SystemPath; - strncpy(ArcBoot, SystemPath, PathSeparator); - ArcBoot[PathSeparator] = 0; - strcpy(SystemRoot, &SystemPath[PathSeparator]); - strcat(SystemRoot, "\\"); - - DbgPrint((DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot)); - DbgPrint((DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot)); - DbgPrint((DPRINT_WINDOWS, "Options: %s\n", Options)); - - /* Fill Arc BootDevice */ - LoaderBlock->ArcBootDeviceName = MmHeapAlloc(strlen(ArcBoot)+1); - strcpy(LoaderBlock->ArcBootDeviceName, ArcBoot); - LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); - - /* Fill Arc HalDevice, it matches ArcBoot path */ - LoaderBlock->ArcHalDeviceName = MmHeapAlloc(strlen(ArcBoot)+1); - strcpy(LoaderBlock->ArcHalDeviceName, ArcBoot); - LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); - - /* Fill SystemRoot */ - LoaderBlock->NtBootPathName = MmHeapAlloc(strlen(SystemRoot)+1); - strcpy(LoaderBlock->NtBootPathName, SystemRoot); - LoaderBlock->NtBootPathName = PaToVa(LoaderBlock->NtBootPathName); - - /* Fill NtHalPathName */ - LoaderBlock->NtHalPathName = MmHeapAlloc(strlen(HalPath)+1); - strcpy(LoaderBlock->NtHalPathName, HalPath); - LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); - - /* Fill load options */ - LoaderBlock->LoadOptions = MmHeapAlloc(strlen(Options)+1); - strcpy(LoaderBlock->LoadOptions, Options); - LoaderBlock->LoadOptions = PaToVa(LoaderBlock->LoadOptions); - - /* Arc devices */ - LoaderBlock->ArcDiskInformation = (PARC_DISK_INFORMATION)MmHeapAlloc(sizeof(ARC_DISK_INFORMATION)); - InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); - - /* Convert ARC disk information from freeldr to a correct format */ - for (i = 0; i < reactos_disk_count; i++) - { - PARC_DISK_SIGNATURE ArcDiskInfo; - - /* Get the ARC structure */ - ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE)); - RtlZeroMemory(ArcDiskInfo, sizeof(ARC_DISK_SIGNATURE)); - - /* Copy the data over */ - ArcDiskInfo->Signature = reactos_arc_disk_info[i].Signature; - ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum; - - /* Copy the ARC Name */ - ArcDiskInfo->ArcName = (PCHAR)MmHeapAlloc(sizeof(CHAR)*256); - strcpy(ArcDiskInfo->ArcName, reactos_arc_disk_info[i].ArcName); - ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName); - - /* Mark partition table as valid */ - ArcDiskInfo->ValidPartitionTable = TRUE; - - /* Insert into the list */ - InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, - &ArcDiskInfo->ListEntry); - } - - /* Convert all list's to Virtual address */ - - /* Convert the ArcDisks list to virtual address */ - List_PaToVa(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); - LoaderBlock->ArcDiskInformation = PaToVa(LoaderBlock->ArcDiskInformation); - - /* Convert configuration entries to VA */ - ConvertConfigToVA(LoaderBlock->ConfigurationRoot); - LoaderBlock->ConfigurationRoot = PaToVa(LoaderBlock->ConfigurationRoot); - - /* Convert all DTE into virtual addresses */ - List_PaToVa(&LoaderBlock->LoadOrderListHead); - - /* this one will be converted right before switching to - virtual paging mode */ - //List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); - - /* Convert list of boot drivers */ - List_PaToVa(&LoaderBlock->BootDriverListHead); - - /* Initialize Extension now */ - Extension = MmHeapAlloc(sizeof(LOADER_PARAMETER_EXTENSION)); - if (Extension == NULL) - { - UiMessageBox("Failed to allocate LPB Extension!"); - return; - } - RtlZeroMemory(Extension, sizeof(LOADER_PARAMETER_EXTENSION)); - - /* Fill LPB extension */ - Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); - Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; - Extension->MinorVersion = VersionToBoot & 0xFF; - Extension->Profile.Status = 2; - - LoaderBlock->Extension = PaToVa(Extension); -} - -// Last step before going virtual -void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, - PVOID *GdtIdt, - ULONG *PcrBasePage, - ULONG *TssBasePage) -{ - ULONG TssSize; - ULONG TssPages; - ULONG_PTR Pcr = 0; - ULONG_PTR Tss = 0; - ULONG BlockSize, NumPages; - - LoaderBlock->u.I386.CommonDataArea = NULL; //CommonDataArea; - LoaderBlock->u.I386.MachineType = 0; // ntldr sets this to 0 - - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - *PcrBasePage = Pcr >> MM_PAGE_SHIFT; - - if (Pcr == 0) - { - UiMessageBox("Can't allocate PCR\n"); - return; - } - - /* Allocate TSS */ - TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - TssPages = TssSize / MM_PAGE_SIZE; - - Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); - - *TssBasePage = Tss >> MM_PAGE_SHIFT; - - /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? - NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); - - if (*GdtIdt == NULL) - { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); - return; - } - - /* Zero newly prepared GDT+IDT */ - RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); -} - -BOOLEAN -WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPSTR BootPath, - PUNICODE_STRING FilePath, - ULONG Flags, - PLDR_DATA_TABLE_ENTRY *DriverDTE) -{ - CHAR FullPath[1024]; - CHAR DriverPath[1024]; - CHAR DllName[1024]; - PCHAR DriverNamePos; - BOOLEAN Status; - PVOID DriverBase; - - // Separate the path to file name and directory path - sprintf(DriverPath, "%S", FilePath->Buffer); - DriverNamePos = strrchr(DriverPath, '\\'); - if (DriverNamePos != NULL) - { - // Copy the name - strcpy(DllName, DriverNamePos+1); - - // Cut out the name from the path - *(DriverNamePos+1) = 0; - } - - DbgPrint((DPRINT_WINDOWS, "DriverPath: %s, DllName: %s, LPB %p\n", DriverPath, DllName, LoaderBlock)); - - - // Check if driver is already loaded - Status = WinLdrCheckForLoadedDll(LoaderBlock, DllName, DriverDTE); - if (Status) - { - // We've got the pointer to its DTE, just return success - return TRUE; - } - - // It's not loaded, we have to load it - sprintf(FullPath,"%s%S", BootPath, FilePath->Buffer); - Status = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); - if (!Status) - return FALSE; - - // Allocate a DTE for it - Status = WinLdrAllocateDataTableEntry(LoaderBlock, DllName, DllName, DriverBase, DriverDTE); - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrAllocateDataTableEntry() failed\n")); - return FALSE; - } - - // Modify any flags, if needed - (*DriverDTE)->Flags |= Flags; - - // Look for any dependencies it may have, and load them too - sprintf(FullPath,"%s%s", BootPath, DriverPath); - Status = WinLdrScanImportDescriptorTable(LoaderBlock, FullPath, *DriverDTE); - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable() failed for %s\n", - FullPath)); - return FALSE; - } - - return TRUE; -} - -BOOLEAN -WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPSTR BootPath) -{ - PLIST_ENTRY NextBd; - PBOOT_DRIVER_LIST_ENTRY BootDriver; - BOOLEAN Status; - - // Walk through the boot drivers list - NextBd = LoaderBlock->BootDriverListHead.Flink; - - while (NextBd != &LoaderBlock->BootDriverListHead) - { - BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry); - - DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath, - BootDriver->DataTableEntry, &BootDriver->RegistryPath)); - - // Paths are relative (FIXME: Are they always relative?) - - // Load it - Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath, - 0, &BootDriver->DataTableEntry); - - // If loading failed - cry loudly - //FIXME: Maybe remove it from the list and try to continue? - if (!Status) - { - UiMessageBox("Can't load boot driver!"); - return FALSE; - } - - // Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore - BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer); - BootDriver->DataTableEntry = PaToVa(BootDriver->DataTableEntry); - - NextBd = BootDriver->ListEntry.Flink; - } - - return TRUE; -} - -VOID -LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) -{ - CHAR MsgBuffer[256]; - CHAR SystemPath[512], SearchPath[512]; - CHAR FileName[512]; - CHAR BootPath[512]; - CHAR BootOptions[256]; - PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; - BOOLEAN Status; - ULONG SectionId; - ULONG BootDevice; - PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; - KERNEL_ENTRY_POINT KiSystemStartup; - PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; - // Mm-related things - PVOID GdtIdt; - ULONG PcrBasePage=0; - ULONG TssBasePage=0; - - //sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion); - //UiMessageBox(MsgBuffer); - - // Open the operating system section - // specified in the .ini file - if (!IniOpenSection(OperatingSystemName, &SectionId)) - { - sprintf(MsgBuffer,"Operating System section '%s' not found in freeldr.ini", OperatingSystemName); - UiMessageBox(MsgBuffer); - return; - } - - UiDrawBackdrop(); - UiDrawStatusText("Detecting Hardware..."); - UiDrawProgressBarCenter(1, 100, "Loading Windows..."); - - /* Make sure the system path is set in the .ini file */ - if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) - { - UiMessageBox("System path not specified for selected operating system."); - return; - } - - /* Read booting options */ - if (!IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) - { - /* Nothing read, make the string empty */ - strcpy(BootOptions, ""); - } - - /* Normalize system path */ - if (!MachDiskNormalizeSystemPath(SystemPath, sizeof(SystemPath))) - { - UiMessageBox("Invalid system path"); - return; - } - - /* Let user know we started loading */ - UiDrawStatusText("Loading..."); - - /* Try to open system drive */ - BootDevice = 0xffffffff; - if (!FsOpenSystemVolume(SystemPath, BootPath, &BootDevice)) - { - UiMessageBox("Failed to open boot drive."); - return; - } - - /* append a backslash */ - if ((strlen(BootPath)==0) || - BootPath[strlen(BootPath)] != '\\') - strcat(BootPath, "\\"); - - DbgPrint((DPRINT_WINDOWS,"SystemRoot: '%s'\n", BootPath)); - - /* Allocate and minimalistic-initialize LPB */ - AllocateAndInitLPB(&LoaderBlock); - - /* Detect hardware */ - UseRealHeap = TRUE; - LoaderBlock->ConfigurationRoot = MachHwDetect(); - - /* Load kernel */ - strcpy(FileName, BootPath); - strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); - Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase); - DbgPrint((DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase)); - - /* Load HAL */ - strcpy(FileName, BootPath); - strcat(FileName, "SYSTEM32\\HAL.DLL"); - Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase); - DbgPrint((DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase)); - - /* Load kernel-debugger support dll */ - if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) - { - strcpy(FileName, BootPath); - strcat(FileName, "SYSTEM32\\KDCOM.DLL"); - Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase); - DbgPrint((DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase)); - } - - /* Allocate data table entries for above-loaded modules */ - WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", - "WINDOWS\\SYSTEM32\\NTOSKRNL.EXE", NtosBase, &KernelDTE); - WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", - "WINDOWS\\SYSTEM32\\HAL.DLL", HalBase, &HalDTE); - if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) - { - WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", - "WINDOWS\\SYSTEM32\\KDCOM.DLL", KdComBase, &KdComDTE); - } - - /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ - strcpy(SearchPath, BootPath); - strcat(SearchPath, "SYSTEM32\\"); - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); - if (KdComDTE) - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); - - /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ - Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); - DbgPrint((DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status)); - - /* Load boot drivers */ - Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); - DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status)); - - /* Alloc PCR, TSS, do magic things with the GDT/IDT */ - WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); - - /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, OperatingSystemVersion); - - /* Save entry-point pointer and Loader block VAs */ - KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; - LoaderBlockVA = PaToVa(LoaderBlock); - - /* "Stop all motors", change videomode */ - DiskStopFloppyMotor(); - if (OperatingSystemVersion < _WIN32_WINNT_WIN2K) - MachVideoPrepareForReactOS(TRUE); - else - MachVideoPrepareForReactOS(FALSE); - - /* Debugging... */ - //DumpMemoryAllocMap(); - - /* Turn on paging mode of CPU*/ - WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); - - /* Save final value of LoaderPagesSpanned */ - LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; - - DbgPrint((DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", - KiSystemStartup, LoaderBlockVA)); - - WinLdrpDumpMemoryDescriptors(LoaderBlockVA); - WinLdrpDumpBootDriver(LoaderBlockVA); - WinLdrpDumpArcDisks(LoaderBlockVA); - - //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below - //while (1) {}; - /*asm(".intel_syntax noprefix\n"); - asm("test1:\n"); - asm("jmp test1\n"); - asm(".att_syntax\n");*/ - - /* Pass control */ - (*KiSystemStartup)(LoaderBlockVA); - - return; -} - -VOID -WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PLIST_ENTRY NextMd; - PMEMORY_ALLOCATION_DESCRIPTOR MemoryDescriptor; - - NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; - - while (NextMd != &LoaderBlock->MemoryDescriptorListHead) - { - MemoryDescriptor = CONTAINING_RECORD(NextMd, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - - DbgPrint((DPRINT_WINDOWS, "BP %08X PC %04X MT %d\n", MemoryDescriptor->BasePage, - MemoryDescriptor->PageCount, MemoryDescriptor->MemoryType)); - - NextMd = MemoryDescriptor->ListEntry.Flink; - } -} - -VOID -WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PLIST_ENTRY NextBd; - PBOOT_DRIVER_LIST_ENTRY BootDriver; - - NextBd = LoaderBlock->BootDriverListHead.Flink; - - while (NextBd != &LoaderBlock->BootDriverListHead) - { - BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry); - - DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath, - BootDriver->DataTableEntry, &BootDriver->RegistryPath)); - - NextBd = BootDriver->ListEntry.Flink; - } -} - -VOID -WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PLIST_ENTRY NextBd; - PARC_DISK_SIGNATURE ArcDisk; - - NextBd = LoaderBlock->ArcDiskInformation->DiskSignatureListHead.Flink; - - while (NextBd != &LoaderBlock->ArcDiskInformation->DiskSignatureListHead) - { - ArcDisk = CONTAINING_RECORD(NextBd, ARC_DISK_SIGNATURE, ListEntry); - - DbgPrint((DPRINT_WINDOWS, "ArcDisk %s checksum: 0x%X, signature: 0x%X\n", - ArcDisk->ArcName, ArcDisk->CheckSum, ArcDisk->Signature)); - - NextBd = ArcDisk->ListEntry.Flink; - } -} - - +/* + * 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. + */ + +#include <freeldr.h> + +#include <ndk/ldrtypes.h> +#include <debug.h> + +//FIXME: Do a better way to retrieve Arc disk information +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern char reactos_arc_strings[32][256]; + +extern BOOLEAN UseRealHeap; +extern ULONG LoaderPagesSpanned; + +BOOLEAN +WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); + +// debug stuff +VOID DumpMemoryAllocMap(VOID); +VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); + + +// Init "phase 0" +VOID +AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) +{ + PLOADER_PARAMETER_BLOCK LoaderBlock; + + /* Allocate and zero-init the LPB */ + LoaderBlock = MmHeapAlloc(sizeof(LOADER_PARAMETER_BLOCK)); + RtlZeroMemory(LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); + + /* Init three critical lists, used right away */ + InitializeListHead(&LoaderBlock->LoadOrderListHead); + InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); + InitializeListHead(&LoaderBlock->BootDriverListHead); + + /* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */ + LoaderBlock->NlsData = MmHeapAlloc(sizeof(NLS_DATA_BLOCK)); + if (LoaderBlock->NlsData == NULL) + { + UiMessageBox("Failed to allocate memory for NLS table data!"); + return; + } + RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK)); + + *OutLoaderBlock = LoaderBlock; +} + +// Init "phase 1" +VOID +WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, + PCHAR Options, + PCHAR SystemPath, + WORD VersionToBoot) +{ + /* Examples of correct options and paths */ + //CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; + //CHAR Options[] = "/NODEBUG"; + //CHAR SystemRoot[] = "\\WINNT\\"; + //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; + + CHAR HalPath[] = "\\"; + CHAR SystemRoot[256]; + CHAR ArcBoot[256]; + ULONG i, PathSeparator; + PLOADER_PARAMETER_EXTENSION Extension; + + LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support + + /* Construct SystemRoot and ArcBoot from SystemPath */ + PathSeparator = strstr(SystemPath, "\\") - SystemPath; + strncpy(ArcBoot, SystemPath, PathSeparator); + ArcBoot[PathSeparator] = 0; + strcpy(SystemRoot, &SystemPath[PathSeparator]); + strcat(SystemRoot, "\\"); + + DbgPrint((DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot)); + DbgPrint((DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot)); + DbgPrint((DPRINT_WINDOWS, "Options: %s\n", Options)); + + /* Fill Arc BootDevice */ + LoaderBlock->ArcBootDeviceName = MmHeapAlloc(strlen(ArcBoot)+1); + strcpy(LoaderBlock->ArcBootDeviceName, ArcBoot); + LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); + + /* Fill Arc HalDevice, it matches ArcBoot path */ + LoaderBlock->ArcHalDeviceName = MmHeapAlloc(strlen(ArcBoot)+1); + strcpy(LoaderBlock->ArcHalDeviceName, ArcBoot); + LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); + + /* Fill SystemRoot */ + LoaderBlock->NtBootPathName = MmHeapAlloc(strlen(SystemRoot)+1); + strcpy(LoaderBlock->NtBootPathName, SystemRoot); + LoaderBlock->NtBootPathName = PaToVa(LoaderBlock->NtBootPathName); + + /* Fill NtHalPathName */ + LoaderBlock->NtHalPathName = MmHeapAlloc(strlen(HalPath)+1); + strcpy(LoaderBlock->NtHalPathName, HalPath); + LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); + + /* Fill load options */ + LoaderBlock->LoadOptions = MmHeapAlloc(strlen(Options)+1); + strcpy(LoaderBlock->LoadOptions, Options); + LoaderBlock->LoadOptions = PaToVa(LoaderBlock->LoadOptions); + + /* Arc devices */ + LoaderBlock->ArcDiskInformation = (PARC_DISK_INFORMATION)MmHeapAlloc(sizeof(ARC_DISK_INFORMATION)); + InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); + + /* Convert ARC disk information from freeldr to a correct format */ + for (i = 0; i < reactos_disk_count; i++) + { + PARC_DISK_SIGNATURE ArcDiskInfo; + + /* Get the ARC structure */ + ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE)); + RtlZeroMemory(ArcDiskInfo, sizeof(ARC_DISK_SIGNATURE)); + + /* Copy the data over */ + ArcDiskInfo->Signature = reactos_arc_disk_info[i].Signature; + ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum; + + /* Copy the ARC Name */ + ArcDiskInfo->ArcName = (PCHAR)MmHeapAlloc(sizeof(CHAR)*256); + strcpy(ArcDiskInfo->ArcName, reactos_arc_disk_info[i].ArcName); + ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName); + + /* Mark partition table as valid */ + ArcDiskInfo->ValidPartitionTable = TRUE; + + /* Insert into the list */ + InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, + &ArcDiskInfo->ListEntry); + } + + /* Convert all list's to Virtual address */ + + /* Convert the ArcDisks list to virtual address */ + List_PaToVa(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); + LoaderBlock->ArcDiskInformation = PaToVa(LoaderBlock->ArcDiskInformation); + + /* Convert configuration entries to VA */ + ConvertConfigToVA(LoaderBlock->ConfigurationRoot); + LoaderBlock->ConfigurationRoot = PaToVa(LoaderBlock->ConfigurationRoot); + + /* Convert all DTE into virtual addresses */ + List_PaToVa(&LoaderBlock->LoadOrderListHead); + + /* this one will be converted right before switching to + virtual paging mode */ + //List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); + + /* Convert list of boot drivers */ + List_PaToVa(&LoaderBlock->BootDriverListHead); + + /* Initialize Extension now */ + Extension = MmHeapAlloc(sizeof(LOADER_PARAMETER_EXTENSION)); + if (Extension == NULL) + { + UiMessageBox("Failed to allocate LPB Extension!"); + return; + } + RtlZeroMemory(Extension, sizeof(LOADER_PARAMETER_EXTENSION)); + + /* Fill LPB extension */ + Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); + Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; + Extension->MinorVersion = VersionToBoot & 0xFF; + Extension->Profile.Status = 2; + + LoaderBlock->Extension = PaToVa(Extension); +} + +// Last step before going virtual +void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, + PVOID *GdtIdt, + ULONG *PcrBasePage, + ULONG *TssBasePage) +{ + ULONG TssSize; + ULONG TssPages; + ULONG_PTR Pcr = 0; + ULONG_PTR Tss = 0; + ULONG BlockSize, NumPages; + + LoaderBlock->u.I386.CommonDataArea = NULL; //CommonDataArea; + LoaderBlock->u.I386.MachineType = 0; // ntldr sets this to 0 + + /* Allocate 2 pages for PCR */ + Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); + *PcrBasePage = Pcr >> MM_PAGE_SHIFT; + + if (Pcr == 0) + { + UiMessageBox("Can't allocate PCR\n"); + return; + } + + /* Allocate TSS */ + TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); + TssPages = TssSize / MM_PAGE_SIZE; + + Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); + + *TssBasePage = Tss >> MM_PAGE_SHIFT; + + /* Allocate space for new GDT + IDT */ + BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? + NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; + *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); + + if (*GdtIdt == NULL) + { + UiMessageBox("Can't allocate pages for GDT+IDT!\n"); + return; + } + + /* Zero newly prepared GDT+IDT */ + RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); +} + +BOOLEAN +WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock, + LPSTR BootPath, + PUNICODE_STRING FilePath, + ULONG Flags, + PLDR_DATA_TABLE_ENTRY *DriverDTE) +{ + CHAR FullPath[1024]; + CHAR DriverPath[1024]; + CHAR DllName[1024]; + PCHAR DriverNamePos; + BOOLEAN Status; + PVOID DriverBase; + + // Separate the path to file name and directory path + sprintf(DriverPath, "%S", FilePath->Buffer); + DriverNamePos = strrchr(DriverPath, '\\'); + if (DriverNamePos != NULL) + { + // Copy the name + strcpy(DllName, DriverNamePos+1); + + // Cut out the name from the path + *(DriverNamePos+1) = 0; + } + + DbgPrint((DPRINT_WINDOWS, "DriverPath: %s, DllName: %s, LPB %p\n", DriverPath, DllName, LoaderBlock)); + + + // Check if driver is already loaded + Status = WinLdrCheckForLoadedDll(LoaderBlock, DllName, DriverDTE); + if (Status) + { + // We've got the pointer to its DTE, just return success + return TRUE; + } + + // It's not loaded, we have to load it + sprintf(FullPath,"%s%S", BootPath, FilePath->Buffer); + Status = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); + if (!Status) + return FALSE; + + // Allocate a DTE for it + Status = WinLdrAllocateDataTableEntry(LoaderBlock, DllName, DllName, DriverBase, DriverDTE); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrAllocateDataTableEntry() failed\n")); + return FALSE; + } + + // Modify any flags, if needed + (*DriverDTE)->Flags |= Flags; + + // Look for any dependencies it may have, and load them too + sprintf(FullPath,"%s%s", BootPath, DriverPath); + Status = WinLdrScanImportDescriptorTable(LoaderBlock, FullPath, *DriverDTE); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable() failed for %s\n", + FullPath)); + return FALSE; + } + + return TRUE; +} + +BOOLEAN +WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, + LPSTR BootPath) +{ + PLIST_ENTRY NextBd; + PBOOT_DRIVER_LIST_ENTRY BootDriver; + BOOLEAN Status; + + // Walk through the boot drivers list + NextBd = LoaderBlock->BootDriverListHead.Flink; + + while (NextBd != &LoaderBlock->BootDriverListHead) + { + BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry); + + DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath, + BootDriver->DataTableEntry, &BootDriver->RegistryPath)); + + // Paths are relative (FIXME: Are they always relative?) + + // Load it + Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath, + 0, &BootDriver->DataTableEntry); + + // If loading failed - cry loudly + //FIXME: Maybe remove it from the list and try to continue? + if (!Status) + { + UiMessageBox("Can't load boot driver!"); + return FALSE; + } + + // Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore + BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer); + BootDriver->DataTableEntry = PaToVa(BootDriver->DataTableEntry); + + NextBd = BootDriver->ListEntry.Flink; + } + + return TRUE; +} + +VOID +LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) +{ + CHAR MsgBuffer[256]; + CHAR SystemPath[512], SearchPath[512]; + CHAR FileName[512]; + CHAR BootPath[512]; + CHAR BootOptions[256]; + PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; + BOOLEAN Status; + ULONG SectionId; + ULONG BootDevice; + PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; + KERNEL_ENTRY_POINT KiSystemStartup; + PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; + // Mm-related things + PVOID GdtIdt; + ULONG PcrBasePage=0; + ULONG TssBasePage=0; + + //sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion); + //UiMessageBox(MsgBuffer); + + // Open the operating system section + // specified in the .ini file + if (!IniOpenSection(OperatingSystemName, &SectionId)) + { + sprintf(MsgBuffer,"Operating System section '%s' not found in freeldr.ini", OperatingSystemName); + UiMessageBox(MsgBuffer); + return; + } + + UiDrawBackdrop(); + UiDrawStatusText("Detecting Hardware..."); + UiDrawProgressBarCenter(1, 100, "Loading Windows..."); + + /* Make sure the system path is set in the .ini file */ + if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) + { + UiMessageBox("System path not specified for selected operating system."); + return; + } + + /* Read booting options */ + if (!IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) + { + /* Nothing read, make the string empty */ + strcpy(BootOptions, ""); + } + + /* Normalize system path */ + if (!MachDiskNormalizeSystemPath(SystemPath, sizeof(SystemPath))) + { + UiMessageBox("Invalid system path"); + return; + } + + /* Let user know we started loading */ + UiDrawStatusText("Loading..."); + + /* Try to open system drive */ + BootDevice = 0xffffffff; + if (!FsOpenSystemVolume(SystemPath, BootPath, &BootDevice)) + { + UiMessageBox("Failed to open boot drive."); + return; + } + + /* append a backslash */ + if ((strlen(BootPath)==0) || + BootPath[strlen(BootPath)] != '\\') + strcat(BootPath, "\\"); + + DbgPrint((DPRINT_WINDOWS,"SystemRoot: '%s'\n", BootPath)); + + /* Allocate and minimalistic-initialize LPB */ + AllocateAndInitLPB(&LoaderBlock); + + /* Detect hardware */ + UseRealHeap = TRUE; + LoaderBlock->ConfigurationRoot = MachHwDetect(); + + /* Load kernel */ + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); + Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase); + DbgPrint((DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase)); + + /* Load HAL */ + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\HAL.DLL"); + Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase); + DbgPrint((DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase)); + + /* Load kernel-debugger support dll */ + if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) + { + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\KDCOM.DLL"); + Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase); + DbgPrint((DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase)); + } + + /* Allocate data table entries for above-loaded modules */ + WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", + "WINDOWS\\SYSTEM32\\NTOSKRNL.EXE", NtosBase, &KernelDTE); + WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", + "WINDOWS\\SYSTEM32\\HAL.DLL", HalBase, &HalDTE); + if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) + { + WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", + "WINDOWS\\SYSTEM32\\KDCOM.DLL", KdComBase, &KdComDTE); + } + + /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ + strcpy(SearchPath, BootPath); + strcat(SearchPath, "SYSTEM32\\"); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + if (KdComDTE) + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); + + /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ + Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); + DbgPrint((DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status)); + + /* Load boot drivers */ + Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); + DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status)); + + /* Alloc PCR, TSS, do magic things with the GDT/IDT */ + WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); + + /* Initialize Phase 1 - no drivers loading anymore */ + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, OperatingSystemVersion); + + /* Save entry-point pointer and Loader block VAs */ + KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; + LoaderBlockVA = PaToVa(LoaderBlock); + + /* "Stop all motors", change videomode */ + if (OperatingSystemVersion < _WIN32_WINNT_WIN2K) + MachPrepareForReactOS(TRUE); + else + MachPrepareForReactOS(FALSE); + + /* Debugging... */ + //DumpMemoryAllocMap(); + + /* Turn on paging mode of CPU*/ + WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); + + /* Save final value of LoaderPagesSpanned */ + LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; + + DbgPrint((DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", + KiSystemStartup, LoaderBlockVA)); + + WinLdrpDumpMemoryDescriptors(LoaderBlockVA); + WinLdrpDumpBootDriver(LoaderBlockVA); + WinLdrpDumpArcDisks(LoaderBlockVA); + + //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below + //while (1) {}; + /*asm(".intel_syntax noprefix\n"); + asm("test1:\n"); + asm("jmp test1\n"); + asm(".att_syntax\n");*/ + + /* Pass control */ + (*KiSystemStartup)(LoaderBlockVA); + + return; +} + +VOID +WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextMd; + PMEMORY_ALLOCATION_DESCRIPTOR MemoryDescriptor; + + NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; + + while (NextMd != &LoaderBlock->MemoryDescriptorListHead) + { + MemoryDescriptor = CONTAINING_RECORD(NextMd, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + + DbgPrint((DPRINT_WINDOWS, "BP %08X PC %04X MT %d\n", MemoryDescriptor->BasePage, + MemoryDescriptor->PageCount, MemoryDescriptor->MemoryType)); + + NextMd = MemoryDescriptor->ListEntry.Flink; + } +} + +VOID +WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextBd; + PBOOT_DRIVER_LIST_ENTRY BootDriver; + + NextBd = LoaderBlock->BootDriverListHead.Flink; + + while (NextBd != &LoaderBlock->BootDriverListHead) + { + BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry); + + DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath, + BootDriver->DataTableEntry, &BootDriver->RegistryPath)); + + NextBd = BootDriver->ListEntry.Flink; + } +} + +VOID +WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextBd; + PARC_DISK_SIGNATURE ArcDisk; + + NextBd = LoaderBlock->ArcDiskInformation->DiskSignatureListHead.Flink; + + while (NextBd != &LoaderBlock->ArcDiskInformation->DiskSignatureListHead) + { + ArcDisk = CONTAINING_RECORD(NextBd, ARC_DISK_SIGNATURE, ListEntry); + + DbgPrint((DPRINT_WINDOWS, "ArcDisk %s checksum: 0x%X, signature: 0x%X\n", + ArcDisk->ArcName, ArcDisk->CheckSum, ArcDisk->Signature)); + + NextBd = ArcDisk->ListEntry.Flink; + } +} + +

1 0

[ros-arm-bringup] 32134: Implement ARM version of DbgBreakPoint in the RTL. We do a bkpt with a special value of 3 (to be as close as possible to x86 int 3). Fix NtCurrentTeb definition for ARM. We will expose the KPCR to user-mode much like KUSER_SHARED_DATA on x86 (this is how ARM-CE and NT-MIPS do it) and link the TEB there.
by ros-arm-bringup＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: ros-arm-bringup Date: Tue Feb 5 14:08:34 2008 New Revision: 32134 URL: http://svn.reactos.org/svn/reactos?rev=32134&view=rev Log: Implement ARM version of DbgBreakPoint in the RTL. We do a bkpt with a special value of 3 (to be as close as possible to x86 int 3). Fix NtCurrentTeb definition for ARM. We will expose the KPCR to user-mode much like KUSER_SHARED_DATA on x86 (this is how ARM-CE and NT-MIPS do it) and link the TEB there. Added: trunk/reactos/lib/rtl/arm/ trunk/reactos/lib/rtl/arm/debug_asm.S (with props) Modified: trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Tue Feb 5 14:08:34 2008 @@ -66,7 +66,9 @@ // FIXME: mmtypes.h? // #define KIPCR 0xFFFFF000 -#define PCR ((volatile KPCR * const)KIPCR) +#define USPCR 0x7FFF0000 +#define PCR ((volatile KPCR * const)USPCR) +#define USERPCR ((volatile KPCR * const)KIPCR) // // Synchronization-level IRQL @@ -104,34 +106,13 @@ ULONG FpExtra[8]; } KTRAP_FRAME, *PKTRAP_FRAME; -#ifndef NTOS_MODE_USER -// -// Stub -// -typedef struct _KFLOATING_SAVE -{ - ULONG Reserved; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -// -// Processor Region Control Block -// -typedef struct _KPRCB -{ - USHORT MinorVersion; - USHORT MajorVersion; - struct _KTHREAD *CurrentThread; - struct _KTHREAD *NextThread; - struct _KTHREAD *IdleThread; - UCHAR Number; - // - // TODO - // -} KPRCB, *PKPRCB; - // // Processor Control Region -// +// On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA +// +#ifdef NTOS_MODE_USER +#define PKINTERRUPT_ROUTINE PVOID // Hack! +#endif typedef struct _KPCR { ULONG MinorVersion; @@ -186,6 +167,31 @@ ULONG QuantumEnd; } KPCR, *PKPCR; +#ifndef NTOS_MODE_USER +// +// Stub +// +typedef struct _KFLOATING_SAVE +{ + ULONG Reserved; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +// +// Processor Region Control Block +// +typedef struct _KPRCB +{ + USHORT MinorVersion; + USHORT MajorVersion; + struct _KTHREAD *CurrentThread; + struct _KTHREAD *NextThread; + struct _KTHREAD *IdleThread; + UCHAR Number; + // + // TODO + // +} KPRCB, *PKPRCB; + // // Macro to get current KPRCB // Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Feb 5 14:08:34 2008 @@ -4104,7 +4104,23 @@ return ret; } #elif _M_ARM - struct _TEB* WINAPI NtCurrentTeb(VOID); + +// +// NT-ARM is not documented, need NDK +// +#define NTOS_MODE_USER +#include <arm/ketypes.h> + +// +// FIXME: Move _M_ARM stuff away from here +// *** AND NOT IN THE NDK! NDK IS ONLY FOR OFFICIALLY OBTAINABLE/EXISTING NT +// +FORCEINLINE +struct _TEB* NtCurrentTeb(VOID) +{ + return (struct _TEB*)USERPCR->Teb; +} + #else static __inline__ struct _TEB * NtCurrentTeb(void) { Added: trunk/reactos/lib/rtl/arm/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/debug_asm.S?re… ============================================================================== --- trunk/reactos/lib/rtl/arm/debug_asm.S (added) +++ trunk/reactos/lib/rtl/arm/debug_asm.S Tue Feb 5 14:08:34 2008 @@ -1,0 +1,18 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: Debug Routines + * FILE: lib/rtl/arm/debug_asm.S + */ + +/* GLOBALS ********************************************************************/ + +.globl DbgBreakPoint + +/* FUNCTIONS ******************************************************************/ + +.func DbgBreakPoint +DbgBreakPoint: + bkpt 3 + bx lr +.endfunc Propchange: trunk/reactos/lib/rtl/arm/debug_asm.S ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/rtl/arm/debug_asm.S ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=321… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Feb 5 14:08:34 2008 @@ -28,6 +28,11 @@ <file>rtlswap.s</file> <file>thread.c</file> </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>debug_asm.S</file> + </directory> </if> <directory name="austin"> <file>avl.c</file>

1 0

[gbrunmar] 32133: Fixed an infinite loop in IDirect3D::GetAdapterIdentifier()
by gbrunmar＠svn.reactos.org 05 Feb '08

05 Feb '08

Author: gbrunmar Date: Tue Feb 5 09:37:48 2008 New Revision: 32133 URL: http://svn.reactos.org/svn/reactos?rev=32133&view=rev Log: Fixed an infinite loop in IDirect3D::GetAdapterIdentifier() Modified: trunk/reactos/dll/directx/d3d9/adapter.c Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Tue Feb 5 09:37:48 2008 @@ -136,6 +136,8 @@ FoundDisplayDevice = TRUE; break; } + + ++AdapterIndex; } /* No matching display device found? */

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
46
Older →

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 February 2008