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

[RFC PATCH 5/5] quartz/tests: Add MPEG video parser tests for MPEG splitter.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 596 ++++++++++++++++++++++++++++------ dlls/quartz/tests/rsrc.rc | 4 + dlls/quartz/tests/video.mpg | Bin 0 -> 617 bytes 3 files changed, 500 insertions(+), 100 deletions(-) create mode 100644 dlls/quartz/tests/video.mpg

2 1

[RFC PATCH 4/5] winegstreamer: Add MPEG video parser to MPEG splitter.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 2 +- dlls/winegstreamer/gstdemux.c | 150 ++++++++++++++++++++++++++++++++-- 2 files changed, 143 insertions(+), 9 deletions(-)

1 0

[RFC PATCH 3/5] winegstreamer: Pass the AM_MEDIA_TYPE parameter to the handler.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[RFC PATCH 2/5] winegstreamer: Implement listing of sink media types.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Though, some of media types aren't supported. They are rejected by mpeg_splitter_sink_query_accept(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 75 ++++++++++++++--------------------- dlls/winegstreamer/gstdemux.c | 26 ++++++++++++ 2 files changed, 56 insertions(+), 45 deletions(-)

1 0

[RFC PATCH 1/5] quartz/tests: Factor out MP3 audio tests.
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Prepare the code before adding MPEG video tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 357 +++++++++++++++++++--------------- 1 file changed, 199 insertions(+), 158 deletions(-)

1 0

[PATCH] bcrypt/tests: Fix some failures on Windows 7.
by Zebediah Figura 20 Jun '20

20 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/bcrypt/tests/bcrypt.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e4a99d63048..f6e5c84e8d2 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2381,16 +2381,37 @@ static void test_BcryptDeriveKeyCapi(void) } ret = pBCryptDeriveKeyCapi(NULL, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || ret == STATUS_INVALID_HANDLE /* win7 */, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); + + memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 41, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + if (!ret) + ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 20, 0); -- 2.27.0

1 0

Wine staging 5.11 release
by Alistair Leslie-Hughes 20 Jun '20

20 Jun '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.11 (702 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until ntdll seperation upstream is complete. Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Add stub for NtContinue. * ntdll: Use NtContinue to continue execution after exceptions. * directmanipulation: New dll * uuid: Add directmanipulation.h * ntdll: Implement retrieving DOS attributes in NtQuery[Full]AttributesFile and NtQueryDirectoryFile. * directmanipulation: Create DirectManipulationManager/DirectManipulationSharedManager objects * directmanipulation: Implement IDirectManipulationManager2 GetUpdateManager. * directmanipulation/tests: Initial tests. Added: * None Updated: * ntdll-ForceBottomUpAlloc * winebuild-Fake_Dlls * ntdll-Syscall_Emulation * wow64cpu-Wow64Transition Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/6] quartz/vmr9: Merge VMR9_SendSampleData() into VMR9_DoRenderSample().
by Zebediah Figura 20 Jun '20

20 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- videoconvert seems to be faster at converting YUV -> YUV than YUV -> RGB, which makes sense. This patch set, as well as following patch sets, aim to improve the speed of video post-processing in the quartz pipeline. Particularly large video samples can take long enough to process that not only will the video play back slowly, but (depending on demuxer) the audio will get "stuck behind" it and stutter. 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 6b653e56092..f81d8067059 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; -- 2.27.0

2 6

[PATCH v2 1/2] amstream: Implement IAudioStreamSample::GetSampleTimes.
by Anton Baskanov 19 Jun '20

