August 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods in Anchor Elements.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 196f13c174e4c1e97021a7ab2c918c42adabdeea URL: https://gitlab.winehq.org/wine/wine/-/commit/196f13c174e4c1e97021a7ab2c918c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods in Anchor Elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 9 +++++++++ dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index cfe49ac05bd..813d4eb3b2d 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -517,6 +517,10 @@ static HRESULT WINAPI HTMLAnchorElement_get_port(IHTMLAnchorElement *iface, BSTR IUri_Release(uri); if(FAILED(hres)) return hres; + if(hres != S_OK) { + *p = NULL; + return S_OK; + } len = swprintf(buf, ARRAY_SIZE(buf), L"%u", port); str = SysAllocStringLen(buf, len); @@ -556,6 +560,11 @@ static HRESULT WINAPI HTMLAnchorElement_get_protocol(IHTMLAnchorElement *iface, IUri_Release(uri); if(FAILED(hres)) return hres; + if(hres != S_OK) { + SysFreeString(scheme); + *p = NULL; + return S_OK; + } len = SysStringLen(scheme); if(len) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5e135aa88ff..6f4e8ed007b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9479,6 +9479,12 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_hostname((IUnknown*)elem, L"test1"); test_anchor_port((IUnknown*)elem, L"8080"); + /* about:blank */ + test_anchor_put_href((IUnknown*)elem, L"about:blank"); + test_anchor_href((IUnknown*)elem, L"about:blank"); + test_anchor_hostname((IUnknown*)elem, NULL); + test_anchor_port((IUnknown*)elem, NULL); + /* Restore the href */ test_anchor_put_href((IUnknown*)elem, L"http://test/"); test_anchor_href((IUnknown*)elem, L"http://test/");

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods when checking targetOrigin.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: e783c358b65050d783a53bd605d927658fed71dd URL: https://gitlab.winehq.org/wine/wine/-/commit/e783c358b65050d783a53bd605d927… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods when checking targetOrigin. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7774e0fc92d..b9dcfa6e913 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3181,24 +3181,32 @@ static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_ goto done; } + bstr = NULL; hres = IUri_GetSchemeName(uri, &bstr); - if(FAILED(hres)) + if(hres != S_OK) { + SysFreeString(bstr); goto done; + } hres = IUri_GetSchemeName(target, &bstr2); if(SUCCEEDED(hres)) { - hres = !wcsicmp(bstr, bstr2) ? S_OK : S_FALSE; + if(hres == S_OK && wcsicmp(bstr, bstr2)) + hres = S_FALSE; SysFreeString(bstr2); } SysFreeString(bstr); if(hres != S_OK) goto done; + bstr = NULL; hres = IUri_GetHost(uri, &bstr); - if(FAILED(hres)) + if(hres != S_OK) { + SysFreeString(bstr); goto done; + } hres = IUri_GetHost(target, &bstr2); if(SUCCEEDED(hres)) { - hres = !wcsicmp(bstr, bstr2) ? S_OK : S_FALSE; + if(hres == S_OK && wcsicmp(bstr, bstr2)) + hres = S_FALSE; SysFreeString(bstr2); } SysFreeString(bstr); @@ -3210,11 +3218,11 @@ static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_ goto done; hres = IUri_GetPort(uri, &port); - if(FAILED(hres)) + if(hres != S_OK) goto done; hres = IUri_GetPort(target, &port2); - if(SUCCEEDED(hres)) - hres = (port == port2) ? S_OK : S_FALSE; + if(hres == S_OK && port != port2) + hres = S_FALSE; done: IUri_Release(target);

1 0

