June 2020 - Wine-commits - list.winehq.org

Anton Baskanov : amstream: Implement MediaStreamFilter::GetCurrentStreamTime.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 57b627fba69d633042201f7d9c26b2545afa186d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b627fba69d633042201f7d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jun 18 01:18:29 2020 +0700 amstream: Implement MediaStreamFilter::GetCurrentStreamTime. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 28 ++++++++- dlls/amstream/tests/amstream.c | 137 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 05a02e3f66..3dff686b21 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -174,6 +174,7 @@ struct filter IAMMediaStream **streams; IAMMediaStream *seekable_stream; FILTER_STATE state; + REFERENCE_TIME start_time; }; static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -295,6 +296,7 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start EnterCriticalSection(&filter->cs); + filter->start_time = start; set_state(filter, State_Running); LeaveCriticalSection(&filter->cs); @@ -614,11 +616,31 @@ static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface return E_NOTIMPL; } -static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pCurrentStreamTime) +static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pCurrentStreamTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + if (!time) + return E_POINTER; + + EnterCriticalSection(&filter->cs); + + if (filter->state != State_Running || !filter->clock) + { + *time = 0; + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + IReferenceClock_GetTime(filter->clock, time); + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME WaitStreamTime) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2bc1310a96..e1f6a15ad3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2641,6 +2641,87 @@ static const IMediaSeekingVtbl testsource_seeking_vtbl = testsource_seeking_GetPreroll, }; +struct testclock +{ + IReferenceClock IReferenceClock_iface; + LONG refcount; + LONGLONG time; + HRESULT get_time_hr; +}; + +static inline struct testclock *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, struct testclock, IReferenceClock_iface); +} + +static HRESULT WINAPI testclock_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); + if (IsEqualGUID(iid, &IID_IReferenceClock) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + IReferenceClock_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI testclock_AddRef(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedIncrement(&clock->refcount); +} + +static ULONG WINAPI testclock_Release(IReferenceClock *iface) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + return InterlockedDecrement(&clock->refcount); +} + +static HRESULT WINAPI testclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + struct testclock *clock = impl_from_IReferenceClock(iface); + if (SUCCEEDED(clock->get_time_hr)) + *time = clock->time; + return clock->get_time_hr; +} + +static HRESULT WINAPI testclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static IReferenceClockVtbl testclock_vtbl = +{ + testclock_QueryInterface, + testclock_AddRef, + testclock_Release, + testclock_GetTime, + testclock_AdviseTime, + testclock_AdvisePeriodic, + testclock_Unadvise, +}; + +static void testclock_init(struct testclock *clock) +{ + memset(clock, 0, sizeof(*clock)); + clock->IReferenceClock_iface.lpVtbl = &testclock_vtbl; +} + static void test_audiostream_get_format(void) { static const WAVEFORMATEX pin_format = @@ -4330,6 +4411,61 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_current_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 11111101, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -4383,6 +4519,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_current_stream_time(); CoUninitialize(); }

1 0

Dmitry Timoshkov : ieframe: Implement IPersistStorage::GetClassID().
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 500a813579d1747d70e08f13de5b9644ec3ee839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=500a813579d1747d70e08f13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 18 14:39:00 2020 +0800 ieframe: Implement IPersistStorage::GetClassID(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/persist.c | 10 ++++++++-- dlls/ieframe/tests/webbrowser.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c index bef5ef7344..a0a7c94fbe 100644 --- a/dlls/ieframe/persist.c +++ b/dlls/ieframe/persist.c @@ -56,8 +56,14 @@ static ULONG WINAPI PersistStorage_Release(IPersistStorage *iface) static HRESULT WINAPI PersistStorage_GetClassID(IPersistStorage *iface, CLSID *pClassID) { WebBrowser *This = impl_from_IPersistStorage(iface); - FIXME("(%p)->(%p)\n", This, pClassID); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClassID); + + if (!pClassID) + return E_INVALIDARG; + + *pClassID = This->version == 1 ? CLSID_WebBrowser_V1: CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI PersistStorage_IsDirty(IPersistStorage *iface) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 898d0e6805..95d5fc4988 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2220,6 +2220,25 @@ static void test_EnumVerbs(IWebBrowser2 *wb) IEnumOLEVERB_Release(enum_verbs); } +static void test_Persist(IWebBrowser2 *wb, int version) +{ + IPersist *persist; + GUID guid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); + ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + + hr = IPersist_GetClassID(persist, &guid); + ok(hr == S_OK, "GetClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&guid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&guid)); + else + ok(IsEqualGUID(&guid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&guid)); + + IPersist_Release(persist); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3741,6 +3760,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_olecmd(webbrowser, FALSE); test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); + test_Persist(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3849,6 +3869,7 @@ static void test_WebBrowserV1(void) test_ready_state(READYSTATE_UNINITIALIZED, BUSY_FAIL); test_ClassInfo(wb); test_EnumVerbs(wb); + test_Persist(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref);

1 0

Paul Gofman : winex11.drv: Handle X error from vkGetRandROutputDisplayEXT().
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 6f9d20806e821ab07c8adf81ae6630fae94b00ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9d20806e821ab07c8adf81… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 18 17:28:50 2020 +0300 winex11.drv: Handle X error from vkGetRandROutputDisplayEXT(). Nvidia implementation of vkGetRandROutputDisplayEXT() generates X exception when rrOutput is from different provider (or if rrOutput is just invalid). That can happen on certain multiple GPU configurations, on which Wine is currently unable to initialize display driver and thus create any window. According to Vulkan spec, vkGetRandROutputDisplayEXT is supposed to just return VK_NULL_HANDLE if there is no corresponding VkDisplayKHR. But it is probably better to workaround the problem to avoid long standing regression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49407 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f61a5b190e..b1a43e48ea 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -756,9 +756,11 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + XSync( gdi_display, FALSE ); + if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) );

