- Wine-Devel - list.winehq.org

[PATCH] mf: Add a helper to get associated topology node object.
by Nikolay Sivov Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/copier.c | 4 +-- dlls/mf/mf_private.h | 3 ++- dlls/mf/session.c | 55 +++++++++++++-------------------------- dlls/mf/topology.c | 62 +++++++++++++++++++++----------------------- 4 files changed, 52 insertions(+), 72 deletions(-) diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index cbdac97292b..1a07d6abefd 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -561,9 +561,9 @@ static const IMFTransformVtbl sample_copier_transform_vtbl = sample_copier_transform_ProcessOutput, }; -BOOL mf_is_sample_copier_transform(IUnknown *transform) +BOOL mf_is_sample_copier_transform(IMFTransform *transform) { - return transform->lpVtbl == (IUnknownVtbl *)&sample_copier_transform_vtbl; + return transform->lpVtbl == &sample_copier_transform_vtbl; } /*********************************************************************** diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 0c4dde0c4fc..cc270a8cf57 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -80,4 +80,5 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } -extern BOOL mf_is_sample_copier_transform(IUnknown *transform) DECLSPEC_HIDDEN; +extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; +extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1a7439a13c3..af0407f6a0b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -792,7 +792,6 @@ static void session_shutdown_current_topology(struct media_session *session) IMFTopologyNode *node; IMFActivate *activate; IMFMediaSink *sink; - IUnknown *object; WORD idx = 0; HRESULT hr; @@ -818,20 +817,15 @@ static void session_shutdown_current_topology(struct media_session *session) WARN("Failed to shut down activation object for the sink, hr %#x.\n", hr); IMFActivate_Release(activate); } - else if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + else if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { - if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) { - if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) - { - IMFMediaSink_Shutdown(sink); - IMFMediaSink_Release(sink); - } - - IMFStreamSink_Release(stream_sink); + IMFMediaSink_Shutdown(sink); + IMFMediaSink_Release(sink); } - IUnknown_Release(object); + IMFStreamSink_Release(stream_sink); } } } @@ -1358,7 +1352,6 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod IMFMediaType *media_type; IMFStreamDescriptor *sd; HRESULT hr = S_OK; - IUnknown *object; if (!(topo_node = heap_alloc_zero(sizeof(*topo_node)))) return E_OUTOFMEMORY; @@ -1374,15 +1367,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod case MF_TOPOLOGY_OUTPUT_NODE: topo_node->u.sink.notify_cb.lpVtbl = &node_sample_allocator_cb_vtbl; - if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) + if (FAILED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&topo_node->object.object))) { - WARN("Node %s does not have associated object.\n", wine_dbgstr_longlong(topo_node->node_id)); + WARN("Failed to get stream sink interface, hr %#x.\n", hr); break; } - hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&topo_node->object.object); - IUnknown_Release(object); - if (FAILED(hr)) - break; if (FAILED(hr = IMFStreamSink_GetMediaSink(topo_node->object.sink_stream, &media_sink))) break; @@ -1433,14 +1422,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod break; case MF_TOPOLOGY_TRANSFORM_NODE: - if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &object))) - { - hr = IUnknown_QueryInterface(object, &IID_IMFTransform, (void **)&topo_node->object.transform); - IUnknown_Release(object); - } - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFTransform, (void **)&topo_node->object.transform))) + { hr = session_set_transform_stream_info(topo_node); + } else WARN("Failed to get IMFTransform for MFT node, hr %#x.\n", hr); @@ -2017,10 +2003,10 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { IMFStreamSink *stream_sink; IMFTopologyNode *node; - IUnknown *vr, *object; IMFCollection *nodes; IMFMediaSink *sink; unsigned int i = 0; + IUnknown *vr; HRESULT hr; EnterCriticalSection(&session->cs); @@ -2033,23 +2019,18 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) { - if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { - if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) { - if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) { - if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) - { - if (FAILED(hr = MFGetService(vr, service, riid, obj))) - WARN("Failed to get service from video renderer %#x.\n", hr); - IUnknown_Release(vr); - } + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); } - IMFStreamSink_Release(stream_sink); } - - IUnknown_Release(object); + IMFStreamSink_Release(stream_sink); } IMFTopologyNode_Release(node); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e33dbc2efc7..af28de0819d 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1786,6 +1786,22 @@ static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_ return S_OK; } +HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) +{ + IUnknown *unk; + HRESULT hr; + + *obj = NULL; + + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &unk))) + { + hr = IUnknown_QueryInterface(unk, riid, obj); + IUnknown_Release(unk); + } + + return hr; +} + /*********************************************************************** * MFCreateTopologyNode (mf.@) */ @@ -1817,7 +1833,6 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO IMFStreamDescriptor *sd; IMFTransform *transform; UINT32 primary_output; - IUnknown *object; HRESULT hr; TRACE("%p, %u, %d, %p.\n", node, stream, output, type); @@ -1828,12 +1843,7 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) - return hr; - - hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink); - IUnknown_Release(object); - if (SUCCEEDED(hr)) + if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); IMFStreamSink_Release(stream_sink); @@ -1861,12 +1871,7 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO } break; case MF_TOPOLOGY_TRANSFORM_NODE: - if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) - return hr; - - hr = IUnknown_QueryInterface(object, &IID_IMFTransform, (void **)&transform); - IUnknown_Release(object); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFTransform, (void **)&transform))) { if (output) hr = IMFTransform_GetOutputCurrentType(transform, stream, type); @@ -2163,7 +2168,6 @@ static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFM MF_TOPOLOGY_TYPE node_type; IMFStreamSink *stream_sink; IMFStreamDescriptor *sd; - IUnknown *object; HRESULT hr; if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) @@ -2172,14 +2176,10 @@ static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFM switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, (IUnknown **)&object))) + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { - if (SUCCEEDED(hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); - IMFStreamSink_Release(stream_sink); - } - IUnknown_Release(object); + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); + IMFStreamSink_Release(stream_sink); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: @@ -2368,22 +2368,20 @@ static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) { IMFAttributes *attributes; unsigned int d3d_aware = 0; - IUnknown *object = NULL; + IMFTransform *transform; - if (FAILED(IMFTopologyNode_GetObject(node, &object))) + if (FAILED(topology_node_get_object(node, &IID_IMFAttributes, (void **)&attributes))) return FALSE; - if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFAttributes, (void **)&attributes))) + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); + IMFAttributes_Release(attributes); + + if (!d3d_aware && SUCCEEDED(topology_node_get_object(node, &IID_IMFTransform, (void **)&transform))) { - IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); - IMFAttributes_Release(attributes); + d3d_aware = mf_is_sample_copier_transform(transform); + IMFTransform_Release(transform); } - if (!d3d_aware) - d3d_aware = mf_is_sample_copier_transform(object); - - IUnknown_Release(object); - return !!d3d_aware; } @@ -2454,7 +2452,7 @@ static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context IMFTransform *copier = NULL; HRESULT hr = S_OK; - IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink); if (topology_loader_is_node_d3d_aware(node)) { -- 2.29.2

1 0

[PATCH 1/4] winegstreamer: Get rid of the unknown_type() callback.
by Zebediah Figura Jan. 14, 2021

Jan. 14, 2021

This information is already printed by GStreamer via GST_MESSAGE_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gst_cbs.c | 12 ------------ dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 14 -------------- 3 files changed, 34 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 51aaefa911d..e6b9a30d466 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -279,18 +279,6 @@ GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, return cbdata.u.autoplug_blacklist_data.ret; } -void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) -{ - struct cb_data cbdata = { UNKNOWN_TYPE }; - - cbdata.u.unknown_type_data.bin = bin; - cbdata.u.unknown_type_data.pad = pad; - cbdata.u.unknown_type_data.caps = caps; - cbdata.u.unknown_type_data.user = user; - - call_cb(&cbdata); -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index a48999bbf71..546443bb4c6 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -41,7 +41,6 @@ enum CB_TYPE { GOT_DATA_SINK, REMOVED_DECODED_PAD, AUTOPLUG_BLACKLIST, - UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -125,12 +124,6 @@ struct cb_data { gpointer user; GstAutoplugSelectResult ret; } autoplug_blacklist_data; - struct unknown_type_data { - GstElement *bin; - GstPad *pad; - GstCaps *caps; - gpointer user; - } unknown_type_data; struct query_sink_data { GstPad *pad; GstObject *parent; @@ -161,7 +154,6 @@ GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *b GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; -void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1e91c9f8e7e..992cdf01755 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1352,13 +1352,6 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) return GST_BUS_DROP; } -static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) -{ - gchar *strcaps = gst_caps_to_string(caps); - ERR("Could not find a filter for caps: %s\n", debugstr_a(strcaps)); - g_free(strcaps); -} - static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin) { LONGLONG avail; @@ -1691,7 +1684,6 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); - g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); filter->their_sink = gst_element_get_static_pad(element, "sink"); @@ -2339,12 +2331,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->pad, data->caps, data->fact, data->user); break; } - case UNKNOWN_TYPE: - { - struct unknown_type_data *data = &cbdata->u.unknown_type_data; - unknown_type(data->bin, data->pad, data->caps, data->user); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data; -- 2.30.0

1 3

[PATCH vkd3d 1/5] vkd3d-shader: Implement macro body expansion.
by Zebediah Figura Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.h | 18 ++++++++ libs/vkd3d-shader/preproc.l | 83 +++++++++++++++++++++++++++++++------ libs/vkd3d-shader/preproc.y | 24 +++++++++-- tests/hlsl_d3d12.c | 9 ++-- 5 files changed, 113 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index bf1d7bfa..514f0506 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 16b579e0..7d6bda2a 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -50,10 +50,24 @@ struct preproc_file size_t if_count, if_stack_size; }; +struct preproc_text +{ + struct vkd3d_string_buffer text; + struct vkd3d_shader_location location; +}; + +struct preproc_expansion +{ + struct preproc_buffer buffer; + const struct preproc_text *text; +}; + struct preproc_macro { struct rb_entry entry; char *name; + + struct preproc_text body; }; struct preproc_ctx @@ -67,6 +81,9 @@ struct preproc_ctx struct preproc_file *file_stack; size_t file_count, file_stack_size; + struct preproc_expansion *expansion_stack; + size_t expansion_count, expansion_stack_size; + struct rb_tree macros; int current_directive; @@ -78,6 +95,7 @@ struct preproc_ctx }; void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; +struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) DECLSPEC_HIDDEN; void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; bool preproc_push_include(struct preproc_ctx *ctx, char *filename, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 476c1e59..86ca4733 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -169,27 +169,41 @@ static void update_location(struct preproc_ctx *ctx) static void preproc_pop_buffer(struct preproc_ctx *ctx) { - struct preproc_file *file = preproc_get_top_file(ctx); + if (ctx->expansion_count) + { + struct preproc_expansion *exp = &ctx->expansion_stack[ctx->expansion_count - 1]; - if (ctx->file_count > 1) - preproc_close_include(ctx, &file->code); + yy_delete_buffer(exp->buffer.lexer_buffer, ctx->scanner); - if (file->if_count) + --ctx->expansion_count; + TRACE("Expansion stack size is now %zu.\n", ctx->expansion_count); + } + else { - const struct vkd3d_shader_location loc = {.source_name = file->filename}; + struct preproc_file *file = preproc_get_top_file(ctx); - preproc_warning(ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); - } - vkd3d_free(file->if_stack); + if (ctx->file_count > 1) + preproc_close_include(ctx, &file->code); + + if (file->if_count) + { + const struct vkd3d_shader_location loc = {.source_name = file->filename}; - vkd3d_free(file->filename); + preproc_warning(ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); + } + vkd3d_free(file->if_stack); - yy_delete_buffer(file->buffer.lexer_buffer, ctx->scanner); + vkd3d_free(file->filename); - --ctx->file_count; - TRACE("File stack size is now %zu.\n", ctx->file_count); + yy_delete_buffer(file->buffer.lexer_buffer, ctx->scanner); - if (ctx->file_count) + --ctx->file_count; + TRACE("File stack size is now %zu.\n", ctx->file_count); + } + + if (ctx->expansion_count) + yy_switch_to_buffer(ctx->expansion_stack[ctx->expansion_count - 1].buffer.lexer_buffer, ctx->scanner); + else if (ctx->file_count) yy_switch_to_buffer(ctx->file_stack[ctx->file_count - 1].buffer.lexer_buffer, ctx->scanner); } @@ -218,6 +232,21 @@ static int return_token(int token, YYSTYPE *lval, const char *text) return token; } +static bool preproc_push_expansion(struct preproc_ctx *ctx, const struct preproc_text *text) +{ + struct preproc_expansion *exp; + + if (!vkd3d_array_reserve((void **)&ctx->expansion_stack, &ctx->expansion_stack_size, + ctx->expansion_count + 1, sizeof(*ctx->expansion_stack))) + return false; + exp = &ctx->expansion_stack[ctx->expansion_count++]; + exp->text = text; + exp->buffer.lexer_buffer = yy_scan_bytes(text->text.buffer, text->text.content_size, ctx->scanner); + exp->buffer.location = text->location; + TRACE("Expansion stack size is now %zu.\n", ctx->expansion_count); + return true; +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -239,6 +268,10 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) if (!(token = preproc_lexer_lex(lval, lloc, scanner))) { ctx->last_was_eof = true; + + /* If we have reached the end of an included file, inject a newline. */ + if (ctx->expansion_count) + continue; token = T_NEWLINE; text = "\n"; } @@ -288,6 +321,29 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } + if (token == T_IDENTIFIER) + { + struct preproc_macro *macro; + + switch (ctx->current_directive) + { + case T_DEFINE: + case T_IFDEF: + case T_IFNDEF: + case T_UNDEF: + /* Return identifiers verbatim. */ + return return_token(token, lval, text); + } + + /* Otherwise, expand a macro if there is one. */ + + if ((macro = preproc_find_macro(ctx, text))) + { + preproc_push_expansion(ctx, &macro->body); + continue; + } + } + if (ctx->current_directive) return return_token(token, lval, text); @@ -365,6 +421,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); vkd3d_free(ctx.file_stack); + vkd3d_free(ctx.expansion_stack); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 53ce3e57..17bc6499 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -68,7 +68,7 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } -static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) +struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) { struct rb_entry *entry; @@ -77,7 +77,8 @@ static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const c return NULL; } -static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, + const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) { struct preproc_macro *macro; int ret; @@ -94,6 +95,8 @@ static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader if (!(macro = vkd3d_malloc(sizeof(*macro)))) return false; macro->name = name; + macro->body.text = *body; + macro->body.location = *body_loc; ret = rb_put(&ctx->macros, name, &macro->entry); assert(!ret); return true; @@ -102,6 +105,7 @@ static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader void preproc_free_macro(struct preproc_macro *macro) { vkd3d_free(macro->name); + vkd3d_string_buffer_cleanup(&macro->body.text); vkd3d_free(macro); } @@ -265,6 +269,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx) { char *string; uint32_t integer; + struct vkd3d_string_buffer string_buffer; } %token <string> T_IDENTIFIER @@ -286,6 +291,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %type <integer> expr %type <string> body_token +%type <string_buffer> body_text %% @@ -298,8 +304,16 @@ shader_text body_text : %empty + { + vkd3d_string_buffer_init(&$$); + } | body_text body_token { + if (vkd3d_string_buffer_printf(&$$, "%s ", $2) < 0) + { + vkd3d_free($2); + YYABORT; + } vkd3d_free($2); } @@ -311,8 +325,12 @@ body_token directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE { - if (!preproc_add_macro(ctx, &@$, $2)) + if (!preproc_add_macro(ctx, &@$, $2, &@3, &$3)) + { + vkd3d_free($2); + vkd3d_string_buffer_cleanup(&$3); YYABORT; + } } | T_UNDEF T_IDENTIFIER T_NEWLINE { diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 54ab94de..ac616c23 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,10 +349,10 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 6 || i == 10 || i == 11) + if (i == 10 || i == 11) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || (i >= 9 && i <= 14)) + todo_if (i <= 4 || (i >= 9 && i <= 14) || i == 43) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -400,12 +400,11 @@ static void test_preprocess(void) macros[1].Definition = "KEY2"; todo check_preprocess("KEY", macros, NULL, "value", NULL); - if (0) - todo check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); + check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); ok(!refcount_file1, "Got %d references to file1.\n", refcount_file1); ok(!refcount_file2, "Got %d references to file1.\n", refcount_file2); ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3); - todo ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); + ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ if (0) -- 2.30.0

