- Wine-Commits - list.winehq.org

Rémi Bernon : include: Fix debugstr_fourcc printf format to print at most 4 chars.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: df75c9ed3c313e7e3760faa1b478f180ab10f505 URL: https://gitlab.winehq.org/wine/wine/-/commit/df75c9ed3c313e7e3760faa1b478f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 16 10:31:04 2023 +0200 include: Fix debugstr_fourcc printf format to print at most 4 chars. --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index d0862942be8..70fab5a247b 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -330,7 +330,7 @@ static inline const char *wine_dbgstr_fourcc( unsigned int fourcc ) if (!fourcc) return "''"; if (isprint( str[0] ) && isprint( str[1] ) && isprint( str[2] ) && isprint( str[3] )) - return wine_dbg_sprintf( "'%4s'", str ); + return wine_dbg_sprintf( "'%.4s'", str ); return wine_dbg_sprintf( "0x%08x", fourcc ); }

1 0

Zebediah Figura : advapi32: Fix rewinding the last path segment in SetSecurityInfo().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: c05973d077eed481d544e43cbfdac251831ca006 URL: https://gitlab.winehq.org/wine/wine/-/commit/c05973d077eed481d544e43cbfdac2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 21:14:20 2023 -0500 advapi32: Fix rewinding the last path segment in SetSecurityInfo(). In particular, handle the case where an object has no name. In theory, this should not happen for regular files, but SetSecurityInfo() is almost certainly not supposed to care about that [i.e. this code probably belongs in the server, at the very least]. However, fixing that will require much more work. While we're at it, rewrite the code to be a little more idiomatic about its intent. --- dlls/advapi32/security.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index fd3f4b9fefc..d13fd65af78 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2969,10 +2969,11 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, return RtlNtStatusToDosError(status); } - for (name_info->Name.Length-=2; name_info->Name.Length>0; name_info->Name.Length-=2) - if (name_info->Name.Buffer[name_info->Name.Length/2-1]=='\\' || - name_info->Name.Buffer[name_info->Name.Length/2-1]=='/') - break; + if (name_info->Name.Length && name_info->Name.Buffer[(name_info->Name.Length / 2) - 1] == '\\') + name_info->Name.Length -= 2; + while (name_info->Name.Length && name_info->Name.Buffer[(name_info->Name.Length / 2) - 1] != '\\') + name_info->Name.Length -= 2; + if (name_info->Name.Length) { OBJECT_ATTRIBUTES attr;

1 0

Connor McAdams : uiautomationcore: Potentially raise focus event on the currently focused serverside provider in response to EVENT_OBJECT_FOCUS.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: f26d470920bf9291a0b8861de66c1a262cdf0b03 URL: https://gitlab.winehq.org/wine/wine/-/commit/f26d470920bf9291a0b8861de66c1a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 18 10:54:55 2023 -0400 uiautomationcore: Potentially raise focus event on the currently focused serverside provider in response to EVENT_OBJECT_FOCUS. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 78 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_classes.idl | 2 +- dlls/uiautomationcore/uia_client.c | 37 ++++++++------ dlls/uiautomationcore/uia_com_client.c | 29 +++++++++-- dlls/uiautomationcore/uia_event.c | 4 +- dlls/uiautomationcore/uia_private.h | 3 +- 6 files changed, 131 insertions(+), 22 deletions(-)

1 0

