December 2023 - Wine-commits

Vijay Kiran Kamuju : msvcm80: Add stub for ThrowModuleLoadException(String, Exception) function.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 9bec22a2e25f9f2c66df1b3b6269f0140922b191 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bec22a2e25f9f2c66df1b3b6269f0… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Dec 4 16:49:08 2023 +0100 msvcm80: Add stub for ThrowModuleLoadException(String, Exception) function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34537 --- dlls/msvcm80/msvcm80.spec | 4 ++-- dlls/msvcm80/msvcm_main.c | 6 ++++++ dlls/msvcm90/msvcm90.spec | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index b35a0ba7d89..211dcd678b8 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -5,8 +5,8 @@ @ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer @ cdecl -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z(ptr) CrtImplementationDetails_ThrowModuleLoadException @ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z(ptr) CrtImplementationDetails_ThrowModuleLoadException -@ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z -@ stub -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@PE$AAVException(a)3@@Z +@ cdecl -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner +@ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@PE$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner @ stub -arch=win32 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVException(a)System@@0(a)Z @ stub -arch=win64 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVException(a)System@@0(a)Z @ stub -arch=win32 ?_Addstd(a)ios_base@std@@SAXPAV12@@Z diff --git a/dlls/msvcm80/msvcm_main.c b/dlls/msvcm80/msvcm_main.c index badb9a1b5f8..680636d5418 100644 --- a/dlls/msvcm80/msvcm_main.c +++ b/dlls/msvcm80/msvcm_main.c @@ -49,3 +49,9 @@ void __cdecl CrtImplementationDetails_ThrowModuleLoadException(void* message) { FIXME("%p: stub\n", message); } + +/* void __cdecl <CrtImplementationDetails>::ThrowModuleLoadException(System.String^, System.Exception^) */ +void __cdecl CrtImplementationDetails_ThrowModuleLoadException_inner(void* message, void* inner) +{ + FIXME("%p %p: stub\n", message, inner); +} diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index 80c661e775e..cb555442ed0 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -5,8 +5,8 @@ @ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer @ cdecl -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z(ptr) CrtImplementationDetails_ThrowModuleLoadException @ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z(ptr) CrtImplementationDetails_ThrowModuleLoadException -@ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z -@ stub -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@PE$AAVException(a)3@@Z +@ cdecl -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner +@ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@PE$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner @ stub -arch=win32 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVException(a)System@@0(a)Z @ stub -arch=win64 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVException(a)System@@0(a)Z @ stub -arch=win32 ?_Addstd(a)ios_base@std@@SAXPAV12@@Z

1 0

Vijay Kiran Kamuju : msvcm80: Add stub for ThrowNestedLoadModuleException function.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 63ccb5826db1884f5f3946f1800657e3ab31b122 URL: https://gitlab.winehq.org/wine/wine/-/commit/63ccb5826db1884f5f3946f1800657… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Dec 5 21:05:17 2023 +0100 msvcm80: Add stub for ThrowNestedLoadModuleException function. --- dlls/msvcm80/msvcm80.spec | 4 ++-- dlls/msvcm80/msvcm_main.c | 6 ++++++ dlls/msvcm90/msvcm90.spec | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 211dcd678b8..89cabd80f34 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -7,8 +7,8 @@ @ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z(ptr) CrtImplementationDetails_ThrowModuleLoadException @ cdecl -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner @ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@PE$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner -@ stub -arch=win32 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVException(a)System@@0(a)Z -@ stub -arch=win64 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVException(a)System@@0(a)Z +@ cdecl -arch=win32 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVException(a)System@@0(a)Z(ptr ptr) CrtImplementationDetails_ThrowNestedModuleLoadException +@ cdecl -arch=win64 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVException(a)System@@0(a)Z(ptr ptr) CrtImplementationDetails_ThrowNestedModuleLoadException @ stub -arch=win32 ?_Addstd(a)ios_base@std@@SAXPAV12@@Z @ stub -arch=win64 ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z diff --git a/dlls/msvcm80/msvcm_main.c b/dlls/msvcm80/msvcm_main.c index 680636d5418..9b7cd18dcb0 100644 --- a/dlls/msvcm80/msvcm_main.c +++ b/dlls/msvcm80/msvcm_main.c @@ -55,3 +55,9 @@ void __cdecl CrtImplementationDetails_ThrowModuleLoadException_inner(void* messa { FIXME("%p %p: stub\n", message, inner); } + +/* void __cdecl <CrtImplementationDetails>::ThrowNestedModuleLoadException(System.Exception^, System.Exception^) */ +void __cdecl CrtImplementationDetails_ThrowNestedModuleLoadException(void* inner, void* nested) +{ + FIXME("%p %p: stub\n", inner, nested); +} diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index cb555442ed0..3cd61344fe4 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -7,8 +7,8 @@ @ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z(ptr) CrtImplementationDetails_ThrowModuleLoadException @ cdecl -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner @ cdecl -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@PE$AAVException(a)3@@Z(ptr ptr) CrtImplementationDetails_ThrowModuleLoadException_inner -@ stub -arch=win32 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVException(a)System@@0(a)Z -@ stub -arch=win64 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVException(a)System@@0(a)Z +@ cdecl -arch=win32 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVException(a)System@@0(a)Z(ptr ptr) CrtImplementationDetails_ThrowNestedModuleLoadException +@ cdecl -arch=win64 ?ThrowNestedModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVException(a)System@@0(a)Z(ptr ptr) CrtImplementationDetails_ThrowNestedModuleLoadException @ stub -arch=win32 ?_Addstd(a)ios_base@std@@SAXPAV12@@Z @ stub -arch=win64 ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z

