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

[PATCH] mfreadwrite/reader: Alternate between selected streams for MF_SOURCE_READER_ANY_STREAM requests.
by Nikolay Sivov 23 Nov '20

23 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 68 ++++++++++++++------------------- dlls/mfreadwrite/tests/mfplat.c | 10 ++--- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index cc1b29a2b6a..7aa8f65df7a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -101,7 +101,6 @@ enum media_stream_flags STREAM_FLAG_SAMPLE_REQUESTED = 0x1, /* Protects from making multiple sample requests. */ STREAM_FLAG_SELECTED = 0x2, /* Mirrors descriptor, used to simplify tests when starting the source. */ STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ - STREAM_FLAG_REQUESTED_ONCE = 0x8, /* Used for MF_SOURCE_READER_ANY_STREAM in synchronous mode. */ }; struct media_stream @@ -109,7 +108,7 @@ struct media_stream IMFMediaStream *stream; IMFMediaType *current; IMFTransform *decoder; - DWORD id; + unsigned int id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -169,13 +168,14 @@ struct source_reader LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; - DWORD first_audio_stream_index; - DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; + unsigned int first_audio_stream_index; + unsigned int first_video_stream_index; + unsigned int last_read_index; + unsigned int stream_count; unsigned int flags; enum media_source_state source_state; struct media_stream *streams; - DWORD stream_count; struct list responses; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; @@ -393,7 +393,7 @@ static HRESULT source_reader_request_sample(struct source_reader *reader, struct WARN("Sample request failed, hr %#x.\n", hr); else { - stream->flags |= (STREAM_FLAG_SAMPLE_REQUESTED | STREAM_FLAG_REQUESTED_ONCE); + stream->flags |= STREAM_FLAG_SAMPLE_REQUESTED; } } @@ -988,39 +988,42 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_first_selected_stream(struct source_reader *reader, unsigned int flags, - unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) { - unsigned int i, first_selected = ~0u; + unsigned int i, start_idx, stop_idx, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; - for (i = 0; i < reader->stream_count; ++i) + start_idx = (reader->last_read_index + 1) % reader->stream_count; + stop_idx = reader->last_read_index == ~0u ? reader->stream_count : reader->last_read_index; + + for (i = start_idx; i < reader->stream_count && i != stop_idx; i = (i + 1) % (reader->stream_count + 1)) { stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; - if (selected && !(reader->streams[i].flags & flags)) + if (selected) { if (first_selected == ~0u) first_selected = i; - if (!stream_drained) + /* Try to balance pending reads. */ + if (!stream_drained && reader->streams[i].requests < requests) { + requests = reader->streams[i].requests; *stream_index = i; - break; } } } - /* If all selected streams reached EOS, use first selected. This fallback only applies after reader went through all - selected streams once. */ - if (i == reader->stream_count && first_selected != ~0u && !flags) + /* If all selected streams reached EOS, use first selected. */ + if (first_selected != ~0u) { - *stream_index = first_selected; - i = first_selected; + if (requests == ~0u) + *stream_index = first_selected; + reader->last_read_index = *stream_index; } - return i == reader->stream_count ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; + return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) @@ -1037,18 +1040,7 @@ static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, *stream_index = reader->first_audio_stream_index; break; case MF_SOURCE_READER_ANY_STREAM: - if (reader->async_callback) - { - /* Pick first selected stream. */ - hr = source_reader_get_first_selected_stream(reader, 0, stream_index); - } - else - { - /* Cycle through all selected streams once, next pick first selected. */ - if (FAILED(hr = source_reader_get_first_selected_stream(reader, STREAM_FLAG_REQUESTED_ONCE, stream_index))) - hr = source_reader_get_first_selected_stream(reader, 0, stream_index); - } - return hr; + return source_reader_get_next_selected_stream(reader, stream_index); default: *stream_index = index; } @@ -1339,8 +1331,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR if (!selection_changed) { source_reader_get_stream_selection(reader, i, &selected); - if (selected ^ selection) - selection_changed = TRUE; + selection_changed = !!(selected ^ selection); } if (selection) @@ -1364,8 +1355,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR } source_reader_get_stream_selection(reader, index, &selected); - if (selected ^ selection) - selection_changed = TRUE; + selection_changed = !!(selected ^ selection); if (selection) hr = IMFPresentationDescriptor_SelectStream(reader->descriptor, index); @@ -1373,11 +1363,8 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR hr = IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); } - if (SUCCEEDED(hr) && selection_changed) - { - for (i = 0; i < reader->stream_count; ++i) - reader->streams[i].flags &= ~STREAM_FLAG_REQUESTED_ONCE; - } + if (selection_changed) + reader->last_read_index = ~0u; LeaveCriticalSection(&reader->cs); @@ -2135,6 +2122,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); + object->last_read_index = ~0u; if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 2a6e3a1cc36..8455ac64688 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -886,13 +886,12 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 2, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); - for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", - i, actual_index); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); @@ -905,13 +904,12 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); - for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", - i, actual_index); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); -- 2.29.2

