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

[PATCH 1/5] winegstreamer: Implement IWMReaderAdvanced::SetAllocateForOutput().
by Zebediah Figura 11 Nov '21

11 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 8 ++- dlls/winegstreamer/wm_asyncreader.c | 17 ++++-- dlls/winegstreamer/wm_reader.c | 84 ++++++++++++++++++++++++----- 3 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e1dec7b755c..f1862515ebc 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -120,10 +120,11 @@ struct wm_stream { struct wm_reader *reader; struct wg_parser_stream *wg_stream; - WORD index; - bool eos; struct wg_format format; WMT_STREAM_SELECTION selection; + WORD index; + bool eos; + bool allocate_output; }; struct wm_reader @@ -148,6 +149,8 @@ struct wm_reader struct wm_stream *streams; WORD stream_count; + IWMReaderCallbackAdvanced *callback_advanced; + const struct wm_reader_ops *ops; }; @@ -174,6 +177,7 @@ void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); +HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 35ed8221aa0..e0547dfda60 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -57,10 +57,16 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) static void open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) { static const DWORD zero; + HRESULT hr; IWMReaderCallback_AddRef(reader->callback = callback); reader->context = context; IWMReaderCallback_OnStatus(callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); + + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, + &IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced))) + reader->reader.callback_advanced = NULL; + TRACE("Querying for IWMReaderCallbackAdvanced returned %#x.\n", hr); } static DWORD WINAPI stream_thread(void *arg) @@ -497,11 +503,14 @@ static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, + DWORD output, BOOL allocate) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, output %u, allocate %d.\n", reader, output, allocate); + + return wm_reader_set_allocate_for_output(&reader->reader, output, allocate); } static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3ca43fb127e..09059c3a32b 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1554,6 +1554,10 @@ HRESULT wm_reader_close(struct wm_reader *reader) CloseHandle(reader->read_thread); reader->read_thread = NULL; + if (reader->callback_advanced) + IWMReaderCallbackAdvanced_Release(reader->callback_advanced); + reader->callback_advanced = NULL; + wg_parser_destroy(reader->wg_parser); reader->wg_parser = NULL; @@ -1758,9 +1762,9 @@ static const char *get_major_type_string(enum wg_major_type type) HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags) { + IWMReaderCallbackAdvanced *callback_advanced = stream->reader->callback_advanced; struct wg_parser_stream *wg_stream = stream->wg_stream; struct wg_parser_event event; - struct buffer *object; if (stream->selection == WMT_OFF) return NS_E_INVALID_REQUEST; @@ -1768,6 +1772,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (stream->eos) return NS_E_NO_MORE_SAMPLES; + if (!stream->allocate_output) + callback_advanced = NULL; + for (;;) { if (!wg_parser_stream_get_event(wg_stream, &event)) @@ -1782,24 +1789,59 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, switch (event.type) { case WG_PARSER_EVENT_BUFFER: - /* FIXME: Should these be pooled? */ - if (!(object = calloc(1, offsetof(struct buffer, data[event.u.buffer.size])))) + { + DWORD size, capacity; + INSSBuffer *sample; + HRESULT hr; + BYTE *data; + + if (callback_advanced) { - wg_parser_stream_release_buffer(wg_stream); - return E_OUTOFMEMORY; + if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced, + stream->index, event.u.buffer.size, &sample, NULL))) + { + ERR("Failed to allocate sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); + return hr; + } + } + else + { + struct buffer *object; + + /* FIXME: Should these be pooled? */ + if (!(object = calloc(1, offsetof(struct buffer, data[event.u.buffer.size])))) + { + wg_parser_stream_release_buffer(wg_stream); + return E_OUTOFMEMORY; + } + + object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + object->refcount = 1; + object->capacity = event.u.buffer.size; + + TRACE("Created buffer %p.\n", object); + sample = &object->INSSBuffer_iface; } - object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; - object->refcount = 1; - object->capacity = object->size = event.u.buffer.size; + if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) + ERR("Failed to get data pointer, hr %#x.\n", hr); + if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity))) + ERR("Failed to get capacity, hr %#x.\n", hr); + if (event.u.buffer.size > capacity) + ERR("Returned capacity %u is less than requested capacity %u.\n", + capacity, event.u.buffer.size); - if (!wg_parser_stream_copy_buffer(wg_stream, object->data, 0, object->size)) + if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, event.u.buffer.size)) { /* The GStreamer pin has been flushed. */ - free(object); + INSSBuffer_Release(sample); break; } + if (FAILED(hr = INSSBuffer_SetLength(sample, event.u.buffer.size))) + ERR("Failed to set size %u, hr %#x.\n", event.u.buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); if (!event.u.buffer.has_pts) @@ -1815,9 +1857,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (!event.u.buffer.delta) *flags |= WM_SF_CLEANPOINT; - TRACE("Created buffer %p.\n", object); - *ret_sample = &object->INSSBuffer_iface; + *ret_sample = sample; return S_OK; + } case WG_PARSER_EVENT_EOS: stream->eos = true; @@ -1913,6 +1955,24 @@ HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, return S_OK; } +HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate) +{ + struct wm_stream *stream; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + stream->allocate_output = !!allocate; + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; -- 2.33.0

1 4

[PATCH] shell32: Fix getting file attributes from the file system in SHELL32_GetItemAttributes.
by Torge Matthies 10 Nov '21

10 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52017 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/shell32/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index ce7fc072fa3..10aafc160c0 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -417,7 +417,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO } else if (_ILGetDataPointer (pidl)) { DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0); - if (!file_attr && has_guid) { + if (!file_attr) { WCHAR path[MAX_PATH]; STRRET strret; -- 2.33.1

1 0

[PATCH vkd3d] vkd3d-shader/hlsl: swizzle types of srcs can now be specified on sm4_instruction
by Francisco Casas 10 Nov '21

10 Nov '21

Some dxbc instructions require swizzle types that differ from what is usual for the register type. e.g. gather4 requires a register with register type VKD3D_SM4_RT_SAMPLER but a swizzle type VKD3D_SM4_SWIZZLE_VEC4 instead of the usual VKD3D_SM4_SWIZZLE_NONE. The new fields of sm4_instruction can be used to handle these exceptions. Also, they shouldn't change the current behaviour of the rest of the code since they are currently initalized with zeroes everywhere a sm4_instruction is initialized. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e163..e148c821 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -747,6 +747,10 @@ struct sm4_instruction { struct sm4_register reg; unsigned int swizzle; + /* If use_custom_swizzle_type is true, then custom_swizzle_type will be used in the + * instruction, instead of the default swizzle type obtained from the register type. */ + bool use_custom_swizzle_type; + enum vkd3d_sm4_swizzle_type custom_swizzle_type; } srcs[2]; unsigned int src_count; @@ -754,7 +758,7 @@ struct sm4_instruction unsigned int idx_count; }; -static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) +static unsigned int sm4_default_swizzle_type(enum vkd3d_sm4_register_type type) { switch (type) { @@ -913,8 +917,10 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st for (i = 0; i < instr->src_count; ++i) { + unsigned int swizzle_type = instr->srcs[i].use_custom_swizzle_type ? + instr->srcs[i].custom_swizzle_type : sm4_default_swizzle_type(instr->srcs[i].reg.type); token = sm4_encode_register(&instr->srcs[i].reg); - token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + token |= swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; if (instr->srcs[i].reg.mod) token |= VKD3D_SM4_EXTENDED_OPERAND; -- 2.25.1

2 1

[PATCH] mscoree: Update Wine Mono to 7.0.0.
by Esme Povirk 10 Nov '21

10 Nov '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 7ef7ca312ae..b4da6137d72 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.4.0" +#define MONO_VERSION "7.0.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "db8b85f3b910590f61adbfa0005a995d613e299a1cc73d00553d70dc81010e36" +#define MONO_SHA "b37e6fc9e590e582243dc25d72a5fcc330c3a7970dfdc98a7a81d23845ba8900" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 04844c8da69..1ef5ac200f3 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.4.0" +#define WINE_MONO_VERSION "7.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.30.2

2 1

[PATCH v2 1/2] server: Wait for process exit more often and using increasing delay.
by Rémi Bernon 10 Nov '21

10 Nov '21

Instead of waiting for 1s before considering it dead, when most of the time the process dies quickly, delaying desktop or wineserver shutdown. This saves ~2s on the prefix shutdown time, as measured with: time bash -c 'wine cmd /c exit |& tee /dev/null' Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Rebase on upstream HEAD. server/process.c | 19 +++++++++++++++---- server/process.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/process.c b/server/process.c index 48b5d6d6dd4..343ad78270c 100644 --- a/server/process.c +++ b/server/process.c @@ -595,10 +595,20 @@ static void process_died( struct process *process ) static void process_sigkill( void *private ) { struct process *process = private; + int signal = 0; - process->sigkill_timeout = NULL; - kill( process->unix_pid, SIGKILL ); - process_died( process ); + process->sigkill_delay *= 2; + if (process->sigkill_delay >= TICKS_PER_SEC / 2) + signal = SIGKILL; + + if (!kill( process->unix_pid, signal ) && !signal) + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); + else + { + process->sigkill_delay = TICKS_PER_SEC / 64; + process->sigkill_timeout = NULL; + process_died( process ); + } } /* start the sigkill timer for a process upon exit */ @@ -606,7 +616,7 @@ static void start_sigkill_timer( struct process *process ) { grab_object( process ); if (process->unix_pid != -1) - process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); else process_died( process ); } @@ -630,6 +640,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->handles = NULL; process->msg_fd = NULL; process->sigkill_timeout = NULL; + process->sigkill_delay = TICKS_PER_SEC / 64; process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0; diff --git a/server/process.h b/server/process.h index 55e4d6dced6..22ee8178368 100644 --- a/server/process.h +++ b/server/process.h @@ -53,6 +53,7 @@ struct process process_id_t group_id; /* group id of the process */ unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ + timeout_t sigkill_delay; /* delay before final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */ -- 2.33.1