19 Jun '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/audiostream.c | 33 +++++- dlls/amstream/tests/amstream.c | 181 +++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 8fba877719..4c6c326d84 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -34,6 +34,7 @@ struct queued_receive DWORD length; BYTE *pointer; DWORD position; + STREAM_TIME start_time; }; struct audio_stream @@ -66,6 +67,8 @@ typedef struct { LONG ref; struct audio_stream *parent; IAudioData *audio_data; + STREAM_TIME start_time; + STREAM_TIME end_time; HANDLE update_event; struct list entry; @@ -102,6 +105,12 @@ static void flush_receive_queue(struct audio_stream *stream) remove_queued_receive(LIST_ENTRY(entry, struct queued_receive, entry)); } +static STREAM_TIME stream_time_from_position(struct audio_stream *stream, struct queued_receive *receive) +{ + const WAVEFORMATEX *format = (WAVEFORMATEX *)stream->mt.pbFormat; + return receive->start_time + (receive->position * 10000000 + format->nAvgBytesPerSec / 2) / format->nAvgBytesPerSec; +} + static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive *receive) { DWORD advance; @@ -109,9 +118,14 @@ static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive advance = min(receive->length - receive->position, sample->length - sample->position); memcpy(&sample->pointer[sample->position], &receive->pointer[receive->position], advance); + if (!sample->position) + sample->start_time = stream_time_from_position(sample->parent, receive); + receive->position += advance; sample->position += advance; + sample->end_time = stream_time_from_position(sample->parent, receive); + sample->update_hr = (sample->position == sample->length) ? S_OK : MS_S_PENDING; } @@ -204,9 +218,19 @@ static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample * static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { - FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); + IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); - return E_NOTIMPL; + TRACE("sample %p, start_time %p, end_time %p, current_time %p.\n", sample, start_time, end_time, current_time); + + if (current_time) + IMediaStreamFilter_GetCurrentStreamTime(sample->parent->filter, current_time); + + if (start_time) + *start_time = sample->start_time; + if (end_time) + *end_time = sample->end_time; + + return S_OK; } static HRESULT WINAPI IAudioStreamSampleImpl_SetSampleTimes(IAudioStreamSample *iface, const STREAM_TIME *start_time, @@ -1228,6 +1252,8 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * { struct audio_stream *stream = impl_from_IMemInputPin(iface); struct queued_receive *receive; + REFERENCE_TIME start_time = 0; + REFERENCE_TIME end_time = 0; BYTE *pointer; HRESULT hr; @@ -1253,6 +1279,8 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * return hr; } + IMediaSample_GetTime(sample, &start_time, &end_time); + receive = calloc(1, sizeof(*receive)); if (!receive) { @@ -1263,6 +1291,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; 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 e1f6a15ad3..d12441fc2e 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3851,6 +3851,186 @@ void test_audiostreamsample_completion_status(void) CloseHandle(event); } +static void test_audiostreamsample_get_sample_times(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const BYTE test_data[8] = { 0 }; + IAudioStreamSample *stream_sample; + IMediaFilter *graph_media_filter; + IAudioMediaStream *audio_stream; + STREAM_TIME filter_start_time; + IMemInputPin *mem_input_pin; + IMediaStreamFilter *filter; + IMediaSample *media_sample; + struct testfilter source; + STREAM_TIME current_time; + struct testclock clock; + 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_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + 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"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaFilter, (void **)&graph_media_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + 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); + testclock_init(&clock); + + clock.time = 12345678; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); + + IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); + + 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 = IMediaStreamFilter_GetCurrentStreamTime(filter, &filter_start_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == 0xdeadbeefddf15da1 + filter_start_time, "Expected current time %s, got %s.\n", + wine_dbgstr_longlong(0xdeadbeefddf15da1 + filter_start_time), wine_dbgstr_longlong(current_time)); + + clock.get_time_hr = S_OK; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == filter_start_time, "Expected current time %s, got %s.\n", + wine_dbgstr_longlong(filter_start_time), wine_dbgstr_longlong(current_time)); + + clock.time = 23456789; + + current_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, &current_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current_time == filter_start_time + 11111111, "Expected current time %s, got %s.\n", + wine_dbgstr_longlong(filter_start_time + 11111111), wine_dbgstr_longlong(current_time)); + + 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 == 0, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 0, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + media_sample = audiostream_allocate_sample(&source, test_data, 8); + 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 == 12345678, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 12347946, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + media_sample = audiostream_allocate_sample(&source, test_data, 6); + 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 == 12347946, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 12346585, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + 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 == 12346585, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 12348399, "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); + IMediaFilter_Release(graph_media_filter); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + 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 test_ddrawstream_initialize(void) { IDirectDrawMediaStream *ddraw_stream; @@ -4510,6 +4690,7 @@ START_TEST(amstream) test_audiostreamsample_update(); test_audiostreamsample_completion_status(); + test_audiostreamsample_get_sample_times(); test_ddrawstream_initialize(); -- 2.17.1

2 4

[PATCH 1/3] ntoskrnl: Set DriverStart and DriverSize fields in DRIVER_OBJECT.
by Derek Lesho 19 Jun '20

19 Jun '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2da58dc104..7604c13b56 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3645,6 +3645,8 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING return STATUS_DLL_INIT_FAILED; driver_object->DriverSection = find_ldr_module( module ); + driver_object->DriverStart = ((LDR_MODULE *)driver_object->DriverSection)->BaseAddress; + driver_object->DriverSize = ((LDR_MODULE *)driver_object->DriverSection)->SizeOfImage; nt = RtlImageNtHeader( module ); if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; -- 2.26.2

3 11