5 16

[PATCH vkd3d v2 1/5] vkd3d-shader: Partially implement #define.
by Zebediah Figura Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/preproc.h | 10 ++++ libs/vkd3d-shader/preproc.l | 35 ++++++++++++-- libs/vkd3d-shader/preproc.y | 59 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 103 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 514f0506..bf1d7bfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,6 +243,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index effcd995..7f77d278 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -22,6 +22,7 @@ #define __VKD3D_SHADER_PREPROC_H #include "vkd3d_shader_private.h" +#include "rbtree.h" struct preproc_if_state { @@ -33,6 +34,12 @@ struct preproc_if_state bool seen_else; }; +struct preproc_macro +{ + struct rb_entry entry; + char *name; +}; + struct preproc_ctx { void *scanner; @@ -44,6 +51,8 @@ struct preproc_ctx struct preproc_if_state *if_stack; size_t if_count, if_stack_size; + struct rb_tree macros; + int current_directive; bool last_was_newline; @@ -52,6 +61,7 @@ struct preproc_ctx bool error; }; +void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 47ad1f13..89c205f1 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -67,7 +67,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} -<INITIAL>{IDENTIFIER} {return T_TEXT;} +<INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "define")) + return T_DEFINE; if (!strcmp(p, "elif")) return T_ELIF; if (!strcmp(p, "else")) @@ -154,6 +156,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_IDENTIFIER: case T_INTEGER: case T_TEXT: if (!(lval->string = vkd3d_strdup(text))) @@ -191,6 +194,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_DEFINE: case T_ELIF: case T_ELSE: case T_ENDIF: @@ -208,8 +212,18 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", token, lloc->line, ctx->current_directive, debugstr_a(text)); - if (!ctx->current_directive && !preproc_is_writing(ctx)) - continue; + switch (ctx->current_directive) + { + case T_ELIF: + case T_ELSE: + case T_ENDIF: + case T_IF: + break; + + default: + if (!preproc_is_writing(ctx)) + continue; + } if (ctx->current_directive) return return_token(token, lval, text); @@ -218,6 +232,19 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } } +static int preproc_macro_compare(const void *key, const struct rb_entry *entry) +{ + const struct preproc_macro *macro = RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + const char *name = key; + + return strcmp(name, macro->name); +} + +static void preproc_macro_rb_free(struct rb_entry *entry, void *ctx) +{ + preproc_free_macro(RB_ENTRY_VALUE(entry, struct preproc_macro, entry)); +} + int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { @@ -226,6 +253,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + rb_init(&ctx.macros, preproc_macro_compare); ctx.message_context = message_context; ctx.location.source_name = compile_info->source_name; ctx.location.line = 1; @@ -248,6 +276,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_free(ctx.if_stack); + rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 647bb45d..45cad443 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -66,6 +66,43 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) +{ + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->macros, name))) + return RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + return NULL; +} + +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +{ + struct preproc_macro *macro; + int ret; + + if ((macro = preproc_find_macro(ctx, name))) + { + preproc_warning(ctx, loc, VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED, "Redefinition of %s.", name); + rb_remove(&ctx->macros, &macro->entry); + preproc_free_macro(macro); + } + + TRACE("Defining new macro %s.\n", debugstr_a(name)); + + if (!(macro = vkd3d_malloc(sizeof(*macro)))) + return false; + macro->name = name; + ret = rb_put(&ctx->macros, name, &macro->entry); + assert(!ret); + return true; +} + +void preproc_free_macro(struct preproc_macro *macro) +{ + vkd3d_free(macro->name); + vkd3d_free(macro); +} + static bool preproc_was_writing(struct preproc_ctx *ctx) { if (ctx->if_count < 2) @@ -135,17 +172,20 @@ static uint32_t preproc_parse_integer(const char *s) uint32_t integer; } +%token <string> T_IDENTIFIER %token <string> T_INTEGER %token <string> T_TEXT %token T_NEWLINE +%token T_DEFINE "#define" %token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" %type <integer> expr +%type <string> body_token %% @@ -156,8 +196,25 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +body_text + : %empty + | body_text body_token + { + vkd3d_free($2); + } + +body_token + : T_IDENTIFIER + | T_INTEGER + | T_TEXT + directive - : T_IF expr T_NEWLINE + : T_DEFINE T_IDENTIFIER body_text T_NEWLINE + { + if (!preproc_add_macro(ctx, &@$, $2)) + YYABORT; + } + | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b89d20e2..1011be27 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -82,6 +82,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED = 4300, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 4301, VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 77a7ea1a..38c1ab2c 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,7 +349,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 43) + if (i == 6) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); todo_if (i <= 4 || (i >= 9 && i <= 14)) -- 2.30.0