Gabriel Ivăncescu : mshtml: Don't navigate if GetDisplayUri failed.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: d2daec4027a1f9263f84e0e37a3a6cf624f04f57 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2daec4027a1f9263f84e0e37a3a6c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Don't navigate if GetDisplayUri failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ef764bde58c..4cafa083b08 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1677,9 +1677,11 @@ static void handle_extern_mime_navigation(nsChannelBSC *This) hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv, (void**)&webbrowser_priv_old); if(SUCCEEDED(hres)) { V_VT(&uriv) = VT_BSTR; - IUri_GetDisplayUri(uri, &V_BSTR(&uriv)); + V_BSTR(&uriv) = NULL; + hres = IUri_GetDisplayUri(uri, &V_BSTR(&uriv)); - hres = IWebBrowserPriv_NavigateWithBindCtx(webbrowser_priv_old, &uriv, &flags, NULL, NULL, NULL, bind_ctx, NULL); + if(hres == S_OK) + hres = IWebBrowserPriv_NavigateWithBindCtx(webbrowser_priv_old, &uriv, &flags, NULL, NULL, NULL, bind_ctx, NULL); SysFreeString(V_BSTR(&uriv)); IWebBrowserPriv_Release(webbrowser_priv_old);

1 0

Etaash Mathamsetty : ntoskrnl: Implement IoCreateFileEx.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: e934e746bee9c16ec484abef300ebc073828e494 URL: https://gitlab.winehq.org/wine/wine/-/commit/e934e746bee9c16ec484abef300ebc… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Aug 21 14:59:35 2022 -0400 ntoskrnl: Implement IoCreateFileEx. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index eff23a5b576..031e9900544 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4013,6 +4013,19 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) return STATUS_SUCCESS; } +/*********************************************************************** + * IoCreateFileEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateFileEx(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, ULONG attributes, ULONG sharing, + ULONG disposition, ULONG create_options, VOID *ea_buffer, ULONG ea_length, + CREATE_FILE_TYPE file_type, VOID *parameters, ULONG options, void *driverctx) +{ + FIXME(": semi-stub\n"); + return NtCreateFile(handle, access, attr, io, alloc_size, attributes, sharing, disposition, + create_options, ea_buffer, ea_length); +} + /*********************************************************************** * IoCreateFile (NTOSKRNL.EXE.@) */ @@ -4021,8 +4034,9 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT ULONG disposition, ULONG create_options, VOID *ea_buffer, ULONG ea_length, CREATE_FILE_TYPE file_type, VOID *parameters, ULONG options ) { - FIXME(": stub\n"); - return STATUS_NOT_IMPLEMENTED; + FIXME(": semi-stub\n"); + return IoCreateFileEx(handle, access, attr, io, alloc_size, attributes, sharing, disposition, + create_options, ea_buffer, ea_length, file_type, parameters, options, NULL); } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d8e082f032f..e3898b06f89 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -357,6 +357,7 @@ @ stdcall IoCreateDeviceSecure(ptr long ptr long long long ptr ptr ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) +@ stdcall IoCreateFileEx(ptr long ptr ptr ptr long long long long ptr long long ptr long ptr) @ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint @ stdcall IoCreateNotificationEvent(ptr ptr)

1 0

Etaash Mathamsetty : ntoskrnl.exe: Implement KeAreAllApcsDisabled.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: bafb181c42a88e9cb847d589799d62ff0261a621 URL: https://gitlab.winehq.org/wine/wine/-/commit/bafb181c42a88e9cb847d589799d62… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Aug 21 14:33:54 2022 -0400 ntoskrnl.exe: Implement KeAreAllApcsDisabled. Required for vgk.sys (vanguard anti-cheat). --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 085d0eebaef..eff23a5b576 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3533,6 +3533,14 @@ BOOLEAN WINAPI KeAreApcsDisabled(void) return !!critical_region; } +/*********************************************************************** + * KeAreAllApcsDisabled (NTOSKRNL.@) + */ +BOOLEAN WINAPI KeAreAllApcsDisabled(void) +{ + return KeAreApcsDisabled(); +} + /*********************************************************************** * KeBugCheck (NTOSKRNL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 460d7d0459f..d8e082f032f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -532,6 +532,7 @@ @ stdcall -arch=!i386 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stdcall KeAlertThread(ptr long) +@ stdcall KeAreAllApcsDisabled() @ stdcall KeAreApcsDisabled() @ stub KeAttachProcess @ stdcall KeBugCheck(long)

1 0

Henri Verbeet : mfreadwrite/reader: Only attempt to copy sample buffers from responses with non-NULL samples.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 76db4b2459920eb2e2004255e3388b069dd1d6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/76db4b2459920eb2e2004255e3388b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 10:38:41 2022 +0200 mfreadwrite/reader: Only attempt to copy sample buffers from responses with non-NULL samples. For example, queueing a MF_SOURCE_READERF_ENDOFSTREAM response will set a NULL sample. This fixes a regression introduced by commit 68fa3f673633c138596b86ad2ed1befcd0cc63c5. --- dlls/mfreadwrite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index f29d48b6a9e..5296e77f3c3 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -958,7 +958,7 @@ static struct stream_response *media_stream_pop_response(struct source_reader *r if (!stream) stream = &reader->streams[response->stream_index]; - if (stream->allocator) + if (response->sample && stream->allocator) { /* Return allocation error to the caller, while keeping original response sample in for later. */ if (SUCCEEDED(hr = IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample)))

1 0

Rémi Bernon : maintainers: Add myself to multimedia sections.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 2bdd7d37ff239e8028235c3fc48467de5a6440ed URL: https://gitlab.winehq.org/wine/wine/-/commit/2bdd7d37ff239e8028235c3fc48467… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 23 13:45:59 2022 +0200 maintainers: Add myself to multimedia sections. --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 2b0666f6ea3..c7bd1f0c02c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -104,6 +104,7 @@ F: dlls/dpwsockx/ DirectShow M: Zebediah Figura <z.figura12(a)gmail.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ F: dlls/mciqtz32/ @@ -156,6 +157,7 @@ F: dlls/gphoto2.ds/ GStreamer multimedia backend M: Zebediah Figura <z.figura12(a)gmail.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winegstreamer/ HID support @@ -334,11 +336,13 @@ F: dlls/wmiutils/ Windows Media Format M: Zebediah Figura <z.figura12(a)gmail.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/wmp/ F: dlls/wmvcore/ Windows Media Foundation M: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/mf/ F: dlls/mferror/ F: dlls/mfmediaengine/

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 975665713a48683c1eab9291d33565a36c5d4e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/975665713a48683c1eab9291d33565… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Aug 20 11:32:57 2022 +0200 po: Update Dutch translation. --- po/nl.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 839fb642d1a..34152f29da8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-07-12 15:15+0200\n" +"PO-Revision-Date: 2022-08-20 11:30+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -1335,10 +1335,8 @@ msgid "Options" msgstr "Instellingen" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" -msgstr "Multimedia Apparaten" +msgstr "Standaard" #: dlls/credui/credui.rc:45 msgid "&User name:" @@ -19335,7 +19333,7 @@ msgstr "&Systeem\tCtrl+1" #: programs/wordpad/wordpad.rc:99 msgid "&Pale yellow\tCtrl+2" -msgstr "&Geeltje\tCtrl+2" +msgstr "Licht&geel\tCtrl+2" #: programs/wordpad/wordpad.rc:104 msgid "&About Wine Wordpad"

1 0

Rémi Bernon : mf/tests: Avoid creating now unused sink activate instances.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: fe31dafd6358840b13d8ba6006ad3009370c4e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe31dafd6358840b13d8ba6006ad30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 20:51:37 2022 +0200 mf/tests: Avoid creating now unused sink activate instances. --- dlls/mf/tests/mf.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eccf4f51e4c..888cea8c4aa 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2550,6 +2550,15 @@ static void test_topology_loader(void) hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); ok(hr == MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED, "Unexpected hr %#lx.\n", hr); + hr = IMFTopologyNode_SetObject(sink_node, NULL); + ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr); + + hr = IMFActivate_ShutdownObject(sink_activate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ref = IMFActivate_Release(sink_activate); + ok(ref == 0, "Release returned %ld\n", ref); + + hr = MFCreateMediaType(&input_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); @@ -2575,9 +2584,6 @@ static void test_topology_loader(void) else handler.invalid_type = NULL; - hr = MFCreateSampleGrabberSinkActivate(output_type, &test_grabber_callback, &sink_activate); - ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr); - init_source_node(source, test->source_method, src_node, 1, &input_type, test->current_input); init_sink_node(&stream_sink.IMFStreamSink_iface, test->sink_method, sink_node); @@ -2733,11 +2739,6 @@ todo_wine { ok(hr == S_OK, "Failed to get attribute count, hr %#lx.\n", hr); ok(!count, "Unexpected count %u.\n", count); - hr = IMFActivate_ShutdownObject(sink_activate); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ref = IMFActivate_Release(sink_activate); - ok(ref == 0, "Release returned %ld\n", ref); - winetest_pop_context(); }