1 0

André Hentschel : krnl386.exe16: Simply clean a comment from master/slave.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: d593be3b4c3b00064ea709ab50030ec9e938e154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d593be3b4c3b00064ea709ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 15:29:00 2020 +0200 krnl386.exe16: Simply clean a comment from master/slave. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int31.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index d5cf02896a..01c3102d98 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -446,7 +446,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context ) SET_AX( context, 0x005a ); /* DPMI version 0.90 */ SET_BX( context, 0x0005 ); /* Flags: 32-bit, virtual memory */ SET_CL( context, si.wProcessorLevel ); - SET_DX( context, 0x0870 ); /* Master/slave interrupt controller base */ + SET_DX( context, 0x0870 ); /* Interrupt controller base */ } break;

1 0

André Hentschel : winex11.drv: Change slave to a more neutral word.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 9f974579b6ecf8d6cc2d6ee0ace477a3d546f0df URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f974579b6ecf8d6cc2d6ee0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 13:34:27 2020 +0200 winex11.drv: Change slave to a more neutral word. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index b1a43e48ea..dce4e6739e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -948,7 +948,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!output_info->crtc || !crtc_info->mode) detached = TRUE; - /* Ignore mirroring output slaves because mirrored monitors are under the same adapter */ + /* Ignore mirroring output replicas because mirrored monitors are under the same adapter */ mirrored = FALSE; if (!detached) { @@ -970,7 +970,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new continue; /* Some outputs may have the same coordinates, aka mirrored. Choose the output with - * the lowest value as primary and the rest will then be slaves in a mirroring set */ + * the lowest value as primary and the rest will then be replicas in a mirroring set */ if (crtc_info->x == enum_crtc_info->x && crtc_info->y == enum_crtc_info->y && crtc_info->width == enum_crtc_info->width && @@ -1079,7 +1079,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * goto done; } - /* Inactive but attached monitor, no need to check for mirrored/slave monitors */ + /* Inactive but attached monitor, no need to check for mirrored/replica monitors */ if (!output_info->crtc || !crtc_info->mode) { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW );

1 0

André Hentschel : ntdll: Change master/slave to more neutral words.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 5f9f827fd4effe08d544964db349b56519952da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9f827fd4effe08d544964d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 13:34:28 2020 +0200 ntdll: Change master/slave to more neutral words. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a0e66a92a2..b60a01df8f 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2029,7 +2029,7 @@ static NTSTATUS CDROM_GetAddress(int fd, SCSI_ADDRESS* address) address->PortNumber = portnum; /* primary=0 secondary=1 for ide */ address->PathId = busid; /* always 0 for ide */ - address->TargetId = targetid; /* master=0 slave=1 for ide */ + address->TargetId = targetid; /* device id 0/1 for ide */ address->Lun = lun; return STATUS_SUCCESS; }

1 0

