January 2024 - Wine-commits

Bernhard Übelacker : server: Avoid unloading of HKU .Default registry branch.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 26e383c8df94d76c849dc6e61998fd043c2dacdc URL: https://gitlab.winehq.org/wine/wine/-/commit/26e383c8df94d76c849dc6e61998fd… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 21 15:24:11 2024 +0100 server: Avoid unloading of HKU .Default registry branch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55000 --- dlls/advapi32/tests/registry.c | 8 ++++++++ server/registry.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 35df1b226f5..c2b73a8a3fa 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1598,6 +1598,14 @@ static void test_reg_unload_key(void) ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); + pRtlInitUnicodeString(&key_name, L"\\REGISTRY\\User\\.Default"); + InitializeObjectAttributes(&attr, &key_name, OBJ_CASE_INSENSITIVE, NULL, NULL); + status = pNtUnloadKey(&attr); + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %08lx\n", status); + + ret = RegUnLoadKeyA(HKEY_USERS, ".Default"); + ok(ret == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %ld\n", ret); + set_privileges(SE_RESTORE_NAME, FALSE); DeleteFileA("saved_key"); diff --git a/server/registry.c b/server/registry.c index 0128b8be9d8..da6a6d0982e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2357,6 +2357,8 @@ DECL_HANDLER(unload_registry) { if (key->obj.handle_count) set_error( STATUS_CANNOT_DELETE ); + else if (key->obj.is_permanent) + set_error( STATUS_ACCESS_DENIED ); else delete_key( key, 1 ); /* FIXME */ release_object( key );

1 0

Daniel Hill : winex11.drv: Dvorak should use QWERTY scancodes.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 4fb14b565690857be08958852b759122e1a4e2ef URL: https://gitlab.winehq.org/wine/wine/-/commit/4fb14b565690857be08958852b7591… Author: Daniel Hill <daniel(a)gluo.nz> Date: Thu Jan 18 17:23:05 2024 +1300 winex11.drv: Dvorak should use QWERTY scancodes. This make dvorak more consistent with X11/Wayland/Windows, qwertz and azerty layouts having the same physical scancode layout as a qwerty keyboard and only differing in the labels on the keycaps. Signed-off-by: Daniel Hill <daniel(a)gluo.nz> --- dlls/winex11.drv/keyboard.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5c7f6c37276..89bf7da550a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -99,19 +99,6 @@ static const WORD main_key_scan_abnt_qwerty[MAIN_LEN] = 0x56, /* the 102nd key (actually to the right of l-shift) */ }; -static const WORD main_key_scan_dvorak[MAIN_LEN] = -{ - /* ` 1 2 3 4 5 6 7 8 9 0 [ ] */ - 0x29,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x1A,0x1B, - /* ' , . p y f g c r l / = */ - 0x28,0x33,0x34,0x19,0x15,0x21,0x22,0x2E,0x13,0x26,0x35,0x0D, - /* a o e u i d h t n s - \ */ - 0x1E,0x18,0x12,0x16,0x17,0x20,0x23,0x14,0x31,0x1F,0x0C,0x2B, - /* ; q j k x b m w v z */ - 0x27,0x10,0x24,0x25,0x2D,0x30,0x32,0x11,0x2F,0x2C, - 0x56 /* the 102nd key (actually to the right of l-shift) */ -}; - static const WORD main_key_scan_qwerty_jp106[MAIN_LEN] = { /* 1 2 3 4 5 6 7 8 9 0 - ^ \ (Yen) */ @@ -866,7 +853,8 @@ static const struct { } main_key_tab[]={ {0x0409, "United States keyboard layout", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak}, + /* Dvorak users tend to run QWERTY keyboards and rely on Windows/X11/Wayland to translate to the correct keysyms */ + {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_qwerty, &main_key_vkey_dvorak}, {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz},

1 0

Daniel Hill : winex11.drv: Improve DetectLayout heuristics.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: b5359b7da0dc5d86b4cbbcf5170c818083ac7766 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5359b7da0dc5d86b4cbbcf5170c81… Author: Daniel Hill <daniel(a)gluo.nz> Date: Thu Jan 18 20:35:13 2024 +1300 winex11.drv: Improve DetectLayout heuristics. Dvorak detection would sometimes fallback to Phantom keys, because we only use seq as a tie breaker greater emphasis on locality is required for layouts using the same language. Signed-off-by: Daniel Hill <daniel(a)gluo.nz> --- dlls/winex11.drv/keyboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 89bf7da550a..2e7a118c110 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1522,8 +1522,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) } TRACE("matches=%d, mismatches=%d, seq=%d, score=%d\n", match, mismatch, seq, score); - if ((score > max_score) || - ((score == max_score) && (seq > max_seq))) { + if (score + (int)seq > max_score + (int)max_seq) { /* best match so far */ kbd_layout = current; max_score = score;

1 0

Daniel Hill : winex11.drv: Add Dvorak with phantom keys layout.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 054678aad0e20d9dd8545620e1596676b8174dec URL: https://gitlab.winehq.org/wine/wine/-/commit/054678aad0e20d9dd8545620e15966… Author: Daniel Hill <daniel(a)gluo.nz> Date: Thu Jan 18 20:34:10 2024 +1300 winex11.drv: Add Dvorak with phantom keys layout. Signed-off-by: Daniel Hill <daniel(a)gluo.nz> --- dlls/winex11.drv/keyboard.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 2e7a118c110..dde74303bad 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -226,6 +226,16 @@ static const char main_key_US_dvorak[MAIN_LEN][4] = ";:","qQ","jJ","kK","xX","bB","mM","wW","vV","zZ" }; +/*** United States keyboard layout (dvorak phantom key version) */ +static const char main_key_US_dvorak_phantom[MAIN_LEN][4] = +{ + "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","[{","]}", + "'\"",",<",".>","pP","yY","fF","gG","cC","rR","lL","/?","=+", + "aA","oO","eE","uU","iI","dD","hH","tT","nN","sS","-_","\\|", + ";:","qQ","jJ","kK","xX","bB","mM","wW","vV","zZ", + "<>" +}; + /*** British keyboard layout */ static const char main_key_UK[MAIN_LEN][4] = { @@ -855,6 +865,7 @@ static const struct { {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* Dvorak users tend to run QWERTY keyboards and rely on Windows/X11/Wayland to translate to the correct keysyms */ {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_qwerty, &main_key_vkey_dvorak}, + {0x0409, "United States keyboard layout (dvorak with phantom key)", &main_key_US_dvorak_phantom, &main_key_scan_qwerty, &main_key_vkey_dvorak}, {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz},

1 0

Russell Greene : powrprof: Add PowerWriteACValueIndex stub.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: c2d683488e8d68c25446138102c78d6cd5162775 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d683488e8d68c25446138102c78d… Author: Russell Greene <russell(a)shotover.com> Date: Mon Jan 15 12:36:41 2024 -0700 powrprof: Add PowerWriteACValueIndex stub. --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 1 + 3 files changed, 8 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index ac1fa34bc05..dcc7126b920 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -356,6 +356,12 @@ DWORD WINAPI PowerSettingUnregisterNotification(HPOWERNOTIFY handle) return ERROR_SUCCESS; } +DWORD WINAPI PowerWriteACValueIndex(HKEY key, const GUID *scheme, const GUID *subgroup, const GUID *setting, DWORD index) +{ + FIXME("(%p,%s,%s,%s,0x%08lx) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), debugstr_guid(setting), index); + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 7a65fd37fc2..95d28178729 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -21,6 +21,7 @@ @ stdcall PowerUnregisterSuspendResumeNotification(ptr) @ stdcall PowerSettingRegisterNotification(ptr long ptr ptr) @ stdcall PowerSettingUnregisterNotification(ptr) +@ stdcall PowerWriteACValueIndex(ptr ptr ptr ptr long) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 4c6cee41d16..28ebf2a7a79 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -164,6 +164,7 @@ DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD, HANDLE, PHPOWERNOTI DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY); DWORD WINAPI PowerSettingRegisterNotification(const GUID *, DWORD, HANDLE, PHPOWERNOTIFY); DWORD WINAPI PowerSettingUnregisterNotification(HPOWERNOTIFY); +DWORD WINAPI PowerWriteACValueIndex(HKEY, const GUID *, const GUID *, const GUID *, DWORD); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0

Alistair Leslie-Hughes : include: Correct KMTQAITYPE values.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: d6a6e1f1862584e55f680ad1659359950a25a842 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6a6e1f1862584e55f680ad1659359… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 25 16:32:02 2024 +1100 include: Correct KMTQAITYPE values. Windows SDK skips the value 14 and KMTQAITYPE_DISPLAY_UMDRIVERNAME was assigned a value of 71 in the SDK but wasn't in the correct order. --- include/ddk/d3dkmthk.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 2d30bdd8777..6f92f9e4fe5 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -189,8 +189,8 @@ typedef enum _KMTQUERYADAPTERINFOTYPE KMTQAITYPE_MODELIST, KMTQAITYPE_CHECKDRIVERUPDATESTATUS, KMTQAITYPE_VIRTUALADDRESSINFO, - KMTQAITYPE_DRIVERVERSION, - KMTQAITYPE_ADAPTERTYPE, + KMTQAITYPE_DRIVERVERSION = 13, + KMTQAITYPE_ADAPTERTYPE = 15, KMTQAITYPE_OUTPUTDUPLCONTEXTSCOUNT, KMTQAITYPE_WDDM_1_2_CAPS, KMTQAITYPE_UMD_DRIVER_VERSION, @@ -243,10 +243,10 @@ typedef enum _KMTQUERYADAPTERINFOTYPE KMTQAITYPE_DRIVER_DESCRIPTION, KMTQAITYPE_DRIVER_DESCRIPTION_RENDER, KMTQAITYPE_SCANOUT_CAPS, - KMTQAITYPE_DISPLAY_UMDRIVERNAME, KMTQAITYPE_PARAVIRTUALIZATION_RENDER, KMTQAITYPE_SERVICENAME, KMTQAITYPE_WDDM_2_7_CAPS, + KMTQAITYPE_DISPLAY_UMDRIVERNAME = 71, KMTQAITYPE_TRACKEDWORKLOAD_SUPPORT, KMTQAITYPE_HYBRID_DLIST_DLL_SUPPORT, KMTQAITYPE_DISPLAY_CAPS,

1 0

Alexandre Julliard : ntdll: Share the nested exception handler across platforms.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 014f020e3487e3ab729559dc712df962576e1ba8 URL: https://gitlab.winehq.org/wine/wine/-/commit/014f020e3487e3ab729559dc712df9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 25 16:17:52 2024 +0100 ntdll: Share the nested exception handler across platforms. --- dlls/ntdll/exception.c | 11 +++++++++++ dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 19 +++++-------------- dlls/ntdll/signal_arm64.c | 19 +++++-------------- dlls/ntdll/signal_x86_64.c | 11 +---------- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 69f061768bd..f5ff845b1ee 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -230,6 +230,17 @@ NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ) #endif +/******************************************************************* + * nested_exception_handler + */ +EXCEPTION_DISPOSITION WINAPI nested_exception_handler( EXCEPTION_RECORD *rec, void *frame, + CONTEXT *context, void *dispatch ) +{ + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + return ExceptionNestedException; +} + + /******************************************************************* * raise_status * diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 299363d7363..756b19ae649 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -52,6 +52,8 @@ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ); extern NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ); extern EXCEPTION_DISPOSITION WINAPI user_callback_handler( EXCEPTION_RECORD *record, void *frame, CONTEXT *context, void *dispatch ); +extern EXCEPTION_DISPOSITION WINAPI nested_exception_handler( EXCEPTION_RECORD *rec, void *frame, + CONTEXT *context, void *dispatch ); extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ); extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ); extern void WINAPI process_breakpoint(void); diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 17a2b8caa08..eb55b883e51 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -304,28 +304,17 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT } -static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - rec->ExceptionFlags |= EH_NESTED_CALL; - - return ExceptionContinueSearch; -} - - /********************************************************************** * call_handler * * Call a single exception handler. - * FIXME: Handle nested exceptions. */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { EXCEPTION_REGISTRATION_RECORD frame; DWORD res; - frame.Handler = nested_exception_handler; + frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &frame ); TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", @@ -404,7 +393,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG_PTR frame; @@ -434,7 +424,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG_PTR frame; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2cf7e5fd855..54a1612bd90 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -335,28 +335,17 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT } -static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - rec->ExceptionFlags |= EH_NESTED_CALL; - - return ExceptionContinueSearch; -} - - /********************************************************************** * call_handler * * Call a single exception handler. - * FIXME: Handle nested exceptions. */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { EXCEPTION_REGISTRATION_RECORD frame; DWORD res; - frame.Handler = nested_exception_handler; + frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &frame ); TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", @@ -435,7 +424,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -465,7 +455,8 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1344b89a9ca..db2976b1a28 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -357,15 +357,6 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "fxsave 0x100(%rcx)\n\t" /* context->FltSave */ "ret" ); -DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) -{ - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - return ExceptionNestedException; - - return ExceptionContinueSearch; -} - /*********************************************************************** * exception_handler_call_wrapper */ @@ -391,7 +382,7 @@ static DWORD exception_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame, EXCEPTION_REGISTRATION_RECORD wrapper_frame; DWORD res; - wrapper_frame.Handler = nested_exception_handler; + wrapper_frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; __wine_push_frame( &wrapper_frame ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); __wine_pop_frame( &wrapper_frame );

1 0

Alexandre Julliard : ntdll: Use a .seh handler for nested exceptions.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 7a5e92124f95d5e2dd50e9862ea050f53573bbb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a5e92124f95d5e2dd50e9862ea050… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 25 17:18:32 2024 +0100 ntdll: Use a .seh handler for nested exceptions. --- dlls/ntdll/signal_arm.c | 38 ++++++++++++++++++++++++++++++++------ dlls/ntdll/signal_arm64.c | 27 +++++++++++++++++++++------ 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index eb55b883e51..db8955387ae 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -304,6 +304,37 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT } +/*********************************************************************** + * call_handler_wrapper + */ +#ifdef __WINE_PE_BUILD +extern DWORD WINAPI call_handler_wrapper( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ); +__ASM_GLOBAL_FUNC( call_handler_wrapper, + "push {r4,lr}\n\t" + ".seh_save_regs {r4,lr}\n\t" + ".seh_endprologue\n\t" + ".seh_handler " __ASM_NAME("nested_exception_handler") ", %except\n\t" + "mov r3, r2\n\t" /* dispatch */ + "mov r2, r1\n\t" /* context */ + "ldr r1, [r3, #0x0c]\n\t" /* dispatch->EstablisherFrame */ + "ldr ip, [r3, #0x18]\n\t" /* dispatch->LanguageHandler */ + "blx ip\n\t" + "pop {r4,pc}\n\t" ) +#else +static DWORD call_handler_wrapper( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) +{ + EXCEPTION_REGISTRATION_RECORD frame; + DWORD res; + + frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; + __wine_push_frame( &frame ); + res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); + __wine_pop_frame( &frame ); + return res; +} +#endif + + /********************************************************************** * call_handler * @@ -311,19 +342,14 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { - EXCEPTION_REGISTRATION_RECORD frame; DWORD res; - frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; - __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); + res = call_handler_wrapper( rec, context, dispatch ); TRACE( "handler at %p returned %lu\n", dispatch->LanguageHandler, res ); rec->ExceptionFlags &= EH_NONCONTINUABLE; - __wine_pop_frame( &frame ); return res; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 54a1612bd90..bc06aae5aec 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -335,6 +335,26 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT } +/*********************************************************************** + * call_handler_wrapper + */ +extern DWORD WINAPI call_handler_wrapper( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ); +__ASM_GLOBAL_FUNC( call_handler_wrapper, + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + "mov x29, sp\n\t" + ".seh_set_fp\n\t" + ".seh_endprologue\n\t" + ".seh_handler " __ASM_NAME("nested_exception_handler") ", @except\n\t" + "mov x3, x2\n\t" /* dispatch */ + "mov x2, x1\n\t" /* context */ + "ldr x1, [x3, #0x18]\n\t" /* dispatch->EstablisherFrame */ + "ldr x15, [x3, #0x30]\n\t" /* dispatch->LanguageHandler */ + "blr x15\n\t" + "ldp x29, x30, [sp], #16\n\t" + "ret" ) + + /********************************************************************** * call_handler * @@ -342,19 +362,14 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { - EXCEPTION_REGISTRATION_RECORD frame; DWORD res; - frame.Handler = (PEXCEPTION_HANDLER)nested_exception_handler; - __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); + res = call_handler_wrapper( rec, context, dispatch ); TRACE( "handler at %p returned %lu\n", dispatch->LanguageHandler, res ); rec->ExceptionFlags &= EH_NONCONTINUABLE; - __wine_pop_frame( &frame ); return res; }

1 0

Martin Storsjö : ntdll: Remove dwarf unwinding support for aarch64.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 6d0fcf64d22aae81b47a796d1a352914032209c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d0fcf64d22aae81b47a796d1a3529… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Jan 24 15:26:30 2024 +0200 ntdll: Remove dwarf unwinding support for aarch64. Since recently, unwinding never should need to look at the unix libs any longer, and as aarch64 requires PE builds, there should be no need to unwind through any .dll.so files any longer. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 48 +++----------- dlls/ntdll/unix/dwarf.h | 4 +- dlls/ntdll/unix/signal_arm64.c | 144 +---------------------------------------- 3 files changed, 13 insertions(+), 183 deletions(-)

1 0

Jacek Caban : winevdm: Use char type for max length assignment.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: df0726e3591b068815d030141e59199ec3fafa66 URL: https://gitlab.winehq.org/wine/wine/-/commit/df0726e3591b068815d030141e5919… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:00:47 2023 +0100 winevdm: Use char type for max length assignment. --- programs/winevdm/winevdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 5b5f72db253..87c25f0d191 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -359,7 +359,7 @@ static char *build_command_line( char **argv ) return NULL; p = cmd_line; - *p++ = (len < 256) ? len : 255; + *p++ = (len < 256) ? len : '\xff'; for (arg = argv; *arg; arg++) { BOOL has_space,has_quote;

1 0