February 2024 - Wine-commits

Krzysztof Bogacki : win32u: Maintain a list of GPUs in cache.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 800b5e44fc3106930b424ffa852699e499da1993 URL: https://gitlab.winehq.org/wine/wine/-/commit/800b5e44fc3106930b424ffa852699… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Sat Jan 27 16:27:27 2024 +0100 win32u: Maintain a list of GPUs in cache. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 710dc6f18c3..bb31ddc23b5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -233,6 +233,13 @@ struct display_device WCHAR device_key[128]; /* DeviceKey in DISPLAY_DEVICEW */ }; +struct gpu +{ + struct list entry; + LUID luid; + unsigned int adapter_count; +}; + struct adapter { LONG refcount; @@ -275,6 +282,7 @@ struct monitor struct edid_monitor_info edid_info; }; +static struct list gpus = LIST_INIT(gpus); static struct list adapters = LIST_INIT(adapters); static struct list monitors = LIST_INIT(monitors); static INT64 last_query_display_time; @@ -1672,6 +1680,7 @@ static void clear_display_devices(void) { struct adapter *adapter; struct monitor *monitor; + struct gpu *gpu; if (list_head( &monitors ) == &virtual_monitor.entry) { @@ -1693,19 +1702,32 @@ static void clear_display_devices(void) list_remove( &adapter->entry ); adapter_release( adapter ); } + + while (!list_empty( &gpus )) + { + gpu = LIST_ENTRY( list_head( &gpus ), struct gpu, entry ); + list_remove( &gpu->entry ); + free( gpu ); + } } static BOOL update_display_cache_from_registry(void) { + char buffer[1024]; DWORD adapter_id, monitor_id, monitor_count = 0, size; - KEY_BASIC_INFORMATION key; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + KEY_BASIC_INFORMATION key, *key2 = (void *)buffer; + HKEY pci_key, device_key, gpu_key, prop_key; struct adapter *adapter; struct monitor *monitor, *monitor2; HANDLE mutex = NULL; NTSTATUS status; + struct gpu *gpu; BOOL ret; /* If user driver did initialize the registry, then exit */ + if (!enum_key && !(enum_key = reg_open_key( NULL, enum_keyW, sizeof(enum_keyW) ))) + return FALSE; if (!video_key && !(video_key = reg_open_key( NULL, devicemap_video_keyW, sizeof(devicemap_video_keyW) ))) return FALSE; @@ -1761,6 +1783,60 @@ static BOOL update_display_cache_from_registry(void) } } + if ((pci_key = reg_open_key( enum_key, pciW, sizeof(pciW) ))) + { + unsigned int i = 0; + + while (!NtEnumerateKey( pci_key, i++, KeyBasicInformation, key2, sizeof(buffer), &size )) + { + unsigned int j = 0; + + if (!(device_key = reg_open_key( pci_key, key2->Name, key2->NameLength ))) + continue; + + while (!NtEnumerateKey( device_key, j++, KeyBasicInformation, key2, sizeof(buffer), &size )) + { + if (!(gpu_key = reg_open_key( device_key, key2->Name, key2->NameLength ))) + continue; + + size = query_reg_value( gpu_key, class_guidW, value, sizeof(buffer) ); + if (size != sizeof(guid_devclass_displayW) + || wcscmp( (WCHAR *)value->Data, guid_devclass_displayW )) + { + NtClose( gpu_key ); + continue; + } + + if (!(gpu = calloc( 1, sizeof(*gpu) ))) + { + NtClose( gpu_key ); + continue; + } + + if ((prop_key = reg_open_key( gpu_key, devpropkey_gpu_luidW, + sizeof(devpropkey_gpu_luidW) ))) + { + if (query_reg_value( prop_key, NULL, value, sizeof(buffer) ) == sizeof(LUID)) + gpu->luid = *(const LUID *)value->Data; + NtClose( prop_key ); + } + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + { + if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) )) + gpu->adapter_count++; + } + + list_add_tail( &gpus, &gpu->entry ); + NtClose( gpu_key ); + } + + NtClose( device_key ); + } + + NtClose( pci_key ); + } + if ((ret = !list_empty( &adapters ) && !list_empty( &monitors ))) last_query_display_time = key.LastWriteTime.QuadPart; pthread_mutex_unlock( &display_lock );

