February 2016 - Wine-Commits

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

Feb. 11, 2016

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 : combase/tests: Add tests for WindowsTrimString{Start, End}.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

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 : combase: Implement WindowsTrimStringEnd.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

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: Implement WindowsTrimStringStart.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 211b8b5f61e19acc62e4d42cbf765c43b4879d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211b8b5f61e19acc62e4d42cb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 23:27:15 2016 +0100 combase: Implement WindowsTrimStringStart. 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 | 28 ++++++++++++++++++++++ 3 files changed, 30 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 1b661aa..fe63810 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 @@ -24,4 +24,4 @@ @ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring @ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) combase.WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd -@ stub WindowsTrimStringStart +@ stdcall WindowsTrimStringStart(ptr ptr ptr) combase.WindowsTrimStringStart diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 430ca95..69f47d0 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -305,4 +305,4 @@ @ stdcall WindowsSubstring(ptr long ptr) @ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) @ stub WindowsTrimStringEnd -@ stub WindowsTrimStringStart +@ stdcall WindowsTrimStringStart(ptr ptr ptr) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index bd18a73..2d04f15 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -21,6 +21,7 @@ #include "windows.h" #include "winerror.h" #include "hstring.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winstring); @@ -405,3 +406,30 @@ HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *re *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; return S_OK; } + +/*********************************************************************** + * WindowsTrimStringStart (combase.@) + */ +HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) +{ + struct hstring_private *priv1 = impl_from_HSTRING(str1); + struct hstring_private *priv2 = impl_from_HSTRING(str2); + UINT32 start; + + TRACE("(%p, %p, %p)\n", str1, str2, out); + + if (!out || !str2 || !priv2->length) + return E_INVALIDARG; + if (!str1) + { + *out = NULL; + return S_OK; + } + for (start = 0; start < priv1->length; start++) + { + if (!memchrW(priv2->buffer, priv1->buffer[start], priv2->length)) + break; + } + return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : + WindowsDuplicateString(str1, out); +}

1 0

Sebastian Lackner : combase/tests: Add tests for WindowsCompareStringOrdinal.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: f3827dab8f2ed5f678d6f6369ca917e8fb0ae1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3827dab8f2ed5f678d6f6369… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 23:25:48 2016 +0100 combase/tests: Add tests for WindowsCompareStringOrdinal. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 8e112c3..db6c8f5 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -27,6 +27,7 @@ #include "wine/test.h" +static HRESULT (WINAPI *pWindowsCompareStringOrdinal)(HSTRING, HSTRING, INT32 *); static HRESULT (WINAPI *pWindowsConcatString)(HSTRING, HSTRING, HSTRING *); static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *); @@ -52,6 +53,7 @@ static BOOL init_functions(void) win_skip("Failed to load combase.dll, skipping tests\n"); return FALSE; } + SET(WindowsCompareStringOrdinal); SET(WindowsConcatString); SET(WindowsCreateString); SET(WindowsCreateStringReference); @@ -394,6 +396,66 @@ static void test_concat(void) ok(concat == NULL, "Concatenate created new string\n"); } +static void test_compare(void) +{ + HSTRING str1, str2; + HSTRING_HEADER header1, header2; + INT32 res; + + /* Test comparison of string buffers */ + ok(pWindowsCreateString(input_string1, 3, &str1) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n"); + + ok(pWindowsCompareStringOrdinal(str1, str1, &res) == S_OK, "Failed to compare string\n"); + ok(res == 0, "Expected 0, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str1, str2, &res) == S_OK, "Failed to compare string\n"); + ok(res == -1, "Expected -1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str2, str1, &res) == S_OK, "Failed to compare string\n"); + ok(res == 1, "Expected 1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str2, str2, &res) == S_OK, "Failed to compare string\n"); + ok(res == 0, "Expected 0, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str1, NULL, &res) == S_OK, "Failed to compare string\n"); + ok(res == 1, "Expected 1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(NULL, str1, &res) == S_OK, "Failed to compare string\n"); + ok(res == -1, "Expected -1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str2, NULL, &res) == S_OK, "Failed to compare string\n"); + ok(res == 1, "Expected 1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(NULL, str2, &res) == S_OK, "Failed to compare string\n"); + ok(res == -1, "Expected -1, got %d\n", res); + + ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); + + /* Test comparison of string references */ + ok(pWindowsCreateStringReference(input_string1, 3, &header1, &str1) == S_OK, "Failed to create string ref\n"); + ok(pWindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n"); + + ok(pWindowsCompareStringOrdinal(str1, str1, &res) == S_OK, "Failed to compare string\n"); + ok(res == 0, "Expected 0, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str1, str2, &res) == S_OK, "Failed to compare string\n"); + ok(res == -1, "Expected -1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str2, str1, &res) == S_OK, "Failed to compare string\n"); + ok(res == 1, "Expected 1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str2, str2, &res) == S_OK, "Failed to compare string\n"); + ok(res == 0, "Expected 0, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str1, NULL, &res) == S_OK, "Failed to compare string\n"); + ok(res == 1, "Expected 1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(NULL, str1, &res) == S_OK, "Failed to compare string\n"); + ok(res == -1, "Expected -1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(str2, NULL, &res) == S_OK, "Failed to compare string\n"); + ok(res == 1, "Expected 1, got %d\n", res); + ok(pWindowsCompareStringOrdinal(NULL, str2, &res) == S_OK, "Failed to compare string\n"); + ok(res == -1, "Expected -1, got %d\n", res); + + ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n"); + ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n"); + + /* Test comparison of two empty strings */ + ok(pWindowsCompareStringOrdinal(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsCompareStringOrdinal(NULL, NULL, &res) == S_OK, "Failed to compare NULL string\n"); + ok(res == 0, "Expected 0, got %d\n", res); +} + START_TEST(string) { if (!init_functions()) @@ -404,4 +466,5 @@ START_TEST(string) test_string_buffer(); test_substring(); test_concat(); + test_compare(); }

