December 2023 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 93ff7aaabfdf9c90ee8b40671fce28bf6700bee1 URL: https://gitlab.winehq.org/wine/wine/-/commit/93ff7aaabfdf9c90ee8b40671fce28… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Dec 8 00:07:30 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index a3b8ab368b0..857becd2b40 100644 --- a/po/lt.po +++ b/po/lt.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: 2023-12-05 00:28+0200\n" +"PO-Revision-Date: 2023-12-08 00:07+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15030,7 +15030,7 @@ msgstr "Šios tarnybos vykdomos:\n" #: programs/net/net.rc:44 msgid "A command was used with conflicting switches.\n" -msgstr "" +msgstr "Panaudota komanda su nederančiais parametrais.\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections"

1 0

Alfred Agrell : winegstreamer: Delete duplicate WMT_ON check.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: b7db871088c00c1596cf41313667b746e0d731dd URL: https://gitlab.winehq.org/wine/wine/-/commit/b7db871088c00c1596cf41313667b7… Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Dec 5 00:46:17 2023 +0100 winegstreamer: Delete duplicate WMT_ON check. --- dlls/winegstreamer/wm_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 6bb73e9a47b..e3a2bfc343b 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2462,7 +2462,7 @@ static HRESULT WINAPI reader_SetStreamsSelected(IWMSyncReader2 *iface, TRACE("Disabling stream %u.\n", stream_numbers[i]); wg_parser_stream_disable(stream->wg_stream); } - else if (selections[i] == WMT_ON) + else { if (selections[i] != WMT_ON) FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n",

1 0