1 0

Krzysztof Bogacki : win32u: Implement NtGdiDdDDIEnumAdapters2.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 223292da029ed1a807a00a46c5fc4cc1e7c2cc72 URL: https://gitlab.winehq.org/wine/wine/-/commit/223292da029ed1a807a00a46c5fc4c… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon Jan 15 19:16:23 2024 +0100 win32u: Implement NtGdiDdDDIEnumAdapters2. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/gdi32/tests/driver.c | 2 +- dlls/win32u/sysparams.c | 78 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f42595126c2..3a7944e9c02 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -199,7 +199,7 @@ static void test_D3DKMTEnumAdapters2(void) if (!pD3DKMTEnumAdapters2 || pD3DKMTEnumAdapters2(&enum_adapters_2_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTEnumAdapters2() is unavailable.\n"); + win_skip("D3DKMTEnumAdapters2() is unavailable.\n"); return; } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bb31ddc23b5..1573edf069f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6656,6 +6656,80 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD */ NTSTATUS WINAPI NtGdiDdDDIEnumAdapters2( D3DKMT_ENUMADAPTERS2 *desc ) { - FIXME(" (%p): stub\n", desc ); - return STATUS_PROCEDURE_NOT_FOUND; + D3DKMT_OPENADAPTERFROMLUID open_adapter_from_luid; + static const ULONG max_adapters = 34; + D3DKMT_CLOSEADAPTER close_adapter; + NTSTATUS status = STATUS_SUCCESS; + ULONG idx = 0, count; + struct gpu *gpu; + + TRACE( "(%p)\n", desc ); + + if (!desc) return STATUS_INVALID_PARAMETER; + + if (!desc->pAdapters) + { + desc->NumAdapters = max_adapters; + return STATUS_SUCCESS; + } + + if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; + + if ((count = list_count( &gpus )) > max_adapters) + { + WARN( "Too many adapters (%u), only up to %u can be enumerated.\n", + (unsigned int)count, (unsigned int)max_adapters ); + count = max_adapters; + } + + if (count > desc->NumAdapters) + { + status = STATUS_BUFFER_TOO_SMALL; + goto done; + } + + LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) + { + if (gpu->luid.LowPart || gpu->luid.HighPart) + { + open_adapter_from_luid.AdapterLuid = gpu->luid; + + /* give the GDI driver a chance to be notified about new adapter handle */ + if (NT_SUCCESS( NtGdiDdDDIOpenAdapterFromLuid( &open_adapter_from_luid ) )) + { + desc->pAdapters[idx].hAdapter = open_adapter_from_luid.hAdapter; + desc->pAdapters[idx].AdapterLuid = gpu->luid; + desc->pAdapters[idx].NumOfSources = gpu->adapter_count; + desc->pAdapters[idx].bPrecisePresentRegionsPreferred = FALSE; + idx += 1; + continue; + } + else + { + ERR( "Failed to open adapter %u from LUID.\n", (unsigned int)idx ); + } + } + else + { + ERR( "Adapter %u does not have a LUID.\n", (unsigned int)idx ); + } + + while (idx--) + { + close_adapter.hAdapter = desc->pAdapters[idx].hAdapter; + NtGdiDdDDICloseAdapter( &close_adapter ); + } + + memset( desc->pAdapters, 0, desc->NumAdapters * sizeof(D3DKMT_ADAPTERINFO) ); + status = STATUS_UNSUCCESSFUL; + break; + } + +done: + if (status == STATUS_SUCCESS) + desc->NumAdapters = idx; + + unlock_display_devices(); + + return status; }

1 0

