Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[akhaldi] 65784: [NTDLL_WINETEST] Temporarily enable LdrAddRefDll tests in light of CORE-8102.
by akhaldi＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: akhaldi Date: Sun Dec 21 17:16:15 2014 New Revision: 65784 URL: http://svn.reactos.org/svn/reactos?rev=65784&view=rev Log: [NTDLL_WINETEST] Temporarily enable LdrAddRefDll tests in light of CORE-8102. Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Sun Dec 21 17:16:15 2014 @@ -1504,7 +1504,7 @@ return; } -#ifdef __REACTOS__ +#ifndef __REACTOS__ if (!winetest_interactive) { skip("Skipping LdrAddRefDll tests. See CORE-8102\n");

1 0

[pschweitzer] 65783: [SHELL32] Update French translation
by pschweitzer＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: pschweitzer Date: Sun Dec 21 13:26:31 2014 New Revision: 65783 URL: http://svn.reactos.org/svn/reactos?rev=65783&view=rev Log: [SHELL32] Update French translation Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Dec 21 13:26:31 2014 @@ -116,11 +116,11 @@ LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Cette version de ReactOS est enregistrÃ©e Ã :", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Cette version de ReactOS est enregistrÃ©e Ã :", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "MÃ©moire physique installÃ©e:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "MÃ©moire physique installÃ©e :", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 @@ -130,7 +130,7 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS est une rÃ©alisation de:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOS est une rÃ©alisation de :", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -156,20 +156,20 @@ ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type de la cible:", 14004, 8, 38, 68, 10 + LTEXT "Type de la cible :", 14004, 8, 38, 68, 10 EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Localisation de la cible:", 14006, 8, 55, 68, 10 + LTEXT "Localisation de la cible :", 14006, 8, 55, 68, 10 EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cible:", 14008, 8, 71, 68, 10 + LTEXT "&Cible :", 14008, 8, 71, 68, 10 EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&DÃ©marrer dans:", 14010, 8, 98, 68, 10 + LTEXT "&DÃ©marrer dans :", 14010, 8, 98, 68, 10 EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Touche de raccourci:", 14014, 8, 117, 68, 10 + LTEXT "&Touche de raccourci :", 14014, 8, 117, 68, 10 CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&ExÃ©cuter:", 14016, 8, 136, 68, 10 + LTEXT "&ExÃ©cuter :", 14016, 8, 136, 68, 10 COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&ommentaire:", 14018, 8, 154, 68, 10 + LTEXT "C&ommentaire :", 14018, 8, 154, 68, 10 EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "&Changer d'icÃ´ne...", 14021, 84, 172, 70, 14, ES_LEFT @@ -196,26 +196,26 @@ BEGIN ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT - LTEXT "Type de fichier:", 14004, 8, 40, 55, 10 + LTEXT "Type de fichier :", 14004, 8, 40, 55, 10 CONTROL "Dossier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 68, 40, 160, 10 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Localisation:", 14008, 8, 56, 55, 10 + LTEXT "Localisation :", 14008, 8, 56, 55, 10 EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP - LTEXT "Taille:", 14010, 8, 72, 55, 10 + LTEXT "Taille :", 14010, 8, 72, 55, 10 EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "Taille sur le disque :", 140101, 8, 88, 55, 10 EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Contient:", 14026, 8, 104, 55, 10 + LTEXT "Contient :", 14026, 8, 104, 55, 10 EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "CrÃ©Ã©:", 14014, 8, 128, 55, 10 + LTEXT "CrÃ©Ã© :", 14014, 8, 128, 55, 10 EDITTEXT 14015, 68, 128, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Attributs:", 14020, 8, 152, 46, 10 + LTEXT "Attributs :", 14020, 8, 152, 46, 10 AUTOCHECKBOX "Lectu&re-seule", 14021, 56, 152, 70, 10 AUTOCHECKBOX "Cac&hÃ©", 14022, 56, 166, 70, 10 AUTOCHECKBOX "&Archive", 14023, 56, 180, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "A&vancÃ©...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -230,14 +230,14 @@ CONTROL "Fichier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Changer...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Localisation :", 14008, 8, 75, 45, 10 EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Taille :", 14010, 8, 91, 45, 10 EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "Taille sur le disque :", 140112, 8, 107, 55, 10 EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "CrÃ©Ã© :", 14014, 8, 131, 45, 10 @@ -251,7 +251,7 @@ AUTOCHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10 AUTOCHECKBOX "Cac&hÃ©", 14022, 126, 189, 50, 10 AUTOCHECKBOX "&Archive", 14023, 181, 189, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + PUSHBUTTON "A&vancÃ©...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -261,9 +261,9 @@ BEGIN LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10 EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Description : ", 14002, 10, 27, 45, 10 EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "Copyright : ", 14004, 10, 46, 66, 10 EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115 LTEXT "Nom de l'Ã©lÃ©ment : ", 14007, 13, 82, 50, 10 @@ -280,21 +280,21 @@ ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type:", -1, 8, 38, 95, 10 + LTEXT "Type :", -1, 8, 38, 95, 10 EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "SystÃ¨me de fichiers:", -1, 8, 51, 95, 10 + LTEXT "SystÃ¨me de fichiers :", -1, 8, 51, 95, 10 EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 - LTEXT "Espace utilisÃ©:", -1, 25, 69, 80, 10 + LTEXT "Espace utilisÃ© :", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 - LTEXT "Espace libre:", -1, 25, 82, 80, 10 + LTEXT "Espace libre :", -1, 25, 82, 80, 10 EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "CapacitÃ©:", -1, 25, 103, 80, 10 + LTEXT "CapacitÃ© :", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 @@ -371,7 +371,7 @@ LTEXT "Choisissez le programme que vous dÃ©sirez utiliser pour ouvrir ce fichier :", -1, 44, 12, 211, 10 LTEXT "Fichier : ", 14001, 44, 25, 188, 10 GROUPBOX "&Programmes", -1, 7, 42, 249, 187 - CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 + CONTROL "Programmes", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Toujours utiliser le progr&amme sÃ©lectionnÃ© pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10 PUSHBUTTON "Parcourir...", 14004, 198, 207, 50, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 @@ -380,12 +380,12 @@ IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 +CAPTION "En cours de copie..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + PUSHBUTTON "Annuler", 14002, 195, 14, 60, 16 CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 + LTEXT "Fichier", 14001, 8, 6, 169, 10 END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 @@ -608,16 +608,16 @@ IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "Attention" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + LTEXT "Ce fichier peut Ãªtre utilisÃ© par le systÃ¨me ou par\n\ +une autre application. Modifier ce fichier peut endommager votre\n\ +systÃ¨me ou le rendre moins fonctionnel.\n\n\ +Ãtes-vous sÃ»r de vouloir ouvrir ce fichier ?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Oui", IDYES, 125, 55, 50, 14 + PUSHBUTTON "Non", IDNO, 180, 55, 50, 14 END STRINGTABLE @@ -695,10 +695,10 @@ IDS_LOGOFF_PROMPT "Voulez-vous vous dÃ©connecter ?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Impossible d'afficher la boÃ®te de dialogue pour l'exÃ©cution d'un fichier (erreur interne)" + IDS_RUNDLG_BROWSE_ERROR "Impossible d'afficher la boÃ®te de dialogue pour la recherche de fichier (erreur interne)" + IDS_RUNDLG_BROWSE_CAPTION "Parcourir" + IDS_RUNDLG_BROWSE_FILTER "Fichiers exÃ©cutables (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu DÃ©marrer\\Programmes" @@ -739,8 +739,8 @@ /* Open With */ IDS_OPEN_WITH "Ouvrir avec" IDS_OPEN_WITH_CHOOSE "Choisir le programme..." - IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:" - IDS_OPEN_WITH_OTHER "Other Programs:" + IDS_OPEN_WITH_RECOMMENDED "Programmes recommandÃ©s :" + IDS_OPEN_WITH_OTHER "Auttres programmes :" IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< PrÃ©cÃ©dent" @@ -792,7 +792,7 @@ IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramÃ¨tres qui concernent tous les fichiers '%s', cliquez sur AvancÃ©." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" - IDS_BYTES_FORMAT "bytes" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" -END + IDS_BYTES_FORMAT "octets" + IDS_UNKNOWN_APP "Application inconnue" + IDS_EXE_DESCRIPTION "Description :" +END

1 0

[ekohl] 65782: [CMD] Implement CTRL+Left (jump to previous word) and CRTL+Right (jump to next word) edit keys. CORE-5626 #resolve
by ekohl＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: ekohl Date: Sun Dec 21 12:36:24 2014 New Revision: 65782 URL: http://svn.reactos.org/svn/reactos?rev=65782&view=rev Log: [CMD] Implement CTRL+Left (jump to previous word) and CRTL+Right (jump to next word) edit keys. CORE-5626 #resolve Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Dec 21 12:36:24 2014 @@ -137,6 +137,7 @@ INT current = 0; /*the position of the cursor in the string (str)*/ INT charcount = 0;/*chars in the string (str)*/ INPUT_RECORD ir; + DWORD dwControlKeyState; #ifdef FEATURE_UNIX_FILENAME_COMPLETION WORD wLastKey = 0; #endif @@ -185,7 +186,9 @@ bReturn = FALSE; ConInKey (&ir); - if (ir.Event.KeyEvent.dwControlKeyState & + dwControlKeyState = ir.Event.KeyEvent.dwControlKeyState; + + if (dwControlKeyState & (RIGHT_ALT_PRESSED |LEFT_ALT_PRESSED| RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) { @@ -194,7 +197,7 @@ #ifdef FEATURE_HISTORY case 'K': /*add the current command line to the history*/ - if (ir.Event.KeyEvent.dwControlKeyState & + if (dwControlKeyState & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) { if (str[0]) @@ -210,7 +213,7 @@ case 'D': /*delete current history entry*/ - if (ir.Event.KeyEvent.dwControlKeyState & + if (dwControlKeyState & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) { ClearCommandLine (str, maxlen, orgx, orgy); @@ -481,59 +484,137 @@ break; case VK_LEFT: - /* move cursor left */ - if (current > 0) - { - current--; - if (GetCursorX () == 0) - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - curx = maxx - 1; - cury--; + if (dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) + { + /* move cursor to the previous word */ + if (current > 0) + { + while (current > 0 && str[current - 1] == _T(' ')) + { + current--; + if (curx == 0) + { + cury--; + curx = maxx -1; + } + else + { + curx--; + } + } + + while (current > 0 && str[current -1] != _T(' ')) + { + current--; + if (curx == 0) + { + cury--; + curx = maxx -1; + } + else + { + curx--; + } + } + + SetCursorXY(curx, cury); + } + } + else + { + /* move cursor left */ + if (current > 0) + { + current--; + if (GetCursorX () == 0) + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + curx = maxx - 1; + cury--; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); + curx--; + } } else { - SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); - curx--; + MessageBeep (-1); + } + } + break; + + case VK_RIGHT: + if (dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) + { + /* move cursor to the next word */ + if (current != charcount) + { + while (current != charcount && str[current] != _T(' ')) + { + current++; + if (curx == maxx - 1) + { + cury++; + curx = 0; + } + else + { + curx++; + } + } + + while (current != charcount && str[current] == _T(' ')) + { + current++; + if (curx == maxx - 1) + { + cury++; + curx = 0; + } + else + { + curx++; + } + } + + SetCursorXY(curx, cury); } } else { - MessageBeep (-1); - } - break; - - case VK_RIGHT: - /* move cursor right */ - if (current != charcount) - { - current++; - if (GetCursorX () == maxx - 1) - { - SetCursorXY (0, (SHORT)(GetCursorY () + 1)); - curx = 0; - cury++; - } + /* move cursor right */ + if (current != charcount) + { + current++; + if (GetCursorX () == maxx - 1) + { + SetCursorXY (0, (SHORT)(GetCursorY () + 1)); + curx = 0; + cury++; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); + curx++; + } + } +#ifdef FEATURE_HISTORY else { - SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); - curx++; - } - } -#ifdef FEATURE_HISTORY - else - { - LPCTSTR last = PeekHistory(-1); - if (last && charcount < (INT)_tcslen (last)) - { - PreviousChar = last[current]; - ConOutChar(PreviousChar); - GetCursorXY(&curx, &cury); - str[current++] = PreviousChar; - charcount++; - } - } -#endif + LPCTSTR last = PeekHistory(-1); + if (last && charcount < (INT)_tcslen (last)) + { + PreviousChar = last[current]; + ConOutChar(PreviousChar); + GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif + } break; default:

1 0

[pschweitzer] 65781: [MSPAINT] Update French translation
by pschweitzer＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: pschweitzer Date: Sun Dec 21 10:04:55 2014 New Revision: 65781 URL: http://svn.reactos.org/svn/reactos?rev=65781&view=rev Log: [MSPAINT] Update French translation Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] Sun Dec 21 10:04:55 2014 @@ -58,7 +58,7 @@ POPUP "&Image" BEGIN MENUITEM "Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "Rogner", IDM_IMAGECROP MENUITEM "Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -149,26 +149,26 @@ IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" -BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 +CAPTION "Agrandir et pencher l'image" +BEGIN + GROUPBOX "Agrandissement", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 - LTEXT "Horizontal:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 + LTEXT "Horizontal :", 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 "Vertical:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 + LTEXT "Vertical :", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "Penchement", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 - LTEXT "Horizontal:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 + LTEXT "Horizontal :", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "degrÃ©s", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 - LTEXT "Vertical:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 + LTEXT "Vertical :", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "degrÃ©s", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Annuler", IDCANCEL, 170, 24, 48, 14 END @@ -202,8 +202,8 @@ IDS_SAVEFILTER "Bitmap 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d octets" IDS_PRINTRES "%d x %d pixels par mÃ¨tre" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_INTNUMBERS "Veuillez entrer des nombres entiers uniquement !" + IDS_PERCENTAGE "Le pourcentage doit Ãªtre entre 1 et 500." + IDS_ANGLE "L'angle doit Ãªtre entre -89 et 89." + IDS_LOADERRORTEXT "Le fichier %s n'a pas pu Ãªtre chargÃ©." +END

1 0

[gadamopoulos] 65780: [EXPLORER] * Fix the fallback case when BCM_GETIDEALSIZE doesn't work. * Take into account the size of the borders of the start button twice. Now the caption has enough space ...
by gadamopoulos＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: gadamopoulos Date: Sat Dec 20 22:11:35 2014 New Revision: 65780 URL: http://svn.reactos.org/svn/reactos?rev=65780&view=rev Log: [EXPLORER] * Fix the fallback case when BCM_GETIDEALSIZE doesn't work. * Take into account the size of the borders of the start button twice. Now the caption has enough space and doesn't hide part of the border and more importantly the button is vertically aligned to the tasks buttons. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat Dec 20 22:11:35 2014 @@ -102,8 +102,8 @@ if (m_ImageList == NULL || !SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) { - Size.cx = GetSystemMetrics(SM_CXEDGE); - Size.cy = GetSystemMetrics(SM_CYEDGE); + Size.cx = 2 * GetSystemMetrics(SM_CXEDGE); + Size.cy = 2 * GetSystemMetrics(SM_CYEDGE); if (hbmStart == NULL) {

1 0

