- Wine-Commits - list.winehq.org

Max Figura : wined3d: Move the WINED3D_RS_WRAP6 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: cbbf1f054c9e6ecd56dce57563527118281264a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbbf1f054c9e6ecd56dce575635271… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:29:11 2022 -0600 wined3d: Move the WINED3D_RS_WRAP6 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a8aae40b7f2..a0ef4213b11 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -104,7 +104,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 27f9c1d14e6..065367c605c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP6: case WINED3D_RS_WRAP7: case WINED3D_RS_WRAP8: case WINED3D_RS_WRAP9: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 337753e7e70..f8a38eb13d9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2817,7 +2817,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP6), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7dfdcb7c456..ded450992f6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4687,7 +4687,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP3), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP4), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP5), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP6), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5468,7 +5467,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, - {135, 135}, + {134, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

Alexandre Julliard : ntdll: Don't touch the top of the 32-bit thread stack.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 26163c10bb3e1053d4f1b3d78c2d2d65d96c43d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/26163c10bb3e1053d4f1b3d78c2d2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 17:48:23 2023 +0100 ntdll: Don't touch the top of the 32-bit thread stack. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 07ffb269d19..2152b5e1a77 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -97,7 +97,7 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "pushq %rdi\n\t" "movq %rsp,%rdi\n\t" "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ - "subl $0x10,%esp\n\t" + "subl $0x20,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ "movl %ecx,(%rsp)\n\t" /* entry_number */ "movl %edx,4(%rsp)\n\t" /* base */

1 0

Alexandre Julliard : server: Determine the native thread context flags on the client side.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: fa47ea740020dd5bffa94b3cd835559393b2f752 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa47ea740020dd5bffa94b3cd83555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 12:24:49 2023 +0100 server: Determine the native thread context flags on the client side. --- dlls/ntdll/unix/thread.c | 15 +++++++++++++++ include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 2 ++ server/request.h | 6 ++++-- server/thread.c | 8 +++----- server/trace.c | 2 ++ 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d56962e1721..79943ebabc2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -207,6 +207,18 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin } +/*********************************************************************** + * get_native_context_flags + * + * Get flags for registers that are set from the native context in WoW mode. + */ +static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_machine ) +{ + if (native_machine == wow_machine) return 0; + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; +} + + /*********************************************************************** * context_to_server * @@ -1691,6 +1703,7 @@ NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USH SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); + req->native_flags = server_contexts[0].flags & get_native_context_flags( native_machine, machine ); wine_server_add_data( req, server_contexts, count * sizeof(server_contexts[0]) ); ret = wine_server_call( req ); *self = reply->self; @@ -1717,6 +1730,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma req->handle = wine_server_obj_handle( handle ); req->flags = flags; req->machine = machine; + req->native_flags = flags & get_native_context_flags( native_machine, machine ); wine_server_set_reply( req, server_contexts, sizeof(server_contexts) ); ret = wine_server_call( req ); *self = reply->self; @@ -1734,6 +1748,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma req->context = wine_server_obj_handle( context_handle ); req->flags = flags; req->machine = machine; + req->native_flags = flags & get_native_context_flags( native_machine, machine ); wine_server_set_reply( req, server_contexts, sizeof(server_contexts) ); ret = wine_server_call( req ); count = wine_server_reply_size( reply ) / sizeof(server_contexts[0]); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ffef499df20..f61918271ff 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2531,8 +2531,9 @@ struct get_thread_context_request obj_handle_t handle; obj_handle_t context; unsigned int flags; + unsigned int native_flags; unsigned short machine; - char __pad_26[6]; + char __pad_30[2]; }; struct get_thread_context_reply { @@ -2548,7 +2549,9 @@ struct set_thread_context_request { struct request_header __header; obj_handle_t handle; + unsigned int native_flags; /* VARARG(contexts,contexts); */ + char __pad_20[4]; }; struct set_thread_context_reply { @@ -6355,7 +6358,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 761 +#define SERVER_PROTOCOL_VERSION 762 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 57957efdae3..c857f72ce68 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1931,6 +1931,7 @@ struct process_info obj_handle_t handle; /* thread handle */ obj_handle_t context; /* context handle */ unsigned int flags; /* context flags */ + unsigned int native_flags; /* flags for native context if WoW present */ unsigned short machine; /* context architecture */ @REPLY int self; /* was it a handle to the current thread? */ @@ -1942,6 +1943,7 @@ struct process_info /* Set the current context of a thread */ @REQ(set_thread_context) obj_handle_t handle; /* thread handle */ + unsigned int native_flags; /* flags for native context if WoW present */ VARARG(contexts,contexts); /* thread context(s) */ @REPLY int self; /* was it a handle to the current thread? */ diff --git a/server/request.h b/server/request.h index 10b877b1deb..b8d4f6a6d5e 100644 --- a/server/request.h +++ b/server/request.h @@ -1278,13 +1278,15 @@ C_ASSERT( sizeof(struct get_timer_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, context) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, flags) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, machine) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, native_flags) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, machine) == 28 ); C_ASSERT( sizeof(struct get_thread_context_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, self) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_context_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_context_request, handle) == 12 ); -C_ASSERT( sizeof(struct set_thread_context_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_context_request, native_flags) == 16 ); +C_ASSERT( sizeof(struct set_thread_context_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_thread_context_reply, self) == 8 ); C_ASSERT( sizeof(struct set_thread_context_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_selector_entry_request, handle) == 12 ); diff --git a/server/thread.c b/server/thread.c index 5f8493dd309..c9adccfef66 100644 --- a/server/thread.c +++ b/server/thread.c @@ -127,8 +127,6 @@ struct context /* flags for registers that always need to be set from the server side */ static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; -/* flags for registers that are set from the native context even in WoW mode */ -static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; static void dump_context( struct object *obj, int verbose ); static int context_signaled( struct object *obj, struct wait_queue_entry *entry ); @@ -1866,8 +1864,8 @@ DECL_HANDLER(get_thread_context) if (req->machine == thread_context->regs[CTX_WOW].machine) { - native_flags = req->flags & always_native_flags; - wow_flags = req->flags & ~always_native_flags; + native_flags = req->native_flags; + wow_flags = req->flags & ~native_flags; } if ((context = set_reply_data_size( (!!native_flags + !!wow_flags) * sizeof(context_t) ))) { @@ -1922,7 +1920,7 @@ DECL_HANDLER(set_thread_context) unsigned int ctx = CTX_NATIVE; const context_t *context = &contexts[CTX_NATIVE]; unsigned int flags = system_flags & context->flags; - unsigned int native_flags = always_native_flags & context->flags; + unsigned int native_flags = context->flags & req->native_flags; if (thread != current) stop_thread( thread ); else if (flags) set_thread_context( thread, context, flags ); diff --git a/server/trace.c b/server/trace.c index 91bc3ae7af9..fb006f605b5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2509,6 +2509,7 @@ static void dump_get_thread_context_request( const struct get_thread_context_req fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", context=%04x", req->context ); fprintf( stderr, ", flags=%08x", req->flags ); + fprintf( stderr, ", native_flags=%08x", req->native_flags ); fprintf( stderr, ", machine=%04x", req->machine ); } @@ -2522,6 +2523,7 @@ static void dump_get_thread_context_reply( const struct get_thread_context_reply static void dump_set_thread_context_request( const struct set_thread_context_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", native_flags=%08x", req->native_flags ); dump_varargs_contexts( ", contexts=", cur_size ); }

1 0

Alexandre Julliard : ntdll: Pass the WoW context to the server on ARM64.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: cc0ca49a464d77cc731b97a650e0f696c04478f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc0ca49a464d77cc731b97a650e0f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 12:27:58 2023 +0100 ntdll: Pass the WoW context to the server on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 11 ++++++++++- dlls/ntdll/unix/thread.c | 20 +++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3855afc34f4..186054af546 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -590,7 +590,7 @@ void *get_native_context( CONTEXT *context ) */ void *get_wow_context( CONTEXT *context ) { - return NULL; + return get_cpu_area( main_image_info.Machine ); } @@ -878,6 +878,15 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) memcpy( &context->FloatSave, &wow_frame->FloatSave, sizeof(context->FloatSave) ); context->ContextFlags |= CONTEXT_I386_FLOATING_POINT; } + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) + { + context->Dr0 = wow_frame->Dr0; + context->Dr1 = wow_frame->Dr1; + context->Dr2 = wow_frame->Dr2; + context->Dr3 = wow_frame->Dr3; + context->Dr6 = wow_frame->Dr6; + context->Dr7 = wow_frame->Dr7; + } /* FIXME: CONTEXT_I386_XSTATE */ break; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 79943ebabc2..3228180e20f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -214,8 +214,15 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin */ static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_machine ) { - if (native_machine == wow_machine) return 0; - return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; + switch (MAKELONG( native_machine, wow_machine )) + { + case MAKELONG( IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386 ): + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; + case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_ARMNT ): + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT; + default: + return 0; + } } @@ -595,6 +602,10 @@ static NTSTATUS context_to_server( context_t *to, USHORT to_machine, const void return STATUS_SUCCESS; } + case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_I386 ): + case MAKELONG( IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_ARM64 ): + return STATUS_SUCCESS; + default: return STATUS_INVALID_PARAMETER; } @@ -974,7 +985,6 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma ARM64_NT_CONTEXT *to = dst; to_flags = to->ContextFlags & ~CONTEXT_ARM64; - to->ContextFlags = CONTEXT_ARM64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_ARM64_CONTROL)) { to->ContextFlags |= CONTEXT_ARM64_CONTROL; @@ -1011,6 +1021,10 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma return STATUS_SUCCESS; } + case MAKELONG( IMAGE_FILE_MACHINE_ARM64, IMAGE_FILE_MACHINE_I386 ): + case MAKELONG( IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_ARM64 ): + return STATUS_SUCCESS; + default: return STATUS_INVALID_PARAMETER; }

1 0

Alexandre Julliard : ntdll: Always call Wow64PrepareForException when dispatching an exception.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: eccf92996c88adee809cea6e1416fa72e4c92ef3 URL: https://gitlab.winehq.org/wine/wine/-/commit/eccf92996c88adee809cea6e1416fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 11:42:58 2023 +0100 ntdll: Always call Wow64PrepareForException when dispatching an exception. --- dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/signal_x86_64.c | 3 ++- dlls/wow64cpu/cpu.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cadf774be67..2eed51b101e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -494,6 +494,8 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte NTSTATUS status; DWORD c; + if (pWow64PrepareForException) pWow64PrepareForException( rec, context ); + TRACE( "code=%lx flags=%lx addr=%p pc=%016I64x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Pc ); for (c = 0; c < rec->NumberParameters; c++) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 81479f1fd91..7ebd52766e6 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -508,6 +508,8 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; + if (pWow64PrepareForException) pWow64PrepareForException( rec, context ); + TRACE_(seh)( "code=%lx flags=%lx addr=%p ip=%Ix\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) @@ -584,7 +586,6 @@ NTSTATUS WINAPI dispatch_wow_exception( EXCEPTION_RECORD *rec_ptr, CONTEXT *cont RtlInitializeExtendedContext( buffer, context_ptr->ContextFlags, &context_ex ); context = RtlLocateLegacyContext( context_ex, NULL ); RtlCopyContext( context, context_ptr->ContextFlags, context_ptr ); - pWow64PrepareForException( &rec, context ); return dispatch_exception( &rec, context ); } diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 13c94751d19..5bcaf9d1c45 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -375,6 +375,8 @@ NTSTATUS WINAPI BTCpuResetToConsistentState( EXCEPTION_POINTERS *ptrs ) CONTEXT *context = ptrs->ContextRecord; I386_CONTEXT wow_context; + if (context->SegCs == cs64_sel) return STATUS_SUCCESS; /* exception in 64-bit code, nothing to do */ + copy_context_64to32( &wow_context, CONTEXT_I386_ALL, context ); wow_context.EFlags &= ~(0x100|0x40000); BTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &wow_context );

