February 2016 - Wine-commits

Sebastian Lackner : combase: Implement WindowsTrimStringEnd.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 441c8dcc65e15ca4a87ce9d19343af9bdc1cc285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441c8dcc65e15ca4a87ce9d19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 23:27:40 2016 +0100 combase: Implement WindowsTrimStringEnd. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/string.c | 27 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index fe63810..8b60a91 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -23,5 +23,5 @@ @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull @ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring @ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) combase.WindowsSubstringWithSpecifiedLength -@ stub WindowsTrimStringEnd +@ stdcall WindowsTrimStringEnd(ptr ptr ptr) combase.WindowsTrimStringEnd @ stdcall WindowsTrimStringStart(ptr ptr ptr) combase.WindowsTrimStringStart diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 69f47d0..4bda470 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -304,5 +304,5 @@ @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) @ stdcall WindowsSubstring(ptr long ptr) @ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) -@ stub WindowsTrimStringEnd +@ stdcall WindowsTrimStringEnd(ptr ptr ptr) @ stdcall WindowsTrimStringStart(ptr ptr ptr) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2d04f15..dfbe368 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -433,3 +433,30 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : WindowsDuplicateString(str1, out); } + +/*********************************************************************** + * WindowsTrimStringEnd (combase.@) + */ +HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) +{ + struct hstring_private *priv1 = impl_from_HSTRING(str1); + struct hstring_private *priv2 = impl_from_HSTRING(str2); + UINT32 len; + + TRACE("(%p, %p, %p)\n", str1, str2, out); + + if (!out || !str2 || !priv2->length) + return E_INVALIDARG; + if (!str1) + { + *out = NULL; + return S_OK; + } + for (len = priv1->length; len > 0; len--) + { + if (!memchrW(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + break; + } + return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : + WindowsDuplicateString(str1, out); +}

1 0

Sebastian Lackner : combase/tests: Add tests for WindowsTrimString{Start, End}.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: d8a2d5eb15b5f16ac01fd34c0ab3bdd12339f109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a2d5eb15b5f16ac01fd34c0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 23:28:08 2016 +0100 combase/tests: Add tests for WindowsTrimString{Start,End}. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index db6c8f5..7a705da 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -42,6 +42,8 @@ static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *); static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); static HRESULT (WINAPI *pWindowsSubstring)(HSTRING, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsSubstringWithSpecifiedLength)(HSTRING, UINT32, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsTrimStringEnd)(HSTRING, HSTRING, HSTRING *); +static HRESULT (WINAPI *pWindowsTrimStringStart)(HSTRING, HSTRING, HSTRING *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -68,6 +70,8 @@ static BOOL init_functions(void) SET(WindowsStringHasEmbeddedNull); SET(WindowsSubstring); SET(WindowsSubstringWithSpecifiedLength); + SET(WindowsTrimStringEnd); + SET(WindowsTrimStringStart); return TRUE; } @@ -456,6 +460,78 @@ static void test_compare(void) ok(res == 0, "Expected 0, got %d\n", res); } +static void test_trim(void) +{ + HSTRING str1, str2, trimmed; + HSTRING_HEADER header1, header2; + + /* Test trimming of string buffers */ + ok(pWindowsCreateString(input_string, 6, &str1) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateString(input_string1, 3, &str2) == S_OK, "Failed to create string\n"); + + ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + check_string(trimmed, input_string2, 3, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + ok(trimmed == str1, "Trimmed string created new string\n"); + check_string(trimmed, input_string, 6, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + + ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n"); + ok(pWindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n"); + + ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + ok(trimmed == str1, "Trimmed string created new string\n"); + check_string(trimmed, input_string, 6, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + check_string(trimmed, input_string1, 3, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + + ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); + + /* Test trimming of string references */ + ok(pWindowsCreateStringReference(input_string, 6, &header1, &str1) == S_OK, "Failed to create string ref\n"); + ok(pWindowsCreateStringReference(input_string1, 3, &header2, &str2) == S_OK, "Failed to create string ref\n"); + + ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + check_string(trimmed, input_string2, 3, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + ok(trimmed != str1, "Trimmed string ref didn't create new string\n"); + check_string(trimmed, input_string, 6, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + + ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n"); + ok(pWindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n"); + + ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + ok(trimmed != str1, "Trimmed string ref didn't create new string\n"); + check_string(trimmed, input_string, 6, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n"); + check_string(trimmed, input_string1, 3, FALSE); + ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n"); + + ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n"); + ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n"); + + /* Test handling of NULL strings */ + ok(pWindowsCreateString(input_string, 6, &str1) == S_OK, "Failed to create string\n"); + ok(pWindowsTrimStringStart(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsTrimStringStart(NULL, str1, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsTrimStringStart(NULL, NULL, &trimmed) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsTrimStringStart(NULL, str1, &trimmed) == S_OK, "Failed to trim empty string\n"); + ok(trimmed == NULL, "Trimming created new string\n"); + ok(pWindowsTrimStringEnd(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsTrimStringEnd(NULL, str1, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsTrimStringEnd(NULL, NULL, &trimmed) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsTrimStringEnd(NULL, str1, &trimmed) == S_OK, "Failed to trim empty string\n"); + ok(trimmed == NULL, "Trimming created new string\n"); + ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); +} + START_TEST(string) { if (!init_functions()) @@ -467,4 +543,5 @@ START_TEST(string) test_substring(); test_concat(); test_compare(); + test_trim(); }

1 0

Sebastian Lackner : ntdll: Implement RtlInterlockedPushListSListEx and fix calling convention of RtlInterlockedPushListSList.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: a4be1ca6db06766f6d35b0fa65afd704115e62a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be1ca6db06766f6d35b0fa6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:52:21 2016 +0100 ntdll: Implement RtlInterlockedPushListSListEx and fix calling convention of RtlInterlockedPushListSList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 ++- dlls/ntdll/rtl.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4e49709..d3cd489 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -706,7 +706,8 @@ @ stdcall RtlInterlockedFlushSList(ptr) @ stdcall RtlInterlockedPopEntrySList(ptr) @ stdcall RtlInterlockedPushEntrySList(ptr ptr) -@ stdcall RtlInterlockedPushListSList(ptr ptr ptr long) +@ stdcall -norelay RtlInterlockedPushListSList(ptr ptr ptr long) +@ stdcall RtlInterlockedPushListSListEx(ptr ptr ptr long) # @ stub RtlInvertRangeList @ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index f699cff..3e985d5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -58,6 +58,16 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; +#ifdef __i386__ +#define DEFINE_FASTCALL4_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 16, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(16)) +#endif + /* CRC polynomial 0xedb88320 */ static const DWORD CRC_table[256] = { @@ -1191,10 +1201,10 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER list) } /************************************************************************* - * RtlInterlockedPushListSList [NTDLL.@] + * RtlInterlockedPushListSListEx [NTDLL.@] */ -PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, - PSLIST_ENTRY last, ULONG count) +PSLIST_ENTRY WINAPI RtlInterlockedPushListSListEx(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) { SLIST_HEADER old, new; @@ -1222,6 +1232,21 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY #endif } +/************************************************************************* + * RtlInterlockedPushListSList [NTDLL.@] + */ +#ifdef DEFINE_FASTCALL4_ENTRYPOINT +DEFINE_FASTCALL4_ENTRYPOINT(RtlInterlockedPushListSList) +PSLIST_ENTRY WINAPI __regs_RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) +#else +PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) +#endif +{ + return RtlInterlockedPushListSListEx(list, first, last, count); +} + /****************************************************************************** * RtlGetCompressionWorkSpaceSize [NTDLL.@] */

1 0

Sebastian Lackner : kernel32/tests: Clean up interlocked SList tests.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 38d0690a2c0f01272a4199e9b73f67b6b83f7fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d0690a2c0f01272a4199e9b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:53:11 2016 +0100 kernel32/tests: Clean up interlocked SList tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 153 +++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 83 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index fc278f8..e2aa3a1 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -261,104 +261,91 @@ static void test_slist(void) { SLIST_ENTRY entry; int value; - } item1, item2, item3, *pitem; - + } item1, item2, item3, *item; SLIST_HEADER slist_header; - PSLIST_ENTRY entry, next; + SLIST_ENTRY *entry; USHORT size; int i; - VOID (WINAPI *pInitializeSListHead)(PSLIST_HEADER); - USHORT (WINAPI *pQueryDepthSList)(PSLIST_HEADER); - PSLIST_ENTRY (WINAPI *pInterlockedFlushSList)(PSLIST_HEADER); - PSLIST_ENTRY (WINAPI *pInterlockedPopEntrySList)(PSLIST_HEADER); - PSLIST_ENTRY (WINAPI *pInterlockedPushEntrySList)(PSLIST_HEADER,PSLIST_ENTRY); - HMODULE kernel32; - - kernel32 = GetModuleHandleA("KERNEL32.DLL"); - pInitializeSListHead = (void*) GetProcAddress(kernel32, "InitializeSListHead"); - pQueryDepthSList = (void*) GetProcAddress(kernel32, "QueryDepthSList"); - pInterlockedFlushSList = (void*) GetProcAddress(kernel32, "InterlockedFlushSList"); - pInterlockedPopEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPopEntrySList"); - pInterlockedPushEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPushEntrySList"); - if (pInitializeSListHead == NULL || - pQueryDepthSList == NULL || - pInterlockedFlushSList == NULL || - pInterlockedPopEntrySList == NULL || - pInterlockedPushEntrySList == NULL) - { - win_skip("some required slist entrypoints were not found, skipping tests\n"); - return; - } - - memset(&slist_header, 0xFF, sizeof(slist_header)); - pInitializeSListHead(&slist_header); - size = pQueryDepthSList(&slist_header); - ok(size == 0, "initially created slist has size %d, expected 0\n", size); - item1.value = 1; - ok(pInterlockedPushEntrySList(&slist_header, &item1.entry) == NULL, - "previous entry in empty slist wasn't NULL\n"); - size = pQueryDepthSList(&slist_header); - ok(size == 1, "slist with 1 item has size %d\n", size); - item2.value = 2; - entry = pInterlockedPushEntrySList(&slist_header, &item2.entry); - ok(entry != NULL, "previous entry in non-empty slist was NULL\n"); - if (entry != NULL) - { - pitem = (struct item*) entry; - ok(pitem->value == 1, "previous entry in slist wasn't the one added\n"); - } - size = pQueryDepthSList(&slist_header); - ok(size == 2, "slist with 2 items has size %d\n", size); - item3.value = 3; - entry = pInterlockedPushEntrySList(&slist_header, &item3.entry); - ok(entry != NULL, "previous entry in non-empty slist was NULL\n"); - if (entry != NULL) - { - pitem = (struct item*) entry; - ok(pitem->value == 2, "previous entry in slist wasn't the one added\n"); - } - size = pQueryDepthSList(&slist_header); - ok(size == 3, "slist with 3 items has size %d\n", size); - - entry = pInterlockedPopEntrySList(&slist_header); - ok(entry != NULL, "entry shouldn't be NULL\n"); - if (entry != NULL) - { - pitem = (struct item*) entry; - ok(pitem->value == 3, "unexpected entry removed\n"); - } - size = pQueryDepthSList(&slist_header); - ok(size == 2, "slist with 2 items has size %d\n", size); - entry = pInterlockedFlushSList(&slist_header); - size = pQueryDepthSList(&slist_header); - ok(size == 0, "flushed slist should be empty, size is %d\n", size); - if (size == 0) - { - ok(pInterlockedPopEntrySList(&slist_header) == NULL, - "popping empty slist didn't return NULL\n"); - } - ok(((struct item*)entry)->value == 2, "item 2 not in front of list\n"); - ok(((struct item*)entry->Next)->value == 1, "item 1 not at the back of list\n"); + memset(&slist_header, 0xff, sizeof(slist_header)); + InitializeSListHead(&slist_header); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item1.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 1, "Expected size == 1, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item2.entry); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 2, "Expected size == 2, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 3, "Expected size == 3, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 2, "Expected size == 2, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); for (i = 0; i < 65536; i++) { - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); - pInterlockedPushEntrySList(&slist_header, entry); + item = HeapAlloc(GetProcessHeap(), 0, sizeof(*item)); + item->value = i + 1; + entry = InterlockedPushEntrySList(&slist_header, &item->entry); + if (i) + { + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == i, "Expected item->value == %u, got %u\n", i, item->value); + } + else + { + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + } + size = QueryDepthSList(&slist_header); + ok(size == ((i + 1) & 0xffff), "Expected size == %u, got %u\n", (i + 1) & 0xffff, size); } - entry = pInterlockedFlushSList(&slist_header); - ok(entry != NULL, "not flushed\n"); - while (entry) + entry = InterlockedFlushSList(&slist_header); + for (i = 65536; i > 0; i--) { - next = entry->Next; - HeapFree(GetProcessHeap(), 0, entry); - entry = next; + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == i, "Expected item->value == %u, got %u\n", i, item->value); + entry = item->entry.Next; + HeapFree(GetProcessHeap(), 0, item); } + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); } static void test_event(void)