André Hentschel : comctl32: Clarify a comment.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 9c11c636b38143a95e5e82ebba69b439006b40d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c11c636b38143a95e5e82eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 18 13:34:29 2020 +0200 comctl32: Clarify a comment. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comboex.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index c3c39be305..61b6383136 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1379,9 +1379,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di } else { /* drawing combo/edit entry */ if (IsWindowVisible(infoPtr->hwndEdit)) { - /* if we have an edit control, the slave the - * selection state to the Edit focus state - */ + /* if we have an edit control, set the selection state from the edit focus state */ if (infoPtr->flags & WCBE_EDITFOCUSED) drawstate = ILD_SELECTED; } else

1 0

Nikolay Sivov : evr: Implement stream managment methods for default mixer.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: d6e5b6ca0241bf0f70691e0c5cb0d6fe24b61ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e5b6ca0241bf0f70691e0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 14:43:44 2020 +0300 evr: Implement stream managment methods for default mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/evr/tests/evr.c | 114 +++++++++++++++++++++++++++++++++ 2 files changed, 276 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e5b6ca0241bf0f7069…

1 0

Nikolay Sivov : evr: Create attributes for input mixer streams.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 68374e43158590164e7038a951d8a8d3d12d136b URL: https://source.winehq.org/git/wine.git/?a=commit;h=68374e43158590164e7038a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 14:43:45 2020 +0300 evr: Create attributes for input mixer streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 1 + dlls/evr/mixer.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 16 ++++------------ 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index bf3048f62e..5671511f6a 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,7 @@ MODULE = evr.dll IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 +DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index f9f1f4b0c3..d1529c015d 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "evr.h" #include "d3d9.h" +#include "mfapi.h" #include "mferror.h" #include "evr_classes.h" @@ -32,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct input_stream { unsigned int id; + IMFAttributes *attributes; }; struct video_mixer @@ -77,6 +79,12 @@ static struct input_stream * video_mixer_get_input(const struct video_mixer *mix return bsearch(&id, mixer->inputs, mixer->input_count, sizeof(*mixer->inputs), video_mixer_compare_input_id); } +static void video_mixer_init_input(struct input_stream *stream) +{ + if (SUCCEEDED(MFCreateAttributes(&stream->attributes, 1))) + IMFAttributes_SetUINT32(stream->attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, 1); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -121,11 +129,17 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) { struct video_mixer *mixer = impl_from_IMFTransform(iface); ULONG refcount = InterlockedDecrement(&mixer->refcount); + unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { + for (i = 0; i < mixer->input_count; ++i) + { + if (mixer->inputs[i].attributes) + IMFAttributes_Release(mixer->inputs[i].attributes); + } DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -223,9 +237,26 @@ static HRESULT WINAPI video_mixer_transform_GetAttributes(IMFTransform *iface, I static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("%p, %u, %p.\n", iface, id, attributes); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *input; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, attributes); + + EnterCriticalSection(&mixer->cs); + + if (!(input = video_mixer_get_input(mixer, id))) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + *attributes = input->attributes; + if (*attributes) + IMFAttributes_AddRef(*attributes); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, @@ -256,6 +287,8 @@ static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *ifac idx = input - mixer->inputs; if (idx < mixer->input_count) { + if (mixer->inputs[idx].attributes) + IMFAttributes_Release(mixer->inputs[idx].attributes); memmove(&mixer->inputs[idx], &mixer->inputs[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->inputs)); memmove(&mixer->input_ids[idx], &mixer->input_ids[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->input_ids)); @@ -277,6 +310,7 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, { struct video_mixer *mixer = impl_from_IMFTransform(iface); struct input_stream inputs[MAX_MIXER_INPUT_STREAMS] = { {0} }; + struct input_stream *input; unsigned int i, len; HRESULT hr = S_OK; @@ -310,6 +344,11 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, if (SUCCEEDED(hr)) { + for (i = 0; i < count; ++i) + { + if ((input = bsearch(&ids[i], inputs, len, sizeof(*inputs), video_mixer_compare_input_id))) + video_mixer_init_input(input); + } memcpy(&mixer->input_ids[mixer->input_count], ids, count * sizeof(*ids)); memcpy(mixer->inputs, inputs, len * sizeof(*inputs)); mixer->input_count += count; @@ -552,6 +591,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->refcount = 1; object->input_count = 1; + video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db20fa7664..be004d9eae 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -406,7 +406,6 @@ static void test_default_mixer(void) ok(input_id == 0 && output_id == 0, "Unexpected stream ids.\n"); hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); -todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 1, &attributes); @@ -444,29 +443,22 @@ todo_wine attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!attributes, "Unexpected attributes.\n"); -} + attributes2 = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes2); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(attributes == attributes2, "Unexpected instance.\n"); - if (attributes2) - IMFAttributes_Release(attributes2); - if (attributes) - IMFAttributes_Release(attributes); + IMFAttributes_Release(attributes2); + IMFAttributes_Release(attributes); attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 1, &attributes); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!attributes, "Unexpected attributes.\n"); -} - if (attributes) - IMFAttributes_Release(attributes); + IMFAttributes_Release(attributes); hr = IMFTransform_DeleteInputStream(transform, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr: Add IMFVideoMixerControl2 stub for the mixer.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 6548fc437192fd852c1a91130382c56e92e68ac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6548fc437192fd852c1a9113… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 14:43:46 2020 +0300 evr: Add IMFVideoMixerControl2 stub for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ include/evr.idl | 38 +++++++++++++++++++++++ 3 files changed, 129 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d1529c015d..b651a56bff 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -41,6 +41,7 @@ struct video_mixer IMFTransform IMFTransform_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; + IMFVideoMixerControl2 IMFVideoMixerControl2_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -64,6 +65,11 @@ static struct video_mixer *impl_from_IMFTopologyServiceLookupClient(IMFTopologyS return CONTAINING_RECORD(iface, struct video_mixer, IMFTopologyServiceLookupClient_iface); } +static struct video_mixer *impl_from_IMFVideoMixerControl2(IMFVideoMixerControl2 *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerControl2_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -104,6 +110,11 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFTopologyServiceLookupClient_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoMixerControl2) || + IsEqualIID(riid, &IID_IMFVideoMixerControl)) + { + *obj = &mixer->IMFVideoMixerControl2_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -564,6 +575,81 @@ static const IMFTopologyServiceLookupClientVtbl video_mixer_service_client_vtbl video_mixer_service_client_ReleaseServicePointers, }; +static HRESULT WINAPI video_mixer_control_QueryInterface(IMFVideoMixerControl2 *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_control_AddRef(IMFVideoMixerControl2 *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_control_Release(IMFVideoMixerControl2 *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD stream_id, DWORD zorder) +{ + FIXME("%p, %u, %u.\n", iface, stream_id, zorder); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_GetStreamZOrder(IMFVideoMixerControl2 *iface, DWORD stream_id, DWORD *zorder) +{ + FIXME("%p, %u, %p.\n", iface, stream_id, zorder); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerControl2 *iface, DWORD stream_id, + const MFVideoNormalizedRect *rect) +{ + FIXME("%p, %u, %p.\n", iface, stream_id, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_GetStreamOutputRect(IMFVideoMixerControl2 *iface, DWORD stream_id, + MFVideoNormalizedRect *rect) +{ + FIXME("%p, %u, %p.\n", iface, stream_id, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_SetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD flags) +{ + FIXME("%p, %#x.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_control_GetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static const IMFVideoMixerControl2Vtbl video_mixer_control_vtbl = +{ + video_mixer_control_QueryInterface, + video_mixer_control_AddRef, + video_mixer_control_Release, + video_mixer_control_SetStreamZOrder, + video_mixer_control_GetStreamZOrder, + video_mixer_control_SetStreamOutputRect, + video_mixer_control_GetStreamOutputRect, + video_mixer_control_SetMixingPrefs, + video_mixer_control_GetMixingPrefs, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -589,6 +675,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl; object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; + object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index be004d9eae..9cf5d41919 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -362,6 +362,10 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/evr.idl b/include/evr.idl index 39b4853b2e..83603b92cc 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -160,4 +160,42 @@ interface IMFVideoDeviceID : IUnknown ); } +[ + object, + uuid(a5c6c53f-c202-4aa5-9695-175ba8c508a5) +] +interface IMFVideoMixerControl : IUnknown +{ + HRESULT SetStreamZOrder( + [in] DWORD stream_id, + [in] DWORD zorder + ); + HRESULT GetStreamZOrder( + [in] DWORD stream_id, + [out] DWORD *zorder + ); + HRESULT SetStreamOutputRect( + [in] DWORD stream_id, + [in] const MFVideoNormalizedRect *rect + ); + HRESULT GetStreamOutputRect( + [in] DWORD stream_id, + [out] MFVideoNormalizedRect *rect + ); +} + +[ + object, + uuid(8459616d-966e-4930-b658-54fa7e5a16d3) +] +interface IMFVideoMixerControl2 : IMFVideoMixerControl +{ + HRESULT SetMixingPrefs( + [in] DWORD flags + ); + HRESULT GetMixingPrefs( + [out] DWORD *flags + ); +} + cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);")

1 0