Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [FREELDR] i386vid.c: Downgrade/Improve 3 false ERR() to WARN(). CORE-13496
by Serge Gautherie 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5a7765068852311932f9… commit b5a7765068852311932f9d1a5e688efb8c4c8060 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jan 13 15:41:49 2018 +0100 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Fri Jan 26 23:11:52 2018 +0200 [FREELDR] i386vid.c: Downgrade/Improve 3 false ERR() to WARN(). CORE-13496 Silence harmless errors, which can be reported at every boot. --- boot/freeldr/freeldr/arch/i386/i386vid.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/i386vid.c b/boot/freeldr/freeldr/arch/i386/i386vid.c index a0f86c955b..0d5db0abf7 100644 --- a/boot/freeldr/freeldr/arch/i386/i386vid.c +++ b/boot/freeldr/freeldr/arch/i386/i386vid.c @@ -205,7 +205,8 @@ USHORT BiosIsVesaSupported(VOID) if (Regs.w.ax != 0x004F) { - ERR("VESA BIOS call failed\n"); + WARN("VBE Get SuperVGA information function not supported (AL=0x%x) or failed (AH=0x%x)\n", + Regs.b.al, Regs.b.ah); return 0x0000; } @@ -260,7 +261,8 @@ BiosIsVesaDdcSupported(VOID) if (Regs.w.ax != 0x004F) { - ERR("VESA/DDC installation check failed\n"); + WARN("VBE/DDC Installation check function not supported (AL=0x%x) or failed (AH=0x%x)\n", + Regs.b.al, Regs.b.ah); return FALSE; } @@ -290,7 +292,8 @@ BiosVesaReadEdid(VOID) if (Regs.w.ax != 0x004F) { - ERR("Read EDID function not supported!\n"); + WARN("VBE/DDC Read EDID function not supported (AL=0x%x) or failed (AH=0x%x)\n", + Regs.b.al, Regs.b.ah); return FALSE; }

1 0

