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

Zebediah Figura : quartz/vmr9: Avoid leaking the surface array on connection failure.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 4eb58312d6056a21c54b0cb987439c63c796bf9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb58312d6056a21c54b0cb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:16 2020 -0500 quartz/vmr9: Avoid leaking the surface array on connection failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d4331d321d..3636d47702 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -428,11 +428,14 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE case 32: info.Format = D3DFMT_X8R8G8B8; break; default: FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); + free(filter->surfaces); return E_INVALIDARG; } info.dwFlags = VMR9AllocFlag_TextureSurface; - return initialize_device(filter, &info, count); + if (FAILED(hr = initialize_device(filter, &info, count))) + free(filter->surfaces); + return hr; } for (i = 0; i < ARRAY_SIZE(formats); ++i) @@ -457,6 +460,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } } + free(filter->surfaces); return hr; }

1 0

Zebediah Figura : quartz/vmr9: Merge VMR9_SendSampleData() into VMR9_DoRenderSample().
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 717784efc949da34709a44f46157cbb5b620991a URL: https://source.winehq.org/git/wine.git/?a=commit;h=717784efc949da34709a44f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:12 2020 -0500 quartz/vmr9: Merge VMR9_SendSampleData() into VMR9_DoRenderSample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 155 ++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6b653e5609..f81d806705 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -207,89 +207,41 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); } -static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *info, LPBYTE data, - DWORD size) +static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { - const BITMAPINFOHEADER *bmiHeader = get_bitmap_header(&This->renderer.sink.pin.mt); - HRESULT hr = S_OK; - int width; - int height; - D3DLOCKED_RECT lock; - - TRACE("%p %p %d\n", This, data, size); - - width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - - hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD); - if (FAILED(hr)) - { - ERR("IDirect3DSurface9_LockRect failed (%x)\n",hr); - return hr; - } - - if (height > 0) { - /* Bottom up image needs inverting */ - lock.pBits = (char *)lock.pBits + (height * lock.Pitch); - while (height--) - { - lock.pBits = (char *)lock.pBits - lock.Pitch; - memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); - data = data + width * bmiHeader->biBitCount / 8; - } - } - else if (lock.Pitch != width * bmiHeader->biBitCount / 8) - { - WARN("Slow path! %u/%u\n", lock.Pitch, width * bmiHeader->biBitCount/8); - - while (height--) - { - memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); - data = data + width * bmiHeader->biBitCount / 8; - lock.pBits = (char *)lock.pBits + lock.Pitch; - } - } - else memcpy(lock.pBits, data, size); - - IDirect3DSurface9_UnlockRect(info->lpSurf); - - hr = IVMRImagePresenter9_PresentImage(This->presenter, This->cookie, info); - return hr; -} - -static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) -{ - struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {This->run_event, This->renderer.flush_event}; + struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const BITMAPINFOHEADER *bitmap_header; + unsigned int data_size, width, depth; + REFERENCE_TIME start_time, end_time; VMR9PresentationInfo info = {}; - LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; - REFERENCE_TIME tStart, tStop; + D3DLOCKED_RECT locked_rect; + BYTE *data = NULL; HRESULT hr; + int height; - TRACE("%p %p\n", iface, pSample); + TRACE("filter %p, sample %p.\n", filter, sample); /* It is possible that there is no device at this point */ - if (!This->allocator || !This->presenter) + if (!filter->allocator || !filter->presenter) { ERR("NO PRESENTER!!\n"); return S_FALSE; } - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); - if (FAILED(hr)) - info.dwFlags = VMR9Sample_SrcDstRectsValid; - else - info.dwFlags = VMR9Sample_SrcDstRectsValid | VMR9Sample_TimeValid; + info.dwFlags = VMR9Sample_SrcDstRectsValid; - if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + if (SUCCEEDED(hr = IMediaSample_GetTime(sample, &start_time, &end_time))) + info.dwFlags |= VMR9Sample_TimeValid; + + if (IMediaSample_IsDiscontinuity(sample) == S_OK) info.dwFlags |= VMR9Sample_Discontinuity; - if (IMediaSample_IsPreroll(pSample) == S_OK) + if (IMediaSample_IsPreroll(sample) == S_OK) info.dwFlags |= VMR9Sample_Preroll; - if (IMediaSample_IsSyncPoint(pSample) == S_OK) + if (IMediaSample_IsSyncPoint(sample) == S_OK) info.dwFlags |= VMR9Sample_SyncPoint; /* If we render ourselves, and this is a preroll sample, discard it */ @@ -298,28 +250,73 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return S_OK; } - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); - if (FAILED(hr)) + if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) { - ERR("Cannot get pointer to sample data (%x)\n", hr); + ERR("Failed to get pointer to sample data, hr %#x.\n", hr); return hr; } + data_size = IMediaSample_GetActualDataLength(sample); - cbSrcStream = IMediaSample_GetActualDataLength(pSample); + bitmap_header = get_bitmap_header(&filter->renderer.sink.pin.mt); + width = bitmap_header->biWidth; + height = bitmap_header->biHeight; + depth = bitmap_header->biBitCount; - info.rtStart = tStart; - info.rtEnd = tStop; - info.szAspectRatio.cx = This->bmiheader.biWidth; - info.szAspectRatio.cy = This->bmiheader.biHeight; - info.lpSurf = This->surfaces[(++This->cur_surface) % This->num_surfaces]; + info.rtStart = start_time; + info.rtEnd = end_time; + info.szAspectRatio.cx = width; + info.szAspectRatio.cy = height; + info.lpSurf = filter->surfaces[(++filter->cur_surface) % filter->num_surfaces]; - VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); + if (FAILED(hr = IDirect3DSurface9_LockRect(info.lpSurf, &locked_rect, NULL, D3DLOCK_DISCARD))) + { + ERR("Failed to lock surface, hr %#x.\n", hr); + return hr; + } - if (This->renderer.filter.state == State_Paused) + if (height > 0) + { + BYTE *dst = (BYTE *)locked_rect.pBits + (height * locked_rect.Pitch); + const BYTE *src = data; + + TRACE("Inverting image.\n"); + + while (height--) + { + dst -= locked_rect.Pitch; + memcpy(dst, src, width * depth / 8); + src += width * depth / 8; + } + } + else if (locked_rect.Pitch != width * depth / 8) { - LeaveCriticalSection(&This->renderer.csRenderLock); + BYTE *dst = locked_rect.pBits; + const BYTE *src = data; + + TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", + width * depth / 8, locked_rect.Pitch); + + while (height--) + { + memcpy(dst, src, width * depth / 8); + src += width * depth / 8; + dst += locked_rect.Pitch; + } + } + else + { + memcpy(locked_rect.pBits, data, data_size); + } + + IDirect3DSurface9_UnlockRect(info.lpSurf); + + hr = IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); + + if (filter->renderer.filter.state == State_Paused) + { + LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&This->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.csRenderLock); } return hr;

