wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Fabian Maurer : winealsa: Remove superflous check.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: c62ca5fceda40ea769b7c3750680255caf78cfc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c62ca5fceda40ea769b7c375068025… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jul 26 19:11:15 2023 +0200 winealsa: Remove superflous check. --- dlls/winealsa.drv/alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 94fc3c6fa4b..aa1ad4abe6c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2014,7 +2014,7 @@ exit: if(params->result == S_FALSE && !params->fmt_out) params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; - if(params->result == S_FALSE && params->fmt_out) { + if(params->result == S_FALSE) { closest->Format.nBlockAlign = closest->Format.nChannels * closest->Format.wBitsPerSample / 8; closest->Format.nAvgBytesPerSec = closest->Format.nBlockAlign * closest->Format.nSamplesPerSec; if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE)

1 0

Fabian Maurer : wineoss: Remove superflous check.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: e75d1b38b5d80703225fdab46cb13020ee52c0fb URL: https://gitlab.winehq.org/wine/wine/-/commit/e75d1b38b5d80703225fdab46cb130… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 20 19:58:53 2023 +0200 wineoss: Remove superflous check. --- dlls/wineoss.drv/oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9a7a0fbb5d9..89e626f39d6 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -551,7 +551,7 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, if(ret == S_FALSE && !out) ret = AUDCLNT_E_UNSUPPORTED_FORMAT; - if(ret == S_FALSE && out){ + if(ret == S_FALSE){ closest->Format.nBlockAlign = closest->Format.nChannels * closest->Format.wBitsPerSample / 8; closest->Format.nAvgBytesPerSec =

1 0

Daniel Lehman : oleaut32: Use scientific notation only for larger numbers in VarBstrFromR[48].
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 4d1ad4f9753b417e9260f614f57eaf0ce0cd5439 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d1ad4f9753b417e9260f614f57eaf… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Feb 6 22:48:35 2024 -0800 oleaut32: Use scientific notation only for larger numbers in VarBstrFromR[48]. --- dlls/oleaut32/tests/vartype.c | 22 ++++++++-------------- dlls/oleaut32/vartype.c | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e58e840a6a9..795446d0987 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4525,7 +4525,6 @@ struct r4_test { float val; const wchar_t *expect; - BOOL todo; }; static void test_VarBstrFromR4(void) @@ -4536,8 +4535,8 @@ static void test_VarBstrFromR4(void) { 0.05, L"0.05" }, { 0.005, L"0.005" }, { 0.0005, L"0.0005" }, - { 0.00005, L"0.00005", TRUE }, - { 0.000005, L"0.000005", TRUE }, + { 0.00005, L"0.00005" }, + { 0.000005, L"0.000005" }, { 1.0e8, L"1E+08" }, { 1.0e12, L"1E+12" }, @@ -4564,8 +4563,8 @@ static void test_VarBstrFromR4(void) { 0.05, L"0,05" }, { 0.005, L"0,005" }, { 0.0005, L"0,0005" }, - { 0.00005, L"0,00005", TRUE }, - { 0.000005, L"0,000005", TRUE }, + { 0.00005, L"0,00005" }, + { 0.000005, L"0,000005" }, { 1.0e8, L"1E+08" }, { 1.0e12, L"1E+12" }, @@ -4648,7 +4647,6 @@ static void test_VarBstrFromR4(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } @@ -4664,7 +4662,6 @@ static void test_VarBstrFromR4(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } @@ -4676,7 +4673,6 @@ struct r8_test { double val; const wchar_t *expect; - BOOL todo; }; static void test_VarBstrFromR8(void) @@ -4687,8 +4683,8 @@ static void test_VarBstrFromR8(void) { 0.05, L"0.05" }, { 0.005, L"0.005" }, { 0.0005, L"0.0005" }, - { 0.00005, L"0.00005", TRUE }, - { 0.000005, L"0.000005", TRUE }, + { 0.00005, L"0.00005" }, + { 0.000005, L"0.000005" }, { 1.0e8, L"100000000" }, { 1.0e12, L"1000000000000" }, @@ -4715,8 +4711,8 @@ static void test_VarBstrFromR8(void) { 0.05, L"0,05" }, { 0.005, L"0,005" }, { 0.0005, L"0,0005" }, - { 0.00005, L"0,00005", TRUE }, - { 0.000005, L"0,000005", TRUE }, + { 0.00005, L"0,00005" }, + { 0.000005, L"0,000005" }, { 1.0e8, L"100000000" }, { 1.0e12, L"1000000000000" }, @@ -4751,7 +4747,6 @@ static void test_VarBstrFromR8(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } @@ -4767,7 +4762,6 @@ static void test_VarBstrFromR8(void) ok(hres == S_OK, "got hres 0x%08lx\n", hres); if (bstr) { - todo_wine_if(cur->todo) ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); SysFreeString(bstr); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3ab404f33f8..d11fb41d1b3 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6538,16 +6538,24 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl } static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, - BSTR* pbstrOut, LPCWSTR lpszFormat) + BSTR* pbstrOut, int ndigits) { _locale_t locale; - WCHAR buff[256]; + WCHAR *e, buff[256]; + int len; if (!pbstrOut) return E_INVALIDARG; if (!(locale = _create_locale(LC_ALL, "C"))) return E_OUTOFMEMORY; - _swprintf_l(buff, ARRAY_SIZE(buff), lpszFormat, locale, dblIn); + len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*G", locale, ndigits, dblIn); + e = wcschr(buff, 'E'); + if (e && labs(wcstol(e+1, NULL, 10)) < ndigits) + { + len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*f", locale, ndigits, dblIn); + while (len > 0 && (buff[len-1] == '0')) len--; + } + buff[len] = 0; _free_locale(locale); /* Negative zeroes are disallowed (some applications depend on this). @@ -6598,7 +6606,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, L"%.7G"); + return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, 7); } /****************************************************************************** @@ -6619,7 +6627,7 @@ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO */ HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, L"%.15G"); + return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, 15); } /******************************************************************************

1 0

Daniel Lehman : oleaut32/tests: Add tests for number of digits.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 55e4aa7a3126e92a7d9bca6e2fb4ad23debc61a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/55e4aa7a3126e92a7d9bca6e2fb4ad… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 4 08:26:00 2024 -0800 oleaut32/tests: Add tests for number of digits. --- dlls/oleaut32/tests/vartype.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c6772a7be14..e58e840a6a9 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4549,10 +4549,12 @@ static void test_VarBstrFromR4(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1.234E+16" }, + { 3.14159300, L"3.141593" }, + { 3.14159265, L"3.141593" }, { M_PI, L"3.141593" }, - { 37.86626157, L"37.86626" }, - { 137.86626157, L"137.8663" }, - { 1137.86626157, L"1137.866" }, + { 12.34567890, L"12.34568" }, + { 123.45678901, L"123.4568" }, + { 1234.56789012, L"1234.568" }, { 0.0, NULL } }; @@ -4575,7 +4577,12 @@ static void test_VarBstrFromR4(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1,234E+16" }, + { 3.14159300, L"3,141593" }, + { 3.14159265, L"3,141593" }, { M_PI, L"3,141593" }, + { 12.34567890, L"12,34568" }, + { 123.45678901, L"123,4568" }, + { 1234.56789012, L"1234,568" }, { 0.0, NULL } }; @@ -4693,6 +4700,12 @@ static void test_VarBstrFromR8(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1.234E+16" }, + { 3.141592653590000, L"3.14159265359" }, + { 3.141592653589793, L"3.14159265358979" }, + { M_PI, L"3.14159265358979" }, + { 12.345678901234567, L"12.3456789012346" }, + { 123.456789012345678, L"123.456789012346" }, + { 1234.567890123456789, L"1234.56789012346" }, { 0.0, NULL } }; @@ -4715,6 +4728,12 @@ static void test_VarBstrFromR8(void) { 1.000e16, L"1E+16" }, { 1.234e16, L"1,234E+16" }, + { 3.141592653590000, L"3,14159265359" }, + { 3.141592653589793, L"3,14159265358979" }, + { M_PI, L"3,14159265358979" }, + { 12.345678901234567, L"12,3456789012346" }, + { 123.456789012345678, L"123,456789012346" }, + { 1234.567890123456789, L"1234,56789012346" }, { 0.0, NULL } };

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

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

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: 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 : 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

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

← Newer
1
...
35
36
37
38
39
40
41
...
72
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 February 2024