wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Anton Baskanov : quartz/tests: Test that MPEG-1 Stream Splitter implements IAMStreamSelect.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 9e8eb72210e7245718e5e15d3ed19d0696e9bcfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8eb72210e7245718e5e15d3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 28 23:02:54 2015 +0600 quartz/tests: Test that MPEG-1 Stream Splitter implements IAMStreamSelect. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/mpegsplit.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 05bfda9..572b729 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ filtermapper.c \ memallocator.c \ misc.c \ + mpegsplit.c \ referenceclock.c \ videorenderer.c diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c new file mode 100644 index 0000000..591e527 --- /dev/null +++ b/dlls/quartz/tests/mpegsplit.c @@ -0,0 +1,58 @@ +/* + * Unit tests for the MPEG-1 stream splitter functions + * + * Copyright 2015 Anton Baskanov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "wine/test.h" +#include "dshow.h" + +static IUnknown *create_mpeg_splitter(void) +{ + IUnknown *mpeg_splitter = NULL; + HRESULT result = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&mpeg_splitter); + ok(S_OK == result, "got 0x%08x\n", result); + return mpeg_splitter; +} + +static void test_query_interface(void) +{ + IUnknown *mpeg_splitter = create_mpeg_splitter(); + + IAMStreamSelect *stream_select = NULL; + HRESULT result = IUnknown_QueryInterface( + mpeg_splitter, &IID_IAMStreamSelect, (void **)&stream_select); + ok(S_OK == result, "got 0x%08x\n", result); + if (S_OK == result) + { + IAMStreamSelect_Release(stream_select); + } + + IUnknown_Release(mpeg_splitter); +} + +START_TEST(mpegsplit) +{ + CoInitialize(NULL); + + test_query_interface(); + + CoUninitialize(); +}

1 0

Michael Stefaniuc : oleaut32: Remove an always true if-subcondition ( PVS-Studio).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 45839dccee543f8dbb28ac8f93e2cc921efa12ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=45839dccee543f8dbb28ac8f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 29 10:37:50 2015 +0100 oleaut32: Remove an always true if-subcondition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8ca9cf9..b31e8bc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3606,7 +3606,7 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result) } /* Determine return type */ - if (!(rightvt == VT_EMPTY)) + if (rightvt != VT_EMPTY) { if (leftvt == VT_NULL || rightvt == VT_NULL) { @@ -3639,7 +3639,7 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result) else if (leftvt == VT_R4 || rightvt == VT_R4) resvt = VT_R4; } - else if (leftvt == VT_NULL && rightvt == VT_EMPTY) + else if (leftvt == VT_NULL) { V_VT(result) = VT_NULL; hres = S_OK;

1 0

Martin Storsjo : ucrtbase: Hook up the terminate function.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 662f62faa949c8c7c2b26f29403cf8cae12557a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662f62faa949c8c7c2b26f294… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Oct 28 11:39:11 2015 +0200 ucrtbase: Hook up the terminate function. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 2f0bb33..d52b81b 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -104,4 +104,4 @@ @ cdecl strerror(long) ucrtbase.strerror @ cdecl strerror_s(ptr long long) ucrtbase.strerror_s @ cdecl system(str) ucrtbase.system -@ stub terminate +@ cdecl terminate() ucrtbase.terminate diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c19c864..067ab23 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2532,7 +2532,7 @@ @ cdecl -arch=arm,x86_64 tanf(float) MSVCRT_tanf @ cdecl tanh(double) MSVCRT_tanh @ cdecl -arch=arm,x86_64 tanhf(float) MSVCRT_tanhf -@ stub terminate +@ cdecl terminate() MSVCRT_terminate @ stub tgamma @ stub tgammaf @ stub tgammal

1 0

Sebastian Lackner : combase/tests: Add tests for WindowsConcatString.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 55149dc2c4727ff0ee547328597d11882ef58cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=55149dc2c4727ff0ee5473285… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 29 05:07:23 2015 +0100 combase/tests: Add tests for WindowsConcatString. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 7af5f7e..8e112c3 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -27,6 +27,7 @@ #include "wine/test.h" +static HRESULT (WINAPI *pWindowsConcatString)(HSTRING, HSTRING, HSTRING *); static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *); static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); @@ -51,6 +52,7 @@ static BOOL init_functions(void) win_skip("Failed to load combase.dll, skipping tests\n"); return FALSE; } + SET(WindowsConcatString); SET(WindowsCreateString); SET(WindowsCreateStringReference); SET(WindowsDeleteString); @@ -94,6 +96,8 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, } static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; +static const WCHAR input_string1[] = { 'a', 'b', 'c', '\0' }; +static const WCHAR input_string2[] = { 'd', 'e', 'f', '\0' }; static const WCHAR input_empty_string[] = { '\0' }; static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; static const WCHAR output_substring[] = { 'c', 'd', 'e', 'f', '\0' }; @@ -334,6 +338,62 @@ static void test_substring(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); } +static void test_concat(void) +{ + HSTRING str1, str2, concat; + HSTRING_HEADER header1, header2; + + /* Test concatenation 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(pWindowsConcatString(str1, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsConcatString(str1, NULL, &concat) == S_OK, "Failed to concatenate string\n"); + ok(str1 == concat, "Concatenate created new string\n"); + check_string(concat, input_string1, 3, FALSE); + ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n"); + + ok(pWindowsConcatString(NULL, str2, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsConcatString(NULL, str2, &concat) == S_OK, "Failed to concatenate string\n"); + ok(str2 == concat, "Concatenate created new string\n"); + check_string(concat, input_string2, 3, FALSE); + ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n"); + + ok(pWindowsConcatString(str1, str2, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsConcatString(str1, str2, &concat) == S_OK, "Failed to concatenate string\n"); + check_string(concat, input_string, 6, FALSE); + ok(pWindowsDeleteString(concat) == 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 concatenation 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(pWindowsConcatString(str1, NULL, &concat) == S_OK, "Failed to concatenate string\n"); + ok(str1 != concat, "Concatenate string ref didn't create new string\n"); + check_string(concat, input_string1, 3, FALSE); + ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n"); + + ok(pWindowsConcatString(NULL, str2, &concat) == S_OK, "Failed to concatenate string\n"); + ok(str2 != concat, "Concatenate string ref didn't create new string\n"); + check_string(concat, input_string2, 3, FALSE); + ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n"); + + ok(pWindowsConcatString(str1, str2, &concat) == S_OK, "Failed to concatenate string\n"); + check_string(concat, input_string, 6, FALSE); + ok(pWindowsDeleteString(concat) == 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 concatenation of two empty strings */ + ok(pWindowsConcatString(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsConcatString(NULL, NULL, &concat) == S_OK, "Failed to concatenate string\n"); + ok(concat == NULL, "Concatenate created new string\n"); +} + START_TEST(string) { if (!init_functions()) @@ -343,4 +403,5 @@ START_TEST(string) test_access(); test_string_buffer(); test_substring(); + test_concat(); }

1 0

Sebastian Lackner : combase: Implement WindowsConcatString.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 63f95fedfe29572c6c369ff38ba10e7539952124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f95fedfe29572c6c369ff38… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 29 05:07:17 2015 +0100 combase: Implement WindowsConcatString. 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 | 30 ++++++++++++++++++++++ 3 files changed, 32 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 dc67deb..fa048d8 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 @@ -7,7 +7,7 @@ @ stub HSTRING_UserUnmarshal @ stub HSTRING_UserUnmarshal64 @ stub WindowsCompareStringOrdinal -@ stub WindowsConcatString +@ stdcall WindowsConcatString(ptr ptr ptr) combase.WindowsConcatString @ stdcall WindowsCreateString(wstr long ptr) combase.WindowsCreateString @ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference @ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index fcd5947..6a76b2d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -288,7 +288,7 @@ @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) ole32.WdtpInterfacePointer_UserUnmarshal @ stub WdtpInterfacePointer_UserUnmarshal64 @ stub WindowsCompareStringOrdinal -@ stub WindowsConcatString +@ stdcall WindowsConcatString(ptr ptr ptr) @ stdcall WindowsCreateString(wstr long ptr) @ stdcall WindowsCreateStringReference(wstr long ptr ptr) @ stdcall WindowsDeleteString(ptr) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 99cd591..dd7c8e9 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -330,6 +330,36 @@ HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UI } /*********************************************************************** + * WindowsConcatString (combase.@) + */ +HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out) +{ + struct hstring_private *priv1 = impl_from_HSTRING(str1); + struct hstring_private *priv2 = impl_from_HSTRING(str2); + struct hstring_private *priv; + + TRACE("(%p, %p, %p)\n", str1, str2, out); + + if (out == NULL) + return E_INVALIDARG; + if (str1 == NULL) + return WindowsDuplicateString(str2, out); + if (str2 == NULL) + return WindowsDuplicateString(str1, out); + if (!priv1->length && !priv2->length) + { + *out = NULL; + return S_OK; + } + if (!alloc_string(priv1->length + priv2->length, out)) + return E_OUTOFMEMORY; + priv = impl_from_HSTRING(*out); + memcpy(priv->buffer, priv1->buffer, priv1->length * sizeof(*priv1->buffer)); + memcpy(priv->buffer + priv1->length, priv2->buffer, priv2->length * sizeof(*priv2->buffer)); + return S_OK; +} + +/*********************************************************************** * WindowsIsStringEmpty (combase.@) */ BOOL WINAPI WindowsIsStringEmpty(HSTRING str)

