wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Alexandre Julliard : msvcrt: Import setjmp/setjmpex from ntdll.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: d538432d79dfe9941934a5478c5c54ba46a3b959 URL: https://gitlab.winehq.org/wine/wine/-/commit/d538432d79dfe9941934a5478c5c54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 13:45:07 2024 +0100 msvcrt: Import setjmp/setjmpex from ntdll. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 8 ++++---- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/except_arm.c | 6 ------ dlls/msvcrt/except_arm64.c | 3 +-- dlls/msvcrt/except_arm64ec.c | 9 --------- dlls/msvcrt/except_i386.c | 9 +++++---- dlls/msvcrt/except_x86_64.c | 6 ------ dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 17 files changed, 41 insertions(+), 62 deletions(-)

1 0

Alexandre Julliard : include: Always use _setjmpex on non-i386 platforms.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 1d168222fd78052f54c8225ba9189eeeaecb3764 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d168222fd78052f54c8225ba9189e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 13:25:15 2024 +0100 include: Always use _setjmpex on non-i386 platforms. --- include/msvcrt/setjmp.h | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 6576605cf1b..38f9ba682ad 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -147,29 +147,35 @@ extern "C" { _ACRTIMP void __cdecl longjmp(jmp_buf,int); -#ifdef _WIN64 -# ifdef _UCRT +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +#ifdef _UCRT +# ifdef __i386__ +# define _setjmp __intrinsic_setjmp +# else # define _setjmpex __intrinsic_setjmpex # endif -# if defined(__GNUC__) || defined(__clang__) -_ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); -# define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) -# define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) +#endif + +#ifdef __i386__ +# if defined(_setjmp) || !__has_builtin(_setjmp) +_ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); # endif -#else /* _WIN64 */ -# ifdef _UCRT -# define _setjmp __intrinsic_setjmp +# define setjmp(buf) _setjmp((buf)) +#else /* __i386__ */ +# if defined(_setjmpex) || !__has_builtin(_setjmpex) +_ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # endif -# if defined(__GNUC__) || defined(__clang__) -_ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); +# if __has_builtin(__builtin_sponentry) +# define setjmp(buf) _setjmpex((buf), __builtin_sponentry()) +# elif __has_builtin(__builtin_frame_address) +# define setjmp(buf) _setjmpex((buf), __builtin_frame_address(0)) # else -_ACRTIMP int __cdecl _setjmp(jmp_buf); +# define setjmp(buf) _setjmpex((buf), NULL) # endif -#endif /* _WIN64 */ - -#ifndef setjmp -#define setjmp _setjmp -#endif +#endif /* __i386__ */ #ifdef __cplusplus }

1 0

Alexandre Julliard : winedump: Dump the __os_arm64x_helper functions.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 5c26513278220f9772a9f54caa50a8c3c4d089d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c26513278220f9772a9f54caa50a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 09:57:49 2024 +0100 winedump: Dump the __os_arm64x_helper functions. --- tools/winedump/pe.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d4bf46c5307..8ff0a955c99 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1911,6 +1911,15 @@ static void dump_hybrid_metadata(void) printf( " ExtraRFETableSize %#x\n", (int)data->ExtraRFETableSize ); printf( " __os_arm64x_dispatch_fptr %#x\n", (int)data->__os_arm64x_dispatch_fptr ); printf( " AuxiliaryIATCopy %#x\n", (int)data->AuxiliaryIATCopy ); + printf( " __os_arm64x_helper0 %#x\n", (int)data->__os_arm64x_helper0 ); + printf( " __os_arm64x_helper1 %#x\n", (int)data->__os_arm64x_helper1 ); + printf( " __os_arm64x_helper2 %#x\n", (int)data->__os_arm64x_helper2 ); + printf( " __os_arm64x_helper3 %#x\n", (int)data->__os_arm64x_helper3 ); + printf( " __os_arm64x_helper4 %#x\n", (int)data->__os_arm64x_helper4 ); + printf( " __os_arm64x_helper5 %#x\n", (int)data->__os_arm64x_helper5 ); + printf( " __os_arm64x_helper6 %#x\n", (int)data->__os_arm64x_helper6 ); + printf( " __os_arm64x_helper7 %#x\n", (int)data->__os_arm64x_helper7 ); + printf( " __os_arm64x_helper8 %#x\n", (int)data->__os_arm64x_helper8 ); if (data->CodeMap) {

1 0

Alexandre Julliard : ntdll: Support the __os_arm64x_helper functions in the loader.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 4a026f4230d2888fd57f26bcc5efe5d98c0091e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a026f4230d2888fd57f26bcc5efe5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 09:57:10 2024 +0100 ntdll: Support the __os_arm64x_helper functions in the loader. --- dlls/ntdll/loader.c | 28 +++++++++++++++++++++------- dlls/ntdll/ntdll_misc.h | 9 +++++++++ include/winnt.h | 9 +++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 765fb5b1617..b389a16d2a7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -240,18 +240,23 @@ static void module_push_unload_trace( const WINE_MODREF *wm ) #ifdef __arm64ec__ +static void update_hybrid_pointer( void *module, const IMAGE_SECTION_HEADER *sec, UINT rva, void *ptr ) +{ + if (!rva) return; + + if (rva < sec->VirtualAddress || rva >= sec->VirtualAddress + sec->Misc.VirtualSize) + ERR( "rva %x outside of section %s (%lx-%lx)\n", rva, + sec->Name, sec->VirtualAddress, sec->VirtualAddress + sec->Misc.VirtualSize ); + else + *(void **)get_rva( module, rva ) = ptr; +} + static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt, const IMAGE_ARM64EC_METADATA *metadata ) { DWORD i, protect_old; const IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); - if (metadata->Version != 1) - { - ERR( "unknown version %lu\n", metadata->Version ); - return; - } - /* assume that all pointers are in the same section */ for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) @@ -264,13 +269,22 @@ static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt, NtProtectVirtualMemory( NtCurrentProcess(), &base, &size, PAGE_READWRITE, &protect_old ); -#define SET_FUNC(func,val) *(void **)get_rva( module, metadata->func ) = val +#define SET_FUNC(func,val) update_hybrid_pointer( module, sec, metadata->func, val ) SET_FUNC( __os_arm64x_dispatch_call, __os_arm64x_check_call ); SET_FUNC( __os_arm64x_dispatch_call_no_redirect, __os_arm64x_dispatch_call_no_redirect ); SET_FUNC( __os_arm64x_dispatch_fptr, __os_arm64x_dispatch_fptr ); SET_FUNC( __os_arm64x_dispatch_icall, __os_arm64x_check_icall ); SET_FUNC( __os_arm64x_dispatch_icall_cfg, __os_arm64x_check_icall_cfg ); SET_FUNC( __os_arm64x_dispatch_ret, __os_arm64x_dispatch_ret ); + SET_FUNC( __os_arm64x_helper0, __os_arm64x_helper0 ); + SET_FUNC( __os_arm64x_helper1, __os_arm64x_helper1 ); + SET_FUNC( __os_arm64x_helper2, __os_arm64x_helper2 ); + SET_FUNC( __os_arm64x_helper3, __os_arm64x_helper3 ); + SET_FUNC( __os_arm64x_helper4, __os_arm64x_helper4 ); + SET_FUNC( __os_arm64x_helper5, __os_arm64x_helper5 ); + SET_FUNC( __os_arm64x_helper6, __os_arm64x_helper6 ); + SET_FUNC( __os_arm64x_helper7, __os_arm64x_helper7 ); + SET_FUNC( __os_arm64x_helper8, __os_arm64x_helper8 ); SET_FUNC( GetX64InformationFunctionPointer, __os_arm64x_get_x64_information ); SET_FUNC( SetX64InformationFunctionPointer, __os_arm64x_set_x64_information ); #undef SET_FUNC diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 171ded98c67..cc467d44966 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -170,6 +170,15 @@ extern void *__os_arm64x_dispatch_fptr; extern void *__os_arm64x_dispatch_ret; extern void *__os_arm64x_get_x64_information; extern void *__os_arm64x_set_x64_information; +extern void *__os_arm64x_helper0; +extern void *__os_arm64x_helper1; +extern void *__os_arm64x_helper2; +extern void *__os_arm64x_helper3; +extern void *__os_arm64x_helper4; +extern void *__os_arm64x_helper5; +extern void *__os_arm64x_helper6; +extern void *__os_arm64x_helper7; +extern void *__os_arm64x_helper8; #endif diff --git a/include/winnt.h b/include/winnt.h index 7adbc1d3761..e7c322fd127 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4044,6 +4044,15 @@ typedef struct _IMAGE_ARM64EC_METADATA ULONG ExtraRFETableSize; ULONG __os_arm64x_dispatch_fptr; ULONG AuxiliaryIATCopy; + ULONG __os_arm64x_helper0; + ULONG __os_arm64x_helper1; + ULONG __os_arm64x_helper2; + ULONG __os_arm64x_helper3; + ULONG __os_arm64x_helper4; + ULONG __os_arm64x_helper5; + ULONG __os_arm64x_helper6; + ULONG __os_arm64x_helper7; + ULONG __os_arm64x_helper8; } IMAGE_ARM64EC_METADATA; typedef struct _IMAGE_ARM64EC_REDIRECTION_ENTRY

1 0

Alexandre Julliard : ntdll: Remove a misleading WARN.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: fd5b56b96d43b9314d2ae0096200b109beb32549 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd5b56b96d43b9314d2ae0096200b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 17:13:18 2024 +0100 ntdll: Remove a misleading WARN. --- dlls/ntdll/signal_x86_64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b49ec23860f..8b1de07ccc9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -88,7 +88,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } if (status != STATUS_UNSUCCESSFUL) return status; } - else WARN( "exception data not found for pc %p\n", (void *)context->Rip ); return RtlVirtualUnwind2( type, dispatch->ImageBase, context->Rip, dispatch->FunctionEntry, context, NULL, &dispatch->HandlerData, &dispatch->EstablisherFrame,

1 0

Alexandre Julliard : ntdll: Don't copy a missing context in get_thread_context().
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 8dc2cc24d713ff9c9b38039e33ae951f90372e69 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dc2cc24d713ff9c9b38039e33ae95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 09:51:56 2024 +0100 ntdll: Don't copy a missing context in get_thread_context(). Fixes a test failure on ARM64EC. --- dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 7f2f1b9a50e..60c833b0320 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1790,7 +1790,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma } SERVER_END_REQ; } - if (!ret) + if (!ret && count) { ret = context_from_server( context, &server_contexts[0], machine ); if (!ret && count > 1) ret = context_from_server( context, &server_contexts[1], machine );

1 0

Zebediah Figura : server: Create processes using a limited administrator token by default.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: e92ba2de43d7afbe0704b11b29f7c30f44dfaeca URL: https://gitlab.winehq.org/wine/wine/-/commit/e92ba2de43d7afbe0704b11b29f7c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 7 22:54:19 2021 -0600 server: Create processes using a limited administrator token by default. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40613 --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index bf5b7cc26d3..abd6edb58a9 100644 --- a/server/process.c +++ b/server/process.c @@ -711,7 +711,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla if (!parent) { process->handles = alloc_handle_table( process, 0 ); - process->token = token_create_admin( TRUE, -1, TokenElevationTypeFull, default_session_id ); + process->token = token_create_admin( TRUE, -1, TokenElevationTypeLimited, default_session_id ); process->affinity = ~0; } else

1 0

Zebediah Figura : ntdll: Elevate processes if requested in the manifest.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 897bcd5d5c6b12d6e69c2a688cfcfd4d42fd1ea0 URL: https://gitlab.winehq.org/wine/wine/-/commit/897bcd5d5c6b12d6e69c2a688cfcfd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 20:14:29 2024 -0600 ntdll: Elevate processes if requested in the manifest. Rufus 3.13 Portable requires administrator privileges, and uses a manifest to elevate itself. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51000 --- dlls/ntdll/loader.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cf9f4ac9a84..765fb5b1617 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -35,6 +35,7 @@ #include "wine/debug.h" #include "wine/list.h" #include "ntdll_misc.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -4104,7 +4105,40 @@ static void load_global_options(void) } } +static BOOL needs_elevation(void) +{ + ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION run_level; + + if (!RtlQueryInformationActivationContext( 0, NULL, NULL, RunlevelInformationInActivationContext, + &run_level, sizeof(run_level), NULL )) + { + TRACE( "image requested run level %#x\n", run_level.RunLevel ); + if (run_level.RunLevel == ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE + || run_level.RunLevel == ACTCTX_RUN_LEVEL_REQUIRE_ADMIN) + return TRUE; + } + return FALSE; +} +static void elevate_token(void) +{ + PROCESS_ACCESS_TOKEN token; + TOKEN_ELEVATION_TYPE type; + TOKEN_LINKED_TOKEN linked; + + NtQueryInformationToken( GetCurrentThreadEffectiveToken(), + TokenElevationType, &type, sizeof(type), NULL ); + + if (type == TokenElevationTypeFull) return; + + NtQueryInformationToken( GetCurrentThreadEffectiveToken(), + TokenLinkedToken, &linked, sizeof(linked), NULL ); + + token.Thread = NULL; + token.Token = linked.LinkedToken; + NtSetInformationProcess( GetCurrentProcess(), ProcessAccessToken, &token, sizeof(token) ); + NtClose( linked.LinkedToken ); +} #ifdef _WIN64 @@ -4290,6 +4324,8 @@ void loader_init( CONTEXT *context, void **entry ) actctx_init(); locale_init(); + if (needs_elevation()) + elevate_token(); get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry );

1 0

Zebediah Figura : ntdll: Implement NtSetInformationProcess(ProcessAccessToken).
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 95a91bd816c2bf01e48f7d7ae4a1eb947b749e98 URL: https://gitlab.winehq.org/wine/wine/-/commit/95a91bd816c2bf01e48f7d7ae4a1eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 20:04:00 2024 -0600 ntdll: Implement NtSetInformationProcess(ProcessAccessToken). --- dlls/ntdll/tests/info.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 18 ++++++++++ dlls/wow64/process.c | 13 ++++++++ dlls/wow64/struct32.h | 6 ++++ include/ddk/ntddk.h | 6 ++++ include/wine/server_protocol.h | 5 ++- server/process.c | 10 ++++++ server/protocol.def | 2 ++ server/request.h | 3 +- server/trace.c | 1 + 10 files changed, 136 insertions(+), 2 deletions(-)

1 0

Zebediah Figura : winetest: Elevate test processes on Wine.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 3103adb6a69a3e1ec184e6abf712c993aa8491e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3103adb6a69a3e1ec184e6abf712c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 20 21:55:59 2024 -0600 winetest: Elevate test processes on Wine. --- programs/winetest/main.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a939034e8b9..dc4fc4b3581 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -687,6 +687,21 @@ extract_test (struct wine_test *test, const char *dir, LPSTR res_name) CloseHandle(hfile); } +static HANDLE get_admin_token(void) +{ + TOKEN_ELEVATION_TYPE type; + TOKEN_LINKED_TOKEN linked; + DWORD size; + + if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenElevationType, &type, sizeof(type), &size) + || type == TokenElevationTypeFull) + return NULL; + + if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenLinkedToken, &linked, sizeof(linked), &size)) + return NULL; + return linked.LinkedToken; +} + static DWORD wait_process( HANDLE process, DWORD timeout ) { DWORD wait, diff = 0, start = GetTickCount(); @@ -722,6 +737,7 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritic PROCESS_INFORMATION pi; DWORD wait, status, flags; UINT old_errmode; + HANDLE token = NULL; GetStartupInfoA (&si); si.dwFlags = STARTF_USESTDHANDLES; @@ -737,8 +753,16 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritic else flags = CREATE_DEFAULT_ERROR_MODE; - if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, flags, - NULL, tempdir, &si, &pi)) + /* Some tests cause a UAC prompt on Windows if the user is not elevated, + * so to allow them to run unattended the relevant test units need to skip + * the tests if so. + * + * However, we still want Wine to run as many tests as possible, so always + * elevate ourselves. On Wine elevation isn't interactive. */ + if (running_under_wine()) + token = get_admin_token(); + + if (!CreateProcessAsUserA(token, NULL, cmd, NULL, NULL, TRUE, flags, NULL, tempdir, &si, &pi)) { if (nocritical) SetErrorMode(old_errmode); if (pid) *pid = 0;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2024