June 2022 - Wine-Devel - list.winehq.org

[PATCH vkd3d 1/3] vkd3d-shader: Allow writing log output via a custom callback.

by Zebediah Figura

When using PE vkd3d through Wine, debug output may be swallowed by writing to Win32 stderr. Avoid this by providing a way to hook up vkd3d log output to Wine output. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/private/vkd3d_debug.h | 1 + include/vkd3d_shader.h | 15 ++++++++++++++ include/vkd3d_types.h | 4 ++++ libs/vkd3d-common/debug.c | 28 +++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 5 +++++ 6 files changed, 52 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 8ab653aef..579c33d36 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -47,6 +47,7 @@ enum vkd3d_dbg_level enum vkd3d_dbg_level vkd3d_dbg_get_level(void); void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback); const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 05d235f9d..1e5a332ef 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1806,6 +1806,18 @@ VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_sig VKD3D_SHADER_API int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** + * Set a callback to be called when vkd3d-shader outputs debug logging. + * + * If NULL, or if this function has not been called, libvkd3d-shader will print + * all enabled log output to stderr. + * + * \param callback Callback function to set. + * + * \since 1.4 + */ +VKD3D_SHADER_API void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ @@ -1859,6 +1871,9 @@ typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signa typedef void (*PFN_vkd3d_shader_preprocess)(struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** Type of vkd3d_shader_set_log_callback(). \since 1.4 */ +typedef void (*PFN_vkd3d_shader_set_log_callback)(PFN_vkd3d_log callback); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 7014f4c25..4a7aca236 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_TYPES_H #define __VKD3D_TYPES_H +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -53,6 +55,8 @@ enum vkd3d_result VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; +typedef void (*PFN_vkd3d_log)(const char *format, va_list args); + #ifdef _WIN32 # define VKD3D_IMPORT __declspec(dllimport) # define VKD3D_EXPORT __declspec(dllexport) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 4868f3fba..0b9e765ac 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -68,6 +68,25 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) return level; } +static PFN_vkd3d_log log_callback; + +static void vkd3d_dbg_voutput(const char *fmt, va_list args) +{ + if (log_callback) + log_callback(fmt, args); + else + vfprintf(stderr, fmt, args); +} + +static void vkd3d_dbg_output(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_dbg_voutput(fmt, args); + va_end(args); +} + void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) { va_list args; @@ -77,12 +96,17 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch assert(level < ARRAY_SIZE(debug_level_names)); - fprintf(stderr, "%s:%s: ", debug_level_names[level], function); + vkd3d_dbg_output("%s:%s ", debug_level_names[level], function); va_start(args, fmt); - vfprintf(stderr, fmt, args); + vkd3d_dbg_voutput(fmt, args); va_end(args); } +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback) +{ + log_callback = callback; +} + static char *get_buffer(void) { static char buffers[VKD3D_DEBUG_BUFFER_COUNT][VKD3D_DEBUG_BUFFER_SIZE]; diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 2e49fe248..cac96972a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -17,6 +17,7 @@ global: vkd3d_shader_preprocess; vkd3d_shader_scan; vkd3d_shader_serialize_root_signature; + vkd3d_shader_set_log_callback; local: *; }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6fd32435a..7d0157fca 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1550,3 +1550,8 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info vkd3d_shader_message_context_cleanup(&message_context); return ret; } + +void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback) +{ + vkd3d_dbg_set_log_callback(callback); +} -- 2.36.1

June 1, 2022

Re: [PATCH] ws2_32: Add WSAConnectByName() functions

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>

June 1, 2022

Re: [PATCH v3 3/4] qasf: Implement ASF Reader filter pin_query_accept.

by Zebediah Figura

On 5/27/22 09:46, Rémi Bernon wrote: > +static HRESULT asf_stream_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *media_type) > +{ > + struct asf_stream *stream = impl_from_strmbase_pin(iface); > + struct asf_reader *filter = asf_reader_from_asf_stream(stream); > + IWMOutputMediaProps *props; > + HRESULT hr; > + > + TRACE("iface %p, media_type %p.\n", iface, media_type); > + strmbase_dump_media_type(media_type); > + > + if (FAILED(IWMReader_GetOutputFormat(filter->reader, stream->index, 0, &props))) > + return VFW_S_NO_MORE_ITEMS; > + > + hr = IWMOutputMediaProps_SetMediaType(props, (WM_MEDIA_TYPE *)media_type); > + if (SUCCEEDED(hr)) > + hr = IWMReader_SetOutputProps(filter->reader, stream->index, props); > + > + IWMOutputMediaProps_Release(props); > + return hr; > +} This seems wrong; QueryAccept() isn't supposed to modify any state, and it can be called at any time. Given that there's apparently no WM interface for this functionality I suspect that we'll have to implement it manually (after writing tests to find out what the correct functionality even is), if it's worth implementing. Which it may not be—calling QueryAccept() on the source pin isn't part of the usual connection process, and our fallback implementation returns S_OK anyway.

