April 2024 - Wine-commits - list.winehq.org

Ziqing Hui : winegstreamer: Merge video_mpeg1 into video field.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: bb7796885177ca08444a824f5ae92ec91a14fb52 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb7796885177ca08444a824f5ae92e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 3 10:17:22 2024 +0800 winegstreamer: Merge video_mpeg1 into video field. --- dlls/winegstreamer/quartz_parser.c | 19 ++++++++----------- dlls/winegstreamer/quartz_transform.c | 2 +- dlls/winegstreamer/unixlib.h | 8 ++------ dlls/winegstreamer/wg_format.c | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 87a5c033516..8bbfee17df0 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -394,13 +394,10 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) return format->u.video.width * format->u.video.height * 3; case WG_MAJOR_TYPE_VIDEO_MPEG1: + case WG_MAJOR_TYPE_VIDEO_WMV: /* Estimated max size of a compressed video frame. * There's no way to no way to know the real upper bound, * so let's just use the decompressed size and hope it works. */ - return wg_format_get_max_size_video_raw(WG_VIDEO_FORMAT_YV12, - format->u.video_mpeg1.width, format->u.video_mpeg1.height); - - case WG_MAJOR_TYPE_VIDEO_WMV: return wg_format_get_max_size_video_raw(WG_VIDEO_FORMAT_YV12, format->u.video.width, format->u.video.height); @@ -701,11 +698,11 @@ static bool amt_from_wg_format_video_mpeg1(AM_MEDIA_TYPE *mt, const struct wg_fo mt->pbFormat = (BYTE *)video_format; memset(video_format, 0, sizeof(*video_format)); - if ((frame_time = MulDiv(10000000, format->u.video_mpeg1.fps_d, format->u.video_mpeg1.fps_n)) != -1) + if ((frame_time = MulDiv(10000000, format->u.video.fps_d, format->u.video.fps_n)) != -1) video_format->hdr.AvgTimePerFrame = frame_time; video_format->hdr.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - video_format->hdr.bmiHeader.biWidth = format->u.video_mpeg1.width; - video_format->hdr.bmiHeader.biHeight = format->u.video_mpeg1.height; + video_format->hdr.bmiHeader.biWidth = format->u.video.width; + video_format->hdr.bmiHeader.biHeight = format->u.video.height; video_format->hdr.bmiHeader.biPlanes = 1; video_format->hdr.bmiHeader.biBitCount = 12; video_format->hdr.bmiHeader.biCompression = mt->subtype.Data1; @@ -1034,10 +1031,10 @@ static bool amt_to_wg_format_video_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form } format->major_type = WG_MAJOR_TYPE_VIDEO_MPEG1; - format->u.video_mpeg1.width = video_format->hdr.bmiHeader.biWidth; - format->u.video_mpeg1.height = video_format->hdr.bmiHeader.biHeight; - format->u.video_mpeg1.fps_n = 10000000; - format->u.video_mpeg1.fps_d = video_format->hdr.AvgTimePerFrame; + format->u.video.width = video_format->hdr.bmiHeader.biWidth; + format->u.video.height = video_format->hdr.bmiHeader.biHeight; + format->u.video.fps_n = 10000000; + format->u.video.fps_d = video_format->hdr.AvgTimePerFrame; return true; } diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 784bf6f9411..ad0c3077733 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -907,7 +907,7 @@ HRESULT mpeg_video_codec_create(IUnknown *outer, IUnknown **out) static const struct wg_format input_format = { .major_type = WG_MAJOR_TYPE_VIDEO_MPEG1, - .u.video_mpeg1 = {}, + .u.video = {}, }; struct wg_transform_attrs attrs = {0}; wg_transform_t transform; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index ee5b5a0c757..2b3365834f5 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -120,7 +120,8 @@ struct wg_format * CINEPAK: width, height, fps_n, fps_d. * H264: width, height, fps_n, fps_d, profile, level, codec_data_len, codec_data. * WMV: width, height, fps_n, fps_d, codec_data_len, codec_data. - * INDEO: width, height, fps_n, fps_d, version. */ + * INDEO: width, height, fps_n, fps_d, version. + * MPEG1: width, height, fps_n, fps_d. */ struct { wg_video_format format; @@ -136,11 +137,6 @@ struct wg_format uint32_t codec_data_len; unsigned char codec_data[64]; } video; - struct - { - int32_t width, height; - uint32_t fps_n, fps_d; - } video_mpeg1; } u; }; diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 460e3d8cae5..b28dc3f22ec 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -384,10 +384,10 @@ static void wg_format_from_caps_video_mpeg1(struct wg_format *format, const GstC } format->major_type = WG_MAJOR_TYPE_VIDEO_MPEG1; - format->u.video_mpeg1.width = width; - format->u.video_mpeg1.height = height; - format->u.video_mpeg1.fps_n = fps_n; - format->u.video_mpeg1.fps_d = fps_d; + format->u.video.width = width; + format->u.video.height = height; + format->u.video.fps_n = fps_n; + format->u.video.fps_d = fps_d; } void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) @@ -844,12 +844,12 @@ static GstCaps *wg_format_to_caps_video_mpeg1(const struct wg_format *format) gst_caps_set_simple(caps, "mpegversion", G_TYPE_INT, 1, NULL); gst_caps_set_simple(caps, "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); gst_caps_set_simple(caps, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); - if (format->u.video_mpeg1.width) - gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_mpeg1.width, NULL); - if (format->u.video_mpeg1.height) - gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_mpeg1.height, NULL); - if (format->u.video_mpeg1.fps_d || format->u.video.fps_n) - gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_mpeg1.fps_n, format->u.video_mpeg1.fps_d, NULL); + if (format->u.video.width) + gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video.width, NULL); + if (format->u.video.height) + gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video.height, NULL); + if (format->u.video.fps_d || format->u.video.fps_n) + gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video.fps_n, format->u.video.fps_d, NULL); return caps; }

1 0

Brendan McGrath : winegstreamer: Pass uri to wg_parser when available.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: 9e1f5f6d11b14b3ee38050a1b45a55f5c71146c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e1f5f6d11b14b3ee38050a1b45a55… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 9 11:31:50 2024 +0000 winegstreamer: Pass uri to wg_parser when available. This is a partial cherry-pick of eda34f74c6ad from Proton. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 3 ++- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_parser.c | 12 ++++++++++++ dlls/winegstreamer/wm_reader.c | 4 ++-- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e03c779f750..4bdef90e045 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -52,7 +52,7 @@ void wg_sample_queue_flush(struct wg_sample_queue *queue, bool all); wg_parser_t wg_parser_create(bool output_compressed); void wg_parser_destroy(wg_parser_t parser); -HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size); +HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size, const WCHAR *uri); void wg_parser_disconnect(wg_parser_t parser); bool wg_parser_get_next_read_offset(wg_parser_t parser, uint64_t *offset, uint32_t *size); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index cabcae3946d..4d38a2bf66c 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -94,12 +94,13 @@ void wg_parser_destroy(wg_parser_t parser) WINE_UNIX_CALL(unix_wg_parser_destroy, &parser); } -HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size) +HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size, const WCHAR *uri) { struct wg_parser_connect_params params = { .parser = parser, .file_size = file_size, + .uri = uri, }; TRACE("parser %#I64x, file_size %I64u.\n", parser, file_size); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 8acfa75f335..d4b7e9a0051 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1654,7 +1654,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc object->state = SOURCE_OPENING; - if (FAILED(hr = wg_parser_connect(parser, object->file_size))) + if (FAILED(hr = wg_parser_connect(parser, object->file_size, context->url))) goto fail; stream_count = wg_parser_get_stream_count(parser); diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 8bbfee17df0..a64a906d4b8 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1529,7 +1529,7 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons filter->sink_connected = true; filter->read_thread = CreateThread(NULL, 0, read_thread, filter, 0, NULL); - if (FAILED(hr = wg_parser_connect(filter->wg_parser, file_size))) + if (FAILED(hr = wg_parser_connect(filter->wg_parser, file_size, NULL))) goto err; if (!filter->init_gst(filter)) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 2b3365834f5..a169cac55dd 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -194,6 +194,7 @@ struct wg_parser_create_params struct wg_parser_connect_params { wg_parser_t parser; + const WCHAR *uri; UINT64 file_size; }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 31538624ef6..db16971cd4f 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -70,6 +70,7 @@ struct wg_parser guint64 file_size, start_offset, next_offset, stop_offset; guint64 next_pull_offset; + gchar *uri; pthread_t push_thread; @@ -1548,11 +1549,21 @@ static NTSTATUS wg_parser_connect(void *args) GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); const struct wg_parser_connect_params *params = args; struct wg_parser *parser = get_parser(params->parser); + const WCHAR *uri = params->uri; unsigned int i; int ret; parser->file_size = params->file_size; parser->sink_connected = true; + if (uri) + { + parser->uri = malloc(wcslen(uri) * 3 + 1); + ntdll_wcstoumbs(uri, wcslen(uri) + 1, parser->uri, wcslen(uri) * 3 + 1, FALSE); + } + else + { + parser->uri = NULL; + } if (!parser->bus) { @@ -1818,6 +1829,7 @@ static NTSTATUS wg_parser_destroy(void *args) pthread_cond_destroy(&parser->read_cond); pthread_cond_destroy(&parser->read_done_cond); + free(parser->uri); free(parser); return S_OK; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 0cf0dd0ac9f..1eb9d2a245f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1464,7 +1464,7 @@ static HRESULT init_stream(struct wm_reader *reader) goto out_destroy_parser; } - if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size))) + if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, NULL))) { ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread; @@ -1569,7 +1569,7 @@ static HRESULT reinit_stream(struct wm_reader *reader, bool read_compressed) goto out_destroy_parser; } - if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size))) + if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, NULL))) { ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread;

1 0

Brendan McGrath : winegstreamer: Respond to the URI query.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: 752126d60ef8249beee57b6d5f9f7ccde84d0d58 URL: https://gitlab.winehq.org/wine/wine/-/commit/752126d60ef8249beee57b6d5f9f7c… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri Mar 29 18:09:05 2024 +1100 winegstreamer: Respond to the URI query. The default behaviour for gstreamer is to use the URI to create the stream-id. Without this, gstreamer creates a random stream-id per pad which can cause inconsistent ordering on the decodebin src pads. This in turn can cause issues, for example, with audio stream selection. --- dlls/winegstreamer/wg_parser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index db16971cd4f..679500b617e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1244,6 +1244,15 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); return TRUE; + case GST_QUERY_URI: + if (parser->uri) + { + GST_LOG_OBJECT(pad, "Responding with %" GST_PTR_FORMAT, query); + gst_query_set_uri(query, parser->uri); + return TRUE; + } + return FALSE; + default: GST_WARNING("Unhandled query type %s.", GST_QUERY_TYPE_NAME(query)); return FALSE;

1 0

Henri Verbeet : wined3d: Pass a shader_glsl_priv structure to shader_glsl_generate_fragment_shader().
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: a1494deef30057cbab0826c655ef6e34ba179f3a URL: https://gitlab.winehq.org/wine/wine/-/commit/a1494deef30057cbab0826c655ef6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 11:39:09 2024 +0200 wined3d: Pass a shader_glsl_priv structure to shader_glsl_generate_fragment_shader(). Much like we do for e.g. shader_glsl_generate_vertex_shader(). --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 933f134830a..4b857d33f73 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7661,13 +7661,14 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_gl *context_gl, - struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader, const struct ps_compile_args *args, - struct ps_np2fixup_info *np2fixup_info) + struct shader_glsl_priv *priv, const struct wined3d_shader *shader, + const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_string_buffer *buffer = &priv->shader_buffer; const char *prefix = shader_glsl_get_prefix(version->type); BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); unsigned int i, extra_constants_needed = 0; @@ -8537,8 +8538,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g } static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context_gl, - struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - struct wined3d_shader *shader, + struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { struct glsl_ps_compiled_shader *gl_shaders, *new_array; @@ -8602,8 +8602,8 @@ static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context memset(np2fixup, 0, sizeof(*np2fixup)); *np2fixup_info = args->np2_fixup ? np2fixup : NULL; - string_buffer_clear(buffer); - ret = shader_glsl_generate_fragment_shader(context_gl, buffer, string_buffers, shader, args, np2fixup); + string_buffer_clear(&priv->shader_buffer); + ret = shader_glsl_generate_fragment_shader(context_gl, priv, shader, args, np2fixup); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret; @@ -10368,8 +10368,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; find_ps_compile_args(state, pshader, context_gl->c.stream_info.position_transformed, &ps_compile_args, &context_gl->c); - ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, - pshader, &ps_compile_args, &np2fixup_info); + ps_id = find_glsl_fragment_shader(context_gl, priv, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; } else if (priv->fragment_pipe == &glsl_fragment_pipe

1 0

Henri Verbeet : wined3d: Pass a shader_glsl_priv structure to shader_glsl_generate_compute_shader().
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: a0b79ba35c43c441db458c5aaa1f2b4119c7bf1d URL: https://gitlab.winehq.org/wine/wine/-/commit/a0b79ba35c43c441db458c5aaa1f2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 11:39:09 2024 +0200 wined3d: Pass a shader_glsl_priv structure to shader_glsl_generate_compute_shader(). --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b857d33f73..886be9eea45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8496,12 +8496,13 @@ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_con /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_gl *context_gl, - struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader) + struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; + struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_string_buffer *buffer = &priv->shader_buffer; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -10177,7 +10178,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, TRACE("Compiling compute shader %p.\n", shader); string_buffer_clear(buffer); - shader_id = shader_glsl_generate_compute_shader(context_gl, buffer, &priv->string_buffers, shader); + shader_id = shader_glsl_generate_compute_shader(context_gl, priv, shader); gl_shaders[shader_data->num_gl_shaders++].id = shader_id; program_id = GL_EXTCALL(glCreateProgram());

1 0

Henri Verbeet : wined3d: Introduce the "glsl-vkd3d" shader backend.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: bcb7396adf22579e53d771671d1ae04be90c0761 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcb7396adf22579e53d771671d1ae0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 11:39:09 2024 +0200 wined3d: Introduce the "glsl-vkd3d" shader backend. Note that this won't compile very many shaders until vkd3d-shader's GLSL support is much more complete. --- dlls/wined3d/glsl_shader.c | 222 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader.c | 22 ++++ dlls/wined3d/shader_spirv.c | 22 ---- dlls/wined3d/wined3d_main.c | 5 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 252 insertions(+), 22 deletions(-)

1 0

Alexandre Julliard : include: Update a couple of RPC structures.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: 522cecf67cd81496bc56a35fc60a799f3f8b79de URL: https://gitlab.winehq.org/wine/wine/-/commit/522cecf67cd81496bc56a35fc60a79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:26:51 2024 +0200 include: Update a couple of RPC structures. --- dlls/rpcrt4/ndr_clientserver.c | 6 +-- dlls/rpcrt4/tests/generated.c | 12 +++--- dlls/rpcrt4/tests/ndr_marshall.c | 10 ++--- include/rpcndr.h | 81 +++++++++++++++++++++++++++++++--------- include/rpcproxy.h | 9 +---- 5 files changed, 79 insertions(+), 39 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index d4ba2ffa5e0..e67046e4c08 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -78,7 +78,6 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg->PointerLength = 0; pStubMsg->fInDontFree = 0; pStubMsg->fDontCallFreeInst = 0; - pStubMsg->fInOnlyParam = 0; pStubMsg->fHasReturn = 0; pStubMsg->fHasExtensions = 0; pStubMsg->fHasNewCorrDesc = 0; @@ -89,7 +88,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg->fHasMemoryValidateCallback = 0; pStubMsg->fInFree = 0; pStubMsg->fNeedMCCP = 0; - pStubMsg->fUnused = 0; + pStubMsg->fUnused2 = 0; pStubMsg->dwDestContext = MSHCTX_DIFFERENTMACHINE; pStubMsg->pvDestContext = NULL; pStubMsg->pRpcChannelBuffer = NULL; @@ -132,7 +131,6 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M pStubMsg->PointerLength = 0; pStubMsg->fInDontFree = 0; pStubMsg->fDontCallFreeInst = 0; - pStubMsg->fInOnlyParam = 0; pStubMsg->fHasReturn = 0; pStubMsg->fHasExtensions = 0; pStubMsg->fHasNewCorrDesc = 0; @@ -142,7 +140,7 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M pStubMsg->fHasMemoryValidateCallback = 0; pStubMsg->fInFree = 0; pStubMsg->fNeedMCCP = 0; - pStubMsg->fUnused = 0; + pStubMsg->fUnused2 = 0; pStubMsg->dwDestContext = MSHCTX_DIFFERENTMACHINE; pStubMsg->pvDestContext = NULL; pStubMsg->pRpcChannelBuffer = NULL; diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 53416566418..57e2a387cf1 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -686,9 +686,9 @@ static void test_pack_MIDL_SYNTAX_INFO(void) TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, aUserMarshalQuadruple, 8) TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, aUserMarshalQuadruple, 8) TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, aUserMarshalQuadruple, 56) - TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, pReserved1, 8) - TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, pReserved1, 8) - TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, pReserved1, 64) + TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, pMethodProperties, 8) + TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, pMethodProperties, 8) + TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, pMethodProperties, 64) TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, pReserved2, 8) TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, pReserved2, 8) TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, pReserved2, 72) @@ -1548,9 +1548,9 @@ static void test_pack_MIDL_SYNTAX_INFO(void) TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, aUserMarshalQuadruple, 4) TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, aUserMarshalQuadruple, 4) TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, aUserMarshalQuadruple, 36) - TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, pReserved1, 4) - TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, pReserved1, 4) - TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, pReserved1, 40) + TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, pMethodProperties, 4) + TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, pMethodProperties, 4) + TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, pMethodProperties, 40) TEST_FIELD_SIZE (MIDL_SYNTAX_INFO, pReserved2, 4) TEST_FIELD_ALIGN (MIDL_SYNTAX_INFO, pReserved2, 4) TEST_FIELD_OFFSET(MIDL_SYNTAX_INFO, pReserved2, 44) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d86f3b0556e..e16c8d40e93 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1728,11 +1728,11 @@ static void test_common_stub_data( const char *prefix, const MIDL_STUB_MESSAGE * ok(stubMsg->fBufferValid == 0, "%s: fBufferValid should have been set to 0 instead of %d\n", prefix, stubMsg->fBufferValid); TEST_ZERO(fNeedMCCP, "%d"); - ok(stubMsg->fUnused == 0 || - stubMsg->fUnused == -2, /* Vista */ - "%s: fUnused should have been set to 0 or -2 instead of %d\n", prefix, stubMsg->fUnused); - ok(stubMsg->fUnused2 == 0xffffcccc, "%s: fUnused2 should have been 0xffffcccc instead of 0x%x\n", - prefix, stubMsg->fUnused2); + ok(stubMsg->fUnused2 == 0 || + stubMsg->fUnused2 == -2, /* Vista */ + "%s: fUnused2 should have been set to 0 or -2 instead of %d\n", prefix, stubMsg->fUnused2); + ok(stubMsg->fUnused3 == 0xffffcccc, "%s: fUnused3 should have been 0xffffcccc instead of 0x%x\n", + prefix, stubMsg->fUnused3); ok(stubMsg->dwDestContext == MSHCTX_DIFFERENTMACHINE, "%s: dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %ld\n", prefix, stubMsg->dwDestContext); diff --git a/include/rpcndr.h b/include/rpcndr.h index 15698a8778a..93ebb0a4aa7 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -71,6 +71,11 @@ typedef INT64 hyper; typedef UINT64 MIDL_uhyper; typedef unsigned char boolean; +#ifndef _ERROR_STATUS_T_DEFINED +typedef ULONG error_status_t; +#define _ERROR_STATUS_T_DEFINED +#endif + #define __RPC_CALLEE WINAPI #define RPC_VAR_ENTRY WINAPIV #define NDR_SHAREABLE static @@ -179,7 +184,7 @@ typedef struct _MIDL_STUB_MESSAGE ULONG PointerLength; unsigned int fInDontFree:1; unsigned int fDontCallFreeInst:1; - unsigned int fInOnlyParam:1; + unsigned int fUnused1 :1; unsigned int fHasReturn:1; unsigned int fHasExtensions:1; unsigned int fHasNewCorrDesc:1; @@ -190,8 +195,8 @@ typedef struct _MIDL_STUB_MESSAGE unsigned int fHasMemoryValidateCallback:1; unsigned int fInFree:1; unsigned int fNeedMCCP:1; - int fUnused:3; - int fUnused2:16; + int fUnused2:3; + int fUnused3:16; DWORD dwDestContext; void *pvDestContext; NDR_SCONTEXT *SavedContextHandles; @@ -303,6 +308,39 @@ typedef struct _COMM_FAULT_OFFSETS short FaultOffset; } COMM_FAULT_OFFSETS; +typedef enum _IDL_CS_CONVERT +{ + IDL_CS_NO_CONVERT, + IDL_CS_IN_PLACE_CONVERT, + IDL_CS_NEW_BUFFER_CONVERT +} IDL_CS_CONVERT; + +typedef void (__RPC_USER * CS_TYPE_NET_SIZE_ROUTINE)(RPC_BINDING_HANDLE,ULONG,ULONG,IDL_CS_CONVERT*,ULONG*,error_status_t*); +typedef void (__RPC_USER * CS_TYPE_TO_NETCS_ROUTINE)(RPC_BINDING_HANDLE,ULONG,void*,ULONG,byte*,ULONG*,error_status_t*); +typedef void (__RPC_USER * CS_TYPE_LOCAL_SIZE_ROUTINE)(RPC_BINDING_HANDLE,ULONG,ULONG,IDL_CS_CONVERT*,ULONG*,error_status_t*); +typedef void (__RPC_USER * CS_TYPE_FROM_NETCS_ROUTINE)(RPC_BINDING_HANDLE,ULONG,byte*,ULONG,ULONG,void*,ULONG*,error_status_t*); +typedef void (__RPC_USER * CS_TAG_GETTING_ROUTINE)(RPC_BINDING_HANDLE,int,ULONG*,ULONG*,ULONG*,error_status_t*); + +typedef struct _NDR_CS_SIZE_CONVERT_ROUTINES +{ + CS_TYPE_NET_SIZE_ROUTINE pfnNetSize; + CS_TYPE_TO_NETCS_ROUTINE pfnToNetCs; + CS_TYPE_LOCAL_SIZE_ROUTINE pfnLocalSize; + CS_TYPE_FROM_NETCS_ROUTINE pfnFromNetCs; +} NDR_CS_SIZE_CONVERT_ROUTINES; + +typedef struct _NDR_CS_ROUTINES +{ + NDR_CS_SIZE_CONVERT_ROUTINES *pSizeConvertRoutines; + CS_TAG_GETTING_ROUTINE *pTagGettingRoutines; +} NDR_CS_ROUTINES; + +typedef struct _NDR_EXPR_DESC +{ + const unsigned short *pOffset; + PFORMAT_STRING pFormatExpr; +} NDR_EXPR_DESC; + typedef struct _MIDL_STUB_DESC { void *RpcInterfaceInformation; @@ -326,22 +364,36 @@ typedef struct _MIDL_STUB_DESC const USER_MARSHAL_ROUTINE_QUADRUPLE *aUserMarshalQuadruple; const NDR_NOTIFY_ROUTINE *NotifyRoutineTable; ULONG_PTR mFlags; - ULONG_PTR Reserved3; - ULONG_PTR Reserved4; - ULONG_PTR Reserved5; + const NDR_CS_ROUTINES *CsRoutineTables; + void *ProxyServerInfo; + const NDR_EXPR_DESC *pExprInfo; } MIDL_STUB_DESC; typedef const MIDL_STUB_DESC *PMIDL_STUB_DESC; typedef struct _MIDL_FORMAT_STRING { short Pad; -#if defined(__GNUC__) - unsigned char Format[0]; -#else - unsigned char Format[1]; -#endif + unsigned char Format[]; } MIDL_FORMAT_STRING; +typedef struct _MIDL_METHOD_PROPERTY +{ + ULONG Id; + ULONG_PTR Value; +} MIDL_METHOD_PROPERTY, *PMIDL_METHOD_PROPERTY; + +typedef struct _MIDL_METHOD_PROPERTY_MAP +{ + ULONG Count; + const MIDL_METHOD_PROPERTY *Properties; +} MIDL_METHOD_PROPERTY_MAP, *PMIDL_METHOD_PROPERTY_MAP; + +typedef struct _MIDL_INTERFACE_METHOD_PROPERTIES +{ + unsigned short MethodCount; + const MIDL_METHOD_PROPERTY_MAP * const *MethodProperties; +} MIDL_INTERFACE_METHOD_PROPERTIES; + typedef struct _MIDL_SYNTAX_INFO { RPC_SYNTAX_IDENTIFIER TransferSyntax; @@ -350,7 +402,7 @@ typedef struct _MIDL_SYNTAX_INFO const unsigned short* FmtStringOffset; PFORMAT_STRING TypeString; const void* aUserMarshalQuadruple; - ULONG_PTR pReserved1; + const MIDL_INTERFACE_METHOD_PROPERTIES *pMethodProperties; ULONG_PTR pReserved2; } MIDL_SYNTAX_INFO, *PMIDL_SYNTAX_INFO; @@ -443,11 +495,6 @@ typedef struct _FULL_PTR_XLAT_TABLES { struct IRpcStubBuffer; -#ifndef _ERROR_STATUS_T_DEFINED -typedef ULONG error_status_t; -#define _ERROR_STATUS_T_DEFINED -#endif - typedef void * NDR_CCONTEXT; typedef struct _SCONTEXT_QUEUE { diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 8d4ab259af5..7c52101e1b1 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -17,8 +17,7 @@ */ #ifndef __RPCPROXY_H_VERSION__ -/* FIXME: Find an appropriate version number. I guess something is better than nothing */ -#define __RPCPROXY_H_VERSION__ ( 399 ) +#define __RPCPROXY_H_VERSION__ (477) #endif #ifndef __WINE_RPCPROXY_H @@ -78,11 +77,7 @@ typedef struct tagCInterfaceProxyHeader typedef struct tagCInterfaceProxyVtbl { CInterfaceProxyHeader header; -#if defined(__GNUC__) - void *Vtbl[0]; -#else - void *Vtbl[1]; -#endif + void *Vtbl[]; } CInterfaceProxyVtbl; typedef void (__RPC_STUB *PRPC_STUB_FUNCTION)(

1 0

Alexandre Julliard : rpcrt4: Add a wrapper for client calls from stubless proxies.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: a8ad671baed45325f6c6987f37e872767ed8f59f URL: https://gitlab.winehq.org/wine/wine/-/commit/a8ad671baed45325f6c6987f37e872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 13:50:16 2024 +0200 rpcrt4: Add a wrapper for client calls from stubless proxies. --- dlls/rpcrt4/cproxy.c | 40 ++++++++++++---------------------------- dlls/rpcrt4/ndr_stubless.c | 12 ++++++++++++ 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 8d34182ca7c..243d16a5cd0 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -103,18 +103,13 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "movq %rdx,0x48(%rsp)\n\t" "movq %r8,0x50(%rsp)\n\t" "movq %r9,0x58(%rsp)\n\t" - "leaq 0x40(%rsp),%r8\n\t" /* &This */ - "movq (%rcx),%rcx\n\t" /* This->lpVtbl */ - "movq -0x10(%rcx),%rcx\n\t" /* MIDL_STUBLESS_PROXY_INFO */ - "movq 0x10(%rcx),%rdx\n\t" /* info->FormatStringOffset */ - "movzwq (%rdx,%r10,2),%rdx\n\t" /* FormatStringOffset[index] */ - "addq 8(%rcx),%rdx\n\t" /* info->ProcFormatString + offset */ - "movq (%rcx),%rcx\n\t" /* info->pStubDesc */ + "leaq 0x40(%rsp),%rdx\n\t" /* args */ "movq %xmm1,0x20(%rsp)\n\t" "movq %xmm2,0x28(%rsp)\n\t" "movq %xmm3,0x30(%rsp)\n\t" - "leaq 0x18(%rsp),%r9\n\t" /* fpu_args */ - "call " __ASM_NAME("NdrpClientCall2") "\n\t" + "leaq 0x18(%rsp),%r8\n\t" /* fpu_regs */ + "movl %r10d,%ecx\n\t" /* index */ + "call " __ASM_NAME("ndr_stubless_client_call") "\n\t" "addq $0x38,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x38\n\t") "ret" ); @@ -138,17 +133,11 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "mov fp, sp\n\t" ".seh_save_sp fp\n\t" ".seh_endprologue\n\t" - "ldr r0, [r0]\n\t" /* This->lpVtbl */ - "ldr r0, [r0,#-8]\n\t" /* MIDL_STUBLESS_PROXY_INFO */ - "ldr r1, [r0,#8]\n\t" /* info->FormatStringOffset */ - "ldrh r1, [r1,ip]\n\t" /* info->FormatStringOffset[index] */ - "ldr ip, [r0,#4]\n\t" /* info->ProcFormatString */ - "add r1, ip\n\t" /* info->ProcFormatString + offset */ - "ldr r0, [r0]\n\t" /* info->pStubDesc */ - "add r2, sp, #8\n\t" /* stack_top */ + "mov r0, ip\n\t" /* index */ + "add r1, sp, #8\n\t" /* args */ "vpush {s0-s15}\n\t" /* store the s0-s15/d0-d7 arguments */ - "mov r3, sp\n\t" /* fpu_stack */ - "bl NdrpClientCall2\n\t" + "mov r2, sp\n\t" /* fpu_regs */ + "bl ndr_stubless_client_call\n\t" "mov sp, fp\n\t" "pop {fp,lr}\n\t" "add sp, #16\n\t" @@ -177,15 +166,10 @@ __ASM_GLOBAL_FUNC( call_stubless_func, "stp x2, x3, [sp, #0x60]\n\t" "stp x4, x5, [sp, #0x70]\n\t" "stp x6, x7, [sp, #0x80]\n\t" - "ldr x0, [x0]\n\t" /* This->lpVtbl */ - "ldr x0, [x0, #-16]\n\t" /* MIDL_STUBLESS_PROXY_INFO */ - "ldp x1, x4, [x0, #8]\n\t" /* info->ProcFormatString, FormatStringOffset */ - "ldrh w4, [x4, x16, lsl #1]\n\t" /* info->FormatStringOffset[index] */ - "add x1, x1, x4\n\t" /* info->ProcFormatString + offset */ - "ldr x0, [x0]\n\t" /* info->pStubDesc */ - "add x2, sp, #0x50\n\t" /* stack */ - "add x3, sp, #0x10\n\t" /* fpu_stack */ - "bl NdrpClientCall2\n\t" + "mov w0, w16\n\t" /* index */ + "add x1, sp, #0x50\n\t" /* args */ + "add x2, sp, #0x10\n\t" /* fpu_regs */ + "bl ndr_stubless_client_call\n\t" "ldp x29, x30, [sp], #0x90\n\t" "ret" ) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index cbb8b617912..bed3b94a021 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1277,6 +1277,18 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns } #endif +#ifndef __i386__ +LONG_PTR WINAPI ndr_stubless_client_call( unsigned int index, void **args, void **fpu_regs ) +{ + void **this = args[0]; + const void **vtbl = *this; + const MIDL_STUBLESS_PROXY_INFO *proxy_info = vtbl[-2]; + const unsigned char *format = proxy_info->ProcFormatString + proxy_info->FormatStringOffset[index]; + + return NdrpClientCall2( proxy_info->pStubDesc, format, args, fpu_regs ); +} +#endif /* __i386__ */ + static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, unsigned short number_of_params)

1 0

Alexandre Julliard : rpcrt4: Move the FPU register conversion to the stubless proxy wrapper.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: d9067a8ae45190b1195efbae352a2015d8af48f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9067a8ae45190b1195efbae352a20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 14:15:13 2024 +0200 rpcrt4: Move the FPU register conversion to the stubless proxy wrapper. --- dlls/rpcrt4/ndr_stubless.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bed3b94a021..5189851f8e9 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -913,19 +913,6 @@ LONG_PTR WINAPI NdrpClientCall2( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForm const NDR_PROC_HEADER_EXTS *pExtensions = (const NDR_PROC_HEADER_EXTS *)pFormat; ext_flags = pExtensions->Flags2; pFormat += pExtensions->Size; -#ifdef __x86_64__ - if (pExtensions->Size > sizeof(*pExtensions) && fpu_stack) - { - int i; - unsigned short fpu_mask = *(unsigned short *)(pExtensions + 1); - for (i = 0; i < 4; i++, fpu_mask >>= 2) - switch (fpu_mask & 3) - { - case 1: *(float *)&stack_top[i] = *(float *)&fpu_stack[i]; break; - case 2: *(double *)&stack_top[i] = *(double *)&fpu_stack[i]; break; - } - } -#endif } } else @@ -1284,6 +1271,25 @@ LONG_PTR WINAPI ndr_stubless_client_call( unsigned int index, void **args, void const void **vtbl = *this; const MIDL_STUBLESS_PROXY_INFO *proxy_info = vtbl[-2]; const unsigned char *format = proxy_info->ProcFormatString + proxy_info->FormatStringOffset[index]; + const NDR_PROC_HEADER *proc = (const NDR_PROC_HEADER *)format; + + if (is_oicf_stubdesc( proxy_info->pStubDesc )) + { + unsigned int hdr_size = (proc->Oi_flags & Oi_HAS_RPCFLAGS) ? sizeof(NDR_PROC_HEADER_RPC) : sizeof(NDR_PROC_HEADER); + const NDR_PROC_PARTIAL_OIF_HEADER *hdr = (const NDR_PROC_PARTIAL_OIF_HEADER *)(format + hdr_size); + + if (hdr->Oi2Flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *ext = (const NDR_PROC_HEADER_EXTS *)(hdr + 1); + if (ext->Size > sizeof(*ext)) + { +#ifdef __x86_64__ + unsigned short fpu_mask = *(unsigned short *)(ext + 1); + for (int i = 0; i < 4; i++, fpu_mask >>= 2) if (fpu_mask & 3) args[i] = fpu_regs[i]; +#endif + } + } + } return NdrpClientCall2( proxy_info->pStubDesc, format, args, fpu_regs ); }

1 0

Alexandre Julliard : rpcrt4: Remap registers to the stack for stubless proxies on ARM platforms.
by Alexandre Julliard 23 Apr '24

23 Apr '24

Module: wine Branch: master Commit: 889767ce35ab1e26e5a910d670db37c143043f9a URL: https://gitlab.winehq.org/wine/wine/-/commit/889767ce35ab1e26e5a910d670db37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 14:30:51 2024 +0200 rpcrt4: Remap registers to the stack for stubless proxies on ARM platforms. --- dlls/rpcrt4/ndr_stubless.c | 59 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 5189851f8e9..6973a3f80ab 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1061,10 +1061,10 @@ __ASM_GLOBAL_FUNC( NdrClientCall2, #endif #if defined(__aarch64__) || defined(__arm__) -static void __attribute__((used)) assign_args( ULONG_PTR *args, ULONG_PTR *regs, ULONG_PTR *stack, - const NDR_PROC_HEADER_EXTS *ext) +static void __attribute__((used)) args_stack_to_regs( void **args, void **regs, void **stack, + const NDR_PROC_HEADER_EXTS *ext ) { - unsigned int i, size, count; + unsigned int i, size, count, pos; unsigned char *data; if (!ext) return; @@ -1072,21 +1072,54 @@ static void __attribute__((used)) assign_args( ULONG_PTR *args, ULONG_PTR *regs, data = (unsigned char *)(ext + 1); size = min( ext->Size - sizeof(*ext) - 3, data[2] ); data += 3; - for (i = 0; i < size; i++) + for (i = pos = 0; i < size; i++, pos++) { if (data[i] < 0x80) continue; - else if (data[i] < 0x94) regs[data[i] - 0x80] = args[i]; + else if (data[i] < 0x94) regs[data[i] - 0x80] = args[pos]; else if (data[i] == 0x9d) /* repeat */ { if (i + 3 >= size) break; count = data[i + 2] + (data[i + 3] << 8); - memcpy( &stack[i + (signed char)data[i + 1]], &args[i], count * sizeof(*args) ); + memcpy( &stack[pos + (signed char)data[i + 1]], &args[pos], count * sizeof(*args) ); + pos += count - 1; i += 3; } else if (data[i] < 0xa0) continue; - else stack[i + (signed char)data[i]] = args[i]; + else stack[pos + (signed char)data[i]] = args[pos]; } } + +static void **args_regs_to_stack( void **regs, void **fpu_regs, const NDR_PROC_HEADER_EXTS *ext ) +{ + static const unsigned int nb_gpregs = sizeof(void *); /* 4 gpregs on arm32, 8 on arm64 */ + unsigned int i, size, count, pos, params; + unsigned char *data; + void **stack, **args = regs + nb_gpregs; + + if (ext->Size < sizeof(*ext) + 3) return NULL; + data = (unsigned char *)(ext + 1); + params = data[0] + (data[1] << 8); + if (!(stack = malloc( params * sizeof(*stack) ))) return NULL; + size = min( ext->Size - sizeof(*ext) - 3, data[2] ); + data += 3; + for (i = pos = 0; i < size; i++, pos++) + { + if (data[i] < 0x80) continue; + else if (data[i] < 0x80 + nb_gpregs) stack[pos] = regs[data[i] - 0x80]; + else if (data[i] < 0x94) stack[pos] = fpu_regs[data[i] - 0x80 - nb_gpregs]; + else if (data[i] == 0x9d) /* repeat */ + { + if (i + 3 >= size) break; + count = data[i + 2] + (data[i + 3] << 8); + memcpy( &stack[pos], &args[pos + (signed char)data[i + 1]], count * sizeof(*args) ); + pos += count - 1; + i += 3; + } + else if (data[i] < 0xa0) continue; + else stack[pos] = args[pos + (signed char)data[i]]; + } + return stack; +} #endif /* Calls a function with the specified arguments, restoring the stack @@ -1215,7 +1248,7 @@ __ASM_GLOBAL_FUNC( call_server_func, "mov r0, r1\n\t" /* args */ "add r1, sp, #8\n\t" /* regs */ "add r2, r1, #20*4\n\t" /* stack */ - "bl assign_args\n\t" + "bl args_stack_to_regs\n\t" "add sp, sp, #8\n\t" "pop {r0-r3}\n\t" "vpop {s0-s15}\n\t" @@ -1240,7 +1273,7 @@ __ASM_GLOBAL_FUNC( call_server_func, "mov x0, x1\n\t" /* args */ "mov x1, sp\n\t" /* regs */ "add x2, sp, #16*8\n\t" /* stack */ - "bl assign_args\n\t" + "bl args_stack_to_regs\n\t" "ldp x2, x3, [sp, #0x10]\n\t" "ldp x4, x5, [sp, #0x20]\n\t" "ldp x6, x7, [sp, #0x30]\n\t" @@ -1272,6 +1305,8 @@ LONG_PTR WINAPI ndr_stubless_client_call( unsigned int index, void **args, void const MIDL_STUBLESS_PROXY_INFO *proxy_info = vtbl[-2]; const unsigned char *format = proxy_info->ProcFormatString + proxy_info->FormatStringOffset[index]; const NDR_PROC_HEADER *proc = (const NDR_PROC_HEADER *)format; + void **stack_top = args; + LONG_PTR ret; if (is_oicf_stubdesc( proxy_info->pStubDesc )) { @@ -1286,12 +1321,16 @@ LONG_PTR WINAPI ndr_stubless_client_call( unsigned int index, void **args, void #ifdef __x86_64__ unsigned short fpu_mask = *(unsigned short *)(ext + 1); for (int i = 0; i < 4; i++, fpu_mask >>= 2) if (fpu_mask & 3) args[i] = fpu_regs[i]; +#else + stack_top = args_regs_to_stack( args, fpu_regs, ext ); #endif } } } - return NdrpClientCall2( proxy_info->pStubDesc, format, args, fpu_regs ); + ret = NdrpClientCall2( proxy_info->pStubDesc, format, stack_top, fpu_regs ); + if (stack_top != args) free( stack_top ); + return ret; } #endif /* __i386__ */

1 0