February 2023 - Wine-Commits

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

Alex Henrie : dsound: Use CRT functions for memory allocation.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 99396d4986869f164907ae8e48b4706a70bd9a8b URL: https://gitlab.winehq.org/wine/wine/-/commit/99396d4986869f164907ae8e48b470… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 9 23:36:32 2023 -0700 dsound: Use CRT functions for memory allocation. --- dlls/dsound/buffer.c | 53 +++++++++++++++++++------------------- dlls/dsound/capture.c | 61 ++++++++++++++++++-------------------------- dlls/dsound/dsound.c | 27 +++++++++----------- dlls/dsound/dsound_private.h | 12 --------- dlls/dsound/duplex.c | 4 +-- dlls/dsound/mixer.c | 9 +++---- dlls/dsound/primary.c | 33 +++++++++++------------- dlls/dsound/propset.c | 46 ++++++++++++++++----------------- 8 files changed, 106 insertions(+), 139 deletions(-)

1 0

Francois Gouget : mmdevapi/tests: WoW64 processes can read the properties from the registry.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 1833dc0b2daf89bdf21adf1f943771f01b4c43ec URL: https://gitlab.winehq.org/wine/wine/-/commit/1833dc0b2daf89bdf21adf1f943771… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 04:26:13 2023 +0100 mmdevapi/tests: WoW64 processes can read the properties from the registry. Since Windows 10 2004 so consider the old limitation to be broken. --- dlls/mmdevapi/tests/propstore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 89eaada5fd7..bbefd5a9ead 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -183,7 +183,9 @@ static void test_setvalue_on_wow64(IPropertyStore *store) /* should NOT find the key in 32-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ, &root); - ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %lu\n", ret); + todo_wine + ok(ret == 0 || broken(ret == ERROR_FILE_NOT_FOUND /* win10 < 2004 */), + "Wrong error when opening mmdevices Render key: %lu\n", ret); } START_TEST(propstore)

1 0

Alexandre Julliard : wow64: Call the 32-bit KiRaiseUserExceptionDispatcher for invalid handle exceptions.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 5d3c0cf01d5c90703a4101b1147db323ce38a3d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d3c0cf01d5c90703a4101b1147db3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 15:07:23 2023 +0100 wow64: Call the 32-bit KiRaiseUserExceptionDispatcher for invalid handle exceptions. --- dlls/wow64/syscall.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8caf06ec013..6f4f3a2dc81 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -100,6 +100,7 @@ static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); +static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); void *dummy = RtlUnwind; @@ -248,6 +249,40 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 } +/********************************************************************** + * call_raise_user_exception_dispatcher + */ +static void call_raise_user_exception_dispatcher( ULONG code ) +{ + TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); + + teb32->ExceptionCode = code; + + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT ctx = { CONTEXT_I386_ALL }; + + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Eip = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT ctx = { CONTEXT_ARM_ALL }; + + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Pc = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + } + break; + } +} + + /* based on RtlRaiseException: call NtRaiseException with context setup to return to caller */ void WINAPI raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) DECLSPEC_HIDDEN; #ifdef __x86_64__ @@ -731,6 +766,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex init_syscall_table( module, 0, &ntdll_syscall_table ); *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); + GET_PTR( KiRaiseUserExceptionDispatcher ); init_file_redirects(); return TRUE; @@ -817,7 +853,7 @@ static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) switch (ptrs->ExceptionRecord->ExceptionCode) { case STATUS_INVALID_HANDLE: - Wow64PassExceptionToGuest( ptrs ); + call_raise_user_exception_dispatcher( ptrs->ExceptionRecord->ExceptionCode ); break; } return EXCEPTION_EXECUTE_HANDLER; @@ -847,7 +883,7 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { status = GetExceptionCode(); } - __ENDTRY; + __ENDTRY free_temp_data(); return status; }

1 0

Alexandre Julliard : ntdll: Skip dependency only for the actually loaded ntdll and kernel32, instead of matching by name.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: a3ff624bcc2822b36e46c14e12c122505f890246 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3ff624bcc2822b36e46c14e12c122… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 09:48:01 2023 +0100 ntdll: Skip dependency only for the actually loaded ntdll and kernel32, instead of matching by name. --- dlls/ntdll/loader.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d0d9bae7f0b..a0ac61d8156 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1404,14 +1404,9 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) { dep_after = wm->ldr.DdagNode->Dependencies.Tail; if (!import_dll( wm->ldr.DllBase, &imports[i], load_path, &imp )) - { - imp = NULL; status = STATUS_DLL_NOT_FOUND; - } - else if (imp && !is_import_dll_system( &wm->ldr, &imports[i] )) - { + else if (imp && imp->ldr.DdagNode != node_ntdll && imp->ldr.DdagNode != node_kernel32) add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); - } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0