5 16

[PATCH v2] d2d1: Fix the size and position of the text.
by Haoyang Chen Jan. 12, 2021

Jan. 12, 2021

2 2

[PATCH v2 1/2] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only with DDSCL_NOWINDOWCHANGES or if window inactive.
by Gabriel Ivăncescu Jan. 12, 2021

Jan. 12, 2021

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ddraw/ddraw.c | 18 ++++++----- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330..f61b4c6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -559,7 +559,7 @@ static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) } static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, - BOOL windowed, struct wined3d_swapchain **wined3d_swapchain) + DWORD cooplevel, struct wined3d_swapchain **wined3d_swapchain) { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode mode; @@ -582,9 +582,11 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.backbuffer_count = 1; swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; - swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetActiveWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, @@ -640,7 +642,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, return DD_OK; } -static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL windowed) +static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, DWORD cooplevel) { HRESULT hr; @@ -650,7 +652,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win return E_FAIL; } - if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, windowed, &ddraw->wined3d_swapchain))) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, cooplevel, &ddraw->wined3d_swapchain))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; @@ -776,7 +778,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * Unsure about this: DDSCL_FPUSETUP * * These don't seem very important for wine: - * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX + * DDSCL_ALLOWREBOOT, DDSCL_ALLOWMODEX * * Returns: * DD_OK if the cooperative level was set successfully @@ -945,7 +947,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw_destroy_swapchain(ddraw); } - if (FAILED(hr = ddraw_create_swapchain(ddraw, window, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(ddraw, window, cooplevel))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index df5c8ac..4746f5a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2584,6 +2584,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bc915c9..e962e66 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2638,6 +2638,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f009b45..f711fd9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2878,6 +2878,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 613f8da..5e5a2e7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2526,6 +2526,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); -- 2.29.2