1 0

Sebastian Lackner : kernel32/tests: Add tests for RtlInterlockedPushListSList[Ex].
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 32f72989b6bec7f79f434bffc2d4b10358b18a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f72989b6bec7f79f434bffc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:53:49 2016 +0100 kernel32/tests: Add tests for RtlInterlockedPushListSList[Ex]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e2aa3a1..325e1ff 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -28,6 +28,9 @@ #include "wine/test.h" +#undef __fastcall +#define __fastcall __stdcall + static BOOL (WINAPI *pChangeTimerQueueTimer)(HANDLE, HANDLE, ULONG, ULONG); static HANDLE (WINAPI *pCreateTimerQueue)(void); static BOOL (WINAPI *pCreateTimerQueueTimer)(PHANDLE, HANDLE, WAITORTIMERCALLBACK, @@ -61,6 +64,48 @@ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE, BOOLEAN, const LARGE_INTEGER *); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); +static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count); +static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count); + +#ifdef __i386__ + +#include "pshpack1.h" +struct fastcall_thunk +{ + BYTE pop_edx; /* popl %edx (ret addr) */ + BYTE pop_eax; /* popl %eax (func) */ + BYTE pop_ecx; /* popl %ecx (param 1) */ + BYTE xchg[3]; /* xchgl (%esp),%edx (param 2) */ + WORD jmp_eax; /* jmp *%eax */ +}; +#include "poppack.h" + +static void * (WINAPI *call_fastcall_func4)(void *func, const void *a, const void *b, const void *c, const void *d); + +static void init_fastcall_thunk(void) +{ + struct fastcall_thunk *thunk = VirtualAlloc(NULL, sizeof(*thunk), MEM_COMMIT, PAGE_EXECUTE_READWRITE); + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->xchg[0] = 0x87; /* xchgl (%esp),%edx */ + thunk->xchg[1] = 0x14; + thunk->xchg[2] = 0x24; + thunk->jmp_eax = 0xe0ff; /* jmp *%eax */ + call_fastcall_func4 = (void *)thunk; +} + +#define call_func4(func, a, b, c, d) call_fastcall_func4(func, (const void *)(a), \ + (const void *)(b), (const void *)(c), (const void *)(d)) + +#else /* __i386__ */ + +#define init_fastcall_thunk() do { } while(0) +#define call_func4(func, a, b, c, d) func(a, b, c, d) + +#endif /* __i386__ */ static void test_signalandwait(void) { @@ -276,6 +321,7 @@ static void test_slist(void) size = QueryDepthSList(&slist_header); ok(size == 0, "Expected size == 0, got %u\n", size); + /* test PushEntry, PopEntry and Flush */ entry = InterlockedPushEntrySList(&slist_header, &item1.entry); ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); size = QueryDepthSList(&slist_header); @@ -313,6 +359,83 @@ static void test_slist(void) entry = InterlockedPopEntrySList(&slist_header); ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + /* test RtlInterlockedPushListSList */ + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = call_func4(pRtlInterlockedPushListSList, &slist_header, &item2.entry, &item1.entry, 42); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 43, "Expected size == 43, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 42, "Expected size == 42, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 41, "Expected size == 41, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 40, "Expected size == 40, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 40, "Expected size == 40, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 40 || broken(size == 0) /* >= Win 8 */, "Expected size == 40, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item1.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + + /* test RtlInterlockedPushListSListEx */ + if (pRtlInterlockedPushListSListEx) + { + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = pRtlInterlockedPushListSListEx(&slist_header, &item2.entry, &item1.entry, 42); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 43, "Expected size == 43, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + } + else + win_skip("RtlInterlockedPushListSListEx not available, skipping tests\n"); + + /* test with a lot of items */ for (i = 0; i < 65536; i++) { item = HeapAlloc(GetProcessHeap(), 0, sizeof(*item)); @@ -2561,6 +2684,8 @@ START_TEST(sync) pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); + pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); + pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2572,6 +2697,7 @@ START_TEST(sync) return; } + init_fastcall_thunk(); test_signalandwait(); test_mutex(); test_slist();

1 0

Sebastian Lackner : kernel32: Forward InterlockedPushListSList[Ex] to ntdll.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 49051392d79b1e0e0760f1649a47a1d70dcc11d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49051392d79b1e0e0760f1649… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:54:55 2016 +0100 kernel32: Forward InterlockedPushListSList[Ex] to ntdll. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-interlocked-l1-1-0.spec | 2 +- .../api-ms-win-core-interlocked-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec index 9c6d25c..8b2d3ac 100644 --- a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) kernel32.InterlockedPushListSList @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec index f1fbd94..c3e2d0c 100644 --- a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSListEx +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) kernel32.InterlockedPushListSListEx @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b0a6361..9bb3181 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -957,7 +957,8 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -# @ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) ntdll.RtlInterlockedPushListSListEx @ stub InvalidateConsoleDIBits @ stdcall InvalidateNLSCache() @ stdcall IsBadCodePtr(ptr)

1 0

Sebastian Lackner : ntdll: Skip unused import descriptors when loading libraries.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: b89f88841e38e0adc0cd6f35e6e62b00ba19ec41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89f88841e38e0adc0cd6f35e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 17:38:28 2016 +0100 ntdll: Skip unused import descriptors when loading libraries. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index bf1d365..a0049fe 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -564,7 +564,7 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * * Import the dll specified by the given import descriptor. * The loader_section must be locked while calling this function. */ -static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path ) +static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path, WINE_MODREF **pwm ) { NTSTATUS status; WINE_MODREF *wmImp; @@ -586,6 +586,13 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else import_list = thunk_list; + if (!import_list->u1.Ordinal) + { + WARN( "Skipping unused import %s\n", name ); + *pwm = NULL; + return TRUE; + } + while (len && name[len-1] == ' ') len--; /* remove trailing spaces */ if (len * sizeof(WCHAR) < sizeof(buffer)) @@ -597,7 +604,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else /* need to allocate a larger buffer */ { WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (!ptr) return NULL; + if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; status = load_dll( load_path, ptr, 0, &wmImp ); @@ -612,7 +619,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else ERR("Loading library %s (which is needed by %s) failed (error %x).\n", name, debugstr_w(current_modref->ldr.FullDllName.Buffer), status); - return NULL; + return FALSE; } /* unprotect the import address table since it can be located in @@ -693,7 +700,8 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d done: /* restore old protection of the import address table */ NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, &protect_old ); - return wmImp; + *pwm = wmImp; + return TRUE; } @@ -901,8 +909,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + { + wm->deps[i] = NULL; status = STATUS_DLL_NOT_FOUND; + } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Sebastian Lackner : avifil32/tests: Remove a couple of unnecessary tests.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: ec010ce3615d38be79d8f20cbca9a649c5ae2a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec010ce3615d38be79d8f20cb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 07:12:01 2016 +0100 avifil32/tests: Remove a couple of unnecessary tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/tests/api.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 552a356..137062ad8 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -371,11 +371,6 @@ static void test_default_data(void) create_avi_file(&cah, filename); res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); - ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); - ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); - ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); - ok(res != AVIERR_FILEOPEN, "Unable to open file: error4=%u\n", AVIERR_FILEOPEN); - ok(res != REGDB_E_CLASSNOTREG, "Unable to open file: error5=%u\n", REGDB_E_CLASSNOTREG); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream0, 0, 0);

1 0

Sebastian Lackner : crypt32/tests: Remove duplicate test.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 818a1b14f210e7759b831d905c5bd6f78fd49401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818a1b14f210e7759b831d905… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 07:19:10 2016 +0100 crypt32/tests: Remove duplicate test. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index da32a74..58a27df 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3627,7 +3627,6 @@ static void testVerifyRevocation(void) "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); - ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Now add a CRL to the hCrlStore */ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: af41733890b09d61bc49fcf8f2e5af3c0dc573fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=af41733890b09d61bc49fcf8f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 11 08:11:22 2016 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 730d45e..e4a3f46 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-09 21:07+0300\n" +"PO-Revision-Date: 2016-02-11 08:10+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11623,22 +11623,16 @@ msgid "(Default)" msgstr "(numatytoji)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Ar tikrai norite pašalinti šias reikšmes?" +msgstr "Ar tikrai norite pašalinti registro reikšmę „%1“?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Ar tikrai norite pašalinti reikšmę „%s“?" +msgstr "Ar tikrai norite pašalinti visas registro „%1“ reikšmes?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Ar tikrai norite pašalinti „%1“?" +msgstr "Ar tikrai norite pašalinti registro raktą „%1“?" #: regedit.rc:34 msgid "&Registry"

1 0