01/01: [TRANSLATION] Estonian translation for Notepad & Paint
by Joann Mõndresku 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=757511c4e8de1f403fb11… commit 757511c4e8de1f403fb11e9b71ddf79c815f3386 Author: Joann Mõndresku <joann.mondresku(a)gmail.com> AuthorDate: Fri Jan 26 20:14:17 2018 +0200 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Fri Jan 26 22:43:25 2018 +0200 [TRANSLATION] Estonian translation for Notepad & Paint Added Estonian translation for the common base applications Notepad and MS Paint. These are the initial translations, and are subject to change, as they may not be the most perfect. --- base/applications/mspaint/lang/et-EE.rc | 228 ++++++++++++++++++++++++++++++++ base/applications/mspaint/rsrc.rc | 3 + base/applications/notepad/lang/et-EE.rc | 194 +++++++++++++++++++++++++++ base/applications/notepad/rsrc.rc | 3 + 4 files changed, 428 insertions(+) diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc new file mode 100644 index 0000000000..aa0205c7d4 --- /dev/null +++ b/base/applications/mspaint/lang/et-EE.rc @@ -0,0 +1,228 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/mspaint/lang/et-EE.rc + * PURPOSE: Estonian Language resource file + * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) + */ + +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +ID_MENU MENU +BEGIN + POPUP "&Fail" + BEGIN + MENUITEM "&Uus\tCtrl+N", IDM_FILENEW + MENUITEM "&Ava...\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Salvesta\tCtrl+S", IDM_FILESAVE + MENUITEM "Salvesta &Nimega...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Skännerist või Kaamerast...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM SEPARATOR + MENUITEM "Lehe Vaade", IDM_FILEPAGEVIEW + MENUITEM "Lehe Ülesehitus...", IDM_FILEPAGESETUP + MENUITEM "&Prindi...\tCtrl+P", IDM_FILEPRINT + MENUITEM SEPARATOR + MENUITEM "Saada...", IDM_FILESEND + MENUITEM SEPARATOR + MENUITEM "Määra taustapildiks (Paanitud)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Määra taustapildiks (Keskele)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Määra taustapildiks (Venitatud)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "Kõige hiljutisemalt kasutatud fail", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Välju\tAlt+F4", IDM_FILEEXIT + END + POPUP "&Redigeeri" + BEGIN + MENUITEM "&Võta Tagasi\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Tee Tagasi\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&leebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Pööra valik", IDM_EDITINVERTSELECTION + MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "Kopee&ri kuhu...", IDM_EDITCOPYTO + MENUITEM "Klee&bi kust...", IDM_EDITPASTEFROM + END + POPUP "&Vaade" + BEGIN + MENUITEM "&Tööriista kast\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "&Värvipalett\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "&Olekuriba", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "Teksti t&ööriistariba", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "&Suum" + BEGIN + POPUP "&Kasutaja määratud" + BEGIN + MENUITEM "12.5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Näita v&õrgustiku\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "Näita miniatuurset", IDM_VIEWSHOWMINIATURE + END + MENUITEM "T&äisekraan\tCtrl+F", IDM_VIEWFULLSCREEN + END + POPUP "&Pilt" + BEGIN + MENUITEM "Pööra/&Peegelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Kärbi", IDM_IMAGECROP + MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atribuudid...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Kustuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Joonista läbipaistmatult", IDM_IMAGEDRAWOPAQUE + END + POPUP "&Värvid" + BEGIN + MENUITEM "&Muuda paletti...", IDM_COLORSEDITPALETTE + MENUITEM SEPARATOR + MENUITEM "Modernne palett", IDM_COLORSMODERNPALETTE + MENUITEM "Vana palett", IDM_COLORSOLDPALETTE + END + POPUP "&Abi" + BEGIN + MENUITEM "&Abi Teemad", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^G", IDM_VIEWSHOWGRID + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGESTRETCHSKEW + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Pööra ja peegelda pilti" +BEGIN + GROUPBOX "Pööra või peegelad", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Peegelda &horisontaalselt", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Peegelda &vertikaalselt", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "&Pööra kraadiga", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "&90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "&180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "&270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 + PUSHBUTTON "Tühista", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 225, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Atribuudid" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 + LTEXT "&Laius:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Pikkus:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "Faili &kuupäev:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Faili &suurus:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "&Resolutsioon:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Pole saadaval", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 + LTEXT "Pole saadaval", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 + LTEXT "Pole saadaval", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 + GROUPBOX "Ühikud", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 + AUTORADIOBUTTON "&Tollid", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "Piksl&id", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + GROUPBOX "Värvid", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 + AUTORADIOBUTTON "&Mustvalge", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Värvid", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 + PUSHBUTTON "Tühista", IDCANCEL, 170, 24, 48, 14 + PUSHBUTTON "Vaikimisi", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 +END + +IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Venita ja kalluta pilti" +BEGIN + GROUPBOX "Venita", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 + ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 + LTEXT "Horisontaalselt:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 + LTEXT "%", IDD_STRETCHSKEWTEXTHPERCENT, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_STRETCHSKEWICONVSTRETCH, 12, 43, 32, 32 + LTEXT "Vertikaalselt:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 + LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 + GROUPBOX "Kalluta", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 + LTEXT "Horisontaalselt:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 + LTEXT "kraadi", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 + LTEXT "Vertikaalselt:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 + EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 + LTEXT "kraadi", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 + PUSHBUTTON "Tühista", IDCANCEL, 170, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME "Paint" + IDS_WINDOWTITLE "%s - Paint" + IDS_INFOTITLE "Paint ReactOS'ile" + IDS_INFOTEXT "Paint ReactOS'ile on saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" + IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?" + IDS_DEFAULTFILENAME "Nimetu.bmp" + IDS_MINIATURETITLE "Miniatuur" + IDS_TOOLTIP1 "Vaba valik" + IDS_TOOLTIP2 "Valik" + IDS_TOOLTIP3 "Kustukumm" + IDS_TOOLTIP4 "Täida värviga" + IDS_TOOLTIP5 "Vali värv" + IDS_TOOLTIP6 "Suum" + IDS_TOOLTIP7 "Pliiats" + IDS_TOOLTIP8 "Pintsel" + IDS_TOOLTIP9 "Õhupintsel" + IDS_TOOLTIP10 "Tekst" + IDS_TOOLTIP11 "Joon" + IDS_TOOLTIP12 "Kumerjoon" + IDS_TOOLTIP13 "Ristkülik" + IDS_TOOLTIP14 "Hulknurk" + IDS_TOOLTIP15 "Ellips" + IDS_TOOLTIP16 "Ümardatud ristkülik" + IDS_ALLFILES "Kõik failid" + IDS_ALLPICTUREFILES "Kõik Pildifailid" + IDS_FILESIZE "%d baiti" + IDS_PRINTRES "%d x %d pikslit meetri kohta" + IDS_INTNUMBERS "Palun sisesta ainult terviklike numbreid!" + IDS_PERCENTAGE "Protsent peab 1 ja 500 vahemikus olema." + IDS_ANGLE "Nurk peab -89 ja 89 vahemikus olema." + IDS_LOADERRORTEXT "Faili %s ei suudetud laadida." + IDS_ENLARGEPROMPTTEXT "Pilt lõikelaual on suurem kui digitaalkujutis.\nKas soovid digitaalkujutist suurendada?" +END diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 77e681972b..d237d385a9 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -62,6 +62,9 @@ IDI_VERTSKEW ICON "icons/vertskew.ico" #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_ET_EE + #include "lang/et-EE.rc" +#endif #ifdef LANGUAGE_EU_ES #include "lang/eu-ES.rc" #endif diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc new file mode 100644 index 0000000000..d1d7b61b20 --- /dev/null +++ b/base/applications/notepad/lang/et-EE.rc @@ -0,0 +1,194 @@ +/* + * PROJECT: NOTEPAD for ReactOS + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/notepad/lang/et-EE.rc + * PURPOSE: Estonian Language resource file + * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) + */ + +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Fail" + BEGIN + MENUITEM "&Uus\tCtrl+N", CMD_NEW + MENUITEM "&Ava...\tCtrl+O", CMD_OPEN + MENUITEM "&Salvesta\tCtrl+S", CMD_SAVE + MENUITEM "Salvesta &Nimega...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Lehe Ülese&hitus...", CMD_PAGE_SETUP + MENUITEM "&Prindi...\tCtrl+P", CMD_PRINT + MENUITEM SEPARATOR + MENUITEM "&Välju", CMD_EXIT + END + POPUP "&Redigeeri" + BEGIN + MENUITEM "&Võta Tagasi\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Lõika\tCtrl+X", CMD_CUT + MENUITEM "&Kopeeri\tCtrl+C", CMD_COPY + MENUITEM "Kl&eebi\tCtrl+V", CMD_PASTE + MENUITEM "Kus&tuta\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "L&eia...\tCtrl+F", CMD_SEARCH + MENUITEM "Leia &Järgmine\tF3", CMD_SEARCH_NEXT + MENUITEM "Asen&da...\tCtrl+H", CMD_REPLACE + MENUITEM "&Mine Asukohta...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Vali Kõ&ik\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Aeg/Ku&upäev\tF5", CMD_TIME_DATE + END + POPUP "F&ormaat" + BEGIN + MENUITEM "&Sõna Mähkimine", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&Vaade" + BEGIN + MENUITEM "&Olekuriba", CMD_STATUSBAR + END + POPUP "&Abi" + BEGIN + MENUITEM "&Vaata Abi", CMD_HELP_CONTENTS + MENUITEM SEPARATOR + MENUITEM "&Teave Notepad'ist", CMD_ABOUT + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD + END +END + +/* Dialog 'Page setup' */ +DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP +FONT 8, "MS Shell Dlg" +CAPTION "Lehe Ülesehitus" +BEGIN + GROUPBOX "Eelvaade", 0, 240, 6, 120, 153, BS_GROUPBOX + CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 + GROUPBOX "Paber", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "&Suurus:", stc2, 16, 22, 36, 8 + COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + LTEXT "&Salv:", stc3, 16, 42, 36, 8 + COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Orientatsioon", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Portree", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Maastik", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Ääred", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&Vasakult:", stc15, 88, 82, 30, 8 + EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Paremalt:", stc16, 159, 82, 30, 8 + EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Ülevalt:", stc17, 88, 102, 30, 8 + EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Alt:", stc18, 159, 102, 30, 8 + EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&Päis:", 0x140, 8, 132, 40, 15 + EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Jalus:", 0x142, 8, 149, 40, 15 + EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + PUSHBUTTON "Abi", IDHELP, 8, 170, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Tühista", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 +END + +/* Dialog 'Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Kodeering" +BEGIN + COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodeering:", 0x155, 5, 2, 41, 12 + COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 5, 20, 41, 12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0, 0, 165, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Mine reale" +BEGIN + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Rea number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "Tühista", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Teave ReactOS Notepad'ist" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS Notepad v1.0\r\nAutoriõigus 1997,98 Marcel Baur\r\nAutoriõigus 2000 Mike McCormack\r\nAutoriõigus 2002 Sylvain Petreolle\r\nAutoriõigus 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 + DEFPUSHBUTTON "Sulge", IDOK, 114, 149, 44, 15, WS_GROUP + ICON IDI_NPICON, -1, 12, 9, 20, 30 + EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + STRING_LICENSE "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.\r\n\r\nThis 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 [...] +END + +STRINGTABLE +BEGIN + STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_NOTEPAD "Notepad" + STRING_ERROR "ERROR" + STRING_WARNING "HOIATUS" + STRING_INFO "Informatsioon" + STRING_UNTITLED "Nimetu" + STRING_ALL_FILES "Kõik failid (*.*)" + STRING_TEXT_FILES_TXT "Tekstifailid (*.txt)" + STRING_TOOLARGE "Fail '%s' on liiga suur Notepad'i jaoks.\n \ +Palun kasuta erinevat redigeerijat." + STRING_NOTEXT "Sa ei sisestanud midagi. \ +\nPalun kirjuta midagi ja proovi uuesti." + STRING_DOESNOTEXIST "Faili '%s'\nei ole olemas\n\n \ +Kas soovid uut faili koostada ?" + STRING_NOTSAVED "Faili '%s'\non redigeeritud\n\n \ +Kas soovid muudatused salvestada ?" + STRING_NOTFOUND "'%s' ei suudetud leida." + STRING_OUT_OF_MEMORY "Pole piisavalt mälu selle \ +käsu lõpetamiseks. \nSulge üks või enam rakendust, et suurendada \nvaba mälu hulka." + STRING_CANNOTFIND "Ei suuda leida '%s'" + STRING_ANSI "ANSI" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (big endian)" + STRING_UTF8 "UTF-8" + STRING_CRLF "Windows (CR + LF)" + STRING_LF "Unix (LF)" + STRING_CR "Mac (CR)" + STRING_LINE_COLUMN "Rida %d, veerg %d" + STRING_PRINTERROR "Ei suuda printida faili '%s'.\n\nVeendu et printer on sisse lülitatud ja korralikult seadistatud." + + STRING_TEXT_DOCUMENT "Tekstidokument" +END diff --git a/base/applications/notepad/rsrc.rc b/base/applications/notepad/rsrc.rc index 524216fbce..8af6d8fa62 100644 --- a/base/applications/notepad/rsrc.rc +++ b/base/applications/notepad/rsrc.rc @@ -56,6 +56,9 @@ IDI_NPICON ICON "res/notepad.ico" #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_ET_EE + #include "lang/et-EE.rc" +#endif #ifdef LANGUAGE_EU_ES #include "lang/eu-ES.rc" #endif