June 1, 2022

Re: [PATCH v2 3/5] winegstreamer: Request native buffer alignment using video pool meta.

by Zebediah Figura

On 5/30/22 03:20, Rémi Bernon wrote: > dlls/mf/tests/mf.c | 3 - > dlls/winegstreamer/wg_transform.c | 123 +++++++++++++++++++++++++++--- > 2 files changed, 114 insertions(+), 12 deletions(-) Looks clear and correct, just a couple of nitpicks... > + if (!(dst_info = gst_video_info_copy(&src_info))) > + return false; Any reason not to allocate dst_info on stack? > + if (!(is_caps_video(caps) ? copy_video_buffer(buffer, caps, plane_align, sample, &total_size) > + : copy_buffer(buffer, caps, sample, &total_size))) This is a little hard to read. Would you mind either using a "ret" variable, or perhaps putting the copy_video_buffer() call inside of copy_buffer()?

June 1, 2022

Re: [PATCH v2 2/5] winegstreamer: Reply with a video buffer pool to ALLOCATION queries.

by Zebediah Figura

On 5/30/22 03:20, Rémi Bernon wrote: > + if (gst_query_get_n_allocation_pools(query) > 0) > + gst_query_set_nth_allocation_pool(query, 0, pool, info.size, 0, 0); > + else > + gst_query_add_allocation_pool(query, pool, info.size, 0, 0); GStreamer documentation isn't exactly clear about this, but my understanding is that, as the sink, we are supposed to be the first element to add things to this query, and as such there shouldn't be any pools already. Have you encountered cases where that wasn't true? Or were you modeling this after some GStreamer code I didn't find? FWIW, the above seems to be a common pattern for filters or source elements *after* receiving a query response from the sink, but that's not the case here.

June 1, 2022

Re: [PATCH v2 1/5] winegstreamer: Use a custom flag instead of sample info for caps change.

by Zebediah Figura

On 5/30/22 03:20, Rémi Bernon wrote: > +#ifndef GST_SAMPLE_FLAG_LAST > +#define GST_SAMPLE_FLAG_WG_CAPS_CHANGED (GST_MINI_OBJECT_FLAG_LAST << 0) > +#else > +#define GST_SAMPLE_FLAG_WG_CAPS_CHANGED (GST_SAMPLE_FLAG_LAST << 0) > +#endif This define doesn't currently exist in GStreamer, and from my searching never has. I get the idea here, but it seems pointless, since they can't actually add it with a different value without breaking ABI.

June 1, 2022

Re: [PATCH v2 0/4] MR168: winemac: PE conversion preparation - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/168

June 1, 2022

Re: [PATCH v2 0/1] MR166: include: Add touch and pointer input related winuser.h declarations. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/166

June 1, 2022

Re: [PATCH v2 0/1] MR164: winex11.drv: Avoid adding duplicate GPUs. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/164

June 1, 2022

Re: [PATCH v2 5/5] user32/tests: Process messages while waiting in WindowFromPoint tests.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=115950 Your paranoid android. === w864 (32 bit report) === user32: win.c:2688: Test failed: style 0x200000: expected !100 win.c:2688: Test failed: style 0x300000: expected !100 === w864 (64 bit report) === user32: win.c:2688: Test failed: style 0x200000: expected !100 win.c:2688: Test failed: style 0x300000: expected !100 === w10pro64_ja (64 bit report) === user32: win.c:4378: Test failed: message 0100 available win.c:4379: Test failed: hwnd 0000000000000000 message 0100 win.c:4408: Test failed: no message available win.c:4409: Test failed: hwnd 0000000000000000 message 0100 win.c:10799: Test failed: pos = 00fa00fa win.c:10803: Test failed: pos = 00fa00fa win.c:10807: Test failed: pos = 00fa00fa === w10pro64_zh_CN (64 bit report) === user32: win.c:4378: Test failed: message 0100 available win.c:4379: Test failed: hwnd 0000000000000000 message 0100 win.c:4408: Test failed: no message available win.c:4409: Test failed: hwnd 0000000000000000 message 0100 win.c:10799: Test failed: pos = 00fa00fa win.c:10803: Test failed: pos = 00fa00fa win.c:10807: Test failed: pos = 00fa00fa

June 1, 2022