[dreimer] 65779: [TRANSLATION] Turkish Translation Update by Erdem Ersoy CORE-7861 #resolve #comment Committed, thx for helping ^^
by dreimer＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dreimer Date: Sat Dec 20 22:02:26 2014 New Revision: 65779 URL: http://svn.reactos.org/svn/reactos?rev=65779&view=rev Log: [TRANSLATION] Turkish Translation Update by Erdem Ersoy CORE-7861 #resolve #comment Committed, thx for helping ^^ Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 22:02:26 2014 @@ -211,7 +211,7 @@ IDS_FILESIZE "%d Ã§oklu" IDS_PRINTRES "TÃ¼m metrekarelerde %d*%d nokta" IDS_INTNUMBERS "LÃ¼tfen yalnÄ±zca tam sayÄ± giriniz." - IDS_PERCENTAGE "YÃ¼zde 1 ilÃ¢ 500 olmalÄ±dÄ±r." - IDS_ANGLE "AÃ§Ä± -89 ilÃ¢ 89 olmalÄ±dÄ±r." + IDS_PERCENTAGE "YÃ¼zde 1'den 500'e dek olmalÄ±dÄ±r." + IDS_ANGLE "AÃ§Ä± -89'dan 89'a dek olmalÄ±dÄ±r." IDS_LOADERRORTEXT "%s kÃ¼tÃ¼ÄÃ¼ yÃ¼klenemedi." END Modified: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 22:02:26 2014 @@ -230,7 +230,7 @@ LTEXT "&Åifre:", 1112, 8, 79, 88, 8 EDITTEXT 1103, 103, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 8, 97, 248, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 26, 120, 226, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 26, 134, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 149, 248, 1 @@ -253,7 +253,7 @@ LTEXT "&Etki AlanÄ±:", 1110, 9, 99, 91, 8 EDITTEXT 1102, 102, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 9, 116, 247, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 25, 137, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 25, 151, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 167, 247, 1 @@ -276,7 +276,7 @@ LTEXT "&Etki AlanÄ±:", 1110, 10, 100, 92, 8 EDITTEXT 1102, 104, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 11, 116, 247, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 29, 139, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 29, 152, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 167, 247, 1 @@ -300,7 +300,7 @@ LTEXT "&Åifre:", 1112, 10, 81, 92, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 97, 247, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 24, 117, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 24, 132, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 147, 247, 1 @@ -529,7 +529,7 @@ BEGIN LTEXT "Bu baÄlantÄ± iÃ§in istediÄiniz bir ad yazÄ±nÄ±z:", -1, 8, 4, 190, 8 EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL - LTEXT "Onu AÄ BaÄlantÄ±larÄ± dizini iÃ§ine kaydetmek iÃ§in Bitir'e tÄ±klayÄ±nÄ±z.", -1, 8, 38, 193, 8 + LTEXT "Onu AÄ BaÄlantÄ±larÄ± dizini iÃ§ine saklamak iÃ§in Bitir'e tÄ±klayÄ±nÄ±z.", -1, 8, 38, 193, 8 LTEXT "Bu baÄlantÄ±yÄ± daha sonra dÃ¼zenlemek iÃ§in onu seÃ§iniz, KÃ¼tÃ¼k seÃ§kesine tÄ±klayÄ±nÄ±z, sonra HusÃ»siyetler'e tÄ±klayÄ±nÄ±z.", -1, 8, 58, 193, 16 END @@ -825,7 +825,7 @@ AUTOCHECKBOX "&Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1363, 27, 65, 184, 10, BS_TOP | BS_MULTILINE | WS_GROUP AUTOCHECKBOX "&GÃ¼Ã§lÃ¼ Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1364, 41, 80, 172, 10, BS_TOP | BS_MULTILINE AUTOCHECKBOX "&Ä°ki YÃ¶nlÃ¼ Kimlik DoÄrulamasÄ±nÄ± Kullan", 1362, 17, 95, 194, 10, BS_TOP | BS_MULTILINE - PUSHBUTTON "&Åifreyi Kaydetme", 1369, 59, 117, 80, 14, WS_GROUP + PUSHBUTTON "&Åifreyi Saklama", 1369, 59, 117, 80, 14, WS_GROUP PUSHBUTTON "G&eliÅmiÅ...", 1368, 142, 117, 80, 14, NOT WS_VISIBLE | WS_DISABLED AUTOCHECKBOX "&Ãevirmeden Ãnce KÃ¼tÃ¼k ve YazdÄ±rma PaylaÅÄ±mÄ±nÄ± AlgÄ±la", 1365, 7, 198, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED END @@ -842,7 +842,7 @@ AUTOCHECKBOX "&Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1363, 33, 67, 165, 10, WS_GROUP AUTOCHECKBOX "&GÃ¼Ã§lÃ¼ Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1364, 48, 79, 152, 10 AUTOCHECKBOX "Å&imdiki KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kullan", 1366, 31, 91, 165, 10 - PUSHBUTTON "&Åifreyi Kaydetme", 1369, 6, 114, 100, 14, WS_GROUP + PUSHBUTTON "&Åifreyi Saklama", 1369, 6, 114, 100, 14, WS_GROUP PUSHBUTTON "G&eliÅmiÅ...", 1368, 109, 114, 60, 14, NOT WS_VISIBLE | WS_DISABLED AUTOCHECKBOX "&Ãevirmeden Ãnce KÃ¼tÃ¼k ve YazdÄ±rma PaylaÅÄ±mÄ±nÄ± AlgÄ±la", 1365, 14, 134, 193, 10, NOT WS_VISIBLE | WS_DISABLED END @@ -886,7 +886,7 @@ EDITTEXT 1394, 66, 46, 143, 14, ES_AUTOHSCROLL LTEXT "&Åifre:", 1397, 8, 70, 49, 8, NOT WS_GROUP EDITTEXT 1393, 66, 64, 143, 14, ES_PASSWORD | ES_AUTOHSCROLL - AUTOCHECKBOX "Å&ifreyi Kaydet", 1391, 66, 84, 143, 10 + AUTOCHECKBOX "Å&ifreyi Sakla", 1391, 66, 84, 143, 10 CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 98, 200, 1 DEFPUSHBUTTON "Tamam", 1, 81, 104, 60, 14, WS_GROUP PUSHBUTTON "Ä°ptal", 2, 145, 104, 60, 14 @@ -904,7 +904,7 @@ EDITTEXT 1393, 97, 87, 115, 14, ES_PASSWORD | ES_AUTOHSCROLL LTEXT "&Etki AlanÄ±:", 1395, 7, 108, 53, 8, NOT WS_GROUP EDITTEXT 1392, 97, 105, 115, 14, ES_UPPERCASE | ES_AUTOHSCROLL - AUTOCHECKBOX "K&ullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "K&ullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Tamam", 1, 87, 146, 60, 14, WS_GROUP PUSHBUTTON "Ä°ptal", 2, 151, 146, 60, 14 CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 140, 205, 1 @@ -1405,7 +1405,7 @@ LTEXT "&Åifre:", 1112, 11, 81, 90, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 98, 248, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&YalnÄ±zca Ben", 1622, 26, 119, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 26, 133, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 149, 248, 1 @@ -1434,7 +1434,7 @@ LTEXT "&Etki AlanÄ±:", 1110, 10, 104, 92, 8 EDITTEXT 1102, 104, 101, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 121, 248, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&YalnÄ±zca Ben", 1622, 24, 141, 227, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 24, 155, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 170, 248, 1 @@ -1771,45 +1771,45 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each device you want to use for incoming connections.", -1, 10, 4, 299, 10 - LTEXT "&Connection devices:", -1, 10, 16, 275, 8 + LTEXT "Gelen baÄlantÄ±lar iÃ§in kullanmak istediÄiniz tÃ¼m aygÄ±tlarÄ±n bitiÅiÄindeki kutucuklarÄ± imleyiniz.", -1, 10, 4, 299, 10 + LTEXT "&BaÄlantÄ± AygÄ±tlarÄ±:", -1, 10, 16, 275, 8 CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 26, 297, 87 - PUSHBUTTON "P&roperties", 7013, 243, 120, 65, 14, WS_GROUP + PUSHBUTTON "&HusÃ»siyetler", 7013, 243, 120, 65, 14, WS_GROUP END 7051 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each type of networking software that should be enabled for incoming connections.", -1, 10, 1, 288, 20 - LTEXT "Networking &software:", -1, 10, 24, 274, 8 + LTEXT "Gelen baÄlantÄ±lar iÃ§in etkinleÅtirilmesi gereken tÃ¼m aÄ yazÄ±lÄ±mÄ± tÃ¼rlerinin bitiÅiÄindeki kutucuklarÄ± imleyiniz.", -1, 10, 1, 288, 20 + LTEXT "&AÄ YazÄ±lÄ±mÄ±:", -1, 10, 24, 274, 8 CONTROL "", 7036, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 10, 34, 286, 33 - PUSHBUTTON "&Install...", 7037, 108, 71, 60, 14, WS_GROUP - PUSHBUTTON "&Uninstall", 7038, 172, 71, 60, 14, WS_GROUP - PUSHBUTTON "&Properties", 7039, 236, 71, 60, 14, WS_GROUP - LTEXT "<protocol description>", 7040, 21, 105, 273, 38 - LTEXT "Description:", -1, 21, 95, 275, 8 + PUSHBUTTON "&Kur...", 7037, 108, 71, 60, 14, WS_GROUP + PUSHBUTTON "Ka&ldÄ±r", 7038, 172, 71, 60, 14, WS_GROUP + PUSHBUTTON "&HusÃ»siyetler", 7039, 236, 71, 60, 14, WS_GROUP + LTEXT "<Ä°letiÅim KÃ¢idesi TanÄ±mÄ±>", 7040, 21, 105, 273, 38 + LTEXT "TanÄ±m:", -1, 21, 95, 275, 8 END 7052 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Virtual private connections to your computer through the Internet are possible only if your computer has a known name or IP address on the Internet.", -1, 10, 4, 290, 20 - AUTORADIOBUTTON "&Allow virtual private connections", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Do not allow virtual private connections", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - LTEXT "Do you want to allow virtual private connections to this computer?", -1, 17, 49, 275, 8 - LTEXT " If you allow VPN connections, ReactOS will modify the Internet Connection Firewall to allow your computer to send and receive VPN packets.", -1, 10, 25, 293, 25 + LTEXT "UmÃ»mÃ® AÄ boyunca bilgisayarÄ±nÄ±za farazÃ® ÅahsÃ® baÄlantÄ±lar ancak bilgisayarÄ±nÄ±zÄ±n UmÃ»mÃ® AÄ'da bilinen bir adÄ± veyÃ¢ IP adresi varsa olasÄ±dÄ±r.", -1, 10, 4, 290, 20 + AUTORADIOBUTTON "&FarazÃ® ÅahsÃ® BaÄlantÄ±lara Ä°zin Ver", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "F&arazÃ® ÅahsÃ® BaÄlantÄ±lara Ä°zin Verme", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + LTEXT "Bu bilgisayara ÅahsÃ® farazÃ® baÄlantÄ±lara izin vermek istiyor musunuz?", -1, 17, 49, 275, 8 + LTEXT "VPN baÄlantÄ±larÄ±na izin verirseniz ReactOS, VPN paketlerini gÃ¶ndermeye ve almaya bilgisayarÄ±nÄ±za izin vermek iÃ§in UmÃ»mÃ® AÄ BaÄlantÄ± GÃ¼venlik DuvarÄ±'nÄ± deÄiÅtirecektir.", -1, 10, 25, 293, 25 END 7055 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Device for this connection:", -1, 23, 24, 275, 8 + LTEXT "&Bu BaÄlantÄ± Ä°Ã§in AygÄ±t:", -1, 23, 24, 275, 8 COMBOBOX 7056, 22, 36, 275, 125, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Devices other than the one you select will not be affected and may be used for other purposes.", -1, 10, 4, 275, 17 - PUSHBUTTON "&Properties", 7061, 232, 53, 65, 14, WS_GROUP + LTEXT "SeÃ§tiÄinizden baÅka aygÄ±tlar etkilenmeyecektir ve baÅka amaÃ§lar iÃ§in kullanÄ±labilir.", -1, 10, 4, 275, 17 + PUSHBUTTON "&HusÃ»siyetler", 7061, 232, 53, 65, 14, WS_GROUP END 7379 DIALOGEX 0, 0, 317, 143 @@ -1820,23 +1820,23 @@ 19900 DIALOGEX 0, 0, 156, 44 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Dial-Up Networking" +CAPTION "Ãevirmeli AÄ" FONT 8, "MS Shell Dlg" BEGIN ICON 563, 19901, 10, 10, 18, 20 - LTEXT "Waiting for services to start...", 19902, 34, 16, 120, 8 + LTEXT "Servisleri baÅlatmak iÃ§in bekleniyor...", 19902, 34, 16, 120, 8 END STRINGTABLE BEGIN - 187 "&No, do not dial\0" - 188 "You (or a program) have requested information from %1. Which connection do you want to use?\0" - 189 "Add Alternate Phone Number\0" - 190 "Dial only first available device\0" - 191 "Dial all devices\0" - 192 "Dial devices only as needed\0" - 193 "Enter a user name and password with access to the remote network domain.\0" - 194 "Network Address Translation (NAT) is currently installed as a routing protocol,\nand must be removed before enabling Internet Connection Sharing.\nTo remove Network Address Translation, open the Routing and Remote Access Manager\nsnapin and expand the router's entry in the left pane.\nDelete the Network Address Translation routing protocol from the list of IP\nrouting protocols.\0" + 187 "&HayÄ±r, Ãevirme\0" + 188 "Siz (ya da bir izlence) %1'den bilgi istemiÅ. Hangi baÄlantÄ±yÄ± kullanmak istersiniz?\0" + 189 "BaÅka Telefon NumarasÄ± Ekle\0" + 190 "YalnÄ±zca Birinci Var Olan AygÄ±tÄ± Ãevir\0" + 191 "TÃ¼m AygÄ±tlarÄ± Ãevir\0" + 192 "YalnÄ±zca Gerekli Olan AygÄ±tlarÄ± Ãevir\0" + 193 "Uzak aÄ etki alanÄ±na eriÅimi olan bir kullanÄ±cÄ± adÄ± ve Åifre giriniz.\0" + 194 "AÄ Adresi Ãevirimi (NAT) bir yÃ¶nlendirme iletiÅim kÃ¢idesi olarak Åimdilik yÃ¼klÃ¼\nve UmÃ»mÃ® AÄ BaÄlantÄ± PaylaÅÄ±mÄ±'nÄ± etkinleÅtirmeden Ã¶nce kaldÄ±rÄ±lmalÄ±dÄ±r.\nAÄ Adresi Ãevirimi'ni silmek iÃ§in YÃ¶nlendirme ve Uzaktan EriÅim YÃ¶neticisi ek bileÅenini aÃ§Ä±nÄ±z\nve sol bÃ¶lmede yÃ¶nlendiricinin giriÅini geniÅletiniz.\nIP yÃ¶nlendirme iletiÅim kÃ¢idelerinin dizelgesinden AÄ Adresi Ãevirimi yÃ¶nlendirme\niletiÅim kÃ¢idesini siliniz.\0" 195 "The area code must contain only the digits 0 to 9.\0" 196 "The entry name must contain at least one non-blank character and cannot begin with a period. Choose a different name.\0" 197 "You must choose a value from %1 to %2 for this field.\0" Modified: trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 22:02:26 2014 @@ -337,9 +337,9 @@ 9 "Alan Kodu" 10 "Ãn Ekler" 11 "KÃ¢ide" - 12 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, *, #, ve virgÃ¼ldÃ¼r." - 13 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, *, #, boÅluk ve virgÃ¼ldÃ¼r." - 14 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9'dur." + 12 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, *, #, ve virgÃ¼ldÃ¼r." + 13 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, *, #, boÅluk ve virgÃ¼ldÃ¼r." + 14 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dektir." 15 "GirdiÄiniz damga geÃ§ersiz." 16 "Ãevir: %1" 17 "Ãevir: %1 ve alan kodu." @@ -362,7 +362,7 @@ 34 "Bir ya da daha Ã§ok, boÅluklarla ya da virgÃ¼llerle ayrÄ±lan Ã¶n ek giriniz." 35 "BasamaklarÄ± Belirle" 36 "Ãevrilmek iÃ§in * ve # iÃ§inde olmak Ã¼zere bir ya da daha Ã§ok basamak giriniz." - 37 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar, 0 ilÃ¢ 9 ve boÅluktur." + 37 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar, 0'dan 9'a dek ve boÅluktur." 38 "%1!d! sÃ¢niye bekleyiniz." 39 "EriÅim numarasÄ±nÄ± Ã§eviriniz." 40 "Hesap numarasÄ±nÄ± Ã§eviriniz." @@ -401,7 +401,7 @@ 73 "Bu kÃ¢idenin uyguladÄ±ÄÄ± Ã¶n ekleri girmelisiniz." 74 "&Basamaklar:" 75 "&Ãn Ekler:" - 76 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, boÅluk ve virgÃ¼ldÃ¼r." + 76 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, boÅluk ve virgÃ¼ldÃ¼r." 77 "Silmeyi DoÄrula" 78 "Bu konumu silmeyi istediÄinizden emin misiniz?" 79 "Bu arama kartÄ±nÄ± silmek istediÄinizden emin misiniz?" @@ -412,7 +412,7 @@ 84 "DoÄrulamayÄ± Ä°ptal Et" 85 "Konumum" 86 "<Kurulum iÃ§in hizmet saÄlayÄ±cÄ±sÄ± yok.>" - 87 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, A ilÃ¢ D, *, #, +, !, boÅluk ve virgÃ¼ldÃ¼r." + 87 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, A'dan D'ye dek, *, #, +, !, boÅluk ve virgÃ¼ldÃ¼r." 88 "Bu konum iÃ§in uluslararasÄ± taÅÄ±yÄ±cÄ± kodu girmelisiniz." 89 "Bu konum iÃ§in taÅÄ±yÄ±cÄ± kodu girmelisiniz." 90 "Bu sayfa, bilgisayarÄ±nÄ±zda telefon aramalarÄ±nÄ± veyÃ¢ baÅka Ã§oklu ortam baÄlantÄ±larÄ±nÄ± yapmaya veyÃ¢ izlemeye Ã§alÄ±ÅÄ±yor.\nSÃ¼rdÃ¼rmek iÃ§in ona izin vermek istiyor musunuz?"

1 0

