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

Gopal Prasad : winewayland.drv: Set wayland app-id from the process name.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: dbc00aecec22efb6bf0e3f562ed4a79a0d4cb47f URL: https://gitlab.winehq.org/wine/wine/-/commit/dbc00aecec22efb6bf0e3f562ed4a7… Author: Gopal Prasad <llyyr(a)yukari.in> Date: Wed Feb 28 08:05:50 2024 +0530 winewayland.drv: Set wayland app-id from the process name. Co-authored-by: Ryan Hendrickson <ryan.hendrickson(a)alum.mit.edu> Co-authored-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/wayland_surface.c | 3 +++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index e212e74362a..9f3ad584f4f 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -253,6 +253,9 @@ void wayland_surface_make_toplevel(struct wayland_surface *surface) if (!surface->xdg_toplevel) goto err; xdg_toplevel_add_listener(surface->xdg_toplevel, &xdg_toplevel_listener, surface->hwnd); + if (process_name) + xdg_toplevel_set_app_id(surface->xdg_toplevel, process_name); + wl_surface_commit(surface->wl_surface); wl_display_flush(process_wayland.wl_display); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 6811b34ab1a..613aae18b22 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -51,6 +51,7 @@ * Globals */ +extern char *process_name; extern struct wayland process_wayland; /********************************************************************** diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 7d02497295a..6bddbb509b6 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -24,11 +24,15 @@ #include "config.h" +#include <stdlib.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "waylanddrv.h" +char *process_name = NULL; + static const struct user_driver_funcs waylanddrv_funcs = { .pClipCursor = WAYLAND_ClipCursor, @@ -46,12 +50,42 @@ static const struct user_driver_funcs waylanddrv_funcs = .pwine_get_wgl_driver = WAYLAND_wine_get_wgl_driver, }; +static void wayland_init_process_name(void) +{ + WCHAR *p, *appname; + WCHAR appname_lower[MAX_PATH]; + DWORD appname_len; + DWORD appnamez_size; + DWORD utf8_size; + int i; + + appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if ((p = wcsrchr(appname, '/'))) appname = p + 1; + if ((p = wcsrchr(appname, '\\'))) appname = p + 1; + appname_len = lstrlenW(appname); + + if (appname_len == 0 || appname_len >= MAX_PATH) return; + + for (i = 0; appname[i]; i++) appname_lower[i] = RtlDowncaseUnicodeChar(appname[i]); + appname_lower[i] = 0; + + appnamez_size = (appname_len + 1) * sizeof(WCHAR); + + if (!RtlUnicodeToUTF8N(NULL, 0, &utf8_size, appname_lower, appnamez_size) && + (process_name = malloc(utf8_size))) + { + RtlUnicodeToUTF8N(process_name, utf8_size, &utf8_size, appname_lower, appnamez_size); + } +} + static NTSTATUS waylanddrv_unix_init(void *arg) { /* Set the user driver functions now so that they are available during * our initialization. We clear them on error. */ __wine_set_user_driver(&waylanddrv_funcs, WINE_GDI_DRIVER_VERSION); + wayland_init_process_name(); + if (!wayland_process_init()) goto err; return 0;

1 0

Dmitry Timoshkov : widl: Set the lowest bit in the param name to indicate whether type description follows the name.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: 202acc52eb487b5870aabef854750c620799a178 URL: https://gitlab.winehq.org/wine/wine/-/commit/202acc52eb487b5870aabef854750c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 25 15:05:03 2016 +0800 widl: Set the lowest bit in the param name to indicate whether type description follows the name. It looks like the lowest bit in the param name offset actually indicates whether type description follows the name, and since the name offsets are always aligned that makes sense. This makes oleview.exe from PSDK running under Windows7 correctly show mix of different very complex and relatively simple type descriptions generated by widl's SLTG generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 96a557a3966..c168a76adf0 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -1240,7 +1240,6 @@ static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, v short name, type_offset; name = base_offset != -1 ? add_name(&typelib->name_table, arg->name) : -1; - append_data(data, &name, sizeof(name)); if (arg_data[i].size > sizeof(short)) { @@ -1248,8 +1247,12 @@ static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, v arg_offset += arg_data[i].size; } else + { + name |= 1; type_offset = *(short *)arg_data[i].data; + } + append_data(data, &name, sizeof(name)); append_data(data, &type_offset, sizeof(type_offset)); if (base_offset != -1)

1 0

