Ros-diffs September 2019

ros-diffs@reactos.org

21 participants
115 discussions

[reactos] 02/02: [APPHELP_APITEST] Make the db test succeed on 2k3

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08110c11d6b4dffde3161… commit 08110c11d6b4dffde31615ce99130c1f6cfe2dc2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 15 18:38:24 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Sep 25 20:46:57 2019 +0200 [APPHELP_APITEST] Make the db test succeed on 2k3 --- modules/rostests/apitests/apphelp/db.cpp | 51 ++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/apphelp/db.cpp b/modules/rostests/apitests/apphelp/db.cpp index 2ddfca91998..f7de73d138e 100644 --- a/modules/rostests/apitests/apphelp/db.cpp +++ b/modules/rostests/apitests/apphelp/db.cpp @@ -220,7 +220,10 @@ static void test_GetDatabaseInformationEmpty(PDB pdb) else { ok(pInfo->dwMajor == 2, "Expected pInfo->dwMajor to be 2, was: %d\n", pInfo->dwMajor); - ok(pInfo->dwMinor == 1, "Expected pInfo->dwMinor to be 1, was: %d\n", pInfo->dwMinor); + if (g_WinVersion >= _WIN32_WINNT_VISTA) + ok(pInfo->dwMinor == 1, "Expected pInfo->dwMinor to be 1, was: %d\n", pInfo->dwMinor); + else + ok(pInfo->dwMinor == 190915, "Expected pInfo->dwMinor to be 190915, was: %d\n", pInfo->dwMinor); ok(pInfo[1].dwSomething == 0xdededede, "Cookie1 corrupt: 0x%x\n", pInfo[1].dwSomething); ok(pInfo[1].dwMajor == 0xdededede, "Cookie2 corrupt: 0x%x\n", pInfo[1].dwMajor); @@ -1517,12 +1520,25 @@ static void test_match_ex(const WCHAR* workdir, HSDB hsdb) ret = pSdbGetMatchingExe(hsdb, exename, NULL, NULL, 0, (SDBQUERYRESULT_VISTA*)&query); DWORD exe_count = Succeed ? 1 : 0; - if (Succeed) - ok(ret, "SdbGetMatchingExe should not fail for %s.\n", wine_dbgstr_w(TestName)); + if (Succeed && !ret && g_WinVersion == _WIN32_WINNT_WS03) + { + skip("As long as we do not have indexes, we will hit a bug in W2k3\n"); +#if 0 +[Info][SdbGetIndex ] index 0x7007(0x600b) was not found in the index table +[Info][SdbGetIndex ] index 0x7007(0x6001) was not found in the index table +[Info][SdbpSearchDB ] Searching database with no index. +[Err ][SdbpSearchDB ] No DATABASE tag found. +#endif + } else - ok(!ret, "SdbGetMatchingExe should not succeed for %s.\n", wine_dbgstr_w(TestName)); + { + if (Succeed) + ok(ret, "SdbGetMatchingExe should not fail for %s.\n", wine_dbgstr_w(TestName)); + else + ok(!ret, "SdbGetMatchingExe should not succeed for %s.\n", wine_dbgstr_w(TestName)); - ok(query.dwExeCount == exe_count, "Expected dwExeCount to be %d, was %d for %s\n", exe_count, query.dwExeCount, wine_dbgstr_w(TestName)); + ok(query.dwExeCount == exe_count, "Expected dwExeCount to be %d, was %d for %s\n", exe_count, query.dwExeCount, wine_dbgstr_w(TestName)); + } DeleteFileW(exename); } } @@ -1772,12 +1788,14 @@ static void test_DataTags(HSDB hsdb) ok_hex(dwBufferSize, sizeof(DWORD)); ok_hex(*(DWORD*)Buffer, 3333); - /* This succeeds on 2k3.. */ - memset(Buffer, 0xaa, sizeof(Buffer)); - dwBufferSize = sizeof(Buffer); - dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", NULL, Buffer, NULL, NULL); - ok_hex(dwRet, ERROR_INSUFFICIENT_BUFFER); - ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + if (g_WinVersion > _WIN32_WINNT_WS03) + { + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", NULL, Buffer, NULL, NULL); + ok_hex(dwRet, ERROR_INSUFFICIENT_BUFFER); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + } memset(Buffer, 0xaa, sizeof(Buffer)); dwBufferSize = 1; @@ -1877,7 +1895,10 @@ static void test_DataTags(HSDB hsdb) ok_hex(dwDataType, 0x12345); ok_hex(dwBufferSize, sizeof(Buffer)); ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); - ok(trData == 0x111111, "Expected 0x111111, got 0x%x\n", trData); + if (g_WinVersion == _WIN32_WINNT_WS03) + ok(trData == 0, "Expected 0, got 0x%x\n", trData); + else + ok(trData == 0x111111, "Expected 0x111111, got 0x%x\n", trData); /* And SdbQueryData as well */ memset(Buffer, 0xaa, sizeof(Buffer)); @@ -2062,9 +2083,9 @@ static int validate_SDBQUERYRESULT_size() START_TEST(db) { - //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); - //SetEnvironmentVariable("SHIMENG_DEBUG_LEVEL", "4"); - //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); + //SetEnvironmentVariableA("SHIM_DEBUG_LEVEL", "4"); + //SetEnvironmentVariableA("SHIMENG_DEBUG_LEVEL", "4"); + //SetEnvironmentVariableA("DEBUGCHANNEL", "+apphelp"); silence_debug_output(); hdll = LoadLibraryA("apphelp.dll");

5 years, 2 months

[reactos] 01/02: [APPHELP_APITEST] Make the apphelp test succeed on 2k3

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9c63aa7a414198875ac9… commit f9c63aa7a414198875ac9318ec7e728758dd9db5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 15 17:11:32 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Sep 25 20:46:45 2019 +0200 [APPHELP_APITEST] Make the apphelp test succeed on 2k3 --- modules/rostests/apitests/apphelp/apphelp.c | 362 +++++++++++++++++++--------- 1 file changed, 250 insertions(+), 112 deletions(-) diff --git a/modules/rostests/apitests/apphelp/apphelp.c b/modules/rostests/apitests/apphelp/apphelp.c index 6b09f1102fc..7f4151289b9 100644 --- a/modules/rostests/apitests/apphelp/apphelp.c +++ b/modules/rostests/apitests/apphelp/apphelp.c @@ -1,10 +1,10 @@ /* * PROJECT: apphelp_apitest - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Misc apphelp tests * COPYRIGHT: Copyright 2012 Detlef Riekenberg * Copyright 2013 Mislav Blažević - * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #include <ntstatus.h> @@ -94,6 +94,7 @@ static BOOL (WINAPI *pSdbGetStandardDatabaseGUID)(DWORD Flags, GUID* Guid); static BOOL (WINAPI *pSdbGetFileAttributes)(LPCWSTR wszPath, PATTRINFO *ppAttrInfo, LPDWORD pdwAttrCount); static BOOL (WINAPI *pSdbFreeFileAttributes)(PATTRINFO AttrInfo); static HRESULT (WINAPI* pSdbGetAppPatchDir)(PVOID hsdb, LPWSTR path, DWORD size); +static DWORD g_AttrInfoSize; /* 'Known' database guids */ DEFINE_GUID(GUID_DATABASE_MSI,0xd8ff6d16,0x6a3a,0x468a,0x8b,0x44,0x01,0x71,0x4d,0xdc,0x49,0xea); @@ -490,40 +491,156 @@ static void test_GuidFunctions(void) ok(IsEqualGUID(&GUID_DATABASE_DRIVERS, &guid), "Expected guid to equal GUID_DATABASE_DRIVERS, was: %s\n", wine_dbgstr_guid(&guid)); } -static void expect_tag_skip_imp(PATTRINFO pattr, DWORD num) +static TAG g_Tags_26[] = { + TAG_SIZE, + TAG_CHECKSUM, + TAG_BIN_FILE_VERSION, + TAG_BIN_PRODUCT_VERSION, + TAG_PRODUCT_VERSION, + TAG_FILE_DESCRIPTION, + TAG_COMPANY_NAME, + TAG_PRODUCT_NAME, + TAG_FILE_VERSION, + TAG_ORIGINAL_FILENAME, + TAG_INTERNAL_NAME, + TAG_LEGAL_COPYRIGHT, + TAG_VERDATEHI, /* TAG_VERFILEDATEHI */ + TAG_VERDATELO, /* TAG_VERFILEDATELO */ + TAG_VERFILEOS, + TAG_VERFILETYPE, + TAG_MODULE_TYPE, + TAG_PE_CHECKSUM, + TAG_LINKER_VERSION, + TAG_16BIT_DESCRIPTION, /* CHECKME! */ + TAG_16BIT_MODULE_NAME, /* CHECKME! */ + TAG_UPTO_BIN_FILE_VERSION, + TAG_UPTO_BIN_PRODUCT_VERSION, + TAG_LINK_DATE, + TAG_UPTO_LINK_DATE, + TAG_VER_LANGUAGE, + 0 +}; + +static TAG g_Tags_28[] = { + TAG_SIZE, + TAG_CHECKSUM, + TAG_BIN_FILE_VERSION, + TAG_BIN_PRODUCT_VERSION, + TAG_PRODUCT_VERSION, + TAG_FILE_DESCRIPTION, + TAG_COMPANY_NAME, + TAG_PRODUCT_NAME, + TAG_FILE_VERSION, + TAG_ORIGINAL_FILENAME, + TAG_INTERNAL_NAME, + TAG_LEGAL_COPYRIGHT, + TAG_VERDATEHI, + TAG_VERDATELO, + TAG_VERFILEOS, + TAG_VERFILETYPE, + TAG_MODULE_TYPE, + TAG_PE_CHECKSUM, + TAG_LINKER_VERSION, + TAG_16BIT_DESCRIPTION, + TAG_16BIT_MODULE_NAME, + TAG_UPTO_BIN_FILE_VERSION, + TAG_UPTO_BIN_PRODUCT_VERSION, + TAG_LINK_DATE, + TAG_UPTO_LINK_DATE, + TAG_EXPORT_NAME, + TAG_VER_LANGUAGE, + TAG_EXE_WRAPPER, + 0 +}; + +static DWORD find_tag(TAG tag) +{ + DWORD n; + TAG* allTags; + switch (g_AttrInfoSize) + { + case 26: + allTags = g_Tags_26; + break; + case 28: + allTags = g_Tags_28; + break; + default: + return ~0; + } + + for (n = 0; n < allTags[n]; ++n) + { + if (allTags[n] == tag) + return n; + } + return ~0; +} + +static void expect_tag_skip_imp(PATTRINFO pattr, TAG tag) { - PATTRINFO p = &pattr[num]; + DWORD num = find_tag(tag); + PATTRINFO p; + + if (num == ~0) + return; + + p = &pattr[num]; winetest_ok(p->type == TAG_NULL, "expected entry #%d to be TAG_NULL, was %x\n", num, p->type); winetest_ok(p->flags == ATTRIBUTE_FAILED, "expected entry #%d to be failed, was %d\n", num, p->flags); winetest_ok(p->qwattr == 0, "expected entry #%d to be 0, was 0x%I64x\n", num, p->qwattr); } -static void expect_tag_empty_imp(PATTRINFO pattr, DWORD num) +static void expect_tag_empty_imp(PATTRINFO pattr, TAG tag) { - PATTRINFO p = &pattr[num]; + DWORD num = find_tag(tag); + PATTRINFO p; + + if (num == ~0) + return; + + p = &pattr[num]; winetest_ok(p->type == TAG_NULL, "expected entry #%d to be TAG_NULL, was %x\n", num, p->type); winetest_ok(p->flags == 0, "expected entry #%d to be 0, was %d\n", num, p->flags); winetest_ok(p->qwattr == 0, "expected entry #%d to be 0, was 0x%I64x\n", num, p->qwattr); } -static void expect_tag_dword_imp(PATTRINFO pattr, DWORD num, TAG tag, DWORD value) +static void expect_tag_dword_imp(PATTRINFO pattr, TAG tag, DWORD value) { - PATTRINFO p = &pattr[num]; + DWORD num = find_tag(tag); + PATTRINFO p; + + if (num == ~0) + return; + + p = &pattr[num]; winetest_ok(p->type == tag, "expected entry #%d to be %x, was %x\n", num, tag, p->type); winetest_ok(p->flags == ATTRIBUTE_AVAILABLE, "expected entry #%d to be available, was %d\n", num, p->flags); winetest_ok(p->dwattr == value, "expected entry #%d to be 0x%x, was 0x%x\n", num, value, p->dwattr); } -static void expect_tag_qword_imp(PATTRINFO pattr, DWORD num, TAG tag, QWORD value) +static void expect_tag_qword_imp(PATTRINFO pattr, TAG tag, QWORD value) { - PATTRINFO p = &pattr[num]; + DWORD num = find_tag(tag); + PATTRINFO p; + + if (num == ~0) + return; + + p = &pattr[num]; winetest_ok(p->type == tag, "expected entry #%d to be %x, was %x\n", num, tag, p->type); winetest_ok(p->flags == ATTRIBUTE_AVAILABLE, "expected entry #%d to be available, was %d\n", num, p->flags); winetest_ok(p->qwattr == value, "expected entry #%d to be 0x%I64x, was 0x%I64x\n", num, value, p->qwattr); } -static void expect_tag_str_imp(PATTRINFO pattr, DWORD num, TAG tag, const WCHAR* value) +static void expect_tag_str_imp(PATTRINFO pattr, TAG tag, const WCHAR* value) { - PATTRINFO p = &pattr[num]; + DWORD num = find_tag(tag); + PATTRINFO p; + + if (num == ~0) + return; + + p = &pattr[num]; winetest_ok(p->type == tag, "expected entry #%d to be %x, was %x\n", num, tag, p->type); winetest_ok(p->flags == ATTRIBUTE_AVAILABLE, "expected entry #%d to be available, was %d\n", num, p->flags); winetest_ok(p->lpattr && wcscmp(p->lpattr, value) == 0, "expected entry #%d to be %s, was %s\n", num, wine_dbgstr_w(value), wine_dbgstr_w(p->lpattr)); @@ -596,11 +713,11 @@ static void test_crc_imp(size_t len, DWORD expected) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); winetest_ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); winetest_ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - winetest_ok(num == 28, "expected 28 items, got %d.\n", num); + winetest_ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); - if (num == 28 && ret) + if (num == g_AttrInfoSize && ret) { - expect_tag_dword_imp(pattrinfo, 1, TAG_CHECKSUM, expected); + expect_tag_dword_imp(pattrinfo, TAG_CHECKSUM, expected); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -623,12 +740,12 @@ static void test_crc2_imp(DWORD len, int fill, DWORD expected) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); winetest_ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); winetest_ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - winetest_ok(num == 28, "expected 28 items, got %d.\n", num); + winetest_ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); - if (num == 28 && ret) + if (num == g_AttrInfoSize && ret) { - expect_tag_dword_imp(pattrinfo, 0, TAG_SIZE, len); - expect_tag_dword_imp(pattrinfo, 1, TAG_CHECKSUM, expected); + expect_tag_dword_imp(pattrinfo, TAG_SIZE, len); + expect_tag_dword_imp(pattrinfo, TAG_CHECKSUM, expected); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -672,38 +789,59 @@ static void test_ApplicationAttributes(void) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - ok(num == 28, "expected 28 items, got %d.\n", num); - - if (num == 28 && ret) - { - expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0x800); - expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0x178bd629); - expect_tag_qword(pattrinfo, 2, TAG_BIN_FILE_VERSION, 0x1000000000000ull); - expect_tag_qword(pattrinfo, 3, TAG_BIN_PRODUCT_VERSION, 0x1000000000001ull); - expect_tag_str(pattrinfo, 4, TAG_PRODUCT_VERSION, PRODUCT_VERSION); - expect_tag_str(pattrinfo, 5, TAG_FILE_DESCRIPTION, FILE_DESCRIPTION); - expect_tag_str(pattrinfo, 6, TAG_COMPANY_NAME, COMPANY_NAME); - expect_tag_str(pattrinfo, 7, TAG_PRODUCT_NAME, PRODUCT_NAME); - expect_tag_str(pattrinfo, 8, TAG_FILE_VERSION, FILE_VERSION); - expect_tag_str(pattrinfo, 9, TAG_ORIGINAL_FILENAME, ORIGINAL_FILENAME); - expect_tag_str(pattrinfo, 10, TAG_INTERNAL_NAME, INTERNAL_NAME); - expect_tag_str(pattrinfo, 11, TAG_LEGAL_COPYRIGHT, LEGAL_COPYRIGHT); - expect_tag_dword(pattrinfo, 12, TAG_VERDATEHI, 0x1d1a019); - expect_tag_dword(pattrinfo, 13, TAG_VERDATELO, 0xac754c50); - expect_tag_dword(pattrinfo, 14, TAG_VERFILEOS, VOS__WINDOWS32); - expect_tag_dword(pattrinfo, 15, TAG_VERFILETYPE, VFT_APP); - expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x3); /* Win32 */ - expect_tag_dword(pattrinfo, 17, TAG_PE_CHECKSUM, 0xBAAD); - expect_tag_dword(pattrinfo, 18, TAG_LINKER_VERSION, 0x40002); - expect_tag_skip(pattrinfo, 19); /* TAG_16BIT_DESCRIPTION */ - expect_tag_skip(pattrinfo, 20); /* TAG_16BIT_MODULE_NAME */ - expect_tag_qword(pattrinfo, 21, TAG_UPTO_BIN_FILE_VERSION, 0x1000000000000ull); - expect_tag_qword(pattrinfo, 22, TAG_UPTO_BIN_PRODUCT_VERSION, 0x1000000000001ull); - expect_tag_dword(pattrinfo, 23, TAG_LINK_DATE, 0x12345); - expect_tag_dword(pattrinfo, 24, TAG_UPTO_LINK_DATE, 0x12345); - expect_tag_str(pattrinfo, 25, TAG_EXPORT_NAME, EXPORT_NAME); - expect_tag_dword(pattrinfo, 26, TAG_VER_LANGUAGE, 0xffff); - expect_tag_dword(pattrinfo, 27, TAG_EXE_WRAPPER, 0x0); + + //for (UINT n = 0; n < num; ++n) + //{ + // trace("%S\n", pSdbTagToString(pattrinfo[n].type)); + //} + + switch (num) + { + case 26: + // 2k3 + g_AttrInfoSize = 26; + break; + case 28: + // Win7+ (and maybe vista, but who cares about that?) + g_AttrInfoSize = 28; + break; + default: + ok(0, "Unknown attrinfo size: %u\n", num); + break; + } + + ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); + + if (num == g_AttrInfoSize && ret) + { + expect_tag_dword(pattrinfo, TAG_SIZE, 0x800); + expect_tag_dword(pattrinfo, TAG_CHECKSUM, 0x178bd629); + expect_tag_qword(pattrinfo, TAG_BIN_FILE_VERSION, 0x1000000000000ull); + expect_tag_qword(pattrinfo, TAG_BIN_PRODUCT_VERSION, 0x1000000000001ull); + expect_tag_str(pattrinfo, TAG_PRODUCT_VERSION, PRODUCT_VERSION); + expect_tag_str(pattrinfo, TAG_FILE_DESCRIPTION, FILE_DESCRIPTION); + expect_tag_str(pattrinfo, TAG_COMPANY_NAME, COMPANY_NAME); + expect_tag_str(pattrinfo, TAG_PRODUCT_NAME, PRODUCT_NAME); + expect_tag_str(pattrinfo, TAG_FILE_VERSION, FILE_VERSION); + expect_tag_str(pattrinfo, TAG_ORIGINAL_FILENAME, ORIGINAL_FILENAME); + expect_tag_str(pattrinfo, TAG_INTERNAL_NAME, INTERNAL_NAME); + expect_tag_str(pattrinfo, TAG_LEGAL_COPYRIGHT, LEGAL_COPYRIGHT); + expect_tag_dword(pattrinfo, TAG_VERDATEHI, 0x1d1a019); + expect_tag_dword(pattrinfo, TAG_VERDATELO, 0xac754c50); + expect_tag_dword(pattrinfo, TAG_VERFILEOS, VOS__WINDOWS32); + expect_tag_dword(pattrinfo, TAG_VERFILETYPE, VFT_APP); + expect_tag_dword(pattrinfo, TAG_MODULE_TYPE, 0x3); /* Win32 */ + expect_tag_dword(pattrinfo, TAG_PE_CHECKSUM, 0xBAAD); + expect_tag_dword(pattrinfo, TAG_LINKER_VERSION, 0x40002); + expect_tag_skip(pattrinfo, TAG_16BIT_DESCRIPTION); + expect_tag_skip(pattrinfo, TAG_16BIT_MODULE_NAME); + expect_tag_qword(pattrinfo, TAG_UPTO_BIN_FILE_VERSION, 0x1000000000000ull); + expect_tag_qword(pattrinfo, TAG_UPTO_BIN_PRODUCT_VERSION, 0x1000000000001ull); + expect_tag_dword(pattrinfo, TAG_LINK_DATE, 0x12345); + expect_tag_dword(pattrinfo, TAG_UPTO_LINK_DATE, 0x12345); + expect_tag_str(pattrinfo, TAG_EXPORT_NAME, EXPORT_NAME); + expect_tag_dword(pattrinfo, TAG_VER_LANGUAGE, 0xffff); + expect_tag_dword(pattrinfo, TAG_EXE_WRAPPER, 0x0); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -715,22 +853,22 @@ static void test_ApplicationAttributes(void) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - ok(num == 28, "expected 28 items, got %d.\n", num); - - if (num == 28 && ret) - { - expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0x800); - expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0xea7caffd); - expect_tag_skip_range(pattrinfo, 2, 16); - expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x3); /* Win32 */ - expect_tag_dword(pattrinfo, 17, TAG_PE_CHECKSUM, 0xBAAD); - expect_tag_dword(pattrinfo, 18, TAG_LINKER_VERSION, 0x40002); - expect_tag_skip_range(pattrinfo, 19, 23); - expect_tag_dword(pattrinfo, 23, TAG_LINK_DATE, 0x12345); - expect_tag_dword(pattrinfo, 24, TAG_UPTO_LINK_DATE, 0x12345); - expect_tag_skip(pattrinfo, 25); /* TAG_EXPORT_NAME */ - expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ - expect_tag_dword(pattrinfo, 27, TAG_EXE_WRAPPER, 0x0); + ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); + + if (num == g_AttrInfoSize && ret) + { + expect_tag_dword(pattrinfo, TAG_SIZE, 0x800); + expect_tag_dword(pattrinfo, TAG_CHECKSUM, 0xea7caffd); + //expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, TAG_MODULE_TYPE, 0x3); /* Win32 */ + expect_tag_dword(pattrinfo, TAG_PE_CHECKSUM, 0xBAAD); + expect_tag_dword(pattrinfo, TAG_LINKER_VERSION, 0x40002); + //expect_tag_skip_range(pattrinfo, 19, 23); + expect_tag_dword(pattrinfo, TAG_LINK_DATE, 0x12345); + expect_tag_dword(pattrinfo, TAG_UPTO_LINK_DATE, 0x12345); + expect_tag_skip(pattrinfo, TAG_EXPORT_NAME); + expect_tag_empty(pattrinfo, TAG_VER_LANGUAGE); + expect_tag_dword(pattrinfo, TAG_EXE_WRAPPER, 0x0); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -741,17 +879,17 @@ static void test_ApplicationAttributes(void) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - ok(num == 28, "expected 28 items, got %d.\n", num); + ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); - if (num == 28 && ret) + if (num == g_AttrInfoSize && ret) { - expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0x2); - expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0); - expect_tag_skip_range(pattrinfo, 2, 16); - expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x1); - expect_tag_skip_range(pattrinfo, 17, 26); - expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ - expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + expect_tag_dword(pattrinfo, TAG_SIZE, 0x2); + expect_tag_dword(pattrinfo, TAG_CHECKSUM, 0); + //expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, TAG_MODULE_TYPE, 0x1); + //expect_tag_skip_range(pattrinfo, 17, 26); + expect_tag_empty(pattrinfo, TAG_VER_LANGUAGE); + expect_tag_skip(pattrinfo, TAG_EXE_WRAPPER); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -762,14 +900,14 @@ static void test_ApplicationAttributes(void) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - ok(num == 28, "expected 28 items, got %d.\n", num); + ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); - if (num == 28 && ret) + if (num == g_AttrInfoSize && ret) { - expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0); - expect_tag_skip_range(pattrinfo, 1, 26); - expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ - expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + expect_tag_dword(pattrinfo, TAG_SIZE, 0); + //expect_tag_skip_range(pattrinfo, 1, 26); + expect_tag_empty(pattrinfo, TAG_VER_LANGUAGE); + expect_tag_skip(pattrinfo, TAG_EXE_WRAPPER); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -780,21 +918,21 @@ static void test_ApplicationAttributes(void) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - ok(num == 28, "expected 28 items, got %d.\n", num); - - if (num == 28 && ret) - { - expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0xa8); - expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0xf2abe4e9); - expect_tag_skip_range(pattrinfo, 2, 16); - expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x2); - expect_tag_skip(pattrinfo, 17); /* TAG_PE_CHECKSUM */ - expect_tag_skip(pattrinfo, 18); /* TAG_LINKER_VERSION */ - expect_tag_str(pattrinfo, 19, TAG_16BIT_DESCRIPTION, OS2_DESCRIPTION); - expect_tag_str(pattrinfo, 20, TAG_16BIT_MODULE_NAME, OS2_EXPORT_NAME); - expect_tag_skip_range(pattrinfo, 21, 26); - expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ - expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); + + if (num == g_AttrInfoSize && ret) + { + expect_tag_dword(pattrinfo, TAG_SIZE, 0xa8); + expect_tag_dword(pattrinfo, TAG_CHECKSUM, 0xf2abe4e9); + //expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, TAG_MODULE_TYPE, 0x2); + expect_tag_skip(pattrinfo, TAG_PE_CHECKSUM); + expect_tag_skip(pattrinfo, TAG_LINKER_VERSION); + expect_tag_str(pattrinfo, TAG_16BIT_DESCRIPTION, OS2_DESCRIPTION); + expect_tag_str(pattrinfo, TAG_16BIT_MODULE_NAME, OS2_EXPORT_NAME); + //expect_tag_skip_range(pattrinfo, 21, 26); + expect_tag_empty(pattrinfo, TAG_VER_LANGUAGE); + expect_tag_skip(pattrinfo, TAG_EXE_WRAPPER); } if (ret) pSdbFreeFileAttributes(pattrinfo); @@ -805,21 +943,21 @@ static void test_ApplicationAttributes(void) ret = pSdbGetFileAttributes(path, &pattrinfo, &num); ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); - ok(num == 28, "expected 28 items, got %d.\n", num); - - if (num == 28 && ret) - { - expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0xa8); - expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0xddcbe4c9); - expect_tag_skip_range(pattrinfo, 2, 16); - expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x2); - expect_tag_skip(pattrinfo, 17); /* TAG_PE_CHECKSUM */ - expect_tag_skip(pattrinfo, 18); /* TAG_LINKER_VERSION */ - expect_tag_str(pattrinfo, 19, TAG_16BIT_DESCRIPTION, OS2_DESCRIPTION_broken); /* the 'Z' from 'MZ' */ - expect_tag_str(pattrinfo, 20, TAG_16BIT_MODULE_NAME, OS2_EXPORT_NAME_broken); /* the 'E' from 'NE' */ - expect_tag_skip_range(pattrinfo, 21, 26); - expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ - expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + ok(num == g_AttrInfoSize, "expected %u items, got %d.\n", g_AttrInfoSize, num); + + if (num == g_AttrInfoSize && ret) + { + expect_tag_dword(pattrinfo, TAG_SIZE, 0xa8); + expect_tag_dword(pattrinfo, TAG_CHECKSUM, 0xddcbe4c9); + //expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, TAG_MODULE_TYPE, 0x2); + expect_tag_skip(pattrinfo, TAG_PE_CHECKSUM); + expect_tag_skip(pattrinfo, TAG_LINKER_VERSION); + expect_tag_str(pattrinfo, TAG_16BIT_DESCRIPTION, OS2_DESCRIPTION_broken); /* the 'Z' from 'MZ' */ + expect_tag_str(pattrinfo, TAG_16BIT_MODULE_NAME, OS2_EXPORT_NAME_broken); /* the 'E' from 'NE' */ + //expect_tag_skip_range(pattrinfo, 21, 26); + expect_tag_empty(pattrinfo, TAG_VER_LANGUAGE); + expect_tag_skip(pattrinfo, TAG_EXE_WRAPPER); } if (ret) pSdbFreeFileAttributes(pattrinfo);

5 years, 2 months

[reactos] 01/01: [POWERCFG] Fix the Indentation. No code changes!

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf854f53727111e0bdce2… commit bf854f53727111e0bdce2145c8478409aac940b9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Sep 25 10:51:55 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 25 10:52:45 2019 +0200 [POWERCFG] Fix the Indentation. No code changes! --- dll/cpl/powercfg/alarms.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dll/cpl/powercfg/alarms.c b/dll/cpl/powercfg/alarms.c index 0782a1508a9..8cae46734fd 100644 --- a/dll/cpl/powercfg/alarms.c +++ b/dll/cpl/powercfg/alarms.c @@ -169,19 +169,22 @@ AlarmsDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) - { - case WM_INITDIALOG: - if (!Ala_InitData(hwndDlg)) - { - // TODO: - // Handle initialization error - } - return TRUE; - default: - break; - } - return FALSE; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + if (!Ala_InitData(hwndDlg)) + { + // TODO: + // Handle initialization error + } + return TRUE; + + default: + break; + } + + return FALSE; }

5 years, 3 months

[reactos] 01/01: [Win32SS] Support Module Versioning.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f78e8ec47a34869d37f0… commit 1f78e8ec47a34869d37f05d03d6fca16707e70fc Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 24 17:40:18 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 24 17:40:18 2019 -0500 [Win32SS] Support Module Versioning. Set the appropriate flags supporting versions of software modules. Fix arguments for getting desktop DC. --- win32ss/user/ntuser/desktop.c | 8 ++++---- win32ss/user/ntuser/menu.c | 2 +- win32ss/user/ntuser/window.c | 25 ++++++++++++++++++++----- win32ss/user/ntuser/window.h | 9 +++++++-- win32ss/user/user32/windows/window.c | 34 ++++++++++++++++++++++++++++++++-- 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index f1aec1b5af7..365a4e5a9a4 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1533,7 +1533,7 @@ VOID NTAPI DesktopThreadMain(VOID) } HDC FASTCALL -UserGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) +UserGetDesktopDC(ULONG DcType, BOOL bAltDc, BOOL ValidatehWnd) { PWND DesktopObject = 0; HDC DesktopHDC = 0; @@ -1549,7 +1549,7 @@ UserGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) else { PMONITOR pMonitor = UserGetPrimaryMonitor(); - DesktopHDC = IntGdiCreateDisplayDC(pMonitor->hDev, DcType, EmptyDC); + DesktopHDC = IntGdiCreateDisplayDC(pMonitor->hDev, DcType, bAltDc); } UserLeave(); @@ -2403,7 +2403,7 @@ IntCreateDesktop( Cs.lpszClass = (LPCWSTR) &ClassName; /* Use IntCreateWindow instead of co_UserCreateWindowEx because the later expects a thread with a desktop */ - pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); + pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk, WINVER); if (pWnd == NULL) { ERR("Failed to create desktop window for the new desktop\n"); @@ -2433,7 +2433,7 @@ IntCreateDesktop( Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Cs.lpszName = (LPCWSTR)&WindowName; Cs.lpszClass = (LPCWSTR)&ClassName; - pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); + pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk, WINVER); if (pWnd == NULL) { ERR("Failed to create message window for the new desktop\n"); diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index b7c550bec3a..17e31d6d13d 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2807,7 +2807,7 @@ static BOOL MENU_InitPopup( PWND pWndOwner, PMENU menu, UINT flags ) Cs.hwndParent = UserHMGetHandle(pWndOwner); /* NOTE: In Windows, top menu popup is not owned. */ - pWndCreated = co_UserCreateWindowEx( &Cs, &ClassName, &WindowName, NULL); + pWndCreated = co_UserCreateWindowEx( &Cs, &ClassName, &WindowName, NULL, WINVER ); if( !pWndCreated ) return FALSE; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index a557c4d3387..c34dcea55f0 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1615,7 +1615,8 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, PWND ParentWindow, PWND OwnerWindow, PVOID acbiBuffer, - PDESKTOP pdeskCreated) + PDESKTOP pdeskCreated, + DWORD dwVer ) { PWND pWnd = NULL; HWND hWnd; @@ -1695,7 +1696,19 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, pWnd->spwndOwner = OwnerWindow; pWnd->fnid = 0; pWnd->spwndLastActive = pWnd; - pWnd->state2 |= WNDS2_WIN40COMPAT; // FIXME!!! + // Ramp up compatible version sets. + if ( dwVer >= WINVER_WIN31 ) + { + pWnd->state2 |= WNDS2_WIN31COMPAT; + if ( dwVer >= WINVER_WINNT4 ) + { + pWnd->state2 |= WNDS2_WIN40COMPAT; + if ( dwVer >= WINVER_WIN2K ) + { + pWnd->state2 |= WNDS2_WIN50COMPAT; + } + } + } pWnd->pcls = Class; pWnd->hModule = Cs->hInstance; pWnd->style = Cs->style & ~WS_VISIBLE; @@ -1956,7 +1969,8 @@ PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW* Cs, PUNICODE_STRING ClassName, PLARGE_STRING WindowName, - PVOID acbiBuffer) + PVOID acbiBuffer, + DWORD dwVer ) { ULONG style; PWND Window = NULL, ParentWindow = NULL, OwnerWindow; @@ -2073,7 +2087,8 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, ParentWindow, OwnerWindow, acbiBuffer, - NULL); + NULL, + dwVer ); if(!Window) { ERR("IntCreateWindow failed!\n"); @@ -2598,7 +2613,7 @@ NtUserCreateWindowEx( UserEnterExclusive(); /* Call the internal function */ - pwnd = co_UserCreateWindowEx(&Cs, &ustrClsVersion, plstrWindowName, acbiBuffer); + pwnd = co_UserCreateWindowEx(&Cs, &ustrClsVersion, plstrWindowName, acbiBuffer, dwFlags); if(!pwnd) { diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 24b60214223..f2cd877b289 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -52,17 +52,22 @@ VOID FASTCALL IntGetWindowBorderMeasures(PWND WindowObject, UINT *cx, UINT *cy); BOOL FASTCALL IntShowOwnedPopups( PWND owner, BOOL fShow ); LRESULT FASTCALL IntDefWindowProc( PWND Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG, DWORD); +#define WINVER_WIN2K _WIN32_WINNT_WIN2K +#define WINVER_WINNT4 _WIN32_WINNT_NT4 +#define WINVER_WIN31 0x30A PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, PLARGE_STRING WindowName, PCLS Class, PWND ParentWindow, PWND OwnerWindow, PVOID acbiBuffer, - PDESKTOP pdeskCreated); + PDESKTOP pdeskCreated, + DWORD dwVer ); PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW* Cs, PUNICODE_STRING ClassName, PLARGE_STRING WindowName, - PVOID acbiBuffer); + PVOID acbiBuffer, + DWORD dwVer ); BOOL FASTCALL IntEnableWindow(HWND,BOOL); BOOL FASTCALL IntIsWindowVisible(PWND); DWORD FASTCALL GetNCHitEx(PWND,POINT); diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index ccf0670bc16..e94d9a1b250 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -148,6 +148,32 @@ RtlFreeLargeString( } } +DWORD +FASTCALL +RtlGetExpWinVer( HMODULE hModule ) +{ + DWORD dwMajorVersion = 3; // Set default to Windows 3.10. + DWORD dwMinorVersion = 10; + PIMAGE_NT_HEADERS pinth; + + if ( hModule && !((ULONG_PTR)hModule >> 16)) + { + pinth = RtlImageNtHeader( hModule ); + + dwMajorVersion = pinth->OptionalHeader.MajorSubsystemVersion; + + if ( dwMajorVersion == 1 ) + { + dwMajorVersion = 3; + } + else + { + dwMinorVersion = pinth->OptionalHeader.MinorSubsystemVersion; + } + } + return MAKELONG(MAKEWORD(dwMinorVersion, dwMajorVersion), 0); +} + HWND WINAPI User32CreateWindowEx(DWORD dwExStyle, LPCSTR lpClassName, @@ -177,11 +203,15 @@ User32CreateWindowEx(DWORD dwExStyle, LPCWSTR lpszClsVersion; LPCWSTR lpLibFileName = NULL; HANDLE pCtx = NULL; + DWORD dwFlagsVer; #if 0 DbgPrint("[window] User32CreateWindowEx style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); #endif + dwFlagsVer = RtlGetExpWinVer( hInstance ? hInstance : GetModuleHandleW(NULL) ); + TRACE("Module Version %x\n",dwFlagsVer); + if (!RegisterDefaultClasses) { TRACE("RegisterSystemControls\n"); @@ -299,8 +329,8 @@ User32CreateWindowEx(DWORD dwExStyle, hMenu, hInstance, lpParam, - dwFlags, - NULL); + dwFlagsVer, + pCtx ); if (Handle) break; if (!lpLibFileName) break; if (!ClassFound)

5 years, 3 months

[reactos] 01/01: [SNDVOL32] Fix a typo in the bass and treble slider code

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf7a8edfb5d022de8ff6… commit 6bf7a8edfb5d022de8ff61628c699ab33f0825ab Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 24 23:28:17 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 24 23:28:17 2019 +0200 [SNDVOL32] Fix a typo in the bass and treble slider code --- base/applications/sndvol32/advanced.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/sndvol32/advanced.c b/base/applications/sndvol32/advanced.c index a41112a9318..ee3a1de5e4a 100644 --- a/base/applications/sndvol32/advanced.c +++ b/base/applications/sndvol32/advanced.c @@ -188,7 +188,7 @@ OnHScroll( DWORD dwControlID = 0, dwStep, dwPosition; DWORD dwMaximum, dwMinimum; - if (dwCtrlID != IDC_ADV_BASS_SLIDER || + if (dwCtrlID != IDC_ADV_BASS_SLIDER && dwCtrlID != IDC_ADV_TREBLE_SLIDER) return;

5 years, 3 months

[reactos] 01/01: [UTILMAN] Add Russian translation (#1934)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4f2e4a37857489b8e9a0… commit d4f2e4a37857489b8e9a0715a115e1f0017f42c6 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Tue Sep 24 18:35:30 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 24 17:35:30 2019 +0200 [UTILMAN] Add Russian translation (#1934) + Update Copyright translation and the hotkey shortcut for the Cancel button. Co-Authored-By: Stanislav Motylkov <x86corez(a)gmail.com> --- base/applications/utilman/lang/ru-RU.rc | 55 +++++++++++++++++++++++++++++++++ base/applications/utilman/utilman.rc | 3 ++ media/inf/shortcuts.inf | 2 ++ 3 files changed, 60 insertions(+) diff --git a/base/applications/utilman/lang/ru-RU.rc b/base/applications/utilman/lang/ru-RU.rc new file mode 100644 index 00000000000..9be0b4f2f35 --- /dev/null +++ b/base/applications/utilman/lang/ru-RU.rc @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Russian (Russia) translation resource + * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Диспетчер служебных программ" +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 "Запустить", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "Остановить", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "Запускать автоматически при моем входе в систему", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "Запускать автоматически при блокировке рабочего стола", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Запускать автоматически при запуске диспетчера", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 + CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "О&тмена", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "&Справка", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 +CAPTION "О программе" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Диспетчер служебных программ\n© 2019 Джордж Бисок (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 48, 33, 150, 36 + PUSHBUTTON "OK", IDOK, 75, 47, 44, 15 +END + +STRINGTABLE +BEGIN + IDS_OSK "Экранная клавиатура" + IDS_MAGNIFIER "Экранная лупа" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "%s не выполняется" + IDS_RUNNING "%s работает" + IDS_GROUPBOX_OPTIONS_TITLE "Параметры для программы %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "О программе" +END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index 2087e63b948..a770f2495aa 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -43,5 +43,8 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif /* EOF */ diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index d73b1bef44c..918607b17e7 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1282,6 +1282,8 @@ WINMINE_TITLE=Сапер WINMINE_DESC=Сапер SPIDER_TITLE=Пасьянс Паук SPIDER_DESC=Пасьянс Паук +UTILMAN_TITLE=Диспетчер служебных программ +UTILMAN_DESC=Обеспечивает запуск и настройку программ поддержки специальных возможностей. ; Slovak [Strings.041B]

5 years, 3 months

[reactos] 01/01: Fix line spacing of Baltic MS Sans Serif (ssee1257.fon)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64c516440529651df469a… commit 64c516440529651df469ae9123e7ccc6262d8214 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 24 18:01:59 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 24 18:01:59 2019 +0900 Fix line spacing of Baltic MS Sans Serif (ssee1257.fon) Line spacing to 6px. Version 0.1.1 --- media/fonts/ssee1257.fon | Bin 65424 -> 65424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1257.fon b/media/fonts/ssee1257.fon index 42a43a7a612..65c819512ec 100644 Binary files a/media/fonts/ssee1257.fon and b/media/fonts/ssee1257.fon differ

5 years, 3 months

[reactos] 01/01: [HAL] Fix parser bugs in HalpDebugPciDumpBus (#1895)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=894635bb001f0d20612ac… commit 894635bb001f0d20612ac38b1a7e5ec9a210674c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Sep 24 00:46:23 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 23 23:46:23 2019 +0200 [HAL] Fix parser bugs in HalpDebugPciDumpBus (#1895) - Match subclass properly, don't match third subclass. - Don't match subclass from next class, add ClassEnd boundary. - Use class name if subclass name not available. - Gracefully return "Unknown" if no class name found. --- hal/halx86/legacy/bussupp.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index b8a7cb888d9..aad25838f55 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -809,7 +809,7 @@ HalpDebugPciDumpBus(IN ULONG i, IN ULONG k, IN PPCI_COMMON_CONFIG PciData) { - PCHAR p, ClassName, SubClassName, VendorName, ProductName, SubVendorName; + PCHAR p, ClassName, ClassEnd, SubClassName, VendorName, ProductName, SubVendorName; ULONG Length; CHAR LookupString[16] = ""; CHAR bSubClassName[64] = ""; @@ -824,19 +824,28 @@ HalpDebugPciDumpBus(IN ULONG i, if (ClassName) { /* Isolate the subclass name */ - ClassName += 6; - sprintf(LookupString, "\t%02x ", PciData->SubClass); + ClassName += strlen("C 00 "); + ClassEnd = strstr(ClassName, "\nC "); + sprintf(LookupString, "\n\t%02x ", PciData->SubClass); SubClassName = strstr(ClassName, LookupString); - if (SubClassName) + if (ClassEnd && SubClassName > ClassEnd) { - /* Copy the subclass into our buffer */ - SubClassName += 5; - p = strpbrk(SubClassName, "\r\n"); - Length = p - SubClassName; - if (Length >= sizeof(bSubClassName)) Length = sizeof(bSubClassName) - 1; - strncpy(bSubClassName, SubClassName, Length); - bSubClassName[Length] = '\0'; + SubClassName = NULL; } + if (!SubClassName) + { + SubClassName = ClassName; + } + else + { + SubClassName += strlen("\n\t00 "); + } + /* Copy the subclass into our buffer */ + p = strpbrk(SubClassName, "\r\n"); + Length = p - SubClassName; + if (Length >= sizeof(bSubClassName)) Length = sizeof(bSubClassName) - 1; + strncpy(bSubClassName, SubClassName, Length); + bSubClassName[Length] = '\0'; } /* Isolate the vendor name */

5 years, 3 months

[reactos] 01/01: [MSXML3R] XML/XSL file description localization (#1926)

by Lee Schroeder

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43f03da35844a5c446009… commit 43f03da35844a5c4460092ed00955b3f9d76b8b8 Author: Lee Schroeder <spaceseel(a)gmail.com> AuthorDate: Mon Sep 23 14:30:53 2019 -0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 23 23:30:53 2019 +0200 [MSXML3R] XML/XSL file description localization (#1926) Add localization for the file description of both XML and XSL file formats. Please check for copypasta errors! CORE-16390 Co-Authored-By: Stanislav Motylkov <x86corez(a)gmail.com> --- boot/bootdata/hivecls.inf | 4 ++-- dll/win32/CMakeLists.txt | 1 + dll/win32/msxml3r/CMakeLists.txt | 4 ++++ dll/win32/msxml3r/lang/en-US.rc | 7 +++++++ dll/win32/msxml3r/lang/es-ES.rc | 7 +++++++ dll/win32/msxml3r/lang/fr-FR.rc | 7 +++++++ dll/win32/msxml3r/lang/it-IT.rc | 7 +++++++ dll/win32/msxml3r/lang/ro-RO.rc | 7 +++++++ dll/win32/msxml3r/lang/ru-RU.rc | 7 +++++++ dll/win32/msxml3r/msxml3r.rc | 34 ++++++++++++++++++++++++++++++++++ dll/win32/msxml3r/resource.h | 7 +++++++ 11 files changed, 90 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 1b38c910e56..d3ae861c06b 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -400,7 +400,7 @@ HKCR,"txtfile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" HKCR,".xml","",0x00000000,"xmlfile" HKCR,".xml","Content Type",0x00000000,"text/xml" HKCR,"xmlfile","",0x00000000,%XMLFILE% -;;HKCR,"xmlfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\msxml3r.dll,-1" +HKCR,"xmlfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\msxml3r.dll,-1" HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\msxml3.dll,0" HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1""" @@ -408,7 +408,7 @@ HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.e HKCR,".xsl","",0x00000000,"xslfile" HKCR,".xsl","Content Type",0x00000000,"text/xml" HKCR,"xslfile","",0x00000000,%XSLFILE% -;;HKCR,"xslfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\msxml3r.dll,-2" +HKCR,"xslfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\msxml3r.dll,-2" HKCR,"xslfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\msxml3.dll,1" HKCR,"xslfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1""" diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index a7259794433..015003826d4 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -127,6 +127,7 @@ add_subdirectory(mswsock) add_subdirectory(msxml) add_subdirectory(msxml2) add_subdirectory(msxml3) +add_subdirectory(msxml3r) add_subdirectory(msxml4) add_subdirectory(msxml6) add_subdirectory(mycomput) diff --git a/dll/win32/msxml3r/CMakeLists.txt b/dll/win32/msxml3r/CMakeLists.txt new file mode 100644 index 00000000000..7589115fd0f --- /dev/null +++ b/dll/win32/msxml3r/CMakeLists.txt @@ -0,0 +1,4 @@ + +add_library(msxml3r SHARED msxml3r.rc) +set_module_type(msxml3r win32dll ENTRYPOINT 0) +add_cd_file(TARGET msxml3r DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml3r/lang/en-US.rc b/dll/win32/msxml3r/lang/en-US.rc new file mode 100644 index 00000000000..e14680ff12f --- /dev/null +++ b/dll/win32/msxml3r/lang/en-US.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_XML_FILE "XML Document" + IDS_XLS_FILE "XSL Stylesheet" +END diff --git a/dll/win32/msxml3r/lang/es-ES.rc b/dll/win32/msxml3r/lang/es-ES.rc new file mode 100644 index 00000000000..99958239f86 --- /dev/null +++ b/dll/win32/msxml3r/lang/es-ES.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_XML_FILE "Documento XML" + IDS_XLS_FILE "Hoja de estilos XSL" +END diff --git a/dll/win32/msxml3r/lang/fr-FR.rc b/dll/win32/msxml3r/lang/fr-FR.rc new file mode 100644 index 00000000000..fce8692e5a5 --- /dev/null +++ b/dll/win32/msxml3r/lang/fr-FR.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_XML_FILE "Document XML" + IDS_XLS_FILE "Feuille de style XSL" +END diff --git a/dll/win32/msxml3r/lang/it-IT.rc b/dll/win32/msxml3r/lang/it-IT.rc new file mode 100644 index 00000000000..52624365b61 --- /dev/null +++ b/dll/win32/msxml3r/lang/it-IT.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_XML_FILE "Documento XML" + IDS_XLS_FILE "Foglio di stile XSL" +END diff --git a/dll/win32/msxml3r/lang/ro-RO.rc b/dll/win32/msxml3r/lang/ro-RO.rc new file mode 100644 index 00000000000..d28277aeb16 --- /dev/null +++ b/dll/win32/msxml3r/lang/ro-RO.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_XML_FILE "Document XML" + IDS_XLS_FILE "Foaie de stil XSL" +END diff --git a/dll/win32/msxml3r/lang/ru-RU.rc b/dll/win32/msxml3r/lang/ru-RU.rc new file mode 100644 index 00000000000..b341853528b --- /dev/null +++ b/dll/win32/msxml3r/lang/ru-RU.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_XML_FILE "Документ XML" + IDS_XLS_FILE "Таблица стилей XSL" +END diff --git a/dll/win32/msxml3r/msxml3r.rc b/dll/win32/msxml3r/msxml3r.rc new file mode 100644 index 00000000000..c3a7f7099cc --- /dev/null +++ b/dll/win32/msxml3r/msxml3r.rc @@ -0,0 +1,34 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS MSXML 3.0 Resource Library" +#define REACTOS_STR_INTERNAL_NAME "msxml3r" +#define REACTOS_STR_ORIGINAL_FILENAME "msxml3r.dll" + +#include <reactos/version.rc> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif diff --git a/dll/win32/msxml3r/resource.h b/dll/win32/msxml3r/resource.h new file mode 100644 index 00000000000..94cbda1d9c9 --- /dev/null +++ b/dll/win32/msxml3r/resource.h @@ -0,0 +1,7 @@ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_XML_FILE 1 +#define IDS_XLS_FILE 2 + +#endif /* RESOURCE_H */

5 years, 3 months

[reactos] 01/01: [TRANSLATION] Russian translation for browseui (#1928)

by Abdulganiev Rafael

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9dd71e12b985f37f63df7… commit 9dd71e12b985f37f63df7a7dbb55116ff47bc6b5 Author: Abdulganiev Rafael <abdulganiev.rafael(a)gmail.com> AuthorDate: Tue Sep 24 01:28:46 2019 +0400 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 23 23:28:46 2019 +0200 [TRANSLATION] Russian translation for browseui (#1928) Co-Authored-By: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/browseui/lang/ru-RU.rc | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 47b56d75618..cfe7d49bd06 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -1,4 +1,11 @@ -/* Russian language resource file by Petr Akhlamov (petr-akhlamov(a)yandex.ru) */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Russian resource file + * COPYRIGHT: Copyright 2014-2015 Petr Akhlamov (petr-akhlamov(a)yandex.ru) + * Copyright 2017 Stanislav Motylkov (binarymaster(a)mail.ru) + * Copyright 2019 Abdulganiev Rafael (abdulganiev.rafael[at]gmail.com) + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -138,19 +145,19 @@ IDD_SEARCH_DLG DIALOGEX 0, 0, 260, 85 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_DLGFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 + LTEXT "Поиск по одному или нескольким критериям.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 30, 500, 10 + LTEXT "Полное или &частичное имя файла:", -1, 10, 30, 500, 10 EDITTEXT IDC_SEARCH_FILENAME, 10, 40, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 60, 500, 10 + LTEXT "С&лово или фраза в файле:", -1, 10, 60, 500, 10 EDITTEXT IDC_SEARCH_QUERY, 10, 70, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 90, 500, 10 + LTEXT "П&оиск в:", -1, 10, 90, 500, 10 CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 100, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Най&ти", IDC_SEARCH_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Остановит&ь", IDC_SEARCH_STOP_BUTTON, 80, 130, 40, 15, WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 150, 200, 8 END @@ -309,7 +316,7 @@ STRINGTABLE BEGIN IDS_BACK "Назад на ""%s""" IDS_FORWARD "Вперед на ""%s""" - IDS_FOLDER_OPTIONS "Folder Options" + IDS_FOLDER_OPTIONS "Свойства папки" END STRINGTABLE @@ -326,11 +333,11 @@ END STRINGTABLE BEGIN - IDS_SEARCHINVALID "'%1' is not a valid folder." - IDS_SEARCH_FOLDER "Searching %s" - IDS_SEARCH_FILES_FOUND "%u files found" - IDS_SEARCH_OPEN_FOLDER "Open Containing &Folder" - IDS_COL_NAME "Name" - IDS_COL_LOCATION "In Folder" - IDS_COL_RELEVANCE "Relevance" + IDS_SEARCHINVALID "'%1' не является допустимой папкой." + IDS_SEARCH_FOLDER "Ищем в ""%s""" + IDS_SEARCH_FILES_FOUND "Найдено файлов: %u" + IDS_SEARCH_OPEN_FOLDER "Открыть &расположение файла" + IDS_COL_NAME "Имя" + IDS_COL_LOCATION "В папке" + IDS_COL_RELEVANCE "Релевантность" END

5 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2019