Paul Gofman : strmbase: Force debug info in critical sections.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: fb64ea8675dc1ab4cc4e89a9924f3672a6662136 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb64ea8675dc1ab4cc4e89a9924f36… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 13 18:33:08 2024 -0600 strmbase: Force debug info in critical sections. --- libs/strmbase/filter.c | 4 ++-- libs/strmbase/pospass.c | 2 +- libs/strmbase/seeking.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index ee41611a198..fa8738188a2 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -524,10 +524,10 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->outer_unk = outer ? outer : &filter->IUnknown_inner; filter->refcount = 1; - InitializeCriticalSection(&filter->filter_cs); + InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); - InitializeCriticalSection(&filter->stream_cs); + InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.stream_cs"); filter->clsid = *clsid; diff --git a/libs/strmbase/pospass.c b/libs/strmbase/pospass.c index 03cb7783f97..79ebf44cf24 100644 --- a/libs/strmbase/pospass.c +++ b/libs/strmbase/pospass.c @@ -730,7 +730,7 @@ void strmbase_passthrough_init(struct strmbase_passthrough *passthrough, IUnknow passthrough->IMediaPosition_iface.lpVtbl = &IMediaPositionPassThru_Vtbl; passthrough->IMediaSeeking_iface.lpVtbl = &IMediaSeekingPassThru_Vtbl; passthrough->ISeekingPassThru_iface.lpVtbl = &ISeekingPassThru_Vtbl; - InitializeCriticalSection(&passthrough->time_cs); + InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); passthrough->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_passthrough.time_cs" ); } diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c index 91e9ccedfb4..574083b985f 100644 --- a/libs/strmbase/seeking.c +++ b/libs/strmbase/seeking.c @@ -49,7 +49,7 @@ HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl * pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - InitializeCriticalSection(&pSeeking->cs); + InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; }

1 0

Paul Gofman : dmime: Force debug info in critical sections.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: bbe1c7532a807844fbc4d1523fed88938f56f3a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbe1c7532a807844fbc4d1523fed88… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 13 18:41:12 2024 -0600 dmime: Force debug info in critical sections. --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 08d74a81c25..500bc8b536f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -2291,7 +2291,7 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface) obj->ref = 1; obj->pDefaultPath = NULL; - InitializeCriticalSection(&obj->safe); + InitializeCriticalSectionEx(&obj->safe, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": performance->safe"); wine_rb_init(&obj->channel_blocks, channel_block_compare);

1 0

Paul Gofman : dmsynth: Force debug info in critical sections.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 17f94ab56389d355571305aa981471b7110b1e42 URL: https://gitlab.winehq.org/wine/wine/-/commit/17f94ab56389d355571305aa981471… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 13 18:42:39 2024 -0600 dmsynth: Force debug info in critical sections. --- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 5453c296be3..ecf1dead8a8 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1992,7 +1992,7 @@ HRESULT synth_create(IUnknown **ret_iface) goto failed; fluid_sfont_set_data(obj->fluid_sfont, obj); - InitializeCriticalSection(&obj->cs); + InitializeCriticalSectionEx(&obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); TRACE("Created DirectMusicSynth %p\n", obj); diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 9263ff56349..c0ac7871f9a 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -754,7 +754,7 @@ HRESULT synth_sink_create(IUnknown **ret_iface) obj->ref = 1; obj->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); - InitializeCriticalSection(&obj->cs); + InitializeCriticalSectionEx(&obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); TRACE("Created DirectMusicSynthSink %p\n", obj);

1 0