Dmitry Timoshkov : widl: Create library block index right after the CompObj one.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: 918425bbe991df5f530a2f5a132c382f87cf960f URL: https://gitlab.winehq.org/wine/wine/-/commit/918425bbe991df5f530a2f5a132c38… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 13:26:49 2016 +0800 widl: Create library block index right after the CompObj one. Otherwise Wine's oleaut32 refuses to load a typelib. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 2560e277fb2..96a557a3966 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -354,28 +354,37 @@ static void init_library(struct sltg_typelib *sltg) } } -static void add_block(struct sltg_typelib *sltg, void *data, int length, const char *name) +static void add_block_index(struct sltg_typelib *sltg, void *data, int length, int index) { - chat("add_block: %p,%d,\"%s\"\n", data, length, name); - sltg->blocks = xrealloc(sltg->blocks, sizeof(sltg->blocks[0]) * (sltg->block_count + 1)); sltg->blocks[sltg->block_count].length = length; sltg->blocks[sltg->block_count].data = data; - sltg->blocks[sltg->block_count].index_string = add_index(&sltg->index, name); + sltg->blocks[sltg->block_count].index_string = index; sltg->block_count++; } -static void add_library_block(struct sltg_typelib *typelib) +static void add_block(struct sltg_typelib *sltg, void *data, int size, const char *name) +{ + struct sltg_block *block = xmalloc(sizeof(*block)); + int index; + + chat("add_block: %p,%d,\"%s\"\n", data, size, name); + + index = add_index(&sltg->index, name); + + add_block_index(sltg, data, size, index); +} + +static void *create_library_block(struct sltg_typelib *typelib, int *size, int *index) { void *block; short *p; - int size; - size = sizeof(short) * 9 + sizeof(int) * 3 + sizeof(GUID); - if (typelib->library.helpstring) size += strlen(typelib->library.helpstring); - if (typelib->library.helpfile) size += strlen(typelib->library.helpfile); + *size = sizeof(short) * 9 + sizeof(int) * 3 + sizeof(GUID); + if (typelib->library.helpstring) *size += strlen(typelib->library.helpstring); + if (typelib->library.helpfile) *size += strlen(typelib->library.helpfile); - block = xmalloc(size); + block = xmalloc(*size); p = block; *p++ = 0x51cc; /* magic */ *p++ = 3; /* res02 */ @@ -408,7 +417,9 @@ static void add_library_block(struct sltg_typelib *typelib) p += 2; *(GUID *)p = typelib->library.uuid; - add_block(typelib, block, size, "dir"); + *index = add_index(&typelib->index, "dir"); + + return block; } static const char *new_index_name(void) @@ -1687,6 +1698,8 @@ int create_sltg_typelib(typelib_t *typelib) { struct sltg_typelib sltg; const statement_t *stmt; + void *library_block; + int library_block_size, library_block_index; if (pointer_size != 4) error("Only 32-bit platform is supported\n"); @@ -1703,12 +1716,14 @@ int create_sltg_typelib(typelib_t *typelib) init_name_table(&sltg.name_table); init_library(&sltg); - add_library_block(&sltg); + library_block = create_library_block(&sltg, &library_block_size, &library_block_index); if (typelib->stmts) LIST_FOR_EACH_ENTRY(stmt, typelib->stmts, const statement_t, entry) add_statement(&sltg, stmt); + add_block_index(&sltg, library_block, library_block_size, library_block_index); + save_all_changes(&sltg); return 1;

1 0

