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

[PATCH v3 2/2] d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters().
by Zhiyi Zhang 23 Mar '20

23 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/device.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4ac38c0e89..61cb505d77 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -778,6 +778,7 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); + parameters->AdapterOrdinal = device->adapter_ordinal; return D3D_OK; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index afbd13a398..4255293439 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13609,6 +13609,53 @@ static void test_shader_validator(void) todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); } +static void test_creation_parameters(void) +{ + unsigned int adapter_idx, adapter_count; + D3DDEVICE_CREATION_PARAMETERS params; + struct device_desc device_desc; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + device_desc.adapter_ordinal = adapter_idx; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + + memset(&params, 0, sizeof(params)); + hr = IDirect3DDevice9_GetCreationParameters(device, &params); + ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr); + ok(params.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, params.AdapterOrdinal); + ok(params.DeviceType == D3DDEVTYPE_HAL, "Adapter %u: Expect device type %#x, got %#x.\n", + adapter_idx, D3DDEVTYPE_HAL, params.DeviceType); + ok(params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n", + adapter_idx, window, params.hFocusWindow); + + IDirect3DDevice9_Release(device); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -13741,6 +13788,7 @@ START_TEST(device) test_get_display_mode(); test_multi_adapter(); test_shader_validator(); + test_creation_parameters(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

2 2

[PATCH v3 1/2] d3d8: Report d3d8 adapter ordinal in d3d8_device_GetCreationParameters().
by Zhiyi Zhang 23 Mar '20

23 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 181455~181456. Remove behaviour flags tests. dlls/d3d8/device.c | 1 + dlls/d3d8/tests/device.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 400e1e292a..23e93df061 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -730,6 +730,7 @@ static HRESULT WINAPI d3d8_device_GetCreationParameters(IDirect3DDevice8 *iface, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); + parameters->AdapterOrdinal = device->adapter_ordinal; return D3D_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2e182e6192..a2c02b2c6a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9869,6 +9869,53 @@ static void test_multi_adapter(void) IDirect3D8_Release(d3d); } +static void test_creation_parameters(void) +{ + unsigned int adapter_idx, adapter_count; + D3DDEVICE_CREATION_PARAMETERS params; + struct device_desc device_desc; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + device_desc.adapter_ordinal = adapter_idx; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + + memset(&params, 0, sizeof(params)); + hr = IDirect3DDevice8_GetCreationParameters(device, &params); + ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr); + ok(params.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, params.AdapterOrdinal); + ok(params.DeviceType == D3DDEVTYPE_HAL, "Adapter %u: Expect device type %#x, got %#x.\n", + adapter_idx, D3DDEVTYPE_HAL, params.DeviceType); + ok(params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n", + adapter_idx, window, params.hFocusWindow); + + IDirect3DDevice8_Release(device); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9986,6 +10033,7 @@ START_TEST(device) test_draw_primitive(); test_get_display_mode(); test_multi_adapter(); + test_creation_parameters(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

3 3

[PATCH] make_makefiles: Allow running from a separate worktree.
by Zebediah Figura 23 Mar '20

23 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tools/make_makefiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 79b18778a52..c18fa90e2d3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -501,7 +501,7 @@ sub update_wine_inf() } my $git_dir = $ENV{GIT_DIR} || ".git"; -die "needs to be run from a git checkout" unless -d $git_dir; +die "needs to be run from a git checkout" unless -e $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; map { $ignored_source_files{$_} = 1; } split /\0/, `git ls-files -d -z`; -- 2.25.1

1 0

[PATCH] comctl32/tests: Remove excessive error handling logic.
by Nikolay Sivov 23 Mar '20