1 0

Paul Gofman : ntdll: Increment num_busy_workers when queuing TP object.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 6d712a42ca20f1273ec1958f03b35a0edbade350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d712a42ca20f1273ec1958f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 19 19:05:39 2020 +0300 ntdll: Increment num_busy_workers when queuing TP object. Otherwise two consequative submits may have the same num_busy_workers value if threadpool_worker_proc did not have a chance to pick the work in between. A new thread is not created in tp_submit() for the second submit and if the first submit queues an (infinitely long) wait the next submitted callback is not called for indefinite time period. Fixes hang on exit in Detroit Become Human. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 451d441f57..84286fbee9 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1375,7 +1375,6 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) { InterlockedIncrement( &pool->refcount ); pool->num_workers++; - pool->num_busy_workers++; NtClose( thread ); } return status; @@ -2137,6 +2136,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa static void tp_object_prio_queue( struct threadpool_object *object ) { + ++object->pool->num_busy_workers; list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); } @@ -2330,7 +2330,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); - pool->num_busy_workers--; for (;;) { while ((ptr = threadpool_get_next_item( pool ))) @@ -2360,7 +2359,6 @@ static void CALLBACK threadpool_worker_proc( void *param ) /* Leave critical section and do the actual callback. */ object->num_associated_callbacks++; object->num_running_callbacks++; - pool->num_busy_workers++; RtlLeaveCriticalSection( &pool->cs ); /* Initialize threadpool instance struct. */ @@ -2466,6 +2464,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) skip_cleanup: RtlEnterCriticalSection( &pool->cs ); + assert(pool->num_busy_workers); pool->num_busy_workers--; /* Simple callbacks are automatically shutdown after execution. */

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.145.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: c80b236366120bb420d6875f93d1bfcd9e77a7fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80b236366120bb420d6875f… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Sun Jun 21 12:18:52 2020 -0700 winevulkan: Update to VK spec version 1.2.145. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 28 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 145 +++++++-- dlls/winevulkan/vulkan_thunks.h | 52 ++- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 28 +- include/wine/vulkan.h | 690 +++++++++++++++++++++------------------- include/wine/vulkan_driver.h | 28 +- 8 files changed, 503 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c80b236366120bb420d6…