Gopal Prasad : winewayland.drv: Implement SetWindowText.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: d07019e4d174fd1b5d8b74ff2a36e900c07d96d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d07019e4d174fd1b5d8b74ff2a36e9… Author: Gopal Prasad <llyyr(a)yukari.in> Date: Thu Feb 29 01:15:04 2024 +0530 winewayland.drv: Implement SetWindowText. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56000 Co-authored-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/wayland_surface.c | 27 +++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 2 ++ dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 28 +++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 9f3ad584f4f..39c3976cdfd 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -24,6 +24,7 @@ #include "config.h" +#include <assert.h> #include <stdlib.h> #include <unistd.h> @@ -902,3 +903,29 @@ void wayland_surface_ensure_contents(struct wayland_surface *surface) if (damage) NtGdiDeleteObjectApp(damage); } + +/********************************************************************** + * wayland_surface_set_title + */ +void wayland_surface_set_title(struct wayland_surface *surface, LPCWSTR text) +{ + DWORD text_len; + DWORD utf8_count; + char *utf8 = NULL; + + assert(surface->xdg_toplevel); + + TRACE("surface=%p hwnd=%p text='%s'\n", + surface, surface->hwnd, wine_dbgstr_w(text)); + + text_len = (lstrlenW(text) + 1) * sizeof(WCHAR); + + if (!RtlUnicodeToUTF8N(NULL, 0, &utf8_count, text, text_len) && + (utf8 = malloc(utf8_count))) + { + RtlUnicodeToUTF8N(utf8, utf8_count, &utf8_count, text, text_len); + xdg_toplevel_set_title(surface->xdg_toplevel, utf8); + } + + free(utf8); +} diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 613aae18b22..3301ce05f82 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -258,6 +258,7 @@ void wayland_surface_coords_to_window(struct wayland_surface *surface, struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface); BOOL wayland_client_surface_release(struct wayland_client_surface *client); void wayland_surface_ensure_contents(struct wayland_surface *surface); +void wayland_surface_set_title(struct wayland_surface *surface, LPCWSTR title); /********************************************************************** * Wayland SHM buffer @@ -329,6 +330,7 @@ BOOL WAYLAND_ClipCursor(const RECT *clip, BOOL reset); LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); void WAYLAND_DestroyWindow(HWND hwnd); void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor); +void WAYLAND_SetWindowText(HWND hwnd, LPCWSTR text); LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam); BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, BOOL force, void *param); diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 6bddbb509b6..61e7df16f14 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -41,6 +41,7 @@ static const struct user_driver_funcs waylanddrv_funcs = .pKbdLayerDescriptor = WAYLAND_KbdLayerDescriptor, .pReleaseKbdTables = WAYLAND_ReleaseKbdTables, .pSetCursor = WAYLAND_SetCursor, + .pSetWindowText = WAYLAND_SetWindowText, .pSysCommand = WAYLAND_SysCommand, .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, .pWindowMessage = WAYLAND_WindowMessage, diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index a02363411ea..3c41c57b7b5 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -195,6 +195,7 @@ static void wayland_win_data_update_wayland_surface(struct wayland_win_data *dat HWND parent = NtUserGetAncestor(data->hwnd, GA_PARENT); BOOL visible, xdg_visible; RECT clip; + WCHAR text[1024]; TRACE("hwnd=%p\n", data->hwnd); @@ -223,7 +224,16 @@ static void wayland_win_data_update_wayland_surface(struct wayland_win_data *dat /* If the window is a visible toplevel make it a wayland * xdg_toplevel. Otherwise keep it role-less to avoid polluting the * compositor with empty xdg_toplevels. */ - if (visible) wayland_surface_make_toplevel(surface); + if (visible) + { + wayland_surface_make_toplevel(surface); + if (surface->xdg_toplevel) + { + if (!NtUserInternalGetWindowText(data->hwnd, text, ARRAY_SIZE(text))) + text[0] = 0; + wayland_surface_set_title(surface, text); + } + } } wayland_win_data_get_config(data, &surface->window); @@ -669,6 +679,22 @@ static enum xdg_toplevel_resize_edge hittest_to_resize_edge(WPARAM hittest) } } +/***************************************************************** + * WAYLAND_SetWindowText + */ +void WAYLAND_SetWindowText(HWND hwnd, LPCWSTR text) +{ + struct wayland_surface *surface = wayland_surface_lock_hwnd(hwnd); + + TRACE("hwnd=%p text=%s\n", hwnd, wine_dbgstr_w(text)); + + if (surface) + { + if (surface->xdg_toplevel) wayland_surface_set_title(surface, text); + pthread_mutex_unlock(&surface->mutex); + } +} + /*********************************************************************** * WAYLAND_SysCommand */

1 0

