February 2024 - Wine-commits

Fabian Maurer : user32/tests: Add exhaustive tests for Get/SetThreadDpiAwarenessContext.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 9ccfac44d55687fd6e9a9fac8a7135d1dd70a8b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ccfac44d55687fd6e9a9fac8a7135… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 18:23:22 2024 +0100 user32/tests: Add exhaustive tests for Get/SetThreadDpiAwarenessContext. --- dlls/user32/tests/sysparams.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 16756ecb06a..68fe455a002 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3778,6 +3778,55 @@ static void test_dpi_aware(void) test_metrics_for_dpi( 192 ); } +static void test_ThreadDpiAwarenessContext(ULONG_PTR flags) +{ + int i; + DPI_AWARENESS_CONTEXT context, last_context; + DPI_AWARENESS awareness; + BOOL ret = pGetProcessDpiAwarenessInternal(GetCurrentProcess(), &awareness); + + struct awareness_context_thread + { + ULONG_PTR context; + ULONG_PTR result_get; + ULONG_PTR result_set; + BOOL todo_get; + BOOL todo_set; + } awareness_contexts[] = { + { 0x10 | flags, 0x10 | flags, 0x10 | flags }, + { 0x11 | flags, 0x11 | flags, 0x11 | flags }, + { 0x12, 0x12, 0x12 }, + { 0x22, 0x22, 0x22, TRUE, TRUE }, + { 0x80000010 | flags, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, + { 0x80000011 | flags, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, + { 0x80000012, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, + { 0x80000022, 0x10 | awareness | flags, 0x80000010 | awareness | flags, FALSE, TRUE }, + { (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE, 0x10 | flags, 0x10 | flags }, + { (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE, 0x11 | flags, 0x11 | flags }, + { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, 0x12, 0x12 }, + { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, 0x22, 0x22, TRUE, TRUE }, + { 0x12, 0x12 }, /* Only for last_result test */ + }; + + ok(ret, "GetProcessDpiAwarenessInternal failed\n"); + + for (i = 0; i < ARRAY_SIZE(awareness_contexts); i++) + { + struct awareness_context_thread *item = &awareness_contexts[i]; + last_context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)item->context ); + ok(last_context != 0, "Failed to set context %p\n", (DPI_AWARENESS_CONTEXT)item->context ); + if (i != 0) + { + struct awareness_context_thread *last = &awareness_contexts[i - 1]; + todo_wine_if(awareness_contexts[i - 1].todo_set) + ok( last_context == (DPI_AWARENESS_CONTEXT)last->result_set, "For context %p - after set expected %p, got %p\n", (DPI_AWARENESS_CONTEXT)last->context, (DPI_AWARENESS_CONTEXT)last->result_set, last_context ); + } + context = pGetThreadDpiAwarenessContext(); + todo_wine_if(item->todo_get) + ok( context == (DPI_AWARENESS_CONTEXT)item->result_get, "For context %p - after get expected %p, got %p\n", (DPI_AWARENESS_CONTEXT)item->context, (DPI_AWARENESS_CONTEXT)item->result_get, context ); + } +} + static void test_dpi_context(void) { DPI_AWARENESS awareness; @@ -3923,6 +3972,9 @@ static void test_dpi_context(void) context = pGetThreadDpiAwarenessContext(); todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); + + test_ThreadDpiAwarenessContext(flags); + for (i = 0; i < 0x100; i++) { awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i );

1 0

Fabian Maurer : user32: Fix Set/GetThreadDpiAwarenessContext for DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 21bdc585f3eb8b23b7973b01e60543e417492a8a URL: https://gitlab.winehq.org/wine/wine/-/commit/21bdc585f3eb8b23b7973b01e60543… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 20:29:05 2024 +0100 user32: Fix Set/GetThreadDpiAwarenessContext for DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56360 --- dlls/user32/sysparams.c | 4 +++- dlls/user32/tests/sysparams.c | 10 +++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ec8dc11af17..d30bed44b31 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -747,7 +747,9 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT prev = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3; prev |= 0x80000010; /* restore to process default */ } - if (((ULONG_PTR)context & ~(ULONG_PTR)0x13) == 0x80000000) info->dpi_awareness = 0; + if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; + else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || context == (DPI_AWARENESS_CONTEXT)0x22) + info->dpi_awareness = 0x22; else info->dpi_awareness = val | 0x10; return ULongToHandle( prev ); } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 68fe455a002..d086725a2b6 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3790,21 +3790,19 @@ static void test_ThreadDpiAwarenessContext(ULONG_PTR flags) ULONG_PTR context; ULONG_PTR result_get; ULONG_PTR result_set; - BOOL todo_get; - BOOL todo_set; } awareness_contexts[] = { { 0x10 | flags, 0x10 | flags, 0x10 | flags }, { 0x11 | flags, 0x11 | flags, 0x11 | flags }, { 0x12, 0x12, 0x12 }, - { 0x22, 0x22, 0x22, TRUE, TRUE }, + { 0x22, 0x22, 0x22}, { 0x80000010 | flags, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, { 0x80000011 | flags, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, { 0x80000012, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, - { 0x80000022, 0x10 | awareness | flags, 0x80000010 | awareness | flags, FALSE, TRUE }, + { 0x80000022, 0x10 | awareness | flags, 0x80000010 | awareness | flags }, { (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE, 0x10 | flags, 0x10 | flags }, { (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE, 0x11 | flags, 0x11 | flags }, { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, 0x12, 0x12 }, - { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, 0x22, 0x22, TRUE, TRUE }, + { (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, 0x22, 0x22 }, { 0x12, 0x12 }, /* Only for last_result test */ }; @@ -3818,11 +3816,9 @@ static void test_ThreadDpiAwarenessContext(ULONG_PTR flags) if (i != 0) { struct awareness_context_thread *last = &awareness_contexts[i - 1]; - todo_wine_if(awareness_contexts[i - 1].todo_set) ok( last_context == (DPI_AWARENESS_CONTEXT)last->result_set, "For context %p - after set expected %p, got %p\n", (DPI_AWARENESS_CONTEXT)last->context, (DPI_AWARENESS_CONTEXT)last->result_set, last_context ); } context = pGetThreadDpiAwarenessContext(); - todo_wine_if(item->todo_get) ok( context == (DPI_AWARENESS_CONTEXT)item->result_get, "For context %p - after get expected %p, got %p\n", (DPI_AWARENESS_CONTEXT)item->context, (DPI_AWARENESS_CONTEXT)item->result_get, context ); } }

1 0

Fabian Maurer : user32/tests: Add tests for AreDpiAwarenessContextsEqual.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: f541d947bb087e1bb58082c4e6fedc238b3a9d22 URL: https://gitlab.winehq.org/wine/wine/-/commit/f541d947bb087e1bb58082c4e6fedc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 22:05:08 2024 +0100 user32/tests: Add tests for AreDpiAwarenessContextsEqual. --- dlls/user32/tests/sysparams.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d086725a2b6..508ee456777 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT); static BOOL (WINAPI *pLogicalToPhysicalPointForPerMonitorDPI)(HWND,POINT*); static BOOL (WINAPI *pPhysicalToLogicalPointForPerMonitorDPI)(HWND,POINT*); static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE); +static BOOL (WINAPI *pAreDpiAwarenessContextsEqual)(DPI_AWARENESS_CONTEXT,DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; @@ -3823,6 +3824,54 @@ static void test_ThreadDpiAwarenessContext(ULONG_PTR flags) } } +static int map_context(ULONG_PTR context, ULONG_PTR flags) +{ + switch (context) + { + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: + return (~(ULONG_PTR)context) | 0x10; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: + return 0x22; + default: + context = context & (~flags); + return context & 0x33; + } +} + +static void test_AreDpiAwarenessContextsEqual(ULONG_PTR flags) +{ + int i, j; + ULONG_PTR contexts[] = { + 0x10 | flags, + 0x11 | flags, + 0x12, + 0x22, + 0x80000010 | flags, + 0x80000011 | flags, + 0x80000012, + 0x80000022, + (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE, + (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE, + (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, + (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, + }; + + for (i = 0; i < ARRAY_SIZE(contexts); i++) + { + for (j = 0; j < ARRAY_SIZE(contexts); j++) + { + BOOL equal = pAreDpiAwarenessContextsEqual((DPI_AWARENESS_CONTEXT)contexts[i], (DPI_AWARENESS_CONTEXT)contexts[j]); + int map_i = map_context(contexts[i], flags); + int map_j = map_context(contexts[j], flags); + BOOL equal_expected = map_i == map_j; + todo_wine_if((map_i == 0x22 && map_j == 0x12) || (map_j == 0x22 && map_i == 0x12)) + ok(equal == equal_expected, "(%d, %d) (%p == %p) - Expected equal to be %d but got %d\n", i, j, (DPI_AWARENESS_CONTEXT)contexts[i], (DPI_AWARENESS_CONTEXT)contexts[j], equal_expected, equal); + } + } +} + static void test_dpi_context(void) { DPI_AWARENESS awareness; @@ -3970,6 +4019,7 @@ static void test_dpi_context(void) ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); test_ThreadDpiAwarenessContext(flags); + test_AreDpiAwarenessContextsEqual(flags); for (i = 0; i < 0x100; i++) { @@ -4265,6 +4315,7 @@ START_TEST(sysparams) pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI"); pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI"); pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState"); + pAreDpiAwarenessContextsEqual = (void*)GetProcAddress(hdll, "AreDpiAwarenessContextsEqual"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0);

1 0

Fabian Maurer : user32: Fix AreDpiAwarenessContextsEqual behavior for DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: c77d2e8a97b0f961e53b6cea5d274edf42956002 URL: https://gitlab.winehq.org/wine/wine/-/commit/c77d2e8a97b0f961e53b6cea5d274e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 22:13:15 2024 +0100 user32: Fix AreDpiAwarenessContextsEqual behavior for DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56360 --- dlls/user32/sysparams.c | 11 +++++++++-- dlls/user32/tests/sysparams.c | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d30bed44b31..9fa37a292d1 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -636,13 +636,20 @@ BOOL WINAPI SetProcessDpiAwarenessInternal( DPI_AWARENESS awareness ) return SetProcessDpiAwarenessContext( contexts[awareness] ); } +static ULONG_PTR map_awareness_context( DPI_AWARENESS_CONTEXT ctx ) +{ + if (ctx == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || ctx == (DPI_AWARENESS_CONTEXT)0x22 || ctx == (DPI_AWARENESS_CONTEXT)0x80000022) + return 0x22; + return GetAwarenessFromDpiAwarenessContext(ctx); +} + /*********************************************************************** * AreDpiAwarenessContextsEqual (USER32.@) */ BOOL WINAPI AreDpiAwarenessContextsEqual( DPI_AWARENESS_CONTEXT ctx1, DPI_AWARENESS_CONTEXT ctx2 ) { - DPI_AWARENESS aware1 = GetAwarenessFromDpiAwarenessContext( ctx1 ); - DPI_AWARENESS aware2 = GetAwarenessFromDpiAwarenessContext( ctx2 ); + DPI_AWARENESS aware1 = map_awareness_context( ctx1 ); + DPI_AWARENESS aware2 = map_awareness_context( ctx2 ); return aware1 != DPI_AWARENESS_INVALID && aware1 == aware2; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 508ee456777..2528d4d4398 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3866,7 +3866,6 @@ static void test_AreDpiAwarenessContextsEqual(ULONG_PTR flags) int map_i = map_context(contexts[i], flags); int map_j = map_context(contexts[j], flags); BOOL equal_expected = map_i == map_j; - todo_wine_if((map_i == 0x22 && map_j == 0x12) || (map_j == 0x22 && map_i == 0x12)) ok(equal == equal_expected, "(%d, %d) (%p == %p) - Expected equal to be %d but got %d\n", i, j, (DPI_AWARENESS_CONTEXT)contexts[i], (DPI_AWARENESS_CONTEXT)contexts[j], equal_expected, equal); } }

1 0

Fabian Maurer : win32u: Sync dpi awareness changes from user32.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 8351a45cb2e650dcc0fc695fc3ce0ad8f32ca5fe URL: https://gitlab.winehq.org/wine/wine/-/commit/8351a45cb2e650dcc0fc695fc3ce0a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 22:20:07 2024 +0100 win32u: Sync dpi awareness changes from user32. --- dlls/user32/sysparams.c | 2 ++ dlls/win32u/sysparams.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9fa37a292d1..a3f768ff66d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -655,6 +655,7 @@ BOOL WINAPI AreDpiAwarenessContextsEqual( DPI_AWARENESS_CONTEXT ctx1, DPI_AWAREN /*********************************************************************** * GetAwarenessFromDpiAwarenessContext (USER32.@) + * copied into win32u, make sure to keep that in sync */ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) { @@ -738,6 +739,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) /********************************************************************** * SetThreadDpiAwarenessContext (USER32.@) + * copied into win32u, make sure to keep that in sync */ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) { diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7dc807bb909..a31d586a5b6 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2187,7 +2187,7 @@ UINT get_win_monitor_dpi( HWND hwnd ) return system_dpi; } -/* see GetAwarenessFromDpiAwarenessContext */ +/* copied from user32 GetAwarenessFromDpiAwarenessContext, make sure to keep that in sync */ static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CONTEXT context ) { switch ((ULONG_PTR)context) @@ -2195,14 +2195,18 @@ static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CON case 0x10: case 0x11: case 0x12: + case 0x22: case 0x80000010: case 0x80000011: case 0x80000012: + case 0x80000022: return (ULONG_PTR)context & 3; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: return ~(ULONG_PTR)context; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: + return ~(ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; default: return DPI_AWARENESS_INVALID; } @@ -2249,6 +2253,7 @@ UINT get_system_dpi(void) /********************************************************************** * SetThreadDpiAwarenessContext (win32u.so) + * copied from user32, make sure to keep that in sync */ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) { @@ -2265,7 +2270,9 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT prev = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3; prev |= 0x80000010; /* restore to process default */ } - if (((ULONG_PTR)context & ~(ULONG_PTR)0x13) == 0x80000000) info->dpi_awareness = 0; + if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; + else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || context == (DPI_AWARENESS_CONTEXT)0x22) + info->dpi_awareness = 0x22; else info->dpi_awareness = val | 0x10; return ULongToHandle( prev ); }

1 0

Alexandre Julliard : winebuild: Remove some no longer used support for ELF ARM platforms.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 4e25c07689d4958cd070f0589dab8a2d06004bb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e25c07689d4958cd070f0589dab8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 12:51:46 2024 +0100 winebuild: Remove some no longer used support for ELF ARM platforms. --- tools/winebuild/build.h | 2 -- tools/winebuild/import.c | 42 +++++++++++-------------------------- tools/winebuild/spec32.c | 25 ++++------------------ tools/winebuild/utils.c | 54 +++--------------------------------------------- 4 files changed, 19 insertions(+), 104 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index af7861275a3..a469a0e9042 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -301,8 +301,6 @@ extern const char *get_asm_export_section(void); extern const char *get_asm_rodata_section(void); extern const char *get_asm_rsrc_section(void); extern const char *get_asm_string_section(void); -extern const char *arm64_page( const char *sym ); -extern const char *arm64_pageoff( const char *sym ); extern void output_function_header( const char *func, int global ); extern void output_function_size( const char *name ); extern void output_gnu_stack_note(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a2473efc5ba..eb9f0205eb5 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -777,19 +777,7 @@ static void output_import_thunk( const char *name, const char *table, int pos ) case CPU_x86_64: output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; - case CPU_ARM: - output( "\tldr ip, 1f\n"); - output( "\tldr pc, [ip]\n"); - output( "1:\t.long %s+%u\n", table, pos ); - break; - case CPU_ARM64: - output( "\tadrp x16, %s\n", arm64_page( table ) ); - output( "\tadd x16, x16, #%s\n", arm64_pageoff( table ) ); - if (pos & ~0x7fff) output( "\tadd x16, x16, #%u\n", pos & ~0x7fff ); - output( "\tldr x16, [x16, #%u]\n", pos & 0x7fff ); - output( "\tbr x16\n" ); - break; - case CPU_ARM64EC: + default: assert( 0 ); break; } @@ -1077,9 +1065,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -0x98" ); output( "\tjmp *%%rax\n" ); break; - case CPU_ARM: - case CPU_ARM64: - case CPU_ARM64EC: + default: assert( 0 ); break; } @@ -1109,9 +1095,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tleaq .L__wine_delay_IAT+%d(%%rip),%%rax\n", iat_pos ); output( "\tjmp %s\n", asm_name(module_func) ); break; - case CPU_ARM: - case CPU_ARM64: - case CPU_ARM64EC: + default: assert( 0 ); break; } @@ -1274,14 +1258,12 @@ void output_stubs( DLLSPEC *spec ) case CPU_ARM64EC: output( "\t.seh_proc %s\n", arm64_name(name) ); output( "\t.seh_endprologue\n" ); - output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_file_name") ); - output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_file_name") ); + output( "\tadrp x0, .L__wine_spec_file_name\n" ); + output( "\tadd x0, x0, #:lo12:.L__wine_spec_file_name\n" ); if (exp_name) { - char *sym = strmake( ".L%s_string", name ); - output( "\tadrp x1, %s\n", arm64_page( sym ) ); - output( "\tadd x1, x1, #%s\n", arm64_pageoff( sym ) ); - free( sym ); + output( "\tadrp x1, .L%s_string\n", name ); + output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); } else output( "\tmov x1, %u\n", odp->ordinal ); @@ -1532,7 +1514,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tstp x6, x7, [sp, #64]\n" ); output( "\tmov x1, x16\n" ); output( "\tadrp x0, %s\n", asm_name( import_desc ) ); - output( "\tadd x0, x0, #%s\n", asm_name( import_desc ) ); + output( "\tadd x0, x0, #:lo12:%s\n", asm_name( import_desc ) ); output( "\tbl __delayLoadHelper2\n" ); output( "\tmov x16, x0\n" ); output( "\tldp x0, x1, [sp, #16]\n" ); @@ -1677,15 +1659,15 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "1:\t.long %s\n", asm_name( imp_name ) ); break; case CPU_ARM64: - output( "\tadrp x16, %s\n", arm64_page( asm_name( imp_name ) ) ); - output( "\tadd x16, x16, #%s\n", arm64_pageoff( asm_name( imp_name ) ) ); + output( "\tadrp x16, %s\n", asm_name( imp_name ) ); + output( "\tadd x16, x16, #:lo12:%s\n", asm_name( imp_name ) ); output( "\tbr x16\n" ); if (is_delay) { output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); - output( "\tadrp x16, %s\n", arm64_page( asm_name( imp_name ) ) ); - output( "\tadd x16, x16, #%s\n", arm64_pageoff( asm_name( imp_name ) ) ); + output( "\tadrp x16, %s\n", asm_name( imp_name ) ); + output( "\tadd x16, x16, #:lo12:%s\n", asm_name( imp_name ) ); output( "\tb %s\n", asm_name( delay_load ) ); } break; diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index e7d195d3081..7e41f2d5a3d 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -352,8 +352,8 @@ static void output_relay_debug( struct exports *exports ) output( "\tstp x8, x9, [SP,#-16]!\n" ); output( "\tmov w1, #%u\n", odp->u.func.args_str_offset << 16 ); if (i - exports->base) output( "\tadd w1, w1, #%u\n", i - exports->base ); - output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_relay_descr") ); - output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_relay_descr") ); + output( "\tadrp x0, .L__wine_spec_relay_descr\n" ); + output( "\tadd x0, x0, #:lo12:.L__wine_spec_relay_descr\n" ); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); output( "\tmov sp, x29\n" ); @@ -636,25 +636,8 @@ void output_module( DLLSPEC *spec ) output( "\t.skip %u\n", 65536 + page_size ); break; default: - switch (target.cpu) - { - case CPU_i386: - case CPU_x86_64: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tjmp 1f\n" ); - break; - case CPU_ARM: - output( "\n\t.section \".text\",\"ax\"\n" ); - output( "\tb 1f\n" ); - break; - case CPU_ARM64: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tb 1f\n" ); - break; - case CPU_ARM64EC: - assert( 0 ); - break; - } + output( "\n\t.section \".init\",\"ax\"\n" ); + output( "\tjmp 1f\n" ); output( "__wine_spec_pe_header:\n" ); output( "\t.skip %u\n", 65536 + page_size ); output( "1:\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 258a644b494..62f05e535b6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -823,15 +823,8 @@ const char *asm_name( const char *sym ) /* return the assembly name for an ARM64/ARM64EC function */ const char *arm64_name( const char *sym ) { - switch (target.platform) - { - case PLATFORM_MINGW: - case PLATFORM_WINDOWS: - if (target.cpu == CPU_ARM64EC) return strmake( "\"#%s\"", sym ); - /* fall through */ - default: - return asm_name( sym ); - } + if (target.cpu == CPU_ARM64EC) return strmake( "\"#%s\"", sym ); + return asm_name( sym ); } /* return an assembly function declaration for a C function name */ @@ -967,16 +960,7 @@ void output_gnu_stack_note(void) case PLATFORM_APPLE: break; default: - switch (target.cpu) - { - case CPU_ARM: - case CPU_ARM64: - output( "\t.section .note.GNU-stack,\"\",%%progbits\n" ); - break; - default: - output( "\t.section .note.GNU-stack,\"\",@progbits\n" ); - break; - } + output( "\t.section .note.GNU-stack,\"\",@progbits\n" ); break; } } @@ -1067,35 +1051,3 @@ const char *get_asm_string_section(void) default: return ".section .rodata"; } } - -const char *arm64_page( const char *sym ) -{ - static char *buffer; - - switch (target.platform) - { - case PLATFORM_APPLE: - free( buffer ); - buffer = strmake( "%s(a)PAGE", sym ); - return buffer; - default: - return sym; - } -} - -const char *arm64_pageoff( const char *sym ) -{ - static char *buffer; - - free( buffer ); - switch (target.platform) - { - case PLATFORM_APPLE: - buffer = strmake( "%s(a)PAGEOFF", sym ); - break; - default: - buffer = strmake( ":lo12:%s", sym ); - break; - } - return buffer; -}

1 0

Alexandre Julliard : wow64: Update Wow64RaiseException behavior to match i386 hardware exceptions.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 259b92d13e2d2c67876006ff0485e7031f4ec7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/259b92d13e2d2c67876006ff0485e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:02:18 2024 +0100 wow64: Update Wow64RaiseException behavior to match i386 hardware exceptions. --- dlls/wow64/syscall.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index db51948057f..78338f7ef6a 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1330,11 +1330,13 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) int_rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; break; case 0x01: /* single-step */ + ctx32.i386.EFlags &= ~0x100; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); int_rec.ExceptionCode = EXCEPTION_SINGLE_STEP; break; case 0x03: /* breakpoint */ int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; - int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip + 1); + int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip - 1); int_rec.NumberParameters = 1; break; case 0x04: /* overflow */ @@ -1352,6 +1354,9 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) case 0x0c: /* stack fault */ int_rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; break; + case 0x0d: /* general protection fault */ + int_rec.ExceptionCode = EXCEPTION_PRIV_INSTRUCTION; + break; case 0x29: /* __fastfail */ int_rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; int_rec.ExceptionFlags = EH_NONCONTINUABLE; @@ -1360,7 +1365,7 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) first_chance = FALSE; break; case 0x2d: /* debug service */ - ctx32.i386.Eip++; + ctx32.i386.Eip += 3; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; @@ -1368,8 +1373,6 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) int_rec.ExceptionInformation[0] = ctx32.i386.Eax; break; default: - ctx32.i386.Eip -= 2; - pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); int_rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; int_rec.NumberParameters = 2;