Alexandre Julliard : winedump: Add dumping of the save_any_reg ARM64 unwind code.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 7c4ca6ff74248b0dfd54be206e6a0e7b13c6ba8a URL: https://gitlab.winehq.org/wine/wine/-/commit/7c4ca6ff74248b0dfd54be206e6a0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 15:08:55 2024 +0100 winedump: Add dumping of the save_any_reg ARM64 unwind code. --- tools/winedump/pe.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f405acb2710..1879dd0ce2a 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1395,7 +1395,7 @@ static const BYTE code_lengths[256] = /* 80 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* a0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* c0 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -/* e0 */ 4,1,2,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +/* e0 */ 4,1,2,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 }; static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) @@ -1406,8 +1406,7 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) { BYTE len = code_lengths[ptr[i]]; unsigned int val = ptr[i]; - if (len == 2) val = ptr[i] * 0x100 + ptr[i+1]; - else if (len == 4) val = ptr[i] * 0x1000000 + ptr[i+1] * 0x10000 + ptr[i+2] * 0x100 + ptr[i+3]; + for (j = 1; j < len; j++) val = val * 0x100 + ptr[i + j]; printf( " %04x: ", i ); for (j = 0; j < 4; j++) @@ -1507,21 +1506,18 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) { printf( "save_next\n" ); } - else if (ptr[i] == 0xe7) /* arithmetic */ + else if (ptr[i] == 0xe7) /* save_any_reg */ { - switch ((val >> 4) & 0x0f) - { - case 0: printf( "add lr,lr,x28\n" ); break; - case 1: printf( "add lr,lr,sp\n" ); break; - case 2: printf( "sub lr,lr,x28\n" ); break; - case 3: printf( "sub lr,lr,sp\n" ); break; - case 4: printf( "eor lr,lr,x28\n" ); break; - case 5: printf( "eor lr,lr,sp\n" ); break; - case 6: printf( "rol lr,lr,neg x28\n" ); break; - case 8: printf( "ror lr,lr,x28\n" ); break; - case 9: printf( "ror lr,lr,sp\n" ); break; - default:printf( "unknown op\n" ); break; - } + char reg = "xdq?"[(val >> 6) & 3]; + int num = (val >> 8) & 0x1f; + if (val & 0x4000) + printf( "stp %c%u,%c%u", reg, num, reg, num + 1 ); + else + printf( "str %c%u,", reg, num ); + if (val & 0x2000) + printf( "[sp,#-%#x]!\n", 16 * (val & 0x3f) + 16 ); + else + printf( "[sp,#%#x]\n", (val & 0x3f) * ((val & 0x4080) ? 16 : 8) ); } else if (ptr[i] == 0xe8) /* MSFT_OP_TRAP_FRAME */ {

1 0