1 0

Sebastian Lackner : combase: Implement WindowsCompareStringOrdinal.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: e39405d44db8fa59a6f46b904fdb80ff29dc1866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39405d44db8fa59a6f46b904… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 23:25:23 2016 +0100 combase: Implement WindowsCompareStringOrdinal. 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 | 33 ++++++++++++++++++++++ include/winnls.h | 1 + 4 files changed, 36 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 fa048d8..1b661aa 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 @@ -6,7 +6,7 @@ @ stub HSTRING_UserSize64 @ stub HSTRING_UserUnmarshal @ stub HSTRING_UserUnmarshal64 -@ stub WindowsCompareStringOrdinal +@ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) combase.WindowsCompareStringOrdinal @ stdcall WindowsConcatString(ptr ptr ptr) combase.WindowsConcatString @ stdcall WindowsCreateString(wstr long ptr) combase.WindowsCreateString @ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 5082f39..430ca95 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -287,7 +287,7 @@ @ stub WdtpInterfacePointer_UserSize64 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) ole32.WdtpInterfacePointer_UserUnmarshal @ stub WdtpInterfacePointer_UserUnmarshal64 -@ stub WindowsCompareStringOrdinal +@ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) @ stdcall WindowsConcatString(ptr ptr ptr) @ stdcall WindowsCreateString(wstr long ptr) @ stdcall WindowsCreateStringReference(wstr long ptr ptr) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index dd7c8e9..bd18a73 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -372,3 +372,36 @@ BOOL WINAPI WindowsIsStringEmpty(HSTRING str) return TRUE; return priv->length == 0; } + +/*********************************************************************** + * WindowsCompareStringOrdinal (combase.@) + */ +HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *res) +{ + struct hstring_private *priv1 = impl_from_HSTRING(str1); + struct hstring_private *priv2 = impl_from_HSTRING(str2); + const WCHAR *buf1 = empty, *buf2 = empty; + UINT32 len1 = 0, len2 = 0; + + TRACE("(%p, %p, %p)\n", str1, str2, res); + + if (res == NULL) + return E_INVALIDARG; + if (str1 == str2) + { + *res = 0; + return S_OK; + } + if (str1) + { + buf1 = priv1->buffer; + len1 = priv1->length; + } + if (str2) + { + buf2 = priv2->buffer; + len2 = priv2->length; + } + *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; + return S_OK; +} diff --git a/include/winnls.h b/include/winnls.h index 603c408..6e5897b 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -831,6 +831,7 @@ WINBASEAPI INT WINAPI CompareStringA(LCID,DWORD,LPCSTR,INT,LPCSTR,INT); WINBASEAPI INT WINAPI CompareStringW(LCID,DWORD,LPCWSTR,INT,LPCWSTR,INT); #define CompareString WINELIB_NAME_AW(CompareString) WINBASEAPI INT WINAPI CompareStringEx(LPCWSTR,DWORD,LPCWSTR,INT,LPCWSTR,INT,LPNLSVERSIONINFO,LPVOID,LPARAM); +WINBASEAPI INT WINAPI CompareStringOrdinal(const WCHAR *,INT,const WCHAR *,INT,BOOL); WINBASEAPI LCID WINAPI ConvertDefaultLocale(LCID); WINBASEAPI BOOL WINAPI EnumCalendarInfoA(CALINFO_ENUMPROCA,LCID,CALID,CALTYPE); WINBASEAPI BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CALTYPE);