2 3

[PATCH] wined3d: Use glFinish() for synchronisation when cleaning up a destroyed context in wined3d_context_gl_cleanup().
by Henri Verbeet Jan. 12, 2021

Jan. 12, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50485 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 467f5b64d6c..a51e5ec9095 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1374,9 +1374,20 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (context_gl->valid) { - wined3d_context_gl_submit_command_fence(context_gl); - wined3d_context_gl_wait_command_fence(context_gl, - wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + /* If we're here because we're switching away from a previously + * destroyed context, acquiring a context in order to submit a fence + * is problematic. (In particular, we'd end up back here again in the + * process of switching to the newly acquired context.) */ + if (context_gl->c.destroyed) + { + gl_info->gl_ops.gl.p_glFinish(); + } + else + { + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, + wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + } if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); -- 2.20.1

1 0

[tools] testbot/PatchUtils: Propagate all build flags.
by Francois Gouget Jan. 12, 2021

Jan. 12, 2021

MakeErrors, MakeFir, MakeOpenGL and MakeUnicode must be propagated to the last patchset part too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Fortunately patching the make* tools and their dependencies is quite rare, and even more so in patchsets. testbot/lib/WineTestBot/PatchUtils.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index c298282344..974ff8eb6b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -396,9 +396,10 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", - "MakeVulkan", "PatchedRoot", "PatchedModules", - "PatchedTests") + foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", + "MakeOpenGL", "MakeRequests", "MakeUnicode", + "MakeVulkan", + "PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -490,10 +491,12 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; - $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; - $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; - $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan}; + foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", + "MakeOpenGL", "MakeRequests", "MakeUnicode", + "MakeVulkan") + { + $Impacts->{$Field} ||= $PastImpacts->{$Field}; + } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; -- 2.20.1