1 0

Alexandre Julliard : ntdll: Use FSCTL_GET_OBJECT_ID to compare file identities.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 9e3893cc29dbcfd53d89abc679d0207cf2492999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e3893cc29dbcfd53d89abc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 21 16:56:05 2020 +0200 ntdll: Use FSCTL_GET_OBJECT_ID to compare file identities. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 83 +++++++++++++++++++++--------------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 4 +- dlls/ntdll/unix/unix_private.h | 5 +-- dlls/ntdll/unixlib.h | 4 +- 5 files changed, 47 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3893cc29dbcfd53d89…

1 0

Alexandre Julliard : ntdll: Set the Unix current directory also in the exec process case.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 6ff0bb786c43ac3348dec6a977feb36af8bc4bcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff0bb786c43ac3348dec6a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 11:44:09 2020 +0200 ntdll: Set the Unix current directory also in the exec process case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49425 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 974ef6b127..804985da4d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -589,7 +589,7 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST { pe_image_info_t pe_info; BOOL is_child_64bit; - int socketfd[2]; + int unixdir, socketfd[2]; char **argv; HANDLE handle; @@ -615,6 +615,8 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST return status; } + unixdir = get_unix_curdir( NtCurrentTeb()->Peb->ProcessParameters ); + if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) return STATUS_TOO_MANY_OPENED_FILES; #ifdef SO_PASSCRED else @@ -637,6 +639,7 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST if (!status) { if (!(argv = build_argv( cmdline, 2 ))) return STATUS_NO_MEMORY; + fchdir( unixdir ); do { status = exec_wineloader( argv, socketfd[0], is_child_64bit,

1 0

Zebediah Figura : quartz/vmr9: Allow connecting with YUV formats.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 339dbc586a75e24f5015333a16c44c8f1c1d3355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339dbc586a75e24f5015333a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:17 2020 -0500 quartz/vmr9: Allow connecting with YUV formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2641b7a04b..fae824b827 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -696,7 +696,7 @@ static void test_media_types(void) VIDEOINFOHEADER vih = { {0}, {0}, 0, 0, 0, - {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, 0xdeadbeef} }; IEnumMediaTypes *enummt; unsigned int i; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3636d47702..b49b2b67db 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -338,8 +338,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) return S_FALSE; - if (get_bitmap_header(mt)->biCompression != BI_RGB) - return S_FALSE; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: The source pitch is the width of the Y plane for planar 4:2:0 formats.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 46a6dd0824091ac060b81f346ac7cf0944738c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a6dd0824091ac060b81f34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:14 2020 -0500 quartz/vmr9: The source pitch is the width of the Y plane for planar 4:2:0 formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5c2cf33820..bee5a10718 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -261,7 +261,11 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi width = bitmap_header->biWidth; height = bitmap_header->biHeight; depth = bitmap_header->biBitCount; - src_pitch = ((width * depth / 8) + 3) & ~3; + if (bitmap_header->biCompression == mmioFOURCC('N','V','1','2') + || bitmap_header->biCompression == mmioFOURCC('Y','V','1','2')) + src_pitch = width; + else /* packed YUV (UYVY or YUY2) or RGB */ + src_pitch = ((width * depth / 8) + 3) & ~3; info.rtStart = start_time; info.rtEnd = end_time;

1 0

