wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Giovanni Mascellani : d2d1: Implement ellipse and rounded rectangle stroking with arcs.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 873e3d0691d8a5fb2012d541369ae7ed3e39cfc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=873e3d0691d8a5fb2012d541… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Mar 3 18:59:47 2020 +0100 d2d1: Implement ellipse and rounded rectangle stroking with arcs. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 13 +- dlls/d2d1/device.c | 313 ++++++++++++++++++++++++++++++++++++++++------- dlls/d2d1/geometry.c | 82 ++++++++++--- 3 files changed, 345 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=873e3d0691d8a5fb2012…

1 0

Giovanni Mascellani : d2d1: Implement ellipse and rounded rectangle filling with arcs.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: a6bf2c429eb726aef9cb01da49f51d952d31ce4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf2c429eb726aef9cb01da… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Mar 3 18:59:46 2020 +0100 d2d1: Implement ellipse and rounded rectangle filling with arcs. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 3 +- dlls/d2d1/d2d1_private.h | 15 ++++--- dlls/d2d1/device.c | 111 ++++++++++++++++++++++++++++++++--------------- dlls/d2d1/geometry.c | 30 ++++++------- dlls/d2d1/tests/d2d1.c | 14 +++--- 5 files changed, 110 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6bf2c429eb726aef9cb…

1 0

Zebediah Figura : kernel32: Reimplement CreateHardLink() on top of NtSetInformationFile(FileLinkInformation).
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 4e98b0810bb0fcaf5e3acae0f4eccf38710de9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e98b0810bb0fcaf5e3acae0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 23:20:37 2020 -0600 kernel32: Reimplement CreateHardLink() on top of NtSetInformationFile(FileLinkInformation). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c50b631d7c..617b14a717 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -663,10 +663,13 @@ BOOL WINAPI MoveFileA( LPCSTR source, LPCSTR dest ) BOOL WINAPI CreateHardLinkW(LPCWSTR lpFileName, LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - NTSTATUS status; UNICODE_STRING ntDest, ntSource; - ANSI_STRING unixDest, unixSource; + FILE_LINK_INFORMATION *info = NULL; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; BOOL ret = FALSE; + HANDLE file; + ULONG size; TRACE("(%s, %s, %p)\n", debugstr_w(lpFileName), debugstr_w(lpExistingFileName), lpSecurityAttributes); @@ -679,37 +682,30 @@ BOOL WINAPI CreateHardLinkW(LPCWSTR lpFileName, LPCWSTR lpExistingFileName, goto err; } - unixSource.Buffer = unixDest.Buffer = NULL; - status = wine_nt_to_unix_file_name( &ntSource, &unixSource, FILE_OPEN, FALSE ); - if (!status) + size = offsetof( FILE_LINK_INFORMATION, FileName ) + ntDest.Length; + if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) { - status = wine_nt_to_unix_file_name( &ntDest, &unixDest, FILE_CREATE, FALSE ); - if (!status) /* destination must not exist */ - { - status = STATUS_OBJECT_NAME_EXISTS; - } else if (status == STATUS_NO_SUCH_FILE) - { - status = STATUS_SUCCESS; - } + SetLastError( ERROR_OUTOFMEMORY ); + goto err; } - if (status) - SetLastError( RtlNtStatusToDosError(status) ); - else if (!link( unixSource.Buffer, unixDest.Buffer )) - { - TRACE("Hardlinked '%s' to '%s'\n", debugstr_a( unixDest.Buffer ), - debugstr_a( unixSource.Buffer )); - ret = TRUE; - } - else - FILE_SetDosError(); + InitializeObjectAttributes( &attr, &ntSource, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (!(ret = set_ntstatus( NtOpenFile( &file, SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT ) ))) + goto err; + + info->ReplaceIfExists = FALSE; + info->RootDirectory = NULL; + info->FileNameLength = ntDest.Length; + memcpy( info->FileName, ntDest.Buffer, ntDest.Length ); + ret = set_ntstatus( NtSetInformationFile( file, &io, info, size, FileLinkInformation ) ); - RtlFreeAnsiString( &unixSource ); - RtlFreeAnsiString( &unixDest ); + NtClose( file ); err: RtlFreeUnicodeString( &ntSource ); RtlFreeUnicodeString( &ntDest ); + HeapFree( GetProcessHeap(), 0, info ); return ret; }

1 0

