- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Export longjmp.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: e1d624a06f7b1748bbaa94f2861fdf138ac85b8e URL: https://gitlab.winehq.org/wine/wine/-/commit/e1d624a06f7b1748bbaa94f2861fdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 10:33:46 2024 +0100 ntdll: Export longjmp. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 19 ++++++++++++++++++ dlls/ntdll/signal_arm64.c | 19 ++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 20 ++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 1 + 6 files changed, 109 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6fb91e8c9f1..2c5a69a410c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1630,6 +1630,7 @@ @ cdecl isxdigit(long) @ cdecl labs(long) abs @ cdecl log(double) +@ cdecl -arch=!i386 longjmp(ptr long) NTDLL_longjmp @ cdecl mbstowcs(ptr str long) @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index dd259322368..b59384c986c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -732,6 +732,25 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "bx lr" ) +/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Pc, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c53d3382207..3ad0a7daa97 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -852,6 +852,25 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "ret" ) +/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Lr, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index f56931a9e4b..c307714e56e 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2019,6 +2020,25 @@ void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) } +/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Rip, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6e88877ee78..b49ec23860f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1058,6 +1058,55 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "retq" ) +void __cdecl DECLSPEC_NORETURN longjmp_regs( _JUMP_BUFFER *buf, int retval ); +__ASM_GLOBAL_FUNC( longjmp_regs, + __ASM_SEH(".seh_endprologue\n\t") + "movq %rdx,%rax\n\t" /* retval */ + "movq 0x8(%rcx),%rbx\n\t" /* jmp_buf->Rbx */ + "movq 0x18(%rcx),%rbp\n\t" /* jmp_buf->Rbp */ + "movq 0x20(%rcx),%rsi\n\t" /* jmp_buf->Rsi */ + "movq 0x28(%rcx),%rdi\n\t" /* jmp_buf->Rdi */ + "movq 0x30(%rcx),%r12\n\t" /* jmp_buf->R12 */ + "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ + "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ + "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ + "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ + "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnclex\n\t" + "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ + "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ + "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ + "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ + "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ + "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ + "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ + "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ + "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ + "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ + "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ + "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ + "jmp *%rdx" ) + +/******************************************************************* + * longjmp (MSVCRT.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + if (!buf->Frame) longjmp_regs( buf, retval ); + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Rip, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index eb9f0205eb5..9cefb2afdfe 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -62,6 +62,7 @@ static const char *stdc_names[] = "isxdigit", "labs", "log", + "longjmp", "mbstowcs", "memchr", "memcmp",

1 0