1 0

Nikolay Sivov : dwrite/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 4afb30c544873d3949d4e39654419e15f5876919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afb30c544873d3949d4e3965… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 10:20:55 2015 +0300 dwrite/tests: Fixed some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 41d848e..8c03977 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1846,6 +1846,7 @@ static void test_CustomFontCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists, "got %d\n", exists); EXPECT_REF(string, 1); + IDWriteLocalizedStrings_Release(string); family3 = NULL; hr = IDWriteFont_GetFontFamily(idfont, &family3); @@ -2869,6 +2870,7 @@ static void test_CreateStreamFromKey(void) ok(writetime != 0, "got %08x%08x\n", (UINT)(writetime >> 32), (UINT)writetime); IDWriteFontFileStream_Release(stream); + IDWriteFontFile_Release(file); IDWriteLocalFontFileLoader_Release(localloader); IDWriteFactory_Release(factory); @@ -2947,6 +2949,7 @@ static void test_ReadFileFragment(void) ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFile_Release(file); IDWriteFontFileStream_Release(stream); IDWriteLocalFontFileLoader_Release(localloader); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Fail earlier in TranslateColorGlyphRun() for fonts without color info.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 9441b26dc5829a3b4e24ac051a5e444e42ebff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9441b26dc5829a3b4e24ac051… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 10:20:54 2015 +0300 dwrite: Fail earlier in TranslateColorGlyphRun() for fonts without color info. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 +++++++++++++++ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0e3c09a..97ea039 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4556,8 +4556,23 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R DWRITE_MEASURING_MODE mode, const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **ret) { struct dwrite_colorglyphenum *colorglyphenum; + IDWriteFontFace2 *fontface2; + BOOL colorfont; + HRESULT hr; *ret = NULL; + + hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void**)&fontface2); + if (FAILED(hr)) { + WARN("failed to get IDWriteFontFace2, 0x%08x\n", hr); + return hr; + } + + colorfont = IDWriteFontFace2_IsColorFont(fontface2); + IDWriteFontFace2_Release(fontface2); + if (!colorfont) + return DWRITE_E_NOCOLOR; + colorglyphenum = heap_alloc(sizeof(*colorglyphenum)); if (!colorglyphenum) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e03c819..41d848e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5074,10 +5074,8 @@ static void test_TranslateColorGlyphRun(void) layers = (void*)0xdeadbeef; hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); -todo_wine { ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); ok(layers == NULL, "got %p\n", layers); -} IDWriteFontFace_Release(fontface); /* Segoe UI Emoji, with color support */