Alexandre Julliard : Wine release 5.11
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: website Branch: master Commit: 435b3c26ceef83603d381127e47ad6514ce39e5a URL: https://source.winehq.org/git/website.git/?a=commit;h=435b3c26ceef83603d381… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 21:49:11 2020 +0200 Wine release 5.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020061901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020061901.xml b/news/en/2020061901.xml new file mode 100644 index 00000000..20d603bd --- /dev/null +++ b/news/en/2020061901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 19, 2020</date> +<title>Wine 5.11 Released</title> +<body> + The Wine development release 5.11 is now available. + <a href="{$root}/announce/5.11">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.1.0, with WpfGfx library support.</li> + <li>More work on the separate Unix library for NTDLL.</li> + <li>Beginnings of a NetIO kernel driver implementation.</li> + <li>Initial support for the Print Ticket API.</li> + <li>Removal of the obsolete 32-bit PowerPC architecture.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Anton Baskanov : amstream: Implement AMAudioStream::NewSegment.
by Alexandre Julliard June 19, 2020

June 19, 2020

Module: wine Branch: master Commit: b9712f2f37f6648108c608e3e33046a697ef36b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9712f2f37f6648108c608e3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Jun 20 00:18:52 2020 +0700 amstream: Implement AMAudioStream::NewSegment. 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/audiostream.c | 18 +++++-- dlls/amstream/tests/amstream.c | 119 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 129 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4c6c326d84..a19cb4ea96 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -56,6 +56,7 @@ struct audio_stream AM_MEDIA_TYPE mt; WAVEFORMATEX format; FILTER_STATE state; + REFERENCE_TIME segment_start; BOOL eos; BOOL flushing; struct list receive_queue; @@ -1158,9 +1159,18 @@ static HRESULT WINAPI audio_sink_EndFlush(IPin *iface) static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - FIXME("iface %p, start %s, stop %s, rate %0.16e, stub!\n", - iface, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); - return E_NOTIMPL; + struct audio_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p, start %s, stop %s, rate %0.16e\n", + stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); + + EnterCriticalSection(&stream->cs); + + stream->segment_start = start; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static const IPinVtbl audio_sink_vtbl = @@ -1291,7 +1301,7 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * receive->length = IMediaSample_GetActualDataLength(sample); receive->pointer = pointer; receive->sample = sample; - receive->start_time = start_time; + receive->start_time = start_time + stream->segment_start; IMediaSample_AddRef(receive->sample); list_add_tail(&stream->receive_queue, &receive->entry); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c7510f30c4..eb9b852ba4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3440,10 +3440,6 @@ static void test_audiostream_begin_flush_end_flush(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void CALLBACK apc_func(ULONG_PTR param) -{ -} - static IMediaSample *audiostream_allocate_sample(struct testfilter *source, const BYTE *input_data, DWORD input_length) { IMediaSample *sample; @@ -3464,6 +3460,120 @@ static IMediaSample *audiostream_allocate_sample(struct testfilter *source, cons return sample; } +static void test_audiostream_new_segment(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const BYTE test_data[8] = { 0 }; + IAudioStreamSample *stream_sample; + IAudioMediaStream *audio_stream; + IMemInputPin *mem_input_pin; + IMediaSample *media_sample; + struct testfilter source; + IAudioData *audio_data; + STREAM_TIME start_time; + STREAM_TIME end_time; + IGraphBuilder *graph; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IMemInputPin, (void **)&mem_input_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioData_SetBuffer(audio_data, 5, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_NewSegment(pin, 11111111, 22222222, 1.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = audiostream_allocate_sample(&source, test_data, 5); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 23459057, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IPin_NewSegment(pin, 11111111, 22222222, 2.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = audiostream_allocate_sample(&source, test_data, 5); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 23459057, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IAudioStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IMemInputPin_Release(mem_input_pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void CALLBACK apc_func(ULONG_PTR param) +{ +} + static IPin *audiostream_pin; static IMemInputPin *audiostream_mem_input_pin; static IMediaSample *audiostream_media_sample; @@ -4699,6 +4809,7 @@ START_TEST(amstream) test_audiostream_receive(); test_audiostream_initialize(); test_audiostream_begin_flush_end_flush(); + test_audiostream_new_segment(); test_audiostreamsample_update(); test_audiostreamsample_completion_status();

1 0