2 3

[PATCH] vkd3d-shader/hlsl: swizzle types of srcs can now be specified on sm4_instruction
by Francisco Casas 10 Nov '21

10 Nov '21

From: Francisco Casas <franciscojacb(a)gmail.com> Some dxbc instructions require swizzle types that differ from what is usual for the register type. e.g. gather4 requires a register with register type VKD3D_SM4_RT_SAMPLER but a swizzle type VKD3D_SM4_SWIZZLE_VEC4 instead of the usual VKD3D_SM4_SWIZZLE_NONE. The new fields of sm4_instruction can be used to handle these exceptions. Also, they shouldn't change the current behaviour of the rest of the code since they are currently initalized with zeroes everywhere a sm4_instruction is initialized. Signed-off-by: Francisco Casas <franciscojacb(a)gmail.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e163..29d728db 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -747,6 +747,11 @@ struct sm4_instruction { struct sm4_register reg; unsigned int swizzle; + /* If use_custom_swizzle_type is true, then custom_swizzle_type will be used in the + * instruction, instead of the result of the default swizzle type obtained from the register + * type. */ + bool use_custom_swizzle_type; + enum vkd3d_sm4_swizzle_type custom_swizzle_type; } srcs[2]; unsigned int src_count; @@ -754,7 +759,7 @@ struct sm4_instruction unsigned int idx_count; }; -static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) +static unsigned int sm4_default_swizzle_type(enum vkd3d_sm4_register_type type) { switch (type) { @@ -913,8 +918,10 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st for (i = 0; i < instr->src_count; ++i) { + unsigned int swizzle_type = instr->srcs[i].use_custom_swizzle_type ? + instr->srcs[i].custom_swizzle_type : sm4_default_swizzle_type(instr->srcs[i].reg.type); token = sm4_encode_register(&instr->srcs[i].reg); - token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + token |= swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; if (instr->srcs[i].reg.mod) token |= VKD3D_SM4_EXTENDED_OPERAND; -- 2.25.1