1 0

Alexandre Julliard : maintainers: Assume maintainership of ARM platforms.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 4d217cb274847223cdaab79bbd0980dff1c09dd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d217cb274847223cdaab79bbd0980… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 09:16:12 2023 +0100 maintainers: Assume maintainership of ARM platforms. --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9d60385414f..7e2645d8b5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,8 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Zwing <nerv(a)dawncrow.de> +M: Alexandre Julliard <julliard(a)winehq.org> +P: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm*

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support distance() intrinsic.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: vkd3d Branch: master Commit: a18f3d4dd5a1b8921067db4a88a587002cb1a8ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a18f3d4dd5a1b8921067db4a88a58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 11:13:33 2023 +0300 vkd3d-shader/hlsl: Support distance() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 24 ++++++++++++++++++++++++ tests/distance.shader_test | 23 +++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/Makefile.am b/Makefile.am index 29692432..191f4eb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,7 @@ vkd3d_shader_tests = \ tests/cbuffer.shader_test \ tests/compute.shader_test \ tests/conditional.shader_test \ + tests/distance.shader_test \ tests/entry-point-semantics.shader_test \ tests/exp.shader_test \ tests/floor.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 10ac3179..e50d1862 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2533,6 +2533,29 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, mul2, mul1_neg, loc); } +static bool intrinsic_distance(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1, *arg2, *neg, *add, *dot; + + if (!(arg1 = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(arg2 = intrinsic_float_convert_arg(ctx, params, params->args[1], loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, arg2, loc))) + return false; + + if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, arg1, neg, loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, add, add, loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc); +} + static bool intrinsic_dot(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3203,6 +3226,7 @@ intrinsic_functions[] = {"clamp", 3, true, intrinsic_clamp}, {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, + {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, {"exp2", 1, true, intrinsic_exp2}, diff --git a/tests/distance.shader_test b/tests/distance.shader_test new file mode 100644 index 00000000..3f544645 --- /dev/null +++ b/tests/distance.shader_test @@ -0,0 +1,23 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : sv_target +{ + return distance(x, y); +} + +[test] +uniform 0 float4 -2.0 3.0 4.0 0.1 +uniform 4 float4 2.0 -1.0 4.0 5.0 +draw quad +probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 + +[pixel shader] +uniform int4 x; +uniform int4 y; + +float4 main() : sv_target +{ + return distance(x, y); +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support rsqrt() intrinsic.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: vkd3d Branch: master Commit: d6b656641c107ade3e078e4dc0210f6d9713a1d1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6b656641c107ade3e078e4dc0210… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 19:07:10 2023 +0300 vkd3d-shader/hlsl: Support rsqrt() intrinsic. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/sqrt.shader_test | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e011ea24..10ac3179 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2941,6 +2941,17 @@ static bool intrinsic_round(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } +static bool intrinsic_rsqrt(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_RSQ, arg, loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3208,6 +3219,7 @@ intrinsic_functions[] = {"pow", 2, true, intrinsic_pow}, {"reflect", 2, true, intrinsic_reflect}, {"round", 1, true, intrinsic_round}, + {"rsqrt", 1, true, intrinsic_rsqrt}, {"saturate", 1, true, intrinsic_saturate}, {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, diff --git a/tests/sqrt.shader_test b/tests/sqrt.shader_test index 5d048b4f..78d89d38 100644 --- a/tests/sqrt.shader_test +++ b/tests/sqrt.shader_test @@ -10,3 +10,16 @@ float4 main() : sv_target uniform 0 float4 1.0 9.0 32.3 46.5 draw quad probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1 + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return rsqrt(f); +} + +[test] +uniform 0 float4 1.0 9.0 4.0 16.0 +draw quad +probe all rgba (1.0, 0.33333333, 0.5, 0.25) 1

1 0

Mohamad Al-Jaf : windows.perception.stub: Implement ISpatialSurfaceObserverStatics2::IsSupported().
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 50f5f9af1c27c4380a7489596d20d8048f003365 URL: https://gitlab.winehq.org/wine/wine/-/commit/50f5f9af1c27c4380a7489596d20d8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 20:29:37 2022 -0500 windows.perception.stub: Implement ISpatialSurfaceObserverStatics2::IsSupported(). Needed by the VR games Forewarned and Überlaüfer. --- dlls/windows.perception.stub/observer.c | 6 ++++-- dlls/windows.perception.stub/tests/perception.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.perception.stub/observer.c b/dlls/windows.perception.stub/observer.c index 16f573e4d84..50643b77981 100644 --- a/dlls/windows.perception.stub/observer.c +++ b/dlls/windows.perception.stub/observer.c @@ -149,8 +149,10 @@ DEFINE_IINSPECTABLE( observer_statics2, ISpatialSurfaceObserverStatics2, struct static HRESULT WINAPI observer_statics2_IsSupported( ISpatialSurfaceObserverStatics2 *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p.\n", iface, value ); + + *value = FALSE; + return S_OK; } static const struct ISpatialSurfaceObserverStatics2Vtbl observer_statics2_vtbl = diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index a112bf7e52a..3e11f5ea8e7 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -77,8 +77,8 @@ static void test_ObserverStatics(void) value = TRUE; hr = ISpatialSurfaceObserverStatics2_IsSupported( observer_statics2, &value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( !value, "got %d.\n", value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Mohamad Al-Jaf : windows.perception.stub: Add ISpatialSurfaceObserverStatics2 stub interface.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 006bc33c57c96bd733147c4088d36bfc14da907e URL: https://gitlab.winehq.org/wine/wine/-/commit/006bc33c57c96bd733147c4088d36b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 23 03:50:15 2023 -0500 windows.perception.stub: Add ISpatialSurfaceObserverStatics2 stub interface. --- dlls/windows.perception.stub/observer.c | 30 +++++++++++++++++++++++++ dlls/windows.perception.stub/tests/perception.c | 6 +++++ 2 files changed, 36 insertions(+) diff --git a/dlls/windows.perception.stub/observer.c b/dlls/windows.perception.stub/observer.c index e5cb0bac3ea..16f573e4d84 100644 --- a/dlls/windows.perception.stub/observer.c +++ b/dlls/windows.perception.stub/observer.c @@ -27,6 +27,7 @@ struct observer { IActivationFactory IActivationFactory_iface; ISpatialSurfaceObserverStatics ISpatialSurfaceObserverStatics_iface; + ISpatialSurfaceObserverStatics2 ISpatialSurfaceObserverStatics2_iface; LONG ref; }; @@ -58,6 +59,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ISpatialSurfaceObserverStatics2 )) + { + *out = &impl->ISpatialSurfaceObserverStatics2_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -137,10 +145,32 @@ static const struct ISpatialSurfaceObserverStaticsVtbl observer_statics_vtbl = observer_statics_RequestAccessAsync, }; +DEFINE_IINSPECTABLE( observer_statics2, ISpatialSurfaceObserverStatics2, struct observer, IActivationFactory_iface ) + +static HRESULT WINAPI observer_statics2_IsSupported( ISpatialSurfaceObserverStatics2 *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct ISpatialSurfaceObserverStatics2Vtbl observer_statics2_vtbl = +{ + observer_statics2_QueryInterface, + observer_statics2_AddRef, + observer_statics2_Release, + /* IInspectable methods */ + observer_statics2_GetIids, + observer_statics2_GetRuntimeClassName, + observer_statics2_GetTrustLevel, + /* ISpatialSurfaceObserverStatics2 methods */ + observer_statics2_IsSupported, +}; + static struct observer observer_statics = { {&factory_vtbl}, {&observer_statics_vtbl}, + {&observer_statics2_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 8b075042f72..9b7b7a07eaf 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_ObserverStatics(void) { static const WCHAR *observer_statics_name = L"Windows.Perception.Spatial.Surfaces.SpatialSurfaceObserver"; + ISpatialSurfaceObserverStatics2 *observer_statics2; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -70,6 +71,11 @@ static void test_ObserverStatics(void) check_interface( factory, &IID_IAgileObject ); check_interface( factory, &IID_ISpatialSurfaceObserverStatics ); + hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialSurfaceObserverStatics2, (void **)&observer_statics2 ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0