Alexandre Julliard : ntdll: Export _setjmpex.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: 8ec8a7f11cc4dea5755e66fc0b0d8da2325aebf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ec8a7f11cc4dea5755e66fc0b0d8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 10:24:17 2024 +0100 ntdll: Export _setjmpex. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/signal_arm.c | 18 ++++++++++++++++++ dlls/ntdll/signal_arm64.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 66995346e57..6fb91e8c9f1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1550,6 +1550,8 @@ @ cdecl _makepath_s(ptr long str str str str) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) +@ cdecl -norelay -arch=arm,x86_64 _setjmp(ptr ptr) NTDLL__setjmpex +@ cdecl -norelay -arch=!i386 _setjmpex(ptr ptr) NTDLL__setjmpex @ varargs _snprintf(ptr long str) NTDLL__snprintf @ varargs _snprintf_s(ptr long long str) @ varargs _snwprintf(ptr long wstr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 49018d35721..dd259322368 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -714,6 +714,24 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } + +/*********************************************************************** + * _setjmp (NTDLL.@) + * _setjmpex (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NTDLL__setjmpex, + ".seh_endprologue\n\t" + "stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */ + "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ + "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ + "vmrs r2, fpscr\n\t" + "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "add r0, r0, #0x30\n\t" + "vstm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ + "mov r0, #0\n\t" + "bx lr" ) + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 0be1807c0c3..c53d3382207 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -826,6 +826,32 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } + +/*********************************************************************** + * _setjmpex (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NTDLL__setjmpex, + ".seh_endprologue\n\t" + "str x1, [x0]\n\t" /* jmp_buf->Frame */ + "stp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "stp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "stp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "stp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "stp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "stp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ + "mov x2, sp\n\t" + "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "mrs x2, fpcr\n\t" + "mrs x3, fpsr\n\t" + "stp w2, w3, [x0, #0x78]\n\t" /* jmp_buf->Fpcr,Fpsr */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "stp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "stp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "stp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ + "mov x0, #0\n\t" + "ret" ) + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index cf6e9d8e65f..6e88877ee78 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1023,6 +1023,41 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/*********************************************************************** + * _setjmp (NTDLL.@) + * _setjmpex (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NTDLL__setjmpex, + __ASM_SEH(".seh_endprologue\n\t") + "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ + "movq %rbx,0x8(%rcx)\n\t" /* jmp_buf->Rbx */ + "leaq 0x8(%rsp),%rax\n\t" + "movq %rax,0x10(%rcx)\n\t" /* jmp_buf->Rsp */ + "movq %rbp,0x18(%rcx)\n\t" /* jmp_buf->Rbp */ + "movq %rsi,0x20(%rcx)\n\t" /* jmp_buf->Rsi */ + "movq %rdi,0x28(%rcx)\n\t" /* jmp_buf->Rdi */ + "movq %r12,0x30(%rcx)\n\t" /* jmp_buf->R12 */ + "movq %r13,0x38(%rcx)\n\t" /* jmp_buf->R13 */ + "movq %r14,0x40(%rcx)\n\t" /* jmp_buf->R14 */ + "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ + "movq (%rsp),%rax\n\t" + "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ + "stmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnstcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ + "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ + "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ + "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ + "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ + "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ + "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ + "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ + "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ + "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ + "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "xorq %rax,%rax\n\t" + "retq" ) + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Use jump buffer definitions from setjmp.h.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: 7a156cbd7fbbf1ce10f805bcfb43ff94fd94dda1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a156cbd7fbbf1ce10f805bcfb43ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 10:23:15 2024 +0100 ntdll: Use jump buffer definitions from setjmp.h. --- dlls/ntdll/signal_arm.c | 30 ++++-------------------------- dlls/ntdll/signal_arm64.c | 27 ++------------------------- dlls/ntdll/signal_x86_64.c | 44 +++----------------------------------------- 3 files changed, 9 insertions(+), 92 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index af33c6c08b6..49018d35721 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -37,25 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); -/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ -struct MSVCRT_JUMP_BUFFER -{ - unsigned long Frame; - unsigned long R4; - unsigned long R5; - unsigned long R6; - unsigned long R7; - unsigned long R8; - unsigned long R9; - unsigned long R10; - unsigned long R11; - unsigned long Sp; - unsigned long Pc; - unsigned long Fpscr; - unsigned long long D[8]; -}; - - static void dump_scope_table( ULONG base, const SCOPE_TABLE *table ) { unsigned int i; @@ -424,17 +406,13 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; - int i; + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; - for (i = 4; i <= 11; i++) - (&context->R4)[i-4] = (&jmp->R4)[i-4]; + memcpy( &context->R4, &jmp->R4, 8 * sizeof(DWORD) ); + memcpy( &context->D[8], &jmp->D[0], 8 * sizeof(ULONGLONG) ); context->Lr = jmp->Pc; context->Sp = jmp->Sp; context->Fpscr = jmp->Fpscr; - - for (i = 0; i < 8; i++) - context->D[8+i] = jmp->D[i]; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 32aca81b198..0be1807c0c3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -39,30 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); -/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ -struct MSVCRT_JUMP_BUFFER -{ - unsigned __int64 Frame; - unsigned __int64 Reserved; - unsigned __int64 X19; - unsigned __int64 X20; - unsigned __int64 X21; - unsigned __int64 X22; - unsigned __int64 X23; - unsigned __int64 X24; - unsigned __int64 X25; - unsigned __int64 X26; - unsigned __int64 X27; - unsigned __int64 X28; - unsigned __int64 Fp; - unsigned __int64 Lr; - unsigned __int64 Sp; - ULONG Fpcr; - ULONG Fpsr; - double D[8]; -}; - - static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) { unsigned int i; @@ -486,7 +463,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; int i; context->X19 = jmp->X19; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d5cc29bd5e1..cf6e9d8e65f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -37,36 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); -/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ -struct MSVCRT_JUMP_BUFFER -{ - ULONG64 Frame; - ULONG64 Rbx; - ULONG64 Rsp; - ULONG64 Rbp; - ULONG64 Rsi; - ULONG64 Rdi; - ULONG64 R12; - ULONG64 R13; - ULONG64 R14; - ULONG64 R15; - ULONG64 Rip; - ULONG MxCsr; - USHORT FpCsr; - USHORT Spare; - M128A Xmm6; - M128A Xmm7; - M128A Xmm8; - M128A Xmm9; - M128A Xmm10; - M128A Xmm11; - M128A Xmm12; - M128A Xmm13; - M128A Xmm14; - M128A Xmm15; -}; - - /******************************************************************* * syscalls */ @@ -726,7 +697,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; context->Rbx = jmp->Rbx; context->Rsp = jmp->Rsp; context->Rbp = jmp->Rbp; @@ -737,19 +708,10 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->R14 = jmp->R14; context->R15 = jmp->R15; context->Rip = jmp->Rip; - context->Xmm6 = jmp->Xmm6; - context->Xmm7 = jmp->Xmm7; - context->Xmm8 = jmp->Xmm8; - context->Xmm9 = jmp->Xmm9; - context->Xmm10 = jmp->Xmm10; - context->Xmm11 = jmp->Xmm11; - context->Xmm12 = jmp->Xmm12; - context->Xmm13 = jmp->Xmm13; - context->Xmm14 = jmp->Xmm14; - context->Xmm15 = jmp->Xmm15; context->MxCsr = jmp->MxCsr; context->FltSave.MxCsr = jmp->MxCsr; context->FltSave.ControlWord = jmp->FpCsr; + memcpy( &context->Xmm6, &jmp->Xmm6, 10 * sizeof(M128A) ); } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) {

1 0

Brendan Shanks : quartz: Set the name of internal threads.
by Alexandre Julliard March 7, 2024

March 7, 2024

Module: wine Branch: master Commit: 542e11fcd9951cc6e3dbe37863bfbbe4a915ad07 URL: https://gitlab.winehq.org/wine/wine/-/commit/542e11fcd9951cc6e3dbe37863bfbb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 6 16:24:07 2024 -0800 quartz: Set the name of internal threads. --- dlls/quartz/filesource.c | 2 ++ dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/systemclock.c | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 7d6292df579..f96555ff78c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -381,6 +381,8 @@ static DWORD CALLBACK io_thread(void *arg) DWORD size; BOOL ret; + SetThreadDescription(GetCurrentThread(), L"wine_qz_async_reader_io"); + for (;;) { ret = GetQueuedCompletionStatus(filter->port, &size, &key, &ovl, INFINITE); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4100e71be3a..9b2b2b4e93b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1033,6 +1033,8 @@ static DWORD WINAPI message_thread_run(void *ctx) { MSG msg; + SetThreadDescription(GetCurrentThread(), L"wine_qz_graph_worker"); + /* Make sure we have a message queue. */ PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE); SetEvent(message_thread_ret); diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 01a8e9fa1ee..244bfd294b6 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -144,6 +144,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) REFERENCE_TIME current_time; TRACE("Starting advise thread for clock %p.\n", clock); + SetThreadDescription(GetCurrentThread(), L"wine_qz_clock_advise"); for (;;) {

1 0

Nikolay Sivov : vkd3d-shader/fx: Make sure to set error message for unimplemented cases.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 437ef0896f6d59b5ccd90fc1e5c0299a4fcbf851 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/437ef0896f6d59b5ccd90fc1e5c02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 14:55:34 2024 +0100 vkd3d-shader/fx: Make sure to set error message for unimplemented cases. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 5ba24e6d..fd5c8443 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -284,6 +284,7 @@ static uint32_t get_fx_4_numeric_type_description(const struct hlsl_type *type, [HLSL_TYPE_UINT ] = 3, [HLSL_TYPE_BOOL ] = 4, }; + struct hlsl_ctx *ctx = fx->ctx; uint32_t value = 0; switch (type->class) @@ -294,8 +295,7 @@ static uint32_t get_fx_4_numeric_type_description(const struct hlsl_type *type, value |= numeric_type_class[type->class]; break; default: - FIXME("Unexpected type class %u.\n", type->class); - set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + hlsl_fixme(ctx, &ctx->location, "Not implemented for type class %u.\n", type->class); return 0; } @@ -308,8 +308,7 @@ static uint32_t get_fx_4_numeric_type_description(const struct hlsl_type *type, value |= (numeric_base_type[type->base_type] << NUMERIC_BASE_TYPE_SHIFT); break; default: - FIXME("Unexpected base type %u.\n", type->base_type); - set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + hlsl_fixme(ctx, &ctx->location, "Not implemented for base type %u.\n", type->base_type); return 0; } @@ -358,6 +357,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co [HLSL_SAMPLER_DIM_BUFFER] = "RWBuffer", [HLSL_SAMPLER_DIM_STRUCTURED_BUFFER] = "RWStructuredBuffer", }; + struct hlsl_ctx *ctx = fx->ctx; /* Resolve arrays to element type and number of elements. */ if (type->class == HLSL_CLASS_ARRAY) @@ -386,8 +386,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co put_u32_unaligned(buffer, variable_type[type->class]); break; default: - FIXME("Writing type class %u is not implemented.\n", type->class); - set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + hlsl_fixme(ctx, &ctx->location, "Writing type class %u is not implemented.\n", type->class); return 0; } @@ -465,8 +464,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co put_u32_unaligned(buffer, uav_type[type->sampler_dim]); break; default: - FIXME("Object type %u is not supported.\n", type->base_type); - set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + hlsl_fixme(ctx, &ctx->location, "Object type %u is not supported.\n", type->base_type); return 0; } }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Improve VertexShader/PixelShader types handling.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: a0d52dc38508b76efedcb6fa1df3162a0062ceaf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a0d52dc38508b76efedcb6fa1df31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 15:50:39 2024 +0100 vkd3d-shader/hlsl: Improve VertexShader/PixelShader types handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 6 ++++-- libs/vkd3d-shader/hlsl.l | 2 ++ tests/hlsl/effect-shader-objects-fx_2.shader_test | 2 +- tests/hlsl/effect-shader-objects-fx_5.shader_test | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e68ffe3f..45d02ce2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -784,7 +784,9 @@ static const char * get_case_insensitive_typename(const char *name) "dword", "float", "matrix", + "pixelshader", "vector", + "vertexshader", }; unsigned int i; @@ -3396,8 +3398,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, - {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, - {"VERTEXSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, + {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, + {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, {"RenderTargetView",HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1}, {"DepthStencilView",HLSL_CLASS_OBJECT, HLSL_TYPE_DEPTHSTENCILVIEW, 1, 1}, }; diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index decc26df..8dcceb94 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -108,6 +108,7 @@ out {return KW_OUT; } packoffset {return KW_PACKOFFSET; } pass {return KW_PASS; } PixelShader {return KW_PIXELSHADER; } +pixelshader {return KW_PIXELSHADER; } precise {return KW_PRECISE; } RasterizerOrderedBuffer {return KW_RASTERIZERORDEREDBUFFER; } RasterizerOrderedStructuredBuffer {return KW_RASTERIZERORDEREDSTRUCTUREDBUFFER; } @@ -166,6 +167,7 @@ typedef {return KW_TYPEDEF; } uniform {return KW_UNIFORM; } vector {return KW_VECTOR; } VertexShader {return KW_VERTEXSHADER; } +vertexshader {return KW_VERTEXSHADER; } void {return KW_VOID; } volatile {return KW_VOLATILE; } while {return KW_WHILE; } diff --git a/tests/hlsl/effect-shader-objects-fx_2.shader_test b/tests/hlsl/effect-shader-objects-fx_2.shader_test index 8068a466..8801ed1f 100644 --- a/tests/hlsl/effect-shader-objects-fx_2.shader_test +++ b/tests/hlsl/effect-shader-objects-fx_2.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] float4 vertexshader; float4 main() : sv_target diff --git a/tests/hlsl/effect-shader-objects-fx_5.shader_test b/tests/hlsl/effect-shader-objects-fx_5.shader_test index 03f01923..1d2f4338 100644 --- a/tests/hlsl/effect-shader-objects-fx_5.shader_test +++ b/tests/hlsl/effect-shader-objects-fx_5.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] float4 vertexshader; float4 main() : sv_target

1 0

Nikolay Sivov : tests: Add some tests for shader object type names.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 4dd1bbae40c5674da8cb52da43eb89de933b84c0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4dd1bbae40c5674da8cb52da43eb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 15:30:29 2024 +0100 tests: Add some tests for shader object type names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl/effect-shader-objects-fx_2.shader_test | 35 +++++++++++++++++++++++ tests/hlsl/effect-shader-objects-fx_5.shader_test | 34 ++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/Makefile.am b/Makefile.am index e7971b1f..b963e4c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,8 @@ vkd3d_shader_tests = \ tests/hlsl/distance.shader_test \ tests/hlsl/dot.shader_test \ tests/hlsl/duplicate-modifiers.shader_test \ + tests/hlsl/effect-shader-objects-fx_2.shader_test \ + tests/hlsl/effect-shader-objects-fx_5.shader_test \ tests/hlsl/entry-point-semantics.shader_test \ tests/hlsl/exp.shader_test \ tests/hlsl/expr-indexing.shader_test \ diff --git a/tests/hlsl/effect-shader-objects-fx_2.shader_test b/tests/hlsl/effect-shader-objects-fx_2.shader_test new file mode 100644 index 00000000..8068a466 --- /dev/null +++ b/tests/hlsl/effect-shader-objects-fx_2.shader_test @@ -0,0 +1,35 @@ +[require] +shader model < 3.0 + +[pixel shader] +float4 vertexshadeR; +float4 geometryshader; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +float4 vertexshader; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 VertexShader; + +float4 main() : sv_target +{ + return 0; +} + +[effect todo] +vertexshader vs1; +verteXshadeR vs2; +pixelshader ps1; +pixeLshadeR ps2; + +technique {} diff --git a/tests/hlsl/effect-shader-objects-fx_5.shader_test b/tests/hlsl/effect-shader-objects-fx_5.shader_test new file mode 100644 index 00000000..03f01923 --- /dev/null +++ b/tests/hlsl/effect-shader-objects-fx_5.shader_test @@ -0,0 +1,34 @@ +[require] +shader model >= 5.0 +shader model < 6.0 + +[pixel shader] +float4 vertexshadeR; +float4 geometryshader; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +float4 vertexshader; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 VertexShader; + +float4 main() : sv_target +{ + return 0; +} + +[effect todo] +vertexshader vs1; +verteXshadeR vs2; +pixelshader ps1; +pixeLshadeR ps2;

1 0

Nikolay Sivov : vkd3d-shader/fx: Reject fx_2_0 output without techniques.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 8c5db57ea70046b40c6116e6f511ceef6fff46b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c5db57ea70046b40c6116e6f511c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 02:11:38 2024 +0100 vkd3d-shader/fx: Reject fx_2_0 output without techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 30 ++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl/technique-fx_2.shader_test | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index bc70d522..5ba24e6d 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -179,7 +179,6 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co static int fx_write_context_cleanup(struct fx_write_context *fx) { struct type_entry *type, *next_type; - int status = fx->status; rb_destroy(&fx->strings, string_storage_destroy, NULL); @@ -189,7 +188,7 @@ static int fx_write_context_cleanup(struct fx_write_context *fx) vkd3d_free(type); } - return status; + return fx->ctx->result; } static bool technique_matches_version(const struct hlsl_ir_var *var, const struct fx_write_context *fx) @@ -643,15 +642,18 @@ static int hlsl_fx_2_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) vkd3d_free(fx.unstructured.data); vkd3d_free(fx.structured.data); - if (!fx.status) + if (!fx.technique_count) + hlsl_error(ctx, &ctx->location, VKD3D_SHADER_ERROR_HLSL_MISSING_TECHNIQUE, "No techniques found."); + + if (fx.status < 0) + ctx->result = fx.status; + + if (!ctx->result) { out->code = buffer.data; out->size = buffer.size; } - if (fx.status < 0) - ctx->result = fx.status; - return fx_write_context_cleanup(&fx); } @@ -870,15 +872,15 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) set_status(&fx, buffer.status); - if (!fx.status) + if (fx.status < 0) + ctx->result = fx.status; + + if (!ctx->result) { out->code = buffer.data; out->size = buffer.size; } - if (fx.status < 0) - ctx->result = fx.status; - return fx_write_context_cleanup(&fx); } @@ -933,15 +935,15 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) set_status(&fx, buffer.status); - if (!fx.status) + if (fx.status < 0) + ctx->result = fx.status; + + if (!ctx->result) { out->code = buffer.data; out->size = buffer.size; } - if (fx.status < 0) - ctx->result = fx.status; - return fx_write_context_cleanup(&fx); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4b322b95..8dca450f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -148,6 +148,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INCONSISTENT_SAMPLER = 5026, VKD3D_SHADER_ERROR_HLSL_NON_FINITE_RESULT = 5027, VKD3D_SHADER_ERROR_HLSL_DUPLICATE_SWITCH_CASE = 5028, + VKD3D_SHADER_ERROR_HLSL_MISSING_TECHNIQUE = 5029, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 3b71d0a3..35963cd0 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -86,7 +86,7 @@ technique10 } % Effects without techniques are not allowed for fx_2_0 -[effect fail todo] +[effect fail] float4 f; % fx_5_0 keyword fails with fx_2_0 profile