[ekohl] 65778: [USETUP] Start implementing the recovery console: CLS, EXIT and HELP have been implemented. I also added a DUMPSECTOR command that enables us to dump disk sectors to the screen. For ...
by ekohl＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: ekohl Date: Sat Dec 20 21:58:22 2014 New Revision: 65778 URL: http://svn.reactos.org/svn/reactos?rev=65778&view=rev Log: [USETUP] Start implementing the recovery console: CLS, EXIT and HELP have been implemented. I also added a DUMPSECTOR command that enables us to dump disk sectors to the screen. For example "DUMPSECTOR 0 63" dumps disk 0 sector 63 to the screen. Added: trunk/reactos/base/setup/usetup/cmdcons.c (with props) trunk/reactos/base/setup/usetup/cmdcons.h (with props) Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/native/utils/console.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -18,6 +18,7 @@ bootsup.c cabinet.c chkdsk.c + cmdcons.c drivesup.c filesup.c filequeue.c Added: trunk/reactos/base/setup/usetup/cmdcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cmdcons.… ============================================================================== --- trunk/reactos/base/setup/usetup/cmdcons.c (added) +++ trunk/reactos/base/setup/usetup/cmdcons.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -0,0 +1,978 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/cmdcons.c + * PURPOSE: Recovery console + * PROGRAMMER: Eric Kohl + */ + +#include "usetup.h" + +#define NDEBUG +#include <debug.h> + + +//#define FEATURE_HISTORY + +typedef struct _CONSOLE_STATE +{ + SHORT maxx; + SHORT maxy; + BOOLEAN bInsert; + BOOLEAN bExit; +} CONSOLE_STATE, *PCONSOLE_STATE; + +typedef struct tagCOMMAND +{ + LPSTR name; + INT flags; + INT (*func)(PCONSOLE_STATE, LPSTR); +} COMMAND, *LPCOMMAND; + + +static +INT +CommandCls( + PCONSOLE_STATE State, + LPSTR param); + +static +INT +CommandDumpSector( + PCONSOLE_STATE State, + LPSTR param); + +static +INT +CommandExit( + PCONSOLE_STATE State, + LPSTR param); + +static +INT +CommandHelp( + PCONSOLE_STATE State, + LPSTR param); + +COMMAND +Commands[] = +{ + {"cls", 0, CommandCls}, + {"dumpsector", 0, CommandDumpSector}, + {"exit", 0, CommandExit}, + {"help", 0, CommandHelp}, + {NULL, 0, NULL} +}; + + +static +VOID +freep( + LPSTR *p) +{ + LPSTR *q; + + if (!p) + return; + + q = p; + while (*q) + RtlFreeHeap(ProcessHeap, 0, *q++); + + RtlFreeHeap(ProcessHeap, 0, p); +} + + +static +VOID +StripQuotes( + LPSTR in) +{ + LPSTR out = in; + + for (; *in; in++) + { + if (*in != '"') + *out++ = *in; + } + + *out = '\0'; +} + + +BOOL +add_entry( + LPINT ac, + LPSTR **arg, + LPCSTR entry) +{ + LPSTR q; + LPSTR *oldarg; + + q = RtlAllocateHeap(ProcessHeap, 0, strlen(entry) + 1); + if (q == NULL) + return FALSE; + + strcpy(q, entry); + oldarg = *arg; + *arg = RtlReAllocateHeap(ProcessHeap, 0, oldarg, (*ac + 2) * sizeof(LPSTR)); + if (*arg == NULL) + { + RtlFreeHeap(ProcessHeap, 0, q); + *arg = oldarg; + return FALSE; + } + + /* save new entry */ + (*arg)[*ac] = q; + (*arg)[++(*ac)] = NULL; + + return TRUE; +} + +static +LPSTR * +split( + LPSTR s, + LPINT args) +{ + LPSTR *arg; + LPSTR start; + LPSTR q; + INT ac; + INT_PTR len; + BOOL bQuoted; + + arg = RtlAllocateHeap(ProcessHeap, 0 , sizeof(LPTSTR)); + if (arg == NULL) + return NULL; + + *arg = NULL; + + ac = 0; + while (*s) + { + bQuoted = FALSE; + + /* skip leading spaces */ + while (*s && (isspace(*s) || iscntrl(*s))) + ++s; + + start = s; + + /* the first character can be '/' */ + if (*s == '/') + s++; + + /* skip to next word delimiter or start of next option */ + while (isprint(*s)) + { + /* if quote (") then set bQuoted */ + bQuoted ^= (*s == '\"'); + + /* Check if we have unquoted text */ + if (!bQuoted) + { + /* check for separators */ + if (isspace(*s) || (*s == '/')) + { + /* Make length at least one character */ + if (s == start) + s++; + break; + } + } + + s++; + } + + /* a word was found */ + if (s != start) + { + len = s - start; + q = RtlAllocateHeap(ProcessHeap, 0, len + 1); + if (q == NULL) + { + freep(arg); + return NULL; + } + + memcpy(q, start, len); + q[len] = '\0'; + + StripQuotes(q); + + if (!add_entry(&ac, &arg, q)) + { + RtlFreeHeap(ProcessHeap, 0, q); + freep(arg); + return NULL; + } + + RtlFreeHeap(ProcessHeap, 0, q); + } + } + + *args = ac; + + return arg; +} + + +static +INT +CommandCls( + PCONSOLE_STATE State, + LPSTR param) +{ +#if 0 + HANDLE hOutput; + COORD coPos; + DWORD dwWritten; + +#if 0 + if (!strncmp(param, "/?", 2)) + { + ConOutResPaging(TRUE,STRING_CLS_HELP); + return 0; + } +#endif + + coPos.X = 0; + coPos.Y = 0; + + hOutput = GetStdHandle(STD_OUTPUT_HANDLE); + FillConsoleOutputAttribute(hOutput, csbi.wAttributes, + State->maxx * State->maxy, + coPos, &dwWritten); + FillConsoleOutputCharacter(hOutput, ' ', + State->maxx * State->maxy, + coPos, &dwWritten); + SetConsoleCursorPosition(hOutput, coPos); +#endif + + CONSOLE_ClearScreen(); + CONSOLE_SetCursorXY(0, 0); + + return 0; +} + + +void HexDump(PUCHAR buffer, ULONG size) +{ + ULONG offset = 0; + PUCHAR ptr; + + while (offset < (size & ~15)) + { + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + CONSOLE_ConOutPrintf("%04lx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx\n", + offset, + ptr[0], + ptr[1], + ptr[2], + ptr[3], + ptr[4], + ptr[5], + ptr[6], + ptr[7], + ptr[8], + ptr[9], + ptr[10], + ptr[11], + ptr[12], + ptr[13], + ptr[14], + ptr[15]); + offset += 16; + } + + if (offset < size) + { + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + CONSOLE_ConOutPrintf("%04lx ", offset); + while (offset < size) + { + CONSOLE_ConOutPrintf(" %02hx", *ptr); + offset++; + ptr++; + } + + CONSOLE_ConOutPrintf("\n"); + } + + CONSOLE_ConOutPrintf("\n"); +} + +static +INT +CommandDumpSector( + PCONSOLE_STATE State, + LPSTR param) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING PathName; + HANDLE hDisk = NULL; + DISK_GEOMETRY DiskGeometry; + NTSTATUS Status; + + LPTSTR *argv = NULL; + INT argc = 0; + WCHAR DriveName[40]; + ULONG ulDrive; +// ULONG ulSector; + LARGE_INTEGER Sector, SectorCount, Offset; + PUCHAR Buffer = NULL; + + DPRINT1("param: %s\n", param); + + if (!strncmp(param, "/?", 2)) + { + CONSOLE_ConOutPrintf("DUMPSECT DiskNumber Sector\n\nDumps a disk sector to the screen.\n\n"); + return 0; + } + + argv = split(param, &argc); + + DPRINT1("argc: %d\n", argc); + DPRINT1("argv: %p\n", argv); + + if (argc != 2) + { + goto done; + } + + DPRINT1("Device: %s\n", argv[0]); + DPRINT1("Sector: %s\n", argv[1]); + + ulDrive = strtoul(argv[0], NULL, 0); +// ulSector = strtoul(argv[1], NULL, 0); + Sector.QuadPart = _atoi64(argv[1]); + + /* Build full drive name */ +// swprintf(DriveName, L"\\\\.\\PHYSICALDRIVE%lu", ulDrive); + swprintf(DriveName, L"\\Device\\Harddisk%lu\\Partition0", ulDrive); + + RtlInitUnicodeString(&PathName, + DriveName); + + InitializeObjectAttributes(&ObjectAttributes, + &PathName, + OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + NULL, + NULL); + + Status = NtOpenFile(&hDisk, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE | FILE_RANDOM_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDeviceIoControlFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + DPRINT1("Drive number: %lu\n", ulDrive); + DPRINT1("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" + "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n", + DiskGeometry.Cylinders.QuadPart, + DiskGeometry.MediaType, + DiskGeometry.TracksPerCylinder, + DiskGeometry.SectorsPerTrack, + DiskGeometry.BytesPerSector); + + DPRINT1("Sector: %I64u\n", Sector.QuadPart); + + SectorCount.QuadPart = DiskGeometry.Cylinders.QuadPart * + DiskGeometry.TracksPerCylinder, + DiskGeometry.SectorsPerTrack; + if (Sector.QuadPart >= SectorCount.QuadPart) + { + CONSOLE_ConOutPrintf("Invalid sector number! Valid range: [0 - %I64u]\n", SectorCount.QuadPart - 1); + goto done; + } + + Buffer = RtlAllocateHeap(ProcessHeap, 0, DiskGeometry.BytesPerSector); + if (Buffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + goto done; + } + + + Offset.QuadPart = Sector.QuadPart * DiskGeometry.BytesPerSector; + DPRINT1("Offset: %I64u\n", Offset.QuadPart); + + Status = NtReadFile(hDisk, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + DiskGeometry.BytesPerSector, + &Offset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtReadFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + HexDump(Buffer, DiskGeometry.BytesPerSector); + +done: + if (Buffer != NULL) + RtlFreeHeap(ProcessHeap, 0, Buffer); + + if (hDisk != NULL) + NtClose(hDisk); + + freep(argv); + + return 0; +} + + +static +INT +CommandExit( + PCONSOLE_STATE State, + LPSTR param) +{ +#if 0 + if (!strncmp(param, "/?", 2)) + { + ConOutResPaging(TRUE,STRING_EXIT_HELP); + /* Just make sure */ + bExit = FALSE; + /* Dont exit */ + return 0; + } +#endif + + State->bExit = TRUE; + + return 0; +} + + +static +INT +CommandHelp( + PCONSOLE_STATE State, + LPSTR param) +{ + CONSOLE_ConOutPrintf("CLS\n"); + CONSOLE_ConOutPrintf("DUMPSECTOR\n"); + CONSOLE_ConOutPrintf("EXIT\n"); + CONSOLE_ConOutPrintf("HELP\n"); + CONSOLE_ConOutPrintf("\n"); + + return 0; +} + + +static +VOID +ClearCommandLine( + LPSTR str, + INT maxlen, + SHORT orgx, + SHORT orgy) +{ + INT count; + + CONSOLE_SetCursorXY(orgx, orgy); + for (count = 0; count < (INT)strlen(str); count++) + CONSOLE_ConOutChar(' '); + memset(str, 0, maxlen); + CONSOLE_SetCursorXY(orgx, orgy); +} + + +static +BOOL +ReadCommand( + PCONSOLE_STATE State, + LPSTR str, + INT maxlen) +{ + SHORT orgx; /* origin x/y */ + SHORT orgy; + SHORT curx; /*current x/y cursor position*/ + SHORT cury; + SHORT tempscreen; + INT count; /*used in some for loops*/ + INT current = 0; /*the position of the cursor in the string (str)*/ + INT charcount = 0;/*chars in the string (str)*/ + INPUT_RECORD ir; + CHAR ch; + BOOL bReturn = FALSE; + BOOL bCharInput; +#ifdef FEATURE_HISTORY + //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ + CHAR PreviousChar; +#endif + + + CONSOLE_GetCursorXY(&orgx, &orgy); + curx = orgx; + cury = orgy; + + memset(str, 0, maxlen * sizeof(CHAR)); + + CONSOLE_SetCursorType(State->bInsert, TRUE); + + do + { + bReturn = FALSE; + CONSOLE_ConInKey(&ir); + + if (ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_ALT_PRESSED |LEFT_ALT_PRESSED| + RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) + { + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { +#ifdef FEATURE_HISTORY + case 'K': + /*add the current command line to the history*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + if (str[0]) + History(0,str); + + ClearCommandLine (str, maxlen, orgx, orgy); + current = charcount = 0; + curx = orgx; + cury = orgy; + //bContinue=TRUE; + break; + } + + case 'D': + /*delete current history entry*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + ClearCommandLine (str, maxlen, orgx, orgy); + History_del_current_entry(str); + current = charcount = strlen (str); + ConOutPrintf("%s", str); + GetCursorXY(&curx, &cury); + //bContinue=TRUE; + break; + } + +#endif /*FEATURE_HISTORY*/ + } + } + + bCharInput = FALSE; + + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { + case VK_BACK: + /* <BACKSPACE> - delete character to left of cursor */ + if (current > 0 && charcount > 0) + { + if (current == charcount) + { + /* if at end of line */ + str[current - 1] = L'\0'; + if (CONSOLE_GetCursorX () != 0) + { + CONSOLE_ConOutPrintf("\b \b"); + curx--; + } + else + { + CONSOLE_SetCursorXY((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + CONSOLE_ConOutChar(' '); + CONSOLE_SetCursorXY((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + cury--; + curx = State->maxx - 1; + } + } + else + { + for (count = current - 1; count < charcount; count++) + str[count] = str[count + 1]; + if (CONSOLE_GetCursorX () != 0) + { + CONSOLE_SetCursorXY ((SHORT)(CONSOLE_GetCursorX () - 1), CONSOLE_GetCursorY ()); + curx--; + } + else + { + CONSOLE_SetCursorXY ((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + cury--; + curx = State->maxx - 1; + } + CONSOLE_GetCursorXY(&curx, &cury); + CONSOLE_ConOutPrintf("%s ", &str[current - 1]); + CONSOLE_SetCursorXY(curx, cury); + } + charcount--; + current--; + } + break; + + case VK_INSERT: + /* toggle insert/overstrike mode */ + State->bInsert ^= TRUE; + CONSOLE_SetCursorType(State->bInsert, TRUE); + break; + + case VK_DELETE: + /* delete character under cursor */ + if (current != charcount && charcount > 0) + { + for (count = current; count < charcount; count++) + str[count] = str[count + 1]; + charcount--; + CONSOLE_GetCursorXY(&curx, &cury); + CONSOLE_ConOutPrintf("%s ", &str[current]); + CONSOLE_SetCursorXY(curx, cury); + } + break; + + case VK_HOME: + /* goto beginning of string */ + if (current != 0) + { + CONSOLE_SetCursorXY(orgx, orgy); + curx = orgx; + cury = orgy; + current = 0; + } + break; + + case VK_END: + /* goto end of string */ + if (current != charcount) + { + CONSOLE_SetCursorXY(orgx, orgy); + CONSOLE_ConOutPrintf("%s", str); + CONSOLE_GetCursorXY(&curx, &cury); + current = charcount; + } + break; + + case 'M': + case 'C': + /* ^M does the same as return */ + bCharInput = TRUE; + if (!(ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + { + break; + } + + case VK_RETURN: + /* end input, return to main */ +#ifdef FEATURE_HISTORY + /* add to the history */ + if (str[0]) + History (0, str); +#endif + str[charcount++] = '\n'; + str[charcount] = '\0'; + CONSOLE_ConOutChar('\n'); + bReturn = TRUE; + break; + + case VK_ESCAPE: + /* clear str Make this callable! */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + break; + +#ifdef FEATURE_HISTORY + case VK_F3: + History_move_to_bottom(); +#endif + case VK_UP: +#ifdef FEATURE_HISTORY + /* get previous command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (-1, str); + current = charcount = strlen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + CONSOLE_ConOutPrintf("%s", str); + CONSOLE_GetCursorXY(&curx, &cury); +#endif + break; + + case VK_DOWN: +#ifdef FEATURE_HISTORY + /* get next command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (1, str); + current = charcount = strlen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + CONSOLE_ConOutPrintf("%s", str); + CONSOLE_GetCursorXY(&curx, &cury); +#endif + break; + + case VK_LEFT: + /* move cursor left */ + if (current > 0) + { + current--; + if (CONSOLE_GetCursorX() == 0) + { + CONSOLE_SetCursorXY((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + curx = State->maxx - 1; + cury--; + } + else + { + CONSOLE_SetCursorXY((SHORT)(CONSOLE_GetCursorX () - 1), CONSOLE_GetCursorY ()); + curx--; + } + } + break; + + case VK_RIGHT: + /* move cursor right */ + if (current != charcount) + { + current++; + if (CONSOLE_GetCursorX() == State->maxx - 1) + { + CONSOLE_SetCursorXY(0, (SHORT)(CONSOLE_GetCursorY () + 1)); + curx = 0; + cury++; + } + else + { + CONSOLE_SetCursorXY((SHORT)(CONSOLE_GetCursorX () + 1), CONSOLE_GetCursorY ()); + curx++; + } + } +#ifdef FEATURE_HISTORY + else + { + LPCSTR last = PeekHistory(-1); + if (last && charcount < (INT)strlen (last)) + { + PreviousChar = last[current]; + CONSOLE_ConOutChar(PreviousChar); + CONSOLE_GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif + break; + + default: + /* This input is just a normal char */ + bCharInput = TRUE; + + } + + ch = ir.Event.KeyEvent.uChar.UnicodeChar; + if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + { + /* insert character into string... */ + if (State->bInsert && current != charcount) + { + /* If this character insertion will cause screen scrolling, + * adjust the saved origin of the command prompt. */ + tempscreen = strlen(str + current) + curx; + if ((tempscreen % State->maxx) == (State->maxx - 1) && + (tempscreen / State->maxx) + cury == (State->maxy - 1)) + { + orgy--; + cury--; + } + + for (count = charcount; count > current; count--) + str[count] = str[count - 1]; + str[current++] = ch; + if (curx == State->maxx - 1) + curx = 0, cury++; + else + curx++; + CONSOLE_ConOutPrintf("%s", &str[current - 1]); + CONSOLE_SetCursorXY(curx, cury); + charcount++; + } + else + { + if (current == charcount) + charcount++; + str[current++] = ch; + if (CONSOLE_GetCursorX () == State->maxx - 1 && CONSOLE_GetCursorY () == State->maxy - 1) + orgy--, cury--; + if (CONSOLE_GetCursorX () == State->maxx - 1) + curx = 0, cury++; + else + curx++; + CONSOLE_ConOutChar(ch); + } + } + } + while (!bReturn); + + CONSOLE_SetCursorType(State->bInsert, TRUE); + + return TRUE; +} + + +static +BOOL +IsDelimiter( + CHAR c) +{ + return (c == '/' || c == '=' || c == '\0' || isspace(c)); +} + + +static +VOID +DoCommand( + PCONSOLE_STATE State, + LPSTR line) +{ + CHAR com[MAX_PATH]; /* the first word in the command */ + LPSTR cp = com; +// LPSTR cstart; + LPSTR rest = line; /* pointer to the rest of the command line */ +// INT cl; + LPCOMMAND cmdptr; + + DPRINT1("DoCommand: (\'%s\')\n", line); + + /* Skip over initial white space */ + while (isspace(*rest)) + rest++; + +// cstart = rest; + + /* Anything to do ? */ + if (*rest) + { + /* Copy over 1st word as lower case */ + while (!IsDelimiter(*rest)) + *cp++ = tolower(*rest++); + + /* Terminate first word */ + *cp = '\0'; + + /* Skip over whitespace to rest of line */ + while (isspace (*rest)) + rest++; + + /* Scan internal command table */ + for (cmdptr = Commands; ; cmdptr++) + { + /* If end of table execute ext cmd */ + if (cmdptr->name == NULL) + { + CONSOLE_ConOutPuts("Unknown command. Enter HELP to get a list of commands."); + break; + } + + if (strcmp(com, cmdptr->name) == 0) + { + cmdptr->func(State, rest); + break; + } + +#if 0 + /* The following code handles the case of commands like CD which + * are recognised even when the command name and parameter are + * not space separated. + * + * e.g dir.. + * cd\freda + */ + + /* Get length of command name */ + cl = strlen(cmdptr->name); + + if ((cmdptr->flags & CMD_SPECIAL) && + (!strncmp (cmdptr->name, com, cl)) && + (strchr("\\.-", *(com + cl)))) + { + /* OK its one of the specials...*/ + + /* Call with new rest */ + cmdptr->func(State, cstart + cl); + break; + } +#endif + } + } +} + + +VOID +RecoveryConsole(VOID) +{ + CHAR szInputBuffer[256]; + CONSOLE_SCREEN_BUFFER_INFO csbi; + CONSOLE_STATE State; + + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + /* get screen size */ + State.maxx = csbi.dwSize.X; + State.maxy = csbi.dwSize.Y; + State.bInsert = TRUE; + State.bExit = FALSE; + + CONSOLE_ClearScreen(); + CONSOLE_SetCursorXY(0, 0); + + CONSOLE_ConOutPrintf("ReactOS Recovery Console\n\nEnter HELP to get a list of commands.\n\n"); + + while (!State.bExit) + { + /* Prompt */ + CONSOLE_ConOutPrintf(">"); + + ReadCommand(&State, szInputBuffer, 256); +DPRINT1("%s\n", szInputBuffer); + + DoCommand(&State, szInputBuffer); + +// Cmd = ParseCommand(NULL); +// if (!Cmd) +// continue; + +// ExecuteCommand(Cmd); +// FreeCommand(Cmd); + } +} + +/* EOF */ Propchange: trunk/reactos/base/setup/usetup/cmdcons.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/cmdcons.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cmdcons.… ============================================================================== --- trunk/reactos/base/setup/usetup/cmdcons.h (added) +++ trunk/reactos/base/setup/usetup/cmdcons.h [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -0,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/cmdcons.h + * PURPOSE: Recovery console + * PROGRAMMER: Eric Kohl + */ + +VOID +RecoveryConsole(VOID); + +/* EOF */ Propchange: trunk/reactos/base/setup/usetup/cmdcons.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -134,6 +134,19 @@ return FlushConsoleInputBuffer(StdInput); } +VOID +CONSOLE_GetCursorXY( + PSHORT x, + PSHORT y) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + *x = csbi.dwCursorPosition.X; + *y = csbi.dwCursorPosition.Y; +} + SHORT CONSOLE_GetCursorX(VOID) { Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -79,6 +79,11 @@ BOOL CONSOLE_Flush(VOID); +VOID +CONSOLE_GetCursorXY( + PSHORT x, + PSHORT y); + SHORT CONSOLE_GetCursorX(VOID); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -30,6 +30,7 @@ #include "bootsup.h" #include "chkdsk.h" +#include "cmdcons.h" #include "format.h" #include "drivesup.h" #include "settings.h" @@ -989,7 +990,7 @@ } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { - return INTRO_PAGE; + return RECOVERY_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ @@ -4133,7 +4134,7 @@ CONSOLE_SetCursorType(TRUE, FALSE); Page = START_PAGE; - while (Page != REBOOT_PAGE) + while (Page != REBOOT_PAGE && Page != RECOVERY_PAGE) { CONSOLE_ClearScreen(); CONSOLE_Flush(); @@ -4281,10 +4282,14 @@ Page = QuitPage(&Ir); break; + case RECOVERY_PAGE: case REBOOT_PAGE: break; } } + + if (Page == RECOVERY_PAGE) + RecoveryConsole(); FreeConsole(); Modified: trunk/reactos/base/setup/usetup/native/utils/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -285,19 +285,44 @@ COORD *pCoord; PCHAR pText; NTSTATUS Status; - ULONG i; +// ULONG i; + + UNICODE_STRING UnicodeString; + OEM_STRING OemString; + ULONG OemLength; + + UnicodeString.Length = nLength * sizeof(WCHAR); + UnicodeString.MaximumLength = nLength * sizeof(WCHAR); + UnicodeString.Buffer = (LPWSTR)lpCharacter; + + OemLength = RtlUnicodeStringToOemSize(&UnicodeString); + Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, 0, - nLength + sizeof(COORD)); + OemLength + sizeof(COORD)); +// nLength + sizeof(COORD)); + if (Buffer== NULL) + return FALSE; + pCoord = (COORD *)Buffer; pText = (PCHAR)(pCoord + 1); *pCoord = dwWriteCoord; + OemString.Length = 0; + OemString.MaximumLength = OemLength; + OemString.Buffer = pText; + + Status = RtlUnicodeStringToOemString(&OemString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + goto done; + /* FIXME: use real unicode->oem conversion */ - for (i = 0; i < nLength; i++) - pText[i] = (CHAR)lpCharacter[i]; +// for (i = 0; i < nLength; i++) +// pText[i] = (CHAR)lpCharacter[i]; Status = NtDeviceIoControlFile(hConsoleOutput, NULL, @@ -310,6 +335,7 @@ Buffer, nLength + sizeof(COORD)); +done: RtlFreeHeap(ProcessHeap, 0, Buffer); if (!NT_SUCCESS(Status)) return FALSE; Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -153,6 +153,7 @@ QUIT_PAGE, FLUSH_PAGE, REBOOT_PAGE, /* virtual page */ + RECOVERY_PAGE, /* virtual page */ } PAGE_NUMBER, *PPAGE_NUMBER; #endif