Zebediah Figura : quartz: Stub CLSID_AllocPresenter.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: cf44bec5980aedd76f930a742ef7d98b5cacb013 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf44bec5980aedd76f930a742ef7d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 7 10:35:24 2023 -0600 quartz: Stub CLSID_AllocPresenter. --- dlls/quartz/Makefile.in | 1 + dlls/quartz/main.c | 1 + dlls/quartz/quartz_private.h | 1 + dlls/quartz/quartz_strmif.idl | 6 +++ dlls/quartz/vmr7_presenter.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 90955e73cb4..0670ba95b48 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -19,6 +19,7 @@ SOURCES = \ systemclock.c \ videorenderer.c \ vmr7.c \ + vmr7_presenter.c \ vmr9.c \ window.c diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index fc6f39e3859..f52884afb34 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -59,6 +59,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_ACMWrapper, acm_wrapper_create }, + { &CLSID_AllocPresenter, vmr7_presenter_create }, { &CLSID_AsyncReader, async_reader_create }, { &CLSID_AudioRender, dsound_render_create }, { &CLSID_AVIDec, avi_dec_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 58d8bb775a9..8a761e540b9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -81,6 +81,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out); HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out); HRESULT video_renderer_create(IUnknown *outer, IUnknown **out); HRESULT video_renderer_default_create(IUnknown *outer, IUnknown **out); +HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out); HRESULT vmr7_create(IUnknown *outer, IUnknown **out); HRESULT vmr9_create(IUnknown *outer, IUnknown **out); diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl index b0b43ee2f33..8e2506c80a4 100644 --- a/dlls/quartz/quartz_strmif.idl +++ b/dlls/quartz/quartz_strmif.idl @@ -139,3 +139,9 @@ coclass VideoMixingRenderer { interface IBaseFilter; } uuid(51b4abf3-748f-4e3b-a276-c828330e926a) ] coclass VideoMixingRenderer9 { interface IBaseFilter; } + +[ + threading(both), + uuid(99d54f63-1a69-41ae-aa4d-c976eb3f0713) +] +coclass AllocPresenter {} diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c new file mode 100644 index 00000000000..952cb879197 --- /dev/null +++ b/dlls/quartz/vmr7_presenter.c @@ -0,0 +1,123 @@ +/* + * Default allocator-presenter for the VMR7 + * + * Copyright 2023 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "quartz_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(quartz); + +struct vmr7_presenter +{ + IVMRImagePresenter IVMRImagePresenter_iface; + LONG refcount; +}; + +static struct vmr7_presenter *impl_from_IVMRImagePresenter(IVMRImagePresenter *iface) +{ + return CONTAINING_RECORD(iface, struct vmr7_presenter, IVMRImagePresenter_iface); +} + +static HRESULT WINAPI image_presenter_QueryInterface(IVMRImagePresenter *iface, REFIID iid, void **out) +{ + struct vmr7_presenter *presenter = impl_from_IVMRImagePresenter(iface); + + TRACE("presenter %p, iid %s, out %p.\n", presenter, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IVMRImagePresenter)) + *out = iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI image_presenter_AddRef(IVMRImagePresenter *iface) +{ + struct vmr7_presenter *presenter = impl_from_IVMRImagePresenter(iface); + ULONG refcount = InterlockedIncrement(&presenter->refcount); + + TRACE("%p increasing refcount to %lu.\n", presenter, refcount); + return refcount; +} + +static ULONG WINAPI image_presenter_Release(IVMRImagePresenter *iface) +{ + struct vmr7_presenter *presenter = impl_from_IVMRImagePresenter(iface); + ULONG refcount = InterlockedDecrement(&presenter->refcount); + + TRACE("%p decreasing refcount to %lu.\n", presenter, refcount); + if (!refcount) + free(presenter); + return refcount; +} + +static HRESULT WINAPI image_presenter_StartPresenting(IVMRImagePresenter *iface, DWORD_PTR cookie) +{ + FIXME("iface %p, cookie %#Ix, stub!\n", iface, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI image_presenter_StopPresenting(IVMRImagePresenter *iface, DWORD_PTR cookie) +{ + FIXME("iface %p, cookie %#Ix, stub!\n", iface, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI image_presenter_PresentImage(IVMRImagePresenter *iface, + DWORD_PTR cookie, VMRPRESENTATIONINFO *info) +{ + FIXME("iface %p, cookie %#Ix, info %p, stub!\n", iface, cookie, info); + return E_NOTIMPL; +} + +static const IVMRImagePresenterVtbl image_presenter_vtbl = +{ + image_presenter_QueryInterface, + image_presenter_AddRef, + image_presenter_Release, + image_presenter_StartPresenting, + image_presenter_StopPresenting, + image_presenter_PresentImage, +}; + +HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) +{ + struct vmr7_presenter *object; + + TRACE("outer %p, out %p.\n", outer, out); + + if (outer) + FIXME("Ignoring outer %p.\n", outer); + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + object->IVMRImagePresenter_iface.lpVtbl = &image_presenter_vtbl; + object->refcount = 1; + + TRACE("Created VMR7 default presenter %p.\n", object); + *out = (IUnknown *)&object->IVMRSurfaceAllocator_iface; + return S_OK; +}

1 0

Zebediah Figura : quartz: Implement sample allocation in the VMR7 presenter.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 9be491e80fc97058402ee74140d7ce90a45a956b URL: https://gitlab.winehq.org/wine/wine/-/commit/9be491e80fc97058402ee74140d7ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 7 13:30:43 2023 -0600 quartz: Implement sample allocation in the VMR7 presenter. --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/vmr7.c | 171 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/vmr7_presenter.c | 79 +++++++++++++++++-- 4 files changed, 247 insertions(+), 7 deletions(-)

1 0

Zebediah Figura : quartz: Stub IVMRWindowlessControl on the VMR7 presenter.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 830801d534481145ceae705f2da601372d10b999 URL: https://gitlab.winehq.org/wine/wine/-/commit/830801d534481145ceae705f2da601… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 7 10:39:15 2023 -0600 quartz: Stub IVMRWindowlessControl on the VMR7 presenter. Rewrite needs this. --- dlls/quartz/vmr7_presenter.c | 152 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c index ddb402456f7..222e6db6048 100644 --- a/dlls/quartz/vmr7_presenter.c +++ b/dlls/quartz/vmr7_presenter.c @@ -28,6 +28,7 @@ struct vmr7_presenter { IVMRImagePresenter IVMRImagePresenter_iface; IVMRSurfaceAllocator IVMRSurfaceAllocator_iface; + IVMRWindowlessControl IVMRWindowlessControl_iface; LONG refcount; }; @@ -46,6 +47,8 @@ static HRESULT WINAPI image_presenter_QueryInterface(IVMRImagePresenter *iface, *out = iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocator)) *out = &presenter->IVMRSurfaceAllocator_iface; + else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl)) + *out = &presenter->IVMRWindowlessControl_iface; else { *out = NULL; @@ -170,6 +173,154 @@ static const IVMRSurfaceAllocatorVtbl surface_allocator_vtbl = surface_allocator_AdviseNotify, }; +static struct vmr7_presenter *impl_from_IVMRWindowlessControl(IVMRWindowlessControl *iface) +{ + return CONTAINING_RECORD(iface, struct vmr7_presenter, IVMRWindowlessControl_iface); +} + +static HRESULT WINAPI windowless_control_QueryInterface(IVMRWindowlessControl *iface, REFIID iid, void **out) +{ + struct vmr7_presenter *presenter = impl_from_IVMRWindowlessControl(iface); + + return IVMRImagePresenter_QueryInterface(&presenter->IVMRImagePresenter_iface, iid, out); +} + +static ULONG WINAPI windowless_control_AddRef(IVMRWindowlessControl *iface) +{ + struct vmr7_presenter *presenter = impl_from_IVMRWindowlessControl(iface); + + return IVMRImagePresenter_AddRef(&presenter->IVMRImagePresenter_iface); +} + +static ULONG WINAPI windowless_control_Release(IVMRWindowlessControl *iface) +{ + struct vmr7_presenter *presenter = impl_from_IVMRWindowlessControl(iface); + + return IVMRImagePresenter_Release(&presenter->IVMRImagePresenter_iface); +} + +static HRESULT WINAPI windowless_control_GetNativeVideoSize(IVMRWindowlessControl *iface, + LONG *width, LONG *height, LONG *aspect_width, LONG *aspect_height) +{ + FIXME("iface %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", + iface, width, height, aspect_width, aspect_height); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetMinIdealVideoSize( + IVMRWindowlessControl *iface, LONG *width, LONG *height) +{ + FIXME("iface %p, width %p, height %p, stub!\n", iface, width, height); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetMaxIdealVideoSize( + IVMRWindowlessControl *iface, LONG *width, LONG *height) +{ + FIXME("iface %p, width %p, height %p, stub!\n", iface, width, height); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_SetVideoPosition( + IVMRWindowlessControl *iface, const RECT *source, const RECT *dest) +{ + FIXME("iface %p, source %s, dest %s, stub!.\n", iface, wine_dbgstr_rect(source), wine_dbgstr_rect(dest)); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetVideoPosition( + IVMRWindowlessControl *iface, RECT *source, RECT *dest) +{ + FIXME("iface %p, source %p, dest %p.\n", iface, source, dest); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetAspectRatioMode( + IVMRWindowlessControl *iface, DWORD *mode) +{ + FIXME("iface %p, mode %p, stub!\n", iface, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_SetAspectRatioMode( + IVMRWindowlessControl *iface, DWORD mode) +{ + FIXME("iface %p, mode %#lx, stub!\n", iface, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_SetVideoClippingWindow( + IVMRWindowlessControl *iface, HWND window) +{ + FIXME("iface %p, window %p, stub!.\n", iface, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_RepaintVideo( + IVMRWindowlessControl *iface, HWND window, HDC dc) +{ + FIXME("iface %p, window %p, dc %p, stub!\n", iface, window, dc); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_DisplayModeChanged(IVMRWindowlessControl *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetCurrentImage(IVMRWindowlessControl *iface, BYTE **image) +{ + FIXME("iface %p, image %p, stub!\n", iface, image); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_SetBorderColor(IVMRWindowlessControl *iface, COLORREF color) +{ + FIXME("iface %p, color %#08lx, stub!\n", iface, color); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetBorderColor(IVMRWindowlessControl *iface, COLORREF *color) +{ + FIXME("iface %p, color %p, stub!\n", iface, color); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_SetColorKey(IVMRWindowlessControl *iface, COLORREF color) +{ + FIXME("iface %p, color %#08lx, stub!\n", iface, color); + return E_NOTIMPL; +} + +static HRESULT WINAPI windowless_control_GetColorKey(IVMRWindowlessControl *iface, COLORREF *color) +{ + FIXME("iface %p, color %p, stub!\n", iface, color); + return E_NOTIMPL; +} + +static const IVMRWindowlessControlVtbl windowless_control_vtbl = +{ + windowless_control_QueryInterface, + windowless_control_AddRef, + windowless_control_Release, + windowless_control_GetNativeVideoSize, + windowless_control_GetMinIdealVideoSize, + windowless_control_GetMaxIdealVideoSize, + windowless_control_SetVideoPosition, + windowless_control_GetVideoPosition, + windowless_control_GetAspectRatioMode, + windowless_control_SetAspectRatioMode, + windowless_control_SetVideoClippingWindow, + windowless_control_RepaintVideo, + windowless_control_DisplayModeChanged, + windowless_control_GetCurrentImage, + windowless_control_SetBorderColor, + windowless_control_GetBorderColor, + windowless_control_SetColorKey, + windowless_control_GetColorKey, +}; + HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) { struct vmr7_presenter *object; @@ -183,6 +334,7 @@ HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; object->IVMRImagePresenter_iface.lpVtbl = &image_presenter_vtbl; object->IVMRSurfaceAllocator_iface.lpVtbl = &surface_allocator_vtbl; + object->IVMRWindowlessControl_iface.lpVtbl = &windowless_control_vtbl; object->refcount = 1; TRACE("Created VMR7 default presenter %p.\n", object);

1 0

Alfred Agrell : winegstreamer: Don't use VIDEOINFO for non-RGB data.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 0ae5edc8edad477c7741a94c6577629a0a5076a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ae5edc8edad477c7741a94c657762… Author: Alfred Agrell <floating(a)muncher.se> Date: Mon Nov 20 22:19:11 2023 +0100 winegstreamer: Don't use VIDEOINFO for non-RGB data. --- dlls/winegstreamer/quartz_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index fdcea1017a9..44e13d05c2a 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -594,7 +594,7 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * static bool amt_from_wg_format_video_cinepak(AM_MEDIA_TYPE *mt, const struct wg_format *format) { - VIDEOINFO *video_format; + VIDEOINFOHEADER *video_format; uint32_t frame_time; if (!(video_format = CoTaskMemAlloc(sizeof(*video_format)))) @@ -605,7 +605,7 @@ static bool amt_from_wg_format_video_cinepak(AM_MEDIA_TYPE *mt, const struct wg_ mt->bTemporalCompression = TRUE; mt->lSampleSize = 1; mt->formattype = FORMAT_VideoInfo; - mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->cbFormat = sizeof(*video_format); mt->pbFormat = (BYTE *)video_format; memset(video_format, 0, sizeof(*video_format));

1 0

Alfred Agrell : winegstreamer: Fix a memory leak in stream_props_GetMediaType.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 7f8260817ec01378865bca5ed0e15f8f1e03850c URL: https://gitlab.winehq.org/wine/wine/-/commit/7f8260817ec01378865bca5ed0e15f… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Nov 23 01:31:24 2023 +0100 winegstreamer: Fix a memory leak in stream_props_GetMediaType. --- dlls/winegstreamer/wm_reader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 4751cc9da2e..6bb73e9a47b 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -555,16 +555,18 @@ static HRESULT WINAPI stream_props_GetMediaType(IWMMediaProps *iface, WM_MEDIA_T return E_OUTOFMEMORY; *size = sizeof(stream_mt) + stream_mt.cbFormat; - if (!mt) - return S_OK; - if (req_size < *size) - return ASF_E_BUFFERTOOSMALL; + if (mt && req_size >= *size) + { + strmbase_dump_media_type(&stream_mt); - strmbase_dump_media_type(&stream_mt); + memcpy(mt, &stream_mt, sizeof(*mt)); + memcpy(mt + 1, stream_mt.pbFormat, stream_mt.cbFormat); + mt->pbFormat = (BYTE *)(mt + 1); + } + FreeMediaType(&stream_mt); - memcpy(mt, &stream_mt, sizeof(*mt)); - memcpy(mt + 1, stream_mt.pbFormat, stream_mt.cbFormat); - mt->pbFormat = (BYTE *)(mt + 1); + if (mt && req_size < *size) + return ASF_E_BUFFERTOOSMALL; return S_OK; }

1 0

Zebediah Figura : quartz: Stub IVMRSurfaceAllocator on the VMR7 presenter.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 7b751a9f7ce772384d672fbcd9559f4c09b962d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b751a9f7ce772384d672fbcd9559f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 7 10:38:57 2023 -0600 quartz: Stub IVMRSurfaceAllocator on the VMR7 presenter. --- dlls/quartz/vmr7_presenter.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c index 952cb879197..ddb402456f7 100644 --- a/dlls/quartz/vmr7_presenter.c +++ b/dlls/quartz/vmr7_presenter.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct vmr7_presenter { IVMRImagePresenter IVMRImagePresenter_iface; + IVMRSurfaceAllocator IVMRSurfaceAllocator_iface; LONG refcount; }; @@ -43,6 +44,8 @@ static HRESULT WINAPI image_presenter_QueryInterface(IVMRImagePresenter *iface, if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IVMRImagePresenter)) *out = iface; + else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocator)) + *out = &presenter->IVMRSurfaceAllocator_iface; else { *out = NULL; @@ -103,6 +106,70 @@ static const IVMRImagePresenterVtbl image_presenter_vtbl = image_presenter_PresentImage, }; +static struct vmr7_presenter *impl_from_IVMRSurfaceAllocator(IVMRSurfaceAllocator *iface) +{ + return CONTAINING_RECORD(iface, struct vmr7_presenter, IVMRSurfaceAllocator_iface); +} + +static HRESULT WINAPI surface_allocator_QueryInterface(IVMRSurfaceAllocator *iface, REFIID iid, void **out) +{ + struct vmr7_presenter *presenter = impl_from_IVMRSurfaceAllocator(iface); + + return IVMRImagePresenter_QueryInterface(&presenter->IVMRImagePresenter_iface, iid, out); +} + +static ULONG WINAPI surface_allocator_AddRef(IVMRSurfaceAllocator *iface) +{ + struct vmr7_presenter *presenter = impl_from_IVMRSurfaceAllocator(iface); + + return IVMRImagePresenter_AddRef(&presenter->IVMRImagePresenter_iface); +} + +static ULONG WINAPI surface_allocator_Release(IVMRSurfaceAllocator *iface) +{ + struct vmr7_presenter *presenter = impl_from_IVMRSurfaceAllocator(iface); + + return IVMRImagePresenter_Release(&presenter->IVMRImagePresenter_iface); +} + +static HRESULT WINAPI surface_allocator_AllocateSurface(IVMRSurfaceAllocator *iface, + DWORD_PTR id, VMRALLOCATIONINFO *info, DWORD *count, IDirectDrawSurface7 **surfaces) +{ + FIXME("iface %p, id %#Ix, info %p, count %p, surfaces %p, stub!\n", iface, id, info, count, surfaces); + return E_NOTIMPL; +} + +static HRESULT WINAPI surface_allocator_FreeSurface(IVMRSurfaceAllocator *iface, DWORD_PTR id) +{ + FIXME("iface %p, id %#Ix, stub!\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI surface_allocator_PrepareSurface(IVMRSurfaceAllocator *iface, + DWORD_PTR id, IDirectDrawSurface7 *surface, DWORD flags) +{ + FIXME("iface %p, id %#Ix, surface %p, flags %#lx, stub!\n", iface, id, surface, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI surface_allocator_AdviseNotify(IVMRSurfaceAllocator *iface, + IVMRSurfaceAllocatorNotify *notify) +{ + FIXME("iface %p, notify %p, stub!\n", iface, notify); + return S_OK; +} + +static const IVMRSurfaceAllocatorVtbl surface_allocator_vtbl = +{ + surface_allocator_QueryInterface, + surface_allocator_AddRef, + surface_allocator_Release, + surface_allocator_AllocateSurface, + surface_allocator_FreeSurface, + surface_allocator_PrepareSurface, + surface_allocator_AdviseNotify, +}; + HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) { struct vmr7_presenter *object; @@ -115,6 +182,7 @@ HRESULT vmr7_presenter_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IVMRImagePresenter_iface.lpVtbl = &image_presenter_vtbl; + object->IVMRSurfaceAllocator_iface.lpVtbl = &surface_allocator_vtbl; object->refcount = 1; TRACE("Created VMR7 default presenter %p.\n", object);

1 0

Ziqing Hui : winegstreamer: Set streamheader field for h264 caps.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 95b8d7fa6078dba8678d7c93de74edf329a61795 URL: https://gitlab.winehq.org/wine/wine/-/commit/95b8d7fa6078dba8678d7c93de74ed… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 5 16:37:51 2023 +0800 winegstreamer: Set streamheader field for h264 caps. For h264 byte-stream format, we should set "streamheader". "codec_data" is for avc. We also set timestamp of the buffer to 0 because mp4mux will be error if the PTS is none. --- dlls/winegstreamer/wg_format.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 9404a0290eb..6da97685736 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -737,8 +737,10 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) return NULL; } + GST_BUFFER_PTS(buffer) = 0; + GST_BUFFER_DTS(buffer) = 0; gst_buffer_fill(buffer, 0, format->u.video_h264.codec_data, format->u.video_h264.codec_data_len); - gst_caps_set_simple(caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL); + gst_caps_set_simple(caps, "streamheader", GST_TYPE_BUFFER, buffer, NULL); gst_buffer_unref(buffer); }

1 0

Yuxuan Shui : dsound: Set position past the end of the buffer is invalid.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 1941a915368b8898da21d0dd4157fd68a4f4c9dd URL: https://gitlab.winehq.org/wine/wine/-/commit/1941a915368b8898da21d0dd4157fd… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Dec 7 19:55:20 2023 +0000 dsound: Set position past the end of the buffer is invalid. --- dlls/dsound/buffer.c | 7 +++++-- dlls/dsound/tests/dsound.c | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 1b724ee775b..8e261fde32c 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -574,12 +574,15 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK; - TRACE("(%p,%ld)\n",This,newpos); + TRACE("(%p,%lu)\n",This,newpos); + + if (newpos >= This->buflen) { + return E_INVALIDARG; + } AcquireSRWLockExclusive(&This->lock); /* start mixing from this new location instead */ - newpos %= This->buflen; newpos -= newpos%This->pwfx->nBlockAlign; This->sec_mixpos = newpos; diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index d5a3ccad8fd..9656a458415 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -919,6 +919,13 @@ static HRESULT test_block_align(LPGUID lpGuid) rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos2, NULL); ok(rc == DS_OK, "Could not get new position: %08lx\n", rc); ok(pos == pos2, "Positions not the same! Old position: %ld, new position: %ld\n", pos, pos2); + + /* Set position to past the end of the buffer */ + rc = IDirectSoundBuffer_SetCurrentPosition(secondary, wfx.nAvgBytesPerSec + 100); + ok(rc == E_INVALIDARG, "Set position to %lu succeeded\n", wfx.nAvgBytesPerSec + 100); + rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos2, NULL); + ok(rc == DS_OK, "Could not get new position: %08lx\n", rc); + ok(pos == pos2, "Positions not the same! Old position: %ld, new position: %ld\n", pos, pos2); } ref=IDirectSoundBuffer_Release(secondary); ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, "

1 0