Ros-diffs May 2023

ros-diffs@reactos.org

16 participants
69 discussions

[reactos] 01/01: [UTILMAN] Add Portuguese (pt-PT) translation (#5290)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=636f2e3241795d85e11c4… commit 636f2e3241795d85e11c4b2fd073f8391d75d20c Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri May 19 04:27:19 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 19 10:27:19 2023 +0200 [UTILMAN] Add Portuguese (pt-PT) translation (#5290) --- base/applications/utilman/umandlg/lang/pt-PT.rc | 47 +++++++++++++++++++++++++ base/applications/utilman/umandlg/umandlg.rc | 3 ++ 2 files changed, 50 insertions(+) diff --git a/base/applications/utilman/umandlg/lang/pt-PT.rc b/base/applications/utilman/umandlg/lang/pt-PT.rc new file mode 100644 index 00000000000..ce097e870a0 --- /dev/null +++ b/base/applications/utilman/umandlg/lang/pt-PT.rc @@ -0,0 +1,47 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Portuguese (Portugal) translation resource + * COPYRIGHT: Copyright 2019-2020 George Bișoc (george.bisoc(a)reactos.org) + * TRANSLATED BY: Jose Carlos Jesus (zecarlos1957(a)hotmail.com) + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Gestor de Utilitários de Acessibilidade" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 + CONTROL "Iniciar", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "Parar", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "Iniciar automaticamente quando iniciar sessão.", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "Iniciar automaticamente quando bloqueio a área de trabalho.", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Iniciar automaticamente quando o Gestor de Utilitários é iniciado.", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 218, 13 + CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "&Cancelar", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "&Ajuda", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_OSK "Teclado no ecrã" + IDS_MAGNIFIER "Lupa" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "%s não está em execução" + IDS_RUNNING "%s está em execução" + IDS_GROUPBOX_OPTIONS_TITLE "Opções para %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "Acerca do Gestor de Utilitários de Acessibilidade..." + IDS_APP_NAME "Gestor de Utilitários de Acessibilidade" + IDS_AUTHORS "Copyright 2019 George Bișoc, Hermes Belusca-Maito" +END diff --git a/base/applications/utilman/umandlg/umandlg.rc b/base/applications/utilman/umandlg/umandlg.rc index 0d11d88128a..5bef849dc41 100644 --- a/base/applications/utilman/umandlg/umandlg.rc +++ b/base/applications/utilman/umandlg/umandlg.rc @@ -44,6 +44,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 year, 7 months

[reactos] 01/01: [FREELDR] Fix builds for PC-98 and Xbox platforms (#5275)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27c0f0e72de8ee8c5cf12… commit 27c0f0e72de8ee8c5cf12492fd43b007dd52c60a Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Fri May 19 00:05:50 2023 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 18 20:05:50 2023 +0200 [FREELDR] Fix builds for PC-98 and Xbox platforms (#5275) Fix broken build after UEFI support merge. Addendum to commit 150f72127. CORE-11954, CORE-16216, CORE-17977 Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- boot/boot_images.cmake | 56 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/boot/boot_images.cmake b/boot/boot_images.cmake index 6ceb37fee73..877cf28bb4a 100644 --- a/boot/boot_images.cmake +++ b/boot/boot_images.cmake @@ -4,7 +4,9 @@ if(ARCH STREQUAL "amd64") set(EFI_PLATFORM_ID "x64") elseif(ARCH STREQUAL "i386") - set(EFI_PLATFORM_ID "ia32") + if(NOT (SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox")) + set(EFI_PLATFORM_ID "ia32") + endif() elseif(ARCH STREQUAL "ia64") set(EFI_PLATFORM_ID "ia64") elseif(ARCH STREQUAL "arm") @@ -15,11 +17,17 @@ else() message(FATAL_ERROR "Unknown ARCH '" ${ARCH} "', cannot generate a valid UEFI boot filename.") endif() -add_custom_target(efisys - COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:uefildr> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi - DEPENDS native-fatten fat uefildr - VERBATIM) +if(DEFINED EFI_PLATFORM_ID) + add_custom_target(efisys + COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT + -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin + -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:uefildr> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi + DEPENDS native-fatten fat uefildr + VERBATIM) +endif() +# ISO image EFI boot parameters +set(ISO_EFI_BOOT_PARAMS) # Create an 'empty' directory (guaranteed to be empty) to be able to add # arbitrary empty directories to the ISO image using mkisofs. @@ -29,7 +37,10 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/empty) set(_isombr_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isombr.bin) # get_target_property(_isombr_file isombr LOCATION) set(_isoboot_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin) # get_target_property(_isoboot_file isoboot LOCATION) set(_isobtrt_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) # get_target_property(_isobtrt_file isobtrt LOCATION) -set(_efisys_file ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # get_target_property(_efisys_file efisys LOCATION) +if(DEFINED EFI_PLATFORM_ID) + set(_efisys_file ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # get_target_property(_efisys_file efisys LOCATION) + list(APPEND ISO_EFI_BOOT_PARAMS -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot) +endif() # Create a mkisofs sort file to specify an explicit ordering for the boot files # to place them at the beginning of the image (makes ISO image analysis easier). @@ -46,12 +57,15 @@ set(_efisys_file ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # get_target_property( # - since its contents are included by mkisofs in the root of the ISO image, # using the empty directory ensures that no extra unwanted files are added. # -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort "\ +set(ISO_SORT_FILE_DATA "\ ${CMAKE_CURRENT_BINARY_DIR}/empty/boot.catalog 4 ${_isoboot_file} 3 ${_isobtrt_file} 2 -${_efisys_file} 1 ") +if(DEFINED EFI_PLATFORM_ID) + string(APPEND ISO_SORT_FILE_DATA "${_efisys_file} 1\n") +endif() +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort ${ISO_SORT_FILE_DATA}) # ISO image identifier names set(ISO_MANUFACTURER "ReactOS Project") # For both the publisher and the preparer @@ -100,7 +114,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_ add_custom_target(bootcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog + -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 ${ISO_EFI_BOOT_PARAMS} -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso @@ -115,7 +129,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_ add_custom_target(bootcdregtest COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog + -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 ${ISO_EFI_BOOT_PARAMS} -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso @@ -134,7 +148,7 @@ add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "D add_custom_target(livecd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog + -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 ${ISO_EFI_BOOT_PARAMS} -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso @@ -153,19 +167,21 @@ add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Pro add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog + -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 ${ISO_EFI_BOOT_PARAMS} -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso DEPENDS bootcd livecd VERBATIM) -# For things like flashing USB drives, we also add the efi file into efi/boot. -add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) +if(DEFINED EFI_PLATFORM_ID) + # For things like flashing USB drives, we also add the efi file into efi/boot. + add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) -add_cd_file( - TARGET uefildr - DESTINATION efi/boot - NO_CAB - NAME_ON_CD boot${EFI_PLATFORM_ID}.efi - FOR livecd hybridcd) + add_cd_file( + TARGET uefildr + DESTINATION efi/boot + NO_CAB + NAME_ON_CD boot${EFI_PLATFORM_ID}.efi + FOR livecd hybridcd) +endif()

1 year, 7 months

[reactos] 01/01: [ATTRIB] Improve command-line parsing. (#5288)

by Hermès Bélusca-Maïto

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 year, 7 months

[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

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 year, 7 months

[reactos] 01/01: [ATTRIB] Simplify the ErrorMessage() function.

by Hermès Bélusca-Maïto

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 year, 7 months

[reactos] 01/01: [ATTRIB] Reorganize resource file headers.

by Hermès Bélusca-Maïto

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 year, 7 months

[reactos] 02/02: [NTOS:LPC] Ensure debug-traced pointer-given user-mode data is captured. (#4399)

by Hermès Bélusca-Maïto

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 year, 7 months

[reactos] 01/02: [NTOS:LPC] Turn a DPRINT1 into an LPCTRACE. (#4399)

by Hermès Bélusca-Maïto

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 year, 7 months

[reactos] 02/02: [KERNEL32] CreateProcessInternalW: Initialize uninitialized ClientId.

by Hermès Bélusca-Maïto

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 year, 7 months

[reactos] 01/02: [KERNEL32] Minor comments improvements in CreateProcessInternalW.

by Hermès Bélusca-Maïto

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 year, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2023