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

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods in localStorage and sessionStorage.
by Alexandre Julliard Aug. 23, 2022

Aug. 23, 2022

Module: wine Branch: master Commit: 1e6c1851b0e758707bf387259f92d0d71734382a URL: https://gitlab.winehq.org/wine/wine/-/commit/1e6c1851b0e758707bf387259f92d0… 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 localStorage and sessionStorage. Also do not use the Uri itself as check for local vs session storage, because sessionStorage will rely on the Uri as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 42 +++++++++++++++++++++++++----------------- dlls/mshtml/htmlwindow.c | 14 ++++++++------ dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 1983d87a296..ae63c2b2f53 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -548,28 +548,20 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -static WCHAR *build_filename(IUri *uri) +static WCHAR *build_filename(BSTR hostname) { static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; WCHAR path[MAX_PATH], *ret; - BSTR hostname; - HRESULT hres; int len; - hres = IUri_GetHost(uri, &hostname); - if(hres != S_OK) - return NULL; - if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { ERR("Can't get folder path %lu\n", GetLastError()); - SysFreeString(hostname); return NULL; } len = wcslen(path); if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { ERR("Path too long\n"); - SysFreeString(hostname); return NULL; } memcpy(path + len, store, sizeof(store)); @@ -577,7 +569,6 @@ static WCHAR *build_filename(IUri *uri) len += ARRAY_SIZE(store); ret = heap_alloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); if(!ret) { - SysFreeString(hostname); return NULL; } @@ -585,7 +576,6 @@ static WCHAR *build_filename(IUri *uri) wcscat(ret, hostname); wcscat(ret, L".xml"); - SysFreeString(hostname); return ret; } @@ -600,17 +590,33 @@ static WCHAR *build_mutexname(const WCHAR *filename) return ret; } -HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage **p) +HRESULT create_html_storage(HTMLInnerWindow *window, BOOL local, IHTMLStorage **p) { + IUri *uri = window->base.outer_window->uri; HTMLStorage *storage; + BSTR hostname = NULL; + HRESULT hres; + + if(!uri) + return S_FALSE; + + hres = IUri_GetHost(uri, &hostname); + if(hres != S_OK) { + SysFreeString(hostname); + return hres; + } storage = heap_alloc_zero(sizeof(*storage)); - if(!storage) + if(!storage) { + SysFreeString(hostname); return E_OUTOFMEMORY; + } - if(uri) { + if(local) { WCHAR *mutexname; - if(!(storage->filename = build_filename(uri))) { + storage->filename = build_filename(hostname); + SysFreeString(hostname); + if(!storage->filename) { heap_free(storage); return E_OUTOFMEMORY; } @@ -627,11 +633,13 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage * heap_free(storage); return HRESULT_FROM_WIN32(GetLastError()); } - } + }else + SysFreeString(hostname); storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; - init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); + init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, + dispex_compat_mode(&window->event_target.dispex)); *p = &storage->IHTMLStorage_iface; return S_OK; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0043fb79731..7774e0fc92d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,10 +2143,11 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS if(!This->inner_window->session_storage) { HRESULT hres; - hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - NULL, &This->inner_window->session_storage); - if(FAILED(hres)) + hres = create_html_storage(This->inner_window, FALSE, &This->inner_window->session_storage); + if(hres != S_OK) { + *p = NULL; return hres; + } } IHTMLStorage_AddRef(This->inner_window->session_storage); @@ -2163,10 +2164,11 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto if(!This->inner_window->local_storage) { HRESULT hres; - hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - This->inner_window->base.outer_window->uri, &This->inner_window->local_storage); - if(FAILED(hres)) + hres = create_html_storage(This->inner_window, TRUE, &This->inner_window->local_storage); + if(hres != S_OK) { + *p = NULL; return hres; + } } IHTMLStorage_AddRef(This->inner_window->local_storage); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 05b37c6b9db..23217ea3308 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -950,7 +950,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IUri*,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(HTMLInnerWindow*,BOOL,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e3ac177205c..5e135aa88ff 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10891,6 +10891,37 @@ static void test_docfrag(IHTMLDocument2 *doc) IHTMLDocument2_Release(frag); } +static void test_about_blank_storage(IHTMLDocument2 *doc) +{ + IHTMLStorage *storage; + IHTMLWindow6 *window6; + IHTMLWindow2 *window; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return; + } + + storage = (IHTMLStorage*)(INT_PTR)0xdeadbeef; + hres = IHTMLWindow6_get_sessionStorage(window6, &storage); + ok(hres == S_FALSE, "get_sessionStorage failed: %08lx\n", hres); + ok(storage == NULL, "session_storage != NULL\n"); + + storage = (IHTMLStorage*)(INT_PTR)0xdeadbeef; + hres = IHTMLWindow6_get_localStorage(window6, &storage); + ok(hres == S_FALSE, "get_localStorage failed: %08lx\n", hres); + ok(storage == NULL, "local_storage != NULL\n"); + + IHTMLWindow6_Release(window6); +} + static void check_quirks_mode(IHTMLDocument2 *doc) { test_compatmode(doc, L"BackCompat"); @@ -11626,9 +11657,11 @@ START_TEST(dom) run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2); run_domtest(doc_blank, test_dom_elements); + run_domtest(doc_blank, test_about_blank_storage); if(is_ie9plus) { compat_mode = COMPAT_IE9; run_domtest(doc_blank_ie9, test_dom_elements); + run_domtest(doc_blank_ie9, test_about_blank_storage); compat_mode = COMPAT_NONE; } run_domtest(noscript_str, test_noscript);

1 0

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

Aug. 23, 2022

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 Aug. 23, 2022

Aug. 23, 2022

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

Etaash Mathamsetty : ntoskrnl: Implement IoCreateFileEx.
by Alexandre Julliard Aug. 23, 2022

Aug. 23, 2022

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 Aug. 23, 2022

Aug. 23, 2022

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 Aug. 23, 2022

Aug. 23, 2022

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 Aug. 23, 2022

Aug. 23, 2022

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

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

Aug. 23, 2022

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 Aug. 23, 2022

Aug. 23, 2022

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

Rémi Bernon : mf: Support uninitialized downstream media types in topology loader.
by Alexandre Julliard Aug. 23, 2022

Aug. 23, 2022

Module: wine Branch: master Commit: 2be95875c0f773f6b393783b061ec0ca8caa6ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2be95875c0f773f6b393783b061ec0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 20:46:33 2022 +0200 mf: Support uninitialized downstream media types in topology loader. --- dlls/mf/tests/mf.c | 2 -- dlls/mf/topology_loader.c | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb320af92fe..af611fac814 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2746,7 +2746,6 @@ 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); @@ -2776,7 +2775,6 @@ todo_wine { 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); diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index eb652f526dd..ab694379237 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -335,6 +335,30 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC return hr; } +static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IMFMediaType **type) +{ + IMFMediaType *media_type; + HRESULT hr; + DWORD i; + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + if (hr != MF_E_NOT_INITIALIZED) + return hr; + + for (i = 0; SUCCEEDED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, i, &media_type)); i++) + { + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, NULL))) + { + *type = media_type; + return hr; + } + + IMFMediaType_Release(media_type); + } + + return hr; +} + static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch, IMFMediaType *up_type) { @@ -353,7 +377,7 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME if (FAILED(hr = topology_node_get_type_handler(branch->down.node, branch->down.stream, FALSE, &down_handler))) return hr; - if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(down_handler, &down_type)) + if (SUCCEEDED(hr = topology_branch_get_current_type(down_handler, &down_type)) && IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK) { TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type);

1 0