Zebediah Figura : kernel32/tests: Add some tests for hard links.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: ee31a622b83d32a9edc454252da7b419d86c0b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee31a622b83d32a9edc45425… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 23:20:36 2020 -0600 kernel32/tests: Add some tests for hard links. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 110082a9c4..1f70433787 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -117,6 +117,13 @@ static void InitFunctionPointers(void) pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } +static void create_file( const char *path ) +{ + FILE *f = fopen( path, "wb" ); + fputs( path, f ); + fclose( f ); +} + static void test__hread( void ) { HFILE filehandle; @@ -5510,6 +5517,80 @@ static void test_SetFileTime(void) CloseHandle(hfile); } +static void test_hard_link(void) +{ + char cwd[MAX_PATH], temp_dir[MAX_PATH], name_buffer[200], buffer[20]; + FILE_NAME_INFORMATION *name_info = (FILE_NAME_INFORMATION *)name_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + DWORD size; + BOOL ret; + + GetCurrentDirectoryA( sizeof(cwd), cwd ); + GetTempPathA( sizeof(temp_dir), temp_dir ); + SetCurrentDirectoryA( temp_dir ); + + ret = CreateDirectoryA( "winetest_dir1", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + ret = CreateDirectoryA( "winetest_dir2", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + create_file( "winetest_file1" ); + create_file( "winetest_file2" ); + + ret = CreateHardLinkA( "winetest_file3", "winetest_file1", NULL ); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA( "winetest_file3", FILE_READ_DATA, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name_buffer, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(!wcsncmp(name_info->FileName + (name_info->FileNameLength / sizeof(WCHAR)) - wcslen(L"\\winetest_file3"), + L"\\winetest_file3", wcslen(L"\\winetest_file3")), "got name %s\n", + debugstr_wn(name_info->FileName, name_info->FileNameLength / sizeof(WCHAR))); + + ret = ReadFile( file, buffer, sizeof(buffer), &size, NULL ); + ok(ret, "got error %u\n", GetLastError()); + ok(!memcmp( buffer, "winetest_file1", size ), "got file contents %s\n", debugstr_an( buffer, size )); + + CloseHandle( file ); + + ret = DeleteFileA( "winetest_file3" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file2", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_file3", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir2", "winetest_dir1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED + || GetLastError() == ERROR_ALREADY_EXISTS /* XP */, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "winetest_dir1", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA( "winetest_dir1" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = RemoveDirectoryA( "winetest_dir2" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file1" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file2" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + SetCurrentDirectoryA( cwd ); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5584,4 +5665,5 @@ START_TEST(file) test_find_file_stream(); test_SetFileTime(); test_ReOpenFile(); + test_hard_link(); }

1 0

Ziqing Hui : comctl32/tests: Remove duplicate line in imagelist.c.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: d26a23d7405ee45ef15f06ec13eb3d3c076ae4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26a23d7405ee45ef15f06ec… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Mar 4 11:21:20 2020 +0800 comctl32/tests: Remove duplicate line in imagelist.c. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index aa563574ed..d4da38b151 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2460,7 +2460,6 @@ static void init_functions(void) X(ImageList_AddMasked); X(ImageList_DrawIndirect); X(ImageList_SetImageCount); - X(ImageList_SetImageCount); X2(ImageList_SetColorTable, 390); X(ImageList_GetFlags); X(ImageList_BeginDrag);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 3b0db0ce34b9696c5e4336edccae975617358fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0db0ce34b9696c5e4336ed… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 4 09:19:57 2020 +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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index 24529763a0..24b9a18c50 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2020. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-26 10:03+0200\n" +"PO-Revision-Date: 2020-03-04 09:19+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8437,7 +8437,7 @@ msgstr "Išrinkite tiekėją." msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "Tiekėjas nebeprieinamas. Įsitikinkite, kad tiekėjas įdiegtas tinkamai." #: version.rc:36 msgid "Data Link Properties"

1 0

Nikolay Sivov : mf/tests: Fix a test failure on older versions.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 044520a4f77dc04cc2b2853d492fd2219e84c67f URL: https://source.winehq.org/git/wine.git/?a=commit;h=044520a4f77dc04cc2b2853d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 11:06:07 2020 +0300 mf/tests: Fix a test failure on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aa72e71292..cf98f3d03f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1138,7 +1138,7 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetClock(session, &clock); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN || broken(hr == E_UNEXPECTED) /* Win7 */, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetSessionCapabilities(session, &caps); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Implement MFGetSupportedMimeTypes()/MFGetSupportedSchemes().
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 18cf1debeb32190cad0ddaa18ac92262db3130ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=18cf1debeb32190cad0ddaa1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 11:06:06 2020 +0300 mf: Implement MFGetSupportedMimeTypes()/MFGetSupportedSchemes(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 34 +++++++++++++++ include/mfidl.idl | 1 + 5 files changed, 153 insertions(+), 5 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index d23349c9cf..fe156e43ab 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,6 +1,6 @@ MODULE = mf.dll IMPORTLIB = mf -IMPORTS = mfplat ole32 uuid mfuuid +IMPORTS = advapi32 mfplat ole32 uuid mfuuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 5d645db200..1700b179e5 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1081,14 +1081,127 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } +static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *count, BOOL unique, const WCHAR *str) +{ + WCHAR *ptrW; + int len, i; + + if (unique) + { + for (i = 0; i < vector->calpwstr.cElems; ++i) + { + if (!lstrcmpW(vector->calpwstr.pElems[i], str)) + return S_OK; + } + } + + if (!vector->calpwstr.cElems || *count > vector->calpwstr.cElems - 1) + { + unsigned int new_count; + WCHAR **ptr; + + new_count = *count ? *count * 2 : 10; + ptr = CoTaskMemRealloc(vector->calpwstr.pElems, new_count * sizeof(*vector->calpwstr.pElems)); + if (!ptr) + return E_OUTOFMEMORY; + vector->calpwstr.pElems = ptr; + *count = new_count; + } + + len = lstrlenW(str); + if (!(vector->calpwstr.pElems[vector->calpwstr.cElems] = ptrW = CoTaskMemAlloc((len + 1) * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + + lstrcpyW(ptrW, str); + vector->calpwstr.cElems++; + + return S_OK; +} + +static int __cdecl qsort_string_compare(const void *a, const void *b) +{ + return lstrcmpW(a, b); +} + +static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst) +{ + static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + HRESULT hr = S_OK; + int i, index; + WCHAR *buffW; + + buffW = heap_calloc(maxlen, sizeof(*buffW)); + if (!buffW) + return E_OUTOFMEMORY; + + memset(dst, 0, sizeof(*dst)); + dst->vt = VT_VECTOR | VT_LPWSTR; + + for (i = 0; i < ARRAY_SIZE(hkey_roots); ++i) + { + unsigned int count; + DWORD size; + HKEY hkey; + + if (RegOpenKeyW(hkey_roots[i], path, &hkey)) + continue; + + index = 0; + size = maxlen; + count = dst->calpwstr.cElems; + while (!RegEnumKeyExW(hkey, index++, buffW, &size, NULL, NULL, NULL, NULL)) + { + if (filter && !wcschr(buffW, filter)) + continue; + if (FAILED(hr = prop_string_vector_append(dst, &count, i > 0, buffW))) + break; + size = maxlen; + } + + /* Sort last pass results. */ + qsort(&dst->calpwstr.pElems[count], dst->calpwstr.cElems - count, sizeof(*dst->calpwstr.pElems), + qsort_string_compare); + + RegCloseKey(hkey); + } + + if (FAILED(hr)) + PropVariantClear(dst); + + heap_free(buffW); + + return hr; +} + /*********************************************************************** * MFGetSupportedMimeTypes (mf.@) */ -HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) +HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *dst) { - FIXME("(%p) stub\n", array); + unsigned int maxlen; - return E_NOTIMPL; + TRACE("%p.\n", dst); + + if (!dst) + return E_POINTER; + + /* According to RFC4288 it's 127/127 characters. */ + maxlen = 127 /* type */ + 1 /* / */ + 127 /* subtype */ + 1; + return mf_get_handler_strings(L"Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers", '/', + maxlen, dst); +} + +/*********************************************************************** + * MFGetSupportedSchemes (mf.@) + */ +HRESULT WINAPI MFGetSupportedSchemes(PROPVARIANT *dst) +{ + TRACE("%p.\n", dst); + + if (!dst) + return E_POINTER; + + return mf_get_handler_strings(L"Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers", 0, 64, dst); } /*********************************************************************** diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index e396d01519..29676005ad 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -74,7 +74,7 @@ @ stub MFGetMultipleServiceProviders @ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) -@ stub MFGetSupportedSchemes +@ stdcall MFGetSupportedSchemes(ptr) @ stub MFGetTopoNodeCurrentType @ stub MFReadSequencerSegmentOffset @ stub MFRequireProtectedEnvironment diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5a690880d1..aa72e71292 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2719,6 +2719,38 @@ static void test_MFCreateSimpleTypeHandler(void) IMFMediaTypeHandler_Release(handler); } +static void test_MFGetSupportedMimeTypes(void) +{ + PROPVARIANT value; + HRESULT hr; + + hr = MFGetSupportedMimeTypes(NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + value.vt = VT_EMPTY; + hr = MFGetSupportedMimeTypes(&value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value.vt == (VT_VECTOR | VT_LPWSTR), "Unexpected value type %#x.\n", value.vt); + + PropVariantClear(&value); +} + +static void test_MFGetSupportedSchemes(void) +{ + PROPVARIANT value; + HRESULT hr; + + hr = MFGetSupportedSchemes(NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + value.vt = VT_EMPTY; + hr = MFGetSupportedSchemes(&value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value.vt == (VT_VECTOR | VT_LPWSTR), "Unexpected value type %#x.\n", value.vt); + + PropVariantClear(&value); +} + START_TEST(mf) { test_topology(); @@ -2734,4 +2766,6 @@ START_TEST(mf) test_sar(); test_evr(); test_MFCreateSimpleTypeHandler(); + test_MFGetSupportedMimeTypes(); + test_MFGetSupportedSchemes(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index fa3a2d132a..e27294d488 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -595,6 +595,7 @@ cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") cpp_quote("HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") +cpp_quote("HRESULT WINAPI MFGetSupportedSchemes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);")

1 0

Zebediah Figura : amstream: Return E_INVALIDARG if AMMSF_ADDDEFAULTRENDERER is requested with a non-NULL ret_stream parameter.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 2227facdd67e809e6fe43142edf556c9c053a9af URL: https://source.winehq.org/git/wine.git/?a=commit;h=2227facdd67e809e6fe43142… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:16 2020 -0600 amstream: Return E_INVALIDARG if AMMSF_ADDDEFAULTRENDERER is requested with a non-NULL ret_stream parameter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 3 +++ dlls/amstream/tests/amstream.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 48abcaf8b4..6fb3ebd17c 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -307,6 +307,9 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac { IBaseFilter *dsound_render; + if (ret_stream) + return E_INVALIDARG; + if (!IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) { WARN("AMMSF_ADDDEFAULTRENDERER requested with id %s, returning MS_E_PURPOSEID.\n", debugstr_guid(PurposeId)); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 16663bf441..f9d348c6e0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -798,7 +798,7 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, &video_stream); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, NULL); @@ -806,7 +806,7 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, &audio_stream); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); @@ -827,9 +827,9 @@ static void test_add_stream(void) hr = IGraphBuilder_EnumFilters(graph, &enum_filters); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumFilters_Next(enum_filters, 3, filters, &count); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(count == 2, "Got count %u.\n", count); - todo_wine ok(filters[1] == (IBaseFilter *)stream_filter, + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + ok(filters[1] == (IBaseFilter *)stream_filter, "Expected filter %p, got %p.\n", stream_filter, filters[1]); hr = IBaseFilter_GetClassID(filters[0], &clsid); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : amstream: Allow AMMSF_ADDDEFAULTRENDERER only with MSPID_PrimaryAudio.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 3e6eaaa2c565b5c5f6d0d5c25de67603c72e61a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6eaaa2c565b5c5f6d0d5c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:15 2020 -0600 amstream: Allow AMMSF_ADDDEFAULTRENDERER only with MSPID_PrimaryAudio. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 25 ++++++++++--------------- dlls/amstream/tests/amstream.c | 3 +++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 6643d5d141..48abcaf8b4 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -305,26 +305,21 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { - if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) + IBaseFilter *dsound_render; + + if (!IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) { - /* Default renderer not supported by video stream */ + WARN("AMMSF_ADDDEFAULTRENDERER requested with id %s, returning MS_E_PURPOSEID.\n", debugstr_guid(PurposeId)); return MS_E_PURPOSEID; } - else - { - IBaseFilter* dsoundrender_filter; - /* Create the default renderer for audio */ - hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&dsoundrender_filter); - if (SUCCEEDED(hr)) - { - hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsoundrender_filter, NULL); - IBaseFilter_Release(dsoundrender_filter); - } - - /* No media stream created when the default renderer is used */ - return hr; + if (SUCCEEDED(hr = CoCreateInstance(&CLSID_DSoundRender, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&dsound_render))) + { + hr = IGraphBuilder_AddFilter(This->pFilterGraph, dsound_render, NULL); + IBaseFilter_Release(dsound_render); } + return hr; } if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5c700140e3..16663bf441 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -840,6 +840,9 @@ static void test_add_stream(void) IGraphBuilder_Release(graph); } + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &test_mspid, + AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &test_mspid, AMMSF_ADDDEFAULTRENDERER, &audio_stream); todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);

1 0

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 March 2020