- Wine-Commits - list.winehq.org

Alexandre Julliard : server: Fix another buffer overflow compiler warning.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: 14967933eca40e1cb021a05b6b2e4190f042cb28 URL: https://gitlab.winehq.org/wine/wine/-/commit/14967933eca40e1cb021a05b6b2e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 1 11:20:15 2023 +0100 server: Fix another buffer overflow compiler warning. --- server/mapping.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index ed81a718bbe..f14ee11cc62 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1192,7 +1192,6 @@ DECL_HANDLER(map_view) { struct mapping *mapping = NULL; struct memory_view *view; - data_size_t namelen = 0; if (!req->size || (req->base & page_mask) || req->base + req->size < req->base) /* overflow */ { @@ -1211,6 +1210,8 @@ DECL_HANDLER(map_view) if (!req->mapping) /* image mapping for a .so dll */ { + data_size_t namelen = 0; + if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image); if (!(view = mem_alloc( sizeof(struct memory_view) + namelen * sizeof(WCHAR) ))) return; memset( view, 0, sizeof(*view) ); @@ -1243,13 +1244,13 @@ DECL_HANDLER(map_view) goto done; } - if ((view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) + if ((view = mem_alloc( sizeof(*view) ))) { view->base = req->base; view->size = req->size; view->start = req->start; view->flags = mapping->flags; - view->namelen = namelen; + view->namelen = 0; view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL;

1 0

Rémi Bernon : widl: Use "g16" for GUID parameterized type signature.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: a375ff9e65f4d67ef90495889468023658a583a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a375ff9e65f4d67ef9049588946802… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 28 17:39:48 2023 +0100 widl: Use "g16" for GUID parameterized type signature. --- tools/widl/typetree.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 290f9fffeb5..87ab7d2134c 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -198,6 +198,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t return n; case TYPE_ALIAS: if (!strcmp(type->name, "boolean")) n += strappend(buf, len, pos + n, "b1"); + else if (!strcmp(type->name, "GUID")) n += strappend(buf, len, pos + n, "g16"); else if (!strcmp(type->name, "HSTRING")) n += strappend(buf, len, pos + n, "string"); else n += append_type_signature(buf, len, pos + n, type->details.alias.aliasee.type); return n;

1 0