Dmitry Timoshkov : widl: Add support for function parameter flags to SLTG typelib generator.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: 13e12597548d7601c0cc2cf4ca3c23506576ef1c URL: https://gitlab.winehq.org/wine/wine/-/commit/13e12597548d7601c0cc2cf4ca3c23… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 25 15:26:12 2016 +0800 widl: Add support for function parameter flags to SLTG typelib generator. This makes stdole32.tlb generated by widl have proper [in,out,retval] parameter flags. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 65 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index c168a76adf0..1f9976f3fa8 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -696,8 +696,8 @@ static int local_href(struct sltg_hrefmap *hrefmap, int typelib_href) return href << 2; } -static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data, type_t *type, short flags, - short base_offset, int *size_instance, struct sltg_hrefmap *hrefmap) +static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data, type_t *type, short param_flags, + short flags, short base_offset, int *size_instance, struct sltg_hrefmap *hrefmap) { short vt, vt_flags, desc_offset; @@ -790,19 +790,19 @@ static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data if (is_ptr(ref)) { - chat("write_var_desc: vt VT_PTR | 0x0400\n"); - vt = VT_PTR | 0x0400; + chat("write_var_desc: vt VT_PTR | 0x0400 | %04x\n", param_flags); + vt = VT_PTR | 0x0400 | param_flags; append_data(data, &vt, sizeof(vt)); - write_var_desc(typelib, data, ref, 0, base_offset, size_instance, hrefmap); + write_var_desc(typelib, data, ref, 0, 0, base_offset, size_instance, hrefmap); } else - write_var_desc(typelib, data, ref, 0x0e00, base_offset, size_instance, hrefmap); + write_var_desc(typelib, data, ref, param_flags, 0x0e00, base_offset, size_instance, hrefmap); return desc_offset; } chat("write_var_desc: vt %d, flags %04x\n", vt, flags); - vt_flags = vt | flags; + vt_flags = vt | flags | param_flags; append_data(data, &vt_flags, sizeof(vt_flags)); if (vt == VT_USERDEFINED) @@ -928,7 +928,8 @@ static void add_structure_typeinfo(struct sltg_typelib *typelib, type_t *type) init_sltg_data(&var_data[i]); base_offset = var_data_size + (i + 1) * sizeof(struct sltg_variable); - type_desc_offset[i] = write_var_desc(typelib, &var_data[i], var->declspec.type, 0, base_offset, &size_instance, &hrefmap); + type_desc_offset[i] = write_var_desc(typelib, &var_data[i], var->declspec.type, 0, 0, + base_offset, &size_instance, &hrefmap); dump_var_desc(var_data[i].data, var_data[i].size); if (var_data[i].size > sizeof(short)) @@ -1110,6 +1111,47 @@ static int get_func_flags(const var_t *func, int *dispid, int *invokekind, int * return flags; } +static int get_param_flags(const var_t *param) +{ + const attr_t *attr; + int flags, in, out; + + if (!param->attrs) return 0; + + flags = 0; + in = out = 0; + + LIST_FOR_EACH_ENTRY(attr, param->attrs, const attr_t, entry) + { + switch(attr->type) + { + case ATTR_IN: + in++; + break; + case ATTR_OUT: + out++; + break; + case ATTR_PARAMLCID: + flags |= 0x2000; + break; + case ATTR_RETVAL: + flags |= 0x80; + break; + default: + chat("unhandled param attr %d\n", attr->type); + break; + } + } + + if (out) + flags |= in ? 0x8000 : 0x4000; + else if (!in) + flags |= 0xc000; + + return flags; +} + + static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, var_t *func, int idx, int dispid, short base_offset, struct sltg_hrefmap *hrefmap) { @@ -1127,7 +1169,7 @@ static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, v init_sltg_data(&ret_data); ret_desc_offset = write_var_desc(typelib, &ret_data, type_function_get_rettype(func->declspec.type), - 0, base_offset, NULL, hrefmap); + 0, 0, base_offset, NULL, hrefmap); dump_var_desc(ret_data.data, ret_data.size); arg_data_size = 0; @@ -1153,13 +1195,16 @@ static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, v LIST_FOR_EACH_ENTRY(arg, type_function_get_args(func->declspec.type), const var_t, entry) { const attr_t *attr; + short param_flags = get_param_flags(arg); chat("add_func_desc: arg[%d] %p (%s), type %p (%s)\n", i, arg, arg->name, arg->declspec.type, arg->declspec.type->name); init_sltg_data(&arg_data[i]); - arg_desc_offset[i] = write_var_desc(typelib, &arg_data[i], arg->declspec.type, 0, arg_offset, NULL, hrefmap); + + arg_desc_offset[i] = write_var_desc(typelib, &arg_data[i], arg->declspec.type, param_flags, 0, + arg_offset, NULL, hrefmap); dump_var_desc(arg_data[i].data, arg_data[i].size); if (arg_data[i].size > sizeof(short))

1 0

Alexandre Julliard : rpcrt4: Add a wrapper for client calls from stubless proxies.
by Alexandre Julliard April 23, 2024

