Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 08/29: [FREELDR] Save used register when calling PNPBIOS

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d55276aad9496fe820b01… commit d55276aad9496fe820b017f272c73b6bf53220a3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 14:16:49 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [FREELDR] Save used register when calling PNPBIOS --- boot/freeldr/freeldr/arch/amd64/pnpbios.S | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/pnpbios.S b/boot/freeldr/freeldr/arch/amd64/pnpbios.S index f97a9d8fb05..8dd44e933ca 100644 --- a/boot/freeldr/freeldr/arch/amd64/pnpbios.S +++ b/boot/freeldr/freeldr/arch/amd64/pnpbios.S @@ -104,7 +104,8 @@ pnp_not_found: PUBLIC PnpBiosGetDeviceNodeCount PnpBiosGetDeviceNodeCount: - /* Save param-regs */ + /* Save registers */ + push rbx push rcx push rdx @@ -115,6 +116,7 @@ PnpBiosGetDeviceNodeCount: /* Restore param-regs */ pop rdx pop rcx + pop rbx xor eax, eax mov ax, [BSS_PnpNodeSize] @@ -148,14 +150,16 @@ PnpBiosGetDeviceNode: and eax, HEX(0f) mov word ptr [BSS_PnpBiosBufferOffset], ax - /* Save rcx */ + /* Save registers */ push rcx + push rbx /* Call the real mode function */ mov bx, FNID_PnpBiosGetDeviceNode call CallRealMode - /* Restore rcx */ + /* Restore registers */ + pop rbx pop rcx /* update node number */

3 years, 4 months