1 0

[dreimer] 65777: [TASKMGR] Fix even some more translations to get this one fixed: CORE-5790 Sidenote: http://rammichael.com/resource-hacker-fx
by dreimer＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dreimer Date: Sat Dec 20 21:44:24 2014 New Revision: 65777 URL: http://svn.reactos.org/svn/reactos?rev=65777&view=rev Log: [TASKMGR] Fix even some more translations to get this one fixed: CORE-5790 Sidenote: http://rammichael.com/resource-hacker-fx Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -206,12 +206,12 @@ ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "ÐÐ±ÑÐ¾", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 LTEXT "ÐÐ°Ð»Ð¸ÑÐ½Ð°", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 60, 8 - LTEXT "Ð¡Ð¸ÑÑÐµÐ¼ÐµÐ½ ÑÐºÐ»Ð°Ð´", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 65, 8 + LTEXT "Ð¡Ð¸ÑÑÐµÐ¼ÐµÐ½ ÑÐºÐ»Ð°Ð´", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 60, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "ÐÐ±ÑÐ¾", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 LTEXT "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°Ð½Ð°", IDS_KERNEL_MEMORY_PAGED, 137, 184, 50, 8 @@ -312,10 +312,10 @@ CONTROL "ÐÑÐ¾Ð¹ &Ð½Ð¸ÑÐºÐ¸", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 94, 115, 10 CONTROL "GDI Objects", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 105, 115, 10 CONTROL "Ð/Ð Ð¿Ð¸ÑÐ°Ð½ÐµÑÐ°", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 116, 115, 10 - CONTROL "Ð/Ð Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ Ð·Ð° Ð¿Ð¸ÑÐ°Ð½Ðµ", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 127, 65, 10 + CONTROL "Ð/Ð Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ Ð·Ð° Ð¿Ð¸ÑÐ°Ð½Ðµ", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 127, 115, 10 CONTROL "ÐÑÑÐ³Ð¸ Ð/Ð", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 138, 115, 10 CONTROL "ÐÑÑÐ³Ð¸ Ð/Ð Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 149, 115, 10 - CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 160, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 160, 115, 10 END /* String Tables */ Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -303,19 +303,19 @@ CONTROL "I/O LÃ¦ste Bytes", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "&Session ID", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 CONTROL "Bruger &Navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 - CONTROL "Side F&ejl Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 + CONTROL "Side F&ejl Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 85, 10 CONTROL "&Virtuel Huk. StÃ¸rrelse", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 85, 10 - CONTROL "Cach&ed Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 - CONTROL "Ikke C&ached Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 - CONTROL "Base P&rioritet", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 + CONTROL "Cach&ed Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 85, 10 + CONTROL "Ikke C&ached Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 85, 10 + CONTROL "Base P&rioritet", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 85, 10 CONTROL "Antal Af &HÃ¥ndtag", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 85, 10 CONTROL "&Antal Af TrÃ¥de", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 85, 10 - CONTROL "GDI Objektor", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 - CONTROL "I/O Skrivning", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 - CONTROL "I/O Skrevet Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 - CONTROL "I/O Andet", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 - CONTROL "I/O Andre Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 - CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 + CONTROL "GDI Objektor", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 85, 10 + CONTROL "I/O Skrivning", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 85, 10 + CONTROL "I/O Skrevet Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 85, 10 + CONTROL "I/O Andet", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 85, 10 + CONTROL "I/O Andre Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 85, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 85, 10 END /* String Tables */ Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -306,7 +306,7 @@ CONTROL "S&itzungskennung", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 70, 10 // 50 CONTROL "Benut&zername", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 70, 10 // 51 CONTROL "VerÃ¤nderung der Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 // 107,60 - CONTROL "GrÃ¶Ãe des &virtuelle Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 // 107, 60 + CONTROL "GrÃ¶Ãe des &virtuellen Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 // 107, 60 CONTROL "&Ausgelagerter Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 80, 10 // 107, 53 CONTROL "Nicht ausgelagerter P&ool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 CONTROL "&BasisprioritÃ¤t", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -311,7 +311,7 @@ CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 // 107 - CONTROL "NÃº&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 85, 10 // 107 + CONTROL "NÃº&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10 // 107 CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107 CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107 CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -174,7 +174,7 @@ LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "&Folyamat befejezÃ©se", IDC_ENDPROCESS, 165, 189, 75, 14 CONTROL "Minden felhasznÃ¡lÃ³ folya&matait jelenÃtse meg", IDC_SHOWALLPROCESSES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 + BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 155, 10 END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -174,7 +174,7 @@ LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "ìì ëë´ê¸°(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 CONTROL "ëª¨ë ì ì ì íë¡ì¸ì¤ ë³´ì´ê¸°(&S)", IDC_SHOWALLPROCESSES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 + BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 120, 10 END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -172,9 +172,9 @@ BEGIN CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 - PUSHBUTTON "&ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ", IDC_ENDPROCESS, 162, 189, 79, 14 + PUSHBUTTON "&ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ", IDC_ENDPROCESS, 167, 189, 74, 14 CONTROL "&ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¿ÑÐ¾ÑÐµÑÑÑ Ð²ÑÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹", IDC_SHOWALLPROCESSES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 153, 10 + BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 158, 10 END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Sat Dec 20 21:44:24 2014 @@ -160,8 +160,8 @@ CONTROL "List2", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "&ÐÐ¾Ð²Ðµ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ...", IDC_NEWTASK, 181, 189, 60, 14 - PUSHBUTTON "Ð&ÐµÑÐµÐºÐ»ÑÑÐ¸ÑÐ¸ÑÑ", IDC_SWITCHTO, 120, 189, 55, 14, WS_DISABLED - PUSHBUTTON "ÐÐ½&ÑÑÐ¸ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ", IDC_ENDTASK, 58, 189, 56, 14, WS_DISABLED + PUSHBUTTON "Ð&ÐµÑÐµÐºÐ»ÑÑÐ¸ÑÐ¸ÑÑ", IDC_SWITCHTO, 118, 189, 60, 14, WS_DISABLED + PUSHBUTTON "ÐÐ½&ÑÑÐ¸ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ", IDC_ENDTASK, 55, 189, 60, 14, WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 @@ -215,12 +215,12 @@ ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Ð£ÑÑÐ¾Ð³Ð¾", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 LTEXT "ÐÐ¸Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°Ð½Ð°", IDS_KERNEL_MEMORY_PAGED, 137, 184, 53, 8 - LTEXT "ÐÐµÐ²Ð¸Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°Ð½Ð°", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 61, 8 + LTEXT "ÐÐµÐ²Ð¸Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°Ð½Ð°", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 63, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 198, 174, 35, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 198, 184, 35, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 198, 193, 35, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 200, 193, 33, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Ð¥ÑÐ¾Ð½Ð¾Ð»Ð¾Ð³ÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ Ð¦Ð", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Ð¥ÑÐ¾Ð½Ð¾Ð»Ð¾Ð³ÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ Ð¿Ð°Ð¼'ÑÑÑ", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT

1 0

[dreimer] 65776: [TASKMGR] Fix some translations as preparation to get this one fixed: CORE-5790 At least most languages now look sort of nicely. Next: apply the patch and check the non ResHacker c...
by dreimer＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dreimer Date: Sat Dec 20 20:51:54 2014 New Revision: 65776 URL: http://svn.reactos.org/svn/reactos?rev=65776&view=rev Log: [TASKMGR] Fix some translations as preparation to get this one fixed: CORE-5790 At least most languages now look sort of nicely. Next: apply the patch and check the non ResHacker compatible languages Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -195,9 +195,9 @@ ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ialt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "BegrÃ¦nsning", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Top", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 + LTEXT "Ialt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 35, 8 + LTEXT "BegrÃ¦nsning", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER + LTEXT "Top", IDS_COMMIT_CHARGE_PEAK, 12, 193, 35, 8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | @@ -205,8 +205,8 @@ EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Ialt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "TilgÃ¦ngelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 + LTEXT "TilgÃ¦ngelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8 + LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 45, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | @@ -214,8 +214,8 @@ EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Ialt", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Allokeret", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Ikke Allokeret", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 + LTEXT "Allokeret", IDS_KERNEL_MEMORY_PAGED, 137, 184, 45, 8 + LTEXT "Ikke Allokeret", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 45, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | @@ -299,17 +299,17 @@ CONTROL "To&p Huk. Forbrug", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 CONTROL "Side &Fejl", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 CONTROL "&USER Objektor", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 - CONTROL "I/O LÃ¦sning", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 + CONTROL "I/O LÃ¦sning", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 65, 10 CONTROL "I/O LÃ¦ste Bytes", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "&Session ID", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 CONTROL "Bruger &Navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 CONTROL "Side F&ejl Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 - CONTROL "&Virtuel Huk. StÃ¸rrelse", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 + CONTROL "&Virtuel Huk. StÃ¸rrelse", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 85, 10 CONTROL "Cach&ed Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 CONTROL "Ikke C&ached Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 CONTROL "Base P&rioritet", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 - CONTROL "Antal Af &HÃ¥ndtag", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 - CONTROL "&Antal Af TrÃ¥de", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 + CONTROL "Antal Af &HÃ¥ndtag", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 85, 10 + CONTROL "&Antal Af TrÃ¥de", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 85, 10 CONTROL "GDI Objektor", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 CONTROL "I/O Skrivning", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 CONTROL "I/O Skrevet Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -302,11 +302,11 @@ CONTROL "Err&ores de pÃ¡gina", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 // 53 CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 // 62 CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 // 49 - CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 85, 10 + CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 90, 10 CONTROL "I&d. de sesiÃ³n", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 // 50 CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 // 51 - CONTROL "Diferencia de erro&res de pÃ¡gina", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 // 107, 60 - CONTROL "TamaÃ±o de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 // 107, 60 + CONTROL "Diferencia de erro&res de pÃ¡gina", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10 // 107, 60 + CONTROL "TamaÃ±o de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10 // 107, 60 CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 // 107, 53 CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -172,7 +172,7 @@ BEGIN CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 - PUSHBUTTON "&Terminer le processus", IDC_ENDPROCESS, 171, 189, 71, 14 + PUSHBUTTON "&Terminer le processus", IDC_ENDPROCESS, 165, 189, 75, 14 CONTROL "Aff&icher les processus de tous les utilisateurs", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 155, 10 END Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -161,9 +161,9 @@ BEGIN CONTROL "List2", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 - PUSHBUTTON "Ãj &folyamat...", IDC_NEWTASK, 187, 189, 53, 14 - PUSHBUTTON "&VÃ¡ltÃ¡s", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED - PUSHBUTTON "Fela&dat befejezÃ©se", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED + PUSHBUTTON "Ãj &folyamat...", IDC_NEWTASK, 172, 188, 68, 14 + PUSHBUTTON "&VÃ¡ltÃ¡s", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED + PUSHBUTTON "Fela&dat befejezÃ©se", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 @@ -172,7 +172,7 @@ BEGIN CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 - PUSHBUTTON "&Folyamat befejezÃ©se", IDC_ENDPROCESS, 171, 189, 69, 14 + PUSHBUTTON "&Folyamat befejezÃ©se", IDC_ENDPROCESS, 165, 189, 75, 14 CONTROL "Minden felhasznÃ¡lÃ³ folya&matait jelenÃtse meg", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 END @@ -188,39 +188,39 @@ GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Fizikai memÃ³ria (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Kernel memÃ³ria (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "SzÃ¡lak szÃ¡ma", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Folyamatok", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 + LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 35, 8 + LTEXT "SzÃ¡lak szÃ¡ma", IDS_TOTALS_THREAD_COUNT, 12, 140, 45, 8 + LTEXT "Folyamatok", IDS_TOTALS_PROCESS_COUNT, 12, 149, 45, 8 EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ãsszesen", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "Legnagyobb", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 + LTEXT "Ãsszesen", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8 + LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 35, 8, NOT WS_BORDER + LTEXT "Legnagyobb", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ãsszesen", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "ElÃ©rhetÃµ", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "Rendszer gyorsÃtÃ³tÃ¡r", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 + LTEXT "Ãsszesen", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 45, 8 + LTEXT "ElÃ©rhetÃµ", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8 + LTEXT "Rendszer gyorsÃtÃ³tÃ¡r", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 67, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | - ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ãsszesen", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "LapozÃ³Ã¡llomÃ¡nyban", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Nem lapozhatÃ³", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 205, 149, 28, 8, ES_RIGHT | ES_READONLY | + ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Ãsszesen", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 45, 8 + LTEXT "LapozÃ³Ã¡llomÃ¡nyban", IDS_KERNEL_MEMORY_PAGED, 137, 184, 62, 8 + LTEXT "Nem lapozhatÃ³", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_PAGED, 200, 184, 33, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP @@ -293,30 +293,30 @@ PUSHBUTTON "MÃ©gse", IDCANCEL, 138, 178, 50, 14 LTEXT "VÃ¡laszd ki azokat az oszlopokat amelyeket szeretnÃ©l lÃ¡tni a feladatkezelÃµben.", IDC_STATIC, 7, 7, 181, 17 CONTROL "&Image Name", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "&PID (Folyamat azonosÃtÃ³)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "&CPU hasznÃ¡lat", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 + CONTROL "&PID (Folyamat azonosÃtÃ³)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 + CONTROL "&CPU hasznÃ¡lat", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 100, 10 CONTROL "CPU idÃµ", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 - CONTROL "&MemÃ³ria hasznÃ¡lat", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "MemÃ³ria hasznÃ¡lat &vÃ¡ltozÃ¡sa", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 + CONTROL "&MemÃ³ria hasznÃ¡lat", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10 + CONTROL "MemÃ³ria hasznÃ¡lat &vÃ¡ltozÃ¡sa", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 100, 10 CONTROL "Pea&k Memory Usage", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 CONTROL "Page &Faults", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 CONTROL "&USER Objects", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 - CONTROL "I/O OlvasÃ¡sok", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 - CONTROL "I/O Olvasott bÃ¡jtok", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 - CONTROL "&Munkamenet azonosÃtÃ³", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 + CONTROL "I/O OlvasÃ¡sok", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 100, 10 + CONTROL "I/O Olvasott bÃ¡jtok", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 100, 10 + CONTROL "&Munkamenet azonosÃtÃ³", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 100, 10 CONTROL "&FelhasznÃ¡lÃ³", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 CONTROL "Page F&aults Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 - CONTROL "&VirtuÃ¡lis memÃ³ria mÃ©rete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 + CONTROL "&VirtuÃ¡lis memÃ³ria mÃ©rete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 85, 10 CONTROL "Pa&ged Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 CONTROL "N&on-paged Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 CONTROL "&PrioritÃ¡s", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 CONTROL "&Handle Count", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 CONTROL "&SzÃ¡lak szÃ¡ma", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 - CONTROL "GDI Objektumok", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 + CONTROL "GDI Objektumok", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 85, 10 CONTROL "I/O ÃrÃ¡sok", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 CONTROL "I/O Ãrott bÃ¡jtok", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 - CONTROL "EgyÃ©b I/O mÃ»veletek", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 - CONTROL "EgyÃ©b I/O mÃ»veletek bÃ¡jtjai", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "EgyÃ©b I/O mÃ»veletek", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 85, 10 + CONTROL "EgyÃ©b I/O mÃ»veletek bÃ¡jtjai", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 85, 10 CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -198,7 +198,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Batas", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER + LTEXT "Batas", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -315,7 +315,7 @@ CONTROL "Scritture I/O Byte", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 69, 10 CONTROL "Altro I/O", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "Altro I/O Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 - CONTROL "&Linea di comando", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 + CONTROL "&Linea di comando", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 70, 10 END /* String Tables */ Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -159,9 +159,9 @@ BEGIN CONTROL "List2", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 - PUSHBUTTON "&Nieuwe Taak...", IDC_NEWTASK, 187, 189, 53, 14 - PUSHBUTTON "&Activeren", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED - PUSHBUTTON "Taa&k beÃ«indigen", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED + PUSHBUTTON "&Nieuwe Taak...", IDC_NEWTASK, 172, 188, 68, 14 + PUSHBUTTON "&Activeren", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED + PUSHBUTTON "Taa&k beÃ«indigen", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 @@ -299,12 +299,12 @@ CONTROL "Pie&kgeheugengebruik", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 CONTROL "&Wisselbestandsfouten", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 102, 10 CONTROL "&USER-objecten", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 - CONTROL "I/O: leesbewerkingen", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 + CONTROL "I/O: leesbewerkingen", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 80, 10 CONTROL "I/O: gelezen bytes", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 102, 10 CONTROL "S&essie-id", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 CONTROL "Gebruikers&naam", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 102, 10 CONTROL "Verschil in &aantal wisselfouten", IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 28, 110, 10 - CONTROL "Grootte van &virtueel geheugen", IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 39, 1100, 10 + CONTROL "Grootte van &virtueel geheugen", IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 39, 110, 10 CONTROL "Wissel&bare pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 50, 100, 10 CONTROL "Niet-wisse&lbare pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 61, 100, 10 CONTROL "Ba&sisprioriteit", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 72, 100, 10 Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -228,7 +228,7 @@ ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 193, 38, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historia uÅ¼ycia procesora CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Historia uzycia pliku stronicowania", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT @@ -298,32 +298,32 @@ DEFPUSHBUTTON "OK", IDOK, 84, 178, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 138, 178, 50, 14 LTEXT "Wybierz kolumny do wyÅwietlania na stronie Proces MenedÅ¼era zadaÅ", IDC_STATIC, 7, 7, 181, 17 - CONTROL "&Nazwa obrazu", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "PI&D (idewntyfikator procesu)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "&UÅ¼ycie procesora CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 - CONTROL "&Czas procesora CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 - CONTROL "ZuÅ¼ycie pa&miÄci", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "&Zmiana zuÅ¼ycia pamiÄci", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 - CONTROL "&Szczytowe zuÅ¼ycie pamiÄci", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 - CONTROL "&BÅÄdy stronic", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 - CONTROL "Obie&kty USER", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 - CONTROL "Odczyty We/Wy", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 - CONTROL "Odczyty We/Wy w bajtach", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 - CONTROL "&Identyfikator sesji", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 - CONTROL "Naz&wa uÅ¼ytkownika", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 - CONTROL "Zmi&ana bÅÄdÃ³w stronic", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 - CONTROL "&Rozmiar pamiÄci wirtualnej", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 - CONTROL "&Pula stronicowania", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 - CONTROL "Pula niestr&onicowana", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 - CONTROL "Prior&ytet podstawowy", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 - CONTROL "&Liczba uchwytÃ³w", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 - CONTROL "Liczba w&ÄtkÃ³w", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 - CONTROL "Obiekty &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 - CONTROL "Zapisy We/Wy", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 - CONTROL "Zapisy We/Wy w bajtach", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 - CONTROL "Inne We/Wy", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 - CONTROL "Inne We/Wy w bajtach", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 - CONTROL "Linia poleceÅ", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 + CONTROL "&Nazwa obrazu", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 100, 10 + CONTROL "PI&D (idewntyfikator procesu)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 + CONTROL "&UÅ¼ycie procesora CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 100, 10 + CONTROL "&Czas procesora CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 100, 10 + CONTROL "ZuÅ¼ycie pa&miÄci", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10 + CONTROL "&Zmiana zuÅ¼ycia pamiÄci", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 100, 10 + CONTROL "&Szczytowe zuÅ¼ycie pamiÄci", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 100, 10 + CONTROL "&BÅÄdy stronic", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 100, 10 + CONTROL "Obie&kty USER", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 100, 10 + CONTROL "Odczyty We/Wy", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 100, 10 + CONTROL "Odczyty We/Wy w bajtach", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 100, 10 + CONTROL "&Identyfikator sesji", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 100, 10 + CONTROL "Naz&wa uÅ¼ytkownika", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 100, 10 + CONTROL "Zmi&ana bÅÄdÃ³w stronic", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 85, 10 + CONTROL "&Rozmiar pamiÄci wirtualnej", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 85, 10 + CONTROL "&Pula stronicowania", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 85, 10 + CONTROL "Pula niestr&onicowana", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 85, 10 + CONTROL "Prior&ytet podstawowy", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 85, 10 + CONTROL "&Liczba uchwytÃ³w", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 85, 10 + CONTROL "Liczba w&ÄtkÃ³w", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 85, 10 + CONTROL "Obiekty &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 85, 10 + CONTROL "Zapisy We/Wy", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 85, 10 + CONTROL "Zapisy We/Wy w bajtach", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 85, 10 + CONTROL "Inne We/Wy", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 85, 10 + CONTROL "Inne We/Wy w bajtach", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 85, 10 + CONTROL "Linia poleceÅ", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 85, 10 END /* String Tables */ Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -172,7 +172,7 @@ LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "&Finalizar processo", IDC_ENDPROCESS, 171, 189, 69, 14 CONTROL "&Mostrar processos de todos os usuÃ¡rios", IDC_SHOWALLPROCESSES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 136, 10 + BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 140, 10 END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ @@ -295,18 +295,18 @@ CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 CONTROL "&Tempo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 61, 10 CONTROL "U&so de memÃ³ria", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Inter&valo de uso de memÃ³ria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 102, 10 + CONTROL "Inter&valo de uso de memÃ³ria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 CONTROL "&Pico do uso de memÃ³ria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 89, 10 CONTROL "&Falhas de pÃ¡gina", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 68, 10 CONTROL "&Objetos USER", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 CONTROL "Leituras de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 61, 10 CONTROL "Bytes de leitura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 86, 10 - CONTROL "Ide&ntificaÃ§Ã£o de sessÃ£o", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 + CONTROL "Ide&ntificaÃ§Ã£o de sessÃ£o", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 90, 10 CONTROL "Nome de usu&Ã¡rio", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 - CONTROL "Intervalo de fal&has de pÃ¡gina", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 28, 103, 10 - CONTROL "Tamanho da &memÃ³ria virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 39, 83, 10 - CONTROL "&Reserva de memÃ³ria paginÃ¡vel", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 50, 111, 10 - CONTROL "R&eserva de memÃ³ria nÃ£o-paginÃ¡vel", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 61, 123, 10 + CONTROL "Intervalo de fal&has de pÃ¡gina", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 28, 110, 10 + CONTROL "Tamanho da &memÃ³ria virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 39, 110, 10 + CONTROL "&Reserva de memÃ³ria paginÃ¡vel", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 50, 110, 10 + CONTROL "R&eserva de memÃ³ria nÃ£o-paginÃ¡vel", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 61, 125, 10 CONTROL "Prioridade &bÃ¡sica", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 72, 67, 10 CONTROL "&Contagem de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 83, 103, 10 CONTROL "Contagem &de segmentos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 94, 91, 10 Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -302,10 +302,10 @@ CONTROL "C&hyby strÃ¡nkovania pamÃ¤te", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 102, 10 CONTROL "O&bjekty USER", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 CONTROL "Vstup a vÃ½stup - ÄÃtanie", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 92, 10 - CONTROL "Vstup a vÃ½stup - preÄÃtanÃ© bajty", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 112, 10 + CONTROL "Vstup a vÃ½stup - preÄÃtanÃ© bajty", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 115, 10 CONTROL "&IdentifikÃ¡cia relÃ¡cie", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 73, 10 CONTROL "&Meno pouÅ¾ÃvateÄ¾a", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 71, 10 - CONTROL "Rozdiel &chÃ½b strÃ¡nkovania pamÃ¤te", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 28, 120, 10 + CONTROL "Rozdiel &chÃ½b strÃ¡nkovania pamÃ¤te", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 28, 125, 10 CONTROL "V&eÄ¾kosÅ¥ virtuÃ¡lnej pamÃ¤te", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 39, 97, 10 CONTROL "StrÃ¡nkovanÃ½ &fond", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 50, 73, 10 CONTROL "Nes&trÃ¡nkovanÃ½ fond", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 61, 77, 10 @@ -314,7 +314,7 @@ CONTROL "&PoÄet vlÃ¡kien", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 94, 59, 10 CONTROL "Objekty &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 105, 55, 10 CONTROL "Vstup a vÃ½stup - zÃ¡pis", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 116, 92, 10 - CONTROL "Vstup a vÃ½stup - zapÃsanÃ© bajty", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 127, 112, 10 + CONTROL "Vstup a vÃ½stup - zapÃsanÃ© bajty", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 127, 115, 10 CONTROL "Vstup a vÃ½stup - inÃ©", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 138, 77, 10 CONTROL "Vstup a vÃ½stup - inÃ© bajty", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 149, 97, 10 CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 160, 95, 10 Modified: trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -174,7 +174,7 @@ LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "Mbyll Procesin", IDC_ENDPROCESS, 171, 189, 69, 14 CONTROL "&Shfaq proceset nga te gjith perdoruesit", IDC_SHOWALLPROCESSES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 + BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 140, 10 END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ @@ -207,7 +207,7 @@ EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Totali", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "N'dispozicion", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 + LTEXT "N'dispozicion", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8 LTEXT "Kafazi Sistemit", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP @@ -215,14 +215,14 @@ ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Totali", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "Numerizim", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "Jo te numerizume", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 + LTEXT "Totali", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 46, 8 + LTEXT "Numerizim", IDS_KERNEL_MEMORY_PAGED, 137, 184, 46, 8 + LTEXT "Jo te numerizume", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 56, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 193, 38, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "Historia e perdorimit CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT GROUPBOX "Historia e perdorimit Memories", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT @@ -294,29 +294,29 @@ LTEXT "Zgjidh kolonat qe do te shfaqen ne faqen e Proceseve ne Task Manager.", IDC_STATIC, 7, 7, 181, 17 CONTROL "Emri fotos", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 CONTROL "&PID (Process Identifier)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "Perdorimi &CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 - CONTROL "Koha &e CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 - CONTROL "Perdorimiri &Memories", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Perdorimi &Delta i Memories", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 - CONTROL "&Kulmi i perdorimi te Memories", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 + CONTROL "Perdorimi &CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10 + CONTROL "Koha &e CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 60, 10 + CONTROL "Perdorimiri &Memories", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10 + CONTROL "Perdorimi &Delta i Memories", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 100, 10 + CONTROL "&Kulmi i perdorimi te Memories", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 100, 10 CONTROL "Faqe gabim", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 - CONTROL "Objektet e Perdor&uesit", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 + CONTROL "Objektet e Perdor&uesit", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 100, 10 CONTROL "Lexo I/O", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 CONTROL "Lexo I/O Bytes", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "&Seance ID", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 - CONTROL "Emri perdoruesit", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 + CONTROL "Emri perdoruesit", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 100, 10 CONTROL "Faqe Delta G&abim", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 - CONTROL "Masa &Virtuale e Memories", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 + CONTROL "Masa &Virtuale e Memories", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 85, 10 CONTROL "Faqe Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 CONTROL "Jo faqosje Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 - CONTROL "P&rioritete Baze", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 - CONTROL "Trajton Numrimin", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 - CONTROL "Numrimin e &Threads", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 + CONTROL "P&rioritete Baze", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 85, 10 + CONTROL "Trajton Numrimin", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 85, 10 + CONTROL "Numrimin e &Threads", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 85, 10 CONTROL "Objekte GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 - CONTROL "Shkruan I/O", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 - CONTROL "Shkruan I/O Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 - CONTROL "I/O te tjere", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 - CONTROL "I/O Byte te tjere", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Shkruan I/O", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 85, 10 + CONTROL "Shkruan I/O Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 85, 10 + CONTROL "I/O te tjere", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 85, 10 + CONTROL "I/O Byte te tjere", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 85, 10 CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 20:51:54 2014 @@ -161,7 +161,7 @@ WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "&Yeni GÃ¶rev...", IDC_NEWTASK, 187, 189, 53, 14 PUSHBUTTON "&GeÃ§", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED - PUSHBUTTON "G&Ã¶revi SonlandÄ±r", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED + PUSHBUTTON "G&Ã¶revi SonlandÄ±r", IDC_ENDTASK, 60, 189, 68, 14, WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 @@ -172,7 +172,7 @@ LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "&Ä°Ålemi SonlandÄ±r", IDC_ENDPROCESS, 171, 189, 69, 14 CONTROL "&TÃ¼m KullanÄ±cÄ±larÄ±n Ä°Ålemlerini GÃ¶ster", IDC_SHOWALLPROCESSES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 + BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 140, 10 END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ @@ -186,36 +186,36 @@ GROUPBOX "AyrÄ±lmÄ±Å Bellek (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "FizÃ®kÃ® Bellek (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Ãekirdek BelleÄi (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT - LTEXT "Ä°ÅleÃ§ler", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 - LTEXT "Ä°Å ParÃ§acÄ±klarÄ±", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 - LTEXT "Ä°Ålemler", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8 + LTEXT "Ä°ÅleÃ§ler", IDS_TOTALS_HANDLE_COUNT, 12, 131, 45, 8 + LTEXT "Ä°Å ParÃ§acÄ±klarÄ±", IDS_TOTALS_THREAD_COUNT, 12, 140, 45, 8 + LTEXT "Ä°Ålemler", IDS_TOTALS_PROCESS_COUNT, 12, 149, 45, 8 EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Toplam", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8 - LTEXT "Hudut", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER - LTEXT "En YÃ¼ksek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8 + LTEXT "Toplam", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8 + LTEXT "Hudut", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER + LTEXT "En YÃ¼ksek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Toplam", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8 - LTEXT "KullanÄ±labilir", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8 - LTEXT "Dizge Ãn BelleÄi", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8 + LTEXT "Toplam", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 45, 8 + LTEXT "KullanÄ±labilir", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8 + LTEXT "Dizge Ãn BelleÄi", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 51, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY | - ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Toplam", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8 - LTEXT "SayfalanmÄ±Å", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8 - LTEXT "SayfalanmamÄ±Å", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8 + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY | + ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Toplam", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 45, 8 + LTEXT "SayfalanmÄ±Å", IDS_KERNEL_MEMORY_PAGED, 137, 184, 45, 8 + LTEXT "SayfalanmamÄ±Å", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY | @@ -291,30 +291,30 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 138, 178, 50, 14 LTEXT "GÃ¶rev YÃ¶neticisi'nin Ä°Ålemler sayfasÄ±nda gÃ¶zÃ¼kecek dikeÃ§leri seÃ§iniz.", IDC_STATIC, 7, 7, 181, 17 CONTROL "YansÄ±ma AdÄ±", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "PID (Ä°Ålem TanÄ±mlayÄ±cÄ±)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "CPU KullanÄ±mÄ±", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 - CONTROL "CPU SÃ¼resi", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 - CONTROL "Bellek KullanÄ±mÄ±", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Bellek KullanÄ±m AralÄ±ÄÄ±", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 - CONTROL "En YÃ¼ksek Bellek KullanÄ±mÄ±", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 - CONTROL "Sayfa YanlÄ±ÅlÄ±klarÄ±", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 - CONTROL "KullanÄ±cÄ± Nesneleri", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 - CONTROL "G/Ã Okuma", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 - CONTROL "G/Ã Okuma ÃoklularÄ±", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 - CONTROL "Oturum KimliÄi", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 - CONTROL "KullanÄ±cÄ± AdÄ±", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 - CONTROL "Sayfa YanlÄ±ÅlÄ±klarÄ± AralÄ±ÄÄ±", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 - CONTROL "FarazÃ® Bellek Boyutu", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 - CONTROL "SayfalanmÄ±Å Havuz", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 - CONTROL "SayfalanmamÄ±Å Havuz", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 67, 10 - CONTROL "Birinci Ãncelik", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 - CONTROL "Ä°ÅleÃ§ler", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 - CONTROL "Ä°Å ParÃ§acÄ±klarÄ±", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 59, 10 - CONTROL "GDI Nesneleri", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 55, 10 - CONTROL "G/Ã Yazma", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 49, 10 - CONTROL "G/Ã Yazma ÃoklularÄ±", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 - CONTROL "G/Ã BaÅka", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 - CONTROL "G/Ã BaÅka Ãoklular", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "PID (Ä°Ålem TanÄ±mlayÄ±cÄ±)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 + CONTROL "CPU KullanÄ±mÄ±", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 100, 10 + CONTROL "CPU SÃ¼resi", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 100, 10 + CONTROL "Bellek KullanÄ±mÄ±", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10 + CONTROL "Bellek KullanÄ±m AralÄ±ÄÄ±", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 100, 10 + CONTROL "En YÃ¼ksek Bellek KullanÄ±mÄ±", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 100, 10 + CONTROL "Sayfa YanlÄ±ÅlÄ±klarÄ±", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 100, 10 + CONTROL "KullanÄ±cÄ± Nesneleri", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 100, 10 + CONTROL "G/Ã Okuma", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 100, 10 + CONTROL "G/Ã Okuma ÃoklularÄ±", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 100, 10 + CONTROL "Oturum KimliÄi", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 100, 10 + CONTROL "KullanÄ±cÄ± AdÄ±", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 100, 10 + CONTROL "Sayfa YanlÄ±ÅlÄ±klarÄ± AralÄ±ÄÄ±", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 85, 10 + CONTROL "FarazÃ® Bellek Boyutu", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 85, 10 + CONTROL "SayfalanmÄ±Å Havuz", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 85, 10 + CONTROL "SayfalanmamÄ±Å Havuz", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 85, 10 + CONTROL "Birinci Ãncelik", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 85, 10 + CONTROL "Ä°ÅleÃ§ler", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 85, 10 + CONTROL "Ä°Å ParÃ§acÄ±klarÄ±", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 94, 85, 10 + CONTROL "GDI Nesneleri", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 105, 85, 10 + CONTROL "G/Ã Yazma", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 116, 85, 10 + CONTROL "G/Ã Yazma ÃoklularÄ±", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 85, 10 + CONTROL "G/Ã BaÅka", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 85, 10 + CONTROL "G/Ã BaÅka Ãoklular", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 85, 10 CONTROL "Komut YatacÄ±", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END

1 0

[gadamopoulos] 65775: [BROWSEUI] * Forward focus to the defview window when the shell browser gets the focus. * We can now navigate to the opened window with the keyboard right after it opens. That...
by gadamopoulos＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: gadamopoulos Date: Sat Dec 20 20:32:32 2014 New Revision: 65775 URL: http://svn.reactos.org/svn/reactos?rev=65775&view=rev Log: [BROWSEUI] * Forward focus to the defview window when the shell browser gets the focus. * We can now navigate to the opened window with the keyboard right after it opens. That means that after opening from the desktop a window with the keyboard, we can navigate right away without any additional mouse clicks. Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Dec 20 20:32:32 2014 @@ -591,6 +591,7 @@ LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); @@ -631,6 +632,7 @@ MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) + MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) MESSAGE_HANDLER(WM_MEASUREITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_DRAWITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_MENUSELECT, RelayMsgToShellView) @@ -3164,6 +3166,12 @@ return ret; } +LRESULT CShellBrowser::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + ::SetFocus(fCurrentShellViewWindow); + return 0; +} + LRESULT CShellBrowser::RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { if (fCurrentShellViewWindow != NULL)

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014