Mohamad Al-Jaf : widl: Use "i2" / "u2" for INT16 parameterized type signature.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: ef43048c65f2615cc7e43c2487e7a7b1cc77e333 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef43048c65f2615cc7e43c2487e7a7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 23 02:59:54 2023 -0500 widl: Use "i2" / "u2" for INT16 parameterized type signature. --- tools/widl/typetree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e867ea4d26f..290f9fffeb5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -210,6 +210,9 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC: switch (type_basic_get_type(type)) { + case TYPE_BASIC_INT16: + n += strappend(buf, len, pos + n, type_basic_get_sign(type) <= 0 ? "i2" : "u2"); + return n; case TYPE_BASIC_INT: case TYPE_BASIC_INT32: case TYPE_BASIC_LONG: @@ -231,7 +234,6 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC_BYTE: n += strappend(buf, len, pos + n, "u1"); return n; - case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER:

1 0

Mohamad Al-Jaf : widl: Use "i4" / "u4" for LONG parameterized type signature.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: e427e893fc90d34925db56c5a01a62e0f8591a4a URL: https://gitlab.winehq.org/wine/wine/-/commit/e427e893fc90d34925db56c5a01a62… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 23 02:52:43 2023 -0500 widl: Use "i4" / "u4" for LONG parameterized type signature. --- tools/widl/typetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index ee71a7a2899..e867ea4d26f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -212,6 +212,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t { case TYPE_BASIC_INT: case TYPE_BASIC_INT32: + case TYPE_BASIC_LONG: n += strappend(buf, len, pos + n, type_basic_get_sign(type) <= 0 ? "i4" : "u4"); return n; case TYPE_BASIC_INT64: @@ -232,7 +233,6 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t return n; case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: - case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_WCHAR:

1 0

Serkan Önder : po: Update Turkish translation.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 56db5b0bf1aa6df5edbedbec03e0a1db39d6639b URL: https://gitlab.winehq.org/wine/wine/-/commit/56db5b0bf1aa6df5edbedbec03e0a1… Author: Serkan Önder <serkanonder(a)outlook.com> Date: Sun Feb 26 17:19:29 2023 +0000 po: Update Turkish translation. --- po/tr.po | 1414 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 646 insertions(+), 768 deletions(-)

1 0

Giovanni Mascellani : vkd3d-shader: Make documentation for "messages" parameters self contained.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: 6ccde9e82c00393f212ddb1934d97eb8858ba331 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6ccde9e82c00393f212ddb1934d97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 24 13:18:49 2023 +0100 vkd3d-shader: Make documentation for "messages" parameters self contained. Otherwise it's not clear which clauses in vkd3d_shader_compile() really apply to other functions. For example, many of the functions currently refering to vkd3d_shader_compile() don't even take a vkd3d_shader_compile_info parameter. --- include/vkd3d_shader.h | 93 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 25 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 51d03e28..ee8ce8d0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1648,7 +1648,7 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * vkd3d_shader_compile_info. Regardless of the requested level, if this * parameter is NULL, no compilation messages will be returned. * \n - * If no compilation messages are produced by the compiler, this parameter may + * If no messages are produced by the compiler, this parameter may * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. @@ -1697,10 +1697,15 @@ VKD3D_SHADER_API void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *co * needed. * * \param messages Optional output location for error or informational messages - * produced by the compiler. + * produced by the parser. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * If no messages are produced by the parser, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. */ @@ -1735,10 +1740,15 @@ VKD3D_SHADER_API void vkd3d_shader_free_root_signature( * vkd3d_shader_free_shader_code() when no longer needed. * * \param messages Optional output location for error or informational messages - * produced by the compiler. + * produced by the serializer. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * If no messages are produced by the serializer, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. */ @@ -1785,10 +1795,19 @@ VKD3D_SHADER_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_ver * depending on their structure type. * * \param messages Optional output location for error or informational messages - * produced by the compiler. + * produced by the parser. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * The messages returned can be regulated with the \a log_level member of struct + * vkd3d_shader_compile_info. Regardless of the requested level, if this + * parameter is NULL, no compilation messages will be returned. + * \n + * If no messages are produced by the parser, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. */ @@ -1822,10 +1841,15 @@ VKD3D_SHADER_API void vkd3d_shader_free_scan_descriptor_info( * needed. * * \param messages Optional output location for error or informational messages - * produced by the compiler. + * produced by the parser. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * If no messages are produced by the parser, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. */ @@ -1881,10 +1905,19 @@ VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_sig * vkd3d_shader_free_shader_code() when no longer needed. * * \param messages Optional output location for error or informational messages - * produced by the compiler. + * produced by the preprocessor. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * The messages returned can be regulated with the \a log_level member of struct + * vkd3d_shader_compile_info. Regardless of the requested level, if this + * parameter is NULL, no compilation messages will be returned. + * \n + * If no messages are produced by the preprocessor, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. * @@ -1936,8 +1969,13 @@ VKD3D_SHADER_API void vkd3d_shader_free_dxbc(struct vkd3d_shader_dxbc_desc *dxbc * \param messages Optional output location for error or informational messages * produced by the parser. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * If no messages are produced by the parser, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. * @@ -1947,25 +1985,30 @@ VKD3D_SHADER_API int vkd3d_shader_parse_dxbc(const struct vkd3d_shader_code *dxb uint32_t flags, struct vkd3d_shader_dxbc_desc *desc, char **messages); /** - * Serialise a DXBC description into a blob stored in a vkd3d_shader_code + * Serialize a DXBC description into a blob stored in a vkd3d_shader_code * structure. * - * \param section_count The number of DXBC sections to serialise. + * \param section_count The number of DXBC sections to serialize. * * \param sections An array of vkd3d_shader_dxbc_section_desc structures - * to serialise. + * to serialize. * * \param dxbc A pointer to a vkd3d_shader_code structure in which the - * serialised blob will be stored. + * serialized blob will be stored. * \n * The output blob is allocated by vkd3d-shader and should be freed with * vkd3d_shader_free_shader_code() when no longer needed. * * \param messages Optional output location for error or informational messages - * produced by the serialiser. + * produced by the serializer. * \n - * This parameter behaves identically to the \a messages parameter of - * vkd3d_shader_compile(). + * This string is null-terminated and UTF-8 encoded. + * \n + * The messages are allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_messages() when no longer needed. + * \n + * If no messages are produced by the serializer, this parameter may + * receive NULL instead of a valid string pointer. * * \return A member of \ref vkd3d_result. *

1 0

Alex Henrie : winex11: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 354e999c5a8f284af3fe833f9fb45bace151a44e URL: https://gitlab.winehq.org/wine/wine/-/commit/354e999c5a8f284af3fe833f9fb45b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 28 09:49:36 2023 -0700 winex11: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/winex11.drv/mouse.c | 3 +-- dlls/winex11.drv/window.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d1ade2eda68..c34f5fde77e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -374,7 +374,7 @@ static BOOL grab_clipping_window( const RECT *clip ) #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); - UNICODE_STRING class_name; + UNICODE_STRING class_name = RTL_CONSTANT_STRING( messageW ); Window clip_window; HWND msg_hwnd = 0; POINT pos; @@ -385,7 +385,6 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; - RtlInitUnicodeString( &class_name, messageW ); if (!(msg_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, NtCurrentTeb()->Peb->ImageBaseAddress, NULL, 0, NULL, 0, FALSE ))) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 776cb5405fb..cb9e07599c4 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2058,7 +2058,7 @@ HWND create_foreign_window( Display *display, Window xwin ) unsigned int nchildren; XWindowAttributes attr; UINT style = WS_CLIPCHILDREN; - UNICODE_STRING class_name; + UNICODE_STRING class_name = RTL_CONSTANT_STRING( classW ); if (!class_registered) { @@ -2069,7 +2069,6 @@ HWND create_foreign_window( Display *display, Window xwin ) class.cbSize = sizeof(class); class.lpfnWndProc = client_foreign_window_proc; class.lpszClassName = classW; - RtlInitUnicodeString( &class_name, classW ); if (!NtUserRegisterClassExWOW( &class, &class_name, &version, NULL, 0, 0, NULL ) && RtlGetLastWin32Error() != ERROR_CLASS_ALREADY_EXISTS) {

1 0

Huw Davies : maintainers: Add myself to the Audio I/O section.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 0410660d6e53fb2a7bf21478512155462a1e3f11 URL: https://gitlab.winehq.org/wine/wine/-/commit/0410660d6e53fb2a7bf21478512155… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 28 10:42:28 2023 +0000 maintainers: Add myself to the Audio I/O section. --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 22351f5af60..2bca4a051c4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -37,6 +37,7 @@ F: programs/winedbg/be_arm* Audio I/O P: Andrew Eikum <coldpie(a)fastmail.com> +P: Huw Davies <huw(a)codeweavers.com> F: dlls/dsound/ F: dlls/mmdevapi/ F: dlls/winealsa.drv/

1 0

Rémi Bernon : winex11: Assume that Xkb extension is available.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: ad5cb8305f4ebc10992113f8f6a724d5f33a6bf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad5cb8305f4ebc10992113f8f6a724… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 27 10:57:58 2023 +0100 winex11: Assume that Xkb extension is available. --- configure | 46 ------------------------------------------ configure.ac | 7 ------- dlls/winex11.drv/keyboard.c | 37 +++++++++------------------------ dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 14 +++---------- include/config.h.in | 3 --- 6 files changed, 13 insertions(+), 95 deletions(-)

1 0

Alex Henrie : winex11: Use RTL_CONSTANT_STRING instead of reimplementing it.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 129d861656b61f9b308e9fb5f563af735871b533 URL: https://gitlab.winehq.org/wine/wine/-/commit/129d861656b61f9b308e9fb5f563af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 28 09:49:36 2023 -0700 winex11: Use RTL_CONSTANT_STRING instead of reimplementing it. --- dlls/winex11.drv/desktop.c | 4 ++-- dlls/winex11.drv/window.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a0367d6ce50..8a9f476ede2 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -227,8 +227,8 @@ static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, const DEVMODEW *mode static void query_desktop_work_area( RECT *rc_work ) { - static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d'}; - UNICODE_STRING str = { sizeof(trayW), sizeof(trayW), (WCHAR *)trayW }; + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + UNICODE_STRING str = RTL_CONSTANT_STRING( trayW ); RECT rect; HWND hwnd = NtUserFindWindowEx( 0, 0, &str, NULL, 0 ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 17fc6d867f5..776cb5405fb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2744,8 +2744,8 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, /* check if the window icon should be hidden (i.e. moved off-screen) */ static BOOL hide_icon( struct x11drv_win_data *data ) { - static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d'}; - UNICODE_STRING str = { sizeof(trayW), sizeof(trayW), (WCHAR *)trayW }; + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + UNICODE_STRING str = RTL_CONSTANT_STRING( trayW ); if (data->managed) return TRUE; /* hide icons in desktop mode when the taskbar is active */

1 0