23 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 427ce1a84c..8cc3243323 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1517,26 +1517,22 @@ static void test_ImageList_DrawIndirect(void) hbmMask = CreateBitmap(2, 1, 1, 1, &maskBits); ok(hbmMask != 0, "CreateBitmap failed\n"); - if(!hbmMask) goto cleanup; hbmInverseMask = CreateBitmap(2, 1, 1, 1, &inverseMaskBits); ok(hbmInverseMask != 0, "CreateBitmap failed\n"); - if(!hbmInverseMask) goto cleanup; himl = pImageList_Create(2, 1, ILC_COLOR32, 0, 1); ok(himl != 0, "ImageList_Create failed\n"); - if(!himl) goto cleanup; hr = pHIMAGELIST_QueryInterface(himl, &IID_IImageList, (void **) &imgl); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); /* Add a no-alpha image */ hbmImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_image); - if(!hbmImage) goto cleanup; + ok(hbmImage != NULL, "Failed to create test bitmap.\n"); iImage = pImageList_Add(himl, hbmImage, hbmMask); ok(iImage != -1, "ImageList_Add failed\n"); - if(iImage == -1) goto cleanup; hr = IImageList_GetItemFlags(imgl, 1000, &flags); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1550,11 +1546,10 @@ static void test_ImageList_DrawIndirect(void) /* Add an alpha image */ hbmAlphaImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_alpha); - if(!hbmAlphaImage) goto cleanup; + ok(hbmAlphaImage != NULL, "Failed to create test bitmap.\n"); iAlphaImage = pImageList_Add(himl, hbmAlphaImage, hbmMask); ok(iAlphaImage != -1, "ImageList_Add failed\n"); - if(iAlphaImage == -1) goto cleanup; hr = IImageList_GetItemFlags(imgl, iAlphaImage, &flags); ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); @@ -1562,11 +1557,10 @@ static void test_ImageList_DrawIndirect(void) /* Add a transparent alpha image */ hbmTransparentImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_transparent); - if(!hbmTransparentImage) goto cleanup; + ok(hbmTransparentImage != NULL, "Failed to create test bitmap.\n"); iTransparentImage = pImageList_Add(himl, hbmTransparentImage, hbmMask); ok(iTransparentImage != -1, "ImageList_Add failed\n"); - if(iTransparentImage == -1) goto cleanup; hr = IImageList_GetItemFlags(imgl, iTransparentImage, &flags); ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); @@ -1576,8 +1570,6 @@ static void test_ImageList_DrawIndirect(void) bitmapInfo.bmiHeader.biBitCount = 32; hbmDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok (hbmDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); - if (!hbmDst || !bits) - goto cleanup; hbmOld = SelectObject(hdcDst, hbmDst); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_NORMAL, 0x00ABCDEF, __LINE__); @@ -1630,24 +1622,19 @@ static void test_ImageList_DrawIndirect(void) bitmapInfo.bmiHeader.biHeight = -4; hbmDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok (hbmDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); - if (!hbmDst || !bits) goto cleanup; SelectObject(hdcDst, hbmDst); hbm4x4 = create_test_bitmap(hdcDst, 4, 4, 32, bits_4x4); - if (!hbm4x4) goto cleanup; + ok(hbm4x4 != NULL, "Failed to create a test bitmap.\n"); ret = pImageList_SetIconSize(himl, 4, 4); ok(ret, "ImageList_SetIconSize failed\n"); - if (!ret) goto cleanup; ret = pImageList_Add(himl, hbm4x4, NULL); ok(ret != -1, "ImageList_Add failed\n"); - if(ret == -1) goto cleanup; check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_4x4, 0, 4, 4, __LINE__); -cleanup: - if(hbmOld) SelectObject(hdcDst, hbmOld); if(hbmDst) -- 2.25.1

1 0

[v5 PATCH 1/6] mfreadwrite: Pass source samples through decoder as they arrive.
by Nikolay Sivov 23 Mar '20

23 Mar '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v5: - fixed a leak introduced in v4 v4: - changed decoder calls logic; - added support for external samples; - now pulling all samples right on EOS event. v3: - moved decoding calls to event handler, queue now always contains processed samples; - removed draining logic for now, I believe we can do that explicitly on ReadSample() or on EndOfStream instead. Same helper could be used for sync/async read and EOS event; - added a check for output transform flags; dlls/mfreadwrite/main.c | 132 ++++++++++++++++++++++++++++++++++------ 1 file changed, 114 insertions(+), 18 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d3c10a4d11..f1519d17a7 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -366,6 +366,100 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static void source_reader_queue_sample(struct media_stream *stream, IMFSample *sample) +{ + struct sample *pending_sample; + + if (!sample) + return; + + pending_sample = heap_alloc(sizeof(*pending_sample)); + pending_sample->sample = sample; + IMFSample_AddRef(pending_sample->sample); + + list_add_tail(&stream->samples, &pending_sample->entry); +} + +static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) +{ + MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; + MFT_OUTPUT_DATA_BUFFER out_buffer; + IMFMediaBuffer *buffer; + DWORD status; + HRESULT hr; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder, 0, &stream_info))) + { + WARN("Failed to get output stream info, hr %#x.\n", hr); + return hr; + } + + for (;;) + { + memset(&out_buffer, 0, sizeof(out_buffer)); + + if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + { + if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) + break; + + if (FAILED(hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer))) + { + IMFSample_Release(out_buffer.pSample); + break; + } + + IMFSample_AddBuffer(out_buffer.pSample, buffer); + IMFMediaBuffer_Release(buffer); + } + + if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder, 0, 1, &out_buffer, &status))) + { + if (out_buffer.pSample) + IMFSample_Release(out_buffer.pSample); + break; + } + + source_reader_queue_sample(stream, out_buffer.pSample); + if (out_buffer.pSample) + IMFSample_Release(out_buffer.pSample); + if (out_buffer.pEvents) + IMFCollection_Release(out_buffer.pEvents); + } + + return hr; +} + +static HRESULT source_reader_process_sample(struct media_stream *stream, IMFSample *sample) +{ + HRESULT hr; + + if (!stream->decoder) + { + source_reader_queue_sample(stream, sample); + return S_OK; + } + + /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */ + + hr = source_reader_pull_stream_samples(stream); + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) + { + if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder, 0, sample, 0))) + { + WARN("Transform failed to process input, hr %#x.\n", hr); + return hr; + } + + if ((hr = source_reader_pull_stream_samples(stream)) == MF_E_TRANSFORM_NEED_MORE_INPUT) + return S_OK; + } + else + WARN("Transform failed to process output, hr %#x.\n", hr); + + return hr; +} + static HRESULT source_reader_media_sample_handler(struct source_reader *reader, IMFMediaStream *stream, IMFMediaEvent *event) { @@ -393,21 +487,14 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, { if (id == reader->streams[i].id) { - struct sample *pending_sample; - - if (!(pending_sample = heap_alloc(sizeof(*pending_sample)))) - { - hr = E_OUTOFMEMORY; - goto failed; - } + EnterCriticalSection(&reader->streams[i].cs); - pending_sample->sample = sample; - IMFSample_AddRef(pending_sample->sample); + hr = source_reader_process_sample(&reader->streams[i], sample); - EnterCriticalSection(&reader->streams[i].cs); - list_add_tail(&reader->streams[i].samples, &pending_sample->entry); LeaveCriticalSection(&reader->streams[i].cs); + /* FIXME: propagate processing errors? */ + WakeAllConditionVariable(&reader->streams[i].sample_event); break; @@ -417,7 +504,6 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, if (i == reader->stream_count) WARN("Stream with id %#x was not present in presentation descriptor.\n", id); -failed: IMFSample_Release(sample); return hr; @@ -438,26 +524,36 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re for (i = 0; i < reader->stream_count; ++i) { - if (id == reader->streams[i].id) + struct media_stream *stream = &reader->streams[i]; + + if (id == stream->id) { - EnterCriticalSection(&reader->streams[i].cs); + EnterCriticalSection(&stream->cs); switch (event) { case MEEndOfStream: - reader->streams[i].state = STREAM_STATE_EOS; + stream->state = STREAM_STATE_EOS; + + if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, + MFT_MESSAGE_COMMAND_DRAIN, 0))) + { + if ((hr = source_reader_pull_stream_samples(stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) + WARN("Failed to pull pending samples, hr %#x.\n", hr); + } + break; case MEStreamSeeked: case MEStreamStarted: - reader->streams[i].state = STREAM_STATE_READY; + stream->state = STREAM_STATE_READY; break; default: ; } - LeaveCriticalSection(&reader->streams[i].cs); + LeaveCriticalSection(&stream->cs); - WakeAllConditionVariable(&reader->streams[i].sample_event); + WakeAllConditionVariable(&stream->sample_event); break; } -- 2.25.1

1 0

[v4 PATCH 1/6] mfreadwrite: Pass source samples through decoder as they arrive.
by Nikolay Sivov 23 Mar '20

23 Mar '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: - changed decoder calls logic; - added support for external samples; - now pulling all samples right on EOS event. v3: - moved decoding calls to event handler, queue now always contains processed samples; - removed draining logic for now, I believe we can do that explicitly on ReadSample() or on EndOfStream instead. Same helper could be used for sync/async read and EOS event; - added a check for output transform flags; dlls/mfreadwrite/main.c | 128 ++++++++++++++++++++++++++++++++++------ 1 file changed, 110 insertions(+), 18 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d3c10a4d11..aa46ac188b 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -366,6 +366,96 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static void source_reader_queue_sample(struct media_stream *stream, IMFSample *sample) +{ + struct sample *pending_sample; + + if (!sample) + return; + + pending_sample = heap_alloc(sizeof(*pending_sample)); + pending_sample->sample = sample; + IMFSample_AddRef(pending_sample->sample); + + list_add_tail(&stream->samples, &pending_sample->entry); +} + +static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) +{ + MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; + MFT_OUTPUT_DATA_BUFFER out_buffer; + IMFMediaBuffer *buffer; + DWORD status; + HRESULT hr; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder, 0, &stream_info))) + { + WARN("Failed to get output stream info, hr %#x.\n", hr); + return hr; + } + + for (;;) + { + memset(&out_buffer, 0, sizeof(out_buffer)); + + if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + { + if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) + break; + + if (FAILED(hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer))) + { + IMFSample_Release(out_buffer.pSample); + break; + } + + IMFSample_AddBuffer(out_buffer.pSample, buffer); + IMFMediaBuffer_Release(buffer); + } + + if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder, 0, 1, &out_buffer, &status))) + break; + + source_reader_queue_sample(stream, out_buffer.pSample); + if (out_buffer.pSample) + IMFSample_Release(out_buffer.pSample); + if (out_buffer.pEvents) + IMFCollection_Release(out_buffer.pEvents); + } + + return hr; +} + +static HRESULT source_reader_process_sample(struct media_stream *stream, IMFSample *sample) +{ + HRESULT hr; + + if (!stream->decoder) + { + source_reader_queue_sample(stream, sample); + return S_OK; + } + + /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */ + + hr = source_reader_pull_stream_samples(stream); + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) + { + if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder, 0, sample, 0))) + { + WARN("Transform failed to process input, hr %#x.\n", hr); + return hr; + } + + if ((hr = source_reader_pull_stream_samples(stream)) == MF_E_TRANSFORM_NEED_MORE_INPUT) + return S_OK; + } + else + WARN("Transform failed to process output, hr %#x.\n", hr); + + return hr; +} + static HRESULT source_reader_media_sample_handler(struct source_reader *reader, IMFMediaStream *stream, IMFMediaEvent *event) { @@ -393,21 +483,14 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, { if (id == reader->streams[i].id) { - struct sample *pending_sample; - - if (!(pending_sample = heap_alloc(sizeof(*pending_sample)))) - { - hr = E_OUTOFMEMORY; - goto failed; - } + EnterCriticalSection(&reader->streams[i].cs); - pending_sample->sample = sample; - IMFSample_AddRef(pending_sample->sample); + hr = source_reader_process_sample(&reader->streams[i], sample); - EnterCriticalSection(&reader->streams[i].cs); - list_add_tail(&reader->streams[i].samples, &pending_sample->entry); LeaveCriticalSection(&reader->streams[i].cs); + /* FIXME: propagate processing errors? */ + WakeAllConditionVariable(&reader->streams[i].sample_event); break; @@ -417,7 +500,6 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, if (i == reader->stream_count) WARN("Stream with id %#x was not present in presentation descriptor.\n", id); -failed: IMFSample_Release(sample); return hr; @@ -438,26 +520,36 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re for (i = 0; i < reader->stream_count; ++i) { - if (id == reader->streams[i].id) + struct media_stream *stream = &reader->streams[i]; + + if (id == stream->id) { - EnterCriticalSection(&reader->streams[i].cs); + EnterCriticalSection(&stream->cs); switch (event) { case MEEndOfStream: - reader->streams[i].state = STREAM_STATE_EOS; + stream->state = STREAM_STATE_EOS; + + if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, + MFT_MESSAGE_COMMAND_DRAIN, 0))) + { + if ((hr = source_reader_pull_stream_samples(stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) + WARN("Failed to pull pending samples, hr %#x.\n", hr); + } + break; case MEStreamSeeked: case MEStreamStarted: - reader->streams[i].state = STREAM_STATE_READY; + stream->state = STREAM_STATE_READY; break; default: ; } - LeaveCriticalSection(&reader->streams[i].cs); + LeaveCriticalSection(&stream->cs); - WakeAllConditionVariable(&reader->streams[i].sample_event); + WakeAllConditionVariable(&stream->sample_event); break; } -- 2.25.1

2 7

[PATCH 7/7] dbghelp: Use search_dll_path to load seach macho files.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 41 +------------------------------------ 1 file changed, 1 insertion(+), 40 deletions(-)

1 0

[PATCH 6/7] dbghelp: Use search_unix_path to load seach macho files.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 63 ++++++++++--------------------------- 1 file changed, 17 insertions(+), 46 deletions(-)

1 0

[PATCH 5/7] dbghelp: Introduce search_unix_path helper and use it in elf_search_and_load_file.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 49 +++------------------------------- dlls/dbghelp/path.c | 43 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 46 deletions(-)

1 0

[PATCH 4/7] dbghelp: Use search_dll_path in elf_search_and_load_file.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 59 ++++++++++++++------------------------- 1 file changed, 21 insertions(+), 38 deletions(-)

1 0