1 0

[PATCH] evr/tests: Add some tests for presenter quality control.
by Nikolay Sivov 23 Nov '20

23 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/evr.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bebffada509..2740f2263f0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1165,6 +1165,7 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); + todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); @@ -2010,6 +2011,67 @@ static void test_presenter_video_window(void) DestroyWindow(window); } +static void test_presenter_quality_control(void) +{ + IMFQualityAdviseLimits *qa_limits; + IMFVideoPresenter *presenter; + MF_QUALITY_DROP_MODE mode; + IMFQualityAdvise *advise; + MF_QUALITY_LEVEL level; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (qa_limits) +{ + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); + + IMFQualityAdviseLimits_Release(qa_limits); +} + +todo_wine { + mode = 1; + hr = IMFQualityAdvise_GetDropMode(advise, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + level = 1; + hr = IMFQualityAdvise_GetQualityLevel(advise, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); + + hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); + ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); + ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); +} + + IMFQualityAdvise_Release(advise); + + IMFVideoPresenter_Release(presenter); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2511,6 +2573,7 @@ START_TEST(evr) test_presenter_native_video_size(); test_presenter_ar_mode(); test_presenter_video_window(); + test_presenter_quality_control(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); -- 2.29.2

1 0

[PATCH 1/4] mf/tests: Relax error code test for IsMediaTypeSupported() of SAR.
by Nikolay Sivov 23 Nov '20

23 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 27e859fa82d..117e2d2e785 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3106,11 +3106,17 @@ todo_wine hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + /* Actual return value is MF_E_ATRIBUTENOTFOUND triggered by missing MF_MT_MAJOR_TYPE */ hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); -todo_wine - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); -- 2.29.2

1 3

[PATCH 1/2] winevulkan: make_vulkan handle VkDeviceAddress basetype
by Liam Middlebrook 23 Nov '20

23 Nov '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6675a813c05..336f09f125e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1387,7 +1387,7 @@ class VkParam(object): self.format_conv = "wine_dbgstr_longlong({0})" elif self.type in ["uint16_t", "uint32_t", "VkBool32"]: self.format_str = "%u" - elif self.type in ["uint64_t", "VkDeviceSize"]: + elif self.type in ["uint64_t", "VkDeviceAddress", "VkDeviceSize"]: self.format_str = "0x%s" self.format_conv = "wine_dbgstr_longlong({0})" elif self.type == "HANDLE": -- 2.28.0

1 1

[PATCH resend 01/12] include/icmpapi: Add missing function declarations.
by Gabriel Ivăncescu 23 Nov '20

23 Nov '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/icmpapi.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/icmpapi.h b/include/icmpapi.h index 102851a..fd86e84 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -21,6 +21,8 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H +#include "winternl.h" + #ifdef __cplusplus extern "C" { #endif @@ -30,10 +32,24 @@ HANDLE WINAPI IcmpCreateFile( VOID ); +HANDLE WINAPI Icmp6CreateFile( + VOID + ); + BOOL WINAPI IcmpCloseHandle( HANDLE IcmpHandle ); +DWORD WINAPI IcmpParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + +DWORD WINAPI Icmp6ParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, IPAddr DestinationAddress, @@ -45,6 +61,50 @@ DWORD WINAPI IcmpSendEcho( DWORD Timeout ); +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI Icmp6SendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + struct sockaddr_in6* SourceAddress, + struct sockaddr_in6* DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + #ifdef __cplusplus } -- 2.21.0

1 11

[PATCH] msvcrt: Remove traces from printf.
by Piotr Caban 23 Nov '20

23 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 4 ---- 1 file changed, 4 deletions(-)

1 0

Release plans
by Alexandre Julliard 23 Nov '20

23 Nov '20

Folks, Like every year, it's now time to start the process towards releasing Wine 6.0. The plan is to start code freeze after the next release, two weeks from now. We'll then have a few weeks to fix as many bugs and regressions as possible, with a final 6.0 sometime in January. With everybody being stuck at home this year, we'll hopefully make more progress than usual during Christmas break ;-) -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] msvcrt: Update lc_category.wrefcount in __get_current_locale.
by Piotr Caban 23 Nov '20

23 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50163 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH] include: Add some DB_S_ defines
by Alistair Leslie-Hughes 23 Nov '20

23 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledberr.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 61093ea1491..c0eccba1e97 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -83,6 +83,9 @@ #define DB_E_MISMATCHEDPROVIDER 0x80040e75 +#define DB_S_BOOKMARKSKIPPED 0x00040ec3 +#define DB_S_NONEXTROWSET 0x00040ec5 +#define DB_S_ENDOFROWSET 0x00040ec6 #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */ -- 2.29.2

1 0

[PATCH v2] wininet: Fix error handling INTERNET_OPTION_PROXY in InternetSetOptionA.
by Jiangyi Chen 23 Nov '20

23 Nov '20

1 0