1 0

Andrew Eikum : wineoss.drv: Avoid potential overflow (Coverity).
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: b2caf7513a3851289766d09d3fa9da9a2814c940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2caf7513a3851289766d09d3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:51 2016 -0600 wineoss.drv: Avoid potential overflow (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d2a0c86..bbac32e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1203,7 +1203,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, /* pretend we process audio in Period chunks, so max latency includes * the period time. Some native machines add .6666ms in shared mode. */ - *latency = This->period_us * 10 + 6666; + *latency = (REFERENCE_TIME)This->period_us * 10 + 6666; LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : xaudio2: Protect access to submix voice during creation ( Coverity).
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 7bb885a3d3ac4fdc435fc79fc5632b6b9e70ffa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb885a3d3ac4fdc435fc79fc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:40 2016 -0600 xaudio2: Protect access to submix voice during creation (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0c39354..503c974 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1475,8 +1475,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(sub, &This->submix_voices, XA2SubmixImpl, entry){ + EnterCriticalSection(&sub->lock); if(!sub->in_use) break; + LeaveCriticalSection(&sub->lock); } if(&sub->entry == &This->submix_voices){ @@ -1498,11 +1500,14 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, InitializeCriticalSection(&sub->lock); sub->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SubmixImpl.lock"); + + EnterCriticalSection(&sub->lock); } sub->in_use = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&sub->lock); #if XAUDIO2_VER == 0 *ppSubmixVoice = (IXAudio2SubmixVoice*)&sub->IXAudio20SubmixVoice_iface;

1 0

Andrew Eikum : dsound: Avoid NULL pointer dereference (Coverity).
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 468477b69410f3f9731b4f9fec568945acb8e1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=468477b69410f3f9731b4f9fe… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:04 2016 -0600 dsound: Avoid NULL pointer dereference (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 2a80c3f..e85a5d1 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1205,9 +1205,9 @@ HRESULT IDirectSoundBufferImpl_Duplicate( HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; - } + }else + IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); - IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); *ppdsb = dsb; return hres; }

1 0

Andrew Eikum : winmm: Reset dwUser in mixerGetLineInfo.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 992e3c5dc8b1c5d52cffef96e7452cb17300e472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992e3c5dc8b1c5d52cffef96e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:33:23 2016 -0600 winmm: Reset dwUser in mixerGetLineInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mixer.c | 4 ++++ dlls/winmm/waveform.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 82eb338..f03a71e 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -438,11 +438,13 @@ static void mixer_test_deviceA(int device) mixerlineA.cbStruct = sizeof(mixerlineA); mixerlineA.dwDestination=d; + mixerlineA.dwUser = (ULONG_PTR)0xdeadbeef; rc = mixerGetLineInfoA(mix, &mixerlineA, MIXER_GETLINEINFOF_DESTINATION); ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER, "mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + ok(mixerlineA.dwUser == 0, "dwUser was not reset\n"); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); else if (rc==MMSYSERR_NOERROR) { @@ -822,11 +824,13 @@ static void mixer_test_deviceW(int device) mixerlineW.cbStruct = sizeof(mixerlineW); mixerlineW.dwDestination=d; + mixerlineW.dwUser = (ULONG_PTR)0xdeadbeef; rc = mixerGetLineInfoW(mix, &mixerlineW, MIXER_GETLINEINFOF_DESTINATION); ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER, "mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + ok(mixerlineW.dwUser == 0, "dwUser was not reset\n"); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); else if (rc==MMSYSERR_NOERROR && winetest_interactive) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 93a5004..a4917a2 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -4287,6 +4287,8 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo if(!mmdevice) return MMSYSERR_INVALHANDLE; + lpmliW->dwUser = 0; + switch(fdwInfo & MIXER_GETLINEINFOF_QUERYMASK){ case MIXER_GETLINEINFOF_DESTINATION: return WINMM_GetDestinationLineInfo(mmdevice, mmdev_index, lpmliW,

1 0