1 0

01/01: [PING] Fix error handling and response address decoding (#318)
by Stanislav Motylkov 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=906fdf9ccb075301a2ae8… commit 906fdf9ccb075301a2ae85ab0979abf7a20bd2ab Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 21:38:47 2018 +0300 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Jan 26 18:38:47 2018 +0000 [PING] Fix error handling and response address decoding (#318) - Host/net unreachable error should be obtained from EchoReply->Status - Use GetNameInfoW to decode actual response addresses (borrowed from tracert code) CORE-14241 #resolve --- base/applications/network/ping/ping.c | 67 ++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/base/applications/network/ping/ping.c b/base/applications/network/ping/ping.c index bbeafa6c88..dd1262eac0 100644 --- a/base/applications/network/ping/ping.c +++ b/base/applications/network/ping/ping.c @@ -479,14 +479,6 @@ Ping(void) Status = GetLastError(); switch (Status) { - case IP_DEST_HOST_UNREACHABLE: - ConResPrintf(StdOut, IDS_DEST_HOST_UNREACHABLE); - break; - - case IP_DEST_NET_UNREACHABLE: - ConResPrintf(StdOut, IDS_DEST_NET_UNREACHABLE); - break; - case IP_REQ_TIMED_OUT: ConResPrintf(StdOut, IDS_REQUEST_TIMED_OUT); break; @@ -498,16 +490,40 @@ Ping(void) } else { + SOCKADDR_IN6 SockAddrIn6; + SOCKADDR_IN SockAddrIn; + PSOCKADDR SockAddr; + socklen_t Size; + EchosReceived++; - ConResPrintf(StdOut, IDS_REPLY_FROM, Address); + ZeroMemory(&SockAddrIn, sizeof(SockAddrIn)); + ZeroMemory(&SockAddrIn6, sizeof(SockAddrIn6)); if (Family == AF_INET6) { PICMPV6_ECHO_REPLY pEchoReply; + PIPV6_ADDRESS_EX Ipv6Addr; pEchoReply = (PICMPV6_ECHO_REPLY)ReplyBuffer; + Ipv6Addr = (PIPV6_ADDRESS_EX)&pEchoReply->Address; + SockAddrIn6.sin6_family = AF_INET6; + CopyMemory(SockAddrIn6.sin6_addr.u.Word, Ipv6Addr->sin6_addr, sizeof(SockAddrIn6.sin6_addr)); + //SockAddrIn6.sin6_addr = Ipv6Addr->sin6_addr; + SockAddr = (PSOCKADDR)&SockAddrIn6; + Size = sizeof(SOCKADDR_IN6); + + GetNameInfoW(SockAddr, + Size, + Address, + NI_MAXHOST, + NULL, + 0, + NI_NUMERICHOST); + + ConResPrintf(StdOut, IDS_REPLY_FROM, Address); + switch (pEchoReply->Status) { case IP_SUCCESS: @@ -531,6 +547,14 @@ Ping(void) break; } + case IP_DEST_NET_UNREACHABLE: + ConResPrintf(StdOut, IDS_DEST_NET_UNREACHABLE); + break; + + case IP_DEST_HOST_UNREACHABLE: + ConResPrintf(StdOut, IDS_DEST_HOST_UNREACHABLE); + break; + case IP_TTL_EXPIRED_TRANSIT: ConResPrintf(StdOut, IDS_TTL_EXPIRED); break; @@ -543,9 +567,26 @@ Ping(void) else { PICMP_ECHO_REPLY pEchoReply; + IPAddr *IP4Addr; pEchoReply = (PICMP_ECHO_REPLY)ReplyBuffer; + IP4Addr = (IPAddr *)&pEchoReply->Address; + SockAddrIn.sin_family = AF_INET; + SockAddrIn.sin_addr.S_un.S_addr = *IP4Addr; + SockAddr = (PSOCKADDR)&SockAddrIn; + Size = sizeof(SOCKADDR_IN); + + GetNameInfoW(SockAddr, + Size, + Address, + NI_MAXHOST, + NULL, + 0, + NI_NUMERICHOST); + + ConResPrintf(StdOut, IDS_REPLY_FROM, Address); + switch (pEchoReply->Status) { case IP_SUCCESS: @@ -571,6 +612,14 @@ Ping(void) break; } + case IP_DEST_NET_UNREACHABLE: + ConResPrintf(StdOut, IDS_DEST_NET_UNREACHABLE); + break; + + case IP_DEST_HOST_UNREACHABLE: + ConResPrintf(StdOut, IDS_DEST_HOST_UNREACHABLE); + break; + case IP_TTL_EXPIRED_TRANSIT: ConResPrintf(StdOut, IDS_TTL_EXPIRED); break;

1 0

01/01: [TRACERT] Improve error handling and output (#319)
by Stanislav Motylkov 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=010c7bfc9bcf31dd232e8… commit 010c7bfc9bcf31dd232e8e779658562fb418cd8a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 21:37:43 2018 +0300 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Jan 26 18:37:43 2018 +0000 [TRACERT] Improve error handling and output (#319) - Correctly interpret network error codes - Add output for generic transmit failure CORE-14242 #resolve --- base/applications/network/tracert/lang/bg-BG.rc | 9 +++++++-- base/applications/network/tracert/lang/cs-CZ.rc | 9 +++++++-- base/applications/network/tracert/lang/de-DE.rc | 9 +++++++-- base/applications/network/tracert/lang/en-US.rc | 9 +++++++-- base/applications/network/tracert/lang/es-ES.rc | 9 +++++++-- base/applications/network/tracert/lang/fr-FR.rc | 9 +++++++-- base/applications/network/tracert/lang/it-IT.rc | 9 +++++++-- base/applications/network/tracert/lang/pl-PL.rc | 9 +++++++-- base/applications/network/tracert/lang/ro-RO.rc | 9 +++++++-- base/applications/network/tracert/lang/ru-RU.rc | 9 +++++++-- base/applications/network/tracert/lang/sq-AL.rc | 9 +++++++-- base/applications/network/tracert/lang/sv-SE.rc | 9 +++++++-- base/applications/network/tracert/lang/tr-TR.rc | 9 +++++++-- base/applications/network/tracert/lang/uk-UA.rc | 9 +++++++-- base/applications/network/tracert/lang/zh-CN.rc | 9 +++++++-- base/applications/network/tracert/lang/zh-TW.rc | 9 +++++++-- base/applications/network/tracert/resource.h | 5 +++++ base/applications/network/tracert/tracert.cpp | 17 +++++++++++++++-- 18 files changed, 132 insertions(+), 34 deletions(-) diff --git a/base/applications/network/tracert/lang/bg-BG.rc b/base/applications/network/tracert/lang/bg-BG.rc index bf99e280f8..e6197573ef 100644 --- a/base/applications/network/tracert/lang/bg-BG.rc +++ b/base/applications/network/tracert/lang/bg-BG.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/cs-CZ.rc b/base/applications/network/tracert/lang/cs-CZ.rc index 1c82fc5dc3..ea442cbf3d 100644 --- a/base/applications/network/tracert/lang/cs-CZ.rc +++ b/base/applications/network/tracert/lang/cs-CZ.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/de-DE.rc b/base/applications/network/tracert/lang/de-DE.rc index bbe5e4dbec..dae8fce082 100644 --- a/base/applications/network/tracert/lang/de-DE.rc +++ b/base/applications/network/tracert/lang/de-DE.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/en-US.rc b/base/applications/network/tracert/lang/en-US.rc index 27b5961ca9..f970a9139a 100644 --- a/base/applications/network/tracert/lang/en-US.rc +++ b/base/applications/network/tracert/lang/en-US.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/es-ES.rc b/base/applications/network/tracert/lang/es-ES.rc index 8c69db16ac..5c44cb4e9c 100644 --- a/base/applications/network/tracert/lang/es-ES.rc +++ b/base/applications/network/tracert/lang/es-ES.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/fr-FR.rc b/base/applications/network/tracert/lang/fr-FR.rc index 611a56490d..69c76b536f 100644 --- a/base/applications/network/tracert/lang/fr-FR.rc +++ b/base/applications/network/tracert/lang/fr-FR.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/it-IT.rc b/base/applications/network/tracert/lang/it-IT.rc index 15b0ba30bf..a4e710b6a4 100644 --- a/base/applications/network/tracert/lang/it-IT.rc +++ b/base/applications/network/tracert/lang/it-IT.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/pl-PL.rc b/base/applications/network/tracert/lang/pl-PL.rc index 94e5ba6ceb..673aa7552d 100644 --- a/base/applications/network/tracert/lang/pl-PL.rc +++ b/base/applications/network/tracert/lang/pl-PL.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/ro-RO.rc b/base/applications/network/tracert/lang/ro-RO.rc index d5f2a88910..2811f1495e 100644 --- a/base/applications/network/tracert/lang/ro-RO.rc +++ b/base/applications/network/tracert/lang/ro-RO.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/ru-RU.rc b/base/applications/network/tracert/lang/ru-RU.rc index 1a000627a1..d07b4f7e1d 100644 --- a/base/applications/network/tracert/lang/ru-RU.rc +++ b/base/applications/network/tracert/lang/ru-RU.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/sq-AL.rc b/base/applications/network/tracert/lang/sq-AL.rc index d3dc494035..b38c9863c8 100644 --- a/base/applications/network/tracert/lang/sq-AL.rc +++ b/base/applications/network/tracert/lang/sq-AL.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/sv-SE.rc b/base/applications/network/tracert/lang/sv-SE.rc index 6579325bdf..36ac1271a8 100644 --- a/base/applications/network/tracert/lang/sv-SE.rc +++ b/base/applications/network/tracert/lang/sv-SE.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/tr-TR.rc b/base/applications/network/tracert/lang/tr-TR.rc index 0ee1a09845..ea7b8a09c1 100644 --- a/base/applications/network/tracert/lang/tr-TR.rc +++ b/base/applications/network/tracert/lang/tr-TR.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/uk-UA.rc b/base/applications/network/tracert/lang/uk-UA.rc index 9a2903c251..794fb76746 100644 --- a/base/applications/network/tracert/lang/uk-UA.rc +++ b/base/applications/network/tracert/lang/uk-UA.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/zh-CN.rc b/base/applications/network/tracert/lang/zh-CN.rc index 61966e02b8..2c303aad4f 100644 --- a/base/applications/network/tracert/lang/zh-CN.rc +++ b/base/applications/network/tracert/lang/zh-CN.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/lang/zh-TW.rc b/base/applications/network/tracert/lang/zh-TW.rc index 86ecc1c9f8..dc37c0388a 100644 --- a/base/applications/network/tracert/lang/zh-TW.rc +++ b/base/applications/network/tracert/lang/zh-TW.rc @@ -20,13 +20,18 @@ Options:\r\n\ IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" IDS_GEN_FAILURE "General failure.\r\n" + IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" IDS_HOP_ZERO, " <1 ms %0\r\n" IDS_TIMEOUT " * %0\r\n" - IDS_HOP_RES_INFO "%1 [%2]\r\n" - IDS_HOP_IP_INFO "%1\r\n" + IDS_HOP_RES_INFO "%1 [%2]" + IDS_HOP_IP_INFO "%1" + IDS_LINEBREAK "\r\n" IDS_REQ_TIMED_OUT "Request timed out.\r\n" + IDS_HOP_RESPONSE " reports: " + IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" END diff --git a/base/applications/network/tracert/resource.h b/base/applications/network/tracert/resource.h index 5bb07ecd6e..01f68bbdba 100644 --- a/base/applications/network/tracert/resource.h +++ b/base/applications/network/tracert/resource.h @@ -6,6 +6,7 @@ #define IDS_TRACE_COMPLETE 103 #define IDS_UNABLE_RESOLVE 104 #define IDS_GEN_FAILURE 105 +#define IDS_TRANSMIT_FAILED 106 #define IDS_HOP_COUNT 107 #define IDS_HOP_TIME 108 @@ -14,3 +15,7 @@ #define IDS_HOP_RES_INFO 111 #define IDS_HOP_IP_INFO 112 #define IDS_REQ_TIMED_OUT 113 +#define IDS_LINEBREAK 114 +#define IDS_HOP_RESPONSE 115 +#define IDS_DEST_HOST_UNREACHABLE 116 +#define IDS_DEST_NET_UNREACHABLE 117 diff --git a/base/applications/network/tracert/tracert.cpp b/base/applications/network/tracert/tracert.cpp index ca14cc5345..1b52d56650 100644 --- a/base/applications/network/tracert/tracert.cpp +++ b/base/applications/network/tracert/tracert.cpp @@ -317,8 +317,19 @@ DecodeResponse( break; case IP_DEST_HOST_UNREACHABLE: - OutputText(IDS_TIMEOUT); - break; + case IP_DEST_NET_UNREACHABLE: + FoundTarget = true; + PrintHopInfo(AddressInfo); + OutputText(IDS_HOP_RESPONSE); + if (Status == IP_DEST_HOST_UNREACHABLE) + { + OutputText(IDS_DEST_HOST_UNREACHABLE); + } + else if (Status == IP_DEST_NET_UNREACHABLE) + { + OutputText(IDS_DEST_NET_UNREACHABLE); + } + return true; case IP_REQ_TIMED_OUT: OutputText(IDS_TIMEOUT); @@ -329,6 +340,7 @@ DecodeResponse( return false; default: + OutputText(IDS_TRANSMIT_FAILED, Status); return false; } @@ -341,6 +353,7 @@ DecodeResponse( if (Status == IP_TTL_EXPIRED_TRANSIT || Status == IP_SUCCESS) { PrintHopInfo(AddressInfo); + OutputText(IDS_LINEBREAK); } else if (Status == IP_REQ_TIMED_OUT) {

1 0

02/02: [NTOSKRNL] Simplify (and speedup!) CcCanIWrite() using the dirty pages count in cache map.
by Pierre Schweitzer 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc85171674eaecb386ada… commit dc85171674eaecb386adaf7037b977715b1529f3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Jan 26 10:50:13 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Jan 26 10:50:13 2018 +0100 [NTOSKRNL] Simplify (and speedup!) CcCanIWrite() using the dirty pages count in cache map. --- ntoskrnl/cc/copy.c | 26 ++------------------------ ntoskrnl/cc/view.c | 7 +++---- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index db6f0f4920..e194074d59 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -376,9 +376,6 @@ CcCanIWrite ( IN BOOLEAN Wait, IN BOOLEAN Retrying) { - KIRQL OldIrql; - ULONG DirtyPages; - PLIST_ENTRY ListEntry; PFSRTL_COMMON_FCB_HEADER Fcb; PROS_SHARED_CACHE_MAP SharedCacheMap; @@ -409,27 +406,8 @@ CcCanIWrite ( return TRUE; } - /* There's a limit, start counting dirty pages */ - DirtyPages = 0; - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); - for (ListEntry = SharedCacheMap->CacheMapVacbListHead.Flink; - ListEntry != &SharedCacheMap->CacheMapVacbListHead; - ListEntry = ListEntry->Flink) - { - PROS_VACB Vacb; - - Vacb = CONTAINING_RECORD(ListEntry, - ROS_VACB, - CacheMapVacbListEntry); - if (Vacb->Dirty) - { - DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - } - } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); - /* Is dirty page count above local threshold? */ - if (DirtyPages > SharedCacheMap->DirtyPageThreshold) + if (SharedCacheMap->DirtyPages > SharedCacheMap->DirtyPageThreshold) { return FALSE; } @@ -437,7 +415,7 @@ CcCanIWrite ( /* We cannot write if dirty pages count will bring use above * XXX: Might not be accurate */ - if (DirtyPages + (BytesToWrite / PAGE_SIZE) > SharedCacheMap->DirtyPageThreshold) + if (SharedCacheMap->DirtyPages + (BytesToWrite / PAGE_SIZE) > SharedCacheMap->DirtyPageThreshold) { return FALSE; } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index b08210c241..0340c68407 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1521,6 +1521,9 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) SharedCacheMap = CONTAINING_RECORD(ListEntry, ROS_SHARED_CACHE_MAP, SharedCacheMapLinks); + /* Dirty size */ + Dirty = (SharedCacheMap->DirtyPages * PAGE_SIZE) / 1024; + /* First, count for all the associated VACB */ for (Vacbs = SharedCacheMap->CacheMapVacbListHead.Flink; Vacbs != &SharedCacheMap->CacheMapVacbListHead; @@ -1529,10 +1532,6 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) PROS_VACB Vacb; Vacb = CONTAINING_RECORD(Vacbs, ROS_VACB, CacheMapVacbListEntry); - if (Vacb->Dirty) - { - Dirty += VACB_MAPPING_GRANULARITY / 1024; - } if (Vacb->Valid) { Valid += VACB_MAPPING_GRANULARITY / 1024;

1 0

01/02: [NTOSKRNL] Store the total dirty pages per shared cache map in it.
by Pierre Schweitzer 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cc0668b213b361f96ba7… commit 5cc0668b213b361f96ba713ecaef5bc5274775d9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Jan 26 10:40:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Jan 26 10:42:09 2018 +0100 [NTOSKRNL] Store the total dirty pages per shared cache map in it. --- ntoskrnl/cc/fs.c | 1 + ntoskrnl/cc/view.c | 6 ++++++ ntoskrnl/include/internal/cc.h | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index d068f96eb2..9e9ff1a4dc 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -235,6 +235,7 @@ CcPurgeCacheSection ( { RemoveEntryList(&Vacb->DirtyVacbListEntry); CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; } RemoveEntryList(&Vacb->CacheMapVacbListEntry); InsertHeadList(&FreeList, &Vacb->CacheMapVacbListEntry); diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index e8da9a51c8..b08210c241 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -175,6 +175,7 @@ CcRosFlushVacb ( Vacb->Dirty = FALSE; RemoveEntryList(&Vacb->DirtyVacbListEntry); CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; CcRosVacbDecRefCount(Vacb); KeReleaseSpinLock(&Vacb->SharedCacheMap->CacheMapLock, oldIrql); @@ -535,6 +536,7 @@ CcRosReleaseVacb ( { InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } if (Mapped) @@ -621,6 +623,7 @@ CcRosMarkDirtyVacb ( { InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } else { @@ -698,6 +701,7 @@ CcRosUnmapVacb ( { InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } CcRosVacbDecRefCount(Vacb); @@ -1162,6 +1166,7 @@ CcRosDeleteFileCache ( { RemoveEntryList(&current->DirtyVacbListEntry); CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + current->SharedCacheMap->DirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; DPRINT1("Freeing dirty VACB\n"); } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); @@ -1349,6 +1354,7 @@ CcRosInitializeFileCache ( SharedCacheMap->FileSize = FileSizes->FileSize; SharedCacheMap->PinAccess = PinAccess; SharedCacheMap->DirtyPageThreshold = 0; + SharedCacheMap->DirtyPages = 0; KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 913517a762..a85df9da61 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -159,8 +159,9 @@ typedef struct _ROS_SHARED_CACHE_MAP PVOID LazyWriteContext; KSPIN_LOCK CacheMapLock; ULONG OpenCount; - ULONG DirtyPageThreshold; + ULONG DirtyPages; LIST_ENTRY SharedCacheMapLinks; + ULONG DirtyPageThreshold; #if DBG BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif

1 0

01/01: [NTOSKRNL] Allow pinned dirty VACB to be lazy written. This is an addition to 07e6e9c. Also, fix a cppcheck warning (so minor!).
by Pierre Schweitzer 25 Jan '18

25 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2362e0faae65397fb50c7… commit 2362e0faae65397fb50c7072f83a8b5f8cfe2282 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jan 25 21:56:19 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Jan 25 22:00:20 2018 +0100 [NTOSKRNL] Allow pinned dirty VACB to be lazy written. This is an addition to 07e6e9c. Also, fix a cppcheck warning (so minor!). CORE-14249 --- ntoskrnl/cc/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 6f4457f5bf..e8da9a51c8 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -250,7 +250,8 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); /* One reference is added above */ - if (current->ReferenceCount > 2) + if ((current->ReferenceCount > 2 && current->PinCount == 0) || + (current->ReferenceCount > 3 && current->PinCount > 1)) { CcRosReleaseVacbLock(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( @@ -883,7 +884,7 @@ CcRosCreateVacb ( #if MI_TRACE_PFNS if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer)) { - PWCHAR pos = NULL; + PWCHAR pos; ULONG len = 0; pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\'); if (pos)

1 0

01/01: [NTOSKRNL] Contrary to WinDBG !filecache, we don't display CONTROL_AREA but shared cache map
by Pierre Schweitzer 25 Jan '18

25 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c27193a43535f0387a09… commit 9c27193a43535f0387a09ad9873b7ca2b387f255 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jan 25 13:47:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Jan 25 13:47:00 2018 +0100 [NTOSKRNL] Contrary to WinDBG !filecache, we don't display CONTROL_AREA but shared cache map --- ntoskrnl/cc/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index f58fa5d3cc..6f4457f5bf 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1500,7 +1500,8 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) PLIST_ENTRY ListEntry; UNICODE_STRING NoName = RTL_CONSTANT_STRING(L"No name for File"); - KdbpPrint("Control\t\tValid\tDirty\tName\n"); + KdbpPrint(" Usage Summary (in kb)\n"); + KdbpPrint("Shared\t\tValid\tDirty\tName\n"); /* No need to lock the spin lock here, we're in DBG */ for (ListEntry = CcCleanSharedCacheMapList.Flink; ListEntry != &CcCleanSharedCacheMapList;

1 0

01/01: [NTOSKRNL] Fix MSVC build?
by Pierre Schweitzer 24 Jan '18

24 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c52ae66950007d72f1d7… commit 5c52ae66950007d72f1d72c336f9a129f625f173 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Jan 24 22:03:23 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Jan 24 22:03:23 2018 +0100 [NTOSKRNL] Fix MSVC build? --- ntoskrnl/cc/view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index adf79eba7d..f58fa5d3cc 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1493,6 +1493,7 @@ CcInitView ( return TRUE; } +#if DBG && defined(KDBG) BOOLEAN ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) { @@ -1547,5 +1548,6 @@ ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) return TRUE; } +#endif /* EOF */

1 0

02/02: [NTOSKRNL] Implement (it's a bit raw for now!) the !filecache command in KDBG
by Pierre Schweitzer 24 Jan '18

24 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb52c8212501589681aa8… commit cb52c8212501589681aa8927ede568b73b51e3ea Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Jan 24 21:45:37 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Jan 24 21:46:16 2018 +0100 [NTOSKRNL] Implement (it's a bit raw for now!) the !filecache command in KDBG --- ntoskrnl/cc/view.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/kdb_cli.c | 2 ++ 2 files changed, 57 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index a9e83bb5b1..adf79eba7d 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1493,4 +1493,59 @@ CcInitView ( return TRUE; } +BOOLEAN +ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]) +{ + PLIST_ENTRY ListEntry; + UNICODE_STRING NoName = RTL_CONSTANT_STRING(L"No name for File"); + + KdbpPrint("Control\t\tValid\tDirty\tName\n"); + /* No need to lock the spin lock here, we're in DBG */ + for (ListEntry = CcCleanSharedCacheMapList.Flink; + ListEntry != &CcCleanSharedCacheMapList; + ListEntry = ListEntry->Flink) + { + PLIST_ENTRY Vacbs; + ULONG Valid = 0, Dirty = 0; + PROS_SHARED_CACHE_MAP SharedCacheMap; + PUNICODE_STRING FileName; + + SharedCacheMap = CONTAINING_RECORD(ListEntry, ROS_SHARED_CACHE_MAP, SharedCacheMapLinks); + + /* First, count for all the associated VACB */ + for (Vacbs = SharedCacheMap->CacheMapVacbListHead.Flink; + Vacbs != &SharedCacheMap->CacheMapVacbListHead; + Vacbs = Vacbs->Flink) + { + PROS_VACB Vacb; + + Vacb = CONTAINING_RECORD(Vacbs, ROS_VACB, CacheMapVacbListEntry); + if (Vacb->Dirty) + { + Dirty += VACB_MAPPING_GRANULARITY / 1024; + } + if (Vacb->Valid) + { + Valid += VACB_MAPPING_GRANULARITY / 1024; + } + } + + /* Setup name */ + if (SharedCacheMap->FileObject != NULL && + SharedCacheMap->FileObject->FileName.Length != 0) + { + FileName = &SharedCacheMap->FileObject->FileName; + } + else + { + FileName = &NoName; + } + + /* And print */ + KdbpPrint("%p\t%d\t%d\t%wZ\n", SharedCacheMap, Valid, Dirty, FileName); + } + + return TRUE; +} + /* EOF */ diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index fe83d5d421..dfb01f4960 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -93,6 +93,7 @@ static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPool(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPoolUsed(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]); #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); @@ -186,6 +187,7 @@ static const struct { "help", "help", "Display help screen.", KdbpCmdHelp }, { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, { "!poolused", "!poolused [Flags [Tag]]", "Display pool usage.", ExpKdbgExtPoolUsed }, + { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, }; /* FUNCTIONS *****************************************************************/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs