March 2024 - Wine-commits - list.winehq.org

Zebediah Figura : quartz/tests: Add some tests for VMR7 renderless mode.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 525ef1bf777433dc64f21dbd0135cc4b509ce330 URL: https://gitlab.winehq.org/wine/wine/-/commit/525ef1bf777433dc64f21dbd0135cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 8 13:44:15 2023 -0600 quartz/tests: Add some tests for VMR7 renderless mode. --- dlls/quartz/tests/vmr7.c | 467 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 467 insertions(+)

1 0

Paul Gofman : strmbase: Fallback to InitializeCriticalSection() if RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO is unsupported.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 86557b9e0ba8a783f1b0d0918b1ddec7e0a7749e URL: https://gitlab.winehq.org/wine/wine/-/commit/86557b9e0ba8a783f1b0d0918b1dde… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 12:44:58 2024 -0600 strmbase: Fallback to InitializeCriticalSection() if RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO is unsupported. --- libs/strmbase/filter.c | 6 ++++-- libs/strmbase/pospass.c | 3 ++- libs/strmbase/seeking.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index fa8738188a2..3229c7ba82a 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -524,10 +524,12 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->outer_unk = outer ? outer : &filter->IUnknown_inner; filter->refcount = 1; - InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&filter->filter_cs); if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); - InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&filter->stream_cs); 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 79ebf44cf24..2b6321432bd 100644 --- a/libs/strmbase/pospass.c +++ b/libs/strmbase/pospass.c @@ -730,7 +730,8 @@ 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; - InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&passthrough->time_cs); 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 574083b985f..62e6d454a57 100644 --- a/libs/strmbase/seeking.c +++ b/libs/strmbase/seeking.c @@ -49,7 +49,8 @@ HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl * pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + if (!InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO)) + InitializeCriticalSection(&pSeeking->cs); pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; }

1 0

Zebediah Figura : shell32/tests: Remove obsolete workarounds from test_move().
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 19627b13e4c6db49cc2e354dbb602cb581923f73 URL: https://gitlab.winehq.org/wine/wine/-/commit/19627b13e4c6db49cc2e354dbb602c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 17 13:34:28 2024 -0500 shell32/tests: Remove obsolete workarounds from test_move(). --- dlls/shell32/tests/shlfileop.c | 307 ++++++++++------------------------------- 1 file changed, 70 insertions(+), 237 deletions(-)

1 0

Zhenbo Li : shell32: Create nonexistent destination directories in FO_MOVE.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: b4a5775ffb2e5c27ff85399f89f6b37f1d1298d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4a5775ffb2e5c27ff85399f89f6b3… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Mar 17 14:04:32 2024 -0500 shell32: Create nonexistent destination directories in FO_MOVE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25207 --- dlls/shell32/shlfileop.c | 6 ++++-- dlls/shell32/tests/shlfileop.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b4a941187ab..a7e88c813d2 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1398,6 +1398,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const INT mismatched = 0; const FILE_ENTRY *entryToMove; const FILE_ENTRY *fileDest; + int ret; if (!flFrom->dwNumFiles) return ERROR_SUCCESS; @@ -1418,8 +1419,9 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const return ERROR_CANCELLED; } - if (!PathFileExistsW(flTo->feFiles[0].szDirectory)) - return ERROR_CANCELLED; + ret = SHCreateDirectoryExW(NULL, flTo->feFiles[0].szDirectory, NULL); + if (ret && ret != ERROR_ALREADY_EXISTS) + return ret; if (lpFileOp->fFlags & FOF_MULTIDESTFILES) mismatched = flFrom->dwNumFiles - flTo->dwNumFiles; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1b00780499c..097e99fd113 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2165,8 +2165,8 @@ static void test_move(void) shfo.pFrom = "test2.txt\0"; shfo.pTo = "dir1\\dir2\\test2.txt\0"; retval = SHFileOperationA(&shfo); - todo_wine ok(!retval, "got %ld\n", retval); - todo_wine ok(DeleteFileA("dir1\\dir2\\test2.txt"), "Expected dir1\\dir2\\test2.txt to exist\n"); + ok(!retval, "got %ld\n", retval); + ok(DeleteFileA("dir1\\dir2\\test2.txt"), "Expected dir1\\dir2\\test2.txt to exist\n"); RemoveDirectoryA("dir1\\dir2"); RemoveDirectoryA("dir1"); createTestFile("test2.txt");

1 0

Alexandre Julliard : netprofm: Use the correct symbols for error codes.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 5cf558935d38aaffc1773201d804189a81163e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf558935d38aaffc1773201d80418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 09:56:48 2024 +0100 netprofm: Use the correct symbols for error codes. --- dlls/netprofm/list.c | 4 ++-- dlls/netprofm/tests/list.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 31534c7f4b9..af40dc0ac91 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -194,7 +194,7 @@ static HRESULT WINAPI connection_point_Advise( if (FAILED(hr)) { WARN( "iface %s not implemented by sink\n", debugstr_guid(&cp->iid) ); - return CO_E_FAILEDTOOPENTHREADTOKEN; + return CONNECT_E_CANNOTCONNECT; } sink_entry = malloc( sizeof(*sink_entry) ); @@ -234,7 +234,7 @@ static HRESULT WINAPI connection_point_Unadvise( } WARN( "invalid cookie\n" ); - return OLE_E_NOCONNECTION; + return CONNECT_E_NOCONNECTION; } static HRESULT WINAPI connection_point_EnumConnections( diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 4c0c87cab8b..12a54477f66 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -22,6 +22,7 @@ #include "initguid.h" #include "objbase.h" #include "ocidl.h" +#include "olectl.h" #include "netlistmgr.h" #include "wine/test.h" @@ -348,13 +349,13 @@ static void test_INetworkListManager( void ) "Expected iid to be IID_INetworkListManagerEvents\n" ); hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink_unk, &cookie); - ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08lx\n", hr ); + ok( hr == CONNECT_E_CANNOTCONNECT, "Advise failed: %08lx\n", hr ); hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink, &cookie); ok( hr == S_OK, "Advise failed: %08lx\n", hr ); hr = IConnectionPoint_Unadvise( pt, 0xdeadbeef ); - ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08lx\n", hr ); + ok( hr == OLE_E_NOCONNECTION || hr == CONNECT_E_NOCONNECTION, "Unadvise failed: %08lx\n", hr ); hr = IConnectionPoint_Unadvise( pt, cookie ); ok( hr == S_OK, "Unadvise failed: %08lx\n", hr ); @@ -365,11 +366,11 @@ static void test_INetworkListManager( void ) IConnectionPoint_Release( pt2 ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt ); - ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr ); + ok( hr == S_OK || hr == CONNECT_E_NOCONNECTION, "got %08lx\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkConnectionEvents, &pt ); - ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr ); + ok( hr == S_OK || hr == CONNECT_E_NOCONNECTION, "got %08lx\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkEvents, &pt );

1 0

Alexandre Julliard : msvcrt: Use floating point comparison builtins also in MSVC mode.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: d70dd610305318143d9b06ec98f1be5cf4716119 URL: https://gitlab.winehq.org/wine/wine/-/commit/d70dd610305318143d9b06ec98f1be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 11:06:03 2024 +0100 msvcrt: Use floating point comparison builtins also in MSVC mode. --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4b7df1244eb..fc7de676c83 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -351,7 +351,7 @@ static inline int __signbit(double x) #define _FP_EQ 2 #define _FP_GT 4 -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) # define isgreater(x, y) __builtin_isgreater(x, y) # define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) # define isless(x, y) __builtin_isless(x, y)

1 0

Alexandre Julliard : ntdll/tests: Fix exception address checks in child process on ARM64EC.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 2c2229523385976cb05a2811a4874bd7a7e31d15 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c2229523385976cb05a2811a4874b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 22:15:54 2024 +0100 ntdll/tests: Fix exception address checks in child process on ARM64EC. --- dlls/ntdll/tests/exception.c | 66 ++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d3c279ecab8..e1389bae2ab 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -89,6 +89,7 @@ static VOID (WINAPI *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64); static BOOLEAN (CDECL *pRtlDeleteFunctionTable)(RUNTIME_FUNCTION*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); +static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); #endif static void *pKiUserApcDispatcher; @@ -146,7 +147,6 @@ static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64GetCpuAreaInfo)(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); -static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); #endif enum debugger_stages @@ -3011,7 +3011,9 @@ static void test_exceptions(void) got_exception = 0; run_exception_test(direction_flag_handler, NULL, direction_flag_code, sizeof(direction_flag_code), 0); ok(got_exception == 1, "got %d exceptions, expected 1\n", got_exception); +#ifndef __arm64ec__ if (is_arm64ec) __asm__ volatile( "cld" ); /* needed on Windows */ +#endif /* test int3 handling */ run_exception_test(int3_handler, NULL, int3_code, sizeof(int3_code), 0); @@ -3294,7 +3296,7 @@ static void rtlraiseexception_handler_( EXCEPTION_RECORD *rec, void *frame, CONT /* check that pc is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && test_stage) + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && test_stage && !is_arm64ec) ok( context->Rip == (UINT_PTR)addr - 1, "%d: Rip at %Ix instead of %Ix\n", test_stage, context->Rip, (UINT_PTR)addr - 1 ); else @@ -3386,7 +3388,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce /* check that Rip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && test_stage) + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && test_stage && !is_arm64ec) ok( context->Rip == (UINT_PTR)addr - 1, "%d: Rip at %Ix instead of %Ix\n", test_stage, context->Rip, (UINT_PTR)addr - 1 ); else @@ -3579,20 +3581,24 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx) else if (counter < 2) /* startup breakpoint */ { /* breakpoint is inside ntdll */ - void *ntdll = GetModuleHandleA( "ntdll.dll" ); - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( ntdll ); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( hntdll ); - ok( (char *)ctx.Rip >= (char *)ntdll && - (char *)ctx.Rip < (char *)ntdll + nt->OptionalHeader.SizeOfImage, - "wrong rip %p ntdll %p-%p\n", (void *)ctx.Rip, ntdll, - (char *)ntdll + nt->OptionalHeader.SizeOfImage ); + ok( (char *)ctx.Rip >= (char *)hntdll && + (char *)ctx.Rip < (char *)hntdll + nt->OptionalHeader.SizeOfImage, + "wrong rip %p ntdll %p-%p\n", (void *)ctx.Rip, hntdll, + (char *)hntdll + nt->OptionalHeader.SizeOfImage ); } else { if (stage == STAGE_RTLRAISE_NOT_HANDLED) { - ok((char *)ctx.Rip == (char *)code_mem_address + 0x0c, "Rip at %p instead of %p\n", - (char *)ctx.Rip, (char *)code_mem_address + 0x0c); + if (is_arm64ec) /* addr points to RtlRaiseException entry thunk */ + ok( ((ULONG *)ctx.Rip)[-1] == 0xd63f0120 /* blr x9 */, + "Rip not in entry thunk %p (ntdll+%Ix)\n", + (char *)ctx.Rip, (char *)ctx.Rip - (char *)hntdll ); + else + ok((char *)ctx.Rip == (char *)code_mem_address + 0x0c, "Rip at %p instead of %p\n", + (char *)ctx.Rip, (char *)code_mem_address + 0x0c); /* setting the context from debugger does not affect the context that the * exception handler gets, except on w2008 */ ctx.Rip = (UINT_PTR)code_mem_address + 0x0e; @@ -3604,8 +3610,14 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx) { if (de.u.Exception.dwFirstChance) { - ok((char *)ctx.Rip == (char *)code_mem_address + 0x0c, "Rip at %p instead of %p\n", - (char *)ctx.Rip, (char *)code_mem_address + 0x0c); + if (is_arm64ec) + ok( ((ULONG *)ctx.Rip)[-1] == 0xd63f0120 /* blr x9 */, + "Rip not in entry thunk %p (ntdll+%Ix)\n", + (char *)ctx.Rip, (char *)ctx.Rip - (char *)hntdll ); + else + ok((char *)ctx.Rip == (char *)code_mem_address + 0x0c, + "Rip at %p instead of %p\n", + (char *)ctx.Rip, (char *)code_mem_address + 0x0c); /* setting the context from debugger does not affect the context that the * exception handler gets, except on w2008 */ ctx.Rip = (UINT_PTR)code_mem_address + 0x0e; @@ -3617,7 +3629,11 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx) else { /* debugger gets context after exception handler has played with it */ - if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) + if (is_arm64ec) + ok( ((ULONG *)ctx.Rip)[-1] == 0xd63f0120 /* blr x9 */, + "Rip not in entry thunk %p (ntdll+%Ix)\n", + (char *)ctx.Rip, (char *)ctx.Rip - (char *)hntdll ); + else if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); @@ -4275,7 +4291,7 @@ static void test_wow64_context(void) ok( !context.Rbx, "rbx is not zero %Ix\n", context.Rbx ); ok( ((ULONG_PTR)context.Rsp & ~0xfff) == ((ULONG_PTR)teb.Tib.StackBase & ~0xfff), "rsp is not at top of stack %p / %p\n", (void *)context.Rsp, teb.Tib.StackBase ); - ok( context.EFlags == 0x200, "wrong flags %08lx\n", context.EFlags ); + ok( context.EFlags == 0x200 || context.EFlags == 0x202, "wrong flags %08lx\n", context.EFlags ); for (i = 0, got32 = got64 = FALSE; i < 10000 && !(got32 && got64); i++) { @@ -10868,6 +10884,17 @@ START_TEST(exception) X(RtlUnwindEx); X(RtlAddFunctionTable); X(RtlDeleteFunctionTable); + X(RtlGetNativeSystemInformation); +#endif + +#ifdef __x86_64__ + if (pRtlGetNativeSystemInformation) + { + SYSTEM_CPU_INFORMATION info; + ULONG len; + if (!pRtlGetNativeSystemInformation( SystemCpuInformation, &info, sizeof(info), &len )) + is_arm64ec = (info.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64); + } #endif #undef X @@ -10999,17 +11026,8 @@ START_TEST(exception) X(RtlWow64GetThreadContext); X(RtlWow64SetThreadContext); X(RtlWow64GetCpuAreaInfo); - X(RtlGetNativeSystemInformation); #undef X - if (pRtlGetNativeSystemInformation) - { - SYSTEM_CPU_INFORMATION info; - ULONG len; - if (!pRtlGetNativeSystemInformation( SystemCpuInformation, &info, sizeof(info), &len )) - is_arm64ec = (info.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64); - } - test_exceptions(); test_debug_registers(); test_debug_registers_wow64();

1 0

Alexandre Julliard : ntdll/tests: Update the KiUserExceptionDispatcher test for ARM64EC.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 1bb011f815700d4e5e72b9353be2ec8d26af34f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bb011f815700d4e5e72b9353be2ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 22:16:23 2024 +0100 ntdll/tests: Update the KiUserExceptionDispatcher test for ARM64EC. --- dlls/ntdll/tests/exception.c | 46 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e1389bae2ab..3300e5fbe00 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4541,7 +4541,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE got_exception = 1; dbg_except_continue_handler_rip = (void *)context->Rip; - if (NtCurrentTeb()->Peb->BeingDebugged) + if (NtCurrentTeb()->Peb->BeingDebugged && !is_arm64ec) ++context->Rip; if (context->Rip >= (ULONG64)code_mem && context->Rip < (ULONG64)code_mem + 0x100) @@ -4580,6 +4580,27 @@ static void * WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTE return pKiUserExceptionDispatcher; } +static void * WINAPI hook_KiUserExceptionDispatcher_arm64ec(EXCEPTION_RECORD *rec, CONTEXT *context) +{ + ARM64_NT_CONTEXT *arm64_context = (ARM64_NT_CONTEXT *)(context + 1); + + trace("rec %p context %p context->Rip %#Ix, context->Rsp %#Ix, ContextFlags %#lx.\n", + rec, context, context->Rip, context->Rsp, context->ContextFlags); + hook_called = TRUE; + ok(rec->ExceptionCode == 0x80000003 || rec->ExceptionCode == 0xceadbeef, + "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode); + + ok( !((ULONG_PTR)context & 15), "unaligned context %p\n", context ); + ok( arm64_context->Pc == context->Rip, "wrong rip %Ix / %Ix\n", arm64_context->Pc, context->Rip ); + ok( arm64_context->Sp == context->Rsp, "wrong rsp %Ix / %Ix\n", arm64_context->Sp, context->Rsp ); + + hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; + hook_exception_address = rec->ExceptionAddress; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + return pKiUserExceptionDispatcher; +} + static void test_KiUserExceptionDispatcher(void) { LPVOID vectored_handler; @@ -4628,6 +4649,19 @@ static void test_KiUserExceptionDispatcher(void) 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ 0xff, 0xe0, /* jmpq *rax */ }; + static BYTE hook_trampoline_arm64ec[] = + { + 0x48, 0x8d, 0x54, 0x24, 0x08, /* lea 0x8(%rsp),%rdx */ + 0x48, 0x8d, 0x8a, 0x60, 0x08, 0x00, 0x00, + /* lea 0x860(%rdx),%rcx */ + 0x4c, 0x89, 0x22, /* mov %r12,(%rdx) */ + 0x48, 0xb8, /* movabs hook_KiUserExceptionDispatcher_arm64ec,%rax */ + 0,0,0,0,0,0,0,0, /* offset 16 */ + 0xff, 0xd0, /* callq *rax */ + 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ + 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ + 0xff, 0xe0, /* jmpq *rax */ + }; BYTE patched_KiUserExceptionDispatcher_bytes[12]; void *bpt_address, *trampoline_ptr; @@ -4641,9 +4675,13 @@ static void test_KiUserExceptionDispatcher(void) *(ULONG64 *)(except_code + 2) = (ULONG64)&test_kiuserexceptiondispatcher_regs; *(ULONG64 *)(except_code + 0x2a) = (ULONG64)&test_kiuserexceptiondispatcher_regs.new_rax; + *(ULONG_PTR *)(hook_trampoline_arm64ec + 17) = (ULONG_PTR)hook_KiUserExceptionDispatcher_arm64ec; *(ULONG_PTR *)(hook_trampoline + 16) = (ULONG_PTR)hook_KiUserExceptionDispatcher; trampoline_ptr = (char *)code_mem + 1024; - memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); + if (is_arm64ec) + memcpy(trampoline_ptr, hook_trampoline_arm64ec, sizeof(hook_trampoline_arm64ec)); + else + memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), PAGE_EXECUTE_READWRITE, &old_protect); @@ -4666,7 +4704,9 @@ static void test_KiUserExceptionDispatcher(void) got_exception = 0; run_exception_test(dbg_except_continue_handler, NULL, except_code, sizeof(except_code), PAGE_EXECUTE_READ); ok(got_exception, "Handler was not called.\n"); + todo_wine_if(is_arm64ec) ok(hook_called, "Hook was not called.\n"); + if (!hook_called) return; ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#Ix.\n", test_kiuserexceptiondispatcher_regs.new_rax); @@ -4717,7 +4757,7 @@ static void test_KiUserExceptionDispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_exception_address == (BYTE *)hook_KiUserExceptionDispatcher_rip + 1 + ok(hook_exception_address == (BYTE *)hook_KiUserExceptionDispatcher_rip + !is_arm64ec || broken(!hook_exception_address) /* 2008 */, "Got unexpected addresses %p, %p.\n", hook_KiUserExceptionDispatcher_rip, hook_exception_address);

1 0

Henri Verbeet : vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_domain().
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: f61a92b9084ddaf1b74488247f2fb975dfd5069b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f61a92b9084ddaf1b74488247f2fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 11 17:33:29 2024 +0100 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_domain(). --- libs/vkd3d-shader/d3d_asm.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 579ad8c5..d0132200 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -514,27 +514,30 @@ static void shader_dump_uav_flags(struct vkd3d_d3d_asm_compiler *compiler, uint3 vkd3d_string_buffer_printf(&compiler->buffer, "_unknown_flags(%#x)", uav_flags); } -static void shader_dump_tessellator_domain(struct vkd3d_d3d_asm_compiler *compiler, - enum vkd3d_tessellator_domain domain) +static void shader_print_tessellator_domain(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, enum vkd3d_tessellator_domain d, const char *suffix) { struct vkd3d_string_buffer *buffer = &compiler->buffer; + const char *domain; - shader_addline(buffer, "domain_"); - switch (domain) + switch (d) { case VKD3D_TESSELLATOR_DOMAIN_LINE: - shader_addline(buffer, "isoline"); + domain = "domain_isoline"; break; case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: - shader_addline(buffer, "tri"); + domain = "domain_tri"; break; case VKD3D_TESSELLATOR_DOMAIN_QUAD: - shader_addline(buffer, "quad"); + domain = "domain_quad"; break; default: - shader_addline(buffer, "unknown_tessellator_domain(%#x)", domain); - break; + vkd3d_string_buffer_printf(buffer, "%s%s<unhandled tessellator domain %#x>%s%s", + prefix, compiler->colours.error, d, compiler->colours.reset, suffix); + return; } + + vkd3d_string_buffer_printf(buffer, "%s%s%s", prefix, domain, suffix); } static void shader_dump_tessellator_output_primitive(struct vkd3d_d3d_asm_compiler *compiler, @@ -1938,8 +1941,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: - vkd3d_string_buffer_printf(buffer, " "); - shader_dump_tessellator_domain(compiler, ins->declaration.tessellator_domain); + shader_print_tessellator_domain(compiler, " ", ins->declaration.tessellator_domain, ""); break; case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE:

1 0

Henri Verbeet : vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_output_primitive().
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 5f5145b8f8bd11ac6746110e2605aa519db5a16e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5f5145b8f8bd11ac6746110e2605a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 11 17:42:09 2024 +0100 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_output_primitive(). --- libs/vkd3d-shader/d3d_asm.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index d0132200..0588b948 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -540,30 +540,33 @@ static void shader_print_tessellator_domain(struct vkd3d_d3d_asm_compiler *compi vkd3d_string_buffer_printf(buffer, "%s%s%s", prefix, domain, suffix); } -static void shader_dump_tessellator_output_primitive(struct vkd3d_d3d_asm_compiler *compiler, - enum vkd3d_shader_tessellator_output_primitive output_primitive) +static void shader_print_tessellator_output_primitive(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, enum vkd3d_shader_tessellator_output_primitive p, const char *suffix) { struct vkd3d_string_buffer *buffer = &compiler->buffer; + const char *primitive; - shader_addline(buffer, "output_"); - switch (output_primitive) + switch (p) { case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: - shader_addline(buffer, "point"); + primitive = "output_point"; break; case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: - shader_addline(buffer, "line"); + primitive = "output_line"; break; case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: - shader_addline(buffer, "triangle_cw"); + primitive = "output_triangle_cw"; break; case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: - shader_addline(buffer, "triangle_ccw"); + primitive = "output_triangle_ccw"; break; default: - shader_addline(buffer, "unknown_tessellator_output_primitive(%#x)", output_primitive); - break; + vkd3d_string_buffer_printf(buffer, "%s%s<unhandled tessellator output primitive %#x>%s%s", + prefix, compiler->colours.error, p, compiler->colours.reset, suffix); + return; } + + vkd3d_string_buffer_printf(buffer, "%s%s%s", prefix, primitive, suffix); } static void shader_dump_tessellator_partitioning(struct vkd3d_d3d_asm_compiler *compiler, @@ -1945,8 +1948,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE: - vkd3d_string_buffer_printf(buffer, " "); - shader_dump_tessellator_output_primitive(compiler, ins->declaration.tessellator_output_primitive); + shader_print_tessellator_output_primitive(compiler, " ", ins->declaration.tessellator_output_primitive, ""); break; case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING:

1 0