October 2015 - Wine-Commits

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

Oct. 29, 2015

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

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

Oct. 29, 2015

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

Sebastian Lackner : combase: Implement WindowsConcatString.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

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

Sebastian Lackner : combase/tests: Add tests for WindowsConcatString.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

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

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

Oct. 29, 2015

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

Jacek Caban : kernel32: Pass SYNCHRONIZE access flag to NtCreateFile.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 0c8edbcc80846f9523ac7164a78517c103edd43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8edbcc80846f9523ac7164a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 29 11:52:06 2015 +0100 kernel32: Pass SYNCHRONIZE access flag to NtCreateFile. Office clicktorun patched ntdll functions expect them to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 8 ++++---- dlls/kernel32/path.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index ee43b10..5ea024f 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1574,7 +1574,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &ret, access, &attr, &io, NULL, attributes, + status = NtCreateFile( &ret, access | SYNCHRONIZE, &attr, &io, NULL, attributes, sharing, nt_disposition[creation - CREATE_NEW], options, NULL, 0 ); if (status) @@ -1683,7 +1683,7 @@ BOOL WINAPI DeleteFileW( LPCWSTR path ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | DELETE, + status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); @@ -1826,7 +1826,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } attr.ObjectName = &nt_backup_name; /* Open the backup with permissions to write over it */ - status = NtCreateFile(&hBackup, GENERIC_WRITE, + status = NtCreateFile(&hBackup, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, replaced_info.FileAttributes, FILE_SHARE_WRITE, FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, @@ -2835,7 +2835,7 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access attr.SecurityQualityOfService = NULL; if (sec_attr && sec_attr->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &result, access, &attr, &io, NULL, flags, + status = NtCreateFile( &result, access | SYNCHRONIZE, &attr, &io, NULL, flags, share, OPEN_EXISTING, options, NULL, 0 ); if (status != STATUS_SUCCESS) { diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 09b8b7f..271bcf4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1562,7 +1562,7 @@ BOOL WINAPI CreateDirectoryW( LPCWSTR path, LPSECURITY_ATTRIBUTES sa ) attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, + status = NtCreateFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );

1 0

Martin Storsjo : ucrtbase: Implement vsscanf.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 436eb3639c34c93d55685396be0e1b7d50d76fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436eb3639c34c93d55685396b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Oct 29 12:39:44 2015 +0200 ucrtbase: Implement vsscanf. 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> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 15 +++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 75549a7..2db8222 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ stub __stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ stub __stdio_common_vswprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 5dc6915..9a0150f 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -661,6 +661,21 @@ int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, return res; } + +/********************************************************************* + * __stdio_common_vsscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, + const char *input, MSVCRT_size_t length, + const char *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options != 2) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); +} + /********************************************************************* * _snwscanf (MSVCRT.@) */ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 9e672f3..c1677ca 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ mbcs.c \ misc.c \ process.c \ + scanf.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 067ab23..6877bef 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -159,7 +159,7 @@ @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ stub __stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ stub __stdio_common_vswprintf_s

1 0

Martin Storsjo : ucrtbase: Hook up the terminate function.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

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

Dmitry Timoshkov : ole32: Fallback to parsing the Presentation streams ff parsing of the "CONTENTS" stream fails.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 421b3ca3eb16a3ca254b615f6c7dfc1619c973e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421b3ca3eb16a3ca254b615f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 23 18:32:22 2015 +0800 ole32: Fallback to parsing the Presentation streams ff parsing of the "CONTENTS" stream fails. I have an application that tries to load an existing object from the file using OleLoad() and fails because the "CONTENTS" stream has clsid set to "Microsoft Photo Editor 3.0 Picture". I've dumped the contents of the OLE storage to disk for investigation, and under Windows (where Microsoft Photo Editor is not installed, and registry has no traces of its class guids) OleLoad() is able to load objects from this storage, and after that OleDraw() successfully paints the object contents on the screen. I've written an application to play with the dumped storage, and under Windows the "CONTENTS" stream also can't be loaded, but the storage also contains the "OlePres000" stream which contains an object in CF_METAFILEPICT format, and this one can be loaded and painted. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index caabd10..9284410 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1368,7 +1368,8 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) hr = parse_contents_stream( This, pStg, stm ); IStream_Release( stm ); } - else + + if (FAILED(hr)) hr = parse_pres_streams( This, pStg ); if (SUCCEEDED( hr ))

1 0

Alexandre Julliard : makefiles: Generate rules for installing programs.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: da340169d6518cf42f1cbe169fbf120383202bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da340169d6518cf42f1cbe169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:32:45 2015 +0900 makefiles: Generate rules for installing programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +---- configure.ac | 15 +---- server/Makefile.in | 8 +-- tools/make_makefiles | 5 ++ tools/makedep.c | 135 ++++++++++++++++++++++++++++++++++++-------- tools/widl/Makefile.in | 8 +-- tools/winebuild/Makefile.in | 8 +-- tools/winedump/Makefile.in | 7 +-- tools/winegcc/Makefile.in | 9 ++- tools/winemaker/Makefile.in | 4 +- tools/wmc/Makefile.in | 8 +-- tools/wrc/Makefile.in | 8 +-- 12 files changed, 133 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da340169d6518cf42f1cb…

1 0