- Wine-Devel - list.winehq.org

[PATCH] ntdll: Fix compilation for Apple platform.
by Jinoh Kang Dec. 6, 2021

Dec. 6, 2021

From: Jactry Zeng <jactry92(a)gmail.com> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..f2612412366 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -365,7 +365,7 @@ static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) #elif defined(__APPLE__) sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->V) ); #endif } @@ -1068,9 +1068,9 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } } #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + context->uc_mcontext->__ns.__fpcr = frame->fpcr; + context->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( context->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); #endif } -- 2.31.1

2 1

[PATCH v2 2/2] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Akihiro Sagawa Dec. 6, 2021

Dec. 6, 2021

Houkago Cinderella verifys that otmpFamilyName matches the desired font name. That prevents us from using replacement fonts. This commit allows to make otmpFamilyName from the replacement name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52176 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 -- dlls/win32u/font.c | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)

1 0

[PATCH v2 1/3] ntdll: Allow raising second chance exceptions from signal handlers.
by Jinoh Kang Dec. 6, 2021

Dec. 6, 2021

This is required to implement some instructions that raise second chance exceptions directly, such as those emitted from the __fastfail() intrinsic function. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: proper patch splitting dlls/ntdll/unix/signal_arm.c | 18 ++++++++++++------ dlls/ntdll/unix/signal_arm64.c | 22 ++++++++++++++-------- dlls/ntdll/unix/signal_i386.c | 21 ++++++++++++++------- dlls/ntdll/unix/signal_x86_64.c | 18 ++++++++++++------ dlls/ntdll/unix/thread.c | 28 +++++++++++++++++++--------- dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 72 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..dbc2770f72e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -576,7 +576,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -591,13 +591,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; stack->context = context; @@ -834,7 +840,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -858,7 +864,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -915,7 +921,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -944,7 +950,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..ef70d4df44b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -618,7 +618,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -634,13 +634,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); stack->rec = *rec; stack->context = context; @@ -861,7 +867,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (void *)SP_sig(context) ); if (!rec.ExceptionCode) return; if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -874,7 +880,7 @@ static void ill_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_ILLEGAL_INSTRUCTION }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -887,7 +893,7 @@ static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_DATATYPE_MISALIGNMENT }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -911,7 +917,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -968,7 +974,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -997,7 +1003,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..e18aed2c222 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1400,7 +1400,8 @@ static void *setup_exception_record( ucontext_t *sigcontext, EXCEPTION_RECORD *r * Change context to setup a call to a raise exception function. */ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, - EXCEPTION_RECORD *rec, struct xcontext *xcontext ) + EXCEPTION_RECORD *rec, struct xcontext *xcontext, + BOOL first_chance ) { CONTEXT *context = &xcontext->c; size_t stack_size; @@ -1420,7 +1421,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) ); - NTSTATUS status = send_debug_event( rec, context, TRUE ); + NTSTATUS status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { @@ -1428,6 +1429,12 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; @@ -1482,7 +1489,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) struct xcontext xcontext; void *stack = setup_exception_record( sigcontext, rec, &xcontext ); - setup_raise_exception( sigcontext, stack, rec, &xcontext ); + setup_raise_exception( sigcontext, stack, rec, &xcontext, TRUE ); } /* stack layout when calling an user apc function. @@ -1675,7 +1682,7 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo rec->ExceptionInformation[0] = context->Eax; rec->ExceptionInformation[1] = context->Ecx; rec->ExceptionInformation[2] = context->Edx; - setup_raise_exception( sigcontext, stack, rec, xcontext ); + setup_raise_exception( sigcontext, stack, rec, xcontext, TRUE ); return TRUE; default: return FALSE; @@ -1848,7 +1855,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( ucontext, stack, &rec, &xcontext.c )) return; - setup_raise_exception( ucontext, stack, &rec, &xcontext ); + setup_raise_exception( ucontext, stack, &rec, &xcontext, TRUE ); } @@ -1894,7 +1901,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[2] = 0; /* FIXME */ break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } @@ -1939,7 +1946,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9e9a96db832..ff4a40c7933 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2110,7 +2110,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** * setup_raise_exception */ -static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext, BOOL first_chance ) { void *stack_ptr = (void *)(RSP_sig(sigcontext) & ~15); CONTEXT *context = &xcontext->c; @@ -2136,13 +2136,19 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec context->EFlags &= ~0x100; /* clear single-step flag */ } - status = send_debug_event( rec, context, TRUE ); + status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( xcontext, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; @@ -2193,7 +2199,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)RIP_sig(sigcontext); save_context( &context, sigcontext ); - setup_raise_exception( sigcontext, rec, &context ); + setup_raise_exception( sigcontext, rec, &context, TRUE ); } @@ -2461,7 +2467,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r default: return FALSE; } - setup_raise_exception( sigcontext, rec, xcontext ); + setup_raise_exception( sigcontext, rec, xcontext, TRUE ); return TRUE; } @@ -2614,7 +2620,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( sigcontext, &rec, &context.c )) return; - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } @@ -2658,7 +2664,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[0] = 0; break; } - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 455272e07e0..d7204b2fd3b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -87,6 +87,24 @@ static inline int get_unix_exit_code( NTSTATUS status ) } +/*********************************************************************** + * handle_second_chance_exception + * + * Handle a second chance exception. + */ +void handle_second_chance_exception( EXCEPTION_RECORD *rec ) +{ + if (rec->ExceptionFlags & EH_STACK_INVALID) + ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); + else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) + ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); + else + ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); + + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); +} + /*********************************************************************** * fpux_to_fpu * @@ -1509,15 +1527,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (first_chance) return call_user_exception_dispatcher( rec, context ); - if (rec->ExceptionFlags & EH_STACK_INVALID) - ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); - else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) - ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); - else - ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - - NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); + handle_second_chance_exception( rec ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0dcb09ad641..d5414474d2e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,6 +172,7 @@ extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; +void handle_second_chance_exception( EXCEPTION_RECORD *rec ); extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; -- 2.31.1

3 8

[PATCH] dlls/kernelbase, programs/conhost: don't delay the TTY input thread for PE executables
by Eric Pouech Dec. 6, 2021

Dec. 6, 2021

currently, conhost delays the start of the input thread until the first console read operation some PE executables (like mingw's gdb port) just do something like: - WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), INFINITE) and hang for ever (the read operations are done *after* the wait operation succeeds) (of course, the real wait operation is more complex, but the problematic part boils down to that) I understand that the delay has been introduced so that executables still reading directly from the unix fd will continue to work. But I could miss some other use cases. This patch forces the start the tty input thread in conhost if current executable is a PE executable. This lets mingw's gdb work a bit further (at least allowing some user input <g>) under wine. (x86_64 seems to be quite ok, i686 still needs come cudling) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/console.c | 8 ++++++-- programs/conhost/conhost.c | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a7eeb439232..b6f2c4fb394 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1694,8 +1694,12 @@ static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HA } else { - swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --unix --width %u --height %u --server 0x%x", - conhost_path, size.X, size.Y, server ); + LDR_DATA_TABLE_ENTRY *ldr; + const WCHAR* start_thread = L""; + if (LdrFindEntryForAddress( GetModuleHandleW( NULL) , &ldr ) == STATUS_SUCCESS && + !(ldr->Flags & LDR_WINE_INTERNAL)) start_thread = L"--thread "; + swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --unix %s--width %u --height %u --server 0x%x", + conhost_path, start_thread, size.X, size.Y, server ); } Wow64DisableWow64FsRedirection( &redir ); res = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 05447d52dd5..27788fbd6a8 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2736,7 +2736,7 @@ static int main_loop( struct console *console, HANDLE signal ) int __cdecl wmain(int argc, WCHAR *argv[]) { - int headless = 0, i, width = 0, height = 0; + int headless = 0, i, width = 0, height = 0, start_thread = 0; HANDLE signal = NULL; WCHAR *end; @@ -2765,6 +2765,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) headless = 1; continue; } + if (!wcscmp( argv[i], L"--thread")) + { + start_thread = 1; + continue; + } if (!wcscmp( argv[i], L"--width" )) { if (++i == argc) return 1; @@ -2812,7 +2817,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) console.tty_input = GetStdHandle( STD_INPUT_HANDLE ); console.tty_output = GetStdHandle( STD_OUTPUT_HANDLE ); init_tty_output( &console ); - if (!console.is_unix && !ensure_tty_input_thread( &console )) return 1; + if ((!console.is_unix || start_thread) && !ensure_tty_input_thread( &console )) return 1; } else {

2 1

[PATCH] tools/examine-relay: DLLs can have underscore in their names (like ws2_32)
by Eric Pouech Dec. 6, 2021

Dec. 6, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/examine-relay | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/examine-relay b/tools/examine-relay index d82110c570a..48782e4728d 100755 --- a/tools/examine-relay +++ b/tools/examine-relay @@ -44,7 +44,7 @@ LINE: while (<IN>) { - if (/^([0-9a-f]+):Call ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { + if (/^([0-9a-f]+):Call ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { my $tid = $1; my $func = $2; if (defined $fullformat) { @@ -96,10 +96,10 @@ while (<IN>) { push @{$tid_callstack{$tid}}, [$func, $retaddr, $segreg]; } - elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || - /^([0-9a-f]+):RET ([A-Za-z0-9]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || + elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || + /^([0-9a-f]+):RET ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || /^([0-9a-f]+):Ret (window proc) ([0-9a-fx]+) .*/) { my $tid = $1; my $func = $2;

1 0

[PATCH 1/3] ntdll: Allow raising second chance exceptions from signal handlers.
by Jinoh Kang Dec. 6, 2021

Dec. 6, 2021

This is required to implement some instructions that raise second chance exceptions directly, such as those emitted from the __fastfail() intrinsic function. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 18 ++++++++++++------ dlls/ntdll/unix/signal_arm64.c | 22 ++++++++++++++-------- dlls/ntdll/unix/signal_i386.c | 19 +++++++++++++------ dlls/ntdll/unix/signal_x86_64.c | 18 ++++++++++++------ dlls/ntdll/unix/thread.c | 28 +++++++++++++++++++--------- dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 71 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..dbc2770f72e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -576,7 +576,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -591,13 +591,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; stack->context = context; @@ -834,7 +840,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -858,7 +864,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -915,7 +921,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -944,7 +950,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..ef70d4df44b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -618,7 +618,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -634,13 +634,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); stack->rec = *rec; stack->context = context; @@ -861,7 +867,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (void *)SP_sig(context) ); if (!rec.ExceptionCode) return; if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -874,7 +880,7 @@ static void ill_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_ILLEGAL_INSTRUCTION }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -887,7 +893,7 @@ static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_DATATYPE_MISALIGNMENT }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -911,7 +917,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -968,7 +974,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -997,7 +1003,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..1986c4728bf 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1400,7 +1400,8 @@ static void *setup_exception_record( ucontext_t *sigcontext, EXCEPTION_RECORD *r * Change context to setup a call to a raise exception function. */ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, - EXCEPTION_RECORD *rec, struct xcontext *xcontext ) + EXCEPTION_RECORD *rec, struct xcontext *xcontext, + BOOL first_chance ) { CONTEXT *context = &xcontext->c; size_t stack_size; @@ -1420,7 +1421,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) ); - NTSTATUS status = send_debug_event( rec, context, TRUE ); + NTSTATUS status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { @@ -1428,6 +1429,12 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; @@ -1675,7 +1682,7 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo rec->ExceptionInformation[0] = context->Eax; rec->ExceptionInformation[1] = context->Ecx; rec->ExceptionInformation[2] = context->Edx; - setup_raise_exception( sigcontext, stack, rec, xcontext ); + setup_raise_exception( sigcontext, stack, rec, xcontext, TRUE ); return TRUE; default: return FALSE; @@ -1848,7 +1855,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( ucontext, stack, &rec, &xcontext.c )) return; - setup_raise_exception( ucontext, stack, &rec, &xcontext ); + setup_raise_exception( ucontext, stack, &rec, &xcontext, TRUE ); } @@ -1894,7 +1901,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[2] = 0; /* FIXME */ break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } @@ -1939,7 +1946,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9e9a96db832..ff4a40c7933 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2110,7 +2110,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** * setup_raise_exception */ -static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext, BOOL first_chance ) { void *stack_ptr = (void *)(RSP_sig(sigcontext) & ~15); CONTEXT *context = &xcontext->c; @@ -2136,13 +2136,19 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec context->EFlags &= ~0x100; /* clear single-step flag */ } - status = send_debug_event( rec, context, TRUE ); + status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( xcontext, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; @@ -2193,7 +2199,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)RIP_sig(sigcontext); save_context( &context, sigcontext ); - setup_raise_exception( sigcontext, rec, &context ); + setup_raise_exception( sigcontext, rec, &context, TRUE ); } @@ -2461,7 +2467,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r default: return FALSE; } - setup_raise_exception( sigcontext, rec, xcontext ); + setup_raise_exception( sigcontext, rec, xcontext, TRUE ); return TRUE; } @@ -2614,7 +2620,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( sigcontext, &rec, &context.c )) return; - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } @@ -2658,7 +2664,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[0] = 0; break; } - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 455272e07e0..d7204b2fd3b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -87,6 +87,24 @@ static inline int get_unix_exit_code( NTSTATUS status ) } +/*********************************************************************** + * handle_second_chance_exception + * + * Handle a second chance exception. + */ +void handle_second_chance_exception( EXCEPTION_RECORD *rec ) +{ + if (rec->ExceptionFlags & EH_STACK_INVALID) + ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); + else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) + ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); + else + ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); + + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); +} + /*********************************************************************** * fpux_to_fpu * @@ -1509,15 +1527,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (first_chance) return call_user_exception_dispatcher( rec, context ); - if (rec->ExceptionFlags & EH_STACK_INVALID) - ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); - else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) - ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); - else - ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - - NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); + handle_second_chance_exception( rec ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0dcb09ad641..d5414474d2e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,6 +172,7 @@ extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; +void handle_second_chance_exception( EXCEPTION_RECORD *rec ); extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; -- 2.31.1

2 3

[PATCH] d3d11: Add stub for ID3D11Device2::CheckFeatureSupport(D3D11_FEATURE_D3D9_OPTIONS).
by Dmitry Timoshkov Dec. 6, 2021

Dec. 6, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d3d11/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 417638bf314..a081352f61f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3941,6 +3941,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D9_OPTIONS: + { + D3D11_FEATURE_DATA_D3D9_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + FIXME("D3D11_FEATURE_D3D9_OPTIONS: stub.\n"); + options->FullNonPow2TextureSupport = FALSE; + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; -- 2.34.1

1 0

[PATCH 2/2] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov Dec. 6, 2021

Dec. 6, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 74d82b85be4..024d9026785 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -457,6 +457,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -631,13 +639,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index ebe11db1039..656dd08e557 100644 --- a/server/registry.c +++ b/server/registry.c @@ -479,6 +479,8 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); -- 2.34.1

1 0

[PATCH] dwrite: Move glyph advances cache to PE side.
by Nikolay Sivov Dec. 6, 2021

Dec. 6, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 12 +++- dlls/dwrite/font.c | 132 ++++++++++++++++++++++++++++++++--- dlls/dwrite/freetype.c | 37 +++++----- 3 files changed, 150 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 10617983b69..e0373dc2891 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/rbtree.h" #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') @@ -240,6 +241,13 @@ struct dwrite_fontface font_object_handle font_object; void *data_context; p_dwrite_fontface_get_font_object get_font_object; + struct + { + struct wine_rb_tree tree; + struct list mru; + size_t max_size; + size_t size; + } cache; CRITICAL_SECTION cs; USHORT simulations; @@ -725,8 +733,8 @@ struct font_backend_funcs int (CDECL *get_glyph_outline)(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); UINT16 (CDECL *get_glyph_count)(font_object_handle object); - INT32 (CDECL *get_glyph_advance)(void *key, float em_size, UINT16 index, DWRITE_MEASURING_MODE measuring_mode, - BOOL *has_contours); + INT32 (CDECL *get_glyph_advance)(font_object_handle object, float em_size, UINT16 glyph, + DWRITE_MEASURING_MODE measuring_mode, BOOL *has_contours); void (CDECL *get_glyph_bbox)(struct dwrite_glyphbitmap *bitmap_desc); BOOL (CDECL *get_glyph_bitmap)(struct dwrite_glyphbitmap *bitmap_desc); void (CDECL *get_design_glyph_metrics)(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 174ab7a3ded..f6ac43e65ac 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -52,6 +52,111 @@ void dwrite_fontface_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) font_funcs->get_glyph_bbox(bitmap); } +struct cache_key +{ + float size; + unsigned short glyph; + unsigned short mode; +}; + +struct cache_entry +{ + struct wine_rb_entry entry; + struct list mru; + struct cache_key key; + float advance; + unsigned int has_contours : 1; +}; + +static struct cache_entry * fontface_get_cache_entry(struct dwrite_fontface *fontface, const struct cache_key *key) +{ + struct cache_entry *entry; + struct wine_rb_entry *e; + + if (!(e = wine_rb_get(&fontface->cache.tree, key))) return NULL; + entry = WINE_RB_ENTRY_VALUE(e, struct cache_entry, entry); + list_remove(&entry->mru); + list_add_head(&fontface->cache.mru, &entry->mru); + return WINE_RB_ENTRY_VALUE(entry, struct cache_entry, entry); +} + +static size_t fontface_get_cache_entry_size(const struct cache_entry *entry) +{ + return sizeof(*entry); +} + +static float fontface_get_glyph_advance(struct dwrite_fontface *fontface, float fontsize, unsigned short glyph, + unsigned short mode, BOOL *has_contours) +{ + struct cache_key key = { .size = fontsize, .glyph = glyph, .mode = mode }; + struct cache_entry *entry, *old_entry; + size_t size; + BOOL value; + + if (!(entry = fontface_get_cache_entry(fontface, &key))) + { + if (!(entry = calloc(1, sizeof(*entry)))) + return 0.0f; + + entry->advance = font_funcs->get_glyph_advance(fontface->get_font_object(fontface), fontsize, glyph, mode, &value); + entry->has_contours = !!value; + entry->key = key; + + size = fontface_get_cache_entry_size(entry); + if ((fontface->cache.size + size > fontface->cache.max_size) && !list_empty(&fontface->cache.mru)) + { + old_entry = LIST_ENTRY(list_tail(&fontface->cache.mru), struct cache_entry, mru); + fontface->cache.size -= fontface_get_cache_entry_size(old_entry); + wine_rb_remove(&fontface->cache.tree, &old_entry->entry); + list_remove(&old_entry->mru); + free(old_entry); + } + + list_add_head(&fontface->cache.mru, &entry->mru); + + if (wine_rb_put(&fontface->cache.tree, &key, &entry->entry) == -1) + { + WARN("Failed to add cache entry.\n"); + return 0.0f; + } + + fontface->cache.size += size; + } + + *has_contours = entry->has_contours; + return entry->advance; +} + +static int fontface_cache_compare(const void *k, const struct wine_rb_entry *e) +{ + const struct cache_entry *entry = WINE_RB_ENTRY_VALUE(e, const struct cache_entry, entry); + const struct cache_key *key = k, *key2 = &entry->key; + + if (key->size != key2->size) return key->size < key2->size ? -1 : 1; + if (key->glyph != key2->glyph) return (int)key->glyph - (int)key2->glyph; + if (key->mode != key2->mode) return (int)key->mode - (int)key2->mode; + return 0; +} + +static void fontface_cache_init(struct dwrite_fontface *fontface) +{ + wine_rb_init(&fontface->cache.tree, fontface_cache_compare); + list_init(&fontface->cache.mru); + fontface->cache.max_size = 0x8000; +} + +static void fontface_cache_clear(struct dwrite_fontface *fontface) +{ + struct cache_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &fontface->cache.mru, struct cache_entry, mru) + { + list_remove(&entry->mru); + free(entry); + } + memset(&fontface->cache, 0, sizeof(fontface->cache)); +} + struct dwrite_font_propvec { FLOAT stretch; FLOAT style; @@ -656,6 +761,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, fontface->data_context); IDWriteFontFileStream_Release(fontface->stream); } + fontface_cache_clear(fontface); dwrite_cmap_release(&fontface->cmap); IDWriteFactory7_Release(fontface->factory); @@ -1019,7 +1125,7 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac UINT32 adjustment = fontface_get_horz_metric_adjustment(fontface); DWRITE_MEASURING_MODE mode; FLOAT scale, size; - HRESULT hr; + HRESULT hr = S_OK; UINT32 i; TRACE("%p, %.8e, %.8e, %p, %d, %p, %u, %p, %d.\n", iface, emSize, ppdip, m, use_gdi_natural, glyphs, @@ -1032,16 +1138,18 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac scale = size / fontface->metrics.designUnitsPerEm; mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; - for (i = 0; i < glyph_count; i++) { + EnterCriticalSection(&fontface->cs); + for (i = 0; i < glyph_count; ++i) + { DWRITE_GLYPH_METRICS *ret = metrics + i; DWRITE_GLYPH_METRICS design; BOOL has_contours; hr = IDWriteFontFace5_GetDesignGlyphMetrics(iface, glyphs + i, 1, &design, is_sideways); if (FAILED(hr)) - return hr; + break; - ret->advanceWidth = font_funcs->get_glyph_advance(iface, size, glyphs[i], mode, &has_contours); + ret->advanceWidth = fontface_get_glyph_advance(fontface, size, glyphs[i], mode, &has_contours); if (has_contours) ret->advanceWidth = round_metric(ret->advanceWidth * fontface->metrics.designUnitsPerEm / size + adjustment); else @@ -1056,6 +1164,7 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac SCALE_METRIC(verticalOriginY); #undef SCALE_METRIC } + LeaveCriticalSection(&fontface->cs); return S_OK; } @@ -1172,8 +1281,8 @@ static int fontface_get_design_advance(struct dwrite_fontface *fontface, DWRITE_ switch (measuring_mode) { case DWRITE_MEASURING_MODE_NATURAL: - advance = font_funcs->get_glyph_advance(&fontface->IDWriteFontFace5_iface, fontface->metrics.designUnitsPerEm, - glyph, measuring_mode, &has_contours); + advance = fontface_get_glyph_advance(fontface, fontface->metrics.designUnitsPerEm, glyph, + measuring_mode, &has_contours); if (has_contours) advance += adjustment; @@ -1187,8 +1296,7 @@ static int fontface_get_design_advance(struct dwrite_fontface *fontface, DWRITE_ if (transform && memcmp(transform, &identity, sizeof(*transform))) FIXME("Transform is not supported.\n"); - advance = font_funcs->get_glyph_advance(&fontface->IDWriteFontFace5_iface, emsize, glyph, measuring_mode, - &has_contours); + advance = fontface_get_glyph_advance(fontface, emsize, glyph, measuring_mode, &has_contours); if (has_contours) advance = round_metric(advance * fontface->metrics.designUnitsPerEm / emsize + adjustment); else @@ -1212,11 +1320,13 @@ static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace5 *i if (is_sideways) FIXME("sideways mode not supported\n"); + EnterCriticalSection(&fontface->cs); for (i = 0; i < glyph_count; ++i) { advances[i] = fontface_get_design_advance(fontface, DWRITE_MEASURING_MODE_NATURAL, fontface->metrics.designUnitsPerEm, 1.0f, NULL, glyphs[i], is_sideways); } + LeaveCriticalSection(&fontface->cs); return S_OK; } @@ -1243,11 +1353,14 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF } measuring_mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; + + EnterCriticalSection(&fontface->cs); for (i = 0; i < glyph_count; ++i) { advances[i] = fontface_get_design_advance(fontface, measuring_mode, em_size, ppdip, transform, glyphs[i], is_sideways); } + LeaveCriticalSection(&fontface->cs); return S_OK; } @@ -5101,6 +5214,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->stream = desc->stream; IDWriteFontFileStream_AddRef(fontface->stream); InitializeCriticalSection(&fontface->cs); + fontface_cache_init(fontface); stream_desc.stream = fontface->stream; stream_desc.face_type = desc->face_type; @@ -6027,7 +6141,9 @@ float fontface_get_scaled_design_advance(struct dwrite_fontface *fontface, DWRIT if (is_sideways) FIXME("Sideways mode is not supported.\n"); + EnterCriticalSection(&fontface->cs); advance = fontface_get_design_advance(fontface, measuring_mode, emsize, ppdip, transform, glyph, is_sideways); + LeaveCriticalSection(&fontface->cs); switch (measuring_mode) { diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 503f8b04496..a2304f264d5 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -781,30 +781,25 @@ static BOOL CDECL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) return ret; } -static INT32 CDECL freetype_get_glyph_advance(void *key, float emSize, UINT16 index, +static INT32 CDECL freetype_get_glyph_advance(font_object_handle object, float emsize, UINT16 glyph, DWRITE_MEASURING_MODE mode, BOOL *has_contours) { - FTC_ImageTypeRec imagetype; - FT_Glyph glyph; - INT32 advance; + FT_Face face = object; + INT32 advance = 0; + FT_Size size; - imagetype.face_id = key; - imagetype.width = 0; - imagetype.height = emSize; - imagetype.flags = FT_LOAD_DEFAULT; - if (mode == DWRITE_MEASURING_MODE_NATURAL) - imagetype.flags |= FT_LOAD_NO_HINTING; + *has_contours = FALSE; - RtlEnterCriticalSection(&freetype_cs); - if (pFTC_ImageCache_Lookup(image_cache, &imagetype, index, &glyph, NULL) == 0) { - *has_contours = glyph->format == FT_GLYPH_FORMAT_OUTLINE && ((FT_OutlineGlyph)glyph)->outline.n_contours; - advance = glyph->advance.x >> 16; - } - else { - *has_contours = FALSE; - advance = 0; + if (!(size = freetype_set_face_size(face, emsize))) + return 0; + + if (!pFT_Load_Glyph(face, glyph, mode == DWRITE_MEASURING_MODE_NATURAL ? FT_LOAD_NO_HINTING : 0)) + { + advance = face->glyph->advance.x >> 6; + *has_contours = freetype_glyph_has_contours(face); } - RtlLeaveCriticalSection(&freetype_cs); + + pFT_Done_Size(size); return advance; } @@ -863,8 +858,8 @@ static UINT16 CDECL null_get_glyph_count(font_object_handle object) return 0; } -static INT32 CDECL null_get_glyph_advance(void *key, float emSize, UINT16 index, DWRITE_MEASURING_MODE mode, - BOOL *has_contours) +static INT32 CDECL null_get_glyph_advance(font_object_handle object, float emsize, UINT16 glyph, + DWRITE_MEASURING_MODE mode, BOOL *has_contours) { *has_contours = FALSE; return 0; -- 2.33.0

1 0

[PATCH vkd3d 1/2] vkd3d-shader/hlsl: Separate texture_dim and sampler_dim, add support for texture arrays.
by Francisco Casas Dec. 6, 2021

Dec. 6, 2021

This patch is a proposal for considering separating texture_dim and sampler_dim, it probably will be resent after Matteo's batch is reviewed. Opinions are appreciated. So far, the enum hlsl_sampler_dim sampler_dim; member of struct hlsl_type has been used to store the dimension type of both HLSL_TYPE_SAMPLER and HLSL_TYPE_TEXTURE types. However, textures have more possible options, e.g. Texture1DArray and Texture2DArray, which are ld and sampled with vectors of 2 and 3 dimensions respectively. Support for these is added in this patch. The new enum hlsl_texture_dim is added to include these cases and the enum hlsl_texture_dim texture_dim; member is added to struct hlsl_type to store the dimension type of HLSL_TYPE_TEXTURE types. Nevertheless, sampler_dim is still used on HLSL_TYPE_TEXTURE types to know the compatible types for sampling (albeit this could be deducted from texture_dim). Future support for Texture2DMS and Texture2DMSArray would be affected if this strategy is chosen. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 48 +++++++++++++++++++++++++----------- libs/vkd3d-shader/hlsl.h | 14 ++++++++++- libs/vkd3d-shader/hlsl.y | 24 ++++++++++++------ libs/vkd3d-shader/hlsl_sm4.c | 48 ++++++++++++++++++++++++------------ 4 files changed, 95 insertions(+), 39 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9824c56d..ed061d42 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,7 +261,7 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } -struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format) +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_texture_dim dim, struct hlsl_type *format) { struct hlsl_type *type; @@ -271,7 +271,14 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ type->base_type = HLSL_TYPE_TEXTURE; type->dimx = 4; type->dimy = 1; - type->sampler_dim = dim; + type->texture_dim = dim; + if (dim == HLSL_TEXTURE_DIM_1DARRAY) + type->sampler_dim = HLSL_SAMPLER_DIM_2D; + else if (dim == HLSL_TEXTURE_DIM_2DARRAY) + type->sampler_dim = HLSL_SAMPLER_DIM_3D; + else + type->sampler_dim = (enum hlsl_sampler_dim) dim; + type->e.resource_format = format; list_add_tail(&ctx->types, &type->entry); return type; @@ -345,11 +352,16 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + if (t1->base_type == HLSL_TYPE_SAMPLER) { if (t1->sampler_dim != t2->sampler_dim) return false; - if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + } + if (t1->base_type == HLSL_TYPE_TEXTURE) + { + if (t1->texture_dim != t2->texture_dim) + return false; + if (t1->texture_dim != HLSL_TEXTURE_DIM_GENERIC && !hlsl_types_are_equal(t1->e.resource_format, t2->e.resource_format)) return false; } @@ -414,6 +426,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) type->modifiers |= default_majority; type->sampler_dim = old->sampler_dim; + type->texture_dim = old->texture_dim; switch (old->type) { case HLSL_CLASS_ARRAY: @@ -778,12 +791,17 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - && t1->sampler_dim != t2->sampler_dim) + if (t1->base_type == HLSL_TYPE_SAMPLER) { if (t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; - if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + + } + if (t1->base_type == HLSL_TYPE_TEXTURE) + { + if (t1->texture_dim != t2->texture_dim) + return t1->texture_dim - t2->texture_dim; + if (t1->texture_dim != HLSL_TEXTURE_DIM_GENERIC && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format))) return r; } @@ -917,24 +935,26 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { static const char *const dimensions[] = { - [HLSL_SAMPLER_DIM_1D] = "1D", - [HLSL_SAMPLER_DIM_2D] = "2D", - [HLSL_SAMPLER_DIM_3D] = "3D", - [HLSL_SAMPLER_DIM_CUBE] = "Cube" + [HLSL_TEXTURE_DIM_1D] = "1D", + [HLSL_TEXTURE_DIM_1DARRAY] = "1DArray", + [HLSL_TEXTURE_DIM_2D] = "2D", + [HLSL_TEXTURE_DIM_2DARRAY] = "2DArray", + [HLSL_TEXTURE_DIM_3D] = "3D", + [HLSL_TEXTURE_DIM_CUBE] = "Cube" }; switch (type->base_type) { case HLSL_TYPE_TEXTURE: - if (type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + if (type->texture_dim == HLSL_TEXTURE_DIM_GENERIC) { vkd3d_string_buffer_printf(string, "Texture"); return string; } - assert(type->sampler_dim < ARRAY_SIZE(dimensions)); + assert(type->texture_dim < ARRAY_SIZE(dimensions)); assert(type->e.resource_format->base_type < ARRAY_SIZE(base_types)); - vkd3d_string_buffer_printf(string, "Texture%s<%s%u>", dimensions[type->sampler_dim], + vkd3d_string_buffer_printf(string, "Texture%s<%s%u>", dimensions[type->texture_dim], base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); return string; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e7bdb45e..9d73d979 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -101,6 +101,17 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE }; +enum hlsl_texture_dim +{ + HLSL_TEXTURE_DIM_GENERIC = HLSL_SAMPLER_DIM_GENERIC, + HLSL_TEXTURE_DIM_1D = HLSL_SAMPLER_DIM_1D, + HLSL_TEXTURE_DIM_2D = HLSL_SAMPLER_DIM_2D, + HLSL_TEXTURE_DIM_3D = HLSL_SAMPLER_DIM_3D, + HLSL_TEXTURE_DIM_CUBE = HLSL_SAMPLER_DIM_CUBE, + HLSL_TEXTURE_DIM_1DARRAY, + HLSL_TEXTURE_DIM_2DARRAY, +}; + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, @@ -114,6 +125,7 @@ struct hlsl_type enum hlsl_type_class type; enum hlsl_base_type base_type; enum hlsl_sampler_dim sampler_dim; + enum hlsl_texture_dim texture_dim; const char *name; unsigned int modifiers; unsigned int dimx; @@ -716,7 +728,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); -struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_texture_dim dim, struct hlsl_type *format); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ff35c09e..13853127 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1831,7 +1831,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl struct hlsl_ir_load *object_load; if (object_type->type != HLSL_CLASS_OBJECT || object_type->base_type != HLSL_TYPE_TEXTURE - || object_type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + || object_type->texture_dim == HLSL_TEXTURE_DIM_GENERIC) { struct vkd3d_string_buffer *string; @@ -1959,7 +1959,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl struct parse_colon_attribute colon_attribute; struct hlsl_semantic semantic; enum hlsl_buffer_type buffer_type; - enum hlsl_sampler_dim sampler_dim; + enum hlsl_texture_dim texture_dim; } %token KW_BLENDSTATE @@ -2134,7 +2134,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <reg_reservation> register_opt -%type <sampler_dim> texture_type +%type <texture_dim> texture_type %type <semantic> semantic @@ -2554,19 +2554,27 @@ input_mod: texture_type: KW_TEXTURE1D { - $$ = HLSL_SAMPLER_DIM_1D; + $$ = HLSL_TEXTURE_DIM_1D; } | KW_TEXTURE2D { - $$ = HLSL_SAMPLER_DIM_2D; + $$ = HLSL_TEXTURE_DIM_2D; } | KW_TEXTURE3D { - $$ = HLSL_SAMPLER_DIM_3D; + $$ = HLSL_TEXTURE_DIM_3D; } | KW_TEXTURECUBE { - $$ = HLSL_SAMPLER_DIM_CUBE; + $$ = HLSL_TEXTURE_DIM_CUBE; + } + | KW_TEXTURE1DARRAY + { + $$ = HLSL_TEXTURE_DIM_1DARRAY; + } + | KW_TEXTURE2DARRAY + { + $$ = HLSL_TEXTURE_DIM_2DARRAY; } type: @@ -2654,7 +2662,7 @@ type: } | KW_TEXTURE { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC, NULL); + $$ = hlsl_new_texture_type(ctx, HLSL_TEXTURE_DIM_GENERIC, NULL); } | texture_type { diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c0c26f80..5275be53 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -302,18 +302,22 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) case HLSL_TYPE_STRING: return D3D_SVT_STRING; case HLSL_TYPE_TEXTURE: - switch (type->sampler_dim) + switch (type->texture_dim) { - case HLSL_SAMPLER_DIM_1D: + case HLSL_TEXTURE_DIM_1D: return D3D_SVT_TEXTURE1D; - case HLSL_SAMPLER_DIM_2D: + case HLSL_TEXTURE_DIM_2D: return D3D_SVT_TEXTURE2D; - case HLSL_SAMPLER_DIM_3D: + case HLSL_TEXTURE_DIM_3D: return D3D_SVT_TEXTURE3D; - case HLSL_SAMPLER_DIM_CUBE: + case HLSL_TEXTURE_DIM_CUBE: return D3D_SVT_TEXTURECUBE; - case HLSL_SAMPLER_DIM_GENERIC: + case HLSL_TEXTURE_DIM_GENERIC: return D3D_SVT_TEXTURE; + case HLSL_TEXTURE_DIM_1DARRAY: + return D3D_SVT_TEXTURE1DARRAY; + case HLSL_TEXTURE_DIM_2DARRAY: + return D3D_SVT_TEXTURE2DARRAY; default: assert(0); } @@ -424,16 +428,22 @@ static D3D_RESOURCE_RETURN_TYPE sm4_resource_format(const struct hlsl_type *type static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *type) { - switch (type->sampler_dim) + enum hlsl_texture_dim tex_dim = (type->base_type == HLSL_TYPE_TEXTURE)? + type->texture_dim : (enum hlsl_texture_dim) type->sampler_dim; + switch (tex_dim) { - case HLSL_SAMPLER_DIM_1D: + case HLSL_TEXTURE_DIM_1D: return D3D_SRV_DIMENSION_TEXTURE1D; - case HLSL_SAMPLER_DIM_2D: + case HLSL_TEXTURE_DIM_2D: return D3D_SRV_DIMENSION_TEXTURE2D; - case HLSL_SAMPLER_DIM_3D: + case HLSL_TEXTURE_DIM_3D: return D3D_SRV_DIMENSION_TEXTURE3D; - case HLSL_SAMPLER_DIM_CUBE: + case HLSL_TEXTURE_DIM_CUBE: return D3D_SRV_DIMENSION_TEXTURECUBE; + case HLSL_TEXTURE_DIM_1DARRAY: + return D3D_SRV_DIMENSION_TEXTURE1DARRAY; + case HLSL_TEXTURE_DIM_2DARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DARRAY; default: assert(0); return D3D_SRV_DIMENSION_UNKNOWN; @@ -711,16 +721,22 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_type *type) { - switch (type->sampler_dim) + enum hlsl_texture_dim tex_dim = (type->base_type == HLSL_TYPE_TEXTURE)? + type->texture_dim : (enum hlsl_texture_dim) type->sampler_dim; + switch (tex_dim) { - case HLSL_SAMPLER_DIM_1D: + case HLSL_TEXTURE_DIM_1D: return VKD3D_SM4_RESOURCE_TEXTURE_1D; - case HLSL_SAMPLER_DIM_2D: + case HLSL_TEXTURE_DIM_2D: return VKD3D_SM4_RESOURCE_TEXTURE_2D; - case HLSL_SAMPLER_DIM_3D: + case HLSL_TEXTURE_DIM_3D: return VKD3D_SM4_RESOURCE_TEXTURE_3D; - case HLSL_SAMPLER_DIM_CUBE: + case HLSL_TEXTURE_DIM_CUBE: return VKD3D_SM4_RESOURCE_TEXTURE_CUBE; + case HLSL_TEXTURE_DIM_1DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY; + case HLSL_TEXTURE_DIM_2DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY; default: assert(0); return 0; -- 2.25.1

2 2