Alexandre Julliard : ntdll: Add support for the save_any_reg ARM64 unwind code.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: a271fc9e192bc43b86f71711b545838b6693a63c URL: https://gitlab.winehq.org/wine/wine/-/commit/a271fc9e192bc43b86f71711b54583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 15:17:23 2024 +0100 ntdll: Add support for the save_any_reg ARM64 unwind code. Based on a patch by Billy Laws. --- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unwind.c | 41 ++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c061edc46ed..789a954cbe0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8092,6 +8092,7 @@ static void test_collided_unwind(void) #define UWOP_END 0xE4 #define UWOP_END_C 0xE5 #define UWOP_SAVE_NEXT 0xE6 +#define UWOP_SAVE_ANY_REG(reg,offset) 0xE7,(reg),(offset) #define UWOP_TRAP_FRAME 0xE8 #define UWOP_MACHINE_FRAME 0xE9 #define UWOP_CONTEXT 0xEA @@ -8164,8 +8165,6 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) else memcpy(&runtime_func.UnwindData, test->unwind_info, 4); - trace( "code: %p stack: %p\n", code_mem, fake_stack ); - for (i = 0; i < test->nb_results; i++) { memset( &ctx_ptr, 0, sizeof(ctx_ptr) ); @@ -8900,6 +8899,59 @@ static void test_virtual_unwind(void) { 0x24, 0x10, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, }; + static const BYTE function_14[] = + { + 0xe6, 0x9f, 0xba, 0xad, /* 00: stp q6, q7, [sp, #-0xb0]! */ + 0xe8, 0x27, 0x01, 0xad, /* 04: stp q8, q9, [sp, #0x20] */ + 0xea, 0x2f, 0x02, 0xad, /* 08: stp q10, q11, [sp, #0x40] */ + 0xec, 0x37, 0x03, 0xad, /* 0c: stp q12, q13, [sp, #0x60] */ + 0xee, 0x3f, 0x04, 0xad, /* 10: stp q14, q15, [sp, #0x80] */ + 0xfd, 0x7b, 0x0a, 0xa9, /* 14: stp x29, x30, [sp, #0xa0] */ + 0xfd, 0x83, 0x02, 0x91, /* 18: add x29, sp, #0xa0 */ + 0x1f, 0x20, 0x03, 0xd5, /* 1c: nop */ + 0xfd, 0x7b, 0x4a, 0xa9, /* 20: ldp x29, x30, [sp, #0xa0] */ + 0xee, 0x3f, 0x44, 0xad, /* 24: ldp q14, q15, [sp, #0x80] */ + 0xec, 0x37, 0x43, 0xad, /* 28: ldp q12, q13, [sp, #0x60] */ + 0xea, 0x2f, 0x42, 0xad, /* 2c: ldp q10, q11, [sp, #0x40] */ + 0xe8, 0x27, 0x41, 0xad, /* 30: ldp q8, q9, [sp, #0x20] */ + 0xe6, 0x9f, 0xc5, 0xac, /* 34: ldp q6, q7, [sp], #0xb0 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 38: ret */ + }; + + static const DWORD unwind_info_14_header = + (sizeof(function_14)/4) | /* function length */ + (0 << 20) | /* X */ + (1 << 21) | /* E */ + (2 << 22) | /* epilog */ + (5 << 27); /* codes */ + + static const BYTE unwind_info_14[] = + { + DW(unwind_info_14_header), + UWOP_ADD_FP(0xa0), /* 18: add x29, sp, #0xa0 */ + UWOP_SAVE_FPLR(0xa0), /* 14: stp x29, x30, [sp, #0xa0] */ + UWOP_SAVE_ANY_REG(0x4e,0x88), /* 10: stp q14, q15, [sp, #0x80] */ + UWOP_SAVE_NEXT, /* 0c: stp q12, q13, [sp, #0x60] */ + UWOP_SAVE_ANY_REG(0x4a,0x84), /* 08: stp q10, q11, [sp, #0x40] */ + UWOP_SAVE_ANY_REG(0x48,0x82), /* 04: stp q8, q9, [sp, #0x20] */ + UWOP_SAVE_ANY_REG(0x66,0x8a), /* 00: stp q6, q7, [sp, #-0xb0]! */ + UWOP_END, + UWOP_NOP /* padding */ + }; + + static const struct results results_14[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {-1,-1} }}, + { 0x10, 0x00, 0, ORIG_LR, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {d12, 0x60}, {d13, 0x70}, {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {d12, 0x60}, {d13, 0x70}, {d14, 0x80}, {d15, 0x90}, {-1,-1} }}, + { 0x18, 0x00, 0, 0xa8, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {d12, 0x60}, {d13, 0x70}, {d14, 0x80}, {d15, 0x90}, {lr, 0xa8}, {x29, 0xa0}, {-1,-1} }}, + { 0x1c, 0xa0, 0, 0xa8, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {d12, 0x60}, {d13, 0x70}, {d14, 0x80}, {d15, 0x90}, {lr, 0xa8}, {x29, 0xa0}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ @@ -8918,6 +8970,7 @@ static void test_virtual_unwind(void) TEST(function_11, unwind_info_11, 1, results_11), TEST(function_12, unwind_info_12, 1, results_12), TEST(function_13, unwind_info_13, 1, results_13), + TEST(function_14, unwind_info_14, 0, results_14), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index be99fe67453..4cc304b63ef 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -296,7 +296,7 @@ static const BYTE unwind_code_len[256] = /* 80 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* a0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* c0 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -/* e0 */ 4,1,2,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +/* e0 */ 4,1,2,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 }; static unsigned int get_sequence_len( BYTE *ptr, BYTE *end ) @@ -336,6 +336,40 @@ static void restore_fpregs( int reg, int count, int pos, ARM64_NT_CONTEXT *conte if (pos < 0) context->Sp += -8 * pos; } +static void restore_qregs( int reg, int count, int pos, ARM64_NT_CONTEXT *context, + KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs ) +{ + int i, offset = max( 0, pos ); + for (i = 0; i < count; i++) + { + if (ptrs && reg + i >= 8) (&ptrs->D8)[reg + i - 8] = (DWORD64 *)context->Sp + 2 * (i + offset); + context->V[reg + i].Low = ((DWORD64 *)context->Sp)[2 * (i + offset)]; + context->V[reg + i].High = ((DWORD64 *)context->Sp)[2 * (i + offset) + 1]; + } + if (pos < 0) context->Sp += -16 * pos; +} + +static void restore_any_reg( int reg, int count, int type, int pos, ARM64_NT_CONTEXT *context, + KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs ) +{ + if (reg & 0x20) pos = -pos - 1; + + switch (type) + { + case 0: + if (count > 1 || pos < 0) pos *= 2; + restore_regs( reg & 0x1f, count, pos, context, ptrs ); + break; + case 1: + if (count > 1 || pos < 0) pos *= 2; + restore_fpregs( reg & 0x1f, count, pos, context, ptrs ); + break; + case 2: + restore_qregs( reg & 0x1f, count, pos, context, ptrs ); + break; + } +} + static void do_pac_auth( ARM64_NT_CONTEXT *context ) { register DWORD64 x17 __asm__( "x17" ) = context->Lr; @@ -421,6 +455,11 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex ptr += len; continue; } + else if (*ptr == 0xe7) /* save_any_reg */ + { + restore_any_reg( ptr[1], (ptr[1] & 0x40) ? save_next : 1, + ptr[2] >> 6, ptr[2] & 0x3f, context, ptrs ); + } else if (*ptr == 0xe9) /* MSFT_OP_MACHINE_FRAME */ { context->Pc = ((DWORD64 *)context->Sp)[1];