[reactos] 07/29: [FREELDR] Force alignment of .text section on disk

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bf116359b5eadb163d2f… commit 2bf116359b5eadb163d2fee475cf2deff268eaeb Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 14:15:33 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [FREELDR] Force alignment of .text section on disk Fixes boot for clang & GCC-amd64 build Also rename freeldr_i386.lds to freeldr_gcc.lds for better clarity --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- boot/freeldr/freeldr/{freeldr_i386.lds => freeldr_gcc.lds} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 980265dd54a..a76ce3e45e9 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -293,9 +293,9 @@ if(MSVC) remove_target_compile_option(freeldr_common "/hotpatch") else() add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200") - add_linker_script(freeldr_pe freeldr_i386.lds) + add_linker_script(freeldr_pe freeldr_gcc.lds) add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200") - add_linker_script(freeldr_pe_dbg freeldr_i386.lds) + add_linker_script(freeldr_pe_dbg freeldr_gcc.lds) endif() set_image_base(freeldr_pe 0x10000) diff --git a/boot/freeldr/freeldr/freeldr_i386.lds b/boot/freeldr/freeldr/freeldr_gcc.lds similarity index 98% rename from boot/freeldr/freeldr/freeldr_i386.lds rename to boot/freeldr/freeldr/freeldr_gcc.lds index 56df8f63ee1..1488ea2ef53 100644 --- a/boot/freeldr/freeldr/freeldr_i386.lds +++ b/boot/freeldr/freeldr/freeldr_gcc.lds @@ -1,6 +1,6 @@ SECTIONS { - .text __image_base__ + __section_alignment__ : + .text __image_base__ + __section_alignment__ : ALIGN(__file_alignment__) { *(.text) *(SORT(.text*))

3 years, 4 months

[reactos] 06/29: [PSDK] Do not compare to max value if we can make sure that the value fits in target type

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7513cc9fca146b3da11b7… commit 7513cc9fca146b3da11b78160abe5c031bad9c89 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 10:28:11 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [PSDK] Do not compare to max value if we can make sure that the value fits in target type This fixes clang warning -Wtautological-constant-out-of-range-compare --- sdk/include/psdk/intsafe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index 2dc0954b152..6404ed33663 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -259,7 +259,7 @@ INTSAFE_NAME(_Name)( \ _In_ _TypeFrom Input, \ _Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \ { \ - if (Input <= _TypeTo ## _MAX) \ + if ((sizeof(_TypeFrom) < sizeof(_TypeTo)) || (Input <= _TypeTo ## _MAX)) \ { \ *pOutput = (_TypeTo)Input; \ return INTSAFE_SUCCESS; \

3 years, 4 months

[reactos] 05/29: [CRT] Add macros to disable diagnostics from GCC and clang

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4138329a14f75b2ab4ff… commit a4138329a14f75b2ab4fffed2d8fd24056a56db0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 10:07:35 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [CRT] Add macros to disable diagnostics from GCC and clang Instead of disabling them globally, this will help making finer grained decisions --- sdk/include/crt/crtdefs.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index 0162e7a46de..8ea3f85bdf5 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -38,6 +38,10 @@ #define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) #endif +#ifndef _CRT_DEFER_MACRO +#define _CRT_DEFER_MACRO(M,...) M(__VA_ARGS__) +#endif + #ifndef _CRT_WIDE #define __CRT_WIDE(_String) L ## _String #define _CRT_WIDE(_String) __CRT_WIDE(_String) @@ -440,4 +444,25 @@ typedef struct localeinfo_struct { #pragma pack(pop) +/* GCC-style diagnostics */ +#ifndef PRAGMA_DIAGNOSTIC_IGNORED +# ifdef __clang__ +# define PRAGMA_DIAGNOSTIC_PUSH() _Pragma("clang diagnostic push") +# define PRAGMA_DIAGNOSTIC_IGNORED(__x) \ + _Pragma(_CRT_STRINGIZE(clang diagnostic ignored _CRT_DEFER_MACRO(_CRT_STRINGIZE,__x))) +# define PRAGMA_DIAGNOSTIC_POP() _Pragma("clang diagnostic pop") +# elif defined (__GNUC__) +# define PRAGMA_DIAGNOSTIC_PUSH() _Pragma("GCC diagnostic push") +# define PRAGMA_DIAGNOSTIC_IGNORED(__x) \ + _Pragma("GCC diagnostic ignored \"-Wpragmas\"") /* This allows us to use it for unkonwn warnings */ \ + _Pragma(_CRT_STRINGIZE(GCC diagnostic ignored _CRT_DEFER_MACRO(_CRT_STRINGIZE,__x))) \ + _Pragma("GCC diagnostic error \"-Wpragmas\"") /* This makes sure that we don't have side effects because we disabled it for our own use. This will be popped anyway. */ +# define PRAGMA_DIAGNOSTIC_POP() _Pragma("GCC diagnostic pop") +# else +# define PRAGMA_DIAGNOSTIC_PUSH() +# define PRAGMA_DIAGNOSTIC_IGNORED(__x) +# define PRAGMA_DIAGNOSTIC_POP() +# endif +#endif + #endif /* !_INC_CRTDEFS */

3 years, 4 months

[reactos] 04/29: [SDK] Make sure we build pefixup with AMD64 definitions

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d1a21a9202380e371bae… commit 1d1a21a9202380e371bae200ee498dadefe6b2fc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 19:21:25 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [SDK] Make sure we build pefixup with AMD64 definitions --- sdk/tools/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index 3b6bf1368f0..3f836f8e9bf 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -40,5 +40,8 @@ if(NOT MSVC) add_subdirectory(rsym) add_host_tool(pefixup pefixup.c) +if (ARCH STREQUAL "amd64") + target_compile_definitions(pefixup PRIVATE _TARGET_PE64) +endif() target_link_libraries(pefixup PRIVATE host_includes) endif()

3 years, 4 months

[reactos] 03/29: [SDK] Fix definition of IMAGE_NT_HEADERS64 in host tools

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b513c61cd130b6e73ff7b… commit b513c61cd130b6e73ff7bb456edfd9aa7a41ec0d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 27 09:56:23 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [SDK] Fix definition of IMAGE_NT_HEADERS64 in host tools --- sdk/include/host/pecoff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/host/pecoff.h b/sdk/include/host/pecoff.h index 74104075fb6..f96982e910a 100644 --- a/sdk/include/host/pecoff.h +++ b/sdk/include/host/pecoff.h @@ -188,7 +188,7 @@ typedef struct _IMAGE_NT_HEADERS64 { DWORD Signature; IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; + IMAGE_OPTIONAL_HEADER64 OptionalHeader; } IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64; #ifdef _TARGET_PE64

3 years, 4 months

[reactos] 02/29: [COMPILER_APITEST] Disable SEH tests for GCC amd64 build

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79bc62f206ef78ef232ab… commit 79bc62f206ef78ef232ab6758f4e4bda30ca9473 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 16:52:53 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [COMPILER_APITEST] Disable SEH tests for GCC amd64 build --- modules/rostests/apitests/compiler/CMakeLists.txt | 12 +++++++++--- modules/rostests/apitests/compiler/testlist.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/compiler/CMakeLists.txt b/modules/rostests/apitests/compiler/CMakeLists.txt index 7bd2a6a6b22..1d98f54ddf6 100644 --- a/modules/rostests/apitests/compiler/CMakeLists.txt +++ b/modules/rostests/apitests/compiler/CMakeLists.txt @@ -1,15 +1,21 @@ -add_subdirectory(ms) +if (NOT (GCC AND (ARCH STREQUAL "amd64"))) + #FIXME _setjmp definitions in CRT headers is wrong + add_subdirectory(ms) + list(APPEND SOURCE ms_seh.c) +endif() list(APPEND SOURCE - ms_seh.c pseh.c pseh_cpp.cpp psehtest2.c testlist.c) add_executable(compiler_apitest ${SOURCE}) -target_link_libraries(compiler_apitest ms_seh_test wine ${PSEH_LIB}) +if (NOT (GCC AND (ARCH STREQUAL "amd64"))) + target_link_libraries(compiler_apitest ms_seh_test) +endif() +target_link_libraries(compiler_apitest wine ${PSEH_LIB}) set_module_type(compiler_apitest win32cui) add_importlibs(compiler_apitest msvcrt kernel32 ntdll) add_rostests_file(TARGET compiler_apitest) diff --git a/modules/rostests/apitests/compiler/testlist.c b/modules/rostests/apitests/compiler/testlist.c index f034cb93127..d73f7fd70bb 100644 --- a/modules/rostests/apitests/compiler/testlist.c +++ b/modules/rostests/apitests/compiler/testlist.c @@ -7,7 +7,9 @@ extern void func_pseh_cpp(void); const struct test winetest_testlist[] = { +#if !(defined(__GNUC__) && defined(_M_AMD64)) { "ms-seh", func_ms_seh }, +#endif { "pseh", func_pseh }, { "pseh_cpp", func_pseh_cpp }, { 0, 0 }

3 years, 4 months

[reactos] 01/29: [KERNEL32_APITEST] Fix compilation & global wut?? with SSE exception test

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0995b35bacf8f82063bd7… commit 0995b35bacf8f82063bd71dc966d9a1b127b3674 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 16:50:43 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [KERNEL32_APITEST] Fix compilation & global wut?? with SSE exception test --- .../kernel32/SetUnhandledExceptionFilter.c | 91 ++++++++++------------ 1 file changed, 42 insertions(+), 49 deletions(-) diff --git a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c index f3a8b1c1a85..ffce66c85bd 100644 --- a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c +++ b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c @@ -32,7 +32,7 @@ TestSetUnhandledExceptionFilter(VOID) ok(p2 != Filter2, "SetUnhandledExceptionFilter returned what was set, not prev\n"); ok(p2 == Filter1, "SetUnhandledExceptionFilter didn't return previous filter\n"); ok(p1 != p2, "SetUnhandledExceptionFilter seems to return random stuff\n"); - + p1 = SetUnhandledExceptionFilter(NULL); ok(p1 == Filter2, "SetUnhandledExceptionFilter didn't return previous filter\n"); } @@ -41,19 +41,19 @@ static LONG WINAPI ExceptionFilterSSESupport(LPEXCEPTION_POINTERS exp) { PEXCEPTION_RECORD rec = exp->ExceptionRecord; PCONTEXT ctx = exp->ContextRecord; - + trace("Exception raised while using SSE instructions.\n"); ok(rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION, "Exception code is 0x%08x.\n", (unsigned int)rec->ExceptionCode); - + if(rec->ExceptionCode != EXCEPTION_ILLEGAL_INSTRUCTION) { trace("Unexpected exception code, terminating!\n"); return EXCEPTION_EXECUTE_HANDLER; } - + ok((ctx->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL, "Context does not contain control register.\n"); - + #ifdef _M_IX86 ctx->Eip += 3; #elif defined(_M_AMD64) @@ -76,21 +76,21 @@ static LONG WINAPI ExceptionFilterSSEException(LPEXCEPTION_POINTERS exp) #else ULONG ExpectedExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; #endif - + trace("Exception raised while dividing by 0.\n"); - + ok(rec->ExceptionCode == ExpectedExceptionCode, "Exception code is 0x%08x.\n", (unsigned int)rec->ExceptionCode); - + if(rec->ExceptionCode != ExpectedExceptionCode) { trace("Unexpected exception code, terminating!\n"); return EXCEPTION_EXECUTE_HANDLER; } - + ok((ctx->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL, "Context does not contain control register.\n"); - + ExceptionCaught = TRUE; - + #ifdef _M_IX86 ctx->Eip += 3; #elif defined(_M_AMD64) @@ -102,50 +102,49 @@ static LONG WINAPI ExceptionFilterSSEException(LPEXCEPTION_POINTERS exp) return EXCEPTION_CONTINUE_EXECUTION; } -#ifdef __clang__ +#if defined(__clang__) || defined(__GNUC__) __attribute__((__target__("sse"))) #endif static VOID TestSSEExceptions(VOID) { LPTOP_LEVEL_EXCEPTION_FILTER p; - BOOL supportsSSE = FALSE; unsigned int csr; - + /* Test SSE support for the CPU */ p = SetUnhandledExceptionFilter(ExceptionFilterSSESupport); ok(p == NULL, "Previous filter should be NULL\n"); -#ifdef _MSC_VER -#if defined(_M_AMD64) - { - __m128 xmm = { { 0 } }; - xmm = _mm_xor_ps(xmm, xmm); - if (!ExceptionCaught) supportsSSE = TRUE; - } -#else - __asm + +#if !defined(_M_AMD64) { - xorps xmm0, xmm0 - mov supportsSSE, 0x1 - } -#endif + BOOL supportsSSE = FALSE; +#ifdef _MSC_VER + __asm + { + xorps xmm0, xmm0 + mov supportsSSE, 0x1 + } #else - __asm__( - "xorps %%xmm0, %%xmm0\n" - "movl $1, %0\n" - : "=r"(supportsSSE) - ); + __asm__( + "xorps %%xmm0, %%xmm0\n" + "movl $1, %0\n" + : "=r"(supportsSSE) + ); #endif /* _MSC_VER */ - if(!supportsSSE) - { - skip("CPU doesn't support SSE instructions.\n"); - SetUnhandledExceptionFilter(NULL); - return; + + if(!supportsSSE) + { + skip("CPU doesn't support SSE instructions.\n"); + SetUnhandledExceptionFilter(NULL); + return; + } } +#endif /* !defined(_M_AMD64) */ + /* Deliberately throw a divide by 0 exception */ p = SetUnhandledExceptionFilter(ExceptionFilterSSEException); ok(p == ExceptionFilterSSESupport, "Unexpected old filter : 0x%p", p); - + /* Unmask divide by 0 exception */ csr = _mm_getcsr(); _mm_setcsr(csr & 0xFFFFFDFF); @@ -157,7 +156,6 @@ VOID TestSSEExceptions(VOID) __m128 xmm1 = { { 1., 1. } }, xmm2 = { { 0 } }; /* Wait, aren't exceptions masked? Yes, but actually no. */ xmm1 = _mm_div_ps(xmm1, xmm2); - if (!ExceptionCaught) supportsSSE = TRUE; } #else __asm @@ -178,20 +176,15 @@ VOID TestSSEExceptions(VOID) } #endif #else + ULONG zeros[4] = {0, 0, 0, 0}; + ULONG ones[4] = {0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000}; __asm__ ( - "xorps %%xmm0, %%xmm0\n" - "pushl $0x3f800000\n" - "pushl $0x3f800000\n" - "pushl $0x3f800000\n" - "pushl $0x3f800000\n" - "movups (%%esp), %%xmm1\n" - + "movups (%0), %%xmm0\n" + "movups (%1), %%xmm1\n" /* Divide by 0 */ "divps %%xmm0, %%xmm1\n" - /* Clean up */ - "addl $16, %%esp\n" - : + : : "r"(&zeros), "r"(&ones) : "xmm0", "xmm1" ); #endif /* _MSC_VER */

3 years, 4 months

[reactos] 01/01: [ACPI] Improve Russian translation INF file

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4959ccc8df375cee47d20… commit 4959ccc8df375cee47d20d14d161da88ca767d1d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Apr 27 23:58:53 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Apr 27 23:58:53 2021 +0300 [ACPI] Improve Russian translation INF file Also some minor whitespace fixes --- drivers/bus/acpi/acpi.inf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/bus/acpi/acpi.inf b/drivers/bus/acpi/acpi.inf index 67e3dd0b3ef..145f561dfb1 100644 --- a/drivers/bus/acpi/acpi.inf +++ b/drivers/bus/acpi/acpi.inf @@ -68,6 +68,7 @@ GenericMfg = "(標準システムデバイス)" [Strings.0415] ReactOS = "Zespół ReactOS" + GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0C08.DeviceDesc = "Sprzęt ACPI" @@ -77,6 +78,7 @@ GenericMfg = "(Dispositivos de sistema padrão)" [Strings.0418] ReactOS = "Echipa ReactOS" + GenericMfg = "(dispozitiv de sistem generic)" *PNP0C08.DeviceDesc = "Dispozitive ACPI" @@ -84,7 +86,7 @@ GenericMfg = "(dispozitiv de sistem generic)" ReactOS = "Команда ReactOS" GenericMfg = "(Стандартные системные устройства)" -*PNP0C08.DeviceDesc = "ACPI устройства" +*PNP0C08.DeviceDesc = "Устройства ACPI" [Strings.041B] GenericMfg = "(Generické systémové zariadenia)" @@ -97,6 +99,8 @@ GenericMfg = "(Umûmî Dizge Aygıtları)" *PNP0C08.DeviceDesc = "ACPI Donanım" [Strings.0422] +ReactOS = "Команда ReactOS" + GenericMfg = "(Стандартні системні пристрої)" *PNP0C08.DeviceDesc = "Пристрої ACPI"

3 years, 4 months

[reactos] 01/01: [FC] Add Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea1f7249289c399a15f50… commit ea1f7249289c399a15f5053cc361737794ef38c8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Apr 27 18:40:23 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Apr 27 18:40:23 2021 +0300 [FC] Add Russian (ru-RU) translation Addendum to 2db87ebd. --- base/applications/cmdutils/fc/lang/ru-RU.rc | 66 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/base/applications/cmdutils/fc/lang/ru-RU.rc b/base/applications/cmdutils/fc/lang/ru-RU.rc index b3f0698943c..64d99eabc8f 100644 --- a/base/applications/cmdutils/fc/lang/ru-RU.rc +++ b/base/applications/cmdutils/fc/lang/ru-RU.rc @@ -2,40 +2,40 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_USAGE "Compares two files or sets of files and displays the differences between\n\ -them\n\ + IDS_USAGE "Сравнение двух файлов или двух наборов файлов\n\ +и вывод различий между ними\n\ \n\ FC [/A] [/C] [/L] [/LBn] [/N] [/OFF[LINE]] [/T] [/U] [/W] [/nnnn]\n\ - [drive1:][path1]filename1 [drive2:][path2]filename2\n\ -FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ + [диск1:][путь1]имя_файла1 [диск2:][путь2]имя_файла2\n\ +FC /B [диск1:][путь1]имя_файла1 [диск2:][путь2]имя_файла2\n\ \n\ - /A Displays only first and last lines for each set of differences.\n\ - /B Performs a binary comparison.\n\ - /C Disregards the case of letters.\n\ - /L Compares files as ASCII text.\n\ - /LBn Sets the maximum consecutive mismatches to the specified\n\ - number of lines (default: 100).\n\ - /N Displays the line numbers on an ASCII comparison.\n\ - /OFF[LINE] Doesn't skip files with offline attribute set.\n\ - /T Doesn't expand tabs to spaces (default: expand).\n\ - /U Compare files as UNICODE text files.\n\ - /W Compresses white space (tabs and spaces) for comparison.\n\ - /nnnn Specifies the number of consecutive lines that must match\n\ - after a mismatch (default: 2).\n\ - [drive1:][path1]filename1\n\ - Specifies the first file or set of files to compare.\n\ - [drive2:][path2]filename2\n\ - Specifies the second file or set of files to compare.\n" - IDS_NO_DIFFERENCE "FC: no differences encountered\n" - IDS_LONGER_THAN "FC: %ls longer than %ls\n" - IDS_COMPARING "Comparing files %ls and %ls\n" - IDS_OUT_OF_MEMORY "FC: Out of memory\n" - IDS_CANNOT_READ "FC: cannot read from %ls\n" - IDS_INVALID_SWITCH "FC: Invalid Switch\n" - IDS_CANNOT_OPEN "FC: cannot open %ls - No such file or folder\n" - IDS_NEEDS_FILES "FC: Insufficient number of file specifications\n" - IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" - IDS_DIFFERENT "FC: File %ls and %ls are different\n" - IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + /A Вывод только первой и последней строк для каждой группы различий.\n\ + /B Сравнение двоичных файлов.\n\ + /C Сравнение без учёта регистра символов.\n\ + /L Сравнение файлов в формате ASCII.\n\ + /LBn Максимальное число несоответствий\n\ + для заданного числа строк (по умолчанию: 100).\n\ + /N Вывод номеров строк при сравнении текстовых файлов ASCII.\n\ + /OFF[LINE] Не пропускать файлы с установленным атрибутом ""Автономный"".\n\ + /T Не заменять символы табуляции пробелами (по умолчанию: заменяет).\n\ + /U Сравнение файлов в формате UNICODE.\n\ + /W Пропуск пробелов и символов табуляции при сравнении.\n\ + /nnnn Число последовательных совпадающих строк, которое\n\ + должно встретиться после группы несовпадающих (по умолчанию: 2).\n\ + [диск1:][путь1]имя_файла1\n\ + Указывает первый файл или набор файлов для сравнения.\n\ + [диск2:][путь2]имя_файла2\n\ + Указывает второй файл или набор файлов для сравнения.\n" + IDS_NO_DIFFERENCE "FC: различия не найдены\n" + IDS_LONGER_THAN "FC: %ls длиннее, чем %ls\n" + IDS_COMPARING "Сравнение файлов %ls и %ls\n" + IDS_OUT_OF_MEMORY "FC: Недостаточно памяти\n" + IDS_CANNOT_READ "FC: не удаётся прочитать %ls\n" + IDS_INVALID_SWITCH "FC: Недопустимый ключ\n" + IDS_CANNOT_OPEN "FC: не удаётся открыть %ls - файл либо папка не существует\n" + IDS_NEEDS_FILES "FC: Недостаточное количество имён файлов\n" + IDS_CANT_USE_WILDCARD "Подстановочные знаки ('*' и '?') пока не поддерживаются\n" + IDS_DIFFERENT "FC: Файлы %ls и %ls различны\n" + IDS_TOO_LARGE "FC: Файл %ls слишком большой\n" + IDS_RESYNCH_FAILED "Не удаётся синхронизировать строки. Слишком много различий между файлами.\n" END

3 years, 4 months

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2021