1 0

Rémi Bernon : mf/tests: Try returning MF_E_NOT_INITIALIZED from GetCurrentMediaType.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: e1768353e8c4285847d5093cd864c6274e8934ad URL: https://gitlab.winehq.org/wine/wine/-/commit/e1768353e8c4285847d5093cd864c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 20:27:53 2022 +0200 mf/tests: Try returning MF_E_NOT_INITIALIZED from GetCurrentMediaType. --- dlls/mf/tests/mf.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 888cea8c4aa..eb320af92fe 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1305,6 +1305,10 @@ struct test_handler IMFMediaTypeHandler IMFMediaTypeHandler_iface; IMFMediaType *current_type; IMFMediaType *invalid_type; + + ULONG enum_count; + ULONG media_types_count; + IMFMediaType **media_types; }; static struct test_handler *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) @@ -1367,7 +1371,19 @@ static HRESULT WINAPI test_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, static HRESULT WINAPI test_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, IMFMediaType **type) { - todo_wine + struct test_handler *impl = impl_from_IMFMediaTypeHandler(iface); + + if (impl->media_types) + { + impl->enum_count++; + + if (index >= impl->media_types_count) + return MF_E_NO_MORE_TYPES; + + IMFMediaType_AddRef((*type = impl->media_types[index])); + return S_OK; + } + ok(0, "Unexpected call.\n"); return E_NOTIMPL; } @@ -1386,7 +1402,7 @@ static HRESULT WINAPI test_handler_GetCurrentMediaType(IMFMediaTypeHandler *ifac HRESULT hr; if (!impl->current_type) - return E_NOTIMPL; + return impl->media_types ? MF_E_NOT_INITIALIZED : E_FAIL; if (FAILED(hr = MFCreateMediaType(media_type))) return hr; @@ -2188,6 +2204,7 @@ enum loader_test_flags LOADER_SET_ENUMERATE_SOURCE_TYPES = 0x10, LOADER_NO_CURRENT_OUTPUT = 0x20, LOADER_SET_INVALID_INPUT = 0x40, + LOADER_SET_MEDIA_TYPES = 0x80, }; static void test_topology_loader(void) @@ -2434,6 +2451,12 @@ static void test_topology_loader(void) .expected_result = S_OK, .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_EXPECTED_CONVERTER, }, + { + /* RGB32 -> Any Video, no current output type, refuse input type */ + .input_type = &video_i420_1280, .output_type = &video_video_processor_rgb32, .sink_method = -1, .source_method = -1, + .expected_result = S_OK, + .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_SET_INVALID_INPUT | LOADER_SET_MEDIA_TYPES | LOADER_EXPECTED_CONVERTER, + }, }; IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; @@ -2584,6 +2607,18 @@ static void test_topology_loader(void) else handler.invalid_type = NULL; + handler.enum_count = 0; + if (test->flags & LOADER_SET_MEDIA_TYPES) + { + handler.media_types_count = 1; + handler.media_types = &output_type; + } + else + { + handler.media_types_count = 0; + handler.media_types = NULL; + } + init_source_node(source, test->source_method, src_node, 1, &input_type, test->current_input); init_sink_node(&stream_sink.IMFStreamSink_iface, test->sink_method, sink_node); @@ -2711,6 +2746,7 @@ todo_wine { hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret); ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr); + todo_wine_if(test->flags & LOADER_SET_MEDIA_TYPES) ok(ret, "Output type of last transform doesn't match sink node type.\n"); IMFTopologyNode_Release(mft_node); @@ -2739,6 +2775,12 @@ todo_wine { ok(hr == S_OK, "Failed to get attribute count, hr %#lx.\n", hr); ok(!count, "Unexpected count %u.\n", count); + if (test->flags & LOADER_SET_MEDIA_TYPES) + todo_wine + ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); + else + ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); + winetest_pop_context(); } @@ -4458,6 +4500,9 @@ if (SUCCEEDED(hr)) hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count, &mediatype); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate);

1 0