April 23, 2024

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: Remap registers to the stack for stubless proxies on ARM platforms.
by Alexandre Julliard April 23, 2024

April 23, 2024

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

Alexandre Julliard : rpcrt4: Move the FPU register conversion to the stubless proxy wrapper.
by Alexandre Julliard April 23, 2024

April 23, 2024

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

Dmitry Timoshkov : widl: Make automatic dispid generation scheme better match what midl does.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: 62223ed995c897f4af759800fafad7c82e963258 URL: https://gitlab.winehq.org/wine/wine/-/commit/62223ed995c897f4af759800fafad7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:04:00 2016 +0800 widl: Make automatic dispid generation scheme better match what midl does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 94ebf678edb..2560e277fb2 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -1020,11 +1020,9 @@ static importinfo_t *find_importinfo(typelib_t *typelib, const char *name) static int get_func_flags(const var_t *func, int *dispid, int *invokekind, int *helpcontext, const char **helpstring) { - static int dispid_base = 0x60000000; const attr_t *attr; int flags; - *dispid = dispid_base++; *invokekind = 1 /* INVOKE_FUNC */; *helpcontext = -2; *helpstring = NULL; @@ -1102,17 +1100,17 @@ static int get_func_flags(const var_t *func, int *dispid, int *invokekind, int * } static int add_func_desc(struct sltg_typelib *typelib, struct sltg_data *data, var_t *func, - int idx, short base_offset, struct sltg_hrefmap *hrefmap) + int idx, int dispid, short base_offset, struct sltg_hrefmap *hrefmap) { struct sltg_data ret_data, *arg_data; int arg_count = 0, arg_data_size, optional = 0, defaults = 0, old_size; - int funcflags = 0, dispid, invokekind = 1 /* INVOKE_FUNC */, helpcontext; + int funcflags = 0, invokekind = 1 /* INVOKE_FUNC */, helpcontext; const char *helpstring; const var_t *arg; short ret_desc_offset, *arg_desc_offset, arg_offset; struct sltg_function func_desc; - chat("add_func_desc: %s, idx %#x\n", func->name, idx); + chat("add_func_desc: %s, idx %#x, dispid %#x\n", func->name, idx, dispid); old_size = data->size; @@ -1293,6 +1291,7 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) struct sltg_tail tail; int member_offset, base_offset, func_data_size, i; int func_count, inherited_func_count = 0; + int dispid, inherit_level = 0; if (iface->typelib_idx != -1) return; @@ -1333,6 +1332,7 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) while (inherit) { + inherit_level++; inherited_func_count += list_count(type_iface_get_stmts(inherit)); inherit = type_iface_get_inherit(inherit); } @@ -1348,7 +1348,7 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(iface)) { - add_func_desc(typelib, &data, stmt_func->u.var, -1, -1, &hrefmap); + add_func_desc(typelib, &data, stmt_func->u.var, -1, -1, -1, &hrefmap); } func_data_size = data.size; @@ -1383,13 +1383,16 @@ static void add_interface_typeinfo(struct sltg_typelib *typelib, type_t *iface) write_impl_href(&data, inherit_href); i = 0; + dispid = 0x60000000 | (inherit_level << 16); STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(iface)) { - if (i == func_count - 1) i |= 0x80000000; + int idx = inherited_func_count + i; + + if (i == func_count - 1) idx |= 0x80000000; base_offset += add_func_desc(typelib, &data, stmt_func->u.var, - inherited_func_count + i, base_offset, &hrefmap); + idx, dispid + i, base_offset, &hrefmap); i++; }

1 0

Danyil Blyschak : mfreadwrite: Store result of object activation in stream transform.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: wine Branch: master Commit: f97e12de40295719e9b6eeed1d10007d8d01293c URL: https://gitlab.winehq.org/wine/wine/-/commit/f97e12de40295719e9b6eeed1d1000… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Thu Apr 18 10:33:18 2024 -0500 mfreadwrite: Store result of object activation in stream transform. In source_reader_create_transform(), store the result of IMFActivate_ActivateObject() so that in the event of failure, resources are freed and an appropriate HRESULT is returned. Previously, if every object's activation failed, the last part of the function was not aware of this. --- dlls/mfreadwrite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 11eac81d2ca..96bb316ac85 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2011,7 +2011,7 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { IMFMediaType *media_type; - if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) + if (FAILED(hr = IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) continue; if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)) && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type)))

1 0