1 0

Conor McCarthy : tests/shader-runner: Add raw UAV tests.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 13143700b76104c1556dd350b3777b9706fd3838 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13143700b76104c1556dd350b3777… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 26 14:31:54 2024 +1000 tests/shader-runner: Add raw UAV tests. --- Makefile.am | 1 + tests/d3d12.c | 41 ----------- tests/hlsl/uav-rwbyteaddressbuffer.shader_test | 59 ++++++++++++++++ tests/shader_runner.c | 52 +++++++++++--- tests/utils.h | 97 ++++++++++++++++++++++++++ 5 files changed, 199 insertions(+), 51 deletions(-)

1 0

Francisco Casas : vkd3d-shader/d3dbc: Implement bool to float cast as MOV.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: vkd3d Branch: master Commit: 58c456ff2bec9c413b23d898f15808316f25c69f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58c456ff2bec9c413b23d898f1580… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 20 22:06:45 2024 -0300 vkd3d-shader/d3dbc: Implement bool to float cast as MOV. In SM1, bools are always represented as either 0.0f or 1.0f at runtime. --- libs/vkd3d-shader/d3dbc.c | 7 ++----- tests/hlsl/cast-to-float.shader_test | 4 ++-- tests/hlsl/cast-to-half.shader_test | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 0f5d34ee..a8cca17f 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1977,16 +1977,13 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - /* Integers are internally represented as floats, so no change is necessary.*/ + case HLSL_TYPE_BOOL: + /* Integrals are internally represented as floats, so no change is necessary.*/ case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); break; - case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to float."); - break; - case HLSL_TYPE_DOUBLE: hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to float."); break; diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index bcb546e2..d80d4290 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform int i; uniform uint u; uniform bool b; @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -todo(sm<4) draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-half.shader_test b/tests/hlsl/cast-to-half.shader_test index 0580fe25..8094a10a 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform int i; uniform uint u; uniform bool b; @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -todo(sm<4) draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)

1 0