1 0

[PATCH 4/5] win32u: Move null user driver implementation from user32.
by Jacek Caban 10 Nov '21

10 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 209 +---------------------------- dlls/win32u/driver.c | 310 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 310 insertions(+), 209 deletions(-)

3 8

[PATCH] winebuild: Use find_clang_tool for ld and nm tools.
by Jacek Caban 10 Nov '21

10 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes linking for Android targets with recent toolchains that don't provide binutils. tools/winebuild/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] winegstreamer: Implement IWMSyncReader::SetStreamsSelected().
by Zebediah Figura 10 Nov '21

10 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 3 ++ dlls/winegstreamer/wm_reader.c | 48 ++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 21 ++++++++----- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9674ee35052..c7c72ab65fc 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -123,6 +123,7 @@ struct wm_stream WORD index; bool eos; struct wg_format format; + WMT_STREAM_SELECTION selection; }; struct wm_reader @@ -173,5 +174,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); +HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, + const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections); #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index bcae50e5d1e..6b29415e363 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1413,6 +1413,7 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i); stream->reader = reader; stream->index = i; + stream->selection = WMT_ON; wg_parser_stream_get_preferred_format(stream->wg_stream, &stream->format); if (stream->format.major_type == WG_MAJOR_TYPE_AUDIO) { @@ -1739,6 +1740,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, struct wg_parser_event event; struct buffer *object; + if (stream->selection == WMT_OFF) + return NS_E_INVALID_REQUEST; + if (stream->eos) return NS_E_NO_MORE_SAMPLES; @@ -1824,6 +1828,50 @@ void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration) LeaveCriticalSection(&reader->cs); } +HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, + const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections) +{ + struct wm_stream *stream; + WORD i; + + if (!count) + return E_INVALIDARG; + + EnterCriticalSection(&reader->cs); + + for (i = 0; i < count; ++i) + { + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]))) + { + LeaveCriticalSection(&reader->cs); + WARN("Invalid stream number %u; returning NS_E_INVALID_REQUEST.\n", stream_numbers[i]); + return NS_E_INVALID_REQUEST; + } + } + + for (i = 0; i < count; ++i) + { + stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]); + stream->selection = selections[i]; + if (selections[i] == WMT_OFF) + { + TRACE("Disabling stream %u.\n", stream_numbers[i]); + wg_parser_stream_disable(stream->wg_stream); + } + else if (selections[i] == WMT_ON) + { + if (selections[i] != WMT_ON) + FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n", + selections[i], stream_numbers[i]); + TRACE("Enabling stream %u.\n", stream_numbers[i]); + wg_parser_stream_enable(stream->wg_stream, &stream->format); + } + } + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index fff048df06e..3e980c59601 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -83,8 +83,8 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, DWORD *flags, DWORD *output_number, WORD *ret_stream_number) { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + HRESULT hr = NS_E_NO_MORE_SAMPLES; struct wm_stream *stream; - HRESULT hr; WORD i; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," @@ -104,8 +104,12 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, for (i = 0; i < reader->reader.stream_count; ++i) { WORD index = (i + reader->last_read_stream + 1) % reader->reader.stream_count; + struct wm_stream *stream = &reader->reader.streams[index]; - hr = wm_reader_get_stream_sample(&reader->reader.streams[index], sample, pts, duration, flags); + if (stream->selection == WMT_OFF) + continue; + + hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); if (hr == S_OK) { if (output_number) @@ -296,12 +300,15 @@ static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, W return E_NOTIMPL; } -static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, + WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); - return S_OK; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n", + reader, count, stream_numbers, selections); + + return wm_reader_set_streams_selected(&reader->reader, count, stream_numbers, selections); } static HRESULT WINAPI WMSyncReader2_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num, -- 2.33.0

1 4

[PATCH v4 vkd3d 1/5] vkd3d-shader/hlsl: Avoid hard-coding array sizes in hlsl_type_to_string().
by Zebediah Figura 10 Nov '21

10 Nov '21

From: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c71eac3f1..1eee4278a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -854,14 +854,14 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { struct vkd3d_string_buffer *string; - static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = - { - "float", - "half", - "double", - "int", - "uint", - "bool", + static const char *const base_types[] = + { + [HLSL_TYPE_FLOAT] = "float", + [HLSL_TYPE_HALF] = "half", + [HLSL_TYPE_DOUBLE] = "double", + [HLSL_TYPE_INT] = "int", + [HLSL_TYPE_UINT] = "uint", + [HLSL_TYPE_BOOL] = "bool", }; if (!(string = hlsl_get_string_buffer(ctx))) @@ -915,7 +915,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_OBJECT: { - static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = + static const char *const dimensions[] = { [HLSL_SAMPLER_DIM_1D] = "1D", [HLSL_SAMPLER_DIM_2D] = "2D", -- 2.33.1

7 21