Alexandre Julliard : ntdll: Move the relay trace on thread startup to LdrInitializeThunk().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: bf2b38a805fbc8b1309cdff38a3311d8a7b5691c URL: https://gitlab.winehq.org/wine/wine/-/commit/bf2b38a805fbc8b1309cdff38a3311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 11:37:57 2023 +0200 ntdll: Move the relay trace on thread startup to LdrInitializeThunk(). --- dlls/ntdll/signal_arm.c | 2 ++ dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/signal_i386.c | 2 ++ dlls/ntdll/signal_x86_64.c | 2 ++ dlls/ntdll/thread.c | 2 -- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index fd653e16381..50eac39c31b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -34,6 +34,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE @@ -1493,6 +1494,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->R0 ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->R0, (void *)context->R1 ); NtContinue( context, TRUE ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 85d31abc028..b244d77a821 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -36,6 +36,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE @@ -1530,6 +1531,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->X0 ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->X0, (void *)context->X1 ); NtContinue( context, TRUE ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7174bd36afe..946e553cee1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -35,6 +35,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); struct x86_thread_data @@ -561,6 +562,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->Eax ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Eax, (void *)context->Ebx ); signal_start_thread( context ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ce57722a930..af3ea1af305 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(threadname); typedef struct _SCOPE_TABLE @@ -1614,6 +1615,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { loader_init( context, (void **)&context->Rcx ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Rcx, (void *)context->Rdx ); signal_start_thread( context ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 82a470271d9..8d072dafa42 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -275,7 +275,6 @@ void DECLSPEC_HIDDEN call_thread_func( PRTL_THREAD_START_ROUTINE entry, void *ar { __TRY { - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); call_thread_func_wrapper( pBaseThreadInitThunk, entry, arg ); } __EXCEPT(call_unhandled_exception_filter) @@ -325,7 +324,6 @@ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) { __TRY { - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); pBaseThreadInitThunk( 0, (LPTHREAD_START_ROUTINE)entry, arg ); } __EXCEPT(call_unhandled_exception_filter)

1 0

Esme Povirk : user32/tests: Reduce size demand in test_hvredraw.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 431d1943f53c0f317d8bf07f808dffb42723d574 URL: https://gitlab.winehq.org/wine/wine/-/commit/431d1943f53c0f317d8bf07f808dff… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Oct 14 14:20:37 2023 -0500 user32/tests: Reduce size demand in test_hvredraw. --- dlls/user32/tests/msg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ae0e6f3de56..07df7d5cb86 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9598,19 +9598,19 @@ static void subtest_hvredraw(HWND hparent, UINT class_style, DWORD style) static const struct movesize_test { int dx, dy, dw, dh; } movesize_tests[] = { - { 0, 0, 0, 50 }, - { 0, 0, 50, 0 }, - { 0, 0, 50, 50 }, - { 0, 0, -50, -50 }, - { -50, -50, 0, 50 }, - { -50, -50, 50, 0 }, - { -50, -50, 50, 50 }, + { 0, 0, 0, 5 }, + { 0, 0, 5, 0 }, + { 0, 0, 5, 5 }, + { 0, 0, -5, -5 }, + { -5, -5, 0, 5 }, + { -5, -5, 5, 0 }, + { -5, -5, 5, 5 }, }; HRGN hrgn_old_vis = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn_new_vis = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn_expect = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn_actual = CreateRectRgn( 0, 0, 0, 0 ); - const int x0 = 100, y0 = 100, w0 = 200, h0 = 200; + const int x0 = 100, y0 = 100, w0 = 150, h0 = 150; size_t i; HWND hwnd; WNDCLASSA cls = {

1 0

Connor McAdams : uiautomationcore: Potentially raise focus event for serverside providers in response to EVENT_OBJECT_FOCUS.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 2be7de9898131bf40712a76cebfc282e3d41400d URL: https://gitlab.winehq.org/wine/wine/-/commit/2be7de9898131bf40712a76cebfc28… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 11 09:10:31 2023 -0400 uiautomationcore: Potentially raise focus event for serverside providers in response to EVENT_OBJECT_FOCUS. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 16 +++---- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 68 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 47 +++++++++++++++++++++ dlls/uiautomationcore/uia_event.c | 3 +- dlls/uiautomationcore/uia_private.h | 8 ++++ 6 files changed, 133 insertions(+), 10 deletions(-)

1 0