1 0

Alfred Agrell : quartz/tests: Improve VMR9 ChangeD3DDevice test.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 31788cdc8c9cc9f6b0b4bdc2d1b96bcd48208fdf URL: https://gitlab.winehq.org/wine/wine/-/commit/31788cdc8c9cc9f6b0b4bdc2d1b96b… Author: Alfred Agrell <floating(a)muncher.se> Date: Wed Sep 27 18:33:25 2023 +0200 quartz/tests: Improve VMR9 ChangeD3DDevice test. - Checks that it presents using the new device, instead of counting TerminateDevice. - Works on Windows now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55649 --- dlls/quartz/tests/vmr9.c | 69 +++++++++++++++++++++++++++++++++++++++--------- dlls/quartz/vmr9.c | 2 +- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 447273a91df..bdd3516da73 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1586,7 +1586,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); - ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); + ok(!IsWindowVisible(hwnd), "Window should be invisible.\n"); thread = send_frame(input); ret = WaitForSingleObject(thread, 1000); @@ -2934,6 +2934,7 @@ struct presenter D3DFORMAT format; DWORD accept_flags; + IDirect3DDevice9 *device; IDirect3DSurface9 *surfaces[5]; IVMRSurfaceAllocatorNotify9 *notify; unsigned int got_PresentImage, got_TerminateDevice; @@ -2979,9 +2980,13 @@ static HRESULT WINAPI presenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD static HRESULT WINAPI presenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR cookie, VMR9PresentationInfo *info) { struct presenter *presenter = impl_from_IVMRImagePresenter9(iface); + IDirect3DDevice9 *device; static const RECT rect; if (winetest_debug > 1) trace("PresentImage()\n"); + IDirect3DSurface9_GetDevice(info->lpSurf, &device); + ok(device == presenter->device, "got %p, expected %p\n", device, presenter->device); + IDirect3DDevice9_Release(device); ok(cookie == 0xabacab, "Got cookie %#Ix.\n", cookie); todo_wine ok(info->dwFlags == VMR9Sample_TimeValid, "Got flags %#lx.\n", info->dwFlags); ok(!info->rtStart, "Got start time %s.\n", wine_dbgstr_longlong(info->rtStart)); @@ -3224,6 +3229,7 @@ static void test_renderless_formats(void) IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); + presenter.device = device; if (hr == E_NOINTERFACE) { win_skip("Direct3D does not support video rendering.\n"); @@ -4307,12 +4313,11 @@ static void test_changed3ddevice(void) { VIDEOINFOHEADER vih = { + .rcSource = {4, 6, 16, 12}, + .rcTarget = {40, 60, 160, 120}, .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), - .bmiHeader.biBitCount = 32, .bmiHeader.biWidth = 32, .bmiHeader.biHeight = 16, - .bmiHeader.biPlanes = 1, - .bmiHeader.biCompression = BI_RGB, }; AM_MEDIA_TYPE req_mt = { @@ -4329,12 +4334,17 @@ static void test_changed3ddevice(void) .refcount = 1, .accept_flags = VMR9AllocFlag_TextureSurface, }; + ALLOCATOR_PROPERTIES req_props = {5, 32 * 16 * 4, 1, 0}, ret_props; IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); IFilterGraph2 *graph = create_graph(); IVMRSurfaceAllocatorNotify9 *notify; - IDirect3DDevice9 *device, *device2; RECT rect = {0, 0, 640, 480}; + IDirect3DDevice9 *device; struct testfilter source; + IMemAllocator *allocator; + IMediaControl *control; + IMemInputPin *input; + OAFilterState state; IPin *pin = NULL; HWND window; HRESULT hr; @@ -4367,6 +4377,16 @@ static void test_changed3ddevice(void) } ok(hr == S_OK, "Got hr %#lx.\n", hr); + IDirect3DDevice9_Release(device); + + device = create_device(window); + ok(device != NULL, "Couldn't create device\n"); + + hr = IVMRSurfaceAllocatorNotify9_ChangeD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + presenter.device = device; + presenter.got_PresentImage = 0; + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); @@ -4374,20 +4394,43 @@ static void test_changed3ddevice(void) hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); - device2 = create_device(window); - ok(device2 != NULL, "Couldn't create device\n"); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); - ok(presenter.got_TerminateDevice == 0, "got %d\n", presenter.got_TerminateDevice); + hr = IMemInputPin_GetAllocator(input, &allocator); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == VFW_E_NO_ALLOCATOR) + { + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); - hr = IVMRSurfaceAllocatorNotify9_ChangeD3DDevice(notify, device2, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); + hr = IMemInputPin_NotifyAllocator(input, allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemAllocator_Commit(allocator); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(presenter.got_TerminateDevice == 1, "got %d\n", presenter.got_TerminateDevice); - IDirect3DDevice9_Release(device2); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + join_thread(send_frame(input)); + + hr = IMediaControl_GetState(control, 100, &state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(presenter.got_PresentImage >= 1, "Got %u calls to PresentImage().\n", presenter.got_PresentImage); + IMediaControl_Release(control); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + IMemAllocator_Release(allocator); + IMemInputPin_Release(input); + IPin_Release(pin); out: - if (pin) - IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %ld.\n", ref); IVMRSurfaceAllocatorNotify9_Release(notify); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 27ebe68e69a..e34e6cee2ba 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2019,7 +2019,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_ChangeD3DDevice(IVMRSurfaceAllo This->allocator_d3d9_dev = device; IDirect3DDevice9_AddRef(This->allocator_d3d9_dev); - if (This->mode && This->allocator && This->presenter) + if (This->surfaces) { deallocate_surfaces(This); allocate_surfaces(This, &This->renderer.sink.pin.mt);