1 0

Alexandre Julliard : wow64: Use a .seh handler for the simulation loop.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 89336772f810cf0ecc456d5a94ad766fb92e87e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/89336772f810cf0ecc456d5a94ad76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:20:55 2024 +0100 wow64: Use a .seh handler for the simulation loop. --- dlls/wow64/syscall.c | 75 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 78338f7ef6a..9f1f324ce35 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -940,25 +940,75 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) /********************************************************************** - * simulate_filter + * cpu_simulate */ +#ifdef __aarch64__ +extern void DECLSPEC_NORETURN cpu_simulate( void (*func)(void) ); +__ASM_GLOBAL_FUNC( cpu_simulate, + "stp x29, x30, [sp, #-32]!\n\t" + ".seh_save_fplr_x 32\n\t" + ".seh_endprologue\n\t" + ".seh_handler cpu_simulate_handler, @except\n\t" + "str x0, [sp, #16]\n" + ".Lcpu_simulate_loop:\n\t" + "ldr x0, [sp, #16]\n\t" + "blr x0\n\t" + "b .Lcpu_simulate_loop" ) +__ASM_GLOBAL_FUNC( cpu_simulate_handler, + "stp x29, x30, [sp, #-32]!\n\t" + ".seh_save_fplr_x 32\n\t" + ".seh_endprologue\n\t" + "mov x19, x0\n\t" /* record */ + "mov x20, x1\n\t" /* frame */ + "stp x0, x2, [sp, #16]\n\t" /* record, context */ + "add x0, sp, #16\n\t" + "bl Wow64PassExceptionToGuest\n\t" + "mov x20, x0\n\t" /* frame */ + "adr x1, .Lcpu_simulate_loop\n\t" /* target */ + "mov x19, x2\n\t" /* record */ + "bl RtlUnwind\n\t" + "brk #1" ) + +#elif defined __WINE_PE_BUILD +extern void DECLSPEC_NORETURN cpu_simulate( void (*func)(void) ); +__ASM_GLOBAL_FUNC( cpu_simulate, + "subq $0x28, %rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + ".seh_handler cpu_simulate_handler, @except\n\t" + "movq %rcx,0x20(%rsp)\n" + ".Lcpu_simulate_loop:\n\t" + "call *0x20(%rsp)\n\t" + "jmp .Lcpu_simulate_loop" ) +__ASM_GLOBAL_FUNC( cpu_simulate_handler, + "subq $0x38, %rsp\n\t" + ".seh_stackalloc 0x38\n\t" + ".seh_endprologue\n\t" + "movq %rcx,%rsi\n\t" /* record */ + "movq %rcx,0x20(%rsp)\n\t" + "movq %rdx,%rdi\n\t" /* frame */ + "movq %r8,0x28(%rsp)\n\t" /* context */ + "leaq 0x20(%rsp),%rcx\n\t" + "call Wow64PassExceptionToGuest\n\t" + "movq %rdi,%rcx\n\t" /* frame */ + "leaq .Lcpu_simulate_loop(%rip), %rdx\n\t" /* target */ + "movq %rsi,%r8\n\t" /* record */ + "call RtlUnwind\n\t" + "int3" ) +#else static LONG CALLBACK simulate_filter( EXCEPTION_POINTERS *ptrs ) { Wow64PassExceptionToGuest( ptrs ); return EXCEPTION_EXECUTE_HANDLER; } - -/********************************************************************** - * cpu_simulate - */ -static void cpu_simulate(void) +static void cpu_simulate( void (*func)(void) ) { for (;;) { __TRY { - pBTCpuSimulate(); + func(); } __EXCEPT( simulate_filter ) { @@ -967,6 +1017,7 @@ static void cpu_simulate(void) __ENDTRY } } +#endif /********************************************************************** @@ -1039,7 +1090,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ctx.Eip = pLdrSystemDllInitBlock->pKiUserApcDispatcher; frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); } break; @@ -1065,7 +1116,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ctx.R3 = arg3; frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); } break; } @@ -1128,7 +1179,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); if (!__wine_setjmpex( &frame.jmpbuf, NULL )) - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); else pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &orig_ctx ); } @@ -1153,7 +1204,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); if (!__wine_setjmpex( &frame.jmpbuf, NULL )) - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); else pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &orig_ctx ); } @@ -1177,7 +1228,7 @@ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) RtlRunOnceExecuteOnce( &init_done, process_init, NULL, NULL ); thread_init(); - cpu_simulate(); + cpu_simulate( pBTCpuSimulate ); }

1 0

Alexandre Julliard : ntdll: Always use .seh handlers on ARM.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 58e68a1b8a1ff84f09b25de65c20904bcce484d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/58e68a1b8a1ff84f09b25de65c2090… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:46:47 2024 +0100 ntdll: Always use .seh handlers on ARM. --- dlls/ntdll/signal_arm.c | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 4fe2d8bd96a..834d52fb83b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -907,7 +907,6 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ -#ifdef __WINE_PE_BUILD __ASM_GLOBAL_FUNC( RtlUserThreadStart, ".seh_endprologue\n\t" "mov r2, r1\n\t" @@ -918,20 +917,6 @@ __ASM_GLOBAL_FUNC( RtlUserThreadStart, "blx ip\n" "1:\t.long " __ASM_NAME("pBaseThreadInitThunk") "\n\t" ".seh_handler " __ASM_NAME("call_unhandled_exception_handler") ", %except" ) -#else -void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) -{ - __TRY - { - pBaseThreadInitThunk( 0, (LPTHREAD_START_ROUTINE)entry, arg ); - } - __EXCEPT(call_unhandled_exception_filter) - { - NtTerminateProcess( GetCurrentProcess(), GetExceptionCode() ); - } - __ENDTRY -} -#endif /****************************************************************** * LdrInitializeThunk (NTDLL.@) @@ -946,7 +931,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 /*********************************************************************** * process_breakpoint */ -#ifdef __WINE_PE_BUILD __ASM_GLOBAL_FUNC( process_breakpoint, ".seh_endprologue\n\t" ".seh_handler process_breakpoint_handler, %except\n\t" @@ -958,25 +942,10 @@ __ASM_GLOBAL_FUNC( process_breakpoint, "str r0, [r2, #0x40]\n\t" "mov r0, #0\n\t" /* ExceptionContinueExecution */ "bx lr" ) -#else -void WINAPI process_breakpoint(void) -{ - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY -} -#endif /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ -#ifdef __WINE_PE_BUILD __ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, ".seh_endprologue\n\t" ".seh_handler DbgUiRemoteBreakin_handler, %except\n\t" @@ -990,24 +959,6 @@ __ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, "DbgUiRemoteBreakin_handler:\n\t" "mov sp, r1\n\t" /* frame */ "b 1b" ) -#else -void WINAPI DbgUiRemoteBreakin( void *arg ) -{ - if (NtCurrentTeb()->Peb->BeingDebugged) - { - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY - } - RtlExitUserThread( STATUS_SUCCESS ); -} -#endif /********************************************************************** * DbgBreakPoint (NTDLL.@)

1 0

Alexandre Julliard : ntdll: Use a .seh handler in DbgUiRemoteBreakin on ARM64EC.
by Alexandre Julliard 27 Feb '24

27 Feb '24

Module: wine Branch: master Commit: 8e26b7e0077dc3eab5d3ce9fc322e1484f31824f URL: https://gitlab.winehq.org/wine/wine/-/commit/8e26b7e0077dc3eab5d3ce9fc322e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:48:25 2024 +0100 ntdll: Use a .seh handler in DbgUiRemoteBreakin on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index a2b21f51ead..5fc4b113a97 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1792,26 +1792,30 @@ __ASM_GLOBAL_FUNC( "#process_breakpoint", "mov w0, #0\n\t" /* ExceptionContinueExecution */ "ret" ) + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ -void WINAPI DbgUiRemoteBreakin( void *arg ) +void __attribute__((naked)) DbgUiRemoteBreakin( void *arg ) { - if (NtCurrentTeb()->Peb->BeingDebugged) - { - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY - } - RtlExitUserThread( STATUS_SUCCESS ); + asm( ".seh_proc DbgUiRemoteBreakin\n\t" + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, @except\n\t" + "ldr x0, [x18, #0x60]\n\t" /* NtCurrentTeb()->Peb */ + "ldrb w0, [x0, 0x02]\n\t" /* peb->BeingDebugged */ + "cbz w0, 1f\n\t" + "bl DbgBreakPoint\n" + "1:\tmov w0, #0\n\t" + "bl RtlExitUserThread\n" + "DbgUiRemoteBreakin_handler:\n\t" + "mov sp, x1\n\t" /* frame */ + "b 1b\n\t" + ".seh_endproc" ); } + /********************************************************************** * DbgBreakPoint (NTDLL.@) */

1 0