Paul Gofman : ntdll: Use .seh handler instead of __TRY in RtlUserThreadStart() on x64.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: c22aa54e9977785eafcd7cc3811116e5f4dd2da8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c22aa54e9977785eafcd7cc3811116… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 22:39:42 2022 +0300 ntdll: Use .seh handler instead of __TRY in RtlUserThreadStart() on x64. --- dlls/ntdll/thread.c | 36 +++++++++++++++++++++++++++++++++++- include/wine/asm.h | 1 + 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 01733585a75..82a470271d9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -285,7 +285,41 @@ void DECLSPEC_HIDDEN call_thread_func( PRTL_THREAD_START_ROUTINE entry, void *ar __ENDTRY } -#else /* __i386__ */ +#elif /* __i386__ */ defined(__x86_64__) && defined(__ASM_SEH_SUPPORTED) +EXCEPTION_DISPOSITION WINAPI call_thread_func_handler( EXCEPTION_RECORD *rec, ULONG64 frame, + CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) +{ + EXCEPTION_POINTERS ep = { rec, context }; + + WARN( "Unhandled exception, calling filter.\n" ); + + switch (call_unhandled_exception_filter( &ep )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + } + NtTerminateProcess( GetCurrentProcess(), rec->ExceptionCode ); + return ExceptionContinueExecution; +} + +extern void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC( RtlUserThreadStart, + "subq $0x28,%rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + "movq %rdx,%r8\n\t" + "movq %rcx,%rdx\n\t" + "xorq %rcx,%rcx\n\t" + "movq " __ASM_NAME( "pBaseThreadInitThunk" ) "(%rip),%r9\n\t" + "call *%r9\n\t" + "int3\n\t" + ".seh_handler call_thread_func_handler, @except\n\t" ) + +#else /* defined(__x86_64__) && defined(__ASM_SEH_SUPPORTED) */ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) { diff --git a/include/wine/asm.h b/include/wine/asm.h index a158449d6a5..2a21bceb55e 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -54,6 +54,7 @@ # define __ASM_SEH(str) # else # define __ASM_SEH(str) str +# define __ASM_SEH_SUPPORTED # endif #else # define __ASM_SEH(str)

1 0

Helix Graziani : uxtheme/tests: Skip the test if the SystemUsesLightTheme value isn't found.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: e5536fa0de6b9e5dc151bfe3593ac6a72ddfc6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5536fa0de6b9e5dc151bfe3593ac6… Author: Helix Graziani <helix.graziani(a)hotmail.com> Date: Sat Oct 14 17:48:22 2023 -0400 uxtheme/tests: Skip the test if the SystemUsesLightTheme value isn't found. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=55771 --- dlls/uxtheme/tests/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 390baece969..197cd86f6b6 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2617,8 +2617,8 @@ static void test_ShouldSystemUseDarkMode(void) L"SystemUsesLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); if (ls == ERROR_FILE_NOT_FOUND) { - light_theme = 1; - ls = 0; + skip("SystemUsesLightTheme registry value not found.\n"); + return; } ok(ls == 0, "RegGetValue failed: %ld.\n", ls);

1 0

Connor McAdams : uiautomationcore: Add support for translating EVENT_OBJECT_FOCUS for native MSAA IAccessibles.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: cc75dbd315c108298a5f601152040ca7eb47043c URL: https://gitlab.winehq.org/wine/wine/-/commit/cc75dbd315c108298a5f601152040c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 26 11:17:28 2023 -0400 uiautomationcore: Add support for translating EVENT_OBJECT_FOCUS for native MSAA IAccessibles. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 169 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 74 +++++++++++++ dlls/uiautomationcore/uia_event.c | 6 +- dlls/uiautomationcore/uia_private.h | 3 + 4 files changed, 248 insertions(+), 4 deletions(-)

1 0

Gerald Pfeifer : readme: Update FreeBSD information.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: bd0656b6e26007de1e766085be4a084ebfa35dcf URL: https://gitlab.winehq.org/wine/wine/-/commit/bd0656b6e26007de1e766085be4a08… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 15 22:53:27 2023 +0200 readme: Update FreeBSD information. Bump minimum version from 8.0 to 12.4, the minimum release supported upstream. Streamline the FreeBSD section. --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index 2d754da4b82..cc435b6c110 100644 --- a/README +++ b/README @@ -37,7 +37,7 @@ especially the wealth of information found at https://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or later - FreeBSD 8.0 or later + FreeBSD 12.4 or later Solaris x86 9 or later NetBSD-current Mac OS X 10.8 or later @@ -47,7 +47,6 @@ systems mentioned above are supported. Other operating systems which support kernel threads may be supported in the future. FreeBSD info: - Wine will generally not work properly on versions before FreeBSD 8.0. See https://wiki.freebsd.org/Wine for more information. Solaris info:

1 0