Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ATTRIB] Improve command-line parsing. (#5288)
by Hermès Bélusca-Maïto 18 May '23

18 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2b04fe75da490448b3eb… commit e2b04fe75da490448b3eb49806163003bce097c6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 18 12:43:23 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 18 13:07:31 2023 +0200 [ATTRIB] Improve command-line parsing. (#5288) Fix arguments parsing and redundant code in case no file specification has been given. (Handles both "attrib" and "attrib +h /s" as given in example.) --- base/applications/cmdutils/attrib/attrib.c | 197 ++++++++++++++--------------- 1 file changed, 92 insertions(+), 105 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 9d22255d8eb..821bfd52faf 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -283,162 +283,149 @@ ChangeAttribute( int wmain(int argc, WCHAR *argv[]) { - INT i; - WCHAR szPath[MAX_PATH] = L""; // For case we only use 'attrib +h /s' there is no szPath - WCHAR szFileName [MAX_PATH]; - BOOL bRecurse = FALSE; - BOOL bDirectories = FALSE; - DWORD dwAttrib = 0; - DWORD dwMask = 0; - LPWSTR p; + INT i; + BOOL bRecurse = FALSE; + BOOL bDirectories = FALSE; + DWORD dwAttrib = 0; + DWORD dwMask = 0; + BOOL bFound = FALSE; + PWSTR pszFileName; + WCHAR szFilePath[MAX_PATH + 2] = L""; // + 2 to reserve an extra path separator and a NULL-terminator. /* Initialize the Console Standard Streams */ ConInitStdStreams(); - /* Print help */ - if (argc > 1 && wcscmp(argv[1], L"/?") == 0) - { - ConResPuts(StdOut, STRING_ATTRIB_HELP); - return 0; - } - - /* check for options */ - for (i = 1; i < argc; i++) - { - if (wcsicmp(argv[i], L"/s") == 0) - bRecurse = TRUE; - else if (wcsicmp(argv[i], L"/d") == 0) - bDirectories = TRUE; - } - - /* create attributes and mask */ + /* Check for options and file specifications */ for (i = 1; i < argc; i++) { - if (*argv[i] == L'+') + if (*argv[i] == L'/') { - if (wcslen(argv[i]) != 2) + /* Print help and bail out if needed */ + if (wcscmp(argv[i], L"/?") == 0) { - ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); - return -1; + ConResPuts(StdOut, STRING_ATTRIB_HELP); + return 0; } - - switch (towupper(argv[i][1])) + else + /* Retrieve the enumeration modes */ + if (wcsicmp(argv[i], L"/s") == 0) + bRecurse = TRUE; + else if (wcsicmp(argv[i], L"/d") == 0) + bDirectories = TRUE; + else { - case L'A': - dwMask |= FILE_ATTRIBUTE_ARCHIVE; - dwAttrib |= FILE_ATTRIBUTE_ARCHIVE; - break; - - case L'H': - dwMask |= FILE_ATTRIBUTE_HIDDEN; - dwAttrib |= FILE_ATTRIBUTE_HIDDEN; - break; - - case L'R': - dwMask |= FILE_ATTRIBUTE_READONLY; - dwAttrib |= FILE_ATTRIBUTE_READONLY; - break; - - case L'S': - dwMask |= FILE_ATTRIBUTE_SYSTEM; - dwAttrib |= FILE_ATTRIBUTE_SYSTEM; - break; - - default: - ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); - return -1; + /* Unknown option */ + ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + return -1; } } - else if (*argv[i] == L'-') + else + /* Build attributes and mask */ + if ((*argv[i] == L'+') || (*argv[i] == L'-')) { + BOOL bAdd = (*argv[i] == L'+'); + if (wcslen(argv[i]) != 2) { - ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } switch (towupper(argv[i][1])) { case L'A': - dwMask |= FILE_ATTRIBUTE_ARCHIVE; - dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE; + dwMask |= FILE_ATTRIBUTE_ARCHIVE; + if (bAdd) + dwAttrib |= FILE_ATTRIBUTE_ARCHIVE; + else + dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE; break; - case L'H': - dwMask |= FILE_ATTRIBUTE_HIDDEN; - dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN; + case L'S': + dwMask |= FILE_ATTRIBUTE_SYSTEM; + if (bAdd) + dwAttrib |= FILE_ATTRIBUTE_SYSTEM; + else + dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM; break; - case L'R': - dwMask |= FILE_ATTRIBUTE_READONLY; - dwAttrib &= ~FILE_ATTRIBUTE_READONLY; + case L'H': + dwMask |= FILE_ATTRIBUTE_HIDDEN; + if (bAdd) + dwAttrib |= FILE_ATTRIBUTE_HIDDEN; + else + dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN; break; - case L'S': - dwMask |= FILE_ATTRIBUTE_SYSTEM; - dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM; + case L'R': + dwMask |= FILE_ATTRIBUTE_READONLY; + if (bAdd) + dwAttrib |= FILE_ATTRIBUTE_READONLY; + else + dwAttrib &= ~FILE_ATTRIBUTE_READONLY; break; default: - ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } } + else + { + /* At least one file specification found */ + bFound = TRUE; + } } - if (argc == 1) + /* If no file specification was found, operate on all files of the current directory */ + if (!bFound) { - DWORD len; - - len = GetCurrentDirectory(MAX_PATH, szPath); - if (szPath[len-1] != L'\\') + DWORD len = GetCurrentDirectoryW(_countof(szFilePath) - 2, szFilePath); + if (szFilePath[len - 1] != L'\\') { - szPath[len] = L'\\'; - szPath[len + 1] = UNICODE_NULL; + szFilePath[len] = L'\\'; + szFilePath[len + 1] = UNICODE_NULL; } - wcscpy(szFileName, L"*.*"); - PrintAttribute(szPath, szFileName, bRecurse, bDirectories); + pszFileName = L"*.*"; + + if (dwMask == 0) + bFound = PrintAttribute(szFilePath, pszFileName, bRecurse, bDirectories); + else + bFound = ChangeAttribute(szFilePath, pszFileName, bRecurse, bDirectories, dwMask, dwAttrib); + + if (!bFound) + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, pszFileName); + return 0; } - /* get full file name */ + /* Operate on each file specification */ for (i = 1; i < argc; i++) { - if (*argv[i] == L'+' || *argv[i] == L'-' || *argv[i] == L'/') + /* Skip options */ + if (*argv[i] == L'/' || *argv[i] == L'+' || *argv[i] == L'-') continue; - GetFullPathNameW(argv[i], MAX_PATH, szPath, &p); - wcscpy(szFileName, p); - *p = 0; - - if (dwMask == 0) + GetFullPathNameW(argv[i], _countof(szFilePath) - 2, szFilePath, &pszFileName); + if (pszFileName) { - if (!PrintAttribute(szPath, szFileName, bRecurse, bDirectories)) - { - ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); - } + /* Move the file part so as to separate and NULL-terminate the directory */ + MoveMemory(pszFileName + 1, pszFileName, + sizeof(szFilePath) - (pszFileName -szFilePath + 1) * sizeof(*szFilePath)); + *pszFileName++ = UNICODE_NULL; } - else if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib)) + else { - ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); + pszFileName = L""; } - } -// Code below handles the special case of 'attrib +h /s' and similar - - if (bRecurse && dwMask && (wcscmp(szPath, L"") == 0)) - { - DWORD len; + if (dwMask == 0) + bFound = PrintAttribute(szFilePath, pszFileName, bRecurse, bDirectories); + else + bFound = ChangeAttribute(szFilePath, pszFileName, bRecurse, bDirectories, dwMask, dwAttrib); - len = GetCurrentDirectory(MAX_PATH, szPath); - if (szPath[len-1] != L'\\') - { - szPath[len] = L'\\'; - szPath[len + 1] = UNICODE_NULL; - } - wcscpy(szFileName, L"*.*"); - if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib)) - ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, szFileName); + if (!bFound) + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); } return 0;

1 0

[reactos] 01/01: [REGEDIT] Creating a new Key should add a new entry even when no child exist. CORE-18878 (#5274)
by Jose Carlos Jesus 18 May '23

18 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f45cac9ab975402cc98d… commit 7f45cac9ab975402cc98d491c8ac0c67733f0a3b Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu May 18 06:16:49 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 18 19:16:49 2023 +0900 [REGEDIT] Creating a new Key should add a new entry even when no child exist. CORE-18878 (#5274) - Avoid using a NULL pointer when My Computer is selected, by disabling the New Key menu item. - Simplifies and fix code style in GetItemPath function. - Add a new entry even when no child items exist. CORE-18878 --- base/applications/regedit/treeview.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index 9c957cfe2ad..958aae6cdc7 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -90,14 +90,25 @@ LPCWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) int pathLen = 0, maxLen; *phRootKey = NULL; - if (!pathBuffer) pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024); - if (!pathBuffer) return NULL; - *pathBuffer = 0; + + if (!pathBuffer) + { + pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024); + } + if (!pathBuffer) + { + return NULL; + } + + *pathBuffer = UNICODE_NULL; + maxLen = (int) HeapSize(GetProcessHeap(), 0, pathBuffer); - if (maxLen == -1) return NULL; - if (!hItem) hItem = TreeView_GetSelection(hwndTV); - if (!hItem) return NULL; - if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) + + if (!hItem) + { + hItem = TreeView_GetSelection(hwndTV); + } + if (maxLen == -1 || !hItem || !get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) { return NULL; } @@ -353,7 +364,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) if (!TreeView_GetItem(hwndTV, &item)) return FALSE; - if ((item.state & TVIS_EXPANDEDONCE) && (item.cChildren > 0)) + if (item.state & TVIS_EXPANDEDONCE) { hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); SendMessageW(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM) hItem); @@ -645,8 +656,9 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) UpdateAddress(pnmtv->itemNew.hItem, NULL, NULL, TRUE); - /* Disable the Permissions menu item for 'My Computer' */ + /* Disable the Permissions and new key menu items for 'My Computer' */ EnableMenuItem(hMenuFrame, ID_EDIT_PERMISSIONS, MF_BYCOMMAND | (hParentItem ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenuFrame, ID_EDIT_NEW_KEY, MF_BYCOMMAND | (hParentItem ? MF_ENABLED : MF_GRAYED)); /* * Disable Delete/Rename menu options for 'My Computer' (first item so doesn't have any parent)

1 0

[reactos] 01/01: [ATTRIB] Simplify the ErrorMessage() function.
by Hermès Bélusca-Maïto 18 May '23

18 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f870bbe1d48efa423830c… commit f870bbe1d48efa423830c2507979de787975b981 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 18 12:12:39 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 18 12:12:44 2023 +0200 [ATTRIB] Simplify the ErrorMessage() function. And send the errors to the error stream. --- base/applications/cmdutils/attrib/attrib.c | 43 ++++++++++++------------------ 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index ff6185a84ea..9d22255d8eb 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -49,41 +49,32 @@ CON_SCREEN StdOutScreen = INIT_CON_SCREEN(StdOut); static VOID ErrorMessage( - DWORD dwErrorCode, - LPWSTR szFormat, + _In_ DWORD dwErrorCode, + _In_opt_ PCWSTR pszMsg, ...) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; - WCHAR szMessage[1024]; - LPWSTR szError; + INT Len; va_list arg_ptr; if (dwErrorCode == ERROR_SUCCESS) return; - if (szFormat) - { - va_start(arg_ptr, szFormat); - vswprintf(szMessage, szFormat, arg_ptr); - va_end(arg_ptr); - } - - if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&szError, 0, NULL)) - { - ConPrintf(StdOut, L"%s %s\n", szError, szMessage); - if (szError) - LocalFree(szError); - return; - } + va_start(arg_ptr, pszMsg); + Len = ConMsgPrintfV(StdErr, + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwErrorCode, + LANG_USER_DEFAULT, + &arg_ptr); + va_end(arg_ptr); /* Fall back just in case the error is not defined */ - LoadStringW(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); - if (szFormat) - ConPrintf(StdOut, L"%s -- %s\n", szMsg, szMessage); - else - ConPrintf(StdOut, L"%s\n", szMsg); + if (Len <= 0) + ConResPrintf(StdErr, STRING_CONSOLE_ERROR, dwErrorCode); + + /* Display the extra optional message if necessary */ + if (pszMsg) + ConPrintf(StdErr, L" %s\n", pszMsg); } /* Returns TRUE if anything is printed, FALSE otherwise */

1 0

[reactos] 01/01: [ATTRIB] Reorganize resource file headers.
by Hermès Bélusca-Maïto 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f50a22d3b6e899f7c900… commit 0f50a22d3b6e899f7c900eed2954d48ea86ca25f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 13 22:49:10 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 17 19:40:43 2023 +0200 [ATTRIB] Reorganize resource file headers. Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- base/applications/cmdutils/attrib/lang/cs-CZ.rc | 10 ++++++---- base/applications/cmdutils/attrib/lang/de-DE.rc | 9 +++++++-- base/applications/cmdutils/attrib/lang/el-GR.rc | 8 +++++--- base/applications/cmdutils/attrib/lang/en-US.rc | 9 ++++++++- base/applications/cmdutils/attrib/lang/es-ES.rc | 10 ++++++++-- base/applications/cmdutils/attrib/lang/fr-FR.rc | 9 +++++++-- base/applications/cmdutils/attrib/lang/hu-HU.rc | 9 +++++++-- base/applications/cmdutils/attrib/lang/id-ID.rc | 10 ++++++++-- base/applications/cmdutils/attrib/lang/it-IT.rc | 9 ++++++++- base/applications/cmdutils/attrib/lang/ja-JP.rc | 10 +++++++++- base/applications/cmdutils/attrib/lang/no-NO.rc | 10 +++++++++- base/applications/cmdutils/attrib/lang/pl-PL.rc | 15 +++++++-------- base/applications/cmdutils/attrib/lang/ro-RO.rc | 9 +++++++-- base/applications/cmdutils/attrib/lang/ru-RU.rc | 12 ++++++++++-- base/applications/cmdutils/attrib/lang/sk-SK.rc | 11 ++++++----- base/applications/cmdutils/attrib/lang/sq-AL.rc | 11 +++++++---- base/applications/cmdutils/attrib/lang/sv-SE.rc | 9 ++++++++- base/applications/cmdutils/attrib/lang/tr-TR.rc | 9 +++++++-- base/applications/cmdutils/attrib/lang/uk-UA.rc | 12 ++++++------ base/applications/cmdutils/attrib/lang/zh-CN.rc | 9 +++++++-- base/applications/cmdutils/attrib/lang/zh-TW.rc | 4 ++-- 21 files changed, 149 insertions(+), 55 deletions(-) diff --git a/base/applications/cmdutils/attrib/lang/cs-CZ.rc b/base/applications/cmdutils/attrib/lang/cs-CZ.rc index 5798313832c..b1f16b9d2c5 100644 --- a/base/applications/cmdutils/attrib/lang/cs-CZ.rc +++ b/base/applications/cmdutils/attrib/lang/cs-CZ.rc @@ -1,13 +1,14 @@ -/* FILE: base/shell/cmd/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2015-04-12 +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATORS: Copyright 2015 Radek Liska aka Black_Fox <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -22,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Processes directories as well\n\n\ Type ATTRIB without a parameter to display the attributes of all files.\n" STRING_CONSOLE_ERROR "Neznámá chyba: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Neplatný formát parametru - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/de-DE.rc b/base/applications/cmdutils/attrib/lang/de-DE.rc index 934496e3b75..0b284c27b0a 100644 --- a/base/applications/cmdutils/attrib/lang/de-DE.rc +++ b/base/applications/cmdutils/attrib/lang/de-DE.rc @@ -1,10 +1,14 @@ -/* German language file by Klemens Friedl <frik85> 2005-06-03 */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2005 Klemens Friedl <frik85(a)hotmail.com> + */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Zeigt Dateiattribute an oder ändert sie.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\ [/S [/D]]\n\n\ @@ -19,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\ /D Verarbeitet auch die Ordner.\n\n\ ATTRIB ohne Parameter zeigt die derzeit gesetzten Attribute aller Dateien an." STRING_CONSOLE_ERROR "Unbekannter Fehler: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Ungültiges Parameterformat - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/el-GR.rc b/base/applications/cmdutils/attrib/lang/el-GR.rc index 61b9646ccf8..4c30269adaa 100644 --- a/base/applications/cmdutils/attrib/lang/el-GR.rc +++ b/base/applications/cmdutils/attrib/lang/el-GR.rc @@ -1,13 +1,14 @@ /* - * Αρχική έκδοση - Ημιτελής. - * Ελληνική μετάφραση - Απόστολος Αλεξιάδης + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Greek resource file + * TRANSLATORS: Copyright 2008 Apostolos Alexiadis <djapal(a)gmail.com> */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Προβολή ή αλλαγή των χαρακτηριστικών των αρχείων.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -22,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Επεξεργασία καταλόγων επίσης.\n\n\ Πληκτρολογήστε ATTRIB χωρίς παράμετρο, για να εμφανιστούν τα χαρακτηριστικά όλων των αρχείων.\n" STRING_CONSOLE_ERROR "Άγνωστο σφάλμα: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Μη έγκυρο φορμά παραμέτρου - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/en-US.rc b/base/applications/cmdutils/attrib/lang/en-US.rc index 340a3db2b19..17194478570 100644 --- a/base/applications/cmdutils/attrib/lang/en-US.rc +++ b/base/applications/cmdutils/attrib/lang/en-US.rc @@ -1,8 +1,14 @@ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATORS: Copyright 2005 Magnus Olsen <magnus(a)greatlord.com> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -17,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Processes directories as well\n\n\ Type ATTRIB without a parameter to display the attributes of all files.\n" STRING_CONSOLE_ERROR "Unknown error: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/es-ES.rc b/base/applications/cmdutils/attrib/lang/es-ES.rc index 33ac2827ae4..9a1e6b69e6f 100644 --- a/base/applications/cmdutils/attrib/lang/es-ES.rc +++ b/base/applications/cmdutils/attrib/lang/es-ES.rc @@ -1,10 +1,15 @@ -/* Spanish translation by HUMA2000, Jose Pedro Fernández Pascual, Ismael Ferreras Morezuelas (Swyter) y Julen Urizar Compains */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Spanish resource file + * TRANSLATORS: Copyright 2005 Jose Pedro Fernández Pascual <huma2000(a)terra.es> + * Copyright 2020 Julen Urizar Compains <julenuri(a)hotmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "Archivo no encontrado - '%s'\n" STRING_ATTRIB_HELP "Muestra o cambia los atributos de los archivos.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -19,5 +24,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Procesa también los directorios\n\n\ Escriba ATTRIB sin un parámetro para mostrar los atributos de todos los archivos.\n" STRING_CONSOLE_ERROR "Error desconocido: %d\n" + STRING_FILE_NOT_FOUND "Archivo no encontrado - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Formato de parámetro erróneo - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/fr-FR.rc b/base/applications/cmdutils/attrib/lang/fr-FR.rc index 99c22f35ae9..debb078809d 100644 --- a/base/applications/cmdutils/attrib/lang/fr-FR.rc +++ b/base/applications/cmdutils/attrib/lang/fr-FR.rc @@ -1,10 +1,14 @@ -/* French translation by Sylvain Pétréolle, Pierre Schweitzer */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATORS: Copyright 2005 Sylvain Pétréolle <spetreolle(a)yahoo.fr> + */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Affiche ou change des attributs de fichiers.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -19,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Traite également les répertoires\n\n\ Taper ATTRIB sans paramètre pour afficher les attributs de tous les fichiers." STRING_CONSOLE_ERROR "Erreur inconnue : %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Format de paramètre incorrect - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/hu-HU.rc b/base/applications/cmdutils/attrib/lang/hu-HU.rc index 8e5e3d0ff7b..5aab23093ca 100644 --- a/base/applications/cmdutils/attrib/lang/hu-HU.rc +++ b/base/applications/cmdutils/attrib/lang/hu-HU.rc @@ -1,10 +1,14 @@ -/* Hungarian translation by Robert Horvath (talley at cubeclub.hu) 2005 */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATORS: Copyright 2005 Robert Horvath <talley(a)cubeclub.hu> + */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Állományok attribútumok megjelenítése vagy beállításai.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\ [/S [/D]]\n\n\ @@ -19,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\ /D Mappákra is érvényesíti\n\n\ Ha ATTRIB-ot paraméter nélkül írod be, megjeleníti a mappában található összes állományt és annak attribútumát.\n" STRING_CONSOLE_ERROR "Ismeretlen hiba: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Érvénytelen paraméter megadás - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/id-ID.rc b/base/applications/cmdutils/attrib/lang/id-ID.rc index 84f5d8f84f3..857e4c2bfe2 100644 --- a/base/applications/cmdutils/attrib/lang/id-ID.rc +++ b/base/applications/cmdutils/attrib/lang/id-ID.rc @@ -1,10 +1,15 @@ -/* Indonesian language file by Zaenal Mutaqin <ade999 at gmail dot com> 2007-02-15 and Mas Ahmad Muhammad <m dot charly81 at gmail dot com> */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATORS: Copyright 2007 Zaenal Mutaqin <ade999(a)gmail.com> + * Copyright 2020 Mas Ahmad Muhammad <m.charly81(a)gmail.com> + */ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "Berkas tidak ditemukan - '%s'\n" STRING_ATTRIB_HELP "Menampilkan atau mengubah atribut file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -19,5 +24,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Proses direktori juga\n\n\ Ketik ATTRIB tanpa parameter untuk menampilkan atribut dari semua file.\n" STRING_CONSOLE_ERROR "Kesalahan tidak dikenal: %d\n" + STRING_FILE_NOT_FOUND "Berkas tidak ditemukan - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Format parameter tidak benar - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/it-IT.rc b/base/applications/cmdutils/attrib/lang/it-IT.rc index a4f6a2a1c21..fddb518d05d 100644 --- a/base/applications/cmdutils/attrib/lang/it-IT.rc +++ b/base/applications/cmdutils/attrib/lang/it-IT.rc @@ -1,8 +1,14 @@ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATORS: Copyright 2007 Paolo Devoti <devotip(a)tiscali.it> + */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Visualizza o modifica gli attributi dei file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -17,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Tratta anche le cartelle\n\n\ Scrivi ATTRIB senza parametri per visualizzare gli attributi di tutti i file.\n" STRING_CONSOLE_ERROR "Errore sconosciuto: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Formato dei parametri non valido - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/ja-JP.rc b/base/applications/cmdutils/attrib/lang/ja-JP.rc index 9125d067cb7..598475f24a0 100644 --- a/base/applications/cmdutils/attrib/lang/ja-JP.rc +++ b/base/applications/cmdutils/attrib/lang/ja-JP.rc @@ -1,8 +1,15 @@ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Japanese resource file + * TRANSLATORS: Copyright 2005 tsk <tsk_n(a)mail.goo.ne.jp> + * Copyright 2013 Tomoya Kitagawa (sabiki) <jptomoya(a)yahoo.co.jp> + */ + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "ファイル属性を表示または変更します。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ファイル] ...\n\ [/S [/D]]\n\n\ @@ -17,5 +24,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ファイル] ...\n\ /D フォルダも処理します。\n\n\ パラメータを指定しないで ATTRIB と入力すると、すべてのファイルの属性を表示します。\n" STRING_CONSOLE_ERROR "不明なエラー: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "無効なパラメータの書式です。 - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/no-NO.rc b/base/applications/cmdutils/attrib/lang/no-NO.rc index fdc13654108..800cd628d28 100644 --- a/base/applications/cmdutils/attrib/lang/no-NO.rc +++ b/base/applications/cmdutils/attrib/lang/no-NO.rc @@ -1,8 +1,15 @@ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATORS: Copyright 2006 Lars Martin Hambro (LMH1) <lars_martin4(a)hotmail.com> + * Copyright 2007 Frode Lillerud (Scalpel78) <frode(a)enkelt.no> + */ + LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Viser eller endrer filattributtene.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ [/S [/D]]\n\n\ @@ -17,5 +24,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ /D Bearbeider også mapper.\n\n\ Skriv ATTRIB uten parametere for å vise attributtene til alle filer.\n" STRING_CONSOLE_ERROR "Ukjent feil: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/pl-PL.rc b/base/applications/cmdutils/attrib/lang/pl-PL.rc index b9b64eb9c1c..15916e60842 100644 --- a/base/applications/cmdutils/attrib/lang/pl-PL.rc +++ b/base/applications/cmdutils/attrib/lang/pl-PL.rc @@ -1,18 +1,16 @@ /* - * Translated by Caemyr - Olaf Siejka (Jan, 2008) - * Updated by niski - Maciej Bialas (Mar, 2010) - * Use ReactOS forum PM or IRC to contact me - * https://reactos.org - * IRC: irc.freenode.net #reactos-pl; - * UTF-8 conversion by Caemyr (May, 2011) - * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2008 Olaf Siejka <caemyr(a)gmail.com> + * Copyright 2010 Maciej Bialas <bjauy(a)o2.pl> + * Copyright 2020 Piotr Hetnarowicz <piotrhwz(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "Nie można odnaleźć pliku - '%s'\n" STRING_ATTRIB_HELP "Wyświetla lub zmienia atrybuty plików.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ [/S [/D]]\n\n\ @@ -27,5 +25,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ /D Przetwarza również katalogi\n\n\ Wpisz ATTRIB bez żadnego parametru, by wyświetlić atrybuty wszystkich plików.\n" STRING_CONSOLE_ERROR "Nieznany błąd: %d\n" + STRING_FILE_NOT_FOUND "Nie można odnaleźć pliku - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Niewłaściwy format parametru - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/ro-RO.rc b/base/applications/cmdutils/attrib/lang/ro-RO.rc index 05f858aae75..0bf97c5b1a6 100644 --- a/base/applications/cmdutils/attrib/lang/ro-RO.rc +++ b/base/applications/cmdutils/attrib/lang/ro-RO.rc @@ -1,10 +1,14 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2014 Ștefan Fulea <stefan.fulea(a)mail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Afișează sau modifică atributele de fișiere.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\ [/S [/D]]\n\n\ @@ -19,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\ Tastați ATTRIB fără argumente pentru afișarea atributelor pentru\n\ toate fișierele.\n" STRING_CONSOLE_ERROR "Eroare necunoscută: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Formatul argumentului este eronat - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/ru-RU.rc b/base/applications/cmdutils/attrib/lang/ru-RU.rc index c2390e95f35..eac195e2a7f 100644 --- a/base/applications/cmdutils/attrib/lang/ru-RU.rc +++ b/base/applications/cmdutils/attrib/lang/ru-RU.rc @@ -1,10 +1,17 @@ -/* Russian translation by Andrey Korotaev (unC0Rr(a)inbox.ru) & Aleksey Bragin (aleksey(a)reactos.org) & Kudratov Olimjon (olim98(a)bk.ru)*/ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2005 Andrey Korotaev <unC0Rr(a)inbox.ru> + * Copyright 2005 Aleksey Bragin <aleksey(a)reactos.org> + * Copyright 2011 Sergey Shamanaev (seven_ro) <seven_s(a)mail.ru> + * Copyright 2014 Kudratov Olimjon <olim98(a)bk.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Вывод и изменение атрибутов файлов.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ [/S [/D]]\n\n\ @@ -19,5 +26,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ /D Обработка и файлов, и папок.\n\n\ Команда ATTRIB без параметров выводит атрибуты всех файлов.\n" STRING_CONSOLE_ERROR "Неизвестная ошибка: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Неверный формат параметра - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/sk-SK.rc b/base/applications/cmdutils/attrib/lang/sk-SK.rc index e883b13c2e3..8e6ac6fbae3 100644 --- a/base/applications/cmdutils/attrib/lang/sk-SK.rc +++ b/base/applications/cmdutils/attrib/lang/sk-SK.rc @@ -1,14 +1,14 @@ -/* Slovak translation for CMD - * TRANSLATOR: Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 21-03-2009 - * LastChange: 10-08-2010 +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATORS: Copyright 2009-2010 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -23,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Processes directories as well\n\n\ Type ATTRIB without a parameter to display the attributes of all files.\n" STRING_CONSOLE_ERROR "Neznáma chyba: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/sq-AL.rc b/base/applications/cmdutils/attrib/lang/sq-AL.rc index 519a5bd5819..46c6bccf59e 100644 --- a/base/applications/cmdutils/attrib/lang/sq-AL.rc +++ b/base/applications/cmdutils/attrib/lang/sq-AL.rc @@ -1,12 +1,14 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 -*/ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATORS: Copyright 2013 Ardit Dani <ardit.dani(a)gmail.com> + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Shfaq ose ndryshu atributet e dokumentave.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ @@ -21,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ /D Proçeso skedat gjithashtu\n\n\ Shkruaj ATTRIB pa një parameter për të shfaque atributet e të gjithë dokumentave.\n" STRING_CONSOLE_ERROR "Error i paditur: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Parametrat e formatit invalid - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/sv-SE.rc b/base/applications/cmdutils/attrib/lang/sv-SE.rc index 2406f5316b1..d3918e88bc8 100644 --- a/base/applications/cmdutils/attrib/lang/sv-SE.rc +++ b/base/applications/cmdutils/attrib/lang/sv-SE.rc @@ -1,8 +1,14 @@ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Swedish resource file + * TRANSLATORS: Copyright 2011 Olaf Siejka <caemyr(a)gmail.com> + */ + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Visar eller ändrar filattributen.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ [/S [/D]]\n\n\ @@ -17,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ /D Bearbetar även mappar.\n\n\ Skriv ATTRIB utan parametrar för att visa attributten för alla filer.\n" STRING_CONSOLE_ERROR "Okänt fel: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Ogiltigt parameterformat - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/tr-TR.rc b/base/applications/cmdutils/attrib/lang/tr-TR.rc index 6d94410e438..004b2abd312 100644 --- a/base/applications/cmdutils/attrib/lang/tr-TR.rc +++ b/base/applications/cmdutils/attrib/lang/tr-TR.rc @@ -1,10 +1,14 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "Dosya bulunamadı - '%s'\n" STRING_ATTRIB_HELP "Dosya öz niteliklerini görüntüler ya da değiştirir.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] dosya ...\n\ [/S [/D]]\n\n\ @@ -19,5 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] dosya ...\n\ Tüm dosyaların öz niteliklerini görüntülemek için bir değişken olmadan ATTRIB\n\ yazınız.\n" STRING_CONSOLE_ERROR "Bilinmeyen hata: %d\n" + STRING_FILE_NOT_FOUND "Dosya bulunamadı - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Geçersiz değişken biçimi - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/uk-UA.rc b/base/applications/cmdutils/attrib/lang/uk-UA.rc index 957e589f2d1..d8b00bbecff 100644 --- a/base/applications/cmdutils/attrib/lang/uk-UA.rc +++ b/base/applications/cmdutils/attrib/lang/uk-UA.rc @@ -1,16 +1,15 @@ /* - * PROJECT: Command-line interface - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/shell/cmd/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Command-line interface - * TRANSLATORS: Artem Reznikov, Igor Paliychuk + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATORS: Copyright 2006 Artem Reznikov <temarez(a)yandex.ru> + * Copyright 2011 Igor Paliychuk <mansonigor(a)gmail.com> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Відображення або зміна атрибутів файлу.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ [/S [/D]]\n\n\ @@ -25,5 +24,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ /D Обробка також i тек\n\n\ Введiть ATTRIB без параметра, щоб вивести атрибути всiх файлiв.\n" STRING_CONSOLE_ERROR "Невiдома помилка: %d\n" + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "Невiрний формат параметра - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/zh-CN.rc b/base/applications/cmdutils/attrib/lang/zh-CN.rc index 1833b74e810..96e311ea09f 100644 --- a/base/applications/cmdutils/attrib/lang/zh-CN.rc +++ b/base/applications/cmdutils/attrib/lang/zh-CN.rc @@ -1,10 +1,14 @@ -/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ +/* + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "找不到文件 - “%s”\n" STRING_ATTRIB_HELP "显示或更改文件属性。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 文件 ...\n\ [/S [/D]]\n\n\ @@ -18,5 +22,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 文件 ...\n\ /D 同时处理目录\n\n\ 执行不带参数的 ATTRIB 将会显示所有文件的属性。\n" STRING_CONSOLE_ERROR "未知错误：%d\n" + STRING_FILE_NOT_FOUND "找不到文件 - “%s”\n" STRING_ERROR_INVALID_PARAM_FORMAT "无效的参数格式 - %s\n" END diff --git a/base/applications/cmdutils/attrib/lang/zh-TW.rc b/base/applications/cmdutils/attrib/lang/zh-TW.rc index 546bf5aa5ab..988373cd2f5 100644 --- a/base/applications/cmdutils/attrib/lang/zh-TW.rc +++ b/base/applications/cmdutils/attrib/lang/zh-TW.rc @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Attribute Command + * PROJECT: ReactOS Attrib Command * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Chinese (Traditional) resource file * TRANSLATORS: Copyright 2016 Henry Tang Ih <henrytang2(a)hotmail.com> @@ -11,7 +11,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "找不到檔案 - '%s'\n" STRING_ATTRIB_HELP "顯示或更改檔案屬性。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 檔案 ...\n\ [/S [/D]]\n\n\ @@ -25,5 +24,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 檔案 ...\n\ /D 同時處理目錄\n\n\ 執行不帶參數的 ATTRIB 將會顯示所有檔案的屬性。\n" STRING_CONSOLE_ERROR "未知的錯誤：%d\n" + STRING_FILE_NOT_FOUND "找不到檔案 - '%s'\n" STRING_ERROR_INVALID_PARAM_FORMAT "無效的參數格式 - %s\n" END

1 0

[reactos] 02/02: [NTOS:LPC] Ensure debug-traced pointer-given user-mode data is captured. (#4399)
by Hermès Bélusca-Maïto 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3c55b9e6c9b0f62142f7… commit b3c55b9e6c9b0f62142f7dbe3e3059f3f81c7f0d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 20 22:55:06 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 17 17:40:37 2023 +0200 [NTOS:LPC] Ensure debug-traced pointer-given user-mode data is captured. (#4399) CORE-18098 --- ntoskrnl/lpc/connect.c | 64 ++++++++++++++++++++++++++++++++++---------------- ntoskrnl/lpc/create.c | 21 ++++++++++++----- ntoskrnl/lpc/send.c | 27 +++++++++++---------- 3 files changed, 74 insertions(+), 38 deletions(-) diff --git a/ntoskrnl/lpc/connect.c b/ntoskrnl/lpc/connect.c index d1f2426ef73..69dff778ab4 100644 --- a/ntoskrnl/lpc/connect.c +++ b/ntoskrnl/lpc/connect.c @@ -90,6 +90,9 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, NTSTATUS Status = STATUS_SUCCESS; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD Thread = PsGetCurrentThread(); +#if DBG + UNICODE_STRING CapturedPortName; +#endif SECURITY_QUALITY_OF_SERVICE CapturedQos; PORT_VIEW CapturedClientView; PSID CapturedServerSid; @@ -105,13 +108,6 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, PTOKEN_USER TokenUserInfo; PAGED_CODE(); - LPCTRACE(LPC_CONNECT_DEBUG, - "Name: %wZ. SecurityQos: %p. Views: %p/%p. Sid: %p\n", - PortName, - SecurityQos, - ClientView, - ServerView, - ServerSid); /* Check if the call comes from user mode */ if (PreviousMode != KernelMode) @@ -141,7 +137,6 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, /* Invalid size */ _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } - } /* Capture the server view */ @@ -172,7 +167,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, ProbeForWrite(ConnectionInformation, ConnectionInfoLength, sizeof(ULONG)); CapturedServerSid = ServerSid; - if (ServerSid != NULL) + if (ServerSid) { /* Capture it */ Status = SepCaptureSid(ServerSid, @@ -231,6 +226,21 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, CapturedServerSid = ServerSid; } +#if DBG + /* Capture the port name for DPRINT only - ObReferenceObjectByName does + * its own capture. As it is used only for debugging, ignore any failure; + * the string is zeroed out in such case. */ + ProbeAndCaptureUnicodeString(&CapturedPortName, PreviousMode, PortName); + + LPCTRACE(LPC_CONNECT_DEBUG, + "Name: %wZ. SecurityQos: %p. Views: %p/%p. Sid: %p\n", + &CapturedPortName, + SecurityQos, + ClientView, + ServerView, + ServerSid); +#endif + /* Get the port */ Status = ObReferenceObjectByName(PortName, 0, @@ -242,7 +252,10 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, (PVOID*)&Port); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reference port '%wZ': 0x%lx\n", PortName, Status); +#if DBG + DPRINT1("Failed to reference port '%wZ': 0x%lx\n", &CapturedPortName, Status); + ReleaseCapturedUnicodeString(&CapturedPortName, PreviousMode); +#endif if (CapturedServerSid != ServerSid) SepReleaseSid(CapturedServerSid, PreviousMode, TRUE); @@ -253,7 +266,10 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, /* This has to be a connection port */ if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT) { - DPRINT1("Port '%wZ' is not a connection port (Flags: 0x%lx)\n", PortName, Port->Flags); +#if DBG + DPRINT1("Port '%wZ' is not a connection port (Flags: 0x%lx)\n", &CapturedPortName, Port->Flags); + ReleaseCapturedUnicodeString(&CapturedPortName, PreviousMode); +#endif /* It isn't, so fail */ ObDereferenceObject(Port); @@ -282,7 +298,9 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!RtlEqualSid(CapturedServerSid, TokenUserInfo->User.Sid)) { /* Fail */ - DPRINT1("Port '%wZ': server SID mismatch\n", PortName); +#if DBG + DPRINT1("Port '%wZ': server SID mismatch\n", &CapturedPortName); +#endif Status = STATUS_SERVER_SID_MISMATCH; } @@ -293,21 +311,27 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, else { /* Invalid SID */ - DPRINT1("Port '%wZ': server SID mismatch\n", PortName); +#if DBG + DPRINT1("Port '%wZ': server SID mismatch\n", &CapturedPortName); +#endif Status = STATUS_SERVER_SID_MISMATCH; } /* Finally release the captured SID, we don't need it anymore */ if (CapturedServerSid != ServerSid) SepReleaseSid(CapturedServerSid, PreviousMode, TRUE); + } - /* Check if SID failed */ - if (!NT_SUCCESS(Status)) - { - /* Quit */ - ObDereferenceObject(Port); - return Status; - } +#if DBG + ReleaseCapturedUnicodeString(&CapturedPortName, PreviousMode); +#endif + + /* Check if SID failed */ + if (ServerSid && !NT_SUCCESS(Status)) + { + /* Quit */ + ObDereferenceObject(Port); + return Status; } /* Create the client port */ diff --git a/ntoskrnl/lpc/create.c b/ntoskrnl/lpc/create.c index aaa5ed70518..7c017b6b7e1 100644 --- a/ntoskrnl/lpc/create.c +++ b/ntoskrnl/lpc/create.c @@ -50,11 +50,13 @@ LpcpCreatePort(OUT PHANDLE PortHandle, NTSTATUS Status; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); UNICODE_STRING CapturedObjectName, *ObjectName; +#if DBG + UNICODE_STRING CapturedPortName; +#endif PLPCP_PORT_OBJECT Port; HANDLE Handle; PAGED_CODE(); - LPCTRACE(LPC_CREATE_DEBUG, "Name: %wZ\n", ObjectAttributes->ObjectName); RtlInitEmptyUnicodeString(&CapturedObjectName, NULL, 0); @@ -70,10 +72,7 @@ LpcpCreatePort(OUT PHANDLE PortHandle, ProbeForRead(ObjectAttributes, sizeof(*ObjectAttributes), sizeof(ULONG)); ObjectName = ((volatile OBJECT_ATTRIBUTES*)ObjectAttributes)->ObjectName; if (ObjectName) - { - ProbeForRead(ObjectName, sizeof(*ObjectName), 1); - CapturedObjectName = *(volatile UNICODE_STRING*)ObjectName; - } + CapturedObjectName = ProbeForReadUnicodeString(ObjectName); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -88,10 +87,20 @@ LpcpCreatePort(OUT PHANDLE PortHandle, CapturedObjectName = *(ObjectAttributes->ObjectName); } - /* Normalize the buffer pointer in case we don't have a name */ + /* Normalize the buffer pointer in case we don't have + * a name, for initializing an unconnected port. */ if (CapturedObjectName.Length == 0) CapturedObjectName.Buffer = NULL; +#if DBG + /* Capture the port name for DPRINT only - ObCreateObject does its + * own capture. As it is used only for debugging, ignore any failure; + * the string is zeroed out in such case. */ + ProbeAndCaptureUnicodeString(&CapturedPortName, PreviousMode, &CapturedObjectName); + LPCTRACE(LPC_CREATE_DEBUG, "Name: %wZ\n", &CapturedPortName); + ReleaseCapturedUnicodeString(&CapturedPortName, PreviousMode); +#endif + /* Create the Object */ Status = ObCreateObject(PreviousMode, LpcPortObjectType, diff --git a/ntoskrnl/lpc/send.c b/ntoskrnl/lpc/send.c index d6b22063014..317ad1e4563 100644 --- a/ntoskrnl/lpc/send.c +++ b/ntoskrnl/lpc/send.c @@ -449,11 +449,6 @@ NtRequestPort(IN HANDLE PortHandle, PLPCP_MESSAGE Message; PAGED_CODE(); - LPCTRACE(LPC_SEND_DEBUG, - "Handle: %p. Message: %p. Type: %lx\n", - PortHandle, - LpcRequest, - LpcpGetMessageType(LpcRequest)); /* Check if the call comes from user mode */ if (PreviousMode != KernelMode) @@ -476,6 +471,12 @@ NtRequestPort(IN HANDLE PortHandle, CapturedLpcRequest = *LpcRequest; } + LPCTRACE(LPC_SEND_DEBUG, + "Handle: %p. Message: %p. Type: %lx\n", + PortHandle, + LpcRequest, + LpcpGetMessageType(&CapturedLpcRequest)); + /* Get the message type */ MessageType = CapturedLpcRequest.u2.s2.Type | LPC_DATAGRAM; @@ -709,15 +710,10 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle, PLPCP_DATA_INFO DataInfo; PAGED_CODE(); - LPCTRACE(LPC_SEND_DEBUG, - "Handle: %p. Messages: %p/%p. Type: %lx\n", - PortHandle, - LpcRequest, - LpcReply, - LpcpGetMessageType(LpcRequest)); /* Check if the thread is dying */ - if (Thread->LpcExitThreadCalled) return STATUS_THREAD_IS_TERMINATING; + if (Thread->LpcExitThreadCalled) + return STATUS_THREAD_IS_TERMINATING; /* Check for user mode access */ if (PreviousMode != KernelMode) @@ -757,6 +753,13 @@ NtRequestWaitReplyPort(IN HANDLE PortHandle, } } + LPCTRACE(LPC_SEND_DEBUG, + "Handle: %p. Messages: %p/%p. Type: %lx\n", + PortHandle, + LpcRequest, + LpcReply, + LpcpGetMessageType(&CapturedLpcRequest)); + /* This flag is undocumented. Remove it before continuing */ CapturedLpcRequest.u2.s2.Type &= ~0x4000;

1 0

[reactos] 01/02: [NTOS:LPC] Turn a DPRINT1 into an LPCTRACE. (#4399)
by Hermès Bélusca-Maïto 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4d572a4322bfbacb165e… commit e4d572a4322bfbacb165e8f84a843ad16e1d2fe3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 20 22:53:25 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 17 17:40:29 2023 +0200 [NTOS:LPC] Turn a DPRINT1 into an LPCTRACE. (#4399) CORE-18098 --- ntoskrnl/lpc/complete.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/lpc/complete.c b/ntoskrnl/lpc/complete.c index d33a38dff36..ac22cd8bf68 100644 --- a/ntoskrnl/lpc/complete.c +++ b/ntoskrnl/lpc/complete.c @@ -59,6 +59,7 @@ NtAcceptConnectPort(OUT PHANDLE PortHandle, LARGE_INTEGER SectionOffset; PAGED_CODE(); + LPCTRACE(LPC_COMPLETE_DEBUG, "Context: %p. Message: %p. Accept: %lx. Views: %p/%p\n", PortContext, @@ -306,10 +307,11 @@ NtAcceptConnectPort(OUT PHANDLE PortHandle, /* Otherwise, quit */ ObDereferenceObject(ServerPort); DPRINT1("Client section mapping failed: %lx\n", Status); - DPRINT1("View base, offset, size: %p %lx %p\n", - ServerPort->ClientSectionBase, - ConnectMessage->ClientView.ViewSize, - SectionOffset); + LPCTRACE(LPC_COMPLETE_DEBUG, + "View base, offset, size: %p %lx %p\n", + ServerPort->ClientSectionBase, + ConnectMessage->ClientView.ViewSize, + SectionOffset); goto Cleanup; } }

1 0

[reactos] 02/02: [KERNEL32] CreateProcessInternalW: Initialize uninitialized ClientId.
by Hermès Bélusca-Maïto 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbae866df3c6f2f9b7a0f… commit cbae866df3c6f2f9b7a0f5362debcbf11c253f1c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 17 15:48:10 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 17 16:17:42 2023 +0200 [KERNEL32] CreateProcessInternalW: Initialize uninitialized ClientId. This situation happens when either of the two "goto VdmShortCircuit;" code paths are taken when starting a DOS or WoW16 app. --- dll/win32/kernel32/client/proc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 6a9fc1087ab..5a8c78c1364 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -2353,6 +2353,7 @@ CreateProcessInternalW(IN HANDLE hUserToken, SectionHandle = NULL; ProcessHandle = NULL; ThreadHandle = NULL; + ClientId.UniqueProcess = ClientId.UniqueThread = 0; BaseAddress = (PVOID)1; /* Zero out initial SxS and Application Compatibility state */

1 0

[reactos] 01/02: [KERNEL32] Minor comments improvements in CreateProcessInternalW.
by Hermès Bélusca-Maïto 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cbcc4ac5cf94f853aeb5… commit 1cbcc4ac5cf94f853aeb5e33ee8589c824a6e2e5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 17 13:56:12 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 17 16:17:38 2023 +0200 [KERNEL32] Minor comments improvements in CreateProcessInternalW. --- dll/win32/kernel32/client/proc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 22f29ca4bba..6a9fc1087ab 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -2222,8 +2222,8 @@ ProcessIdToSessionId(IN DWORD dwProcessId, } -#define AddToHandle(x,y) (x) = (HANDLE)((ULONG_PTR)(x) | (y)); -#define RemoveFromHandle(x,y) (x) = (HANDLE)((ULONG_PTR)(x) & ~(y)); +#define AddToHandle(x,y) ((x) = (HANDLE)((ULONG_PTR)(x) | (y))) +#define RemoveFromHandle(x,y) ((x) = (HANDLE)((ULONG_PTR)(x) & ~(y))) C_ASSERT(PROCESS_PRIORITY_CLASS_REALTIME == (PROCESS_PRIORITY_CLASS_HIGH + 1)); /* @@ -4279,13 +4279,12 @@ StartScan: } } - /* For all apps, if this flag is on, the hourglass mouse cursor is shown */ + /* For all apps, if this flag is on, the hourglass mouse cursor is shown. + * Likewise, the opposite holds as well, and no-feedback has precedence. */ if (StartupInfo.dwFlags & STARTF_FORCEONFEEDBACK) { AddToHandle(CreateProcessMsg->ProcessHandle, 1); } - - /* Likewise, the opposite holds as well */ if (StartupInfo.dwFlags & STARTF_FORCEOFFFEEDBACK) { RemoveFromHandle(CreateProcessMsg->ProcessHandle, 1); @@ -4297,8 +4296,8 @@ StartScan: /* And if it really is a VDM app... */ if (VdmBinaryType) { - /* Store the task ID and VDM console handle */ - CreateProcessMsg->hVDM = VdmTask ? 0 : Peb->ProcessParameters->ConsoleHandle; + /* Store the VDM console handle (none if inherited or WOW app) and the task ID */ + CreateProcessMsg->hVDM = VdmTask ? NULL : Peb->ProcessParameters->ConsoleHandle; CreateProcessMsg->VdmTask = VdmTask; } else if (VdmReserve) @@ -4410,10 +4409,9 @@ VdmShortCircuit: } else { - /* OR-in the special flag to indicate this is not a separate VDM */ + /* OR-in the special flag to indicate this is not a separate VDM, + * and return the handle to the caller */ AddToHandle(VdmWaitObject, 1); - - /* Return handle to the caller */ lpProcessInformation->hProcess = VdmWaitObject; } @@ -4524,7 +4522,7 @@ Quickie: if (ThreadHandle) { /* So kill the process and close the thread handle */ - NtTerminateProcess(ProcessHandle, 0); + NtTerminateProcess(ProcessHandle, STATUS_SUCCESS); NtClose(ThreadHandle); }

1 0

[reactos] 01/01: [TASKMGR] Add status bar description for "Properties" and "Open File Location" menu items (#5280)
by Thamatip Chitpong 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56e93b882d0c576a1b649… commit 56e93b882d0c576a1b6497a2adf8110801074f88 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed May 17 17:41:28 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 17 12:41:28 2023 +0200 [TASKMGR] Add status bar description for "Properties" and "Open File Location" menu items (#5280) Also fix access key collision for en-US/el-GR. --- base/applications/taskmgr/lang/bg-BG.rc | 2 ++ base/applications/taskmgr/lang/cs-CZ.rc | 2 ++ base/applications/taskmgr/lang/da-DK.rc | 2 ++ base/applications/taskmgr/lang/de-DE.rc | 2 ++ base/applications/taskmgr/lang/el-GR.rc | 4 +++- base/applications/taskmgr/lang/en-US.rc | 4 +++- base/applications/taskmgr/lang/es-ES.rc | 2 ++ base/applications/taskmgr/lang/et-EE.rc | 2 ++ base/applications/taskmgr/lang/fr-FR.rc | 2 ++ base/applications/taskmgr/lang/he-IL.rc | 2 ++ base/applications/taskmgr/lang/hu-HU.rc | 2 ++ base/applications/taskmgr/lang/id-ID.rc | 2 ++ base/applications/taskmgr/lang/it-IT.rc | 2 ++ base/applications/taskmgr/lang/ja-JP.rc | 2 ++ base/applications/taskmgr/lang/ko-KR.rc | 2 ++ base/applications/taskmgr/lang/nl-NL.rc | 2 ++ base/applications/taskmgr/lang/no-NO.rc | 2 ++ base/applications/taskmgr/lang/pl-PL.rc | 2 ++ base/applications/taskmgr/lang/pt-BR.rc | 2 ++ base/applications/taskmgr/lang/pt-PT.rc | 2 ++ base/applications/taskmgr/lang/ro-RO.rc | 2 ++ base/applications/taskmgr/lang/ru-RU.rc | 2 ++ base/applications/taskmgr/lang/sk-SK.rc | 2 ++ base/applications/taskmgr/lang/sq-AL.rc | 2 ++ base/applications/taskmgr/lang/sv-SE.rc | 2 ++ base/applications/taskmgr/lang/tr-TR.rc | 2 ++ base/applications/taskmgr/lang/uk-UA.rc | 2 ++ base/applications/taskmgr/lang/zh-CN.rc | 2 ++ base/applications/taskmgr/lang/zh-HK.rc | 2 ++ base/applications/taskmgr/lang/zh-TW.rc | 2 ++ 30 files changed, 62 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 21769152a3e..f59e380b5c0 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Дава на действието ОБИКНОВЕНО първенство" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Дава на действието ПОНИЖЕНО първенство" ID_PROCESS_PAGE_SETPRIORITY_LOW "Дава на действието НИСКО първенство" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 2d308767205..5a98f7782c0 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Přiřadí procesu normální prioritu" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Přiřadí procesu podprůměrnou prioritu" ID_PROCESS_PAGE_SETPRIORITY_LOW "Přiřadí procesu nízkou prioritu" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index fb98f06e6a3..8c5f42f8df6 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sæt proces til Normal Priotet Klasse" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sæt proces til Under Normal Priotet Klasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sæt proces til Lav Priotet Klasse" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 2e7bb38b5e8..365544b3df4 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Legt die Priorität auf NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Legt die Priorität auf NIEDRIGER ALS NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_LOW "Legt die Priorität auf NIEDRIG fest." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 71bc45c53df..7f5c18169e8 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -127,7 +127,7 @@ BEGIN MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Set &Priority" + POPUP "Set P&riority" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sets process to the NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index d82f341ec09..e05a4580a8b 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -125,7 +125,7 @@ BEGIN MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Set &Priority" + POPUP "Set P&riority" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -377,6 +377,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sets process to the NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index bf23377607a..10db2eba609 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Establece el proceso en prioridad NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Establece el proceso en prioridad ABAJO DE LO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Establece el proceso en prioridad BAJA" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 58227163024..a3e698d294a 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -384,6 +384,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sätib protsessi keskmisele prioriteedile" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "SSätib protsessi alla keskmise prioriteedile" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sätib protsessi madalals prioriteedile" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 232dcc5432b..1e599893fbd 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Place le processus dans la priorité NORMALE" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Place le processus dans la priorité INFÉRIRIEURE À LA NORMALE" ID_PROCESS_PAGE_SETPRIORITY_LOW "Place le processus dans la priorité BASSE" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 5d6aeb681be..12b3cdac78b 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sets process to the NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 5d83099f012..57915b3d3be 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Normál prioritásra állítja a folyamatot" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Normál alatti prioritásra állítja a folyamatot" ID_PROCESS_PAGE_SETPRIORITY_LOW "Alacsony prioritásra állítja a folyamatot" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index 1387c83d940..d9d4ec45847 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Menyetel proses ke kelas prioritas NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Menyetel proses ke kelas prioritas DI BAWAH NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Menyetel proses ke kelas prioritas RENDAH" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index db9b4270173..e23bf0e4e39 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Assegna al processo la classe di priorità NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Assegna al processo la classe di priorità BELOW NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Assegna al processo la classe di priorità LOW" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index 955c7395db6..081e4e07d5f 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "プロセスを通常優先度クラスに設定します" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "プロセスを通常以下の優先度クラスに設定します" ID_PROCESS_PAGE_SETPRIORITY_LOW "プロセスを低優先度クラスに設定します" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index 8126980baa4..2f949c9fd6e 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "프로세스 우선 순위를 보통으로 설정합니다" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "프로세스 우선 순위를 보통 미만으로 설정합니다" ID_PROCESS_PAGE_SETPRIORITY_LOW "프로세스 우선 순위를 낮음으로 설정합니다" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 26b7b584183..163e534191e 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Het proces wordt ingesteld met de prioriteitsklasse NORMAAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Proces instellen op prioriteitsklasse LAGER DAN NORMAAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Het proces wordt ingesteld met de prioriteitsklasse LAAG" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 4c542911408..6dbc5dfb5d6 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sett prosess til NORMAL prioritet klasse" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sett prosess til NEDENFOR NORMAL prioritet klasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sett prosess til LAV prioritet klasse" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index dd883054ff5..6f120d77a51 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -387,6 +387,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Ustawia procesowi priorytet normalny" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Ustawia procesowi priorytet poniżej normalnego" ID_PROCESS_PAGE_SETPRIORITY_LOW "Ustawia procesowi priorytet niski" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index 4457dd7c0ab..6a6b15667aa 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Define o processo como tendo classe de prioridade NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Define o processo com a classe de prioridade ABAIXO DO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Define o processo como tendo classe de prioridade BAIXA" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 635ee17ddbe..4457e784dd2 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Define o processo como tendo classe de prioridade NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Define o processo com a classe de prioridade ABAIXO DO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Define o processo como tendo classe de prioridade BAIXA" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 1170b13ae94..85e91a68f48 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -385,6 +385,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Desemnează prioritate ordinară." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Desemnează regim neprioritar." ID_PROCESS_PAGE_SETPRIORITY_LOW "Desemnează prioritate minimă." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index eff0e54ff3b..61d49828887 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Установить для процесса Средний приоритет" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Установить для процесса приоритет Ниже среднего" ID_PROCESS_PAGE_SETPRIORITY_LOW "Установить для процесса Низкий приоритет" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 6e8044c3560..0e8caf1dad3 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Zaradí proces do triedy priorít NORMÁLNA." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Zaradí proces do triedy priorít ZNÍŽENÁ." ID_PROCESS_PAGE_SETPRIORITY_LOW "Zaradí proces do triedy priorít NÍZKA." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index af1a2d67e34..78e491efa73 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Vendos procesin ne klasat e prioritet NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Vendos procesin ne klasat e prioritet BELOW NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Vendos procesin ne klasat e prioritet LOW" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 510200c45b8..9f24ef57b84 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Ändrar processens prioritet till normal" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Ändrar processens prioritet till under normal" ID_PROCESS_PAGE_SETPRIORITY_LOW "Ändrar processens prioritet till låg" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index 72cf3c41e9c..329fa026f32 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "İşlemi NORMAL öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "İşlemi NORMAL ALTI öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_LOW "İşlemi DÜŞÜK öncelik sınıfına getirir." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 0a5664b9990..04fad1c41b6 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Установлює клас пріоритету ""Середній"" для процесу" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Установлює клас пріоритету ""Нижче середнього"" для процесу" ID_PROCESS_PAGE_SETPRIORITY_LOW "Установлює клас пріоритету ""Низький"" для процесу" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 5d00256f112..59b69ceaae4 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -386,6 +386,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "将进程设置为正常优先级" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "将进程设置为低于正常优先级" ID_PROCESS_PAGE_SETPRIORITY_LOW "将进程设置为低优先级" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index 2c0a99f8852..95e97208e4c 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -387,6 +387,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "設定處理程序優先順序為標準" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "設定處理程序優先順序為低於標準" ID_PROCESS_PAGE_SETPRIORITY_LOW "設定處理程序優先順序為低" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 3f8f0746b27..e9dda1201ea 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -387,6 +387,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "設定處理程序優先順序為中等" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "設定處理程序優先順序為中等以下" ID_PROCESS_PAGE_SETPRIORITY_LOW "設定處理程序優先順序為低" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE

1 0

[reactos] 01/01: [NTOS:KE/x64] Fix KiConvertToGuiThread
by Timo Kreuzer 16 May '23

16 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15fbcc19b9e18115ce649… commit 15fbcc19b9e18115ce649955a6291ecfd1b8ce53 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed May 10 20:28:20 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue May 16 22:03:13 2023 +0300 [NTOS:KE/x64] Fix KiConvertToGuiThread - Do not allocate a new stack, if the thread already has a large one. This prevents the function from freeing a large stack as a normal stack and subsequently leaking system PTEs. - Fix the check for failure of PsConvertToGuiThread (test eax, not rax, for being negative, because by default rax is zero extended from eax, not sign extended). This fixes an infinite loop on failure. --- ntoskrnl/ke/amd64/trap.S | 13 ++++++++++--- sdk/include/asm/ksamd64.template.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 150d08d8133..082160893b4 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -1041,6 +1041,11 @@ FUNC KiConvertToGuiThread .allocstack 40 .endprolog + /* Check if we already have a large stack */ + mov rax, gs:[PcCurrentThread] + cmp byte ptr [rax + KTHREAD_LargeStack], 0 + jnz AlreadyLargeStack + // NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0); mov cl, 1 xor rdx, rdx @@ -1050,10 +1055,10 @@ FUNC KiConvertToGuiThread test rax, rax jz KiConvertToGuiThreadFailed - /* OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_STACK_SIZE)); */ + /* OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_LARGE_STACK_COMMIT )); */ mov rcx, rax mov rdx, rax - sub rdx, KERNEL_STACK_SIZE + sub rdx, KERNEL_LARGE_STACK_COMMIT call KeSwitchKernelStack // MmDeleteKernelStack(OldStack, FALSE); @@ -1061,11 +1066,13 @@ FUNC KiConvertToGuiThread xor rdx, rdx call MmDeleteKernelStack +AlreadyLargeStack: + /* Call the worker function */ call PsConvertToGuiThread /* Check for failure */ - test rax, rax + test eax, eax js KiConvertToGuiThreadFailed /* Disable interrupts for return */ diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 6fcb43149ea..db36c5767bc 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -1047,6 +1047,7 @@ OFFSET(KTHREAD_TrapFrame, KTHREAD, TrapFrame), OFFSET(KTHREAD_PreviousMode, KTHREAD, PreviousMode), OFFSET(KTHREAD_KernelStack, KTHREAD, KernelStack), OFFSET(KTHREAD_UserApcPending, KTHREAD, ApcState.UserApcPending), +OFFSET(KTHREAD_LargeStack, KTHREAD, LargeStack), HEADER("KINTERRUPT"), OFFSET(KINTERRUPT_Type, KINTERRUPT, Type),

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs