- Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Share the dump_function_descr() helper between platforms.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: df09103ab6cfc55659c068c51bee8ad24ab9134d URL: https://gitlab.winehq.org/wine/wine/-/commit/df09103ab6cfc55659c068c51bee8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 15:33:08 2024 +0200 msvcrt: Share the dump_function_descr() helper between platforms. --- dlls/msvcrt/cppexcept.h | 1 + dlls/msvcrt/except.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_i386.c | 35 +--------------------------------- dlls/msvcrt/except_x86_64.c | 44 ------------------------------------------- 4 files changed, 48 insertions(+), 78 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 36bc72ab1bc..690c1f5817f 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -278,6 +278,7 @@ static inline void copy_exception( void *object, uintptr_t frame, int offset, UI } \ } while(0) +extern void dump_function_descr( const cxx_function_descr *descr, uintptr_t base ); extern void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ); diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 08e2a51011d..b6f2bb8784d 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -46,6 +46,52 @@ static MSVCRT_security_error_handler security_error_handler; static __sighandler_t sighandlers[NSIG] = { SIG_DFL }; +void dump_function_descr( const cxx_function_descr *descr, uintptr_t base ) +{ + unwind_info *unwind_table = rtti_rva( descr->unwind_table, base ); + tryblock_info *tryblock = rtti_rva( descr->tryblock, base ); + ipmap_info *ipmap = rtti_rva( descr->ipmap, base ); + UINT i, j; + + TRACE( "magic %x\n", descr->magic ); + TRACE( "unwind table: %p %d\n", unwind_table, descr->unwind_count ); + for (i = 0; i < descr->unwind_count; i++) + { + TRACE(" %d: prev %d func %p\n", i, unwind_table[i].prev, + unwind_table[i].handler ? rtti_rva( unwind_table[i].handler, base ) : NULL ); + } + TRACE( "try table: %p %d\n", tryblock, descr->tryblock_count ); + for (i = 0; i < descr->tryblock_count; i++) + { + catchblock_info *catchblock = rtti_rva( tryblock[i].catchblock, base ); + + TRACE( " %d: start %d end %d catchlevel %d catch %p %d\n", i, + tryblock[i].start_level, tryblock[i].end_level, + tryblock[i].catch_level, catchblock, tryblock[i].catchblock_count); + for (j = 0; j < tryblock[i].catchblock_count; j++) + { + type_info *type_info = catchblock[j].type_info ? rtti_rva( catchblock[j].type_info, base ) : NULL; + TRACE( " %d: flags %x offset %d handler %p", + j, catchblock[j].flags, catchblock[j].offset, + catchblock[j].handler ? rtti_rva(catchblock[j].handler, base) : NULL ); +#ifdef RTTI_USE_RVA + TRACE( " frame %x", catchblock[j].frame ); +#endif + TRACE( " type %p %s\n", type_info, dbgstr_type_info(type_info) ); + } + } + TRACE( "ipmap: %p %d\n", ipmap, descr->ipmap_count ); + for (i = 0; i < descr->ipmap_count; i++) + TRACE( " %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state ); +#ifdef RTTI_USE_RVA + TRACE( "unwind_help %+d\n", descr->unwind_help ); +#endif + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; + TRACE( "expect list: %p\n", rtti_rva( descr->expect_list, base ) ); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; + TRACE( "flags: %08x\n", descr->flags ); +} + void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 91fe11a4dfc..f76762d3cb0 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -152,39 +152,6 @@ __ASM_GLOBAL_FUNC( call_handler, "popl %ebp\n\t" "ret" ); -static void dump_function_descr( const cxx_function_descr *descr ) -{ - UINT i; - int j; - - TRACE( "magic %x\n", descr->magic ); - TRACE( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count ); - for (i = 0; i < descr->unwind_count; i++) - { - TRACE( " %d: prev %d func %p\n", i, - descr->unwind_table[i].prev, descr->unwind_table[i].handler ); - } - TRACE( "try table: %p %d\n", descr->tryblock, descr->tryblock_count ); - for (i = 0; i < descr->tryblock_count; i++) - { - TRACE( " %d: start %d end %d catchlevel %d catch %p %d\n", i, - descr->tryblock[i].start_level, descr->tryblock[i].end_level, - descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, - descr->tryblock[i].catchblock_count ); - for (j = 0; j < descr->tryblock[i].catchblock_count; j++) - { - const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; - TRACE( " %d: flags %x offset %d handler %p type %p %s\n", - j, ptr->flags, ptr->offset, ptr->handler, - ptr->type_info, dbgstr_type_info( ptr->type_info ) ); - } - } - if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; - TRACE( "expect list: %p\n", descr->expect_list ); - if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; - TRACE( "flags: %08x\n", descr->flags ); -} - /* unwind the local function up to a given trylevel */ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { @@ -468,7 +435,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec, frame, frame->trylevel, descr, nested_frame ); TRACE_EXCEPTION_TYPE( exc_type, 0 ); - dump_function_descr( descr ); + dump_function_descr( descr, 0 ); } } else diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 39202ff7d9a..81a2515997b 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,50 +61,6 @@ static inline void* rva_to_ptr(UINT rva, ULONG64 base) return rva ? (void*)(base+rva) : NULL; } -static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_base) -{ - unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); - tryblock_info *tryblock = rva_to_ptr(descr->tryblock, image_base); - ipmap_info *ipmap = rva_to_ptr(descr->ipmap, image_base); - UINT i, j; - - TRACE("magic %x\n", descr->magic); - TRACE("unwind table: %x(%p) %d\n", descr->unwind_table, unwind_table, descr->unwind_count); - for (i=0; i<descr->unwind_count; i++) - { - TRACE(" %d: prev %d func %x(%p)\n", i, unwind_table[i].prev, - unwind_table[i].handler, rva_to_ptr(unwind_table[i].handler, image_base)); - } - TRACE("try table: %x(%p) %d\n", descr->tryblock, tryblock, descr->tryblock_count); - for (i=0; i<descr->tryblock_count; i++) - { - catchblock_info *catchblock = rva_to_ptr(tryblock[i].catchblock, image_base); - - TRACE(" %d: start %d end %d catchlevel %d catch %x(%p) %d\n", i, - tryblock[i].start_level, tryblock[i].end_level, - tryblock[i].catch_level, tryblock[i].catchblock, - catchblock, tryblock[i].catchblock_count); - for (j=0; j<tryblock[i].catchblock_count; j++) - { - TRACE(" %d: flags %x offset %d handler %x(%p) frame %x type %x %s\n", - j, catchblock[j].flags, catchblock[j].offset, catchblock[j].handler, - rva_to_ptr(catchblock[j].handler, image_base), catchblock[j].frame, - catchblock[j].type_info, - dbgstr_type_info(rva_to_ptr(catchblock[j].type_info, image_base))); - } - } - TRACE("ipmap: %x(%p) %d\n", descr->ipmap, ipmap, descr->ipmap_count); - for (i=0; i<descr->ipmap_count; i++) - { - TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state); - } - TRACE("unwind_help %d\n", descr->unwind_help); - if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; - TRACE("expect list: %x\n", descr->expect_list); - if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; - TRACE("flags: %08x\n", descr->flags); -} - static inline int ip_to_state(ipmap_info *ipmap, UINT count, int ip) { UINT low = 0, high = count-1, med;

1 0

Alexandre Julliard : msvcrt: Fix the ip_to_state() helper for out of bounds values.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 1f7333f1aec9ad31e61928da9b2bc05ddaa402e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f7333f1aec9ad31e61928da9b2bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 16:17:03 2024 +0200 msvcrt: Fix the ip_to_state() helper for out of bounds values. --- dlls/msvcrt/except_x86_64.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 81a2515997b..b0cf2ff9425 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,24 +61,16 @@ static inline void* rva_to_ptr(UINT rva, ULONG64 base) return rva ? (void*)(base+rva) : NULL; } -static inline int ip_to_state(ipmap_info *ipmap, UINT count, int ip) +static inline int ip_to_state( const cxx_function_descr *descr, uintptr_t ip, uintptr_t base ) { - UINT low = 0, high = count-1, med; - - while (low < high) { - med = low + (high-low)/2; - - if (ipmap[med].ip <= ip && ipmap[med+1].ip > ip) - { - low = med; - break; - } - if (ipmap[med].ip < ip) low = med+1; - else high = med-1; - } - - TRACE("%x -> %d\n", ip, ipmap[low].state); - return ipmap[low].state; + const ipmap_info *ipmap = rtti_rva( descr->ipmap, base ); + unsigned int i; + int ret; + + for (i = 0; i < descr->ipmap_count; i++) if (base + ipmap[i].ip > ip) break; + ret = i ? ipmap[i - 1].state : -1; + TRACE( "%Ix -> %d\n", ip, ret ); + return ret; } static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, @@ -91,8 +83,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, if (unwind_help[0] == -2) { - trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), - descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); } else { @@ -203,8 +194,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, { ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); void *handler, *object = (void *)rec->ExceptionInformation[1]; - int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), - descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + int trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); thread_data_t *data = msvcrt_get_thread_data(); const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; @@ -304,8 +294,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) { - int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), - descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + int trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); cxx_exception_type *exc_type; ULONG64 orig_frame = frame; ULONG64 throw_base;

1 0

Alexandre Julliard : msvcrt: Share a helper macro to print an exception type.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: e7546542abbdd58299b8f7333a1f62ba969a9ea6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7546542abbdd58299b8f7333a1f62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 15:31:22 2024 +0200 msvcrt: Share a helper macro to print an exception type. --- dlls/msvcrt/cppexcept.h | 17 +++++++++++++++++ dlls/msvcrt/except_i386.c | 23 +---------------------- dlls/msvcrt/except_x86_64.c | 28 +--------------------------- dlls/msvcrt/handler4.c | 28 +--------------------------- 4 files changed, 20 insertions(+), 76 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index a5a8abb9345..36bc72ab1bc 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -261,6 +261,23 @@ static inline void copy_exception( void *object, uintptr_t frame, int offset, UI } } +#define TRACE_EXCEPTION_TYPE(type,base) do { \ + const cxx_type_info_table *table = rtti_rva( type->type_info_table, base ); \ + unsigned int i; \ + TRACE( "flags %x destr %p handler %p type info %p\n", \ + type->flags, rtti_rva( type->destructor, base ), \ + type->custom_handler ? rtti_rva( type->custom_handler, base ) : NULL, table ); \ + for (i = 0; i < table->count; i++) \ + { \ + const cxx_type_info *type = rtti_rva( table->info[i], base ); \ + const type_info *info = rtti_rva( type->type_info, base ); \ + TRACE( " %d: flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n", \ + i, type->flags, info, dbgstr_type_info( info ), \ + type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, \ + type->size, rtti_rva( type->copy_ctor, base )); \ + } \ +} while(0) + extern void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ); diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5a8a84089d9..91fe11a4dfc 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -152,27 +152,6 @@ __ASM_GLOBAL_FUNC( call_handler, "popl %ebp\n\t" "ret" ); -static inline void dump_type( const cxx_type_info *type ) -{ - TRACE( "flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n", - type->flags, type->type_info, dbgstr_type_info(type->type_info), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor ); -} - -static void dump_exception_type( const cxx_exception_type *type ) -{ - UINT i; - - TRACE( "flags %x destr %p handler %p type info %p\n", - type->flags, type->destructor, type->custom_handler, type->type_info_table ); - for (i = 0; i < type->type_info_table->count; i++) - { - TRACE( " %d: ", i ); - dump_type( type->type_info_table->info[i] ); - } -} - static void dump_function_descr( const cxx_function_descr *descr ) { UINT i; @@ -488,7 +467,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame { TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec, frame, frame->trylevel, descr, nested_frame ); - dump_exception_type( exc_type ); + TRACE_EXCEPTION_TYPE( exc_type, 0 ); dump_function_descr( descr ); } } diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7dc12db0f25..39202ff7d9a 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,32 +61,6 @@ static inline void* rva_to_ptr(UINT rva, ULONG64 base) return rva ? (void*)(base+rva) : NULL; } -static inline void dump_type(UINT type_rva, ULONG64 base) -{ - const cxx_type_info *type = rva_to_ptr(type_rva, base); - - TRACE("flags %x type %x %s offsets %d,%d,%d size %d copy ctor %x(%p)\n", - type->flags, type->type_info, dbgstr_type_info(rva_to_ptr(type->type_info, base)), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor, rva_to_ptr(type->copy_ctor, base)); -} - -static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); - UINT i; - - TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", - type->flags, type->destructor, rva_to_ptr(type->destructor, base), - type->custom_handler, rva_to_ptr(type->custom_handler, base), - type->type_info_table, type_info_table); - for (i = 0; i < type_info_table->count; i++) - { - TRACE(" %d: ", i); - dump_type(type_info_table->info[i], base); - } -} - static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_base) { unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); @@ -452,7 +426,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { TRACE("handling C++ exception rec %p frame %I64x descr %p\n", rec, frame, descr); - dump_exception_type(exc_type, rec->ExceptionInformation[3]); + TRACE_EXCEPTION_TYPE(exc_type, rec->ExceptionInformation[3]); dump_function_descr(descr, dispatch->ImageBase); } } diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index e805543d6ca..878a5497aaa 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -249,32 +249,6 @@ static void read_ipmap_info(BYTE **b, ipmap_info *ii) ii->state = (INT)decode_uint(b) - 1; } -static inline void dump_type(UINT type_rva, ULONG64 base) -{ - const cxx_type_info *type = rva_to_ptr(type_rva, base); - - TRACE("flags %x type %x %s offsets %d,%d,%d size %d copy ctor %x(%p)\n", - type->flags, type->type_info, dbgstr_type_info(rva_to_ptr(type->type_info, base)), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor, rva_to_ptr(type->copy_ctor, base)); -} - -static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); - UINT i; - - TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", - type->flags, type->destructor, rva_to_ptr(type->destructor, base), - type->custom_handler, rva_to_ptr(type->custom_handler, base), - type->type_info_table, type_info_table); - for (i = 0; i < type_info_table->count; i++) - { - TRACE(" %d: ", i); - dump_type(type_info_table->info[i], base); - } -} - static BOOL validate_cxx_function_descr4(const cxx_function_descr_v4 *descr, DISPATCHER_CONTEXT *dispatch) { ULONG64 image_base = dispatch->ImageBase; @@ -680,7 +654,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { TRACE("handling C++ exception rec %p frame %Ix descr %p\n", rec, frame, descr); - dump_exception_type(exc_type, rec->ExceptionInformation[3]); + TRACE_EXCEPTION_TYPE(exc_type, rec->ExceptionInformation[3]); } } else

1 0

Alexandre Julliard : faudio: Import upstream release 24.06.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 41c65022c1946c8f1bc877e038dcaf2b058ffcc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/41c65022c1946c8f1bc877e038dcaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 2 22:03:55 2024 +0200 faudio: Import upstream release 24.06. --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT_internal.c | 14 +- libs/faudio/src/FAudioFX_reverb.c | 2 +- libs/faudio/src/FAudio_internal.c | 68 +++++++++- libs/faudio/src/FAudio_internal.h | 2 + libs/faudio/src/FAudio_platform_win32.c | 218 +++++++++++++++++++++++++++----- libs/faudio/src/stb_vorbis.h | 2 +- 7 files changed, 265 insertions(+), 43 deletions(-)

1 0

Alexandros Frantzis : server: Apply modifier vkey transformations regardless of unicode flag.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: d14a827b8c55634514763aa74e024524ef7c1945 URL: https://gitlab.winehq.org/wine/wine/-/commit/d14a827b8c55634514763aa74e0245… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu May 30 19:32:11 2024 +0300 server: Apply modifier vkey transformations regardless of unicode flag. --- dlls/user32/tests/input.c | 7 +++---- server/queue.c | 41 +++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 560baa399da..0bcea006db1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1224,11 +1224,10 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W struct send_input_keyboard_test unicode_vkey_ctrl[] = { - {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE, - .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, .todo_state = {[VK_LCONTROL] = TRUE}, - .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, VK_LCONTROL, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0xc0, VK_CONTROL), {0}}}, + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE, .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, VK_LCONTROL), KEY_MSG(WM_KEYDOWN, 0xc0, VK_CONTROL), {0}}}, {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP, - .expect = {KEY_HOOK(WM_KEYUP, 0xc0, VK_LCONTROL, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0xc0, VK_CONTROL), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 0xc0, VK_LCONTROL), KEY_MSG(WM_KEYUP, 0xc0, VK_CONTROL), {0}}}, {0}, }; diff --git a/server/queue.c b/server/queue.c index 3ffa48c3928..7d1cf780837 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2103,29 +2103,26 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c if (!(time = input->kbd.time)) time = get_tick_count(); - if (!(input->kbd.flags & KEYEVENTF_UNICODE)) + switch (vkey) { - switch (vkey) - { - case VK_MENU: - case VK_LMENU: - case VK_RMENU: - vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU; - if ((input->kbd.vkey & 0xff) == VK_MENU) hook_vkey = vkey; - break; - case VK_CONTROL: - case VK_LCONTROL: - case VK_RCONTROL: - vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL; - if ((input->kbd.vkey & 0xff) == VK_CONTROL) hook_vkey = vkey; - break; - case VK_SHIFT: - case VK_LSHIFT: - case VK_RSHIFT: - vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT; - if ((input->kbd.vkey & 0xff) == VK_SHIFT) hook_vkey = vkey; - break; - } + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU; + if ((input->kbd.vkey & 0xff) == VK_MENU) hook_vkey = vkey; + break; + case VK_CONTROL: + case VK_LCONTROL: + case VK_RCONTROL: + vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL; + if ((input->kbd.vkey & 0xff) == VK_CONTROL) hook_vkey = vkey; + break; + case VK_SHIFT: + case VK_LSHIFT: + case VK_RSHIFT: + vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT; + if ((input->kbd.vkey & 0xff) == VK_SHIFT) hook_vkey = vkey; + break; } message_code = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_KEYUP : WM_KEYDOWN;

1 0

Alexandros Frantzis : server: Use right-left modifier vkeys for hooks.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: d0e3286d964c9500b77fbeb480f5ee5d61651e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0e3286d964c9500b77fbeb480f5ee… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu May 30 19:26:07 2024 +0300 server: Use right-left modifier vkeys for hooks. --- dlls/user32/tests/input.c | 12 ++++++------ server/queue.c | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 382e15b9ed2..560baa399da 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -907,9 +907,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W static const struct send_input_keyboard_test shift[] = { {.vkey = VK_SHIFT, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, - .expect = {KEY_HOOK(WM_KEYDOWN, 1, VK_LSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 1, VK_SHIFT), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, 1, VK_LSHIFT), KEY_MSG(WM_KEYDOWN, 1, VK_SHIFT), {0}}}, {.vkey = VK_SHIFT, .flags = KEYEVENTF_KEYUP, - .expect = {KEY_HOOK(WM_KEYUP, 2, VK_LSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 2, VK_SHIFT), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 2, VK_LSHIFT), KEY_MSG(WM_KEYUP, 2, VK_SHIFT), {0}}}, {0}, }; static const struct send_input_keyboard_test shift_ext[] = @@ -948,17 +948,17 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W static const struct send_input_keyboard_test control[] = { {.vkey = VK_CONTROL, .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, - .expect = {KEY_HOOK(WM_KEYDOWN, 1, VK_LCONTROL, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 1, VK_CONTROL), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, 1, VK_LCONTROL), KEY_MSG(WM_KEYDOWN, 1, VK_CONTROL), {0}}}, {.vkey = VK_CONTROL, .flags = KEYEVENTF_KEYUP, .expect_state = {0}, - .expect = {KEY_HOOK(WM_KEYUP, 2, VK_LCONTROL, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 2, VK_CONTROL), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 2, VK_LCONTROL), KEY_MSG(WM_KEYUP, 2, VK_CONTROL), {0}}}, {0}, }; static const struct send_input_keyboard_test control_ext[] = { {.vkey = VK_CONTROL, .flags = KEYEVENTF_EXTENDEDKEY, .expect_state = {[VK_CONTROL] = 0x80, [VK_RCONTROL] = 0x80}, - .expect = {KEY_HOOK_(WM_KEYDOWN, 1, VK_RCONTROL, LLKHF_EXTENDED, .todo_value = TRUE), KEY_MSG_(WM_KEYDOWN, 1, VK_CONTROL, KF_EXTENDED), {0}}}, + .expect = {KEY_HOOK_(WM_KEYDOWN, 1, VK_RCONTROL, LLKHF_EXTENDED), KEY_MSG_(WM_KEYDOWN, 1, VK_CONTROL, KF_EXTENDED), {0}}}, {.vkey = VK_CONTROL, .flags = KEYEVENTF_KEYUP | KEYEVENTF_EXTENDEDKEY, - .expect = {KEY_HOOK_(WM_KEYUP, 2, VK_RCONTROL, LLKHF_EXTENDED, .todo_value = TRUE), KEY_MSG_(WM_KEYUP, 2, VK_CONTROL, KF_EXTENDED), {0}}}, + .expect = {KEY_HOOK_(WM_KEYUP, 2, VK_RCONTROL, LLKHF_EXTENDED), KEY_MSG_(WM_KEYUP, 2, VK_CONTROL, KF_EXTENDED), {0}}}, {0}, }; diff --git a/server/queue.c b/server/queue.c index 6d4396234f2..3ffa48c3928 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2111,16 +2111,19 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c case VK_LMENU: case VK_RMENU: vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU; + if ((input->kbd.vkey & 0xff) == VK_MENU) hook_vkey = vkey; break; case VK_CONTROL: case VK_LCONTROL: case VK_RCONTROL: vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL; + if ((input->kbd.vkey & 0xff) == VK_CONTROL) hook_vkey = vkey; break; case VK_SHIFT: case VK_LSHIFT: case VK_RSHIFT: vkey = (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT; + if ((input->kbd.vkey & 0xff) == VK_SHIFT) hook_vkey = vkey; break; } }

1 0

Alexandre Julliard : Release 9.10.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 951e0e27a743e52c75c7fedc0b1eaa9eb77e6bb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/951e0e27a743e52c75c7fedc0b1eaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 22:33:46 2024 +0200 Release 9.10. --- ANNOUNCE.md | 679 +++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 343 insertions(+), 357 deletions(-)

1 0

Fabian Maurer : user32/tests: Fix ok_sequence succeeding in todo block not giving a test failure.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: d919d572932c424b71a0e8a4059d9c207e3ee1fe URL: https://gitlab.winehq.org/wine/wine/-/commit/d919d572932c424b71a0e8a4059d9c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri May 31 01:55:19 2024 +0200 user32/tests: Fix ok_sequence succeeding in todo block not giving a test failure. --- dlls/user32/tests/msg.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bcb376cb14b..1a264268e8c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2916,7 +2916,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex messages_equal(expected, actual, TRUE, file, line); } } - if (is_wine) goto done; + if (is_wine && !failcount) /* succeeded yet marked todo */ + todo_wine { + dump++; + ok_( file, line)( TRUE, "marked \"todo_wine\" but succeeds\n"); + } } else { @@ -2926,11 +2930,6 @@ static void ok_sequence_(const struct message *expected_list, const char *contex messages_equal(expected, actual, TRUE, file, line); } } - if (todo && !failcount && !strcmp(winetest_platform, "wine")) /* succeeded yet marked todo */ - todo_wine { - dump++; - ok_( file, line)( TRUE, "marked \"todo_wine\" but succeeds\n"); - } done: winetest_pop_context();

1 0

Alexandros Frantzis : server: Don't send raw input events for unicode inputs.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 69aad4aeca3ff8e8ca9c33e808be826742c6e3b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/69aad4aeca3ff8e8ca9c33e808be82… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 29 18:42:36 2024 +0300 server: Don't send raw input events for unicode inputs. --- dlls/user32/tests/input.c | 35 +++++++++++++++++++++++++++++++++++ server/queue.c | 5 +++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0bcea006db1..f4d3b182ca7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1471,6 +1471,35 @@ static void test_SendInput_raw_key_messages( WORD vkey, WORD wch, HKL hkl ) {.vkey = VK_PACKET, .flags = KEYEVENTF_KEYUP, .expect = {RAW_KEY(2, RI_KEY_BREAK, VK_PACKET, WM_KEYUP), {0}}}, {0}, }; + struct send_input_keyboard_test raw_unicode_legacy[] = + { + {.scan = 0x3c0, .flags = KEYEVENTF_UNICODE, .expect_state = {[VK_PACKET] = 0x80}, + .expect = {KEY_MSG(WM_KEYDOWN, 0, VK_PACKET, .todo_value = TRUE), WIN_MSG(WM_CHAR, 0x3c0, 1), {0}}}, + {.scan = 0x3c0, .flags = KEYEVENTF_KEYUP | KEYEVENTF_UNICODE, + .expect = {KEY_MSG(WM_KEYUP, 0, VK_PACKET, .todo_value = TRUE), {0}}}, + {0}, + }; + struct send_input_keyboard_test raw_unicode_nolegacy[] = + { + {.scan = 0x3c0, .flags = KEYEVENTF_UNICODE}, + {.scan = 0x3c0, .flags = KEYEVENTF_KEYUP | KEYEVENTF_UNICODE}, + {0}, + }; + struct send_input_keyboard_test raw_unicode_vkey_ctrl_legacy[] = + { + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE, + .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, + .expect = {KEY_MSG(WM_KEYDOWN, 0xc0, VK_CONTROL), {0}}}, + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP, + .expect = {KEY_MSG(WM_KEYUP, 0xc0, VK_CONTROL), {0}}}, + {0}, + }; + struct send_input_keyboard_test raw_unicode_vkey_ctrl_nolegacy[] = + { + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE}, + {.scan = 0x3c0, .vkey = VK_CONTROL, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP}, + {0}, + }; #undef WIN_MSG #undef RAW_KEY #undef KEY_MSG @@ -1514,6 +1543,9 @@ static void test_SendInput_raw_key_messages( WORD vkey, WORD wch, HKL hkl ) /* get both WM_INPUT and legacy messages */ check_send_input_keyboard_test( raw_legacy, !receive ); check_send_input_keyboard_test( raw_vk_packet_legacy, !receive ); + /* no WM_INPUT message for unicode */ + check_send_input_keyboard_test( raw_unicode_legacy, !receive ); + check_send_input_keyboard_test( raw_unicode_vkey_ctrl_legacy, !receive ); rid.dwFlags = RIDEV_REMOVE; ok_ret( 1, RegisterRawInputDevices( &rid, 1, sizeof(rid) ) ); @@ -1524,6 +1556,9 @@ static void test_SendInput_raw_key_messages( WORD vkey, WORD wch, HKL hkl ) /* get only WM_INPUT messages */ check_send_input_keyboard_test( raw_nolegacy, !receive ); check_send_input_keyboard_test( raw_vk_packet_nolegacy, !receive ); + /* no WM_INPUT message for unicode */ + check_send_input_keyboard_test( raw_unicode_nolegacy, !receive ); + check_send_input_keyboard_test( raw_unicode_vkey_ctrl_nolegacy, !receive ); rid.dwFlags = RIDEV_REMOVE; ok_ret( 1, RegisterRawInputDevices( &rid, 1, sizeof(rid) ) ); diff --git a/server/queue.c b/server/queue.c index 7d1cf780837..4d48da1d484 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2099,6 +2099,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c unsigned int message_code, time; lparam_t lparam = input->kbd.scan << 16; unsigned int flags = 0; + BOOL unicode = input->kbd.flags & KEYEVENTF_UNICODE; int wait; if (!(time = input->kbd.time)) time = get_tick_count(); @@ -2188,7 +2189,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c } } - if ((foreground = get_foreground_thread( desktop, win ))) + if (!unicode && (foreground = get_foreground_thread( desktop, win ))) { struct rawinput_message raw_msg = {0}; raw_msg.foreground = foreground; @@ -2216,7 +2217,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->msg = message_code; if (origin == IMO_INJECTED) msg_data->flags = LLKHF_INJECTED; - if (input->kbd.flags & KEYEVENTF_UNICODE && !vkey) + if (unicode && !vkey) { vkey = hook_vkey = VK_PACKET; }

1 0

Tag wine-9.10 : Alexandre Julliard : Release 9.10
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: refs/tags/wine-9.10 Tag: c6cf223bf78e707ad719e0308685f18335a2c2b4 URL: https://gitlab.winehq.org/wine/wine/-/tags/c6cf223bf78e707ad719e0308685f183… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 22:33:46 2024 +0200 Release 9.10

1 0