1 0

Alexandre Julliard : ntdll: Ignore end_c when processing ARM64 unwind codes.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 1abebca6dc024505a72bd564c6e998107102c1c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1abebca6dc024505a72bd564c6e998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 16:29:03 2024 +0100 ntdll: Ignore end_c when processing ARM64 unwind codes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55584 --- dlls/ntdll/tests/exception.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unwind.c | 4 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 789a954cbe0..518b15f7821 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8952,6 +8952,46 @@ static void test_virtual_unwind(void) { 0x1c, 0xa0, 0, 0xa8, 0x0b0, TRUE, { {d6, 0x00}, {d7, 0x10}, {d8, 0x20}, {d9, 0x30}, {d10, 0x40}, {d11, 0x50}, {d12, 0x60}, {d13, 0x70}, {d14, 0x80}, {d15, 0x90}, {lr, 0xa8}, {x29, 0xa0}, {-1,-1} }}, }; + static const BYTE function_15[] = + { + 0x1f, 0x20, 0x03, 0xd5, /* 00: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 08: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0x1f, 0x20, 0x03, 0xd5, /* 10: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 14: ret */ + }; + + static const DWORD unwind_info_15_header = + (sizeof(function_15)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (2 << 27); /* codes */ + + static const BYTE unwind_info_15[] = + { + DW(unwind_info_15_header), + UWOP_END_C, + UWOP_SET_FP, /* mov x29, sp */ + UWOP_SAVE_REGP(19, 0x10), /* stp r19, r20, [sp, #0x10] */ + UWOP_SAVE_FPLR_X(0x20), /* stp r29, lr, [sp,-#0x20]! */ + UWOP_END, + UWOP_NOP, /* padding */ + UWOP_NOP, /* padding */ + }; + + static const struct results results_15[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x04, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x08, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x0c, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x10, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x14, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ @@ -8971,6 +9011,7 @@ static void test_virtual_unwind(void) TEST(function_12, unwind_info_12, 1, results_12), TEST(function_13, unwind_info_13, 1, results_13), TEST(function_14, unwind_info_14, 0, results_14), + TEST(function_15, unwind_info_15, 0, results_15), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 4cc304b63ef..270410adf82 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -392,7 +392,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex /* skip codes */ while (ptr < end && skip) { - if (*ptr == 0xe4 || *ptr == 0xe5) break; + if (*ptr == 0xe4) break; ptr += unwind_code_len[*ptr]; skip--; } @@ -448,7 +448,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex else if (*ptr == 0xe4) /* end */ break; else if (*ptr == 0xe5) /* end_c */ - break; + /* ignore */; else if (*ptr == 0xe6) /* save_next */ { save_next += 2;

1 0

Alexandre Julliard : ntdll: Don't count custom stack frames as part of the prolog on ARM64.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 2601a8a2f1d42f0d181fa228a93952553ba9cb7f URL: https://gitlab.winehq.org/wine/wine/-/commit/2601a8a2f1d42f0d181fa228a93952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 15 17:59:04 2024 +0100 ntdll: Don't count custom stack frames as part of the prolog on ARM64. --- dlls/ntdll/tests/exception.c | 13 ++++--------- dlls/ntdll/unwind.c | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 518b15f7821..5a9b77c157c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8401,20 +8401,16 @@ static void test_virtual_unwind(void) }; /* Partial prologues with the custom frame opcodes (machine frame, - * context) behave like there's an off-by-one bug; unwinding from - * offset 0, which normally does nothing, executes one opcode if - * there's a machine frame or context in the prologue, and for other - * offsets, it behaves like unwinding from one instruction further - * ahead. So only test the full prologue case. */ + * context) behave like there's one less instruction to skip, because the + * custom frame is set up externally without an explicit instruction. */ static const struct results results_2[] = { /* offset fp handler pc frame offset registers */ -#if 0 { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, { 0x04, 0x00, 0, 0x0008, 0x010, FALSE, { {-1,-1} }}, { 0x08, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, -#endif { 0x0c, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, + { 0x10, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, }; static const BYTE function_3[] = @@ -8446,12 +8442,11 @@ static void test_virtual_unwind(void) static const struct results results_3[] = { /* offset fp handler pc frame offset registers */ -#if 0 { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, { 0x04, 0x00, 0 , 0x0108, 0x110, FALSE, { {x0, 0x08}, {x1, 0x10}, {x2, 0x18}, {x3, 0x20}, {x4, 0x28}, {x5, 0x30}, {x6, 0x38}, {x7, 0x40}, {x8, 0x48}, {x9, 0x50}, {x10, 0x58}, {x11, 0x60}, {x12, 0x68}, {x13, 0x70}, {x14, 0x78}, {x15, 0x80}, {x16, 0x88}, {x17, 0x90}, {x18, 0x98}, {x19, 0xA0}, {x20, 0xA8}, {x21, 0xB0}, {x22, 0xB8}, {x23, 0xC0}, {x24, 0xC8}, {x25, 0xD0}, {x26, 0xD8}, {x27, 0xE0}, {x28, 0xE8}, {x29, 0xF0}, {lr, 0xF8}, {d0, 0x110}, {d1, 0x120}, {d2, 0x130}, {d3, 0x140}, {d4, 0x150}, {d5, 0x160}, {d6, 0x170}, {d7, 0x180}, {d8, 0x190}, {d9, 0x1a0}, {d10, 0x1b0}, {d11, 0x1c0}, {d12, 0x1d0}, {d13, 0x1e0}, {d14, 0x1f0}, {d15, 0x200}, {-1,-1} }}, { 0x08, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, -#endif { 0x0c, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, + { 0x10, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, }; static const BYTE function_4[] = diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 270410adf82..7ca744bc4f8 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -306,8 +306,8 @@ static unsigned int get_sequence_len( BYTE *ptr, BYTE *end ) while (ptr < end) { if (*ptr == 0xe4 || *ptr == 0xe5) break; + if ((*ptr & 0xf8) != 0xe8) ret++; /* custom stack frames don't count */ ptr += unwind_code_len[*ptr]; - ret++; } return ret; }

1 0

Jinoh Kang : ntdll: Remove stale comment from set_async_direct_result() documentation.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: b74e1a570b40220803a31700558e523ead383638 URL: https://gitlab.winehq.org/wine/wine/-/commit/b74e1a570b40220803a31700558e52… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Feb 9 21:54:00 2024 +0900 ntdll: Remove stale comment from set_async_direct_result() documentation. The supplied async handle passed to set_async_direct_result() cannot be NULL. --- dlls/ntdll/unix/sync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1df2ea6e9d2..cde6a0f8483 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2593,7 +2593,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif /* Notify direct completion of async and close the wait handle if it is no longer needed. - * This function is a no-op (returns status as-is) if the supplied handle is NULL. */ void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) {

1 0