1 0

Anton Baskanov : quartz/tests: Add quality control tests for CMpegVideoCodec.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 1fd2958fbec3ba1285d4f3583076e0a69d5afd72 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fd2958fbec3ba1285d4f3583076e0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Dec 2 23:07:29 2023 +0700 quartz/tests: Add quality control tests for CMpegVideoCodec. --- dlls/quartz/tests/mpegvideo.c | 162 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/dlls/quartz/tests/mpegvideo.c b/dlls/quartz/tests/mpegvideo.c index f66d69e99b8..52c174098a9 100644 --- a/dlls/quartz/tests/mpegvideo.c +++ b/dlls/quartz/tests/mpegvideo.c @@ -718,11 +718,118 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +struct testqc +{ + IQualityControl IQualityControl_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; + IBaseFilter *notify_sender; + Quality notify_quality; + HRESULT notify_hr; +}; + +static struct testqc *impl_from_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, struct testqc, IQualityControl_iface); +} + +static HRESULT WINAPI testqc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) +{ + struct testqc *qc = impl_from_IQualityControl(iface); + return IUnknown_QueryInterface(qc->outer_unk, iid, out); +} + +static ULONG WINAPI testqc_AddRef(IQualityControl *iface) +{ + struct testqc *qc = impl_from_IQualityControl(iface); + return IUnknown_AddRef(qc->outer_unk); +} + +static ULONG WINAPI testqc_Release(IQualityControl *iface) +{ + struct testqc *qc = impl_from_IQualityControl(iface); + return IUnknown_Release(qc->outer_unk); +} + +static HRESULT WINAPI testqc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) +{ + struct testqc *qc = impl_from_IQualityControl(iface); + + qc->notify_sender = sender; + qc->notify_quality = q; + + return qc->notify_hr; +} + +static HRESULT WINAPI testqc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IQualityControlVtbl testqc_vtbl = +{ + testqc_QueryInterface, + testqc_AddRef, + testqc_Release, + testqc_Notify, + testqc_SetSink, +}; + +static struct testqc *impl_from_qc_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct testqc, IUnknown_inner); +} + +static HRESULT WINAPI testqc_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct testqc *qc = impl_from_qc_IUnknown(iface); + + if (IsEqualIID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualIID(iid, &IID_IQualityControl)) + *out = &qc->IQualityControl_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI testqc_inner_AddRef(IUnknown *iface) +{ + struct testqc *qc = impl_from_qc_IUnknown(iface); + return InterlockedIncrement(&qc->refcount); +} + +static ULONG WINAPI testqc_inner_Release(IUnknown *iface) +{ + struct testqc *qc = impl_from_qc_IUnknown(iface); + return InterlockedDecrement(&qc->refcount); +} + +static const IUnknownVtbl testqc_inner_vtbl = +{ + testqc_inner_QueryInterface, + testqc_inner_AddRef, + testqc_inner_Release, +}; + +static void testqc_init(struct testqc *qc, IUnknown *outer) +{ + memset(qc, 0, sizeof(*qc)); + qc->IQualityControl_iface.lpVtbl = &testqc_vtbl; + qc->IUnknown_inner.lpVtbl = &testqc_inner_vtbl; + qc->outer_unk = outer ? outer : &qc->IUnknown_inner; +} + struct testfilter { struct strmbase_filter filter; struct strmbase_source source; struct strmbase_sink sink; + struct testqc *qc; const AM_MEDIA_TYPE *mt; unsigned int got_sample, got_new_segment, got_eos, got_begin_flush, got_end_flush; REFERENCE_TIME expected_start_time; @@ -1042,6 +1149,59 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, IFilterGraph2_Disconnect(graph, &testsource->source.pin.IPin_iface); } +static void test_quality_control(IFilterGraph2 *graph, IBaseFilter *filter, + IPin *sink, IPin *source, struct testfilter *testsource, struct testfilter *testsink) +{ + struct testqc testsource_qc; + IQualityControl *source_qc; + IQualityControl *sink_qc; + Quality quality = {0}; + struct testqc qc; + HRESULT hr; + + testqc_init(&testsource_qc, testsource->filter.outer_unk); + testqc_init(&qc, NULL); + + testsource->qc = &testsource_qc; + + hr = IPin_QueryInterface(sink, &IID_IQualityControl, (void **)&sink_qc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IPin_QueryInterface(source, &IID_IQualityControl, (void **)&source_qc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IQualityControl_Notify(source_qc, &testsink->filter.IBaseFilter_iface, quality); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &testsource->source.pin.IPin_iface, sink, &mpeg_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + testsource_qc.notify_sender = (IBaseFilter *)0xdeadbeef; + hr = IQualityControl_Notify(source_qc, &testsink->filter.IBaseFilter_iface, quality); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsource_qc.notify_sender == (IBaseFilter *)0xdeadbeef, "Got sender %p.\n", + testsource_qc.notify_sender); + + hr = IQualityControl_SetSink(sink_qc, &qc.IQualityControl_iface); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + qc.notify_sender = (IBaseFilter *)0xdeadbeef; + hr = IQualityControl_Notify(source_qc, &testsink->filter.IBaseFilter_iface, quality); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(qc.notify_sender == (IBaseFilter *)0xdeadbeef, "Got sender %p.\n", qc.notify_sender); + + qc.notify_hr = E_FAIL; + hr = IQualityControl_Notify(source_qc, &testsink->filter.IBaseFilter_iface, quality); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + qc.notify_hr = S_OK; + + IFilterGraph2_Disconnect(graph, sink); + IFilterGraph2_Disconnect(graph, &testsource->source.pin.IPin_iface); + + IQualityControl_Release(source_qc); + IQualityControl_Release(sink_qc); + + testsource->qc = NULL; +} + static void test_send_sample(IMemInputPin *input, IMediaSample *sample, const BYTE *data, LONG len, BOOL todo) { BYTE *target_data; @@ -1322,6 +1482,8 @@ static void test_connect_pin(void) IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&meminput); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + test_quality_control(graph, filter, sink, source, &testsource, &testsink); + for (i=0;i<ARRAY_SIZE(video_types);++i) { BOOL should_work;

1 0

Anton Baskanov : winegstreamer: Handle quality control messages in CMpegVideoCodec.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: b9e8a742b7b9443b0268e128d52d6f806f24bdff URL: https://gitlab.winehq.org/wine/wine/-/commit/b9e8a742b7b9443b0268e128d52d6f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Dec 2 23:43:39 2023 +0700 winegstreamer: Handle quality control messages in CMpegVideoCodec. Based on the code from quartz_parser and wg_parser. --- dlls/quartz/tests/mpegvideo.c | 8 ++-- dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/main.c | 18 +++++++ dlls/winegstreamer/quartz_transform.c | 88 ++++++++++++++++++++++++++++------- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 10 ++++ dlls/winegstreamer/wg_parser.c | 2 + dlls/winegstreamer/wg_transform.c | 30 ++++++++++++ 8 files changed, 139 insertions(+), 20 deletions(-)

1 0

Daniel Lehman : msxml3: Handle default namespace in get_nodeName.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 4e1a3cc81ec1443cb20ebdc010bb63e5ae8886ba URL: https://gitlab.winehq.org/wine/wine/-/commit/4e1a3cc81ec1443cb20ebdc010bb63… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 28 21:51:28 2023 -0800 msxml3: Handle default namespace in get_nodeName. --- dlls/msxml3/node.c | 22 ++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 1 - dlls/msxml4/tests/domdoc.c | 1 - 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f557aeaa2bf..5145acc77a2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -186,6 +186,13 @@ HRESULT node_get_nodeName(xmlnode *This, BSTR *name) hr = node_get_base_name(This, &base); if (hr != S_OK) return hr; + if (!base[0] && xmldoc_version(This->node->doc) != MSXML6) + { + SysFreeString(base); + *name = SysAllocString(L"xmlns"); + return S_OK; + } + hr = node_get_prefix(This, &prefix); if (hr == S_OK) { @@ -194,10 +201,17 @@ HRESULT node_get_nodeName(xmlnode *This, BSTR *name) /* +1 for ':' */ ptr = *name = SysAllocStringLen(NULL, SysStringLen(base) + SysStringLen(prefix) + 1); - memcpy(ptr, prefix, SysStringByteLen(prefix)); - ptr += SysStringLen(prefix); - memcpy(ptr++, &colW, sizeof(WCHAR)); - memcpy(ptr, base, SysStringByteLen(base)); + if (SysStringByteLen(prefix)) + { + memcpy(ptr, prefix, SysStringByteLen(prefix)); + ptr += SysStringLen(prefix); + } + if (SysStringByteLen(base)) + { + if (SysStringByteLen(prefix)) + memcpy(ptr++, &colW, sizeof(WCHAR)); + memcpy(ptr, base, SysStringByteLen(base)); + } SysFreeString(base); SysFreeString(prefix); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1eceeda65de..3117ddabe4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13778,7 +13778,6 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 70bd4de58c3..b2af7a1658e 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -261,7 +261,6 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Henri Verbeet : dxgi/tests: Release the swapchain after waiting for the window thread to finish in test_resize_target_wndproc().
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 3eebc3ea925bc44e2da12f65ef3c601912ba252a URL: https://gitlab.winehq.org/wine/wine/-/commit/3eebc3ea925bc44e2da12f65ef3c60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 4 13:35:20 2023 +0100 dxgi/tests: Release the swapchain after waiting for the window thread to finish in test_resize_target_wndproc(). In order to prevent resize_target_wndproc() from potentially accessing the swapchain after it has been destroyed. --- dlls/dxgi/tests/dxgi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f929a571823..35b89e94157 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3523,12 +3523,6 @@ static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); - - refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); - ret = SetEvent(thread_data.finished); ok(ret, "Failed to set event, last error %#lx.\n", GetLastError()); ret = WaitForSingleObject(thread, INFINITE); @@ -3536,6 +3530,12 @@ static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) CloseHandle(thread); CloseHandle(thread_data.window_created); CloseHandle(thread_data.finished); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); + + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_inexact_modes(void)

1 0

Henri Verbeet : dxgi: Avoid redundantly setting the present info wait semaphore fields in d3d12_swapchain_queue_present().
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: dcee5182c6cfb58cfc10418c66a639fd2e374c65 URL: https://gitlab.winehq.org/wine/wine/-/commit/dcee5182c6cfb58cfc10418c66a639… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 4 17:22:29 2023 +0100 dxgi: Avoid redundantly setting the present info wait semaphore fields in d3d12_swapchain_queue_present(). --- dlls/dxgi/swapchain.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6a26776d35d..fe9df45cb71 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2134,14 +2134,12 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; - present_info.waitSemaphoreCount = 0; - present_info.pWaitSemaphores = NULL; + present_info.waitSemaphoreCount = 1; + present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->vk_image_index]; present_info.swapchainCount = 1; present_info.pSwapchains = &swapchain->vk_swapchain; present_info.pImageIndices = &swapchain->vk_image_index; present_info.pResults = NULL; - present_info.waitSemaphoreCount = 1; - present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->vk_image_index]; if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) >= 0) swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX;

1 0

Zebediah Figura : d3d10core/tests: Mark a test as no longer todo.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: 5b97dbdb5891735a3e24d601c7775631b4dbabac URL: https://gitlab.winehq.org/wine/wine/-/commit/5b97dbdb5891735a3e24d601c77756… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 4 14:14:42 2023 -0600 d3d10core/tests: Mark a test as no longer todo. This was fixed by ef2908462d37951761f2f820b6fdb6446787543c. I misremembered when writing that commit's message; we don't actually invalidate STATE_SAMPLER when binding an SRV. Hence the code was not just "fragile" but in fact already broken. --- dlls/d3d10core/tests/d3d10core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index fadf9211640..9cb0ec118a4 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -14186,7 +14186,7 @@ static void test_unbind_shader_resource_view(void) ID3D10Device_PSSetShaderResources(device, 1, 1, &srv2); ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); draw_quad(&test_context); - todo_wine_if (!damavand) check_texture_color(test_context.backbuffer, 0x00000000, 1); + check_texture_color(test_context.backbuffer, 0x00000000, 1); ID3D10PixelShader_Release(ps); ID3D10ShaderResourceView_Release(srv);

1 0

Zebediah Figura : d3d11core/tests: Mark a test as no longer todo.
by Alexandre Julliard 05 Dec '23

05 Dec '23

Module: wine Branch: master Commit: d9342e85db8a0dd2b73301fb0cc8c462e2474285 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9342e85db8a0dd2b73301fb0cc8c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 4 14:16:56 2023 -0600 d3d11core/tests: Mark a test as no longer todo. This was fixed by ef2908462d37951761f2f820b6fdb6446787543c. I misremembered when writing that commit's message; we don't actually invalidate STATE_SAMPLER when binding an SRV. Hence the code was not just "fragile" but in fact already broken. --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ecc01f50bfa..727f263731d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21859,7 +21859,7 @@ static void test_unbind_shader_resource_view(void) ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv2); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); draw_quad(&test_context); - todo_wine_if (!damavand) check_texture_color(test_context.backbuffer, 0x00000000, 1); + check_texture_color(test_context.backbuffer, 0x00000000, 1); ID3D11PixelShader_Release(ps); ID3D11ShaderResourceView_Release(srv);

1 0