1 0

Nikolay Sivov : dwrite: Fix streams and files pointer arrays leak ( Valgrind).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: d829c50cbea22fb8eaf023401c32f4e3758a6e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d829c50cbea22fb8eaf023401… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 10:20:53 2015 +0300 dwrite: Fix streams and files pointer arrays leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 22de471..0e3c09a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -431,6 +431,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->files[i]) IDWriteFontFile_Release(This->files[i]); } + heap_free(This->streams); + heap_free(This->files); for (i = 0; i < sizeof(This->glyphs)/sizeof(This->glyphs[0]); i++) heap_free(This->glyphs[i]);

1 0

Nikolay Sivov : shell32: Fix temporary item array leak (Valgrind).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 4e88852415dd72a77eec3eca8903310550527c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e88852415dd72a77eec3eca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 12:23:57 2015 +0300 shell32: Fix temporary item array leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index f64c2d0..d688f17 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1197,6 +1197,7 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, ppsiItemArray); + HeapFree(GetProcessHeap(), 0, array); if(SUCCEEDED(ret)) return ret; } @@ -1310,6 +1311,7 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, psia); + HeapFree(GetProcessHeap(), 0, array); if(SUCCEEDED(ret)) return ret; }

1 0

Martin Storsjo : combase: Fix cornercase error handling in WindowsCreateStringReference.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: bcac15a56f6c10060789ace85ed9730a49f3d001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcac15a56f6c10060789ace85… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Oct 29 10:21:22 2015 +0200 combase: Fix cornercase error handling in WindowsCreateStringReference. When WindowsCreateStringReference is given a non-null input string, the input string must be null terminated at the given length, even if the input length is zero. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/string.c | 4 ++-- dlls/combase/tests/string.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 49d7695..99cd591 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -105,6 +105,8 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, if (out == NULL || header == NULL) return E_INVALIDARG; + if (ptr != NULL && ptr[len] != '\0') + return E_INVALIDARG; if (len == 0) { *out = NULL; @@ -112,8 +114,6 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, } if (ptr == NULL) return E_POINTER; - if (ptr[len] != '\0') - return E_INVALIDARG; priv->buffer = (LPWSTR)ptr; priv->length = len; priv->reference = TRUE; diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 5a59b50..7af5f7e 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -124,6 +124,9 @@ static void test_create_delete(void) * length. According to MSDN this should be E_INVALIDARG, but it returns * 0x80000017 in practice. */ ok(FAILED(pWindowsCreateStringReference(input_string, 5, &header, &str)), "Incorrect error handling\n"); + /* If the input string is non-null, it must be null-terminated even if the + * length is zero. */ + ok(FAILED(pWindowsCreateStringReference(input_string, 0, &header, &str)), "Incorrect error handling\n"); ok(pWindowsCreateStringReference(input_string, 6, NULL, &str) == E_INVALIDARG, "Incorrect error handling\n"); ok(pWindowsCreateStringReference(input_string, 6, &header, NULL) == E_INVALIDARG, "Incorrect error handling\n"); ok(pWindowsCreateStringReference(NULL, 6, &header, &str) == E_POINTER, "Incorrect error handling\n"); @@ -138,9 +141,21 @@ static void test_create_delete(void) ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + ok(pWindowsCreateString(input_string, 0, &str) == S_OK, "Failed to create string\n"); + ok(str == NULL, "Empty string not a null string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + ok(pWindowsCreateStringReference(input_empty_string, 0, &header, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsCreateString(NULL, 0, &str) == S_OK, "Failed to create string\n"); + ok(str == NULL, "Empty string not a null string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsCreateStringReference(NULL, 0, &header, &str) == S_OK, "Failed to create string\n"); + ok(str == NULL, "Empty string not a null string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); } static void test_duplicate(void)

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015