1 0

[tools] testbot: Update the build timeout calculations.
by Francois Gouget Jan. 12, 2021

Jan. 12, 2021

Ever since the Wine build has been simplified there is no separate 'native' Wine build. So there is no need for the $ExeBuildNativeTimeout constant anymore. This allows renaming $ExeBuildTestTimeout to $ExeBuildTimeout, so it follows the same naming scheme as $WineBuildTimeout. Also notice that the 'exe*' and 'win*' timeout calculations have the same structure which makes sense since BuildWine() handles both. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47849 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Config.pm | 7 +++---- testbot/lib/WineTestBot/PatchUtils.pm | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index ca3e983b0f..68709e526e 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -111,8 +111,7 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildNativeTimeout = 2 * 60; -$ExeBuildTestTimeout = 7 * 60; +$ExeBuildTimeout = 7 * 60; # - For a single module $ExeModuleTimeout = 30; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index dbd14f2005..ffe0ec4cdc 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -523,9 +523,8 @@ sub GetBuildTimeout($$) if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : - $ExeBuildTestTimeout; - $ExeTimeout = ($ModuleCount ? 0 : $ExeBuildNativeTimeout) + - $ExeCount * min($ExeBuildTestTimeout, $OneBuild); + $ExeBuildTimeout; + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); } if ($WineCount) { -- 2.20.1

1 0

[tools] testbot/Engine: Fix attachment support in HandleWinePatchMLSubmission().
by Francois Gouget Jan. 12, 2021

Jan. 12, 2021

By default MIME:Parser::Filer uses the attachement's recommended filename to save it to disk. However that name is tainted which causes Perl to throw an exception. Since we don't actually care about the filename (all mailing list patches are called 'patch.diff'), simply tell the filer to generate its own filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The only reason this has not impacted the official TestBot so far is that the mailing list patches go through the patches website which (mis)handles the attachments (bug 48795) and then WinePatchesWebSubmit.pl, instead of going straight in through WinePatchesMLSubmit.pl. testbot/bin/Engine.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 48bb797cc0..db9d82d300 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -428,6 +428,7 @@ sub HandleWinePatchMLSubmission() # Process the email my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); + $Parser->filer->ignore_filename(1); my $Entity = $Parser->parse_open($FullMessageFileName); my $ErrMessage = CreatePatches()->NewPatch($Entity); if (defined $ErrMessage) -- 2.20.1

1 0